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

cc-4105: added support for multiple watched directories

This commit is contained in:
Rudi Grinberg 2012-07-23 10:15:28 -04:00
parent b634bc3525
commit c5bc6a85d2
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,6 @@ class Bootstrapper(Loggable):
deleted += 1 deleted += 1
else: else:
self.logger.error("Could not find the signal corresponding to path: '%s'" % watch_dir) self.logger.error("Could not find the signal corresponding to path: '%s'" % watch_dir)
self.logger.info( "Flushed watch directories. (modified, deleted) = (%d, %d)" self.logger.info( "Flushed watch directories. (modified, deleted) = (%d, %d)"
% (modded, deleted) ) % (modded, deleted) )

9
python_apps/media-monitor2/mm2.py
View File

@ -28,7 +28,7 @@ log = get_logger()
apiclient = apc.AirtimeApiClient(log) apiclient = apc.AirtimeApiClient(log)
# We initialize sdb before anything because we must know what our watched # We initialize sdb before anything because we must know what our watched
# directories are. # directories are.
sdb = SyncDB(apc) sdb = SyncDB(apiclient)
for watch_dir in sdb.list_directories(): for watch_dir in sdb.list_directories():
if not os.path.exists(watch_dir): if not os.path.exists(watch_dir):
# Create the watch_directory here # Create the watch_directory here
@ -40,12 +40,10 @@ for watch_dir in sdb.list_directories():
if os.path.exists(watch_dir): if os.path.exists(watch_dir):
channels['watch'].append(PathChannel('watch', watch_dir)) channels['watch'].append(PathChannel('watch', watch_dir))
org = Organizer(channel=channels['org'],target_path=channels['watch'].path) org = Organizer(channel=channels['org'],target_path=channels['watch'][0].path)
watches = [ WatchSyncer(channel=pc) for pc in channels['watch'] ] watches = [ WatchSyncer(channel=pc) for pc in channels['watch'] ]
problem_files = ProblemFileHandler(channel=channels['badfile']) problem_files = ProblemFileHandler(channel=channels['badfile'])
raw_bootstrap = apiclient.get_bootstrap_info()
print(raw_bootstrap)
# A slight incosistency here, channels['watch'] is already a list while the # A slight incosistency here, channels['watch'] is already a list while the
# other items are single elements. For consistency we should make all the # other items are single elements. For consistency we should make all the
# values in channels lists later on # values in channels lists later on
@ -68,7 +66,8 @@ wm = pyinotify.WatchManager()
# Listeners don't care about which directory they're related to. All they care # Listeners don't care about which directory they're related to. All they care
# about is which signal they should respond to # about is which signal they should respond to
o1 = OrganizeListener(signal=channels['org'].signal) o1 = OrganizeListener(signal=channels['org'].signal)
o2 = StoreWatchListener(signal=channels['watch'].signal) # We are assuming that the signals are the same for each watched directory here
o2 = StoreWatchListener(signal=channels['watch'][0].signal)
notifier = pyinotify.Notifier(wm) notifier = pyinotify.Notifier(wm)
wdd1 = wm.add_watch(channels['org'].path, pyinotify.ALL_EVENTS, rec=True, auto_add=True, proc_fun=o1) wdd1 = wm.add_watch(channels['org'].path, pyinotify.ALL_EVENTS, rec=True, auto_add=True, proc_fun=o1)