fix force delete bug

Future-Scholars · Jun 24, 2022 · 3928b41 · 3928b41
1 parent 17f7c41
commit 3928b41
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/packages/preload/repositories/file-repository/backends/local-backend.ts b/packages/preload/repositories/file-repository/backends/local-backend.ts
@@ -58,9 +58,8 @@ export class LocalFileBackend implements FileBackend {
     try {
       await fsPromise.copyFile(_sourceURL, _targetURL);
       if (
-        ((this.preference.get("deleteSourceFile") as boolean) &&
-          _sourceURL !== _targetURL) ||
-        forceDelete
+        ((this.preference.get("deleteSourceFile") as boolean) || forceDelete) &&
+        _sourceURL !== _targetURL
       ) {
         await fsPromise.unlink(sourceURL);
       }

diff --git a/packages/preload/repositories/file-repository/backends/webdav-backend.ts b/packages/preload/repositories/file-repository/backends/webdav-backend.ts
@@ -197,17 +197,15 @@ export class WebDavFileBackend implements FileBackend {
       if (sourceURL.startsWith("file://")) {
         success = await this._local2localMove(sourceURL, targetCacheURL);
         success = await this._local2serverMove(sourceURL, targetURL);
-        if (
-          (this.preference.get("deleteSourceFile") as boolean) ||
-          forceDelete
-        ) {
+        if (this.preference.get("deleteSourceFile") as boolean) {
           await fsPromise.unlink(sourceURL);
         }
       } else if (sourceURL.startsWith("webdav://")) {
         success = await this._server2serverMove(sourceURL, targetURL);
         if (
-          (this.preference.get("deleteSourceFile") as boolean) ||
-          forceDelete
+          ((this.preference.get("deleteSourceFile") as boolean) ||
+            forceDelete) &&
+          sourceURL !== targetURL
         ) {
           await this.webdavClient?.deleteFile(
             sourceURL.replace("webdav://", "/paperlib/")

diff --git a/packages/preload/repositories/scraper-repository/scrapers/pdf.ts b/packages/preload/repositories/scraper-repository/scrapers/pdf.ts
@@ -68,16 +68,16 @@ export class PDFScraper extends Scraper {
     };
     const firstPageText = rawResponse.firstPageText;
 
-    entityDraft.setValue("title", metaData.info.Title);
+    entityDraft.setValue("title", metaData.info.Title || "");
     let authors;
-    if (metaData.info.Author.includes(";")) {
+    if (metaData.info.Author?.includes(";")) {
       authors = metaData.info.Author.split(";")
         .map((author) => {
           return author.trim();
         })
         .join(", ");
     } else {
-      authors = metaData.info.Author;
+      authors = metaData.info.Author || "";
     }
     entityDraft.setValue("authors", authors);