@itsmrtr/bunkoshelf 1.11.6 → 1.12.1

package/dist/src/components/library/manga/grid/VolumesIndex.tsx

@@ -73,7 +73,9 @@ export default async function VolumesIndex({
       <div className="flex items-center mb-4">
         <h2 className="flex items-center text-base md:text-lg mr-4">
           <BookCopyIcon size={28} className="mr-2" />
-          {intl.manga.allVolumes as string}
+          {section === "others"
+            ? (intl.libraries.allOtherWorks as string)
+            : (intl.manga.allVolumes as string)}
         </h2>
 
         <FiltersDrawer intl={intl} scope={scope} />
@@ -87,7 +89,7 @@ export default async function VolumesIndex({
           return (
             <MangaCard
               key={entry.title}
-              title={entry.meta?.title}
+              title={entry.meta?.title ?? entry.title}
               href={href}
               isSeries={false}
               isOneshot={entry.isOneshot}

package/dist/src/components/reader/EpubReader.tsx

@@ -9,7 +9,6 @@ import {
   MenuIcon,
   Minimize2Icon,
   SearchIcon,
-  Settings2Icon,
   Trash2Icon,
 } from "lucide-react";
 import type { Dictionary } from "@/lib/types";
@@ -97,9 +96,7 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
   const reader = intl.epubReader as Record<string, string>;
   const viewerRef = useRef<HTMLDivElement>(null);
   const tocPanelRef = useRef<HTMLElement>(null);
-  const settingsPanelRef = useRef<HTMLDivElement>(null);
   const tocToggleRef = useRef<HTMLButtonElement>(null);
-  const settingsToggleRef = useRef<HTMLButtonElement>(null);
   const bookRef = useRef<any>(null);
   const renditionRef = useRef<any>(null);
   const annotationsRef = useRef<ReaderState["annotations"]>([]);
@@ -125,7 +122,6 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
   const [margin, setMargin] = useState(24);
   const [columnWidth, setColumnWidth] = useState(720);
   const [preferencesLoaded, setPreferencesLoaded] = useState(false);
-  const [showSettings, setShowSettings] = useState(false);
   const [showToc, setShowToc] = useState(false);
   const [coverVisible, setCoverVisible] = useState(false);
   const [bookmarkCfis, setBookmarkCfis] = useState<string[]>([]);
@@ -137,7 +133,7 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
   const [noteDraft, setNoteDraft] = useState("");
   const [noteEditorOpen, setNoteEditorOpen] = useState(false);
   const [annotationNoteEditorOpen, setAnnotationNoteEditorOpen] = useState(false);
-  const [tocTab, setTocTab] = useState<"contents" | "bookmarks" | "annotations">("contents");
+  const [tocTab, setTocTab] = useState<"contents" | "bookmarks" | "annotations" | "settings">("contents");
   const [search, setSearch] = useState("");
   const [matches, setMatches] = useState<Array<{ label: string; cfi: string }>>([]);
 
@@ -158,7 +154,6 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
   }, [isOpen]);
 
   const closePanels = useCallback(() => {
-    setShowSettings(false);
     setShowToc(false);
   }, []);
 
@@ -509,7 +504,7 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
     if (target?.closest("input, textarea, select, [contenteditable='true']")) return;
     if (event.key === "Escape") {
       event.preventDefault();
-      if (showSettings || showToc) closePanels();
+      if (showToc) closePanels();
       else closeReader();
       return;
     }
@@ -521,7 +516,7 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
       event.preventDefault();
       navigateNext();
     }
-  }, [closePanels, closeReader, isOpen, navigateNext, navigatePrevious, showSettings, showToc]);
+  }, [closePanels, closeReader, isOpen, navigateNext, navigatePrevious, showToc]);
 
   useEffect(() => {
     readerKeyHandlerRef.current = handleReaderKey;
@@ -533,20 +528,18 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
   }, [handleReaderKey]);
 
   useEffect(() => {
-    if (!isOpen || (!showSettings && !showToc)) return;
+    if (!isOpen || !showToc) return;
     const closeOnOutsidePointer = (event: PointerEvent) => {
       const target = event.target as Node;
       if (
-        settingsPanelRef.current?.contains(target)
-        || tocPanelRef.current?.contains(target)
-        || settingsToggleRef.current?.contains(target)
+        tocPanelRef.current?.contains(target)
         || tocToggleRef.current?.contains(target)
       ) return;
       closePanels();
     };
     document.addEventListener("pointerdown", closeOnOutsidePointer);
     return () => document.removeEventListener("pointerdown", closeOnOutsidePointer);
-  }, [closePanels, isOpen, showSettings, showToc]);
+  }, [closePanels, isOpen, showToc]);
 
   const openToc = async (href: string) => {
     coverVisibleRef.current = false;
@@ -681,18 +674,12 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
     setMatches(results.slice(0, 50));
   };
 
