use monolith instead of singlefile

components/CollectionCard.tsx

@@ -39,7 +39,7 @@ export default function CollectionCard({ collection, className }: Props) {
     username: "",
     image: "",
     archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsSinglefile: undefined as unknown as boolean,
+    archiveAsMonolith: undefined as unknown as boolean,
     archiveAsPDF: undefined as unknown as boolean,
   });
 
@@ -55,7 +55,7 @@ export default function CollectionCard({ collection, className }: Props) {
           username: account.username as string,
           image: account.image as string,
           archiveAsScreenshot: account.archiveAsScreenshot as boolean,
-          archiveAsSinglefile: account.archiveAsSinglefile as boolean,
+          archiveAsMonolith: account.archiveAsMonolith as boolean,
           archiveAsPDF: account.archiveAsPDF as boolean,
         });
       }

components/LinkViews/LinkComponents/LinkIcon.tsx

@@ -70,9 +70,14 @@ export default function LinkIcon({
           size={size}
           icon="bi-file-earmark-image"
         />
-      ) : link.type === "singlefile" ? (
+      ) : // : link.type === "monolith" ? (
-        <i className={`bi-filetype-html ${iconClasses}`}></i>
+      //   <LinkPlaceholderIcon
-      ) : undefined}
+      //     iconClasses={iconClasses + dimension}
+      //     size={size}
+      //     icon="bi-filetype-html"
+      //   />
+      // )
+      undefined}
     </>
   );
 }

components/ModalContent/EditCollectionSharingModal.tsx

@@ -68,7 +68,7 @@ export default function EditCollectionSharingModal({
     username: "",
     image: "",
     archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsSinglefile: undefined as unknown as boolean,
+    archiveAsMonolith: undefined as unknown as boolean,
     archiveAsPDF: undefined as unknown as boolean,
   });
 

components/ModalContent/NewLinkModal.tsx

@@ -30,7 +30,7 @@ export default function NewLinkModal({ onClose }: Props) {
     image: "",
     pdf: "",
     readable: "",
-    singlefile: "",
+    monolith: "",
     textContent: "",
     collection: {
       name: "",

components/ModalContent/PreservedFormatsModal.tsx

@@ -12,7 +12,7 @@ import { useSession } from "next-auth/react";
 import {
   pdfAvailable,
   readabilityAvailable,
-  singlefileAvailable,
+  monolithAvailable,
   screenshotAvailable,
 } from "@/lib/shared/getArchiveValidity";
 import PreservedFormatRow from "@/components/PreserverdFormatRow";
@@ -43,7 +43,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
     username: "",
     image: "",
     archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsSinglefile: undefined as unknown as boolean,
+    archiveAsMonolith: undefined as unknown as boolean,
     archiveAsPDF: undefined as unknown as boolean,
   });
 
@@ -61,7 +61,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
           username: account.username as string,
           image: account.image as string,
           archiveAsScreenshot: account.archiveAsScreenshot as boolean,
-          archiveAsSinglefile: account.archiveAsScreenshot as boolean,
+          archiveAsMonolith: account.archiveAsScreenshot as boolean,
           archiveAsPDF: account.archiveAsPDF as boolean,
         });
       }
@@ -76,8 +76,8 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
       (collectionOwner.archiveAsScreenshot === true
         ? link.pdf && link.pdf !== "pending"
         : true) &&
-      (collectionOwner.archiveAsSinglefile === true
+      (collectionOwner.archiveAsMonolith === true
-        ? link.singlefile && link.singlefile !== "pending"
+        ? link.monolith && link.monolith !== "pending"
         : true) &&
       (collectionOwner.archiveAsPDF === true
         ? link.pdf && link.pdf !== "pending"
@@ -92,7 +92,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
       screenshotAvailable(link) ||
       pdfAvailable(link) ||
       readabilityAvailable(link) ||
-      singlefileAvailable(link)
+      monolithAvailable(link)
     );
   };
 
@@ -124,7 +124,7 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
         clearInterval(interval);
       }
     };
