Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x

This commit is contained in:
Rudi Grinberg 2012-11-02 11:30:04 -04:00
parent 466b647b59 5933cc3306
commit e9524c8615
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python_apps/media-monitor2/media/monitor/manager.py
View File

@ -202,6 +202,12 @@ class Manager(Loggable):
organize. organize.
""" """
store_paths = mmp.expand_storage(store) store_paths = mmp.expand_storage(store)
# First attempt to make sure that all paths exist before adding any
# watches
for path_type, path in store_paths.iteritems():
try: mmp.create_dir(path)
except mmp.FailedToCreateDir as e: self.unexpected_exception(e)
self.set_problem_files_path(store_paths['problem_files']) self.set_problem_files_path(store_paths['problem_files'])
self.set_imported_path(store_paths['imported']) self.set_imported_path(store_paths['imported'])
self.set_recorded_path(store_paths['recorded']) self.set_recorded_path(store_paths['recorded'])

4
python_apps/media-monitor2/mm2.py
View File

@ -104,6 +104,9 @@ def main(global_config, api_client_config, log_config,
airtime_notifier = AirtimeNotifier(config, airtime_receiver) airtime_notifier = AirtimeNotifier(config, airtime_receiver)
store = apiclient.setup_media_monitor() store = apiclient.setup_media_monitor()
log.info("Initing with the following airtime response:%s" % str(store))
airtime_receiver.change_storage({ 'directory':store[u'stor'] }) airtime_receiver.change_storage({ 'directory':store[u'stor'] })
for watch_dir in store[u'watched_dirs']: for watch_dir in store[u'watched_dirs']:
@ -115,6 +118,7 @@ def main(global_config, api_client_config, log_config,
(given from the database)." % watch_dir) (given from the database)." % watch_dir)
if os.path.exists(watch_dir): if os.path.exists(watch_dir):
airtime_receiver.new_watch({ 'directory':watch_dir }, restart=True) airtime_receiver.new_watch({ 'directory':watch_dir }, restart=True)
else: log.info("Failed to add watch on %s" % str(watch_dir))
bs = Bootstrapper( db=sdb, watch_signal='watch' ) bs = Bootstrapper( db=sdb, watch_signal='watch' )