From e13d06df4553d0d698d8abf25ad918dd86b3c02b Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Fri, 4 May 2012 13:45:43 -0400
Subject: [PATCH] CC-3749: Media Monitor should not load files pypo cannot read
-fixed
---
.../airtimefilemonitor/airtimenotifier.py | 4 ----
.../airtimefilemonitor/mediamonitorcommon.py | 12 +++---------
2 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
index cbb404712..c6dac73c5 100644
--- a/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
+++ b/python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
@@ -194,10 +194,6 @@ class AirtimeNotifier(Notifier):
self.mmc.is_readable(directory, True)
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:
full_filepath = os.path.join(path, filename)
diff --git a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
index b6ed45a80..8e68b88bf 100644
--- a/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
+++ b/python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
@@ -78,17 +78,11 @@ class MediaMonitorCommon:
# the function only changes the permission if its not readable by www-data
def is_readable(self, item, is_dir):
try:
- if not self.is_user_readable(item, 'www-data', 'www-data') \
- or not self.is_user_readable(item, 'pypo', 'pypo'):
-
- self.logger.warn("%s has incorrect permissions for reading. Skipping import.", item)
- return False
+ return self.is_user_readable(item, 'www-data', 'www-data') \
+ and not self.is_user_readable(item, 'pypo', 'pypo'):
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
- finally:
- return True
-
#checks if path is a directory, and if it doesnt exist, then creates it.
#Otherwise prints error to log file.