-  const togglePanel = (panel: "toc" | "settings") => {
+  const toggleToc = () => {
     setSelectionMenu(null);
     setAnnotationMenu(null);
     setNoteEditorOpen(false);
     setAnnotationNoteEditorOpen(false);
-    if (panel === "toc") {
-      setShowToc((visible) => !visible);
-      setShowSettings(false);
-    } else {
-      setShowSettings((visible) => !visible);
-      setShowToc(false);
-    }
+    setShowToc((visible) => !visible);
   };
 
   if (!isOpen) return null;
@@ -700,26 +687,13 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
 
   return (
     <div className="fixed inset-0 z-50 overflow-hidden text-sand" style={{ background: themeStyles[theme].background }}>
-      {showSettings && (
-        <div ref={settingsPanelRef} className="absolute bottom-[calc(3.5rem+max(0.75rem,env(safe-area-inset-bottom)))] right-3 z-40 max-h-[calc(100dvh-5.5rem-max(0.75rem,env(safe-area-inset-bottom)))] w-[min(24rem,calc(100vw-1.5rem))] overflow-y-auto rounded-lg bg-blackamber p-5 shadow-xl md:bottom-14 md:max-h-[calc(100dvh-4.5rem)]">
-          <div className="grid gap-4 text-base">
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.theme}<select value={theme} onChange={(event) => setTheme(event.target.value as ReaderTheme)} className="cursor-pointer rounded bg-onix px-3 py-2 text-base"><option value="light">{reader.light}</option><option value="sepia">{reader.sepia}</option><option value="dark">{reader.dark}</option></select></label>
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.flow}<select value={flow} onChange={(event) => setFlow(event.target.value as ReaderFlow)} className="cursor-pointer rounded bg-onix px-3 py-2 text-base"><option value="paginated">{reader.paginated}</option><option value="scrolled-continuous">{reader.scrolled}</option></select></label>
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.font}<select value={fontFamily} onChange={(event) => setFontFamily(event.target.value as "serif" | "sans")} className="cursor-pointer rounded bg-onix px-3 py-2 text-base"><option value="serif">{reader.serif}</option><option value="sans">{reader.sans}</option></select></label>
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.fontSize}<input className="w-full cursor-pointer accent-lilah" type="range" min="80" max="160" value={fontSize} onChange={(event) => setFontSize(Number(event.target.value))} /></label>
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.lineHeight}<input className="w-full cursor-pointer accent-lilah" type="range" min="1.2" max="2.4" step="0.1" value={lineHeight} onChange={(event) => setLineHeight(Number(event.target.value))} /></label>
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.margin}<input className="w-full cursor-pointer accent-lilah" type="range" min="0" max="80" value={margin} onChange={(event) => setMargin(Number(event.target.value))} /></label>
-            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.column}<input className="w-full cursor-pointer accent-lilah" type="range" min="320" max="1200" value={columnWidth} onChange={(event) => setColumnWidth(Number(event.target.value))} /></label>
-          </div>
-        </div>
-      )}
-
       {showToc && (
-        <aside ref={tocPanelRef} className="absolute bottom-[calc(3.5rem+max(0.75rem,env(safe-area-inset-bottom)))] left-0 top-0 z-40 w-[min(24rem,calc(100vw-1.5rem))] overflow-y-auto bg-blackamber p-5 shadow-xl md:bottom-14">
-          <div className="mb-4 flex gap-2 border-b border-white/15">
+        <aside ref={tocPanelRef} className="absolute bottom-[calc(3.5rem+max(0.75rem,env(safe-area-inset-bottom)))] left-0 top-0 z-40 w-full overflow-y-auto bg-blackamber p-5 shadow-xl md:bottom-14 md:w-96">
+          <div className="mb-4 flex flex-wrap gap-2 border-b border-white/15">
             <button onClick={() => setTocTab("contents")} className={`cursor-pointer px-2 pb-2 text-base ${tocTab === "contents" ? "border-b-2 border-lilah text-lilah" : "text-sand"}`}>{reader.contents}</button>
             <button onClick={() => setTocTab("bookmarks")} className={`cursor-pointer px-2 pb-2 text-base ${tocTab === "bookmarks" ? "border-b-2 border-lilah text-lilah" : "text-sand"}`}>{reader.bookmarks} {bookmarks.length > 0 ? `(${bookmarks.length})` : ""}</button>
             <button onClick={() => setTocTab("annotations")} className={`cursor-pointer px-2 pb-2 text-base ${tocTab === "annotations" ? "border-b-2 border-lilah text-lilah" : "text-sand"}`}>{reader.annotations} {annotations.length > 0 ? `(${annotations.length})` : ""}</button>
+            {layout === "reflowable" && <button onClick={() => setTocTab("settings")} className={`cursor-pointer px-2 pb-2 text-base ${tocTab === "settings" ? "border-b-2 border-lilah text-lilah" : "text-sand"}`}>{reader.settings}</button>}
           </div>
           {tocTab === "contents" ? <>
             <div className="mb-4 flex gap-2"><input value={search} onChange={(event) => setSearch(event.target.value)} onKeyDown={(event) => event.key === "Enter" && runSearch()} placeholder={reader.searchPlaceholder} className="min-w-0 flex-1 rounded bg-onix px-3 py-2 text-base" /><button onClick={runSearch} aria-label={reader.searchPlaceholder} className="cursor-pointer rounded bg-lilah p-2 text-onix"><SearchIcon size={20} /></button></div>
@@ -727,8 +701,16 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
             {toc.map((entry) => <button key={entry.href} onClick={() => openToc(entry.href)} className="block w-full cursor-pointer py-2 text-left text-base hover:text-lilah">{entry.label}</button>)}
           </> : tocTab === "bookmarks" ? <div className="space-y-1">
             {bookmarks.length === 0 ? <p className="py-2 text-base text-neutral-400">{reader.noBookmarks}</p> : bookmarks.map((bookmark) => <div key={bookmark.id} className="flex items-center gap-2 rounded hover:bg-onix"><button onClick={() => openToc(bookmark.cfi)} className="min-w-0 flex-1 cursor-pointer px-2 py-3 text-left text-base hover:text-lilah"><span className="block truncate">{bookmark.chapterLabel || bookmark.label || reader.markedPage}</span><span className="mt-1 block text-sm text-neutral-400">{reader.goToLocation}</span></button><button onClick={() => removeBookmark(bookmark)} title={reader.removeBookmark} aria-label={reader.removeBookmark} className="cursor-pointer p-3 text-neutral-400 hover:text-lilah"><Trash2Icon size={18} /></button></div>)}
-          </div> : <div className="space-y-2">
+          </div> : tocTab === "annotations" ? <div className="space-y-2">
             {annotations.length === 0 ? <p className="py-2 text-base text-neutral-400">{reader.noAnnotations}</p> : annotations.map((annotation) => <div key={annotation.id} className="rounded bg-onix/60 p-3"><button onClick={() => openToc(annotation.cfiRange)} className="block w-full cursor-pointer text-left hover:text-lilah"><span className="block text-base leading-relaxed">{annotation.excerpt || reader.highlightedText}</span><span className="mt-2 block text-sm text-lilah">{reader.goToLocation}</span></button>{annotation.note && <p className="mt-3 border-t border-white/10 pt-3 text-base text-sand"><span className="mr-2 text-sm uppercase text-neutral-400">{reader.note}</span>{annotation.note}</p>}<button onClick={() => removeAnnotation(annotation)} className="mt-3 flex cursor-pointer items-center gap-2 text-sm text-neutral-400 hover:text-lilah"><Trash2Icon size={16} />{reader.deleteHighlight}</button></div>)}
+          </div> : <div className="grid gap-4 text-base">
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.theme}<select value={theme} onChange={(event) => setTheme(event.target.value as ReaderTheme)} className="cursor-pointer rounded bg-onix px-3 py-2 text-base"><option value="light">{reader.light}</option><option value="sepia">{reader.sepia}</option><option value="dark">{reader.dark}</option></select></label>
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.flow}<select value={flow} onChange={(event) => setFlow(event.target.value as ReaderFlow)} className="cursor-pointer rounded bg-onix px-3 py-2 text-base"><option value="paginated">{reader.paginated}</option><option value="scrolled-continuous">{reader.scrolled}</option></select></label>
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.font}<select value={fontFamily} onChange={(event) => setFontFamily(event.target.value as "serif" | "sans")} className="cursor-pointer rounded bg-onix px-3 py-2 text-base"><option value="serif">{reader.serif}</option><option value="sans">{reader.sans}</option></select></label>
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.fontSize}<input className="w-full cursor-pointer accent-lilah" type="range" min="80" max="160" value={fontSize} onChange={(event) => setFontSize(Number(event.target.value))} /></label>
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.lineHeight}<input className="w-full cursor-pointer accent-lilah" type="range" min="1.2" max="2.4" step="0.1" value={lineHeight} onChange={(event) => setLineHeight(Number(event.target.value))} /></label>
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.margin}<input className="w-full cursor-pointer accent-lilah" type="range" min="0" max="80" value={margin} onChange={(event) => setMargin(Number(event.target.value))} /></label>
+            <label className="grid grid-cols-[7rem_1fr] items-center gap-3">{reader.column}<input className="w-full cursor-pointer accent-lilah" type="range" min="320" max="1200" value={columnWidth} onChange={(event) => setColumnWidth(Number(event.target.value))} /></label>
           </div>}
         </aside>
       )}
