From d7830785dfaa316c9da40a687283e4dd6e8c06d8 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 22 Aug 2011 20:36:16 -0400 Subject: [PATCH] CC-2717: Media Monitor forgets about watched directories after being restarted --- airtime_mvc/application/controllers/ApiController.php | 7 +++++++ python_apps/media-monitor/MediaMonitor.py | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index a02183492..4fff61201 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -426,6 +426,13 @@ class ApiController extends Zend_Controller_Action } $this->view->stor = MusicDir::getStorDir()->getDirectory(); + + $watchedDirs = MusicDir::getWatchedDirs(); + $watchedDirsPath = array(); + foreach($watchedDirs as $wd){ + $watchedDirsPath[] = $wd->getDirectory(); + } + $this->view->watched_dirs = $watchedDirsPath; } public function reloadMetadataAction() { diff --git a/python_apps/media-monitor/MediaMonitor.py b/python_apps/media-monitor/MediaMonitor.py index bda1b15c0..dadb1e65e 100644 --- a/python_apps/media-monitor/MediaMonitor.py +++ b/python_apps/media-monitor/MediaMonitor.py @@ -43,6 +43,7 @@ try: time.sleep(5) storage_directory = apc.encode_to(response["stor"], 'utf-8') + watched_dirs = apc.encode_to(response["watched_dirs"], 'utf-8') logger.info("Storage Directory is: %s", storage_directory) config.storage_directory = os.path.normpath(storage_directory) config.imported_directory = os.path.normpath(storage_directory + '/imported') @@ -77,6 +78,11 @@ try: wdd = notifier.watch_directory(storage_directory) logger.info("Added watch to %s", storage_directory) logger.info("wdd result %s", wdd[storage_directory]) + + for dir in watched_dirs: + wdd = notifier.watch_directory(dir) + logger.info("Added watch to %s", dir) + logger.info("wdd result %s", wdd[dir]) notifier.loop(callback=pe.notifier_loop_callback)