Merge pull request #16498 from iterate-ch/bugfix/GH-12897

Fix #12897. Make sure to ignore file system events from monitored col…
iterate-ch · Nov 15, 2024 · 40249a7 · 40249a7
2 parents 3845480 + 94cccca
commit 40249a7
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/Collection.java b/core/src/main/java/ch/cyberduck/core/Collection.java
@@ -129,8 +129,17 @@ public void add(int row, E item) {
         this.collectionItemAdded(item);
     }
 
-    public void replace(int row, E item) {
-        this.set(row, item);
+    public E set(int row, E item) {
+        final E previous = super.set(row, item);
+        for(CollectionListener<E> listener : listeners) {
+            listener.collectionItemChanged(item);
+        }
+        return previous;
+    }
+
+    public void move(int from, int to) {
+        final E item = super.remove(from);
+        this.add(to, item);
         for(CollectionListener<E> listener : listeners) {
             listener.collectionItemChanged(item);
         }

diff --git a/core/src/main/java/ch/cyberduck/core/MonitorFolderHostCollection.java b/core/src/main/java/ch/cyberduck/core/MonitorFolderHostCollection.java
@@ -68,7 +68,7 @@ public void fileWritten(final Local file) {
                     // Found bookmark with matching UUID
                     if(new HostEditComparator().compare(bookmark, this.get(index)) != 0) {
                         log.debug("Replace bookmark {} at index {}", bookmark, index);
-                        this.replace(index, bookmark);
+                        this.set(index, bookmark);
                     }
                 }
             }

diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/datasource/BookmarkTableDataSource.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/datasource/BookmarkTableDataSource.java
@@ -424,20 +424,13 @@ else if(!pasteboard.isEmpty()) {
             else {
                 int insert = row.intValue();
                 for(Host bookmark : pasteboard) {
-                    int previous = source.indexOf(bookmark);
-                    if(previous == insert) {
+                    int sourceIndex = source.indexOf(bookmark);
+                    if(sourceIndex == insert) {
                         // No need to move
                         continue;
                     }
-                    source.remove(previous);
-                    int moved;
-                    if(previous < insert) {
-                        moved = insert - 1;
-                    }
-                    else {
-                        moved = insert;
-                    }
-                    source.add(moved, bookmark);
+                    int destIndex = sourceIndex < insert ? insert - 1 : insert;
+                    source.move(sourceIndex, destIndex);
                 }
                 for(Host bookmark : pasteboard) {
                     int index = source.indexOf(bookmark);

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/controller/BrowserController.cs b/windows/src/main/csharp/ch/cyberduck/ui/controller/BrowserController.cs
@@ -751,15 +751,7 @@ private void View_HostModelDropped(ModelDropEventArgs dropargs)
                 }
                 foreach (Host promisedDragBookmark in dropargs.SourceModels)
                 {
-                    _bookmarkModel.Source.remove(promisedDragBookmark);
-                    if (destIndex > _bookmarkModel.Source.size())
-                    {
-                        _bookmarkModel.Source.add(promisedDragBookmark);
-                    }
-                    else
-                    {
-                        _bookmarkModel.Source.add(destIndex, promisedDragBookmark);
-                    }
+                    _bookmarkModel.Source.move(sourceIndex, destIndex);
                     //view.selectRowIndexes(NSIndexSet.indexSetWithIndex(row), false);
                     //view.scrollRowToVisible(row);
                 }