Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Put duplicate code into mediamonitorcommon. Removed unnecessary blank lines

This commit is contained in:
Rudi Grinberg 2012-07-05 15:06:45 -04:00
parent 6c1af8a96e
commit 1916ea8b0e
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
View File

@ -77,10 +77,8 @@ class AirtimeMediaMonitorBootstrap():
dir -- pathname of the directory dir -- pathname of the directory
""" """
def sync_database_to_filesystem(self, dir_id, dir): def sync_database_to_filesystem(self, dir_id, dir):
# TODO: is this line even necessary?
dir = os.path.normpath(dir)+"/" dir = os.path.normpath(dir)+"/"
""" """
set to hold new and/or modified files. We use a set to make it ok if files are added set to hold new and/or modified files. We use a set to make it ok if files are added
twice. This is because some of the tests for new files return result sets that are not twice. This is because some of the tests for new files return result sets that are not
@ -94,17 +92,16 @@ class AirtimeMediaMonitorBootstrap():
for file in files['files']: for file in files['files']:
db_known_files_set.add(file) db_known_files_set.add(file)
all_files = self.mmc.scan_dir_for_new_files(dir) all_files = self.mmc.clean_dirty_file_paths( self.mmc.scan_dir_for_new_files(dir) )
all_files_set = set() all_files_set = set()
for file_path in all_files: for file_path in all_files:
file_path = file_path.strip(" \n") if self.config.problem_directory not in file_path:
if len(file_path) > 0 and self.config.problem_directory not in file_path:
all_files_set.add(file_path[len(dir):]) all_files_set.add(file_path[len(dir):])
# if dir doesn't exists, update db # if dir doesn't exists, update db
if not os.path.exists(dir): if not os.path.exists(dir):
self.pe.handle_watched_dir_missing(dir) self.pe.handle_stdout_files(dir)
if os.path.exists(self.mmc.timestamp_file): if os.path.exists(self.mmc.timestamp_file):
"""find files that have been modified since the last time media-monitor process started.""" """find files that have been modified since the last time media-monitor process started."""
@ -120,12 +117,11 @@ class AirtimeMediaMonitorBootstrap():
self.logger.error("Unrecoverable error when syncing db to filesystem.") self.logger.error("Unrecoverable error when syncing db to filesystem.")
return return
new_files = stdout.splitlines() new_files = self.mmc.clean_dirty_file_paths(stdout.splitlines())
new_and_modified_files = set() new_and_modified_files = set()
for file_path in new_files: for file_path in new_files:
file_path = file_path.strip(" \n") if self.config.problem_directory not in file_path:
if len(file_path) > 0 and self.config.problem_directory not in file_path:
new_and_modified_files.add(file_path[len(dir):]) new_and_modified_files.add(file_path[len(dir):])
""" """

4
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
View File

@ -25,6 +25,10 @@ class MediaMonitorCommon:
self.wm = wm self.wm = wm
def clean_dirty_file_paths(self, dirty_files):
""" clean dirty file paths by removing blanks and removing trailing/leading whitespace"""
return filter(lambda e: len(e) > 0, [ f.strip(" \n") for f in dirty_files ])
def find_command(self, directory, extra_arguments=""): def find_command(self, directory, extra_arguments=""):
""" Builds a find command that respects supported_file_formats list """ Builds a find command that respects supported_file_formats list
Note: Use single quotes to quote arguments """ Note: Use single quotes to quote arguments """