From 53b9f29f7be50f4664375501d3a35ba517e1e74a Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Tue, 24 Jul 2012 17:26:48 -0400
Subject: [PATCH] cc-4105: renamed file

---
 .../media/monitor/{mm_manager.py => manager.py}            | 7 +++----
 python_apps/media-monitor2/mm2.py                          | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename python_apps/media-monitor2/media/monitor/{mm_manager.py => manager.py} (98%)

diff --git a/python_apps/media-monitor2/media/monitor/mm_manager.py b/python_apps/media-monitor2/media/monitor/manager.py
similarity index 98%
rename from python_apps/media-monitor2/media/monitor/mm_manager.py
rename to python_apps/media-monitor2/media/monitor/manager.py
index b50702cfd..bc16f84f5 100644
--- a/python_apps/media-monitor2/media/monitor/mm_manager.py
+++ b/python_apps/media-monitor2/media/monitor/manager.py
@@ -14,14 +14,11 @@ class Manager(Loggable):
     # TODO : get rid of config object being passed? It's not actually being
     # used
     def __init__(self,config):
-
         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.organize = {
             'organize_path' : None,
             'store_path' : None,
@@ -32,7 +29,6 @@ class Manager(Loggable):
             # which the "organized" files go to, isn't changed.
             'organizer' : None,
         }
-
         self.watched_directories = set([])
 
     def __remove_watch(self,path):
@@ -87,4 +83,7 @@ class Manager(Loggable):
                     % watch_dir)
 
     def loop(self):
+        """
+        block until we receive pyinotify events
+        """
         pyinotify.Notifier(self.wm).loop()
diff --git a/python_apps/media-monitor2/mm2.py b/python_apps/media-monitor2/mm2.py
index 0a4d76296..7eef83cb0 100644
--- a/python_apps/media-monitor2/mm2.py
+++ b/python_apps/media-monitor2/mm2.py
@@ -31,6 +31,8 @@ from api_clients import api_client as apc
 # 9. Start the toucher thread that updates the last modified time of the index
 #    file as the program is running
 
+# Rewrite to use manager.Manager
+
 log = get_logger()
 global_config = u'/path/to/global/config'
 # MMConfig is a proxy around ConfigObj instances. it does not allow itself