- 
+
[% IF userlogged %]
From 9b053884dd0dfb936d375d0b42e753ac45bd3568 Mon Sep 17 00:00:00 2001
From: Difegue <8237712+Difegue@users.noreply.github.com>
Date: Tue, 26 May 2026 19:25:06 +0000
Subject: [PATCH 03/30] (#519) Add support for Tanks to Reader
---
lib/LANraragi/Utils/Minion.pm | 2 +-
public/css/lrr.css | 14 ++-
public/js/mod/common.js | 31 ++++-
public/js/reader.js | 207 ++++++++++++++++++++++++++--------
4 files changed, 200 insertions(+), 54 deletions(-)
diff --git a/lib/LANraragi/Utils/Minion.pm b/lib/LANraragi/Utils/Minion.pm
index 44ffc15c4..666a8077f 100644
--- a/lib/LANraragi/Utils/Minion.pm
+++ b/lib/LANraragi/Utils/Minion.pm
@@ -145,7 +145,7 @@ sub add_tasks {
}
# Add page number to note field so it can be fetched by the API
- $job->note( $i => "processed", total_pages => $pages );
+ $job->note( $i => "processed", total_pages => $pages, id => $id );
}
};
diff --git a/public/css/lrr.css b/public/css/lrr.css
index 075d1054e..0a893b903 100644
--- a/public/css/lrr.css
+++ b/public/css/lrr.css
@@ -331,9 +331,7 @@ p#nb {
background-repeat: no-repeat;
background-position: center;
filter:
- drop-shadow(0 0 1px black)
- drop-shadow(0 0 1px black)
- drop-shadow(0 0 1px black);
+ drop-shadow(0 0 1px black) drop-shadow(0 0 1px black) drop-shadow(0 0 1px black);
transform: translate(-50%, -50%);
pointer-events: auto;
@@ -768,6 +766,7 @@ body.swal2-shown>[aria-hidden="true"] {
.overlay-bar #overlay-section {
flex: 0 0 auto;
margin: 0;
+ max-width: 50%;
}
.overlay-bar-left {
@@ -776,6 +775,15 @@ body.swal2-shown>[aria-hidden="true"] {
padding-left: 32px;
}
+.favtag-btn {
+ text-overflow: ellipsis;
+ overflow: hidden;
+}
+
+#chapter-select {
+ width: 200px;
+}
+
.chapter-selector {
flex: 1;
text-align: right;
diff --git a/public/js/mod/common.js b/public/js/mod/common.js
index 0171dfa30..d60c23ab9 100644
--- a/public/js/mod/common.js
+++ b/public/js/mod/common.js
@@ -405,15 +405,40 @@ export function buildPageCountDiv(arcdata) {
return "";
}
-export function buildChapterObject(toc, totalpages) {
+export function buildTankChapters(archiveData, pageOffset) {
+ const archiveChapter = {
+ id: archiveData.arcid,
+ chapters: [],
+ name: archiveData.title,
+ startPage: pageOffset + 1,
+ endPage: pageOffset + (archiveData.pagecount || 0)
+ };
+
+ // If there's a ToC, recursively build sub-chapters
+ if (archiveData.toc && archiveData.toc.length > 0) {
+ archiveChapter.chapters = buildArchiveChapters(archiveData.toc, archiveData.arcid, archiveData.pagecount);
+ // Adjust sub-chapter page numbers to tank coordinates
+ archiveChapter.chapters.forEach(ch => {
+ ch.startPage += pageOffset;
+ ch.endPage += pageOffset;
+ });
+ }
+
+ return [archiveChapter];
+}
+
+export function buildArchiveChapters(toc, id, totalpages) {
const chapters = [];
- if (toc.length === 0) {
+
+ if (!toc || toc.length === 0) {
return chapters;
}
if (toc[0].page > 1) {
// Fill in gap before first chapter
chapters.push({
+ id: id,
+ chapters: null,
name: I18N.UntitledChapter,
startPage: 1,
endPage: toc[0].page - 1,
@@ -433,6 +458,8 @@ export function buildChapterObject(toc, totalpages) {
}
chapters.push({
+ id: id,
+ chapters: null,
name: entry.name,
startPage: entry.page,
endPage: null, // to be filled in later
diff --git a/public/js/reader.js b/public/js/reader.js
index 3c3931142..cef964e6e 100644
--- a/public/js/reader.js
+++ b/public/js/reader.js
@@ -108,6 +108,10 @@ export function initializeAll(trackProgressLocally, authenticateProgress) {
confirmButtonColor: "#d33",
}).then((result) => {
if (result.isConfirmed) {
+ if (id.startsWith("TANK_"))
+ Server.callAPI(`/api/tankoubons/${id}`, "DELETE", null, null,
+ () => { document.location.href = "./"; });
+ else
Server.deleteArchive(id, () => { document.location.href = "./"; });
}
});
@@ -150,8 +154,14 @@ export function initializeAll(trackProgressLocally, authenticateProgress) {
$(document).on("click.set-thumbnail", ".set-thumbnail", (e) => {
const pageNumber = +$(e.target).closest("div[page]").attr("page") + 1;
+
+ if (id.startsWith("TANK_")) {
+ Server.callAPI(`/api/tankoubons/${id}/thumbnail?page=${pageNumber}`,
+ "PUT", I18N.ReaderUpdateThumbnail(pageNumber), I18N.ReaderUpdateThumbnailError, null);
+ } else {
Server.callAPI(`/api/archives/${id}/thumbnail?page=${pageNumber}`,
"PUT", I18N.ReaderUpdateThumbnail(pageNumber), I18N.ReaderUpdateThumbnailError, null);
+ }
// Stop event propagation to avoid going to page
e.stopPropagation();
@@ -210,9 +220,9 @@ export function initializeAll(trackProgressLocally, authenticateProgress) {
}).then((result) => {
$("#overlay-page").hide();
markerMode = false;
- //toggleArchiveOverlay();
if (result.isConfirmed && result.value.trim() !== "") {
- Server.callAPI(`/api/archives/${id}/stamps/${page}?position=${markerData.x},${markerData.y}&content=${result.value}`, "PUT", "Stamp added!", I18N.StampError,
+ const { arcId, localPage } = getArchiveForPage(page);
+ Server.callAPI(`/api/archives/${arcId}/stamps/${localPage}?position=${markerData.x},${markerData.y}&content=${result.value}`, "PUT", "Stamp added!", I18N.StampError,
(data) => {
markerData.id = data["stamp_id"];
markerData.name = result.value;
@@ -257,8 +267,9 @@ export function initializeAll(trackProgressLocally, authenticateProgress) {
force = params.get("force_reload") !== null;
currentPage = (+params.get("p") || 1) - 1;
- // Remove the "new" tag with an api call
- Server.callAPI(`/api/archives/${id}/isnew`, "DELETE", null, I18N.ReaderErrorClearingNew, null);
+ // Remove the "new" tag with an api call (archives only; tanks don't have an isnew flag)
+ if (!id.startsWith("TANK_"))
+ Server.callAPI(`/api/archives/${id}/isnew`, "DELETE", null, I18N.ReaderErrorClearingNew, null);
// Load metadata for the requested ID and populate the page
loadContentData().then(() => {
@@ -333,7 +344,7 @@ export function initializeAll(trackProgressLocally, authenticateProgress) {
export function loadContentData() {
// Initialize content object to hold metadata -- This is a recursive object that will be used to build the page overlay.
- // (For tanks, content.chapters will hold an array of archive IDs, for archives it'll hold TOC data.)
+ // (For tanks, content.chapters will hold archive chapters that can themselves contain nested chapters from ToCs)
content = {
id: id,
title: "",
@@ -343,37 +354,81 @@ export function loadContentData() {
summary: ""
};
+ const updateProgress = function(data, id) {
+ // Use localStorage progress value instead of the server one if needed
+ if (state.trackProgressLocally && !(state.authenticateProgress && LRR.isUserLogged())) {
+ progress = localStorage.getItem(`${id}-reader`) - 1 || 0;
+ } else {
+ progress = data.progress - 1;
+ }
+ }
+
// If the ID is a Tank ID (TANK_xxxx), use the Tankoubon API for metadata
if (id.startsWith("TANK_")) {
- // TODO
+ return fetch(new LRR.ApiURL(`/api/tankoubons/${id}?include_full_data=true&page=-1`))
+ .then(r => r.ok ? r.json() : Promise.reject(new Error(I18N.ServerInfoError)))
+ .then(data => {
+ const tank = data.result;
+ content.title = tank.name;
+ content.tags = tank.tags || "";
+ content.summary = tank.summary || "";
+
+ content.chapters = [];
+
+ // full_data contains pre-fetched metadata for every archive in order
+ const fullData = tank.full_data || [];
+ // Cumulative offset as we iterate through the arclist
+ let pageOffset = 0;
+
+ fullData.forEach(meta => {
+ if (!meta) return;
+
+ // Create archive chapter (with nested ToC chapters if present)
+ const archiveChapters = LRR.buildTankChapters(meta, pageOffset);
+ content.chapters.push(...archiveChapters);
+
+ pageOffset += meta.pagecount || 0;
+ });
+
+ content.pages = pageOffset;
+ updateProgress(tank, id);
+ })
+ .catch(err => LRR.showErrorToast(I18N.ServerInfoError, err));
}
- else return Server.callAPI(`/api/archives/${id}/metadata`, "GET", null, I18N.ServerInfoError,
- (data) => {
- let { title } = data;
- content.title = title;
+ return Server.callAPI(`/api/archives/${id}/metadata`, "GET", null, I18N.ServerInfoError,
+ (data) => {
+ content.title = data.title;
content.pages = data.pagecount;
content.tags = data.tags;
content.summary = data.summary;
- // Use localStorage progress value instead of the server one if needed
- if (state.trackProgressLocally && !(state.authenticateProgress && LRR.isUserLogged())) {
- progress = localStorage.getItem(`${id}-reader`) - 1 || 0;
- } else {
- progress = data.progress - 1;
- }
+ updateProgress(data, id);
if (data.toc)
- content.chapters = LRR.buildChapterObject(data.toc, data.pagecount);
+ content.chapters = LRR.buildArchiveChapters(data.toc, id, data.pagecount);
// Check and display warnings for unsupported filetypes
checkFiletypeSupport(data.extension);
-
}
);
}
+/**
+ * For Tank mode: map a page number to the archive it belongs to and said archive's local page number.
+ * @param {number} globalPage global page number
+ * @returns {{ arcId: string, localPage: number }}
+ */
+function getArchiveForPage(globalPage) {
+ if (id.startsWith("TANK_")) {
+ const arc = content.chapters.find(a => globalPage >= a.startPage && globalPage <= a.endPage);
+ if (arc)
+ return { arcId: arc.id, localPage: globalPage - arc.startPage + 1 };
+ }
+ return { arcId: id, localPage: globalPage };
+};
+
/**
* Adds a removable category flag to the categories section within archive overview.
*/
@@ -407,7 +462,8 @@ export function addTocSection(page, currentTitle = null) {
reverseButtons: true,
}).then((result) => {
if (result.isConfirmed && result.value.trim() !== "") {
- Server.callAPI(`/api/archives/${id}/toc?page=${page}&title=${result.value}`, "PUT", "Chapter added!", I18N.ReaderTocError,
+ const { arcId, localPage } = getArchiveForPage(page);
+ Server.callAPI(`/api/archives/${arcId}/toc?page=${localPage}&title=${result.value}`, "PUT", "Chapter added!", I18N.ReaderTocError,
() => loadContentData().then(() => {
updateArchiveOverlay(true);
toggleArchiveOverlay();
@@ -447,9 +503,9 @@ export function removeTocSection() {
}
export function loadImages() {
- Server.callAPI(`/api/archives/${id}/files?force=${force}`, "GET", null, I18N.ReaderArchiveError,
- (data) => {
- pages = data.pages;
+
+ const onLoad = (data) => {
+ pages = data;
maxPage = pages.length - 1;
$(".max-page").html(pages.length);
@@ -498,14 +554,33 @@ export function loadImages() {
}
if (showOverlayByDefault) { toggleArchiveOverlay(); }
- },
- ).finally(() => {
+ };
+
+ const onFinally = () => {
if (pages === undefined) {
$("#img").attr("src", new LRR.ApiURL("/img/flubbed.gif").toString());
$("#display").append(`