cc-2419: media monitor import on startup

-fixed support for watched dirs #2

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()

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):

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                        #