Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cc-4105: reformatted bootstrap.py to fit standards

This commit is contained in:
Rudi Grinberg 2012-08-09 11:37:46 -04:00
parent 78a15916c2
commit 3c82497c34
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
python_apps/media-monitor2/media/monitor/bootstrap.py
View File

@ -6,8 +6,8 @@ import media.monitor.pure as mmp
class Bootstrapper(Loggable): class Bootstrapper(Loggable):
""" """
Bootstrapper reads all the info in the filesystem flushes organize Bootstrapper reads all the info in the filesystem flushes organize events
events and watch events and watch events
""" """
def __init__(self,db,watch_signal): def __init__(self,db,watch_signal):
""" """
@ -20,16 +20,16 @@ class Bootstrapper(Loggable):
def flush_all(self, last_ran): def flush_all(self, last_ran):
""" """
bootstrap every single watched directory. only useful at startup bootstrap every single watched directory. only useful at startup note
note that because of the way list_directories works we also flush that because of the way list_directories works we also flush the import
the import directory as well I think directory as well I think
""" """
for d in self.db.list_storable_paths(): self.flush_watch(d, last_ran) for d in self.db.list_storable_paths(): self.flush_watch(d, last_ran)
def flush_watch(self, directory, last_ran): def flush_watch(self, directory, last_ran):
""" """
flush a single watch/imported directory. useful when wanting to to rescan, flush a single watch/imported directory. useful when wanting to to
or add a watched/imported directory rescan, or add a watched/imported directory
""" """
songs = set([]) songs = set([])
added = modded = deleted = 0 added = modded = deleted = 0
@ -43,18 +43,24 @@ class Bootstrapper(Loggable):
# with the filesystem # with the filesystem
if os.path.getmtime(f) > last_ran: if os.path.getmtime(f) > last_ran:
modded += 1 modded += 1
dispatcher.send(signal=self.watch_signal, sender=self, event=DeleteFile(f)) dispatcher.send(signal=self.watch_signal, sender=self,
dispatcher.send(signal=self.watch_signal, sender=self, event=NewFile(f)) event=DeleteFile(f))
db_songs = set(( song for song in self.db.directory_get_files(directory) if mmp.sub_path(directory,song) )) dispatcher.send(signal=self.watch_signal, sender=self,
event=NewFile(f))
db_songs = set(( song for song in self.db.directory_get_files(directory)
if mmp.sub_path(directory,song) ))
# Get all the files that are in the database but in the file # Get all the files that are in the database but in the file
# system. These are the files marked for deletions # system. These are the files marked for deletions
for to_delete in db_songs.difference(songs): for to_delete in db_songs.difference(songs):
dispatcher.send(signal=self.watch_signal, sender=self, event=DeleteFile(to_delete)) dispatcher.send(signal=self.watch_signal, sender=self,
event=DeleteFile(to_delete))
deleted += 1 deleted += 1
for to_add in songs.difference(db_songs): for to_add in songs.difference(db_songs):
dispatcher.send(signal=self.watch_signal, sender=self, event=NewFile(to_add)) dispatcher.send(signal=self.watch_signal, sender=self,
event=NewFile(to_add))
added += 1 added += 1
self.logger.info( "Flushed watch directory (%s). (added, modified, deleted) = (%d, %d, %d)" self.logger.info( "Flushed watch directory (%s). \
% (directory, added, modded, deleted) ) (added, modified, deleted) = (%d, %d, %d)"
% (directory, added, modded, deleted) )

2
python_apps/media-monitor2/media/monitor/watchersyncer.py
View File

@ -184,6 +184,8 @@ class WatchSyncer(ReportHandler,Loggable):
self.__requests.append(launch_request) self.__requests.append(launch_request)
self.__queue = [] self.__queue = []
def __del__(self): def __del__(self):
# Ideally we would like to do a little more to ensure safe shutdown # Ideally we would like to do a little more to ensure safe shutdown
if self.events_in_queue(): if self.events_in_queue():