Merge pull request #495 from linkwarden/dev

more efficient logic for the background script

lib/api/archiveHandler.ts

@@ -85,11 +85,11 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
             image:
               user.archiveAsScreenshot && !link.image?.startsWith("archive")
                 ? "pending"
-                : undefined,
+                : "unavailable",
             pdf:
               user.archiveAsPDF && !link.pdf?.startsWith("archive")
                 ? "pending"
-                : undefined,
+                : "unavailable",
             readable: !link.readable?.startsWith("archive")
               ? "pending"
               : undefined,

scripts/worker.ts

@@ -19,36 +19,16 @@ async function processBatch() {
       url: { not: null },
       OR: [
         {
-          collection: {
-            owner: {
-              archiveAsScreenshot: true,
-            },
-          },
           image: null,
         },
         {
-          collection: {
-            owner: {
-              archiveAsScreenshot: true,
-            },
-          },
           image: "pending",
         },
         ///////////////////////
         {
-          collection: {
-            owner: {
-              archiveAsPDF: true,
-            },
-          },
           pdf: null,
         },
         {
-          collection: {
-            owner: {
-              archiveAsPDF: true,
-            },
-          },
           pdf: "pending",
         },
         ///////////////////////
@@ -76,36 +56,16 @@ async function processBatch() {
       url: { not: null },
       OR: [
         {
-          collection: {
-            owner: {
-              archiveAsScreenshot: true,
-            },
-          },
           image: null,
         },
         {
-          collection: {
-            owner: {
-              archiveAsScreenshot: true,
-            },
-          },
           image: "pending",
         },
         ///////////////////////
         {
-          collection: {
-            owner: {
-              archiveAsPDF: true,
-            },
-          },
           pdf: null,
         },
         {
-          collection: {
-            owner: {
-              archiveAsPDF: true,
-            },
-          },
           pdf: "pending",
         },
         ///////////////////////
@@ -115,13 +75,6 @@ async function processBatch() {
         {
           readable: "pending",
         },
-        ///////////////////////
-        {
-          preview: null,
-        },
-        {
-          preview: "pending",
-        },
       ],
     },
     take: archiveTakeCount,