Merge pull request #21 from eldertek/nightly

Nightly v1.0.9

lib/Service/FileInfoService.php

@@ -35,19 +35,23 @@ class FileInfoService
     private $folderService;
     /** @var ScannerUtil */
     private $scannerUtil;
+    /** @var FilterService */
+    private $filterService;
 
     public function __construct(
         FileInfoMapper $mapper,
         IEventDispatcher $eventDispatcher,
         LoggerInterface $logger,
         ShareService $shareService,
+        FilterService $filterService,
         FolderService $folderService,
         ScannerUtil $scannerUtil
     ) {
         $this->mapper = $mapper;
         $this->eventDispatcher = $eventDispatcher;
         $this->logger = $logger;
         $this->shareService = $shareService;
+        $this->filterService = $filterService;
         $this->folderService = $folderService;
         $this->scannerUtil = $scannerUtil;
     }
@@ -174,6 +178,7 @@ public function updateFileMeta(FileInfo $fileInfo, ?string $fallbackUID = null):
                 throw $e;
             }
         }
+        $fileInfo->setIgnored($this->filterService->isIgnored($fileInfo, $file));
         return $fileInfo;
     }
 

lib/Service/FilterService.php

@@ -0,0 +1,52 @@
+<?php
+
+namespace OCA\DuplicateFinder\Service;
+
+use Psr\Log\LoggerInterface;
+use OCP\Files\Node;
+use OCP\Files\NotFoundException;
+
+use OCA\DuplicateFinder\Db\FileInfo;
+use OCA\DuplicateFinder\Exception\ForcedToIgnoreFileException;
+use OCA\DuplicateFinder\Service\ConfigService;
+
+class FilterService
+{
+    /** @var LoggerInterface */
+    private $logger;
+    /** @var ConfigService */
+    private $config;
+
+    public function __construct(
+        LoggerInterface $logger,
+        ConfigService $config
+    ) {
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    public function isIgnored(FileInfo $fileInfo, Node $node): bool
+    {
+        // Ignore mounted files
+        if ($node->isMounted() && $this->config->areMountedFilesIgnored()) {
+            throw new ForcedToIgnoreFileException($fileInfo, 'app:ignore_mounted_files');
+        }
+
+        // Ignore files when any ancestor folder contains a .nodupefinder file
+        while ($node !== null) {
+            try {
+                $parent = $node->getParent();
+                if ($parent !== null && $parent->nodeExists('.nodupefinder')) {
+                    return true;
+                }
+                $node = $parent; // move up to the parent and check again
+            } catch (NotFoundException $e) {
+                // No parent found (probably root), break the loop
+                break;
+            }
+        }
+
+        return false;
+    }
+
+}

lib/Utils/ScannerUtil.php

@@ -131,4 +131,5 @@ private function showOutput(string $message, bool $isVerbose = false) : void
             $isVerbose ? OutputInterface::VERBOSITY_VERBOSE : OutputInterface::VERBOSITY_NORMAL
         );
     }
+
 }