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

cc-4105: fixed a bunch of bugs in test_manager

Browse source
This commit is contained in:
Rudi Grinberg 2012-07-25 11:17:04 -04:00
parent 53b9f29f7b
commit 4950f13cf2
4 changed files with 77 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,34 +11,44 @@ class Manager(Loggable):
WatchManager from pyinotify
"""
all_signals = set(['add_watch', 'remove_watch'])
# TODO : get rid of config object being passed? It's not actually being
# used
def __init__(self,config):
def __init__(self):
self.wm = pyinotify.WatchManager()
# These two instance variables are assumed to be constant
self.watch_channel = 'watch'
self.organize_channel = 'organize'
self.watch_listener = StoreWatchListener(self.watch_channel)
self.watch_listener = StoreWatchListener(signal=self.watch_channel)
self.organize = {
'organize_path' : None,
'store_path' : None,
# This guy doesn't need to be changed, always the same.
# Gets hooked by wm to different directories
'organize_listener' : OrganizeListener(self.organize_channel),
'organize_listener' : OrganizeListener(signal=self.organize_channel),
# Also stays the same as long as its target, the directory
# which the "organized" files go to, isn't changed.
'organizer' : None,
}
# A private mapping path => watch_descriptor
# we use the same dictionary for organize, watch, store wd events.
# this is a little hacky because we are unable to have multiple wd's
# on the same path.
self.__wd_path = {}
self.watched_directories = set([])
def __remove_watch(self,path):
old_watch = self.wm.get_wd(path)
if old_watch: # only delete if dir is actually being watched
self.rm_watch(old_watch, rec=True)
if path in self.__wd_path: # only delete if dir is actually being watched
wd = self.__wd_path[path]
self.wm.rm_watch(wd, rec=True)
del(self.__wd_path[path])
def __add_watch(self,path,wd):
self.__wd_path[path] = wd.values()[0]
def __create_organizer(self, target_path):
return Organizer(channel=self.organize_channel,target_path=target_path)
def get_organize_path(self):
return self.organize['organize_path']
def set_organize_path(self, new_path):
# if we are already organizing a particular directory we remove the
# watch from it first before organizing another directory
@ -47,8 +57,14 @@ class Manager(Loggable):
# the OrganizeListener instance will walk path and dispatch an organize
# event for every file in that directory
self.organize['organize_listener'].flush_events(new_path)
self.wm.add_watch(new_path, pyinotify.ALL_EVENTS, rec=True, auto_add=True,
wd = self.wm.add_watch(new_path, pyinotify.ALL_EVENTS, rec=True, auto_add=True,
proc_fun=self.organize['organize_listener'])
self.__add_watch(new_path, wd)
organize_path = property(get_organize_path, set_organize_path)
def get_store_path(self):
return self.organize['store_path']
def set_store_path(self,new_path):
"""set the directory where organized files go to"""
@ -60,8 +76,14 @@ class Manager(Loggable):
# 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.wm.add_watch(new_path, pyinotify.ALL_EVENTS, rec=True, auto_add=True,
wd = self.wm.add_watch(new_path, pyinotify.ALL_EVENTS, rec=True, auto_add=True,
proc_fun=self.watch_listener)
self.__add_watch(new_path, wd)
store_path = property(get_store_path, set_store_path)
def has_watch(self, path):
return path in self.__wd_path
def add_watch_directory(self, new_dir):
if new_dir in self.watched_directories:
@ -69,9 +91,9 @@ class Manager(Loggable):
already being watched" % new_dir)
else:
self.logger.info("Adding watched directory: '%s'" % new_dir)
self.watched_directories.add(new_dir)
self.wm.add_watch(new_dir, pyinotify.ALL_EVENTS, rec=True, auto_add=True,
wd = self.wm.add_watch(new_dir, pyinotify.ALL_EVENTS, rec=True, auto_add=True,
proc_fun=self.watch_listener)
self.__add_watch(new_dir, wd)
def remove_watch_directory(self, watch_dir):
if watch_dir in self.watched_directories: