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

cc-4105: fixed some bugs. fixed manager tests

Browse source
This commit is contained in:
Rudi Grinberg 2012-08-01 17:46:47 -04:00
parent ba78731f99
commit f7b48a4dbb
9 changed files with 37 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

8
python_apps/media-monitor2/media/monitor/manager.py
View file

@ -45,7 +45,7 @@ class Manager(Loggable):
Manager.global_inst = self
def watch_signal(self):
return self.watch_listener.self.signal
return self.watch_listener.signal
def __remove_watch(self,path):
if path in self.__wd_path: # only delete if dir is actually being watched
@ -111,11 +111,6 @@ class Manager(Loggable):
self.__remove_watch(self.organize['imported_path'])
self.organize['imported_path'] = new_path
self.organize['organizer'] = self.__create_organizer(new_path)
# flush all the files in the new store_directory. this is done so that
# new files are added to the database. Note that we are not responsible
# for removing songs in the old store directory from the database
# we assume that this is already done for us.
# self.watch_listener.flush_events(new_path)
self.__add_watch(new_path, self.watch_listener)
def change_storage_root(self, store):
@ -165,7 +160,6 @@ class Manager(Loggable):
def pyinotify(self):
return pyinotify.Notifier(self.wm)
def loop(self):
"""
block until we receive pyinotify events