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

CC-2272: Ability to change storage directory location

Browse source 
make sure imported and organize dirs are created
This commit is contained in:
martin 2011-07-06 15:58:49 -04:00
parent 6b9066466b
commit 75e9ecf985
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
View file

@ -101,6 +101,10 @@ class AirtimeNotifier(Notifier):
self.config.imported_directory = new_storage_directory + '/imported' self.config.imported_directory = new_storage_directory + '/imported'
self.config.organize_directory = new_storage_directory + '/organize' self.config.organize_directory = new_storage_directory + '/organize'
mm.ensure_is_dir(self.config.storage_directory)
mm.ensure_is_dir(self.config.imported_directory)
mm.ensure_is_dir(self.config.organize_directory)
mm.watch_directory(new_storage_directory) mm.watch_directory(new_storage_directory)
""" """

6
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View file

@ -106,9 +106,7 @@ class AirtimeProcessEvent(ProcessEvent):
#checks if path is a directory, and if it doesnt exist, then creates it. #checks if path is a directory, and if it doesnt exist, then creates it.
#Otherwise prints error to log file. #Otherwise prints error to log file.
def ensure_is_dir(self, filepath): def ensure_is_dir(self, directory):
directory = os.path.dirname(filepath)
try: try:
omask = os.umask(0) omask = os.umask(0)
if not os.path.exists(directory): if not os.path.exists(directory):
@ -213,7 +211,7 @@ class AirtimeProcessEvent(ProcessEvent):
filepath = self.create_unique_filename(filepath, original_path) filepath = self.create_unique_filename(filepath, original_path)
self.logger.info('Unique filepath: %s', filepath) self.logger.info('Unique filepath: %s', filepath)
self.ensure_is_dir(filepath) self.ensure_is_dir(os.path.dirname(filepath))
except Exception, e: except Exception, e:
self.logger.error('Exception: %s', e) self.logger.error('Exception: %s', e)