fix ? same file displayed multiple time

eldertek · Dec 27, 2024 · a07cece · a07cece
1 parent bd7b0bd
commit a07cece
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - Added ability to exclude specific folders from duplicate scanning via settings page
 ### Fixed
 - Handle when there is no file to delete in bulk deletion
+- Fix an issue where the same file was displayed multiple times in duplicate
 
 ## 1.3.1 - 2024-12-26
 ### Added

diff --git a/lib/Service/FileDuplicateService.php b/lib/Service/FileDuplicateService.php
@@ -56,12 +56,29 @@ public function enrich(FileDuplicate $duplicate): FileDuplicate
         $files = $duplicate->getFiles();
         $this->logger->debug('Enriching duplicate with hash: {hash}', ['hash' => $duplicate->getHash()]);
 
+        // Track unique node IDs to prevent showing the same file multiple times
+        $seenNodeIds = [];
+        $uniqueFiles = [];
+
         // Iterate through each FileInfo object to enrich it
         foreach ($files as $key => $fileInfo) {
             // Enrich the FileInfo object
             $files[$key] = $this->fileInfoService->enrich($fileInfo);
 
-            // Normalize path by removing /admin/files/ prefix
+            // Skip if we've already seen this node ID (same physical file)
+            if ($files[$key]->getNodeId() && isset($seenNodeIds[$files[$key]->getNodeId()])) {
+                $this->logger->debug('Skipping duplicate node ID: {nodeId} for path: {path}', [
+                    'nodeId' => $files[$key]->getNodeId(),
+                    'path' => $fileInfo->getPath()
+                ]);
+                continue;
+            }
+
+            if ($files[$key]->getNodeId()) {
+                $seenNodeIds[$files[$key]->getNodeId()] = true;
+            }
+
+            // Store normalized path for logging
             $normalizedPath = preg_replace('#^/[^/]+/files/#', '/', $fileInfo->getPath());
             $this->logger->debug('Normalized path for file: {original} -> {normalized}', [
                 'original' => $fileInfo->getPath(),
@@ -75,16 +92,21 @@ public function enrich(FileDuplicate $duplicate): FileDuplicate
                 'path' => $normalizedPath,
                 'status' => $protectionInfo['isProtected'] ? 'protected' : 'not protected'
             ]);
+
+            $uniqueFiles[] = $files[$key];
         }
 
         // Sort the enriched FileInfo objects
-        uasort($files, function (FileInfo $a, FileInfo $b) {
+        uasort($uniqueFiles, function (FileInfo $a, FileInfo $b) {
             return strnatcmp($a->getPath(), $b->getPath());
         });
 
         // Set the sorted and enriched FileInfo objects back to the duplicate
-        $duplicate->setFiles(array_values($files));
-        $this->logger->debug('Finished enriching duplicate with hash: {hash}', ['hash' => $duplicate->getHash()]);
+        $duplicate->setFiles(array_values($uniqueFiles));
+        $this->logger->debug('Finished enriching duplicate with hash: {hash}, found {count} unique files', [
+            'hash' => $duplicate->getHash(),
+            'count' => count($uniqueFiles)
+        ]);
 
         return $duplicate;
     }