From 5f1b2d23bf131e0d25c92f9fca021a2d9a10f1dc Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Thu, 5 Jul 2012 12:35:40 -0400 Subject: [PATCH] fixed code duplication and replaced manual path concatenation with os.path.join --- .../airtimefilemonitor/airtimenotifier.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py index 274dc26d0..312bad10d 100644 --- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py +++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py @@ -101,16 +101,12 @@ class AirtimeNotifier(Notifier): self.bootstrap.sync_database_to_filesystem(new_storage_directory_id, new_storage_directory) self.config.storage_directory = os.path.normpath(new_storage_directory) - self.config.imported_directory = os.path.normpath(new_storage_directory + '/imported') - self.config.organize_directory = os.path.normpath(new_storage_directory + '/organize') + self.config.imported_directory = os.path.normpath(os.path.join(new_storage_directory, '/imported')) + self.config.organize_directory = os.path.normpath(os.path.join(new_storage_directory, '/organize')) - self.mmc.ensure_is_dir(self.config.storage_directory) - self.mmc.ensure_is_dir(self.config.imported_directory) - self.mmc.ensure_is_dir(self.config.organize_directory) - - self.mmc.is_readable(self.config.storage_directory, True) - self.mmc.is_readable(self.config.imported_directory, True) - self.mmc.is_readable(self.config.organize_directory, True) + for directory in [self.config.storage_directory, self.config.imported_directory, self.config.organize_directory]: + self.mmc.ensure_is_dir(directory) + self.mmc.is_readable(directory, True) self.watch_directory(new_storage_directory) elif m['event_type'] == "file_delete":