Ticket #1420: Tracker.FSUtilsFixes.patch

FSUtils.cpp

@@ -588 +588 @@
     switch (moveMode) {
         case kCopySelectionTo:
         case kDuplicateSelection:
+        case kMoveSelectionTo:
             {
                 if (gStatusWindow)
                     gStatusWindow->CreateStatusItem(thread, kCopyState);
@@ -610 +611 @@
                 break;
             }
 
-        case kMoveSelectionTo:
         case kCreateLink:
             if (numItems > 10) {
                 // this will be fast, only put up status if lots of items
@@ -703 +703 @@
     }
 
     // change the move mode if needed
-    if (moveMode == kMoveSelectionTo && srcVolumeDevice != destVolumeDevice)
-        // move across volumes - copy instead
-        moveMode = kCopySelectionTo;
     if (moveMode == kCopySelectionTo && destIsTrash)
         // cannot copy to trash
         moveMode = kMoveSelectionTo;
@@ -908 +905 @@
                 return;
 
             case TrackerCopyLoopControl::kReplace:
-                if (conflictingEntry.IsDirectory()) 
-                    // remove existing folder recursively
-                    ThrowOnError(FSDeleteFolder(&conflictingEntry, loopControl, false));
-                else
+                if (!conflictingEntry.IsDirectory()) {
                     ThrowOnError(conflictingEntry.Remove());
-                break;
-
+                    break;
+                }
+                // fall through if not a directory
             case TrackerCopyLoopControl::kMerge:
                 // This flag implies that the attributes should be kept
                 // on the file.  Just ignore it.
@@ -1174 +1169 @@
 
 static void
 CopyFolder(BEntry *srcEntry, BDirectory *destDir, CopyLoopControl *loopControl,
-    BPoint *loc, bool makeOriginalName, Undo &undo)
+    BPoint *loc, bool makeOriginalName, Undo &undo, bool removeSource = false)
 {
     BDirectory newDir;
     BEntry entry;
@@ -1209 +1204 @@
                 // we are about to ignore this entire directory
                 return;
 
+            
             case TrackerCopyLoopControl::kReplace:
-                if (isDirectory) 
-                    // remove existing folder recursively
-                    ThrowOnError(FSDeleteFolder(&existingEntry, loopControl, false));
-
-                else
+                if (!isDirectory) {
                     // conflicting with a file or symbolic link, remove entry
                     ThrowOnError(existingEntry.Remove());
-                break;
-
+                    break;
+                }
+            // fall through if directory, do not replace.
             case TrackerCopyLoopControl::kMerge:
                 ASSERT(isDirectory);
                 // do not create a new directory, use the current one
@@ -1231 +1224 @@
     // loop through everything in src folder and copy it to new folder
     BDirectory srcDir(srcEntry);
     srcDir.Rewind();
-    srcEntry->Unset();
 
     // create a new folder inside of destination folder
     if (createDirectory) {
@@ -1284 +1276 @@
                 continue;
             }
             
-            CopyFolder(&entry, &newDir, loopControl, 0, false, undo);
-        } else
+            CopyFolder(&entry, &newDir, loopControl, 0, false, undo, removeSource);
+            if (removeSource)
+                FSDeleteFolder(&entry, loopControl, true, true, false);
+        } else {
             CopyFile(&entry, &statbuf, &newDir, loopControl, 0, false, undo);
+            if (removeSource)
+                entry.Remove();
+        }
     }
+    if (removeSource)
+        srcEntry->Remove();
+    else
+        srcEntry->Unset();
 }
 
 
 status_t
+RecursiveMove(BEntry *entry, BDirectory *destDir)
+{
+    TrackerCopyLoopControl loopControl(find_thread(NULL));
+    char name[B_FILE_NAME_LENGTH];
+    if (entry->GetName(name) == B_OK) {
+        if (destDir->Contains(name)) {
+            BPath path (destDir, name);
+            BDirectory subDir (path.Path());
+            entry_ref ref;
+            entry->GetRef(&ref);
+            BDirectory source(&ref);
+            if (source.InitCheck() == B_OK) {
+                source.Rewind();
+                BEntry current;
+                while (source.GetNextEntry(&current) == B_OK) {
+                    if (current.IsDirectory()) {
+                        RecursiveMove(&current, &subDir);
+                        current.Remove();
+                    } else {
+                        current.GetName(name);
+                        if (loopControl.OverwriteOnConflict(&current, name, &subDir, true, false) != TrackerCopyLoopControl::kSkip)
+                            MoveError::FailOnError(current.MoveTo(&subDir, NULL, true));
+                    }
+                }
+            }
+            entry->Remove();
+        } else {
+            MoveError::FailOnError(entry->MoveTo(destDir));
+        }
+    }
+    
+    return B_OK;
+}   
+
+status_t
 MoveItem(BEntry *entry, BDirectory *destDir, BPoint *loc, uint32 moveMode,
     const char *newName, Undo &undo)
 {
@@ -1299 +1335 @@
     try {
         node_ref destNode;
         StatStruct statbuf;
-
         MoveError::FailOnError(entry->GetStat(&statbuf));
         MoveError::FailOnError(entry->GetRef(&ref));
         MoveError::FailOnError(destDir->GetNodeRef(&destNode)); 
@@ -1412 +1447 @@
             thread_id thread = find_thread(NULL);
             if (gStatusWindow && gStatusWindow->HasStatus(thread))
                 gStatusWindow->UpdateStatus(thread, ref.name, 1);
-
+            if (entry->IsDirectory())
+                return RecursiveMove(entry, destDir);
             MoveError::FailOnError(entry->MoveTo(destDir, newName));
         } else {
             TrackerCopyLoopControl loopControl(find_thread(NULL));
-
             bool makeOriginalName = (moveMode == kDuplicateSelection);
-            if (S_ISDIR(statbuf.st_mode))
-                CopyFolder(entry, destDir, &loopControl, loc, makeOriginalName, undo);
-            else
+            if (S_ISDIR(statbuf.st_mode)) {
+                CopyFolder(entry, destDir, &loopControl, loc, makeOriginalName, undo, moveMode == kMoveSelectionTo);
+            } else {
                 CopyFile(entry, &statbuf, destDir, &loopControl, loc, makeOriginalName, undo);
+                if (moveMode == kMoveSelectionTo)               
+                    entry->Remove();
+            }
         }
     } catch (status_t error) {
         // no alert, was already taken care of before
@@ -1833 +1871 @@
     }
 
     // delete destination item
-    if (destIsDir) {
+    if (!destIsDir) {
         TrackerCopyLoopControl loopControl(find_thread(NULL));
-        err = FSDeleteFolder(&entry, &loopControl, false);
+        err = entry.Remove();
     } else
-        err = entry.Remove();
+        return B_OK;
 
     if (err != B_OK) {
         BString error;
@@ -1862 +1900 @@
 
     dir.SetTo(dir_entry);
     dir.Rewind();
-
     // loop through everything in folder and delete it, skipping trouble files
     for (;;) {
         if (dir.GetNextEntry(&entry) != B_OK)
@@ -1898 +1935 @@
     if (update_status && delete_top_dir)
         loopControl->UpdateStatus(NULL, ref, 1);
 
-    if (delete_top_dir)
+    if (delete_top_dir) 
         return dir_entry->Remove();
     else
         return B_OK;