Ticket #125: filemanager-125.patch

pida/services/filemanager/filemanager.py

@@ -235 +235 @@
         self.file_list.clear()
         self.entries.clear()
 
-        for lister in self.svc.features('file_lister'):
-            GeneratorTask(lister, self.add_or_update_file).start(self.path)
+        def work(basepath):
+            dircontent = listdir(basepath)
+            # Take the first lister only because many listers might conflict
+            try:
+                lister = self.svc.features('file_lister').next()
+            except:
+                lister = None
+            # add all from lister and remove the corresponding items from
+            # dircontent
+            if (lister is not None):
+                for item in lister(basepath):
+                    try:
+                        dircontent.remove(item[0])
+                    except:
+                        pass
+                    yield item
+            # handle remaining files
+            for filename in dircontent:
+                if (path.isdir(path.join(basepath, filename))):
+                    state = 'normal'
+                else:
+                    state = 'unknown'
+                yield filename, basepath, state
+
+        GeneratorTask(work, self.add_or_update_file).start(self.path)
 
         self.create_ancest_tree()
 
@@ -411 +434 @@
 
     def subscribe_foreign_features(self):
         self.subscribe_feature('file_hidden_check', self.svc.check_hidden_regex)
-        self.subscribe_feature('file_lister', self.svc.file_lister)
 
         self.subscribe_foreign_feature('contexts', 'file-menu',
             (self.svc.get_action_group(), 'filemanager-file-menu.xml'))
@@ -650 +672 @@
         else:
             return re.match(_re, name) is None
 
-    def file_lister(self, basepath):
-        for name in listdir(basepath):
-            yield name, basepath, 'normal'
-
     def rename_file(self, old, new, basepath):
         pass