v1.3.0

eldertek · Dec 18, 2024 · 05a1bed · 05a1bed
1 parent 367d922
commit 05a1bed
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.3.0 - 2024-12-18
+### Fixed
+- Error during occ update:check when no user context is available
+- Database migration issue with MySQL when column length exceeded maximum key length
+
 ## 1.2.9 - 2024-12-17
 ### Added
 - Origin folders configuration to protect files from deletion

diff --git a/appinfo/info.xml b/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.2.9</version>
+    <version>1.3.0</version>
     <licence>agpl</licence>
     <author mail="andrelauret@eclipse-technology.eu" >André Théo LAURET</author>
     <namespace>DuplicateFinder</namespace>

diff --git a/lib/Migration/Version0009Date20240116000000.php b/lib/Migration/Version0009Date20240116000000.php
@@ -33,7 +33,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
             ]);
             $table->addColumn('folder_path', 'string', [
                 'notnull' => true,
-                'length' => 4000,
+                'length' => 700,
             ]);
             $table->addColumn('created_at', 'datetime', [
                 'notnull' => true,

diff --git a/lib/Service/FileDuplicateService.php b/lib/Service/FileDuplicateService.php
@@ -26,6 +26,8 @@ class FileDuplicateService
     private $fileInfoService;
     /** @var OriginFolderService */
     private $originFolderService;
+    /** @var ?string */
+    private $currentUserId = null;
 
     public function __construct(
         LoggerInterface $logger,
@@ -39,6 +41,13 @@ public function __construct(
         $this->originFolderService = $originFolderService;
     }
 
+    public function setCurrentUserId(?string $userId): void {
+        $this->currentUserId = $userId;
+        if ($this->originFolderService !== null) {
+            $this->originFolderService->setUserId($userId);
+        }
+    }
+
     /**
      * @return FileDuplicate
      */
@@ -96,6 +105,9 @@ public function findAll(
         bool $enrich = false,
         ?array $orderBy = [['hash'], ['type']]
     ): array {
+        if ($user !== null) {
+            $this->setCurrentUserId($user);
+        }
         $this->logger->debug('Finding duplicates with parameters: type={type}, user={user}, page={page}, pageSize={pageSize}, enrich={enrich}', [
             'type' => $type ?? 'all',
             'user' => $user ?? 'none',

diff --git a/lib/Service/OriginFolderService.php b/lib/Service/OriginFolderService.php
@@ -23,19 +23,26 @@ class OriginFolderService {
     public function __construct(
         OriginFolderMapper $mapper,
         IRootFolder $rootFolder,
-        string $userId,
+        ?string $userId,
         LoggerInterface $logger
     ) {
         $this->mapper = $mapper;
         $this->rootFolder = $rootFolder;
-        $this->userId = $userId;
+        $this->userId = $userId ?? '';
         $this->logger = $logger;
     }
 
+    private function validateUserContext(): void {
+        if (empty($this->userId)) {
+            throw new \RuntimeException('User context required for this operation');
+        }
+    }
+
     /**
      * @return array
      */
     public function findAll(): array {
+        $this->validateUserContext();
         return $this->mapper->findAll($this->userId);
     }
 
@@ -46,6 +53,7 @@ public function findAll(): array {
      * @throws Exception if the folder is already an origin folder
      */
     public function create(string $folderPath): OriginFolder {
+        $this->validateUserContext();
         $this->logger->debug('Creating origin folder: {path}', ['path' => $folderPath]);
 
         // Verify that the folder exists
@@ -79,6 +87,7 @@ public function create(string $folderPath): OriginFolder {
      * @throws MultipleObjectsReturnedException
      */
     public function delete(int $id): OriginFolder {
+        $this->validateUserContext();
         try {
             $originFolder = $this->mapper->find($id);
             if ($originFolder->getUserId() !== $this->userId) {
@@ -97,6 +106,7 @@ public function delete(int $id): OriginFolder {
      * @return array{isProtected: bool, protectingFolder: string|null}
      */
     public function isPathProtected(string $path): array {
+        $this->validateUserContext();
         $originFolders = $this->findAll();
         foreach ($originFolders as $folder) {
             $folderPath = $folder->getFolderPath();
@@ -114,4 +124,8 @@ public function isPathProtected(string $path): array {
             'protectingFolder' => null
         ];
     }
+
+    public function setUserId(?string $userId): void {
+        $this->userId = $userId ?? '';
+    }
 } 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "duplicatefinder",
   "description": "Save some space by finding your duplicate files",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "author": "André Théo LAURET <andrelauret@eclipse-technology.eu>",
   "contributors": [],
   "bugs": {