Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2012-05-04 15:04:54 -04:00
parent 7e9d1a3308
commit d98d23d483
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
python_apps/media-monitor/airtimefilemonitor/airtimenotifier.py
View file

@ -150,7 +150,6 @@ class AirtimeNotifier(Notifier):
file_md = None file_md = None
data = None data = None
if (os.path.exists(filepath) and (mode == self.config.MODE_CREATE)): if (os.path.exists(filepath) and (mode == self.config.MODE_CREATE)):
if file_md is None: if file_md is None:
mutagen = self.md_manager.get_md_from_file(filepath) mutagen = self.md_manager.get_md_from_file(filepath)

6
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View file

@ -134,7 +134,7 @@ class AirtimeProcessEvent(ProcessEvent):
#file is being overwritten/replaced in GUI. #file is being overwritten/replaced in GUI.
elif "goutputstream" in pathname: elif "goutputstream" in pathname:
self.temp_files[pathname] = None self.temp_files[pathname] = None
elif self.mmc.is_audio_file(pathname): elif self.mmc.is_audio_file(pathname) and self.mmc.is_readable(pathname, False):
if self.mmc.is_parent_directory(pathname, self.config.organize_directory): if self.mmc.is_parent_directory(pathname, self.config.organize_directory):
#file was created in /srv/airtime/stor/organize. Need to process and move #file was created in /srv/airtime/stor/organize. Need to process and move
#to /srv/airtime/stor/imported #to /srv/airtime/stor/imported
@ -173,7 +173,7 @@ class AirtimeProcessEvent(ProcessEvent):
# update timestamp on create_dict for the entry with pathname as the key # update timestamp on create_dict for the entry with pathname as the key
if pathname in self.create_dict: if pathname in self.create_dict:
self.create_dict[pathname] = time.time() self.create_dict[pathname] = time.time()
if not dir and not self.mmc.is_parent_directory(pathname, self.config.organize_directory): if not dir and not self.mmc.is_parent_directory(pathname, self.config.organize_directory) and self.mmc.is_readable(pathname, False):
self.logger.info("Modified: %s", pathname) self.logger.info("Modified: %s", pathname)
if self.mmc.is_audio_file(name): if self.mmc.is_audio_file(name):
self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY}) self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_MODIFY})
@ -239,7 +239,7 @@ class AirtimeProcessEvent(ProcessEvent):
#if stuff dropped in stor via a UI move must change file permissions. #if stuff dropped in stor via a UI move must change file permissions.
self.mmc.is_readable(event.pathname, event.dir) self.mmc.is_readable(event.pathname, event.dir)
if not event.dir: if not event.dir:
if self.mmc.is_audio_file(event.name): if self.mmc.is_audio_file(event.name) and self.mmc.is_readable(full_filepath, False):
if event.cookie in self.temp_files: if event.cookie in self.temp_files:
self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MODIFY}) self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MODIFY})
del self.temp_files[event.cookie] del self.temp_files[event.cookie]