virtus/reader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Streamline EPUB handling with new split modes and improved error management
Build and Push Reader Image / docker (push) Successful in 1m32s
Details

Browse Source 
- Removed legacy AI Tool references and unnecessary fields from the README and various components.
- Introduced new EPUB split modes (toc, regex, tag) to enhance flexibility in chapter extraction.
- Updated import and chapter management components to utilize the new EPUB split functionality.
- Improved error handling in the login API route for better user feedback.
- Cleaned up unused files and optimized the overall code structure for maintainability.
This commit is contained in:
virtus
2026-05-19 00:15:19 +07:00
parent 3036854cf2
commit 878018ca11
12 changed files with 370 additions and 1327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/mod/import/import-batch-client.tsx
+53 -9
View File
@@ -6,6 +6,12 @@ import { Loader2 } from "lucide-react"
import { Input } from "@/components/ui/input"
import { Progress } from "@/components/ui/progress"
import { toast } from "sonner"
import {
appendEpubSplitFormFields,
DEFAULT_EPUB_CHAPTER_TAG,
EPUB_HTML_TAG_PRESETS,
type EpubSplitMode,
} from "@/lib/epub-split"
/** Đồng bộ với `MOD_EPUB_MAX_CHAPTERS` trên reader-api. */
const BATCH_IMPORT_MAX_CHAPTERS = 4000
@@ -46,10 +52,17 @@ function normalizeNovelTitle(raw: string): string {
}
export function ImportBatchClient() {
const [splitMode, setSplitMode] = useState<"toc" | "regex">("toc")
const [splitMode, setSplitMode] = useState<EpubSplitMode>("toc")
const [chapterStartPattern, setChapterStartPattern] = useState(
"^\\s*(?:[#>*\\-\\[]\\s*)*(?:ch(?:u\\.?|ương|uong)?|chapter|hồi|hoi|quyển|quyen|phần|phan|tập|tap)\\s*\\d+(?:[\\.:\\-\\)]\\s*|\\s+).+$",
)
const [tagPreset, setTagPreset] = useState("a")
const [customTag, setCustomTag] = useState(DEFAULT_EPUB_CHAPTER_TAG)
const getChapterTag = () => {
if (tagPreset === "custom") return customTag.trim() || DEFAULT_EPUB_CHAPTER_TAG
return EPUB_HTML_TAG_PRESETS.find((p) => p.id === tagPreset)?.tag || DEFAULT_EPUB_CHAPTER_TAG
}
const [replaceExisting, setReplaceExisting] = useState(false)
const [running, setRunning] = useState(false)
const [progress, setProgress] = useState({ current: 0, total: 0 })
@@ -142,8 +155,10 @@ export function ImportBatchClient() {
const formAi = new FormData()
formAi.append("file", file)
formAi.append("splitMode", splitMode)
if (splitMode === "regex") formAi.append("chapterRegex", chapterStartPattern)
appendEpubSplitFormFields(formAi, splitMode, {
chapterRegex: chapterStartPattern,
chapterTag: getChapterTag(),
})
formAi.append("title", title)
formAi.append("authorName", author)
@@ -184,8 +199,10 @@ export function ImportBatchClient() {
const formParse = new FormData()
formParse.append("file", file)
formParse.append("preview", "true")
formParse.append("splitMode", splitMode)
if (splitMode === "regex") formParse.append("chapterRegex", chapterStartPattern)
appendEpubSplitFormFields(formParse, splitMode, {
chapterRegex: chapterStartPattern,
chapterTag: getChapterTag(),
})
formParse.append("enforceMaxChapters", "true")
const r3 = await fetch("/api/mod/epub", { method: "POST", credentials: "include", body: formParse, signal })
@@ -220,15 +237,17 @@ export function ImportBatchClient() {
fileName: displayPath,
ok: false,
resolvedTitle: title,
error: "Bước 3: không tách được chương với cấu hình TOC/Regex hiện tại",
error: "Bước 3: không tách được chương với cấu hình TOC/Regex/Thẻ HTML hiện tại",
}
}
const formImport = new FormData()
formImport.append("file", file)
formImport.append("preview", "false")
formImport.append("splitMode", splitMode)
if (splitMode === "regex") formImport.append("chapterRegex", chapterStartPattern)
appendEpubSplitFormFields(formImport, splitMode, {
chapterRegex: chapterStartPattern,
chapterTag: getChapterTag(),
})
formImport.append("title", title)
formImport.append("authorName", author)
formImport.append("status", status)
@@ -348,11 +367,12 @@ export function ImportBatchClient() {
<select
className="rounded border px-2 py-1 text-sm"
value={splitMode}
onChange={(e) => setSplitMode(e.target.value as "toc" | "regex")}
onChange={(e) => setSplitMode(e.target.value as EpubSplitMode)}
disabled={running}
>
<option value="toc">TOC</option>
<option value="regex">Regex tiếng Việt</option>
<option value="tag">Thẻ HTML</option>
</select>
{splitMode === "regex" && (
<Input
@@ -363,6 +383,30 @@ export function ImportBatchClient() {
placeholder="Regex bắt đầu chương"
/>
)}
{splitMode === "tag" && (
<>
<select
className="rounded border px-2 py-1 text-sm"
value={tagPreset}
onChange={(e) => setTagPreset(e.target.value)}
disabled={running}
>
{EPUB_HTML_TAG_PRESETS.map((preset) => (
<option key={preset.id} value={preset.id}>{preset.name}</option>
))}
<option value="custom">Tùy chỉnh tên thẻ...</option>
</select>
{tagPreset === "custom" && (
<Input
className="max-w-[120px] font-mono text-xs"
value={customTag}
onChange={(e) => setCustomTag(e.target.value)}
disabled={running}
placeholder="a, h2"
/>
)}
</>
)}
</div>
<label className="flex items-center gap-2 text-sm">
<input type="checkbox" checked={replaceExisting} onChange={(e) => setReplaceExisting(e.target.checked)} disabled={running} />
app/mod/import/import-client.tsx
+43 -10
View File
@@ -7,6 +7,12 @@ import { Input } from "@/components/ui/input"
import { Textarea } from "@/components/ui/textarea"
import { Progress } from "@/components/ui/progress"
import { toast } from "sonner"
import {
appendEpubSplitFormFields,
DEFAULT_EPUB_CHAPTER_TAG,
EPUB_HTML_TAG_PRESETS,
type EpubSplitMode,
} from "@/lib/epub-split"
type AssetItem = {
id: string
@@ -49,8 +55,15 @@ export function ImportClient() {
const [selectedGenreIds, setSelectedGenreIds] = useState<string[]>([])
const [genreQuery, setGenreQuery] = useState("")
const [addingGenre, setAddingGenre] = useState(false)
const [splitMode, setSplitMode] = useState<"toc" | "regex">("toc")
const [splitMode, setSplitMode] = useState<EpubSplitMode>("toc")
const [chapterStartPattern, setChapterStartPattern] = useState("^\\s*(?:[#>*\\-\\[]\\s*)*(?:ch(?:u\\.?|ương|uong)?|chapter|hồi|hoi|quyển|quyen|phần|phan|tập|tap)\\s*\\d+(?:[\\.:\\-\\)]\\s*|\\s+).+$")
const [tagPreset, setTagPreset] = useState("a")
const [customTag, setCustomTag] = useState(DEFAULT_EPUB_CHAPTER_TAG)
const getChapterTag = () => {
if (tagPreset === "custom") return customTag.trim() || DEFAULT_EPUB_CHAPTER_TAG
return EPUB_HTML_TAG_PRESETS.find((p) => p.id === tagPreset)?.tag || DEFAULT_EPUB_CHAPTER_TAG
}
const [replaceExisting, setReplaceExisting] = useState(false)
const [previewLoading, setPreviewLoading] = useState(false)
@@ -242,8 +255,10 @@ export function ImportClient() {
const form = new FormData()
form.append("file", epubFile)
form.append("preview", "true")
form.append("splitMode", splitMode)
if (splitMode === "regex") form.append("chapterRegex", chapterStartPattern)
appendEpubSplitFormFields(form, splitMode, {
chapterRegex: chapterStartPattern,
chapterTag: getChapterTag(),
})
form.append("title", title)
form.append("authorName", author)
const res = await fetch("/api/mod/epub/ai-suggest", { method: "POST", credentials: "include", body: form })
@@ -291,8 +306,10 @@ export function ImportClient() {
const form = new FormData()
form.append("file", epubFile)
form.append("preview", "true")
form.append("splitMode", splitMode)
if (splitMode === "regex") form.append("chapterRegex", chapterStartPattern)
appendEpubSplitFormFields(form, splitMode, {
chapterRegex: chapterStartPattern,
chapterTag: getChapterTag(),
})
const res = await fetch("/api/mod/epub", { method: "POST", credentials: "include", body: form })
const data = await res.json()
if (!res.ok) throw new Error(data?.detail || "Parse preview thất bại")
@@ -306,7 +323,7 @@ export function ImportClient() {
const total = Number(data?.novel?.totalChapters || data?.chapterCount || 0)
setChapterCount(total)
if (total <= 0) {
setParseError("Không tách được chương từ EPUB này với cấu hình hiện tại. Thử đổi TOC/Regex rồi parse lại.")
setParseError("Không tách được chương từ EPUB này với cấu hình hiện tại. Thử đổi TOC / Regex / Thẻ HTML rồi parse lại.")
}
toast.success("Đã tạo preview chương")
} catch (error) {
@@ -324,8 +341,10 @@ export function ImportClient() {
const form = new FormData()
form.append("file", epubFile)
form.append("preview", "false")
form.append("splitMode", splitMode)
if (splitMode === "regex") form.append("chapterRegex", chapterStartPattern)
appendEpubSplitFormFields(form, splitMode, {
chapterRegex: chapterStartPattern,
chapterTag: getChapterTag(),
})
form.append("title", title)
form.append("originalTitle", originalTitle)
form.append("authorName", author)
@@ -351,7 +370,7 @@ export function ImportClient() {
setPreviewItems([])
setChapterCount(0)
setParseError("")
}, [splitMode, chapterStartPattern])
}, [splitMode, chapterStartPattern, tagPreset, customTag])
useEffect(() => {
if (step === 3 && asset) {
@@ -523,13 +542,27 @@ export function ImportClient() {
<section className="space-y-3 rounded-xl border p-4">
<div className="flex flex-wrap items-center gap-3 rounded-md border bg-muted/30 p-3">
<label className="text-sm font-medium">Tách chương:</label>
<select className="rounded border px-2 py-1 text-sm" value={splitMode} onChange={(e) => setSplitMode(e.target.value as "toc" | "regex")}>
<select className="rounded border px-2 py-1 text-sm" value={splitMode} onChange={(e) => setSplitMode(e.target.value as EpubSplitMode)}>
<option value="toc">TOC (lọc intro/mục lục)</option>
<option value="regex">Regex tiếng Việt</option>
<option value="tag">Thẻ HTML</option>
</select>
{splitMode === "regex" && (
<Input value={chapterStartPattern} onChange={(e) => setChapterStartPattern(e.target.value)} placeholder="Regex bắt đầu chương" />
)}
{splitMode === "tag" && (
<>
<select className="rounded border px-2 py-1 text-sm" value={tagPreset} onChange={(e) => setTagPreset(e.target.value)}>
{EPUB_HTML_TAG_PRESETS.map((preset) => (
<option key={preset.id} value={preset.id}>{preset.name}</option>
))}
<option value="custom">Tùy chỉnh tên thẻ...</option>
</select>
{tagPreset === "custom" && (
<Input value={customTag} onChange={(e) => setCustomTag(e.target.value)} placeholder="Ví dụ: a, h2" className="max-w-[120px]" />
)}
</>
)}
</div>
<div className="flex items-center justify-between">
<h2 className="font-semibold">Preview chapters</h2>