diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index a1a96df8b..b6e841616 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -118,7 +118,7 @@ class ApiController extends Zend_Controller_Action //make sure to exit here so that no other output is sent. exit; } else { - $logger->err('Resource in database, but not in storage: '.$filepath.' '.is_file($filepath)); + $logger->err('Resource in database, but not in storage: "'.$filepath.'"'); } } else { $logger->err('$media != null && !PEAR::isError($media)'); diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index ac84ac7f7..e40504d56 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -207,25 +207,4 @@ class LibraryController extends Zend_Controller_Action } } - - } - - - - - - - - - - - - - - - - - - - diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index fca9c2130..bb5246aad 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -839,6 +839,5 @@ class StoredFile { return $results; } - } diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py index 3840d4607..730da8d6d 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py @@ -49,7 +49,9 @@ class AirtimeMediaMonitorBootstrap(): command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable" % dir stdout = self.execCommandAndReturnStdOut(command) - new_files = stdout.split('\n') + stdout = unicode(stdout, "utf_8") + + new_files = stdout.splitlines() all_files_set = set() for file_path in new_files: if len(file_path.strip(" \n")) > 0: @@ -65,9 +67,10 @@ class AirtimeMediaMonitorBootstrap(): command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable" % dir stdout = self.execCommandAndReturnStdOut(command) - - new_files = stdout.split('\n') - + stdout = unicode(stdout, "utf_8") + + new_files = stdout.splitlines() + for file_path in new_files: if len(file_path.strip(" \n")) > 0: new_and_modified_files.add(file_path)