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

CC-3749: Media Monitor should not load files pypo cannot read 

-fixed
This commit is contained in:
Martin Konecny 2012-05-04 13:45:43 -04:00
parent d6a12053eb
commit e13d06df45
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,10 +194,6 @@ class AirtimeNotifier(Notifier):
self.mmc.is_readable(directory, True) self.mmc.is_readable(directory, True)
for (path, dirs, files) in os.walk(directory): for (path, dirs, files) in os.walk(directory):
for d in dirs:
self.mmc.is_readable(os.path.join(path, d), True)
for filename in files: for filename in files:
full_filepath = os.path.join(path, filename) full_filepath = os.path.join(path, filename)

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

@ -78,17 +78,11 @@ class MediaMonitorCommon:
# the function only changes the permission if its not readable by www-data # the function only changes the permission if its not readable by www-data
def is_readable(self, item, is_dir): def is_readable(self, item, is_dir):
try: try:
if not self.is_user_readable(item, 'www-data', 'www-data') \ return self.is_user_readable(item, 'www-data', 'www-data') \
or not self.is_user_readable(item, 'pypo', 'pypo'): and not self.is_user_readable(item, 'pypo', 'pypo'):
self.logger.warn("%s has incorrect permissions for reading. Skipping import.", item)
return False
except Exception, e: except Exception, e:
self.logger.warn("Failed to change owner/group/permissions for %s", item) self.logger.warn("Failed to check owner/group/permissions for %s", item)
return False return False
finally:
return True
#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.