cc-4105: rename watched subdirs barely works

python_apps/media-monitor2/media/monitor/events.py

@@ -2,8 +2,10 @@
 import os
 import abc
 from media.monitor.pure import LazyProperty
+import media.monitor.pure as mmp
 from media.monitor.metadata import Metadata
 from media.monitor.log import Loggable
+from media.monitor.exceptions import BadSongFile
 
 class PathChannel(object):
     """a dumb struct; python has no record types"""
@@ -56,13 +58,26 @@ class BaseEvent(Loggable):
     def __str__(self):
         return "Event. Path: %s" % self.__raw_event.pathname
 
+    def is_dir_event(self):
+        return self._raw_event.dir
+
     # nothing to see here, please move along
     def morph_into(self, evt):
+        """
+        'Morphing' should preserve the self.cookie invariant. I.e. either
+        None -> None or int -> int
+        """
         self.logger.info("Morphing '%s' into '%s'" % (self.__class__.__name__,
             evt.__class__.__name__))
         self._raw_event = evt
         self.path = evt.path
         self.__class__ = evt.__class__
+        return self
+
+class FakePyinotify(object):
+    def __init__(self, path):
+        self.pathname = path
+
 
 class OrganizeFile(BaseEvent, HasMetaData):
     def __init__(self, *args, **kwargs): super(OrganizeFile, self).__init__(*args, **kwargs)
@@ -78,7 +93,7 @@ class NewFile(BaseEvent, HasMetaData):
         req_dict = self.metadata.extract()
         req_dict['mode'] = u'create'
         req_dict['MDATA_KEY_FILEPATH'] = unicode( self.path )
-        return req_dict
+        return [req_dict]
 
 class DeleteFile(BaseEvent):
     def __init__(self, *args, **kwargs): super(DeleteFile, self).__init__(*args, **kwargs)
@@ -86,7 +101,7 @@ class DeleteFile(BaseEvent):
         req_dict = {}
         req_dict['mode'] = u'delete'
         req_dict['MDATA_KEY_FILEPATH'] = unicode( self.path )
-        return req_dict
+        return [req_dict]
 
 class MoveFile(BaseEvent, HasMetaData):
     """Path argument should be the new path of the file that was moved"""
@@ -96,15 +111,34 @@ class MoveFile(BaseEvent, HasMetaData):
         req_dict['mode'] = u'moved'
         req_dict['MDATA_KEY_MD5'] = self.metadata.extract()['MDATA_KEY_MD5']
         req_dict['MDATA_KEY_FILEPATH'] = unicode( self.path )
-        return req_dict
+        return [req_dict]
+
+def map_events(directory, constructor):
+    #return map(lambda f: constructor( FakePyinotify(f) ).pack(),
+        #mmp.walk_supported(directory.replace("-unknown-path",""),
+            #clean_empties=False))
+    for f in mmp.walk_supported(directory.replace("-unknown-path",""),
+            clean_empties=True):
+        try: yield constructor( FakePyinotify(f) ).pack()[0]
+        except BadSongFile as e: yield e
 
 class DeleteDir(BaseEvent):
     def __init__(self, *args, **kwargs): super(DeleteDir, self).__init__(*args, **kwargs)
+    def pack(self):
+        return map_events( self.path, DeleteFile )
+
+class MoveDir(BaseEvent):
+    def __init__(self, *args, **kwargs): super(MoveDir, self).__init__(*args, **kwargs)
+    def pack(self):
+        return map_events( self.path, MoveFile )
+
+class DeleteDirWatch(BaseEvent):
+    def __init__(self, *args, **kwargs): super(DeleteDirWatch, self).__init__(*args, **kwargs)
     def pack(self):
         req_dict = {}
         req_dict['mode'] = u'delete_dir'
         req_dict['MDATA_KEY_FILEPATH'] = unicode( self.path )
-        return req_dict
+        return [req_dict]
 
 class ModifyFile(BaseEvent, HasMetaData):
     def __init__(self, *args, **kwargs): super(ModifyFile, self).__init__(*args, **kwargs)
@@ -113,5 +147,5 @@ class ModifyFile(BaseEvent, HasMetaData):
         req_dict['mode'] = u'modify'
         # path to directory that is to be removed
         req_dict['MDATA_KEY_FILEPATH'] = unicode( self.path )
-        return req_dict
+        return [req_dict]