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

CC-2497: Media Monitor: doesn't detect some file change 

-properly handle changing file extensions in the stor dir.
This commit is contained in:
martin 2011-07-05 19:04:27 -04:00
parent a44a7d71f2
commit 7a4fce1167
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
View File

@ -276,7 +276,8 @@ class AirtimeProcessEvent(ProcessEvent):
def process_IN_MOVED_FROM(self, event): def process_IN_MOVED_FROM(self, event):
self.logger.info("process_IN_MOVED_FROM: %s", event) self.logger.info("process_IN_MOVED_FROM: %s", event)
if not event.dir: if not event.dir:
self.cookies_IN_MOVED_FROM[event.cookie] = (event, time.time()) if self.is_audio_file(event.name):
self.cookies_IN_MOVED_FROM[event.cookie] = (event, time.time())
""" """
if "goutputstream" in event.pathname: if "goutputstream" in event.pathname:
@ -295,19 +296,20 @@ 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.set_needed_file_permissions(event.pathname, event.dir) self.set_needed_file_permissions(event.pathname, event.dir)
if not event.dir: if not event.dir:
if event.cookie in self.cookies_IN_MOVED_FROM: if self.is_audio_file(event.name):
#files original location was also in a watched directory if event.cookie in self.cookies_IN_MOVED_FROM:
del self.cookies_IN_MOVED_FROM[event.cookie] #files original location was also in a watched directory
if self.is_parent_directory(event.pathname, self.config.organize_directory): del self.cookies_IN_MOVED_FROM[event.cookie]
self.organize_new_file(event.pathname) if self.is_parent_directory(event.pathname, self.config.organize_directory):
self.organize_new_file(event.pathname)
else:
self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MOVED})
else: else:
self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MOVED}) if self.is_parent_directory(event.pathname, self.config.organize_directory):
else: self.organize_new_file(event.pathname)
if self.is_parent_directory(event.pathname, self.config.organize_directory): else:
self.organize_new_file(event.pathname) #show dragged from unwatched folder into a watched folder. Do not "organize".
else: self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': event.pathname, 'is_recorded_show': False})
#show dragged from unwatched folder into a watched folder. Do not "organize".
self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': event.pathname, 'is_recorded_show': False})
def process_IN_DELETE(self, event): def process_IN_DELETE(self, event):
self.logger.info("process_IN_DELETE: %s", event) self.logger.info("process_IN_DELETE: %s", event)
@ -315,7 +317,7 @@ class AirtimeProcessEvent(ProcessEvent):
def handle_removed_file(self, pathname): def handle_removed_file(self, pathname):
self.logger.info("Deleting %s", pathname) self.logger.info("Deleting %s", pathname)
if not self.is_parent_directory(event.pathname, self.config.organize_directory): if not self.is_parent_directory(pathname, self.config.organize_directory):
#we don't care if a file was deleted from the organize directory. #we don't care if a file was deleted from the organize directory.
self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_DELETE}) self.file_events.append({'filepath': pathname, 'mode': self.config.MODE_DELETE})