Changeset 781:d4455b2cd469 for src

Timestamp:

05/22/16 06:42:44 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The files already removable are removed in advance (re #298)

File:

• src/mlx/update.py (modified) (3 diffs)

src/mlx/update.py

@@ -297 +297 @@
 #------------------------------------------------------------------------------
 
+def removeFiles(directory, listener, removed, count):
+    """Remove the given files."""
+    toremoveDir = None
+    
+    listener.startRemoving()
+
+    removed.sort(reverse = True)
+    for path in removed:
+        removePath = createLocalPath(directory, path)
+        removeFile(toremoveDir, directory, removePath)
+
+        removeDirectory = os.path.dirname(removePath)
+        try:
+            os.removedirs(removeDirectory)
+        except:
+            pass
+
+        count += 1
+        listener.removed(path, count)
+
+    return count
+
+#------------------------------------------------------------------------------
+
 def updateFiles(directory, updateURL, listener,
                 manifest, modifiedAndNew, removed, localRemoved):
@@ -314 +338 @@
         updateURL += "/" + os.name
 
+        removeCount = 0
+        if localRemoved:
+            removeCount = removeFiles(directory, listener,
+                                      localRemoved, removeCount)
+        
         for (path, size, sum) in modifiedAndNew:
             targetFile = createLocalPath(directory, path)
@@ -346 +375 @@
             count += 1
             listener.renamed(path, count)
-        
-        listener.startRemoving()
-        count = 0
-        removed += localRemoved
-        removed.sort(reverse = True)
-        for path in removed:            
-            removePath = createLocalPath(directory, path)
-            removeFile(toremoveDir, directory, removePath)
-
-            removeDirectory = os.path.dirname(removePath)
-            try:
-                os.removedirs(removeDirectory)
-            except:
-                pass
-
-            count += 1
-            listener.removed(path, count)
+
+        removeFiles(directory, listener, removed, removeCount)
 
         listener.writingManifest()