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

-fixed bug with moving from stor to stor/organize, and having

Browse source 
duplicate files appear.
This commit is contained in:
martin 2011-07-12 16:10:54 -04:00
parent 7c98d90e5e
commit 6972150b19
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -293,7 +293,10 @@ class AirtimeProcessEvent(ProcessEvent):
self.logger.debug(u"Moving from %s to %s", pathname, filepath) self.logger.debug(u"Moving from %s to %s", pathname, filepath)
self.move_file(pathname, filepath) self.move_file(pathname, filepath)
else: else:
self.logger.warn("File %s, has invalid metadata", pathname) filepath = None
self.logger.warn("File %s, has invalid metadata", pathname)
return filepath
def process_IN_MODIFY(self, event): def process_IN_MODIFY(self, event):
self.logger.info("process_IN_MODIFY: %s", event) self.logger.info("process_IN_MODIFY: %s", event)
@ -332,9 +335,12 @@ class AirtimeProcessEvent(ProcessEvent):
#files original location was also in a watched directory #files original location was also in a watched directory
del self.cookies_IN_MOVED_FROM[event.cookie] del self.cookies_IN_MOVED_FROM[event.cookie]
if self.is_parent_directory(event.pathname, self.config.organize_directory): if self.is_parent_directory(event.pathname, self.config.organize_directory):
self.organize_new_file(event.pathname) filepath = self.organize_new_file(event.pathname)
else: else:
self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MOVED}) filepath = event.pathname
if (filepath is not None):
self.file_events.append({'filepath': filepath, 'mode': self.config.MODE_MOVED})
else: else:
if self.is_parent_directory(event.pathname, self.config.organize_directory): if self.is_parent_directory(event.pathname, self.config.organize_directory):
self.organize_new_file(event.pathname) self.organize_new_file(event.pathname)