Merge pull request #49 from eldertek/nightly

v1.1.6

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.6 - 2024-02-17
+### Fixed
+- Fix an issue where the same duplicate was displayed multiple times
+
 ## 1.1.5 - 2024-02-12
 ### Added
 - Limit number of errors/success messages to 2

appinfo/info.xml

@@ -7,7 +7,7 @@
     <summary lang="fr">Économisez de l’espace en trouvant vos fichiers en doublon</summary>
     <description>Are you tired of sifting through piles of files and folders, only to discover multiple copies of the same content cluttering your storage space?</description>
     <description lang="fr">Vous en avez assez de passer au crible des piles de fichiers et de dossiers pour découvrir que plusieurs copies du même contenu encombrent votre espace de stockage ?</description>
-    <version>1.1.5</version>
+    <version>1.1.6</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >André Théo LAURET</author>
     <namespace>DuplicateFinder</namespace>

lib/Db/FileDuplicateMapper.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace OCA\DuplicateFinder\Db;
 
 use OCP\IDBConnection;
@@ -45,25 +46,22 @@ public function findAll(
         ?array $orderBy = [['hash'], ['type']]
     ): array {
         $qb = $this->db->getQueryBuilder();
-        $qb->select('d.*')
-            ->from($this->getTableName(), 'd')
-            ->leftJoin('d', 'duplicatefinder_finfo', 'f', 'd.hash = f.file_hash');
-
-        if (!is_null($user)) {
-            $qb->andWhere($qb->expr()->eq('f.owner', $qb->createNamedParameter($user)));
-        }
-
+        $qb->select('d.id as id', 'd.type', 'd.hash', 'd.acknowledged')
+            ->from($this->getTableName(), 'd');
+
         if ($limit !== null) {
-            $qb->setMaxResults($limit);
+            $qb->setMaxResults($limit); // Set the limit of rows to fetch
         }
         if ($offset !== null) {
-            $qb->setFirstResult($offset);
+            $qb->setFirstResult($offset); // Set the offset to start fetching rows
         }
-
-        foreach ($orderBy as $order) {
-            $qb->addOrderBy($order[0], $order[1] ?? 'ASC');
+
+        if ($orderBy !== null) {
+            foreach ($orderBy as $order) {
+                $qb->addOrderBy($order[0], isset($order[1]) ? $order[1] : null);
+            }
+            unset($order);
         }
-
         return $this->findEntities($qb);
     }
 
@@ -148,4 +146,4 @@ public function getTotalCount(string $type = 'unacknowledged'): int
         // Return the count result as an integer
         return (int) ($row ? $row['total_count'] : 0);
     }
-}
+}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "duplicatefinder",
   "description": "Save some space by finding your duplicate files",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "author": "André Théo LAURET <[email protected]>",
   "contributors": [],
   "bugs": {