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

cc-2419: media monitor import on startup 

-fixed bug related due to pair not being returned (only scalar value returned)
This commit is contained in:
martin 2011-07-04 18:38:16 -04:00
parent 42a324f659
commit 0757fda479
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python_apps/media-monitor/MediaMonitor.py
View File

@ -75,5 +75,4 @@ except KeyboardInterrupt:
notifier.stop() notifier.stop()
logger.info("Keyboard Interrupt") logger.info("Keyboard Interrupt")
except Exception, e: except Exception, e:
#notifier.stop()
logger.error('Exception: %s', e) logger.error('Exception: %s', e)

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

@ -289,14 +289,13 @@ class AirtimeProcessEvent(ProcessEvent):
self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MOVED}) self.file_events.append({'filepath': event.pathname, 'mode': self.config.MODE_MOVED})
elif hasattr(event, 'src_pathname') and event.src_pathname in self.renamed_files: elif hasattr(event, 'src_pathname') and event.src_pathname in self.renamed_files:
del self.renamed_files[event.src_pathname] del self.renamed_files[event.src_pathname]
#self.logger.info("removing renamed path %s", event.src_pathname)
else: else:
# show dragged from unwatched folder into a watched folder. # show dragged from unwatched folder into a watched folder.
storage_directory = self.config.storage_directory storage_directory = self.config.storage_directory
if self.is_parent_directory(event.pathname, storage_directory): if self.is_parent_directory(event.pathname, storage_directory):
file_md = self.md_manager.get_md_from_file(event.pathname) file_md = self.md_manager.get_md_from_file(event.pathname)
if file_md is not None: if file_md is not None:
filepath, is_recorded_show = self.create_file_path(event.pathname, file_md) filepath = self.create_file_path(event.pathname, file_md)
self.move_file(event.pathname, filepath) self.move_file(event.pathname, filepath)
self.renamed_files[event.pathname] = filepath self.renamed_files[event.pathname] = filepath
self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': filepath, 'data': file_md, 'is_recorded_show': False}) self.file_events.append({'mode': self.config.MODE_CREATE, 'filepath': filepath, 'data': file_md, 'is_recorded_show': False})
@ -324,14 +323,6 @@ class AirtimeProcessEvent(ProcessEvent):
self.logger.warn("command \n%s\n return with a non-zero return value", command) self.logger.warn("command \n%s\n return with a non-zero return value", command)
return stdout return stdout
def write_index_file(self):
#create a new index file.
self.logger.debug("writing new index file")
command = "find %s -type f -iname '*.ogg' -o -iname '*.mp3' -readable" % '/srv/airtime/stor'
stdout = self.execCommandAndReturnStdOut(command)
self.write_file('/var/tmp/airtime' + '/.airtime_media_index', stdout)
return stdout
def write_file(self, file, string): def write_file(self, file, string):
f = open(file, 'w') f = open(file, 'w')
f.write(string) f.write(string)
@ -345,9 +336,6 @@ class AirtimeProcessEvent(ProcessEvent):
self.file_events = [] self.file_events = []
#no file_events and queue is empty. This is a good time
#to write an index file.
self.write_index_file()
#check for any events recieved from Airtime. #check for any events recieved from Airtime.
try: try: