From c67e711a051258252671fb82ecb648dcc7ed8171 Mon Sep 17 00:00:00 2001 From: martin Date: Mon, 4 Jul 2011 15:40:09 -0400 Subject: [PATCH] cc-2419: media monitor import on startup -fixed syntax errors, added more logging. --- airtime_mvc/application/controllers/ApiController.php | 2 +- .../airtimefilemonitor/airtimemediamonitorbootstrap.py | 6 +++--- .../media-monitor/airtimefilemonitor/airtimemetadata.py | 1 + .../media-monitor/airtimefilemonitor/airtimeprocessevent.py | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index fcd6c2b52..57bff257d 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -25,7 +25,7 @@ class ApiController extends Zend_Controller_Action } /** - * Returns Airtime version. i.e "1.7.0 alpha" + * Returns Airtime version. i.e "1.7.0-beta" * * First checks to ensure the correct API key was * supplied, then returns AIRTIME_VERSION as defined diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py index 39e4d076b..9e3a07fd6 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py @@ -59,10 +59,10 @@ class AirtimeMediaMonitorBootstrap(): all_files_set.add(file_path) - if os.path.exists("/var/tmp/airtime/media_monitor_boot"): + if os.path.exists("/var/tmp/airtime/.media_monitor_boot"): #find files that have been modified since the last time #media-monitor process started. - time_diff_sec = time.time() - os.path.getmtime("/var/tmp/airtime/media_monitor_boot") + time_diff_sec = time.time() - os.path.getmtime("/var/tmp/airtime/.media_monitor_boot") command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable -mmin -%d" % (dir, time_diff_sec/60+1) else: command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable" % dir @@ -91,7 +91,7 @@ class AirtimeMediaMonitorBootstrap(): self.logger.info("Modified files: \n%s\n\n"%modified_files_set) #"touch" file timestamp - open("/var/tmp/airtime/media_monitor_boot","w") + open("/var/tmp/airtime/.media_monitor_boot","w") for file_path in deleted_files_set: self.pe.handle_removed_file(file_path) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py index 7a3079c4a..d1a984cb9 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py @@ -113,6 +113,7 @@ class AirtimeMetadata: except Exception, e: self.logger.error("failed getting metadata from %s", filepath) + self.logger.error("Exception %s", e) return None diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py index 19e0a9925..c3a3a9ab1 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py @@ -289,7 +289,7 @@ class AirtimeProcessEvent(ProcessEvent): if self.is_parent_directory(event.pathname, storage_directory): file_md = self.md_manager.get_md_from_file(event.pathname) if file_md is not None: - filepath, is_recorded_show = self.create_file_path(event.pathname) + filepath, is_recorded_show = self.create_file_path(event.pathname, file_md) self.move_file(event.pathname, filepath) self.renamed_files[event.pathname] = filepath self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': filepath, 'data': file_md, 'is_recorded_show': False})