From 805d3616fe81d73ec9abda47bbbe927b30c89a92 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 4 Jul 2011 17:59:02 -0400 Subject: [PATCH] cc-2419: media monitor import on startup -fixed support for watched dirs #2 --- airtime_mvc/application/models/StoredFile.php | 4 ++-- python_apps/api_clients/api_client.py | 2 -- .../airtimefilemonitor/airtimemediamonitorbootstrap.py | 3 ++- python_apps/media-monitor/media-monitor.cfg | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 1401e366a..352b66ba4 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -820,14 +820,14 @@ class StoredFile { } public static function listAllFiles($dir_id){ - global $CC_CONFIG, $CC_DBC; + global $CC_DBC; $sql = "SELECT m.directory || '/' || f.filepath as fp" ." FROM CC_MUSIC_DIRS m" ." LEFT JOIN CC_FILES f" ." ON m.id = f.directory" ." WHERE m.id = f.directory" - ." AND directory = $dir_id"; + ." AND m.id = $dir_id"; $rows = $CC_DBC->getAll($sql); $results = array(); diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py index eb828d2df..83371f033 100644 --- a/python_apps/api_clients/api_client.py +++ b/python_apps/api_clients/api_client.py @@ -431,9 +431,7 @@ class AirTimeApiClient(ApiClientInterface): try: url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["list_all_watched_dirs"]) - url = url.replace("%%api_key%%", self.config["api_key"]) - logger.debug(url) req = urllib2.Request(url) response = urllib2.urlopen(req).read() diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py index e8c4b7367..311888746 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py @@ -26,7 +26,8 @@ class AirtimeMediaMonitorBootstrap(): self.logger.info("watched directories found: %s", directories) - for id, dir in directories: + for id, dir in directories.iteritems(): + self.logger.debug("%s, %s", id, dir) self.check_for_diff(id, dir) def list_db_files(self, dir_id): diff --git a/python_apps/media-monitor/media-monitor.cfg b/python_apps/media-monitor/media-monitor.cfg index f9c86d616..47c3373b3 100644 --- a/python_apps/media-monitor/media-monitor.cfg +++ b/python_apps/media-monitor/media-monitor.cfg @@ -29,10 +29,10 @@ upload_recorded = 'upload-recorded/format/json/api_key/%%api_key%%/fileid/%%file update_media_url = 'reload-metadata/format/json/api_key/%%api_key%%/mode/%%mode%%' # URL to tell Airtime we want a listing of all files it knows about -list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%' +list_all_db_files = 'list-all-files/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%' # URL to tell Airtime we want a listing of all dirs its watching (including the stor dir) -list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%/dir_id/%%dir_id%%' +list_all_watched_dirs = 'list-all-watched-dirs/format/json/api_key/%%api_key%%' ############################################ # RabbitMQ settings #