-  }, [link?.singlefile]);
+  }, [link?.monolith]);
 
   const updateArchive = async () => {
     const load = toast.loading(t("sending_request"));
@@ -152,18 +152,18 @@ export default function PreservedFormatsModal({ onClose, activeLink }: Props) {
       {screenshotAvailable(link) ||
       pdfAvailable(link) ||
       readabilityAvailable(link) ||
-      singlefileAvailable(link) ? (
+      monolithAvailable(link) ? (
         <p className="mb-3">{t("available_formats")}</p>
       ) : (
         ""
       )}
 
       <div className={`flex flex-col gap-3`}>
-        {singlefileAvailable(link) ? (
+        {monolithAvailable(link) ? (
           <PreservedFormatRow
             name={t("webpage")}
             icon={"bi-filetype-html"}
-            format={ArchivedFormat.singlefile}
+            format={ArchivedFormat.monolith}
             activeLink={link}
             downloadable={true}
           />

components/ModalContent/UploadFileModal.tsx

@@ -33,7 +33,7 @@ export default function UploadFileModal({ onClose }: Props) {
     image: "",
     pdf: "",
     readable: "",
-    singlefile: "",
+    monolith: "",
     textContent: "",
     collection: {
       name: "",
@@ -97,7 +97,7 @@ export default function UploadFileModal({ onClose }: Props) {
   const submit = async () => {
     if (!submitLoader && file) {
       let fileType: ArchivedFormat | null = null;
-      let linkType: "url" | "image" | "singlefile" | "pdf" | null = null;
+      let linkType: "url" | "image" | "monolith" | "pdf" | null = null;
 
       if (file?.type === "image/jpg" || file.type === "image/jpeg") {
         fileType = ArchivedFormat.jpeg;
@@ -105,13 +105,14 @@ export default function UploadFileModal({ onClose }: Props) {
       } else if (file.type === "image/png") {
         fileType = ArchivedFormat.png;
         linkType = "image";
-      } else if (file.type === "text/html") {
-        fileType = ArchivedFormat.singlefile;
-        linkType = "singlefile";
       } else if (file.type === "application/pdf") {
         fileType = ArchivedFormat.pdf;
         linkType = "pdf";
       }
+      // else if (file.type === "text/html") {
+      //   fileType = ArchivedFormat.monolith;
+      //   linkType = "monolith";
+      // }
 
       setSubmitLoader(true);
       const load = toast.loading(t("creating"));

components/PreserverdFormatRow.tsx

@@ -61,7 +61,7 @@ export default function PreservedFormatRow({
         clearInterval(interval);
       }
     };
-  }, [link?.image, link?.pdf, link?.readable, link?.singlefile]);
+  }, [link?.image, link?.pdf, link?.readable, link?.monolith]);
 
   const handleDownload = () => {
     const path = `/api/v1/archives/${link?.id}?format=${format}`;
@@ -72,7 +72,7 @@ export default function PreservedFormatRow({
           const anchorElement = document.createElement("a");
           anchorElement.href = path;
           anchorElement.download =
-            format === ArchivedFormat.singlefile
+            format === ArchivedFormat.monolith
               ? "Webpage"
               : format === ArchivedFormat.pdf
                 ? "PDF"

components/ReadableView.tsx

@@ -81,11 +81,11 @@ export default function ReadableView({ link }: Props) {
       (link?.image === "pending" ||
         link?.pdf === "pending" ||
         link?.readable === "pending" ||
-        link?.singlefile === "pending" ||
+        link?.monolith === "pending" ||
         !link?.image ||
         !link?.pdf ||
         !link?.readable ||
-        !link?.singlefile)
+        !link?.monolith)
     ) {
       interval = setInterval(() => getLink(link.id as number), 5000);
     } else {
@@ -99,7 +99,7 @@ export default function ReadableView({ link }: Props) {
         clearInterval(interval);
       }
     };
-  }, [link?.image, link?.pdf, link?.readable, link?.singlefile]);
+  }, [link?.image, link?.pdf, link?.readable, link?.monolith]);
 
   const rgbToHex = (r: number, g: number, b: number): string =>
     "#" +

lib/api/archiveHandler.ts

@@ -102,7 +102,7 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
             readable: !link.readable?.startsWith("archive")
               ? "pending"
               : undefined,
-            singlefile: !link.singlefile?.startsWith("archive")
+            monolith: !link.monolith?.startsWith("archive")
               ? "pending"
               : undefined,
             preview: !link.readable?.startsWith("archive")
@@ -151,11 +151,11 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
           )
             await handleScreenshotAndPdf(link, page, user);
 
-          // SingleFile
+          // Monolith
           if (
-            !link.singlefile?.startsWith("archive") &&
+            !link.monolith?.startsWith("archive") &&
-            !link.singlefile?.startsWith("unavailable") &&
+            !link.monolith?.startsWith("unavailable") &&
-            user.archiveAsSinglefile &&
+            user.archiveAsMonolith &&
             link.url
           )
             await handleMonolith(link, content);
@@ -183,7 +183,7 @@ export default async function archiveHandler(link: LinksAndCollectionAndOwner) {
           image: !finalLink.image?.startsWith("archives")
             ? "unavailable"
             : undefined,
-          singlefile: !finalLink.singlefile?.startsWith("archives")
+          monolith: !finalLink.monolith?.startsWith("archives")
             ? "unavailable"
             : undefined,
           pdf: !finalLink.pdf?.startsWith("archives")

lib/api/controllers/public/users/getPublicUser.ts

@@ -75,7 +75,7 @@ export default async function getPublicUser(
     username: lessSensitiveInfo.username,
     image: lessSensitiveInfo.image,
     archiveAsScreenshot: lessSensitiveInfo.archiveAsScreenshot,
-    archiveAsSinglefile: lessSensitiveInfo.archiveAsSinglefile,
+    archiveAsMonolith: lessSensitiveInfo.archiveAsMonolith,
     archiveAsPDF: lessSensitiveInfo.archiveAsPDF,
   };
 

lib/api/controllers/users/userId/updateUserById.ts

@@ -207,7 +207,7 @@ export default async function updateUserById(
       ),
       locale: i18n.locales.includes(data.locale) ? data.locale : "en",
       archiveAsScreenshot: data.archiveAsScreenshot,
-      archiveAsSinglefile: data.archiveAsSinglefile,
+      archiveAsMonolith: data.archiveAsMonolith,
       archiveAsPDF: data.archiveAsPDF,
       archiveAsWaybackMachine: data.archiveAsWaybackMachine,
       linksRouteTo: data.linksRouteTo,

lib/api/preservationScheme/handleMonolith.ts

@@ -19,7 +19,7 @@ const handleMonolith = async (link: Link, content: string) => {
     );
 
     if (!html?.length) {
-      console.error("Error running SINGLEFILE_ARCHIVE_COMMAND: Empty buffer");
+      console.error("Error running MONOLITH: Empty buffer");
       return;
     }
 
@@ -30,12 +30,12 @@ const handleMonolith = async (link: Link, content: string) => {
       await prisma.link.update({
         where: { id: link.id },
         data: {
-          singlefile: `archives/${link.collectionId}/${link.id}.html`,
+          monolith: `archives/${link.collectionId}/${link.id}.html`,
         },
       });
     });
   } catch (err) {
-    console.error("Error running SINGLEFILE_ARCHIVE_COMMAND:", err);
+    console.error("Error running MONOLITH:", err);
   }
 };
 

lib/client/generateLinkHref.ts

@@ -8,7 +8,7 @@ import {
   pdfAvailable,
   readabilityAvailable,
   screenshotAvailable,
-  singlefileAvailable,
+  monolithAvailable,
 } from "../shared/getArchiveValidity";
 
 export const generateLinkHref = (
@@ -39,10 +39,10 @@ export const generateLinkHref = (
     return `/preserved/${link?.id}?format=${
       link?.image?.endsWith("png") ? ArchivedFormat.png : ArchivedFormat.jpeg
     }`;
-  } else if (account.linksRouteTo === LinksRouteTo.SINGLEFILE) {
+  } else if (account.linksRouteTo === LinksRouteTo.MONOLITH) {
-    if (!singlefileAvailable(link)) return link.url || "";
+    if (!monolithAvailable(link)) return link.url || "";
 
-    return `/preserved/${link?.id}?format=${ArchivedFormat.singlefile}`;
+    return `/preserved/${link?.id}?format=${ArchivedFormat.monolith}`;
   } else {
     return link.url || "";
   }

lib/shared/getArchiveValidity.ts

@@ -28,14 +28,14 @@ export function readabilityAvailable(
   );
 }
 
-export function singlefileAvailable(
+export function monolithAvailable(
   link: LinkIncludingShortenedCollectionAndTags
 ) {
   return (
     link &&
-    link.singlefile &&
+    link.monolith &&
-    link.singlefile !== "pending" &&
+    link.monolith !== "pending" &&
-    link.singlefile !== "unavailable"
+    link.monolith !== "unavailable"
   );
 }
 

pages/api/v1/archives/[linkId].ts

@@ -29,7 +29,7 @@ export default async function Index(req: NextApiRequest, res: NextApiResponse) {
   else if (format === ArchivedFormat.jpeg) suffix = ".jpeg";
   else if (format === ArchivedFormat.pdf) suffix = ".pdf";
   else if (format === ArchivedFormat.readability) suffix = "_readability.json";
-  else if (format === ArchivedFormat.singlefile) suffix = ".html";
+  else if (format === ArchivedFormat.monolith) suffix = ".html";
 
   //@ts-ignore
   if (!linkId || !suffix)

pages/api/v1/links/[id]/archive/index.ts

@@ -76,7 +76,7 @@ const deleteArchivedFiles = async (link: Link & { collection: Collection }) => {
       image: null,
       pdf: null,
       readable: null,
-      singlefile: null,
+      monolith: null,
       preview: null,
     },
   });

pages/collections/[id].tsx

@@ -59,7 +59,7 @@ export default function Index() {
     username: "",
     image: "",
     archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsSinglefile: undefined as unknown as boolean,
+    archiveAsMonolith: undefined as unknown as boolean,
     archiveAsPDF: undefined as unknown as boolean,
   });
 
@@ -77,7 +77,7 @@ export default function Index() {
           username: account.username as string,
           image: account.image as string,
           archiveAsScreenshot: account.archiveAsScreenshot as boolean,
-          archiveAsSinglefile: account.archiveAsScreenshot as boolean,
+          archiveAsMonolith: account.archiveAsScreenshot as boolean,
           archiveAsPDF: account.archiveAsPDF as boolean,
         });
       }

pages/preserved/[id].tsx

@@ -37,9 +37,9 @@ export default function Index() {
       {link && Number(router.query.format) === ArchivedFormat.readability && (
         <ReadableView link={link} />
       )}
-      {link && Number(router.query.format) === ArchivedFormat.singlefile && (
+      {link && Number(router.query.format) === ArchivedFormat.monolith && (
         <iframe
-          src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.singlefile}`}
+          src={`/api/v1/archives/${link.id}?format=${ArchivedFormat.monolith}`}
           className="w-full h-screen border-none"
         ></iframe>
       )}

pages/public/collections/[id].tsx

@@ -42,7 +42,7 @@ export default function PublicCollections() {
     username: "",
     image: "",
     archiveAsScreenshot: undefined as unknown as boolean,
-    archiveAsSinglefile: undefined as unknown as boolean,
+    archiveAsMonolith: undefined as unknown as boolean,
     archiveAsPDF: undefined as unknown as boolean,
   });
 

pages/settings/preference.tsx

@@ -26,8 +26,8 @@ export default function Appearance() {
     account.archiveAsPDF
   );
 
-  const [archiveAsSinglefile, setArchiveAsSinglefile] = useState<boolean>(
+  const [archiveAsMonolith, setArchiveAsMonolith] = useState<boolean>(
-    account.archiveAsSinglefile
+    account.archiveAsMonolith
   );
 
   const [archiveAsWaybackMachine, setArchiveAsWaybackMachine] =
@@ -39,7 +39,7 @@ export default function Appearance() {
     setUser({
       ...account,
       archiveAsScreenshot,
-      archiveAsSinglefile,
+      archiveAsMonolith,
       archiveAsPDF,
       archiveAsWaybackMachine,
       linksRouteTo,
@@ -48,7 +48,7 @@ export default function Appearance() {
   }, [
     account,
     archiveAsScreenshot,
-    archiveAsSinglefile,
+    archiveAsMonolith,
     archiveAsPDF,
     archiveAsWaybackMachine,
     linksRouteTo,
@@ -62,7 +62,7 @@ export default function Appearance() {
   useEffect(() => {
     if (!objectIsEmpty(account)) {
       setArchiveAsScreenshot(account.archiveAsScreenshot);
-      setArchiveAsSinglefile(account.archiveAsSinglefile);
+      setArchiveAsMonolith(account.archiveAsMonolith);
       setArchiveAsPDF(account.archiveAsPDF);
       setArchiveAsWaybackMachine(account.archiveAsWaybackMachine);
       setLinksRouteTo(account.linksRouteTo);
@@ -136,9 +136,9 @@ export default function Appearance() {
             />
 
             <Checkbox
-              label="Singlefile"
+              label={t("webpage")}
-              state={archiveAsSinglefile}
+              state={archiveAsMonolith}
-              onClick={() => setArchiveAsSinglefile(!archiveAsSinglefile)}
+              onClick={() => setArchiveAsMonolith(!archiveAsMonolith)}
             />
 
             <Checkbox
@@ -229,27 +229,13 @@ export default function Appearance() {
                 type="radio"
                 name="link-preference-radio"
                 className="radio checked:bg-primary"
-                value="Singlefile"
+                value="Monolith"
-                checked={linksRouteTo === LinksRouteTo.SINGLEFILE}
+                checked={linksRouteTo === LinksRouteTo.MONOLITH}
-                onChange={() => setLinksRouteTo(LinksRouteTo.SINGLEFILE)}
+                onChange={() => setLinksRouteTo(LinksRouteTo.MONOLITH)}
               />
-              <span className="label-text">Open Singlefile, if available</span>
+              <span className="label-text">
-            </label>
+                {t("open_webpage_if_available")}
-
+              </span>
-            <label
-              className="label cursor-pointer flex gap-2 justify-start w-fit"
-              tabIndex={0}
-              role="button"
-            >
-              <input
-                type="radio"
-                name="link-preference-radio"
-                className="radio checked:bg-primary"
-                value="Singlefile"
-                checked={linksRouteTo === LinksRouteTo.SINGLEFILE}
-                onChange={() => setLinksRouteTo(LinksRouteTo.SINGLEFILE)}
-              />
-              <span className="label-text">Open Singlefile, if available</span>
             </label>
 
             <label

prisma/migrations/20240628014129_rename_field/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `singlefile` on the `Link` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Link" DROP COLUMN "singlefile",
+ADD COLUMN     "monolith" TEXT;

prisma/schema.prisma

@@ -139,7 +139,7 @@ model Link {
   image         String?
   pdf           String?
   readable      String?
-  singlefile    String?
+  monolith      String?
   lastPreserved DateTime?
   importDate    DateTime?
   createdAt     DateTime   @default(now())

public/locales/en/common.json

@@ -166,6 +166,7 @@
   "open_pdf_if_available": "Open PDF, if available",
   "open_readable_if_available": "Open Readable, if available",
   "open_screenshot_if_available": "Open Screenshot, if available",
+  "open_webpage_if_available": "Open Webpage copy, if available",
   "tag_renamed": "Tag renamed!",
   "tag_deleted": "Tag deleted!",
   "rename_tag": "Rename Tag",

scripts/worker.ts

@@ -40,10 +40,10 @@ async function processBatch() {
         },
         ///////////////////////
         {
-          singlefile: null,
+          monolith: null,
         },
         {
-          singlefile: "pending",
+          monolith: "pending",
         },
       ],
     },
@@ -84,10 +84,10 @@ async function processBatch() {
         },
         ///////////////////////
         {
-          singlefile: null,
+          monolith: null,
         },
         {
-          singlefile: "pending",
+          monolith: "pending",
         },
       ],
     },

types/global.ts

@@ -137,14 +137,14 @@ export enum ArchivedFormat {
   jpeg,
   pdf,
   readability,
-  singlefile,
+  monolith,
 }
 
 export enum LinkType {
   url,
   pdf,
   image,
-  singlefile,
+  monolith,
 }
 
 export enum TokenExpiry {