itemsync: Fix missing data in the last item when tab is full

Author: hluk

docs/scripting-api.rst

@@ -2009,7 +2009,7 @@ Types
        :returns: self
        :rtype: ItemSelection
 
-   .. js:method:: sort(row)
+   .. js:method:: sort(comparisonFunction)
 
        Sort items with a comparison function.
 

plugins/itemsync/filewatcher.cpp

@@ -314,10 +314,10 @@ BaseNameExtensionsList listFiles(const QStringList &files,
             int i = fileMap.value(baseName, -1);
             if (i == -1) {
                 i = fileList.size();
+                if (i >= maxItemCount)
+                    break;
                 fileList.append( BaseNameExtensions(baseName, {ext}) );
                 fileMap.insert(baseName, i);
-                if (fileList.size() >= maxItemCount)
-                    break;
             } else {
                 fileList[i].exts.push_back(ext);
             }

plugins/itemsync/tests/itemsynctests.cpp

@@ -817,3 +817,66 @@ void ItemSyncTests::saveLargeItem()
     RUN(args << "getItem(0)['application/x-copyq-test-data'].left(26)", "abcdefghijklmnopqrstuvwxyz");
     RUN(args << "getItem(0)['application/x-copyq-test-data'].length", "260000\n");
 }
+
+void ItemSyncTests::sortItemsSimple()
+{
+    TestDir dir1(1);
+    const QString tab1 = testTab(1);
+    RUN(Args() << "show" << tab1, "");
+
+    const Args args = Args() << "tab" << tab1 << "separator" << ",";
+
+    RUN("config" << "maxitems" << "4", "4\n");
+    const QString initScript = R"(
+        add(1,2,0,3);
+        read(0,1,2,3);
+    )";
+    RUN(args << initScript, "3,0,2,1");
+    RUN(args << "size", "4\n");
+
+    const QString sortScript = R"(
+        let sel = ItemSelection().selectAll();
+        let items = sel.itemsFormat(mimeText);
+        serverLog("SORT BEGIN");
+        sel.sort((i, j) => items[i] < items[j]);
+        serverLog("SORT END");
+        read(0,1,2,3);
+    )";
+    RUN(args << sortScript, "0,1,2,3");
+    RUN(args << "size", "4\n");
+}
+
+void ItemSyncTests::sortItems()
+{
+    TestDir dir1(1);
+    const QString tab1 = testTab(1);
+    RUN(Args() << "show" << tab1, "");
+
+    const Args args = Args() << "tab" << tab1 << "separator" << ",";
+
+    RUN("config" << "maxitems" << "4", "4\n");
+    const QString initScript = R"(
+        add(
+            {[mimeText]: 1, [mimeHtml]: "I"},
+            {[mimeText]: 2, [mimeHtml]: "II"},
+            {[mimeText]: 0, [mimeHtml]: "O"},
+            {[mimeText]: 3, [mimeHtml]: "III"},
+        );
+        read(0,1,2,3);
+    )";
+    RUN(args << initScript, "3,0,2,1");
+    RUN(args << "read(mimeHtml,0,1,2,3)", "III,O,II,I");
+    RUN(args << "size", "4\n");
+
+    const QString sortScript = R"(
+        let sel = ItemSelection().selectAll();
+        let items = sel.itemsFormat(mimeText);
+        serverLog("SORT BEGIN");
+        sel.sort((i, j) => items[i] < items[j]);
+        serverLog("SORT END");
+        read(0,1,2,3);
+    )";
+    RUN(args << sortScript, "0,1,2,3");
+    RUN(args << "read(mimeHtml,0,1,2,3)", "O,I,II,III");
+    RUN(args << "size", "4\n");
+}

plugins/itemsync/tests/itemsynctests.h

@@ -54,6 +54,9 @@ private slots:
 
     void saveLargeItem();
 
+    void sortItemsSimple();
+    void sortItems();
+
 private:
     TestInterfacePtr m_test;
 };

src/item/clipboardmodel.cpp

@@ -8,7 +8,6 @@
 #include <QStringList>
 
 #include <algorithm>
-#include <functional>
 
 namespace {
 

src/tests/tests_classes.cpp

@@ -368,8 +368,17 @@ void Tests::classItemSelectionSort()
     const QString outRows("ItemSelection(tab=\"" + tab1 + "\", rows=[%1])\n");
     RUN("setCurrentTab" << tab1, "");
 
-    RUN(args << "add(2,5,1,3,4)", "");
-    RUN(args << "read(0,1,2,3,4)", "4,3,1,5,2");
+    const QString initScript = R"(
+        add(
+            {[mimeText]: 2, [mimeHtml]: "two"},
+            {[mimeText]: 5, [mimeHtml]: "five"},
+            {[mimeText]: 1, [mimeHtml]: "one"},
+            {[mimeText]: 3, [mimeHtml]: "three"},
+            {[mimeText]: 4, [mimeHtml]: "four"},
+        );
+        read(0,1,2,3,4);
+    )";
+    RUN(args << initScript, "4,3,1,5,2");
 
     const auto script = R"(
         var sel = ItemSelection().selectAll();
@@ -381,6 +390,7 @@ void Tests::classItemSelectionSort()
     )";
     RUN(args << script, outRows.arg("3,2,0,4,1"));
     RUN(args << "read(0,1,2,3,4)", "1,2,3,4,5");
+    RUN(args << "read(mimeHtml,0,1,2,3,4)", "one,two,three,four,five");
     RUN(args << "size", "5\n");
 }