@@ -773,9 +755,8 @@ export default function EpubReader({ isOpen, onClose, slug, title, layout, intl
         <div className="flex h-14 items-center justify-between px-2">
           <div className="flex items-center gap-1">
             <button onClick={closeReader} title={reader.close} aria-label={reader.close} className="cursor-pointer p-2"><Minimize2Icon size={24} /></button>
-            {layout === "reflowable" && <button ref={settingsToggleRef} onClick={() => togglePanel("settings")} title={reader.settings} aria-label={reader.settings} className="cursor-pointer p-2"><Settings2Icon size={24} /></button>}
             <button onClick={toggleBookmark} title={isBookmarked ? reader.removeBookmark : reader.addBookmark} aria-label={isBookmarked ? reader.removeBookmark : reader.addBookmark} className="cursor-pointer p-2"><BookmarkIcon size={24} className={isBookmarked ? "fill-lilah text-lilah" : ""} /></button>
-            <button ref={tocToggleRef} onClick={() => togglePanel("toc")} title={reader.contents} aria-label={reader.contents} className="cursor-pointer p-2"><MenuIcon size={24} /></button>
+            <button ref={tocToggleRef} onClick={toggleToc} title={reader.contents} aria-label={reader.contents} className="cursor-pointer p-2"><MenuIcon size={24} /></button>
           </div>
           <div className="flex items-center gap-1">
             <button onClick={navigatePrevious} title={reader.previous} aria-label={reader.previous} className="cursor-pointer p-2"><ChevronLeftIcon size={24} /></button>

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

@@ -121,6 +121,7 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
 
     for (let i = 0; i < acceptedFiles.length; i++) {
       const file = acceptedFiles[i];
+      if (file.name.toLowerCase().endsWith(".epub")) continue;
       try {
         const result = await extractFromArchive(file);
 
@@ -526,6 +527,7 @@ export default function UploadMangaForm({ intl, lang }: UploadMangaFormProps) {
                 "application/pdf": [".pdf"],
                 "application/zip": [".zip", ".cbz"],
                 "application/x-rar-compressed": [".rar", ".cbr"],
+                ...(libraryType === "others" ? { "application/epub+zip": [".epub"] } : {}),
               }}
           intl={intl}
         />

package/dist/src/lib/books/epubParser.ts

@@ -24,8 +24,12 @@ function xmlText(value: XmlValue | undefined): string | null {
   return value?._?.trim() || null;
 }
 
-function attrs(value: XmlValue | undefined): Record<string, string> {
-  return typeof value === "object" && value ? value.$ ?? {} : {};
+function attrs(value: unknown): Record<string, string> {
+  if (!value || typeof value !== "object" || !("$" in value)) return {};
+  const attributes = value.$;
+  return attributes && typeof attributes === "object" && !Array.isArray(attributes)
+    ? attributes as Record<string, string>
+    : {};
 }
 
 function firstText(record: XmlRecord, name: string): string | null {
@@ -259,6 +263,7 @@ function parseMetadata(packagePath: string, parsed: Record<string, unknown>): Ep
   const namedMeta = namedMetaValues(metadata);
   const collection = parseCollection(metadata, namedMeta);
   const { title, subtitle } = parseTitles(metadata);
+  const epubVersion = attrs(pkg).version?.trim().split(".")[0];
 
   return {
     title,
@@ -270,6 +275,7 @@ function parseMetadata(packagePath: string, parsed: Record<string, unknown>): Ep
     rights: firstText(metadata, "dc:rights"),
     source: firstText(metadata, "dc:source"),
     publicationType: rendition.get("schema:bookFormat") ?? firstText(metadata, "dc:type"),
+    epubVersion: epubVersion === "2" || epubVersion === "3" ? epubVersion : null,
     ageRating: normalizeBookAgeRating(rendition.get("schema:typicalAgeRange")
       ?? rendition.get("schema:contentRating")
       ?? rendition.get("schema:audience")

package/dist/src/lib/books/indexer.ts

@@ -2,6 +2,7 @@ import path from "node:path";
 import { parseEpubBuffer } from "./epubParser";
 import { readBookFile } from "./storage";
 import { upsertBook } from "@/lib/db/books/library";
+import type { ComicMetadata } from "@/lib/types/manga";
 
 export function toBookSlug(value: string): string {
   return value.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase()
@@ -16,6 +17,7 @@ export async function indexBook(input: {
   size: number;
   mtime: Date;
   isOneshot?: boolean;
+  librarySection?: "books" | "other";
 }) {
   if (path.extname(input.filename).toLowerCase() !== ".epub") {
     throw new Error("Only .epub files are supported in Books");
@@ -24,7 +26,34 @@ export async function indexBook(input: {
   const collection = parsed.metadata.collection;
   const folderSeriesTitle = input.seriesName.replace(/\[oneshot\]/gi, "").trim();
   const seriesTitle = collection?.title || folderSeriesTitle || parsed.metadata.title;
-  return upsertBook({
+  const comicMetadata: ComicMetadata = {
+    series: seriesTitle,
+    title: parsed.metadata.title,
+    number: collection?.position ?? null,
+    count: null,
+    publisher: parsed.metadata.publisher,
+    imprint: null,
+    languageISO: parsed.metadata.language,
+    format: "EPUB",
+    ageRating: parsed.metadata.ageRating,
+    communityRating: null,
+    writer: parsed.metadata.people.filter((person) => person.kind === "creator").map((person) => person.name).join(", ") || null,
+    penciller: null,
+    inker: null,
+    colorist: null,
+    letterer: null,
+    coverArtist: null,
+    editor: null,
+    summary: parsed.metadata.description,
+    web: null,
+    pageCount: null,
+    year: parsed.metadata.publishedAt ? Number.parseInt(parsed.metadata.publishedAt, 10) || null : null,
+    month: null,
+    day: null,
+    gtin: parsed.metadata.identifiers.find((identifier) => identifier.isPrimary)?.value ?? null,
+    mangaStyle: "No",
+  };
+  const book = await upsertBook({
     seriesTitle,
     seriesPath: input.seriesPath,
     isOneshot: collection ? false : input.isOneshot ?? /\[oneshot\]/i.test(input.seriesName),
@@ -37,5 +66,7 @@ export async function indexBook(input: {
     size: input.size,
     mtime: input.mtime,
     metadata: parsed.metadata,
+    librarySection: input.librarySection ?? "books",
   });
+  return { book, comicMetadata, genres: parsed.metadata.subjects.map((subject) => subject.name) };
 }

package/dist/src/lib/books/types.ts

@@ -33,6 +33,7 @@ export interface EpubMetadata {
   rights: string | null;
   source: string | null;
   publicationType: string | null;
+  epubVersion: "2" | "3" | null;
   ageRating: string | null;
   modifiedAt: string | null;
   packagePath: string;

package/dist/src/lib/db/books/library.ts

@@ -3,6 +3,8 @@ import { buildNaturalSortKey } from "@/lib/naturalSort";
 import type { EpubMetadata } from "@/lib/books/types";
 import { execute, query, queryOne } from "../query";
 
+export type BookLibrarySection = "books" | "other";
+
 export interface BookSeries {
   id: string;
   slug: string;
@@ -11,6 +13,7 @@ export interface BookSeries {
   isOneshot: boolean;
   status: string;
   collectionType: "series" | "set" | null;
+  librarySection: BookLibrarySection;
 }
 
 export interface BookVolume {
@@ -27,6 +30,19 @@ export interface BookVolume {
   metadata: EpubMetadata & { id: string };
 }
 
+export interface BookSearchEntry {
+  id: string;
+  slug: string;
+  title: string;
+  seriesId: string;
+  seriesSlug: string;
+  seriesTitle: string;
+  seriesIsOneshot: boolean;
+  librarySection: BookLibrarySection;
+  writer: string;
+  subjects: string;
+}
+
 interface BookRow {
   volume_id: string;
   volume_slug: string;
@@ -44,6 +60,7 @@ interface BookRow {
   series_is_oneshot: boolean;
   series_status: string;
   series_collection_type: "series" | "set" | null;
+  series_library_section: BookLibrarySection;
   metadata_id: string;
   metadata_title: string;
   metadata_subtitle: string | null;
@@ -54,6 +71,7 @@ interface BookRow {
   metadata_rights: string | null;
   metadata_source: string | null;
   metadata_publication_type: string | null;
+  metadata_epub_version: "2" | "3" | null;
   metadata_age_rating: string | null;
   metadata_modified_at: string | null;
   metadata_package_path: string;
@@ -84,6 +102,7 @@ function mapBook(row: BookRow): BookVolume {
       isOneshot: row.series_is_oneshot,
       status: row.series_status,
       collectionType: row.series_collection_type,
+      librarySection: row.series_library_section,
     },
     metadata: {
       id: row.metadata_id,
@@ -96,6 +115,7 @@ function mapBook(row: BookRow): BookVolume {
       rights: row.metadata_rights,
       source: row.metadata_source,
       publicationType: row.metadata_publication_type,
+      epubVersion: row.metadata_epub_version,
       ageRating: row.metadata_age_rating,
       modifiedAt: row.metadata_modified_at,
       packagePath: row.metadata_package_path,
@@ -119,11 +139,13 @@ const BOOK_SELECT = `
     bv.size::text AS volume_size, bv.cover_image AS volume_cover_image, bv.number AS volume_number, bv.created_at AS volume_created_at,
     bs.id AS series_id, bs.slug AS series_slug, bs.title AS series_title, bs.path AS series_path,
     bs.is_oneshot AS series_is_oneshot, bs.status AS series_status, bs.collection_type AS series_collection_type,
+    bs.library_section AS series_library_section,
     bm.id AS metadata_id, bm.title AS metadata_title, bm.subtitle AS metadata_subtitle,
     bm.description AS metadata_description, bm.publisher AS metadata_publisher,
     bm.published_at AS metadata_published_at, bm.language AS metadata_language,
     bm.rights AS metadata_rights, bm.source AS metadata_source,
-    bm.publication_type AS metadata_publication_type, bm.age_rating AS metadata_age_rating,
+    bm.publication_type AS metadata_publication_type, bm.epub_version AS metadata_epub_version,
+    bm.age_rating AS metadata_age_rating,
     bm.modified_at AS metadata_modified_at,
     bm.package_path AS metadata_package_path, bm.navigation_path AS metadata_navigation_path,
     bm.cover_path AS metadata_cover_path, bm.rendition_layout AS metadata_rendition_layout,
@@ -161,14 +183,15 @@ export async function upsertBook(input: {
   size: number;
   mtime: Date;
   metadata: EpubMetadata;
+  librarySection: BookLibrarySection;
 }): Promise<BookVolume> {
   const series = await queryOne<{ id: string }>(`
-    INSERT INTO book_series (id, slug, title, sort_title, path, is_oneshot, collection_type, mtime)
-    VALUES ($1, $2, $3, $4, $5, $6, $7, $8)
+    INSERT INTO book_series (id, slug, title, sort_title, path, is_oneshot, collection_type, mtime, library_section)
+    VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
     ON CONFLICT (slug) DO UPDATE SET title = EXCLUDED.title, sort_title = EXCLUDED.sort_title,
       path = EXCLUDED.path, is_oneshot = EXCLUDED.is_oneshot, collection_type = EXCLUDED.collection_type,
-      mtime = EXCLUDED.mtime, updated_at = NOW()
-    RETURNING id`, [createId(), input.seriesSlug, input.seriesTitle, buildNaturalSortKey(input.seriesTitle), input.seriesPath, input.isOneshot, input.collectionType, input.mtime]);
+      mtime = EXCLUDED.mtime, library_section = EXCLUDED.library_section, updated_at = NOW()
+    RETURNING id`, [createId(), input.seriesSlug, input.seriesTitle, buildNaturalSortKey(input.seriesTitle), input.seriesPath, input.isOneshot, input.collectionType, input.mtime, input.librarySection]);
   if (!series) throw new Error("Failed to create book series");
 
   const volume = await queryOne<{ id: string }>(`
@@ -182,18 +205,19 @@ export async function upsertBook(input: {
   if (!volume) throw new Error("Failed to create book volume");
 
   const metadata = await queryOne<{ id: string }>(`
-    INSERT INTO book_metadata (id, volume_id, title, subtitle, description, publisher, published_at, language, rights, source, publication_type, age_rating, modified_at, package_path, navigation_path, cover_path, rendition_layout, rendition_flow, rendition_orientation, rendition_spread)
-    VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20)
+    INSERT INTO book_metadata (id, volume_id, title, subtitle, description, publisher, published_at, language, rights, source, publication_type, epub_version, age_rating, modified_at, package_path, navigation_path, cover_path, rendition_layout, rendition_flow, rendition_orientation, rendition_spread)
+    VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19,$20,$21)
     ON CONFLICT (volume_id) DO UPDATE SET title=EXCLUDED.title, subtitle=EXCLUDED.subtitle, description=EXCLUDED.description,
       publisher=EXCLUDED.publisher, published_at=EXCLUDED.published_at, language=EXCLUDED.language, rights=EXCLUDED.rights,
-      source=EXCLUDED.source, publication_type=EXCLUDED.publication_type, age_rating=EXCLUDED.age_rating,
+      source=EXCLUDED.source, publication_type=EXCLUDED.publication_type, epub_version=EXCLUDED.epub_version,
+      age_rating=EXCLUDED.age_rating,
       modified_at=EXCLUDED.modified_at,
       package_path=EXCLUDED.package_path, navigation_path=EXCLUDED.navigation_path, cover_path=EXCLUDED.cover_path,
       rendition_layout=EXCLUDED.rendition_layout, rendition_flow=EXCLUDED.rendition_flow,
       rendition_orientation=EXCLUDED.rendition_orientation, rendition_spread=EXCLUDED.rendition_spread, updated_at=NOW()
     RETURNING id`, [createId(), volume.id, input.metadata.title, input.metadata.subtitle, input.metadata.description,
     input.metadata.publisher, input.metadata.publishedAt, input.metadata.language, input.metadata.rights, input.metadata.source,
-    input.metadata.publicationType, input.metadata.ageRating, input.metadata.modifiedAt, input.metadata.packagePath,
+    input.metadata.publicationType, input.metadata.epubVersion, input.metadata.ageRating, input.metadata.modifiedAt, input.metadata.packagePath,
     input.metadata.navigationPath, input.metadata.coverPath, input.metadata.renditionLayout, input.metadata.renditionFlow,
     input.metadata.renditionOrientation, input.metadata.renditionSpread]);
   if (!metadata) throw new Error("Failed to save book metadata");
@@ -238,10 +262,14 @@ export async function listBookVolumes(options?: {
   seriesSlug?: string;
   authorNames?: string[];
   limit?: number;
+  librarySection?: BookLibrarySection;
 }): Promise<BookVolume[]> {
   const params: unknown[] = [];
   const conditions: string[] = [];
 
+  params.push(options?.librarySection ?? "books");
+  conditions.push(`bs.library_section = $${params.length}`);
+
   if (options?.seriesSlug) {
     params.push(options.seriesSlug);
     conditions.push(`bs.slug = $${params.length}`);
@@ -282,8 +310,8 @@ export async function listBookVolumes(options?: {
   return Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
 }
 
-export async function listRecentlyAddedBooks(limit = 8): Promise<BookVolume[]> {
-  const rows = await query<BookRow>(`${BOOK_SELECT} ORDER BY bv.created_at DESC LIMIT $1`, [limit]);
+export async function listRecentlyAddedBooks(limit = 8, librarySection: BookLibrarySection = "books"): Promise<BookVolume[]> {
+  const rows = await query<BookRow>(`${BOOK_SELECT} WHERE bs.library_section = $1 ORDER BY bv.created_at DESC LIMIT $2`, [librarySection, limit]);
   return Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
 }
 
@@ -291,15 +319,16 @@ export async function listFavoriteBookSeries(userId: string, options: { page: nu
   const count = await queryOne<{ count: string }>(`
     SELECT COUNT(*)::text AS count
     FROM user_to_book_series ubs
-    WHERE ubs.user_id = $1 AND ubs.is_favorite = TRUE`, [userId]);
+    INNER JOIN book_series bs ON bs.id = ubs.series_id
+    WHERE ubs.user_id = $1 AND ubs.is_favorite = TRUE AND bs.library_section = 'books'`, [userId]);
   const total = Number(count?.count ?? "0");
   const offset = Math.max(0, options.page - 1) * options.pageSize;
   const series = await query<BookSeries>(`
     SELECT bs.id, bs.slug, bs.title, bs.path, bs.is_oneshot AS "isOneshot", bs.status,
-      bs.collection_type AS "collectionType"
+      bs.collection_type AS "collectionType", bs.library_section AS "librarySection"
     FROM book_series bs
     INNER JOIN user_to_book_series ubs ON ubs.series_id = bs.id
-    WHERE ubs.user_id = $1 AND ubs.is_favorite = TRUE
+    WHERE ubs.user_id = $1 AND ubs.is_favorite = TRUE AND bs.library_section = 'books'
     ORDER BY bs.sort_title
     LIMIT $2 OFFSET $3`, [userId, options.pageSize, offset]);
   const items = await Promise.all(series.map(async (entry) => ({
@@ -313,13 +342,15 @@ export async function listFavoriteBookSeries(userId: string, options: { page: nu
 export async function listFavoriteBookVolumes(userId: string, options: { page: number; pageSize: number }) {
   const count = await queryOne<{ count: string }>(`
     SELECT COUNT(*)::text AS count
-    FROM user_to_books
-    WHERE user_id = $1 AND is_favorite = TRUE`, [userId]);
+    FROM user_to_books ub
+    INNER JOIN book_volumes bv ON bv.id = ub.volume_id
+    INNER JOIN book_series bs ON bs.id = bv.series_id
+    WHERE ub.user_id = $1 AND ub.is_favorite = TRUE AND bs.library_section = 'books'`, [userId]);
   const total = Number(count?.count ?? "0");
   const offset = Math.max(0, options.page - 1) * options.pageSize;
   const rows = await query<BookRow>(`${BOOK_SELECT}
     INNER JOIN user_to_books ub ON ub.volume_id = bv.id
-    WHERE ub.user_id = $1 AND ub.is_favorite = TRUE
+    WHERE ub.user_id = $1 AND ub.is_favorite = TRUE AND bs.library_section = 'books'
     ORDER BY bs.sort_title, bv.number NULLS LAST, bv.sort_title
     LIMIT $2 OFFSET $3`, [userId, options.pageSize, offset]);
   const items = await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
@@ -327,12 +358,12 @@ export async function listFavoriteBookVolumes(userId: string, options: { page: n
   return { items, total, totalPages: Math.max(1, Math.ceil(total / options.pageSize)) };
 }
 
-export async function listBooksInProgress(userId: string, limit = 12): Promise<Array<BookVolume & { progression: number; lastReadAt: Date | null }>> {
+export async function listBooksInProgress(userId: string, limit = 12, librarySection: BookLibrarySection = "books"): Promise<Array<BookVolume & { progression: number; lastReadAt: Date | null }>> {
   const select = BOOK_SELECT.replace("  FROM book_volumes", "  , ub.progression, ub.last_read_at\n  FROM book_volumes");
   const rows = await query<BookRow & { progression: number; last_read_at: Date | null }>(`${select}
     INNER JOIN user_to_books ub ON ub.volume_id = bv.id
-    WHERE ub.user_id = $1 AND ub.cfi IS NOT NULL AND ub.is_read = FALSE
-    ORDER BY ub.last_read_at DESC NULLS LAST LIMIT $2`, [userId, limit]);
+    WHERE ub.user_id = $1 AND ub.cfi IS NOT NULL AND ub.is_read = FALSE AND bs.library_section = $2
+    ORDER BY ub.last_read_at DESC NULLS LAST LIMIT $3`, [userId, librarySection, limit]);
   const books = await Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
   return books.map((book, index) => ({
     ...book,
@@ -357,13 +388,14 @@ export async function listBookProgressByIds(userId: string, volumeIds: string[])
 
 export async function getBookReaderStats(userId: string): Promise<{ totalVolumes: number; totalSeries: number; totalUnread: number }> {
   const [volumes, series, unread] = await Promise.all([
-    queryOne<{ count: string }>("SELECT COUNT(*)::text AS count FROM book_volumes"),
-    queryOne<{ count: string }>("SELECT COUNT(*)::text AS count FROM book_series WHERE is_oneshot = FALSE"),
+    queryOne<{ count: string }>("SELECT COUNT(*)::text AS count FROM book_volumes bv INNER JOIN book_series bs ON bs.id = bv.series_id WHERE bs.library_section = 'books'"),
+    queryOne<{ count: string }>("SELECT COUNT(*)::text AS count FROM book_series WHERE is_oneshot = FALSE AND library_section = 'books'"),
     queryOne<{ count: string }>(`
       SELECT COUNT(*)::text AS count
       FROM book_volumes bv
       LEFT JOIN user_to_books ub ON ub.volume_id = bv.id AND ub.user_id = $1
-      WHERE COALESCE(ub.is_read, FALSE) = FALSE`, [userId]),
+      INNER JOIN book_series bs ON bs.id = bv.series_id
+      WHERE COALESCE(ub.is_read, FALSE) = FALSE AND bs.library_section = 'books'`, [userId]),
   ]);
 
   return {
@@ -376,7 +408,7 @@ export async function getBookReaderStats(userId: string): Promise<{ totalVolumes
 export async function listRecentlyReadBooks(userId: string, limit = 12): Promise<BookVolume[]> {
   const rows = await query<BookRow>(`${BOOK_SELECT}
     INNER JOIN user_to_books ub ON ub.volume_id = bv.id
-    WHERE ub.user_id = $1 AND ub.is_read = TRUE AND ub.last_read_at IS NOT NULL
+    WHERE ub.user_id = $1 AND ub.is_read = TRUE AND ub.last_read_at IS NOT NULL AND bs.library_section = 'books'
     ORDER BY ub.last_read_at DESC LIMIT $2`, [userId, limit]);
   return Promise.all(rows.map((row) => hydrateMetadata(mapBook(row))));
 }
@@ -384,23 +416,51 @@ export async function listRecentlyReadBooks(userId: string, limit = 12): Promise
 export async function listBookSeries(): Promise<Array<BookSeries & { volumeCount: number }>> {
   return query<BookSeries & { volumeCount: number }>(`
     SELECT bs.id, bs.slug, bs.title, bs.path, bs.is_oneshot AS "isOneshot", bs.status,
-      bs.collection_type AS "collectionType",
+      bs.collection_type AS "collectionType", bs.library_section AS "librarySection",
       COUNT(bv.id)::int AS "volumeCount"
     FROM book_series bs LEFT JOIN book_volumes bv ON bv.series_id = bs.id
+    WHERE bs.library_section = 'books'
     GROUP BY bs.id ORDER BY bs.sort_title`);
 }
 
+export async function listBookSearchEntries(): Promise<BookSearchEntry[]> {
+  return query<BookSearchEntry>(`
+    SELECT bv.id, bv.slug, bm.title,
+      bs.id AS "seriesId", bs.slug AS "seriesSlug", bs.title AS "seriesTitle",
+      bs.is_oneshot AS "seriesIsOneshot", bs.library_section AS "librarySection",
+      COALESCE(
+        STRING_AGG(DISTINCT BTRIM(bp.name), ', ') FILTER (
+          WHERE bp.kind = 'creator'
+            AND (bp.role IS NULL OR LOWER(bp.role) = 'aut')
+            AND BTRIM(bp.name) <> ''
+        ),
+        ''
+      ) AS writer,
+      COALESCE(
+        STRING_AGG(DISTINCT BTRIM(bsub.name), ', ') FILTER (WHERE BTRIM(bsub.name) <> ''),
+        ''
+      ) AS subjects
+    FROM book_volumes bv
+    INNER JOIN book_series bs ON bs.id = bv.series_id
+    INNER JOIN book_metadata bm ON bm.volume_id = bv.id
+    LEFT JOIN book_people bp ON bp.metadata_id = bm.id
+    LEFT JOIN book_subjects bsub ON bsub.metadata_id = bm.id
+    GROUP BY bv.id, bv.slug, bv.number, bv.sort_title, bm.title, bs.id, bs.slug, bs.title, bs.is_oneshot, bs.library_section, bs.sort_title
+    ORDER BY bs.sort_title, bv.number NULLS LAST, bv.sort_title
+  `);
+}
+
 export async function findBookSeriesBySlug(slug: string): Promise<BookSeries | null> {
   return queryOne<BookSeries>(`
     SELECT id, slug, title, path, is_oneshot AS "isOneshot", status,
-      collection_type AS "collectionType"
+      collection_type AS "collectionType", library_section AS "librarySection"
     FROM book_series WHERE slug = $1 LIMIT 1`, [slug]);
 }
 
 export async function findBookSeriesById(id: string): Promise<BookSeries | null> {
   return queryOne<BookSeries>(`
     SELECT id, slug, title, path, is_oneshot AS "isOneshot", status,
-      collection_type AS "collectionType"
+      collection_type AS "collectionType", library_section AS "librarySection"
     FROM book_series WHERE id = $1 LIMIT 1`, [id]);
 }
 

package/dist/src/lib/db/migrations/010_book_metadata_epub_version.sql

@@ -0,0 +1,2 @@
+ALTER TABLE book_metadata
+  ADD COLUMN IF NOT EXISTS epub_version TEXT;

package/dist/src/lib/db/migrations/011_book_series_library_section.sql

@@ -0,0 +1,12 @@
+ALTER TABLE book_series
+  ADD COLUMN IF NOT EXISTS library_section TEXT NOT NULL DEFAULT 'books';
+
+ALTER TABLE book_series
+  DROP CONSTRAINT IF EXISTS book_series_library_section_check;
+
+ALTER TABLE book_series
+  ADD CONSTRAINT book_series_library_section_check
+  CHECK (library_section IN ('books', 'other'));
+
+CREATE INDEX IF NOT EXISTS book_series_library_section_idx
+  ON book_series (library_section);

package/dist/src/lib/i18n/dictionaries/en/libraries.json

@@ -7,6 +7,10 @@
     "comicIssues": "Issues",
     "otherCollections": "Collections",
     "otherWorks": "Works",
+    "otherCollection": "Collection:",
+    "allOtherCollections": "Collections (All)",
+    "allOtherWorks": "Works (All)",
+    "otherCollectionWorks": "Works in the collection",
     "readList": "Read List",
     "keepReading": "Keep Reading",
     "noActiveReading": "No active reading",

package/dist/src/lib/i18n/dictionaries/es/libraries.json

@@ -7,6 +7,10 @@
     "comicIssues": "Números",
     "otherCollections": "Colecciones",
     "otherWorks": "Obras",
+    "otherCollection": "Colección:",
+    "allOtherCollections": "Colecciones (todas)",
+    "allOtherWorks": "Obras (todas)",
+    "otherCollectionWorks": "Obras de la colección",
     "readList": "Lista de lectura",
     "keepReading": "Seguir leyendo",
     "noActiveReading": "No hay lectura activa",