CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions.

-fixed

python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py

@@ -152,11 +152,9 @@ class AirtimeProcessEvent(ProcessEvent):
                             self.logger.error("traceback: %s", traceback.format_exc())
                     else:
                         #ensure file is world readable (Liquidsoap and Web UI preview)
-                        if self.mmc.make_readable(pathname):
                         is_recorded = self.mmc.is_parent_directory(pathname, self.config.recorded_directory)
                         self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': pathname, 'is_recorded_show': is_recorded})
-                        else:
-                            self.logger.warn("Couldn't add %s because failed to change file permissions", pathname)
+
 
     def process_IN_MODIFY(self, event):
         # if IN_MODIFY is followed by IN_CREATE, it's not true modify event
@@ -173,7 +171,7 @@ class AirtimeProcessEvent(ProcessEvent):
             self.create_dict[pathname] = time.time()
         if not dir and not self.mmc.is_parent_directory(pathname, self.config.organize_directory):
             self.logger.info("Modified: %s", pathname)
-            if self.mmc.is_audio_file(name) and self.mmc.make_readable(pathname):
+            if self.mmc.is_audio_file(name):
                 self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY})
     
     # if change is detected on /etc/mtab, we check what mount(file system) was added/removed
@@ -237,7 +235,6 @@ class AirtimeProcessEvent(ProcessEvent):
 
         if not event.dir:
             if self.mmc.is_audio_file(event.name):
-                if self.mmc.make_readable(event.pathname):
                 if event.cookie in self.temp_files:
                     self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MODIFY})
                     del self.temp_files[event.cookie]

python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py

@@ -104,9 +104,8 @@ class MediaMonitorCommon:
         original_file = pathname
         is_dir = False
         try:
-            while not is_readable(original_file, is_dir):
+            while not self.is_readable(original_file, is_dir):
                 #Not readable. Make appropriate permission changes.
-                
                 self.make_file_readable(pathname, is_dir)
 
                 dirname = os.path.dirname(pathname)
@@ -315,6 +314,9 @@ class MediaMonitorCommon:
 
             self.logger.debug("Moving from %s to %s", pathname, filepath)
             self.move_file(pathname, filepath)
+            if not self.mmc.make_readable(filepath):
+                self.logger.warn("Couldn't make filepath %s readable", pathname)
+                filepath = None
         else:
             filepath = None
             self.logger.warn("File %s, has invalid metadata", pathname)