@itsmrtr/bunkoshelf 1.8.2 → 1.9.0

package/dist/src/components/settings/UploadMangaForm.tsx

@@ -8,10 +8,7 @@ import { extractFromArchive } from "@/lib/client/archiveExtractor";
 import { parseComicInfo } from "@/lib/client/comicInfoParser";
 import { generateCoverFilename } from "@/lib/client/coverHasher";
 import { sendPushBroadcast } from "@/actions/web-push";
-import {
-  normalizeLibraryDirectoryName,
-  sanitizeLibraryDirectoryName,
-} from "@/lib/libraryDirectory";
+import { normalizeLibraryDirectoryName } from "@/lib/libraryDirectory";
 import type { Dictionary } from "@/lib/types";
 import type { ComicMetadata } from "@/lib/types/manga";
 
@@ -26,7 +23,7 @@ interface ExtractedFileData {
 }
 
 interface UploadMetadata {
-  type: "manga" | "books";
+  type: "manga" | "comic" | "books" | "others";
   isNew: boolean;
   newDirectoryName: string | null;
   isOneshot: boolean;
@@ -52,7 +49,7 @@ interface UploadMangaFormProps {
 }
 
 export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
-  const [isManga, setIsManga] = useState(true);
+  const [libraryType, setLibraryType] = useState<UploadMetadata["type"]>("manga");
   const [directories, setDirectories] = useState<string[]>([]);
   const [selectedDirectory, setSelectedDirectory] = useState("");
   const [newDirectoryName, setNewDirectoryName] = useState("");
@@ -66,6 +63,13 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
   const extractedDataRef = useRef<Map<string, ExtractedFileData>>(new Map());
   const { addToast } = useToast()!;
 
+  const selectLibraryType = (type: UploadMetadata["type"]) => {
+    setLibraryType(type);
+    setSelectedDirectory("");
+    setNewDirectoryName("");
+    setIsOneshot(false);
+  };
+
   const isOneshotMode =
     (selectedDirectory === "new" && isOneshot) ||
     (selectedDirectory !== "new" &&
@@ -76,9 +80,8 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
     const fetchDirectories = async () => {
       let _err: unknown;
       try {
-        const type = isManga ? "manga" : "books";
         const res = await fetch(
-          `/api/admin/upload/library?type=${type}&action=list`,
+          `/api/admin/upload/library?type=${libraryType}&action=list`,
         );
         const data = await res.json();
 
@@ -99,7 +102,7 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
     };
 
     fetchDirectories();
-  }, [isManga, addToast]);
+  }, [libraryType, addToast]);
 
   const handleFilesAccepted = async (acceptedFiles: File[]) => {
     setFiles(acceptedFiles);
@@ -290,7 +293,7 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
       setIsLoading(true);
 
       const metadata: UploadMetadata = {
-        type: isManga ? "manga" : "books",
+        type: libraryType,
         isNew: selectedDirectory === "new",
         newDirectoryName:
           selectedDirectory === "new"
@@ -375,7 +378,7 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
         await sendPushBroadcast({
           title: intl.push.ttLibraryUpdate as string,
           body: intl.push.bodyLibraryUpdate as string,
-          url: `/${lang}/manga`,
+          url: `/${lang}/${libraryType === "manga" ? "manga" : libraryType === "books" ? "books" : "others"}`,
         });
       } catch (e) {
         console.error("Error al enviar notificaciones push:", e);
@@ -423,9 +426,9 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
         <div className="flex gap-2">
           <button
             type="button"
-            onClick={() => setIsManga(true)}
+            onClick={() => selectLibraryType("manga")}
             className={`font-bold px-6 py-2 rounded-lg leading-none uppercase transition-all duration-300 cursor-pointer ${
-              isManga
+              libraryType === "manga"
                 ? "text-sand bg-onix border border-onix"
                 : "text-onix bg-sand border border-sand hover:text-sand hover:bg-onix hover:border-onix"
             }`}
@@ -434,15 +437,37 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
           </button>
           <button
             type="button"
-            onClick={() => setIsManga(false)}
+            onClick={() => selectLibraryType("comic")}
+            className={`font-bold px-6 py-2 rounded-lg leading-none uppercase transition-all duration-300 cursor-pointer ${
+              libraryType === "comic"
+                ? "text-sand bg-onix border border-onix"
+                : "text-onix bg-sand border border-sand hover:text-sand hover:bg-onix hover:border-onix"
+            }`}
+          >
+            {intl.settings.uploadLibraryComic as string}
+          </button>
+          <button
+            type="button"
+            onClick={() => selectLibraryType("books")}
             className={`font-bold px-6 py-2 rounded-lg leading-none uppercase transition-all duration-300 cursor-pointer ${
-              !isManga
+              libraryType === "books"
                 ? "text-sand bg-onix border border-onix"
                 : "text-onix bg-sand border border-sand hover:text-sand hover:bg-onix hover:border-onix"
             }`}
           >
             {intl.settings.uploadLibraryBook as string}
           </button>
+          <button
+            type="button"
+            onClick={() => selectLibraryType("others")}
+            className={`font-bold px-6 py-2 rounded-lg leading-none uppercase transition-all duration-300 cursor-pointer ${
+              libraryType === "others"
+                ? "text-sand bg-onix border border-onix"
+                : "text-onix bg-sand border border-sand hover:text-sand hover:bg-onix hover:border-onix"
+            }`}
+          >
+            {intl.settings.uploadLibraryOther as string}
+          </button>
         </div>
 
         <select
@@ -453,9 +478,13 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
         >
           <option value="">{intl.settings.uploadLibrarySelect as string}</option>
           <option value="new">
-            {isManga
+            {libraryType === "manga"
               ? (intl.settings.uploadLibraryNewManga as string)
-              : (intl.settings.uploadLibraryNewBook as string)}
+              : libraryType === "books"
+                ? (intl.settings.uploadLibraryNewBook as string)
+                : libraryType === "comic"
+                  ? (intl.settings.uploadLibraryNewComic as string)
+                  : (intl.settings.uploadLibraryNewOther as string)}
           </option>
           {directories.map((dir) => (
             <option key={dir} value={dir}>
@@ -469,9 +498,7 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
             <input
               type="text"
               value={newDirectoryName}
-              onChange={(e) =>
-                setNewDirectoryName(sanitizeLibraryDirectoryName(e.target.value))
-              }
+              onChange={(e) => setNewDirectoryName(e.target.value)}
               placeholder={intl.settings.uploadLibraryNewFolder as string}
               className="bg-pearl border border-onix rounded-lg w-full px-5 py-3"
               required

package/dist/src/components/sidebar/MainNav.tsx

@@ -7,17 +7,19 @@ import { usePathname, useParams } from "next/navigation";
 import clsx from "clsx";
 import { getMainNavLinks } from "@/lib/nav/mainNav";
 import type { Dictionary, Session } from "@/lib/types";
+import type { LibrarySectionCounts } from "@/lib/db/library";
 
 interface MainNavProps {
   intl: Dictionary;
   user: Session;
+  libraryCounts: LibrarySectionCounts;
 }
 
-export default function MainNav({ intl, user }: MainNavProps) {
+export default function MainNav({ intl, user, libraryCounts }: MainNavProps) {
   const params = useParams();
   const currentLang = (params.lang as string) || "es";
   const pathname = usePathname();
-  const links = getMainNavLinks({ intl, user, lang: currentLang, pathname });
+  const links = getMainNavLinks({ intl, user, lang: currentLang, pathname, libraryCounts });
   const isLibraryActive = links.some(
     (link) => link.isDropdown && link.isActive,
   );

package/dist/src/components/sidebar/sidebar.tsx

@@ -7,6 +7,7 @@ import SearchInput from "@/components/search/SearchImput";
 import SearchModal from "@/components/search/SearchModal";
 import type { ChallengeData, Dictionary, Locale, Session } from "@/lib/types";
 import type { VersionInfo } from "@/lib/versionInfo";
+import type { LibrarySectionCounts } from "@/lib/db/library";
 
 interface SidebarProps {
   lang: Locale;
@@ -14,6 +15,7 @@ interface SidebarProps {
   user: Session | null;
   challengeData: ChallengeData | null;
   versionData: VersionInfo;
+  libraryCounts: LibrarySectionCounts;
 }
 
 export default function Sidebar({
@@ -22,6 +24,7 @@ export default function Sidebar({
   user,
   challengeData,
   versionData,
+  libraryCounts,
 }: SidebarProps) {
   return (
     <>
@@ -34,7 +37,7 @@ export default function Sidebar({
 
         {user && (
           <div className="flex-1">
-            <MainNav intl={intl} user={user} />
+            <MainNav intl={intl} user={user} libraryCounts={libraryCounts} />
 
             {/* <div className="mt-16">
               <SearchInput intl={intl} />

package/dist/src/components/ui/MangaCard.tsx

@@ -6,6 +6,7 @@ import clsx from "clsx";
 import { useRef } from "react";
 import { CloudIcon } from "lucide-react";
 import { usePwa } from "@/components/pwa/PwaProvider";
+import { getOneshotLabel, type LibrarySection } from "@/lib/librarySection";
 import type { DictionarySection } from "@/lib/types";
 
 interface MangaCardProps {
@@ -50,6 +51,12 @@ export default function MangaCard({
   const { offlineSlugs, offlineVolumeIds, offlineSeriesIds } = usePwa();
 
   const manga = t.manga as DictionarySection;
+  const section: LibrarySection = href.includes("/comic/")
+    ? "comic"
+    : href.includes("/others/")
+      ? "others"
+      : "manga";
+  const oneshotLabel = getOneshotLabel(section, manga);
   const volumeSlug = href.split("?")[0].split("/").pop();
   const isOfflineCover = cover?.startsWith("/offline/") ?? false;
   const isOfflineAvailable = isSeries
@@ -142,7 +149,7 @@ export default function MangaCard({
           )}
           {!isSeries && isOneshot && (
             <span className="bg-neutral-700 text-[10px] leading-none uppercase py-1 px-1.5 rounded">
-              Oneshot
+              {oneshotLabel}
             </span>
           )}
           {!isSeries && isOfflineAvailable && (

package/dist/src/components/ui/PushButton.tsx

@@ -3,6 +3,7 @@
 import { useEffect, useState } from "react";
 import { BellIcon } from "lucide-react";
 import { subscribePush, sendPushToSubscription } from "@/actions/web-push";
+import { useAlertDialog } from "@/components/AlertDialogProvider";
 import type { DictionarySection } from "@/lib/types";
 
 function urlBase64ToUint8Array(base64String: string): ArrayBuffer {
@@ -48,6 +49,7 @@ export default function PushButton({ lang, intl, vapidPublicKey }: PushButtonPro
   const [permission, setPermission] = useState("default");
   const [hasSubscription, setHasSubscription] = useState(false);
   const [ready, setReady] = useState(false);
+  const { alert } = useAlertDialog()!;
 
   useEffect(() => {
     if (typeof window === "undefined") return;
@@ -71,13 +73,25 @@ export default function PushButton({ lang, intl, vapidPublicKey }: PushButtonPro
   }, []);
 
   async function subscribeUser() {
-    if (!supported) return alert("Push no es soportado en este navegador");
+    const push = intl.push as DictionarySection;
+
+    if (!supported) {
+      return alert({
+        title: push.unsupportedTitle as string,
+        description: push.unsupportedDescription as string,
+      });
+    }
     if (!vapidPublicKey) return;
 
     if (Notification.permission === "default") {
       const perm = await Notification.requestPermission();
       setPermission(perm);
-      if (perm !== "granted") return alert("Permiso denegado");
+      if (perm !== "granted") {
+        return alert({
+          title: push.permissionDeniedTitle as string,
+          description: push.permissionDeniedDescription as string,
+        });
+      }
     }
 
     if (Notification.permission === "granted") {
@@ -93,7 +107,6 @@ export default function PushButton({ lang, intl, vapidPublicKey }: PushButtonPro
         await subscribePush(subInput, getDeviceName());
         setHasSubscription(true);
 
-        const push = intl.push as DictionarySection;
         await sendPushToSubscription(subInput, {
           title: push.ttSubscription as string,
           body: push.bodySubscription as string,

package/dist/src/lib/db/backup.ts

@@ -5,9 +5,9 @@ const TABLES = [
   "users",
   "reading_challenges",
   "push_subscriptions",
-  "manga_series",
+  "library_series",
   "volume_metadata",
-  "manga_volumes",
+  "library_volumes",
   "user_to_series",
   "user_to_volumes",
   "daily_reading_logs",

package/dist/src/lib/db/ingestion.ts

@@ -2,6 +2,7 @@ import { createId } from "@paralleldrive/cuid2";
 import { execute, query, queryOne } from "./query";
 import { buildNaturalSortKey } from "@/lib/naturalSort";
 import type { ComicMetadata } from "@/lib/types";
+import type { LibraryContentSection } from "@/lib/librarySection";
 
 export interface IndexedSeries {
   id: string;
@@ -9,6 +10,7 @@ export interface IndexedSeries {
   title: string;
   path: string;
   isOneshot: boolean;
+  librarySection: LibraryContentSection;
 }
 
 export interface IndexedVolume {
@@ -30,6 +32,7 @@ interface SeriesRow {
   title: string;
   path: string;
   is_oneshot: boolean;
+  library_section: LibraryContentSection;
 }
 
 interface VolumeRow {
@@ -52,6 +55,7 @@ function mapSeries(row: SeriesRow): IndexedSeries {
     title: row.title,
     path: row.path,
     isOneshot: row.is_oneshot,
+    librarySection: row.library_section,
   };
 }
 
@@ -75,29 +79,32 @@ export async function upsertSeriesRecord(input: {
   title: string;
   path: string;
   isOneshot: boolean;
+  librarySection: LibraryContentSection;
   mtime: Date;
 }): Promise<IndexedSeries> {
   const row = await queryOne<SeriesRow>(
     `
-      INSERT INTO manga_series (
+      INSERT INTO library_series (
         id,
         slug,
         title,
         sort_title,
         path,
         is_oneshot,
+        library_section,
         mtime
       )
-      VALUES ($1, $2, $3, $4, $5, $6, $7)
-      ON CONFLICT (slug)
+      VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+      ON CONFLICT (library_section, slug)
       DO UPDATE SET
         title = EXCLUDED.title,
         sort_title = EXCLUDED.sort_title,
         path = EXCLUDED.path,
         is_oneshot = EXCLUDED.is_oneshot,
+        library_section = EXCLUDED.library_section,
         mtime = EXCLUDED.mtime,
         updated_at = NOW()
-      RETURNING id, slug, title, path, is_oneshot
+      RETURNING id, slug, title, path, is_oneshot, library_section
     `,
     [
       createId(),
@@ -106,6 +113,7 @@ export async function upsertSeriesRecord(input: {
       buildNaturalSortKey(input.title),
       input.path,
       input.isOneshot,
+      input.librarySection,
       input.mtime,
     ]
   );
@@ -129,7 +137,7 @@ export async function upsertVolumeRecord(input: {
 }): Promise<IndexedVolume> {
   const row = await queryOne<VolumeRow>(
     `
-      INSERT INTO manga_volumes (
+      INSERT INTO library_volumes (
         id,
         slug,
         title,