From bbe56bcdc3f12e8b08161e47e5724ca4a52b60fc Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Mon, 23 Jul 2012 17:16:51 -0400 Subject: [PATCH] cc-4105: add last_ran method for config object. added more comments --- python_apps/media-monitor2/media/monitor/config.py | 4 ++++ python_apps/media-monitor2/mm2.py | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/python_apps/media-monitor2/media/monitor/config.py b/python_apps/media-monitor2/media/monitor/config.py index d88c8fe73..17f1ff152 100644 --- a/python_apps/media-monitor2/media/monitor/config.py +++ b/python_apps/media-monitor2/media/monitor/config.py @@ -4,6 +4,7 @@ import copy from configobj import ConfigObj from media.monitor.exceptions import NoConfigFile, ConfigAccessViolation +import media.monitor.pure as mmp class MMConfig(object): def __init__(self, path): @@ -27,6 +28,9 @@ class MMConfig(object): def save(self): self.cfg.write() + def last_ran(self): + return mmp.last_modified(self.cfg['index_path']) + # Remove this after debugging... def haxxor_set(self, key, value): self.cfg[key] = value def haxxor_get(self, key): return self.cfg[key] diff --git a/python_apps/media-monitor2/mm2.py b/python_apps/media-monitor2/mm2.py index 2785605ae..91b0def70 100644 --- a/python_apps/media-monitor2/mm2.py +++ b/python_apps/media-monitor2/mm2.py @@ -92,8 +92,11 @@ problem_files = ProblemFileHandler(channel=channels['badfile']) # A slight incosistency here, channels['watch'] is already a list while the # other items are single elements. For consistency we should make all the # values in channels lists later on -# like now -bs = Bootstrapper(db=sdb, last_ran=mmp.last_modified(config['index_path']), org_channels=[channels['org']], watch_channels=channels['watch']) +# we try to not share the config object as much as possible and in this case we +# prefer to only pass the necessary last_ran parameter instead of the whole +# object. although this might change in the future if Bootstrapper becomes more +# complicated +bs = Bootstrapper(db=sdb, last_ran=config.last_ran(), org_channels=[channels['org']], watch_channels=channels['watch']) bs.flush_organize() bs.flush_watch()