Merge pull request #50 from eldertek/nightly

v1.1.7
eldertek · Feb 20, 2024 · 1db76cf · 1db76cf
2 parents 541cb31 + 573f5cb
commit 1db76cf
Show file tree

Hide file tree

Showing 19 changed files with 711 additions and 559 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1.7 - 2024-02-20
+### Fixed
+- Refactor the code to use components
+
 ## 1.1.6 - 2024-02-17
 ### Fixed
 - Fix an issue where the same duplicate was displayed multiple times

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.1.6</version>
+    <version>1.1.7</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >André Théo LAURET</author>
     <namespace>DuplicateFinder</namespace>

diff --git a/js/duplicatefinder-main.js b/js/duplicatefinder-main.js
diff --git a/js/duplicatefinder-settings.js b/js/duplicatefinder-settings.js
diff --git a/...icatefinder-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-5074f4ba_mjs.js b/...icatefinder-vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-5074f4ba_mjs.js
diff --git a/lib/BackgroundJob/CleanUpDB.php b/lib/BackgroundJob/CleanUpDB.php
@@ -6,7 +6,7 @@
  use OCA\DuplicateFinder\Service\FileInfoService;
  use OCA\DuplicateFinder\Service\FolderService;
  use OCP\Files\NotFoundException;
- use OC\BackgroundJob\TimedJob;
+ use OCP\BackgroundJob\TimedJob;
  use Psr\Log\LoggerInterface;
  class CleanUpDB extends TimedJob
  {

diff --git a/lib/BackgroundJob/FindDuplicates.php b/lib/BackgroundJob/FindDuplicates.php
@@ -8,7 +8,7 @@
  use OCP\IDBConnection;
  use OCP\IUser;
  use OCP\IUserManager;
- use OC\BackgroundJob\TimedJob;
+ use OCP\BackgroundJob\TimedJob;
  use Psr\Log\LoggerInterface;
 
  class FindDuplicates extends TimedJob

diff --git a/lib/Controller/AbstractAPIController.php b/lib/Controller/AbstractAPIController.php
@@ -1,6 +1,7 @@
 <?php
 namespace OCA\DuplicateFinder\Controller;
 
+ use OCP\AppFramework\Http\DataResponse;
  use OCP\IRequest;
  use OCP\IUserSession;
  use Psr\Log\LoggerInterface;
@@ -61,13 +62,13 @@ protected function getUserId(): string
       * @param \Exception $e The exception to handle.
       * @return JSONResponse The JSON response.
       */
-     protected function handleException(\Exception $e): JSONResponse
+     protected function handleException(\Exception $e): DataResponse
      {
          if ($e instanceof NotAuthenticatedException) {
-             return $this->error($e, Http::STATUS_FORBIDDEN);
+             return new DataResponse(['status' => 'error', 'message' => 'Not authenticated'], Http::STATUS_UNAUTHORIZED);
          }
          $this->logger->error('An unknown exception occurred', ['app' => Application::ID, 'exception' => $e]);
-         return $this->error($e, Http::STATUS_NOT_IMPLEMENTED);
+         return new DataResponse(['status' => 'error', 'message' => 'An unknown exception occurred'], Http::STATUS_INTERNAL_SERVER_ERROR);
      }
  }
 
diff --git a/package-lock.json b/package-lock.json
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.1.6",
+  "version": "1.1.7",
   "author": "André Théo LAURET <[email protected]>",
   "contributors": [],
   "bugs": {