Changeset 1150:6dbe667baa4e

Timestamp:

05/08/08 23:02:18 (2 months ago)

Author:

Tobias Eberle <info@…>

Children:

1151:121df08315cf, 1152:0c20ab72990b

Message:

rewrite of file listing: no flickering any more (fixes #125)

Location:

pida/services

Files:

• filemanager/filemanager.py (modified) (3 diffs)
• versioncontrol/versioncontrol.py (modified) (3 diffs)

pida/services/filemanager/filemanager.py

@@ -236 +236 @@
         self.entries.clear()
 
-        for lister in self.svc.features('file_lister'):
-            GeneratorTask(lister, self.add_or_update_file).start(self.path)
+        def work(basepath):
+            dir_content = listdir(basepath)
+            # add all files from vcs and remove the corresponding items 
+            # from dir_content
+            for item in self.svc.boss.cmd('versioncontrol', 'list_file_states',
+              path=self.path):
+                if (item[1] == self.path):
+                    try:
+                        dir_content.remove(item[0])
+                    except:
+                        pass
+                    yield item
+            # handle remaining files
+            for filename in dir_content:
+                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()
@@ -408 +427 @@
         self.create_feature('file_manager')
         self.create_feature('file_hidden_check')
-        self.create_feature('file_lister')
 
     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',
@@ -651 +668 @@
             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

pida/services/versioncontrol/versioncontrol.py

@@ -229 +229 @@
 
         self.subscribe_foreign_feature(
-                "filemanager", "file_lister",
-                self.svc.list_files
-                )
-        self.subscribe_foreign_feature(
                 "filemanager", "file_hidden_check",
                 self.svc.ignored_file_checker
@@ -254 +250 @@
     def get_workdirmanager(self,path):
         return self.svc.get_workdir_manager_for_path(path)
+
+    def list_file_states(self, path):
+        return self.svc.list_file_states(path)
 
 class VersionControlActions(ActionsConfig):
@@ -619 +618 @@
         return found_vcm
 
-    def list_files(self, path):
+    def list_file_states(self, path):
         workdir = self.get_workdir_manager_for_path(path)