From 316b99c20f591612ed914a008696c4b0d704447e Mon Sep 17 00:00:00 2001 From: ZXY101 Date: Tue, 3 Oct 2023 12:44:59 +0200 Subject: [PATCH] Flesh out volume data --- src/lib/components/Reader/Reader.svelte | 8 ++- src/lib/components/Settings/Settings.svelte | 2 + src/lib/components/Settings/Stats.svelte | 30 ++++++++ src/lib/components/VolumeItem.svelte | 1 - src/lib/settings/index.ts | 2 +- src/lib/settings/progress.ts | 24 ------- src/lib/settings/volume-data.ts | 77 +++++++++++++++++++++ src/routes/[manga]/[volume]/+page.svelte | 11 +++ 8 files changed, 128 insertions(+), 27 deletions(-) create mode 100644 src/lib/components/Settings/Stats.svelte delete mode 100644 src/lib/settings/progress.ts create mode 100644 src/lib/settings/volume-data.ts diff --git a/src/lib/components/Reader/Reader.svelte b/src/lib/components/Reader/Reader.svelte index 665b671..471d061 100644 --- a/src/lib/components/Reader/Reader.svelte +++ b/src/lib/components/Reader/Reader.svelte @@ -62,7 +62,13 @@ if (showSecondPage() && page + 1 === pages.length && newPage > page) { return; } - updateProgress(volume.mokuroData.volume_uuid, clamp(newPage, 1, pages?.length)); + const pageClamped = clamp(newPage, 1, pages?.length); + updateProgress( + volume.mokuroData.volume_uuid, + pageClamped, + getCharCount(pages, pageClamped) || 0, + pageClamped === pages.length + ); zoomDefault(); } } diff --git a/src/lib/components/Settings/Settings.svelte b/src/lib/components/Settings/Settings.svelte index be43c65..6b6cefd 100644 --- a/src/lib/components/Settings/Settings.svelte +++ b/src/lib/components/Settings/Settings.svelte @@ -8,6 +8,7 @@ import ReaderSettings from './Reader/ReaderSettings.svelte'; import Profiles from './Profiles/Profiles.svelte'; import CatalogSettings from './CatalogSettings.svelte'; + import Stats from './Stats.svelte'; let transitionParams = { x: 320, @@ -47,6 +48,7 @@ +
diff --git a/src/lib/components/Settings/Stats.svelte b/src/lib/components/Settings/Stats.svelte new file mode 100644 index 0000000..d0e340b --- /dev/null +++ b/src/lib/components/Settings/Stats.svelte @@ -0,0 +1,30 @@ + + + + Stats +
+

Completed volumes: {completed}

+

Pages read: {pagesRead}

+

Characters read: {charsRead}

+
+
diff --git a/src/lib/components/VolumeItem.svelte b/src/lib/components/VolumeItem.svelte index ae82332..02065a0 100644 --- a/src/lib/components/VolumeItem.svelte +++ b/src/lib/components/VolumeItem.svelte @@ -1,5 +1,4 @@