Compare commits

...

35 Commits

Author SHA1 Message Date
Youwes09 5c703bdba5 Chore: Bump to v0.10.0 2026-06-12 17:59:11 -05:00
Youwes09 a041b182e5 Feat: Static & Flatpak Workflow + Recent Fix 2026-06-12 17:52:09 -05:00
Youwes09 9dad1fb329 Feat: Recent Tab (Unread State) + Bug Fixes 2026-06-12 17:27:08 -05:00
Youwes09 31a19687ce Fix: Browse Bug Fixes & Enhancements 2026-06-12 04:12:33 -05:00
Youwes09 437b52fd8b Feat: Longstrip Viewer(s) & Lag Improvements 2026-06-11 23:27:01 -05:00
Youwes09 1e159bbd73 Fix: Pass all Template Arguments on BugReporter 2026-06-10 13:12:25 -05:00
Youwes09 cb3d8d64fa Fix: DiscordRPC Toggle (Un-tested) 2026-06-10 13:06:46 -05:00
Youwes09 c0a95ff899 Fix: Github Workflows (P.2) 2026-06-10 12:59:08 -05:00
Youwes09 ddaca9d126 Fix: Workflow Failure (P.1) 2026-06-10 12:55:30 -05:00
Youwes09 77b28e97a4 Feat: Bug Reporter (Github Issue Templates) 2026-06-10 12:49:48 -05:00
Youwes09 f10b343108 Fix: Library Mappings 2026-06-09 22:57:50 -05:00
Youwes09 a8ad9034fc Fix: Reader Longstrip Bookmark + ProgressBar 2026-06-09 22:52:11 -05:00
Shozikan f99fa60e8e Merge pull request #95 from frozenKelp/main
fix: idle splash, Discord RPC, memory leaks, reader navigation, cover art, settings scroll
2026-06-09 21:11:29 -05:00
Youwes09 915ff66b2f Chore: ModalBlur Component 2026-06-09 21:08:57 -05:00
Youwes09 abd60f261f Fix: Splashscreen Idle & Dev 2026-06-09 19:24:16 -05:00
Youwes09 fc20835dde Fix: SplashScreen MemoryLeak + WebUI Bypass 2026-06-09 14:54:12 -05:00
frozenKelp 04631d93ef fix: settings modal scroll layer will-change 2026-06-09 21:45:39 +05:30
frozenKelp 5c09cd15ad fix: settings scroll parallax between text and row backgrounds 2026-06-09 20:59:52 +05:30
frozenKelp 7af69fd77c fix: manga detail page shows correct cover instead of stale one 2026-06-09 20:58:56 +05:30
frozenKelp 0b6372bd17 fix: X closes reader to origin page, not previous chapter 2026-06-09 20:58:43 +05:30
frozenKelp 32bdeb92ff fix: set rpc to idle when idle 2026-06-09 20:13:41 +05:30
frozenKelp 22c4a222d8 fix: idle splash exit animation works 2026-06-09 19:43:02 +05:30
frozenKelp 26cb16ec0f Merge branch 'main' of https://github.com/moku-project/Moku 2026-06-09 19:16:10 +05:30
Youwes09 8c2917b698 Chore: Update Server Version 2026-06-09 08:44:09 -05:00
frozenKelp 6d33fb7ae1 fix: make weel and touch passive 2026-06-09 19:10:52 +05:30
frozenKelp 0e7ff1a27c fix: add wheel and touchmove to idle activity listeners 2026-06-09 16:29:48 +05:30
frozenKelp 685bd9b9da fix: revoke page blob URLs on chapter change and reader close 2026-06-09 16:15:31 +05:30
frozenKelp 3926b5d064 chore: clean up discord RPC hooks 2026-06-09 15:16:27 +05:30
frozenKelp 9f6996dcdb fix: read idleTimeoutMin from settings; clean up idle + splash canvas fixes 2026-06-09 15:04:18 +05:30
frozenKelp 294865fe9d style: use specific imports for discord functions 2026-06-09 10:55:22 +05:30
frozenKelp 13e760594d fix: sync libraryShowAllInSaved setting to library state 2026-06-09 10:54:20 +05:30
frozenKelp b44b12ba86 fix: update discord rpc to emit presence when reading chapters 2026-06-09 10:53:34 +05:30
Youwes09 3b8c8dea38 Fix: WebUI Auth & Tauri Auth 2026-06-08 20:27:22 -05:00
Youwes09 615fa1e92f Chore: GQL Cleanup P.3 2026-06-07 18:37:52 -05:00
Youwes09 248b046627 Fix: Home-Screen Recommendations & GQL Cleanup P.2 2026-06-07 15:40:18 -05:00
110 changed files with 4437 additions and 2874 deletions
+78
View File
@@ -0,0 +1,78 @@
name: Bug Report
description: Something isn't working as expected
labels: ["bug"]
body:
- type: markdown
attributes:
value: |
Thanks for taking the time to report a bug. The more detail you include, the faster it gets fixed.
You can use the **Report a Bug** button in **Settings → About** to pre-fill most of this automatically.
- type: textarea
id: description
attributes:
label: Description
description: What's broken? A clear, concise summary.
placeholder: "e.g. Library card stats don't appear even with 'Always show' enabled"
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to Reproduce
description: Exact steps to trigger the bug.
placeholder: |
1. Open Settings → Library
2. Enable "Always show card stats"
3. Return to Library
4. Unread counts are not visible
validations:
required: true
- type: textarea
id: expected
attributes:
label: Expected Behavior
placeholder: "Unread and download counts should be permanently visible on manga cards"
validations:
required: true
- type: textarea
id: actual
attributes:
label: Actual Behavior
placeholder: "Counts only appear on hover, or not at all"
validations:
required: true
- type: textarea
id: environment
attributes:
label: Environment
description: Copy this from Settings → About → Report a Bug, or fill in manually.
placeholder: |
- Moku Version: v0.9.4
- Platform: Windows / macOS / Linux / Web
- OS Version: Windows 11 24H2
- Server: Suwayomi v2.2.2196
- Server URL: localhost:4567
validations:
required: true
- type: textarea
id: settings
attributes:
label: Relevant Settings
description: Settings related to the bug (auto-filled by the in-app reporter, or paste manually).
placeholder: |
libraryStatsAlways: true
libraryCropCovers: true
libraryPageSize: 48
render: yaml
- type: textarea
id: additional
attributes:
label: Additional Context
description: Screenshots, screen recordings, console errors, anything else helpful.
+5
View File
@@ -0,0 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Discussions (Questions & Support)
url: https://github.com/moku-project/Moku/discussions
about: Not a bug? Ask questions and get help here.
@@ -0,0 +1,47 @@
name: Feature Request
description: Suggest an improvement or new feature
labels: ["enhancement"]
body:
- type: markdown
attributes:
value: |
Got an idea? Describe what you want and why it would be useful.
- type: textarea
id: problem
attributes:
label: Problem / Motivation
description: What's the gap or frustration this would address?
placeholder: "e.g. There's no way to bulk-mark chapters as read without opening each series"
validations:
required: true
- type: textarea
id: solution
attributes:
label: Proposed Solution
description: What would you like to see?
placeholder: "A 'Mark all read' option in the series long-press context menu"
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: Alternatives Considered
description: Any workarounds you've tried, or other ways this could be solved.
- type: textarea
id: environment
attributes:
label: Environment
description: Optional — useful if this is platform-specific.
placeholder: |
- Moku Version: v0.9.4
- Platform: Windows / macOS / Linux / Web
- type: textarea
id: additional
attributes:
label: Additional Context
description: Mockups, references, examples from other apps, etc.
+18
View File
@@ -0,0 +1,18 @@
# Sourced by CI jobs that need versions from nix/versions.nix.
# Usage: source .github/read_versions.sh
# Exports: MOKU_VERSION SUWA_VERSION SUWA_HASH_LINUX SUWA_HASH_MACOS_ARM64 SUWA_HASH_MACOS_X64 SUWA_HASH_WINDOWS
_nix="$( cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd )/nix/versions.nix"
_t=$(cat "$_nix")
_pick() { echo "$_t" | grep -oP "${1}\s*=\s*\"\K[^\"]+"; }
export MOKU_VERSION=$(_pick "moku")
export SUWA_VERSION=$(_pick "version")
export SUWA_HASH_WINDOWS=$(_pick "windowsHash")
export SUWA_HASH_LINUX=$(_pick "linuxHash")
export SUWA_HASH_MACOS_ARM64=$(_pick "macosArm64Hash")
export SUWA_HASH_MACOS_X64=$(_pick "macosX64Hash")
unset _nix _t
unset -f _pick
+80
View File
@@ -0,0 +1,80 @@
name: Build Flatpak
on:
workflow_dispatch:
inputs:
version:
description: "Version to build (e.g. 0.9.0)"
required: true
permissions:
contents: write
jobs:
flatpak:
name: Build Flatpak bundle
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Free up disk space
run: |
sudo rm -rf /usr/local/lib/android /opt/ghc /usr/share/dotnet /opt/hostedtoolcache/CodeQL
sudo docker image prune -af || true
- name: Install flatpak tooling
run: |
sudo apt-get update
sudo apt-get install -y flatpak flatpak-builder
flatpak --user remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
- name: Cache flatpak runtimes/SDKs
uses: actions/cache@v4
with:
path: ~/.local/share/flatpak
key: flatpak-runtimes-gnome48-rust-stable
- name: Install runtime, SDK and rust-stable extension
run: |
flatpak --user install -y --noninteractive flathub \
org.gnome.Platform//48 \
org.gnome.Sdk//48 \
org.freedesktop.Sdk.Extension.rust-stable//48
- name: Build flatpak
run: |
rm -rf build-dir repo
flatpak-builder \
--user \
--install-deps-from=flathub \
--repo=repo \
--force-clean \
build-dir \
io.github.moku_project.Moku.yml
- name: Bundle flatpak
run: |
flatpak build-bundle \
--runtime-repo=https://flathub.org/repo/flathub.flatpakrepo \
repo \
moku.flatpak \
io.github.moku_project.Moku
- name: Upload Flatpak artifact to release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
for i in $(seq 1 12); do
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
"https://api.github.com/repos/moku-project/Moku/releases" \
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}") | .id' | head -1)
[ -n "$RELEASE_ID" ] && break
echo "Waiting for release... attempt $i"; sleep 15
done
[ -z "$RELEASE_ID" ] && { echo "ERROR: release not found"; exit 1; }
curl -s -X POST \
-H "Authorization: Bearer $GITHUB_TOKEN" \
-H "Content-Type: application/octet-stream" \
--data-binary @"moku.flatpak" \
"https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=moku.flatpak"
+36 -79
View File
@@ -16,24 +16,15 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with: { version: latest }
version: latest
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Install dependencies - run: pnpm build:static
run: pnpm install --frozen-lockfile - uses: actions/upload-artifact@v4
- name: Build
run: pnpm build
- name: Upload dist
uses: actions/upload-artifact@v4
with: with:
name: frontend-dist-linux name: frontend-dist-linux
path: dist/ path: dist/
@@ -43,77 +34,56 @@ jobs:
name: Tauri (Linux x64) name: Tauri (Linux x64)
needs: frontend needs: frontend
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download frontend dist - uses: actions/download-artifact@v4
uses: actions/download-artifact@v4 with: { name: frontend-dist-linux, path: dist/ }
with:
name: frontend-dist-linux - name: Read versions
path: dist/ run: |
source .github/read_versions.sh
echo "MOKU_VERSION=$MOKU_VERSION" >> $GITHUB_ENV
echo "SUWA_VERSION=$SUWA_VERSION" >> $GITHUB_ENV
echo "SUWA_HASH=$SUWA_HASH_LINUX" >> $GITHUB_ENV
- name: Install system dependencies - name: Install system dependencies
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y \ sudo apt-get install -y \
libwebkit2gtk-4.1-dev \ libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libfuse2
libappindicator3-dev \
librsvg2-dev \
patchelf \
libfuse2
- name: Install Rust - uses: dtolnay/rust-toolchain@stable
uses: dtolnay/rust-toolchain@stable with: { targets: x86_64-unknown-linux-gnu }
with:
targets: x86_64-unknown-linux-gnu
- name: Rust cache - uses: Swatinem/rust-cache@v2
uses: Swatinem/rust-cache@v2 with: { workspaces: src-tauri }
with:
workspaces: src-tauri
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with: { version: latest }
version: latest
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Install JS dependencies
run: pnpm install --frozen-lockfile
- name: Download Suwayomi (Linux x64) - name: Download Suwayomi (Linux x64)
run: | run: |
curl -fsSL \ curl -fsSL \
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087-linux-x64.tar.gz" \ "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/Suwayomi-Server-v${SUWA_VERSION}-linux-x64.tar.gz" \
-o suwayomi-linux.tar.gz -o suwayomi-linux.tar.gz
echo "${SUWA_HASH} suwayomi-linux.tar.gz" | sha256sum -c -
echo "888bee202649ce7e3e3468a729c4084fb465f024b4033cab3f8ab98b0c66fe76 suwayomi-linux.tar.gz" | sha256sum -c -
mkdir -p suwayomi-extracted mkdir -p suwayomi-extracted
tar -xzf suwayomi-linux.tar.gz -C suwayomi-extracted --strip-components=1 tar -xzf suwayomi-linux.tar.gz -C suwayomi-extracted --strip-components=1
- name: Stage Suwayomi bundle - name: Stage Suwayomi bundle
run: | run: |
mkdir -p src-tauri/binaries mkdir -p src-tauri/binaries
for f in suwayomi-extracted/bin/Suwayomi-Server.jar \
JAR="suwayomi-extracted/bin/Suwayomi-Server.jar" suwayomi-extracted/jre/bin/java \
JAVA="suwayomi-extracted/jre/bin/java" suwayomi-extracted/bin/catch_abort.so; do
CATCH="suwayomi-extracted/bin/catch_abort.so" [ -e "$f" ] || { echo "ERROR: missing $f"; find suwayomi-extracted -type f | head -40; exit 1; }
for f in "$JAR" "$JAVA" "$CATCH"; do
if [ ! -e "$f" ]; then
echo "ERROR: expected file not found: $f"
find suwayomi-extracted -type f | head -40
exit 1
fi
done done
echo "JAR=$JAR JAVA=$JAVA CATCH=$CATCH"
cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
chmod +x src-tauri/binaries/suwayomi-bundle/jre/bin/java chmod +x src-tauri/binaries/suwayomi-bundle/jre/bin/java
@@ -129,43 +99,30 @@ jobs:
- name: Build Tauri app - name: Build Tauri app
run: pnpm tauri build --target x86_64-unknown-linux-gnu --config src-tauri/tauri.linux.conf.json --verbose run: pnpm tauri build --target x86_64-unknown-linux-gnu --config src-tauri/tauri.linux.conf.json --verbose
env: env: { NO_STRIP: "true" }
NO_STRIP: "true"
- name: Upload Linux artifacts to release - name: Upload Linux artifacts to release
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ github.event.inputs.version }}
run: | run: |
for i in $(seq 1 12); do for i in $(seq 1 12); do
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \ RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
"https://api.github.com/repos/moku-project/Moku/releases" \ "https://api.github.com/repos/moku-project/Moku/releases" \
| jq -r '.[] | select(.tag_name == "v'"$VERSION"'") | .id' | head -1) | jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}") | .id' | head -1)
if [ -n "$RELEASE_ID" ]; then break; fi [ -n "$RELEASE_ID" ] && break
echo "Waiting for release to exist... attempt $i" echo "Waiting for release... attempt $i"; sleep 15
sleep 15
done done
[ -z "$RELEASE_ID" ] && { echo "ERROR: release not found"; exit 1; }
if [ -z "$RELEASE_ID" ]; then upload() {
echo "ERROR: Could not find release for v$VERSION after waiting"
exit 1
fi
echo "Found release ID: $RELEASE_ID"
upload_asset() {
local file="$1"
local name="$2"
echo "Uploading $name..."
curl -s -X POST \ curl -s -X POST \
-H "Authorization: Bearer $GITHUB_TOKEN" \ -H "Authorization: Bearer $GITHUB_TOKEN" \
-H "Content-Type: application/octet-stream" \ -H "Content-Type: application/octet-stream" \
--data-binary @"$file" \ --data-binary @"$1" \
"https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$name" "https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$2"
} }
APPIMAGE=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage -name "*.AppImage" | head -1) APPIMAGE=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/appimage -name "*.AppImage" | head -1)
DEB=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb -name "*.deb" | head -1) DEB=$(find src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb -name "*.deb" | head -1)
[ -n "$APPIMAGE" ] && upload "$APPIMAGE" "moku-linux-x64-${{ github.event.inputs.version }}.AppImage"
[ -n "$APPIMAGE" ] && upload_asset "$APPIMAGE" "moku-linux-x64-${VERSION}.AppImage" [ -n "$DEB" ] && upload "$DEB" "moku-linux-x64-${{ github.event.inputs.version }}.deb"
[ -n "$DEB" ] && upload_asset "$DEB" "moku-linux-x64-${VERSION}.deb"
+56 -114
View File
@@ -4,7 +4,7 @@ on:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
version: version:
description: "Version to build (e.g. 0.4.0)" description: "Version to build (e.g. 0.9.0)"
required: true required: true
permissions: permissions:
@@ -16,28 +16,16 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with: { version: latest }
version: latest
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Install dependencies - run: pnpm build:static
run: pnpm install --frozen-lockfile - uses: actions/upload-artifact@v4
with: { name: frontend-dist, path: dist/, retention-days: 1 }
- name: Build
run: pnpm build
- name: Upload dist
uses: actions/upload-artifact@v4
with:
name: frontend-dist
path: dist/
retention-days: 1
tauri: tauri:
name: Tauri (macOS) name: Tauri (macOS)
@@ -46,149 +34,103 @@ jobs:
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download frontend dist - uses: actions/download-artifact@v4
uses: actions/download-artifact@v4 with: { name: frontend-dist, path: dist/ }
with:
name: frontend-dist
path: dist/
- name: Install Rust - name: Read versions
uses: dtolnay/rust-toolchain@stable run: |
with: source .github/read_versions.sh
targets: aarch64-apple-darwin,x86_64-apple-darwin echo "SUWA_VERSION=$SUWA_VERSION" >> $GITHUB_ENV
echo "SUWA_HASH_ARM64=$SUWA_HASH_MACOS_ARM64" >> $GITHUB_ENV
echo "SUWA_HASH_X64=$SUWA_HASH_MACOS_X64" >> $GITHUB_ENV
- name: Rust cache - uses: dtolnay/rust-toolchain@stable
uses: Swatinem/rust-cache@v2
with: with:
workspaces: src-tauri targets: "aarch64-apple-darwin,x86_64-apple-darwin"
- uses: Swatinem/rust-cache@v2
with: { workspaces: src-tauri }
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with: { version: latest }
version: latest
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Install JS dependencies
run: pnpm install --frozen-lockfile
- name: Download Suwayomi binaries - name: Download Suwayomi binaries
run: | run: |
download_suwayomi() { dl() {
local asset="$1" sha="$2" outdir="$3" local asset="$1" sha="$2" outdir="$3"
curl -fsSL \ curl -fsSL \
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/${asset}" \ "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/${asset}" \
-o "${outdir}.tar.gz" -o "${outdir}.tar.gz"
echo "${sha} ${outdir}.tar.gz" | shasum -a 256 -c - echo "${sha} ${outdir}.tar.gz" | shasum -a 256 -c -
mkdir -p "${outdir}" mkdir -p "${outdir}"
tar -xzf "${outdir}.tar.gz" -C "${outdir}" --strip-components=1 tar -xzf "${outdir}.tar.gz" -C "${outdir}" --strip-components=1
} }
dl "Suwayomi-Server-v${SUWA_VERSION}-macOS-arm64.tar.gz" "$SUWA_HASH_ARM64" suwayomi-arm64
download_suwayomi \ dl "Suwayomi-Server-v${SUWA_VERSION}-macOS-x64.tar.gz" "$SUWA_HASH_X64" suwayomi-x64
"Suwayomi-Server-v2.1.2087-macOS-arm64.tar.gz" \
"59f73a53a139d5d843e16cab4f3ac425a410add6bee0a60920fa26eb0a4b8a5c" \
"suwayomi-arm64"
download_suwayomi \
"Suwayomi-Server-v2.1.2087-macOS-x64.tar.gz" \
"da7e664e4c2615a0b9eac09ee38fe979feee1d6c0b266e19dba1ceea8ae3795c" \
"suwayomi-x64"
- name: Stage Suwayomi sidecars - name: Stage Suwayomi sidecars
run: | run: |
mkdir -p src-tauri/binaries mkdir -p src-tauri/binaries
stage() {
stage_arch() { local srcdir="$1" arch="$2"
local srcdir="$1"
local arch="$2"
local sidecar="src-tauri/binaries/suwayomi-server-${arch}"
local bundle_dest="src-tauri/binaries/suwayomi-bundle-${arch}"
JAR=$(find "$srcdir" -name "Suwayomi-Server.jar" | head -1) JAR=$(find "$srcdir" -name "Suwayomi-Server.jar" | head -1)
JAVA=$(find "$srcdir" -path "*/jre/bin/java" | head -1) JAVA=$(find "$srcdir" -path "*/jre/bin/java" | head -1)
[ -z "$JAR" ] && { echo "ERROR: jar not found in $srcdir"; find "$srcdir" -type f | head -30; exit 1; }
if [ -z "$JAR" ]; then [ -z "$JAVA" ] && { echo "ERROR: java not found in $srcdir"; find "$srcdir" -type f | head -30; exit 1; }
echo "ERROR: Suwayomi-Server.jar not found in $srcdir" cp -r "$srcdir" "src-tauri/binaries/suwayomi-bundle-${arch}"
find "$srcdir" -type f | head -30 cp src-tauri/binaries/suwayomi-launcher.sh "src-tauri/binaries/suwayomi-server-${arch}"
exit 1 chmod +x "src-tauri/binaries/suwayomi-server-${arch}"
fi
if [ -z "$JAVA" ]; then
echo "ERROR: jre/bin/java not found in $srcdir"
find "$srcdir" -type f | head -30
exit 1
fi
echo "${arch}: jar=${JAR} java=${JAVA}"
cp -r "$srcdir" "$bundle_dest"
# The launcher script is committed at src-tauri/binaries/suwayomi-launcher.sh
# to avoid embedding a heredoc in YAML (which breaks GitHub Actions parsing).
cp src-tauri/binaries/suwayomi-launcher.sh "$sidecar"
chmod +x "$sidecar"
echo "Staged sidecar: $sidecar"
} }
stage suwayomi-arm64 aarch64-apple-darwin
stage_arch suwayomi-arm64 aarch64-apple-darwin stage suwayomi-x64 x86_64-apple-darwin
stage_arch suwayomi-x64 x86_64-apple-darwin
- name: Patch tauri.conf.json for CI - name: Patch tauri.conf.json for CI
run: | run: |
sed -i '' 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json sed -i '' 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
- name: Swap bundle for aarch64 - name: Build Tauri app (aarch64)
run: | run: |
rm -rf src-tauri/binaries/suwayomi-bundle rm -rf src-tauri/binaries/suwayomi-bundle
cp -r src-tauri/binaries/suwayomi-bundle-aarch64-apple-darwin \ cp -r src-tauri/binaries/suwayomi-bundle-aarch64-apple-darwin src-tauri/binaries/suwayomi-bundle
src-tauri/binaries/suwayomi-bundle pnpm tauri build --target aarch64-apple-darwin --config src-tauri/tauri.macos.conf.json
- name: Build Tauri app (aarch64)
run: pnpm tauri build --target aarch64-apple-darwin --config src-tauri/tauri.macos.conf.json
env: env:
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }} APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }}
- name: Swap bundle for x86_64 - name: Build Tauri app (x86_64)
run: | run: |
rm -rf src-tauri/binaries/suwayomi-bundle rm -rf src-tauri/binaries/suwayomi-bundle
cp -r src-tauri/binaries/suwayomi-bundle-x86_64-apple-darwin \ cp -r src-tauri/binaries/suwayomi-bundle-x86_64-apple-darwin src-tauri/binaries/suwayomi-bundle
src-tauri/binaries/suwayomi-bundle pnpm tauri build --target x86_64-apple-darwin --config src-tauri/tauri.macos.conf.json
- name: Build Tauri app (x86_64)
run: pnpm tauri build --target x86_64-apple-darwin --config src-tauri/tauri.macos.conf.json
env: env:
APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }} APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY || '-' }}
- name: Upload macOS artifacts to release - name: Upload macOS artifacts to release
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VERSION: ${{ github.event.inputs.version }}
run: | run: |
# Wait for the Windows workflow to have created the draft release
for i in $(seq 1 12); do for i in $(seq 1 12); do
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" "https://api.github.com/repos/moku-project/Moku/releases" | jq -r '.[] | select(.tag_name == "v'"$VERSION"'") | .id' | head -1) RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
if [ -n "$RELEASE_ID" ]; then break; fi "https://api.github.com/repos/moku-project/Moku/releases" \
echo "Waiting for release to exist... attempt $i" | jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}") | .id' | head -1)
sleep 15 [ -n "$RELEASE_ID" ] && break
echo "Waiting for release... attempt $i"; sleep 15
done done
[ -z "$RELEASE_ID" ] && { echo "ERROR: release not found"; exit 1; }
if [ -z "$RELEASE_ID" ]; then upload() {
echo "ERROR: Could not find release for v$VERSION after waiting" curl -s -X POST \
exit 1 -H "Authorization: Bearer $GITHUB_TOKEN" \
fi -H "Content-Type: application/octet-stream" \
--data-binary @"$1" \
echo "Found release ID: $RELEASE_ID" "https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$2"
upload_asset() {
local file="$1"
local name="$2"
echo "Uploading $name..."
curl -s -X POST -H "Authorization: Bearer $GITHUB_TOKEN" -H "Content-Type: application/octet-stream" --data-binary @"$file" "https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=$name"
} }
ARM64_DMG=$(find src-tauri/target/aarch64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1) ARM64=$(find src-tauri/target/aarch64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1)
X64_DMG=$(find src-tauri/target/x86_64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1) X64=$(find src-tauri/target/x86_64-apple-darwin/release/bundle/dmg -name "*.dmg" | head -1)
[ -n "$ARM64" ] && upload "$ARM64" "moku-macos-arm64-${{ github.event.inputs.version }}.dmg"
[ -n "$ARM64_DMG" ] && upload_asset "$ARM64_DMG" "moku-macos-arm64-${VERSION}.dmg" [ -n "$X64" ] && upload "$X64" "moku-macos-x64-${{ github.event.inputs.version }}.dmg"
[ -n "$X64_DMG" ] && upload_asset "$X64_DMG" "moku-macos-x64-${VERSION}.dmg"
+51
View File
@@ -0,0 +1,51 @@
name: Build Static WebUI
on:
workflow_dispatch:
inputs:
version:
description: "Version to build (e.g. 0.9.0)"
required: true
permissions:
contents: write
jobs:
build:
name: Build static frontend
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: pnpm/action-setup@v4
with: { version: latest }
- uses: actions/setup-node@v4
with:
node-version: 22
cache: pnpm
- run: pnpm install --frozen-lockfile
- run: pnpm build:static
- name: Zip static build
run: |
cd dist
zip -r "../moku-webui-${{ github.event.inputs.version }}.zip" .
- name: Upload WebUI artifact to release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
for i in $(seq 1 12); do
RELEASE_ID=$(curl -s -H "Authorization: Bearer $GITHUB_TOKEN" \
"https://api.github.com/repos/moku-project/Moku/releases" \
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}") | .id' | head -1)
[ -n "$RELEASE_ID" ] && break
echo "Waiting for release... attempt $i"; sleep 15
done
[ -z "$RELEASE_ID" ] && { echo "ERROR: release not found"; exit 1; }
curl -s -X POST \
-H "Authorization: Bearer $GITHUB_TOKEN" \
-H "Content-Type: application/zip" \
--data-binary @"moku-webui-${{ github.event.inputs.version }}.zip" \
"https://uploads.github.com/repos/moku-project/Moku/releases/$RELEASE_ID/assets?name=moku-webui-${{ github.event.inputs.version }}.zip"
+34 -77
View File
@@ -16,120 +16,81 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with: { version: latest }
version: latest
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Install dependencies - run: pnpm build:static
run: pnpm install --frozen-lockfile - uses: actions/upload-artifact@v4
with: { name: frontend-dist-windows, path: dist/, retention-days: 1 }
- name: Build
run: pnpm build
- name: Upload dist
uses: actions/upload-artifact@v4
with:
name: frontend-dist-windows
path: dist/
retention-days: 1
tauri: tauri:
name: Tauri (Windows x64) name: Tauri (Windows x64)
needs: frontend needs: frontend
runs-on: windows-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Download frontend dist - uses: actions/download-artifact@v4
uses: actions/download-artifact@v4 with: { name: frontend-dist-windows, path: dist/ }
with:
name: frontend-dist-windows
path: dist/
- name: Install Rust - name: Read versions
uses: dtolnay/rust-toolchain@stable shell: bash
with: run: |
targets: x86_64-pc-windows-msvc source .github/read_versions.sh
echo "SUWA_VERSION=$SUWA_VERSION" >> $GITHUB_ENV
echo "SUWA_HASH=$SUWA_HASH_WINDOWS" >> $GITHUB_ENV
- name: Rust cache - uses: dtolnay/rust-toolchain@stable
uses: Swatinem/rust-cache@v2 with: { targets: x86_64-pc-windows-msvc }
with:
workspaces: src-tauri - uses: Swatinem/rust-cache@v2
with: { workspaces: src-tauri }
- uses: pnpm/action-setup@v4 - uses: pnpm/action-setup@v4
with: with: { version: latest }
version: latest
- uses: actions/setup-node@v4 - uses: actions/setup-node@v4
with: with:
node-version: 22 node-version: 22
cache: pnpm cache: pnpm
- run: pnpm install --frozen-lockfile
- name: Install JS dependencies
run: pnpm install --frozen-lockfile
- name: Download Suwayomi (Windows x64) - name: Download Suwayomi (Windows x64)
shell: bash shell: bash
run: | run: |
curl -fsSL \ curl -fsSL \
"https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087-windows-x64.zip" \ "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/Suwayomi-Server-v${SUWA_VERSION}-windows-x64.zip" \
-o suwayomi-windows.zip -o suwayomi-windows.zip
echo "65c3ec544190bc4e52f8ba05b49c87448421d9825aaaeb902cb4e34e69ff7207 suwayomi-windows.zip" | sha256sum -c - echo "${SUWA_HASH} suwayomi-windows.zip" | sha256sum -c -
unzip -q suwayomi-windows.zip -d suwayomi-raw unzip -q suwayomi-windows.zip -d suwayomi-raw
- name: Extract Suwayomi bundle - name: Stage Suwayomi bundle
shell: bash shell: bash
run: | run: |
mkdir -p suwayomi-extracted mkdir -p suwayomi-extracted
TOP_DIRS=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | wc -l) TOP_DIRS=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | wc -l)
TOP_FILES=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type f | wc -l) TOP_FILES=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type f | wc -l)
if [ "$TOP_DIRS" -eq 1 ] && [ "$TOP_FILES" -eq 0 ]; then if [ "$TOP_DIRS" -eq 1 ] && [ "$TOP_FILES" -eq 0 ]; then
INNER=$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | head -1) cp -r "$(find suwayomi-raw -mindepth 1 -maxdepth 1 -type d | head -1)"/. suwayomi-extracted/
cp -r "$INNER"/. suwayomi-extracted/
else else
cp -r suwayomi-raw/. suwayomi-extracted/ cp -r suwayomi-raw/. suwayomi-extracted/
fi fi
- name: Stage Suwayomi bundle
shell: bash
run: |
mkdir -p src-tauri/binaries mkdir -p src-tauri/binaries
JAVA=$(find suwayomi-extracted -path "*/jre/bin/java.exe" | head -1) find suwayomi-extracted -path "*/jre/bin/java.exe" | grep -q . \
JAR=$(find suwayomi-extracted -name "Suwayomi-Server.jar" | head -1) || { echo "ERROR: java.exe not found"; find suwayomi-extracted -type f | head -50; exit 1; }
if [ -z "$JAVA" ]; then find suwayomi-extracted -name "Suwayomi-Server.jar" | grep -q . \
echo "ERROR: jre/bin/java.exe not found" || { echo "ERROR: Suwayomi-Server.jar not found"; find suwayomi-extracted -type f | head -50; exit 1; }
find suwayomi-extracted -type f | head -50
exit 1
fi
if [ -z "$JAR" ]; then
echo "ERROR: Suwayomi-Server.jar not found"
find suwayomi-extracted -type f | head -50
exit 1
fi
cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle cp -r suwayomi-extracted src-tauri/binaries/suwayomi-bundle
- name: Validate staging
shell: bash
run: |
find src-tauri/binaries/suwayomi-bundle -path "*/jre/bin/java.exe" \
| grep -q . || (echo "ERROR: jre/bin/java.exe missing" && exit 1)
find src-tauri/binaries/suwayomi-bundle -name "Suwayomi-Server.jar" \
| grep -q . || (echo "ERROR: Suwayomi-Server.jar missing" && exit 1)
echo "Staging OK"
- name: Patch tauri.conf.json for CI - name: Patch tauri.conf.json for CI
shell: bash shell: bash
run: | run: |
sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json
- name: Delete existing draft release if present - name: Delete existing draft release
shell: bash shell: bash
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -138,14 +99,10 @@ jobs:
"https://api.github.com/repos/moku-project/Moku/releases" \ "https://api.github.com/repos/moku-project/Moku/releases" \
| jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}" and .draft == true) | .id') | jq -r '.[] | select(.tag_name == "v${{ github.event.inputs.version }}" and .draft == true) | .id')
if [ -n "$RELEASE_ID" ]; then if [ -n "$RELEASE_ID" ]; then
echo "Deleting existing draft release $RELEASE_ID"
curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \ curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
"https://api.github.com/repos/moku-project/Moku/releases/$RELEASE_ID" "https://api.github.com/repos/moku-project/Moku/releases/$RELEASE_ID"
curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \ curl -s -X DELETE -H "Authorization: Bearer $GITHUB_TOKEN" \
"https://api.github.com/repos/moku-project/Moku/git/refs/tags/v${{ github.event.inputs.version }}" "https://api.github.com/repos/moku-project/Moku/git/refs/tags/v${{ github.event.inputs.version }}"
echo "Deleted draft release and tag"
else
echo "No existing draft release found"
fi fi
- name: Build Tauri app + create draft release - name: Build Tauri app + create draft release
@@ -158,10 +115,10 @@ jobs:
releaseBody: | releaseBody: |
Moku v${{ github.event.inputs.version }} Moku v${{ github.event.inputs.version }}
**Windows:** Download `Moku_${{ github.event.inputs.version }}_x64-setup.exe` **Windows:** `Moku_${{ github.event.inputs.version }}_x64-setup.exe`
**macOS arm64:** Download `moku-macos-arm64-${{ github.event.inputs.version }}.dmg` **macOS arm64:** `moku-macos-arm64-${{ github.event.inputs.version }}.dmg`
**macOS x64:** Download `moku-macos-x64-${{ github.event.inputs.version }}.dmg` **macOS x64:** `moku-macos-x64-${{ github.event.inputs.version }}.dmg`
**Linux:** Download `moku.flatpak` **Linux:** `moku.flatpak`
releaseDraft: true releaseDraft: true
prerelease: false prerelease: false
args: --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json args: --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json
+1 -1
View File
@@ -1,5 +1,5 @@
pkgname=moku pkgname=moku
pkgver=0.9.4 pkgver=0.10.0
pkgrel=1 pkgrel=1
pkgdesc="Native Linux manga reader frontend for Suwayomi-Server" pkgdesc="Native Linux manga reader frontend for Suwayomi-Server"
arch=('x86_64') arch=('x86_64')
+99
View File
@@ -0,0 +1,99 @@
#Requires -Version 7
param(
[switch]$SkipFrontend,
[switch]$SkipSuwayomi
)
Set-StrictMode -Version Latest
$ErrorActionPreference = "Stop"
function Step($msg) { Write-Host "`n==> $msg" -ForegroundColor Cyan }
function Need($cmd) {
if (-not (Get-Command $cmd -ErrorAction SilentlyContinue)) {
Write-Error "Required tool not found: $cmd"
}
}
$Root = Split-Path -Parent $MyInvocation.MyCommand.Path
Set-Location $Root
Step "Reading nix/versions.nix"
$nix = Get-Content "$Root\nix\versions.nix" -Raw
$MOKU_VERSION = if ($nix -match 'moku\s*=\s*"([^"]+)"') { $Matches[1] } else { Write-Error "moku version not found" }
$SUWA_VERSION = if ($nix -match 'version\s*=\s*"([^"]+)"') { $Matches[1] } else { Write-Error "suwayomi version not found" }
$SUWA_HASH = if ($nix -match 'windowsHash\s*=\s*"([^"]+)"') { $Matches[1] } else { Write-Error "windowsHash not found" }
Write-Host " moku=$MOKU_VERSION suwayomi=$SUWA_VERSION"
Need "pnpm"; Need "cargo"; Need "node"
if (-not $SkipFrontend) {
Step "pnpm install"
pnpm install --frozen-lockfile
if ($LASTEXITCODE -ne 0) { Write-Error "pnpm install failed" }
Step "Frontend build"
$env:MOKU_TARGET = "static"
pnpm build:static
if ($LASTEXITCODE -ne 0) { Write-Error "Frontend build failed" }
}
$BundleDir = "$Root\src-tauri\binaries\suwayomi-bundle"
$ZipPath = "$env:TEMP\suwayomi-windows-$SUWA_VERSION.zip"
$ExtractDir = "$env:TEMP\suwayomi-extracted-$SUWA_VERSION"
if (-not $SkipSuwayomi) {
Step "Downloading Suwayomi v$SUWA_VERSION"
$ZipUrl = "https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VERSION}/Suwayomi-Server-v${SUWA_VERSION}-windows-x64.zip"
if (-not (Test-Path $ZipPath)) {
Invoke-WebRequest -Uri $ZipUrl -OutFile $ZipPath -UseBasicParsing
}
$actual = (Get-FileHash $ZipPath -Algorithm SHA256).Hash.ToLower()
if ($actual -ne $SUWA_HASH.ToLower()) {
Write-Error "Hash mismatch`n expected: $SUWA_HASH`n got: $actual"
}
Step "Staging bundle"
if (Test-Path $ExtractDir) { Remove-Item $ExtractDir -Recurse -Force }
Expand-Archive -Path $ZipPath -DestinationPath $ExtractDir
$topDirs = @(Get-ChildItem $ExtractDir -Directory)
$topFiles = @(Get-ChildItem $ExtractDir -File)
$SrcDir = if ($topDirs.Count -eq 1 -and $topFiles.Count -eq 0) { $topDirs[0].FullName } else { $ExtractDir }
if (Test-Path $BundleDir) { Remove-Item $BundleDir -Recurse -Force }
Copy-Item $SrcDir $BundleDir -Recurse
$java = Get-ChildItem $BundleDir -Recurse -Filter "java.exe" | Where-Object { $_.FullName -match "jre.bin" } | Select-Object -First 1
$jar = Get-ChildItem $BundleDir -Recurse -Filter "Suwayomi-Server.jar" | Select-Object -First 1
if (-not $java) { Write-Error "java.exe not found in staged bundle" }
if (-not $jar) { Write-Error "Suwayomi-Server.jar not found in staged bundle" }
Write-Host " java: $($java.FullName)"
Write-Host " jar: $($jar.FullName)"
} elseif (-not (Test-Path $BundleDir)) {
Write-Error "Bundle dir missing at $BundleDir — run without -SkipSuwayomi first"
}
Step "Patching tauri.conf.json"
$tauriConf = "$Root\src-tauri\tauri.conf.json"
$original = Get-Content $tauriConf -Raw
Set-Content $tauriConf ($original -replace '"beforeBuildCommand":\s*"pnpm build"', '"beforeBuildCommand": ""') -NoNewline
Step "Tauri build"
$env:TAURI_SKIP_DEVSERVER_CHECK = "true"
pnpm tauri build --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json
$buildExit = $LASTEXITCODE
Set-Content $tauriConf $original -NoNewline
if ($buildExit -ne 0) { Write-Error "Tauri build failed (exit $buildExit)" }
Step "Artifacts"
$out = "$Root\src-tauri\target\x86_64-pc-windows-msvc\release\bundle"
$msi = Get-ChildItem "$out\msi" -Filter "*.msi" -ErrorAction SilentlyContinue | Select-Object -First 1
$exe = Get-ChildItem "$out\nsis" -Filter "*.exe" -ErrorAction SilentlyContinue | Select-Object -First 1
Write-Host "`nDone — Moku $MOKU_VERSION" -ForegroundColor Green
if ($msi) { Write-Host " MSI: $($msi.FullName)" -ForegroundColor Yellow }
if ($exe) { Write-Host " EXE: $($exe.FullName)" -ForegroundColor Yellow }
if (-not $msi -and -not $exe) { Write-Host " No artifacts found in $out" -ForegroundColor Red }
+4 -4
View File
@@ -220,8 +220,8 @@ modules:
sources: sources:
- type: file - type: file
url: https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.1.2087/Suwayomi-Server-v2.1.2087.jar url: https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v2.2.2196/Suwayomi-Server-v2.2.2196.jar
sha256: f589a422674252394c13b289a9c8be691905bf583efb7f4d5f1501ae5e91e6b3 sha256: 8e7244c269456661a87705f746f0d87275770aa976bab7c6920e4d513e97c3f6
dest-filename: Suwayomi-Server.jar dest-filename: Suwayomi-Server.jar
- name: moku - name: moku
@@ -244,11 +244,11 @@ modules:
sources: sources:
- type: git - type: git
url: https://github.com/moku-project/Moku.git url: https://github.com/moku-project/Moku.git
tag: v0.9.4 tag: v0.10.0
commit: 239960683b6c7f1347e1798b0e179a8a46628728 commit: 239960683b6c7f1347e1798b0e179a8a46628728
- type: file - type: file
path: packaging/frontend-dist.tar.gz path: packaging/frontend-dist.tar.gz
sha256: 7db288b4b54277aa82b6ec5b21fc31a1e71f8246c50a74777500083b806c1fa5 sha256: 676ec2273ffd9a69248849c5d51dc4d59a5d5b68fbba7a4fe7e7b572a5f25f14
- packaging/cargo-sources.json - packaging/cargo-sources.json
- type: inline - type: inline
dest: src-tauri/.cargo dest: src-tauri/.cargo
+25 -8
View File
@@ -7,6 +7,7 @@
gnused gnused
coreutils coreutils
git git
xxd
rustToolchain rustToolchain
nodejs_22 nodejs_22
pnpm pnpm
@@ -85,17 +86,31 @@ PYEOF
if [[ $# -ge 2 ]]; then if [[ $# -ge 2 ]]; then
SUWA_VER="$2" SUWA_VER="$2"
JAR_URL="https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v${SUWA_VER}/Suwayomi-Server-v${SUWA_VER}.jar" BASE="https://github.com/Suwayomi/Suwayomi-Server-preview/releases/download/v''${SUWA_VER}"
SUWA_SHA_HEX=$(curl -fsSL "$JAR_URL" | sha256sum | awk '{print $1}') echo "Fetching Suwayomi v''${SUWA_VER} hashes (5 downloads)..."
SUWA_SHA_SRI=$(echo "$SUWA_SHA_HEX" | xxd -r -p | base64 -w0 | sed 's/^/sha256-/')
sed -i "s/version = \"[^\"]*\"/version = \"$SUWA_VER\"/" "$VERSIONS" sha_of() { curl -fsSL "$1" | sha256sum | awk '{print $1}'; }
sed -i "s|hash = \"sha256-[^\"]*\"|hash = \"$SUWA_SHA_SRI\"|" "$VERSIONS" to_sri() { echo "$1" | xxd -r -p | base64 -w0 | sed 's/^/sha256-/'; }
sed -i "s|Suwayomi-Server-preview/releases/download/v[^/]*/|Suwayomi-Server-preview/releases/download/v${SUWA_VER}/|" "$MANIFEST" JAR_SHA=$(sha_of "''${BASE}/Suwayomi-Server-v''${SUWA_VER}.jar")
sed -i "s|Suwayomi-Server-v[0-9.]*\.jar|Suwayomi-Server-v${SUWA_VER}.jar|g" "$MANIFEST" WIN_SHA=$(sha_of "''${BASE}/Suwayomi-Server-v''${SUWA_VER}-windows-x64.zip")
python3 - "$MANIFEST" "$SUWA_SHA_HEX" <<'PYEOF' LINUX_SHA=$(sha_of "''${BASE}/Suwayomi-Server-v''${SUWA_VER}-linux-x64.tar.gz")
ARM64_SHA=$(sha_of "''${BASE}/Suwayomi-Server-v''${SUWA_VER}-macOS-arm64.tar.gz")
X64_SHA=$(sha_of "''${BASE}/Suwayomi-Server-v''${SUWA_VER}-macOS-x64.tar.gz")
JAR_SRI=$(to_sri "$JAR_SHA")
sed -i "s/version = \"[^\"]*\"/version = \"''${SUWA_VER}\"/" "$VERSIONS"
sed -i "s|hash = \"sha256-[^\"]*\"|hash = \"''${JAR_SRI}\"|" "$VERSIONS"
sed -i "s|windowsHash = \"[^\"]*\"|windowsHash = \"''${WIN_SHA}\"|" "$VERSIONS"
sed -i "s|linuxHash = \"[^\"]*\"|linuxHash = \"''${LINUX_SHA}\"|" "$VERSIONS"
sed -i "s|macosArm64Hash = \"[^\"]*\"|macosArm64Hash = \"''${ARM64_SHA}\"|" "$VERSIONS"
sed -i "s|macosX64Hash = \"[^\"]*\"|macosX64Hash = \"''${X64_SHA}\"|" "$VERSIONS"
sed -i "s|Suwayomi-Server-preview/releases/download/v[^/]*/|Suwayomi-Server-preview/releases/download/v''${SUWA_VER}/|" "$MANIFEST"
sed -i "s|Suwayomi-Server-v[0-9.]*\.jar|Suwayomi-Server-v''${SUWA_VER}.jar|g" "$MANIFEST"
python3 - "$MANIFEST" "$JAR_SHA" <<'PYEOF'
import re, sys import re, sys
path, sha = sys.argv[1], sys.argv[2] path, sha = sys.argv[1], sys.argv[2]
text = open(path).read() text = open(path).read()
@@ -106,6 +121,8 @@ if n == 0:
sys.exit("ERROR: could not find Suwayomi jar sha256 in manifest") sys.exit("ERROR: could not find Suwayomi jar sha256 in manifest")
open(path, 'w').write(updated) open(path, 'w').write(updated)
PYEOF PYEOF
echo "Suwayomi hashes written."
fi fi
echo "Done versions.nix, flatpak manifest, and PKGBUILD patched for v$VERSION" echo "Done versions.nix, flatpak manifest, and PKGBUILD patched for v$VERSION"
+11 -7
View File
@@ -1,21 +1,25 @@
{ {
moku = "0.9.4"; moku = "0.10.0";
suwayomi = { suwayomi = {
version = "2.1.2087"; version = "2.2.2196";
hash = "sha256-9YmkImdCUjlME7KJqci+aRkFv1g++39NXxUBrl6R5rM="; hash = "sha256-jnJEwmlFZmGodwX3RvDYcnV3Cql2urfGkg5NUT6Xw/Y=";
windowsHash = "457ca4a64a57e0d274a87203d25e962103bcb456ee30ada3ea47328a3093329d";
linuxHash = "e13d63ceb7e2b15e83d0a78281e8c1c04ac4a833caa73e5a2b68fbaf0cb20c1f";
macosArm64Hash = "9e3dbebc7475707e8d11c56a473385c00b09bde0103d013bc1cb3d06c89e5c43";
macosX64Hash = "eadee02060b780a5febfb8dada2f89c7bd7db5905cfd20d47eaca02fcde8c9c5";
}; };
frontend = { frontend = {
pnpmHash = "sha256-18twdFhprV9v9hzvqxuVDHD6Tm4zHNDJs7s6l/7ClBo="; pnpmHash = "sha256-18twdFhprV9v9hzvqxuVDHD6Tm4zHNDJs7s6l/7ClBo=";
distHash = "7db288b4b54277aa82b6ec5b21fc31a1e71f8246c50a74777500083b806c1fa5"; distHash = "7db288b4b54277aa82b6ec5b21fc31a1e71f8246c50a74777500083b806c1fa5";
distHashSri = "sha256-fbiiu0tCd6qCtu+SIfw+aR8Yj2bFCnR3dQAIO4BvwfM="; distHashSri = "sha256-Z27CJz/9mmkkiEnF1R3E1ZpdW2j7unpP5+e1cqXyXxQ=";
}; };
gitDeps = { gitDeps = {
tauri-plugin-discord-rpc = "sha256-xq0qyK2NrwSAFDhXo0vbvcygRD2/7uqBaLpqfpfxkrc="; tauri-plugin-discord-rpc = "sha256-xq0qyK2NrwSAFDhXo0vbvcygRD2/7uqBaLpqfpfxkrc=";
}; };
gitCommit = "239960683b6c7f1347e1798b0e179a8a46628728"; gitCommit = "239960683b6c7f1347e1798b0e179a8a46628728";
tarballHash = ""; tarballHash = "";
} }
+2 -1
View File
@@ -21,6 +21,8 @@
"@sveltejs/kit": "^2.62.0", "@sveltejs/kit": "^2.62.0",
"@sveltejs/vite-plugin-svelte": "^7.1.2", "@sveltejs/vite-plugin-svelte": "^7.1.2",
"@tauri-apps/cli": "^2.11.2", "@tauri-apps/cli": "^2.11.2",
"@types/node": "^25.9.3",
"phosphor-svelte": "^3.1.0",
"svelte": "^5.56.1", "svelte": "^5.56.1",
"svelte-check": "^4.5.0", "svelte-check": "^4.5.0",
"typescript": "^6.0.3", "typescript": "^6.0.3",
@@ -42,7 +44,6 @@
"@tauri-apps/plugin-store": "^2.4.3", "@tauri-apps/plugin-store": "^2.4.3",
"capacitor-native-biometric": "^4.2.2", "capacitor-native-biometric": "^4.2.2",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"phosphor-svelte": "^3.1.0",
"tauri-plugin-discord-rpc-api": "github:Youwes09/tauri-plugin-discord-rpc" "tauri-plugin-discord-rpc-api": "github:Youwes09/tauri-plugin-discord-rpc"
} }
} }
+255 -255
View File
@@ -125,14 +125,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/autocfg/autocfg-1.5.0.crate", "url": "https://static.crates.io/crates/autocfg/autocfg-1.5.1.crate",
"sha256": "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8", "sha256": "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53",
"dest": "cargo/vendor/autocfg-1.5.0" "dest": "cargo/vendor/autocfg-1.5.1"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8\", \"files\": {}}", "contents": "{\"package\": \"f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53\", \"files\": {}}",
"dest": "cargo/vendor/autocfg-1.5.0", "dest": "cargo/vendor/autocfg-1.5.1",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -203,14 +203,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/bitflags/bitflags-2.11.1.crate", "url": "https://static.crates.io/crates/bitflags/bitflags-2.13.0.crate",
"sha256": "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3", "sha256": "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8",
"dest": "cargo/vendor/bitflags-2.11.1" "dest": "cargo/vendor/bitflags-2.13.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3\", \"files\": {}}", "contents": "{\"package\": \"b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8\", \"files\": {}}",
"dest": "cargo/vendor/bitflags-2.11.1", "dest": "cargo/vendor/bitflags-2.13.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -242,27 +242,27 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/brotli/brotli-8.0.2.crate", "url": "https://static.crates.io/crates/brotli/brotli-8.0.3.crate",
"sha256": "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560", "sha256": "8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610",
"dest": "cargo/vendor/brotli-8.0.2" "dest": "cargo/vendor/brotli-8.0.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560\", \"files\": {}}", "contents": "{\"package\": \"8119e4516436f5708bbc474a9d395bf12f1b5395e93a92a56e647ac3388c8610\", \"files\": {}}",
"dest": "cargo/vendor/brotli-8.0.2", "dest": "cargo/vendor/brotli-8.0.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/brotli-decompressor/brotli-decompressor-5.0.0.crate", "url": "https://static.crates.io/crates/brotli-decompressor/brotli-decompressor-5.0.1.crate",
"sha256": "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03", "sha256": "5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924",
"dest": "cargo/vendor/brotli-decompressor-5.0.0" "dest": "cargo/vendor/brotli-decompressor-5.0.1"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03\", \"files\": {}}", "contents": "{\"package\": \"5962523e1b92ce1b5e793d9169b9943eece10d39f62550bc04bb605d75b94924\", \"files\": {}}",
"dest": "cargo/vendor/brotli-decompressor-5.0.0", "dest": "cargo/vendor/brotli-decompressor-5.0.1",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -281,14 +281,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/bumpalo/bumpalo-3.20.2.crate", "url": "https://static.crates.io/crates/bumpalo/bumpalo-3.20.3.crate",
"sha256": "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb", "sha256": "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649",
"dest": "cargo/vendor/bumpalo-3.20.2" "dest": "cargo/vendor/bumpalo-3.20.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb\", \"files\": {}}", "contents": "{\"package\": \"72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649\", \"files\": {}}",
"dest": "cargo/vendor/bumpalo-3.20.2", "dest": "cargo/vendor/bumpalo-3.20.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -411,14 +411,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/cc/cc-1.2.62.crate", "url": "https://static.crates.io/crates/cc/cc-1.2.64.crate",
"sha256": "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98", "sha256": "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f",
"dest": "cargo/vendor/cc-1.2.62" "dest": "cargo/vendor/cc-1.2.64"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98\", \"files\": {}}", "contents": "{\"package\": \"dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f\", \"files\": {}}",
"dest": "cargo/vendor/cc-1.2.62", "dest": "cargo/vendor/cc-1.2.64",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -489,14 +489,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/chrono/chrono-0.4.44.crate", "url": "https://static.crates.io/crates/chrono/chrono-0.4.45.crate",
"sha256": "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0", "sha256": "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327",
"dest": "cargo/vendor/chrono-0.4.44" "dest": "cargo/vendor/chrono-0.4.45"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0\", \"files\": {}}", "contents": "{\"package\": \"1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327\", \"files\": {}}",
"dest": "cargo/vendor/chrono-0.4.44", "dest": "cargo/vendor/chrono-0.4.45",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -944,14 +944,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/displaydoc/displaydoc-0.2.5.crate", "url": "https://static.crates.io/crates/displaydoc/displaydoc-0.2.6.crate",
"sha256": "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0", "sha256": "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f",
"dest": "cargo/vendor/displaydoc-0.2.5" "dest": "cargo/vendor/displaydoc-0.2.6"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0\", \"files\": {}}", "contents": "{\"package\": \"1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f\", \"files\": {}}",
"dest": "cargo/vendor/displaydoc-0.2.5", "dest": "cargo/vendor/displaydoc-0.2.6",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -1100,14 +1100,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/either/either-1.15.0.crate", "url": "https://static.crates.io/crates/either/either-1.16.0.crate",
"sha256": "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719", "sha256": "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e",
"dest": "cargo/vendor/either-1.15.0" "dest": "cargo/vendor/either-1.16.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719\", \"files\": {}}", "contents": "{\"package\": \"91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e\", \"files\": {}}",
"dest": "cargo/vendor/either-1.15.0", "dest": "cargo/vendor/either-1.16.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -1867,14 +1867,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/http/http-1.4.0.crate", "url": "https://static.crates.io/crates/http/http-1.4.2.crate",
"sha256": "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a", "sha256": "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425",
"dest": "cargo/vendor/http-1.4.0" "dest": "cargo/vendor/http-1.4.2"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a\", \"files\": {}}", "contents": "{\"package\": \"6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425\", \"files\": {}}",
"dest": "cargo/vendor/http-1.4.0", "dest": "cargo/vendor/http-1.4.2",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -1919,14 +1919,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/hyper/hyper-1.9.0.crate", "url": "https://static.crates.io/crates/hyper/hyper-1.10.1.crate",
"sha256": "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca", "sha256": "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498",
"dest": "cargo/vendor/hyper-1.9.0" "dest": "cargo/vendor/hyper-1.10.1"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca\", \"files\": {}}", "contents": "{\"package\": \"55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498\", \"files\": {}}",
"dest": "cargo/vendor/hyper-1.9.0", "dest": "cargo/vendor/hyper-1.10.1",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2322,14 +2322,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/js-sys/js-sys-0.3.98.crate", "url": "https://static.crates.io/crates/js-sys/js-sys-0.3.102.crate",
"sha256": "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08", "sha256": "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31",
"dest": "cargo/vendor/js-sys-0.3.98" "dest": "cargo/vendor/js-sys-0.3.102"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08\", \"files\": {}}", "contents": "{\"package\": \"03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31\", \"files\": {}}",
"dest": "cargo/vendor/js-sys-0.3.98", "dest": "cargo/vendor/js-sys-0.3.102",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2452,14 +2452,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/libredox/libredox-0.1.16.crate", "url": "https://static.crates.io/crates/libredox/libredox-0.1.17.crate",
"sha256": "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c", "sha256": "f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3",
"dest": "cargo/vendor/libredox-0.1.16" "dest": "cargo/vendor/libredox-0.1.17"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c\", \"files\": {}}", "contents": "{\"package\": \"f02ab6bace2054fb888a3c16f990117b579d14a3088e472d63c6011fa185c9d3\", \"files\": {}}",
"dest": "cargo/vendor/libredox-0.1.16", "dest": "cargo/vendor/libredox-0.1.17",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2517,14 +2517,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/log/log-0.4.29.crate", "url": "https://static.crates.io/crates/log/log-0.4.32.crate",
"sha256": "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897", "sha256": "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a",
"dest": "cargo/vendor/log-0.4.29" "dest": "cargo/vendor/log-0.4.32"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897\", \"files\": {}}", "contents": "{\"package\": \"953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a\", \"files\": {}}",
"dest": "cargo/vendor/log-0.4.29", "dest": "cargo/vendor/log-0.4.32",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2556,14 +2556,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/memchr/memchr-2.8.0.crate", "url": "https://static.crates.io/crates/memchr/memchr-2.8.2.crate",
"sha256": "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79", "sha256": "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4",
"dest": "cargo/vendor/memchr-2.8.0" "dest": "cargo/vendor/memchr-2.8.2"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79\", \"files\": {}}", "contents": "{\"package\": \"88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4\", \"files\": {}}",
"dest": "cargo/vendor/memchr-2.8.0", "dest": "cargo/vendor/memchr-2.8.2",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2608,27 +2608,27 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/mio/mio-1.2.0.crate", "url": "https://static.crates.io/crates/mio/mio-1.2.1.crate",
"sha256": "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1", "sha256": "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda",
"dest": "cargo/vendor/mio-1.2.0" "dest": "cargo/vendor/mio-1.2.1"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1\", \"files\": {}}", "contents": "{\"package\": \"02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda\", \"files\": {}}",
"dest": "cargo/vendor/mio-1.2.0", "dest": "cargo/vendor/mio-1.2.1",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/muda/muda-0.19.1.crate", "url": "https://static.crates.io/crates/muda/muda-0.19.2.crate",
"sha256": "0ae8844f63b5b118e334e205585b8c5c17b984121dbdb179d44aeb087ffad3cb", "sha256": "47a2e3dff89cd322c66647942668faee0a2b1f88ea6cbb4d374b4a8d7e92528c",
"dest": "cargo/vendor/muda-0.19.1" "dest": "cargo/vendor/muda-0.19.2"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"0ae8844f63b5b118e334e205585b8c5c17b984121dbdb179d44aeb087ffad3cb\", \"files\": {}}", "contents": "{\"package\": \"47a2e3dff89cd322c66647942668faee0a2b1f88ea6cbb4d374b4a8d7e92528c\", \"files\": {}}",
"dest": "cargo/vendor/muda-0.19.1", "dest": "cargo/vendor/muda-0.19.2",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2686,14 +2686,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/nix/nix-0.30.1.crate", "url": "https://static.crates.io/crates/nix/nix-0.31.3.crate",
"sha256": "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6", "sha256": "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d",
"dest": "cargo/vendor/nix-0.30.1" "dest": "cargo/vendor/nix-0.31.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6\", \"files\": {}}", "contents": "{\"package\": \"cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d\", \"files\": {}}",
"dest": "cargo/vendor/nix-0.30.1", "dest": "cargo/vendor/nix-0.31.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -2712,14 +2712,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/num-conv/num-conv-0.2.1.crate", "url": "https://static.crates.io/crates/num-conv/num-conv-0.2.2.crate",
"sha256": "c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967", "sha256": "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441",
"dest": "cargo/vendor/num-conv-0.2.1" "dest": "cargo/vendor/num-conv-0.2.2"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"c6673768db2d862beb9b39a78fdcb1a69439615d5794a1be50caa9bc92c81967\", \"files\": {}}", "contents": "{\"package\": \"521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441\", \"files\": {}}",
"dest": "cargo/vendor/num-conv-0.2.1", "dest": "cargo/vendor/num-conv-0.2.2",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -3024,14 +3024,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/openssl/openssl-0.10.80.crate", "url": "https://static.crates.io/crates/openssl/openssl-0.10.81.crate",
"sha256": "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967", "sha256": "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45",
"dest": "cargo/vendor/openssl-0.10.80" "dest": "cargo/vendor/openssl-0.10.81"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967\", \"files\": {}}", "contents": "{\"package\": \"77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45\", \"files\": {}}",
"dest": "cargo/vendor/openssl-0.10.80", "dest": "cargo/vendor/openssl-0.10.81",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -3063,14 +3063,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.116.crate", "url": "https://static.crates.io/crates/openssl-sys/openssl-sys-0.9.117.crate",
"sha256": "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4", "sha256": "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695",
"dest": "cargo/vendor/openssl-sys-0.9.116" "dest": "cargo/vendor/openssl-sys-0.9.117"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4\", \"files\": {}}", "contents": "{\"package\": \"b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695\", \"files\": {}}",
"dest": "cargo/vendor/openssl-sys-0.9.116", "dest": "cargo/vendor/openssl-sys-0.9.117",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -3089,14 +3089,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/os_info/os_info-3.14.0.crate", "url": "https://static.crates.io/crates/os_info/os_info-3.15.0.crate",
"sha256": "e4022a17595a00d6a369236fdae483f0de7f0a339960a53118b818238e132224", "sha256": "9cf20a545b305cf1da722b236b5155c9bb35f1d5ceb28c048bd96ca842f41b5b",
"dest": "cargo/vendor/os_info-3.14.0" "dest": "cargo/vendor/os_info-3.15.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"e4022a17595a00d6a369236fdae483f0de7f0a339960a53118b818238e132224\", \"files\": {}}", "contents": "{\"package\": \"9cf20a545b305cf1da722b236b5155c9bb35f1d5ceb28c048bd96ca842f41b5b\", \"files\": {}}",
"dest": "cargo/vendor/os_info-3.14.0", "dest": "cargo/vendor/os_info-3.15.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -3726,14 +3726,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/regex/regex-1.12.3.crate", "url": "https://static.crates.io/crates/regex/regex-1.12.4.crate",
"sha256": "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276", "sha256": "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba",
"dest": "cargo/vendor/regex-1.12.3" "dest": "cargo/vendor/regex-1.12.4"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276\", \"files\": {}}", "contents": "{\"package\": \"f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba\", \"files\": {}}",
"dest": "cargo/vendor/regex-1.12.3", "dest": "cargo/vendor/regex-1.12.4",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -3752,14 +3752,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.10.crate", "url": "https://static.crates.io/crates/regex-syntax/regex-syntax-0.8.11.crate",
"sha256": "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a", "sha256": "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4",
"dest": "cargo/vendor/regex-syntax-0.8.10" "dest": "cargo/vendor/regex-syntax-0.8.11"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a\", \"files\": {}}", "contents": "{\"package\": \"d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4\", \"files\": {}}",
"dest": "cargo/vendor/regex-syntax-0.8.10", "dest": "cargo/vendor/regex-syntax-0.8.11",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -3778,14 +3778,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/reqwest/reqwest-0.13.3.crate", "url": "https://static.crates.io/crates/reqwest/reqwest-0.13.4.crate",
"sha256": "62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0", "sha256": "219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3",
"dest": "cargo/vendor/reqwest-0.13.3" "dest": "cargo/vendor/reqwest-0.13.4"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"62e0021ea2c22aed41653bc7e1419abb2c97e038ff2c33d0e1309e49a97deec0\", \"files\": {}}", "contents": "{\"package\": \"219c5811de6525e5416c7d5d53bb656d3afdbc6c5af816e0802bcfa42dbdc1c3\", \"files\": {}}",
"dest": "cargo/vendor/reqwest-0.13.3", "dest": "cargo/vendor/reqwest-0.13.4",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -4129,14 +4129,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/serde_json/serde_json-1.0.149.crate", "url": "https://static.crates.io/crates/serde_json/serde_json-1.0.150.crate",
"sha256": "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86", "sha256": "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9",
"dest": "cargo/vendor/serde_json-1.0.149" "dest": "cargo/vendor/serde_json-1.0.150"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86\", \"files\": {}}", "contents": "{\"package\": \"e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9\", \"files\": {}}",
"dest": "cargo/vendor/serde_json-1.0.149", "dest": "cargo/vendor/serde_json-1.0.150",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -4194,27 +4194,27 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/serde_with/serde_with-3.20.0.crate", "url": "https://static.crates.io/crates/serde_with/serde_with-3.21.0.crate",
"sha256": "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2", "sha256": "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c",
"dest": "cargo/vendor/serde_with-3.20.0" "dest": "cargo/vendor/serde_with-3.21.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2\", \"files\": {}}", "contents": "{\"package\": \"76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c\", \"files\": {}}",
"dest": "cargo/vendor/serde_with-3.20.0", "dest": "cargo/vendor/serde_with-3.21.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/serde_with_macros/serde_with_macros-3.20.0.crate", "url": "https://static.crates.io/crates/serde_with_macros/serde_with_macros-3.21.0.crate",
"sha256": "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac", "sha256": "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660",
"dest": "cargo/vendor/serde_with_macros-3.20.0" "dest": "cargo/vendor/serde_with_macros-3.21.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac\", \"files\": {}}", "contents": "{\"package\": \"84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660\", \"files\": {}}",
"dest": "cargo/vendor/serde_with_macros-3.20.0", "dest": "cargo/vendor/serde_with_macros-3.21.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -4285,14 +4285,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/shlex/shlex-1.3.0.crate", "url": "https://static.crates.io/crates/shlex/shlex-2.0.1.crate",
"sha256": "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64", "sha256": "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba",
"dest": "cargo/vendor/shlex-1.3.0" "dest": "cargo/vendor/shlex-2.0.1"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64\", \"files\": {}}", "contents": "{\"package\": \"f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba\", \"files\": {}}",
"dest": "cargo/vendor/shlex-1.3.0", "dest": "cargo/vendor/shlex-2.0.1",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -4376,27 +4376,27 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/smallvec/smallvec-1.15.1.crate", "url": "https://static.crates.io/crates/smallvec/smallvec-1.15.2.crate",
"sha256": "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03", "sha256": "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90",
"dest": "cargo/vendor/smallvec-1.15.1" "dest": "cargo/vendor/smallvec-1.15.2"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03\", \"files\": {}}", "contents": "{\"package\": \"8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90\", \"files\": {}}",
"dest": "cargo/vendor/smallvec-1.15.1", "dest": "cargo/vendor/smallvec-1.15.2",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/socket2/socket2-0.6.3.crate", "url": "https://static.crates.io/crates/socket2/socket2-0.6.4.crate",
"sha256": "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e", "sha256": "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51",
"dest": "cargo/vendor/socket2-0.6.3" "dest": "cargo/vendor/socket2-0.6.4"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e\", \"files\": {}}", "contents": "{\"package\": \"52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51\", \"files\": {}}",
"dest": "cargo/vendor/socket2-0.6.3", "dest": "cargo/vendor/socket2-0.6.4",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -4649,14 +4649,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/tao/tao-0.35.2.crate", "url": "https://static.crates.io/crates/tao/tao-0.35.3.crate",
"sha256": "a33f7f9e486ade65fcf1e45c440f9236c904f5c1002cdc7fc6ae582777345ce4", "sha256": "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9",
"dest": "cargo/vendor/tao-0.35.2" "dest": "cargo/vendor/tao-0.35.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"a33f7f9e486ade65fcf1e45c440f9236c904f5c1002cdc7fc6ae582777345ce4\", \"files\": {}}", "contents": "{\"package\": \"d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9\", \"files\": {}}",
"dest": "cargo/vendor/tao-0.35.2", "dest": "cargo/vendor/tao-0.35.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -4992,40 +4992,40 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/time/time-0.3.47.crate", "url": "https://static.crates.io/crates/time/time-0.3.48.crate",
"sha256": "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c", "sha256": "fc1aa89044e7786ffb2ec017acb22cb7de5b0be46d0f21aea2b224b8561e5db2",
"dest": "cargo/vendor/time-0.3.47" "dest": "cargo/vendor/time-0.3.48"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c\", \"files\": {}}", "contents": "{\"package\": \"fc1aa89044e7786ffb2ec017acb22cb7de5b0be46d0f21aea2b224b8561e5db2\", \"files\": {}}",
"dest": "cargo/vendor/time-0.3.47", "dest": "cargo/vendor/time-0.3.48",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/time-core/time-core-0.1.8.crate", "url": "https://static.crates.io/crates/time-core/time-core-0.1.9.crate",
"sha256": "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca", "sha256": "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109",
"dest": "cargo/vendor/time-core-0.1.8" "dest": "cargo/vendor/time-core-0.1.9"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca\", \"files\": {}}", "contents": "{\"package\": \"9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109\", \"files\": {}}",
"dest": "cargo/vendor/time-core-0.1.8", "dest": "cargo/vendor/time-core-0.1.9",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/time-macros/time-macros-0.2.27.crate", "url": "https://static.crates.io/crates/time-macros/time-macros-0.2.28.crate",
"sha256": "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215", "sha256": "9d3bfe86347f0cc659f586f01e26303ccd32418f26f30c7b0309b3ca3a07d695",
"dest": "cargo/vendor/time-macros-0.2.27" "dest": "cargo/vendor/time-macros-0.2.28"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215\", \"files\": {}}", "contents": "{\"package\": \"9d3bfe86347f0cc659f586f01e26303ccd32418f26f30c7b0309b3ca3a07d695\", \"files\": {}}",
"dest": "cargo/vendor/time-macros-0.2.27", "dest": "cargo/vendor/time-macros-0.2.28",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5239,14 +5239,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/toml_edit/toml_edit-0.25.11+spec-1.1.0.crate", "url": "https://static.crates.io/crates/toml_edit/toml_edit-0.25.12+spec-1.1.0.crate",
"sha256": "0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b", "sha256": "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7",
"dest": "cargo/vendor/toml_edit-0.25.11+spec-1.1.0" "dest": "cargo/vendor/toml_edit-0.25.12+spec-1.1.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"0b59c4d22ed448339746c59b905d24568fcbb3ab65a500494f7b8c3e97739f2b\", \"files\": {}}", "contents": "{\"package\": \"d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7\", \"files\": {}}",
"dest": "cargo/vendor/toml_edit-0.25.11+spec-1.1.0", "dest": "cargo/vendor/toml_edit-0.25.12+spec-1.1.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5291,14 +5291,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/tower-http/tower-http-0.6.10.crate", "url": "https://static.crates.io/crates/tower-http/tower-http-0.6.11.crate",
"sha256": "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51", "sha256": "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840",
"dest": "cargo/vendor/tower-http-0.6.10" "dest": "cargo/vendor/tower-http-0.6.11"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51\", \"files\": {}}", "contents": "{\"package\": \"4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840\", \"files\": {}}",
"dest": "cargo/vendor/tower-http-0.6.10", "dest": "cargo/vendor/tower-http-0.6.11",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5408,14 +5408,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/typenum/typenum-1.20.0.crate", "url": "https://static.crates.io/crates/typenum/typenum-1.20.1.crate",
"sha256": "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de", "sha256": "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20",
"dest": "cargo/vendor/typenum-1.20.0" "dest": "cargo/vendor/typenum-1.20.1"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de\", \"files\": {}}", "contents": "{\"package\": \"b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20\", \"files\": {}}",
"dest": "cargo/vendor/typenum-1.20.0", "dest": "cargo/vendor/typenum-1.20.1",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5499,14 +5499,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.13.2.crate", "url": "https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.13.3.crate",
"sha256": "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c", "sha256": "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8",
"dest": "cargo/vendor/unicode-segmentation-1.13.2" "dest": "cargo/vendor/unicode-segmentation-1.13.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c\", \"files\": {}}", "contents": "{\"package\": \"c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8\", \"files\": {}}",
"dest": "cargo/vendor/unicode-segmentation-1.13.2", "dest": "cargo/vendor/unicode-segmentation-1.13.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5616,14 +5616,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/uuid/uuid-1.23.1.crate", "url": "https://static.crates.io/crates/uuid/uuid-1.23.3.crate",
"sha256": "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76", "sha256": "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7",
"dest": "cargo/vendor/uuid-1.23.1" "dest": "cargo/vendor/uuid-1.23.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76\", \"files\": {}}", "contents": "{\"package\": \"144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7\", \"files\": {}}",
"dest": "cargo/vendor/uuid-1.23.1", "dest": "cargo/vendor/uuid-1.23.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5733,14 +5733,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/wasip2/wasip2-1.0.3+wasi-0.2.9.crate", "url": "https://static.crates.io/crates/wasip2/wasip2-1.0.4+wasi-0.2.12.crate",
"sha256": "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6", "sha256": "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487",
"dest": "cargo/vendor/wasip2-1.0.3+wasi-0.2.9" "dest": "cargo/vendor/wasip2-1.0.4+wasi-0.2.12"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6\", \"files\": {}}", "contents": "{\"package\": \"b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487\", \"files\": {}}",
"dest": "cargo/vendor/wasip2-1.0.3+wasi-0.2.9", "dest": "cargo/vendor/wasip2-1.0.4+wasi-0.2.12",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5759,66 +5759,66 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.121.crate", "url": "https://static.crates.io/crates/wasm-bindgen/wasm-bindgen-0.2.125.crate",
"sha256": "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790", "sha256": "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a",
"dest": "cargo/vendor/wasm-bindgen-0.2.121" "dest": "cargo/vendor/wasm-bindgen-0.2.125"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790\", \"files\": {}}", "contents": "{\"package\": \"8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a\", \"files\": {}}",
"dest": "cargo/vendor/wasm-bindgen-0.2.121", "dest": "cargo/vendor/wasm-bindgen-0.2.125",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.71.crate", "url": "https://static.crates.io/crates/wasm-bindgen-futures/wasm-bindgen-futures-0.4.75.crate",
"sha256": "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8", "sha256": "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280",
"dest": "cargo/vendor/wasm-bindgen-futures-0.4.71" "dest": "cargo/vendor/wasm-bindgen-futures-0.4.75"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8\", \"files\": {}}", "contents": "{\"package\": \"503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280\", \"files\": {}}",
"dest": "cargo/vendor/wasm-bindgen-futures-0.4.71", "dest": "cargo/vendor/wasm-bindgen-futures-0.4.75",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.121.crate", "url": "https://static.crates.io/crates/wasm-bindgen-macro/wasm-bindgen-macro-0.2.125.crate",
"sha256": "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578", "sha256": "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d",
"dest": "cargo/vendor/wasm-bindgen-macro-0.2.121" "dest": "cargo/vendor/wasm-bindgen-macro-0.2.125"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578\", \"files\": {}}", "contents": "{\"package\": \"4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d\", \"files\": {}}",
"dest": "cargo/vendor/wasm-bindgen-macro-0.2.121", "dest": "cargo/vendor/wasm-bindgen-macro-0.2.125",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.121.crate", "url": "https://static.crates.io/crates/wasm-bindgen-macro-support/wasm-bindgen-macro-support-0.2.125.crate",
"sha256": "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2", "sha256": "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd",
"dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.121" "dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.125"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2\", \"files\": {}}", "contents": "{\"package\": \"fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd\", \"files\": {}}",
"dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.121", "dest": "cargo/vendor/wasm-bindgen-macro-support-0.2.125",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.121.crate", "url": "https://static.crates.io/crates/wasm-bindgen-shared/wasm-bindgen-shared-0.2.125.crate",
"sha256": "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441", "sha256": "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f",
"dest": "cargo/vendor/wasm-bindgen-shared-0.2.121" "dest": "cargo/vendor/wasm-bindgen-shared-0.2.125"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441\", \"files\": {}}", "contents": "{\"package\": \"23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f\", \"files\": {}}",
"dest": "cargo/vendor/wasm-bindgen-shared-0.2.121", "dest": "cargo/vendor/wasm-bindgen-shared-0.2.125",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -5876,14 +5876,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/web-sys/web-sys-0.3.98.crate", "url": "https://static.crates.io/crates/web-sys/web-sys-0.3.102.crate",
"sha256": "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa", "sha256": "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d",
"dest": "cargo/vendor/web-sys-0.3.98" "dest": "cargo/vendor/web-sys-0.3.102"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa\", \"files\": {}}", "contents": "{\"package\": \"a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d\", \"files\": {}}",
"dest": "cargo/vendor/web-sys-0.3.98", "dest": "cargo/vendor/web-sys-0.3.102",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -7137,14 +7137,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/yoke/yoke-0.8.2.crate", "url": "https://static.crates.io/crates/yoke/yoke-0.8.3.crate",
"sha256": "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca", "sha256": "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5",
"dest": "cargo/vendor/yoke-0.8.2" "dest": "cargo/vendor/yoke-0.8.3"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca\", \"files\": {}}", "contents": "{\"package\": \"709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5\", \"files\": {}}",
"dest": "cargo/vendor/yoke-0.8.2", "dest": "cargo/vendor/yoke-0.8.3",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -7163,27 +7163,27 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/zerocopy/zerocopy-0.8.48.crate", "url": "https://static.crates.io/crates/zerocopy/zerocopy-0.8.52.crate",
"sha256": "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9", "sha256": "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f",
"dest": "cargo/vendor/zerocopy-0.8.48" "dest": "cargo/vendor/zerocopy-0.8.52"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9\", \"files\": {}}", "contents": "{\"package\": \"ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f\", \"files\": {}}",
"dest": "cargo/vendor/zerocopy-0.8.48", "dest": "cargo/vendor/zerocopy-0.8.52",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.8.48.crate", "url": "https://static.crates.io/crates/zerocopy-derive/zerocopy-derive-0.8.52.crate",
"sha256": "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4", "sha256": "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930",
"dest": "cargo/vendor/zerocopy-derive-0.8.48" "dest": "cargo/vendor/zerocopy-derive-0.8.52"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4\", \"files\": {}}", "contents": "{\"package\": \"1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930\", \"files\": {}}",
"dest": "cargo/vendor/zerocopy-derive-0.8.48", "dest": "cargo/vendor/zerocopy-derive-0.8.52",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
@@ -7215,14 +7215,14 @@
{ {
"type": "archive", "type": "archive",
"archive-type": "tar-gzip", "archive-type": "tar-gzip",
"url": "https://static.crates.io/crates/zeroize/zeroize-1.8.2.crate", "url": "https://static.crates.io/crates/zeroize/zeroize-1.9.0.crate",
"sha256": "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0", "sha256": "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e",
"dest": "cargo/vendor/zeroize-1.8.2" "dest": "cargo/vendor/zeroize-1.9.0"
}, },
{ {
"type": "inline", "type": "inline",
"contents": "{\"package\": \"b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0\", \"files\": {}}", "contents": "{\"package\": \"e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e\", \"files\": {}}",
"dest": "cargo/vendor/zeroize-1.8.2", "dest": "cargo/vendor/zeroize-1.9.0",
"dest-filename": ".cargo-checksum.json" "dest-filename": ".cargo-checksum.json"
}, },
{ {
+39 -23
View File
@@ -53,28 +53,31 @@ importers:
clsx: clsx:
specifier: ^2.1.1 specifier: ^2.1.1
version: 2.1.1 version: 2.1.1
phosphor-svelte:
specifier: ^3.1.0
version: 3.1.0(svelte@5.56.1)(vite@8.0.16)
tauri-plugin-discord-rpc-api: tauri-plugin-discord-rpc-api:
specifier: github:Youwes09/tauri-plugin-discord-rpc specifier: github:Youwes09/tauri-plugin-discord-rpc
version: https://codeload.github.com/Youwes09/tauri-plugin-discord-rpc/tar.gz/d2fd312945d0573153e0e7e2d2dfb131acecc52c version: https://codeload.github.com/Youwes09/tauri-plugin-discord-rpc/tar.gz/d2fd312945d0573153e0e7e2d2dfb131acecc52c
devDependencies: devDependencies:
'@sveltejs/adapter-node': '@sveltejs/adapter-node':
specifier: ^5.5.4 specifier: ^5.5.4
version: 5.5.4(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16)) version: 5.5.4(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3)))
'@sveltejs/adapter-static': '@sveltejs/adapter-static':
specifier: ^3.0.10 specifier: ^3.0.10
version: 3.0.10(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16)) version: 3.0.10(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3)))
'@sveltejs/kit': '@sveltejs/kit':
specifier: ^2.62.0 specifier: ^2.62.0
version: 2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16) version: 2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3))
'@sveltejs/vite-plugin-svelte': '@sveltejs/vite-plugin-svelte':
specifier: ^7.1.2 specifier: ^7.1.2
version: 7.1.2(svelte@5.56.1)(vite@8.0.16) version: 7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3))
'@tauri-apps/cli': '@tauri-apps/cli':
specifier: ^2.11.2 specifier: ^2.11.2
version: 2.11.2 version: 2.11.2
'@types/node':
specifier: ^25.9.3
version: 25.9.3
phosphor-svelte:
specifier: ^3.1.0
version: 3.1.0(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3))
svelte: svelte:
specifier: ^5.56.1 specifier: ^5.56.1
version: 5.56.1 version: 5.56.1
@@ -86,7 +89,7 @@ importers:
version: 6.0.3 version: 6.0.3
vite: vite:
specifier: ^8.0.16 specifier: ^8.0.16
version: 8.0.16 version: 8.0.16(@types/node@25.9.3)
packages: packages:
@@ -578,6 +581,9 @@ packages:
'@types/estree@1.0.9': '@types/estree@1.0.9':
resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==} resolution: {integrity: sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==}
'@types/node@25.9.3':
resolution: {integrity: sha512-603BddQMv3pUcr4U2dhujk83N2tTDVr/34wII2B6bJy6g+8WD6yUb11jszNs0gdi4PesVWl7ABt8nYMVpnLUcg==}
'@types/resolve@1.20.2': '@types/resolve@1.20.2':
resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
@@ -874,6 +880,9 @@ packages:
engines: {node: '>=14.17'} engines: {node: '>=14.17'}
hasBin: true hasBin: true
undici-types@7.24.6:
resolution: {integrity: sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==}
vite@8.0.16: vite@8.0.16:
resolution: {integrity: sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==} resolution: {integrity: sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
@@ -1171,23 +1180,23 @@ snapshots:
dependencies: dependencies:
acorn: 8.16.0 acorn: 8.16.0
'@sveltejs/adapter-node@5.5.4(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16))': '@sveltejs/adapter-node@5.5.4(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3)))':
dependencies: dependencies:
'@rollup/plugin-commonjs': 29.0.3(rollup@4.61.0) '@rollup/plugin-commonjs': 29.0.3(rollup@4.61.0)
'@rollup/plugin-json': 6.1.0(rollup@4.61.0) '@rollup/plugin-json': 6.1.0(rollup@4.61.0)
'@rollup/plugin-node-resolve': 16.0.3(rollup@4.61.0) '@rollup/plugin-node-resolve': 16.0.3(rollup@4.61.0)
'@sveltejs/kit': 2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16) '@sveltejs/kit': 2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3))
rollup: 4.61.0 rollup: 4.61.0
'@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16))': '@sveltejs/adapter-static@3.0.10(@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3)))':
dependencies: dependencies:
'@sveltejs/kit': 2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16) '@sveltejs/kit': 2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3))
'@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16)': '@sveltejs/kit@2.62.0(@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)))(svelte@5.56.1)(typescript@6.0.3)(vite@8.0.16(@types/node@25.9.3))':
dependencies: dependencies:
'@standard-schema/spec': 1.1.0 '@standard-schema/spec': 1.1.0
'@sveltejs/acorn-typescript': 1.0.10(acorn@8.16.0) '@sveltejs/acorn-typescript': 1.0.10(acorn@8.16.0)
'@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.56.1)(vite@8.0.16) '@sveltejs/vite-plugin-svelte': 7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3))
'@types/cookie': 0.6.0 '@types/cookie': 0.6.0
acorn: 8.16.0 acorn: 8.16.0
cookie: 0.6.0 cookie: 0.6.0
@@ -1199,18 +1208,18 @@ snapshots:
set-cookie-parser: 3.1.0 set-cookie-parser: 3.1.0
sirv: 3.0.2 sirv: 3.0.2
svelte: 5.56.1 svelte: 5.56.1
vite: 8.0.16 vite: 8.0.16(@types/node@25.9.3)
optionalDependencies: optionalDependencies:
typescript: 6.0.3 typescript: 6.0.3
'@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16)': '@sveltejs/vite-plugin-svelte@7.1.2(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3))':
dependencies: dependencies:
deepmerge: 4.3.1 deepmerge: 4.3.1
magic-string: 0.30.21 magic-string: 0.30.21
obug: 2.1.1 obug: 2.1.1
svelte: 5.56.1 svelte: 5.56.1
vite: 8.0.16 vite: 8.0.16(@types/node@25.9.3)
vitefu: 1.1.3(vite@8.0.16) vitefu: 1.1.3(vite@8.0.16(@types/node@25.9.3))
'@tauri-apps/api@2.11.0': {} '@tauri-apps/api@2.11.0': {}
@@ -1298,6 +1307,10 @@ snapshots:
'@types/estree@1.0.9': {} '@types/estree@1.0.9': {}
'@types/node@25.9.3':
dependencies:
undici-types: 7.24.6
'@types/resolve@1.20.2': {} '@types/resolve@1.20.2': {}
'@types/trusted-types@2.0.7': {} '@types/trusted-types@2.0.7': {}
@@ -1436,13 +1449,13 @@ snapshots:
path-parse@1.0.7: {} path-parse@1.0.7: {}
phosphor-svelte@3.1.0(svelte@5.56.1)(vite@8.0.16): phosphor-svelte@3.1.0(svelte@5.56.1)(vite@8.0.16(@types/node@25.9.3)):
dependencies: dependencies:
estree-walker: 3.0.3 estree-walker: 3.0.3
magic-string: 0.30.21 magic-string: 0.30.21
svelte: 5.56.1 svelte: 5.56.1
optionalDependencies: optionalDependencies:
vite: 8.0.16 vite: 8.0.16(@types/node@25.9.3)
picocolors@1.1.1: {} picocolors@1.1.1: {}
@@ -1579,7 +1592,9 @@ snapshots:
typescript@6.0.3: {} typescript@6.0.3: {}
vite@8.0.16: undici-types@7.24.6: {}
vite@8.0.16(@types/node@25.9.3):
dependencies: dependencies:
lightningcss: 1.32.0 lightningcss: 1.32.0
picomatch: 4.0.4 picomatch: 4.0.4
@@ -1587,10 +1602,11 @@ snapshots:
rolldown: 1.0.3 rolldown: 1.0.3
tinyglobby: 0.2.17 tinyglobby: 0.2.17
optionalDependencies: optionalDependencies:
'@types/node': 25.9.3
fsevents: 2.3.3 fsevents: 2.3.3
vitefu@1.1.3(vite@8.0.16): vitefu@1.1.3(vite@8.0.16(@types/node@25.9.3)):
optionalDependencies: optionalDependencies:
vite: 8.0.16 vite: 8.0.16(@types/node@25.9.3)
zimmerframe@1.1.4: {} zimmerframe@1.1.4: {}
+90 -93
View File
@@ -117,9 +117,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]] [[package]]
name = "bitflags" name = "bitflags"
version = "2.12.1" version = "2.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84d7ced0ae9557296835c32bf1b1e02b44c746701f898460fb000d7eaa84f00a" checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
dependencies = [ dependencies = [
"serde_core", "serde_core",
] ]
@@ -205,7 +205,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2" checksum = "8ca26ef0159422fb77631dc9d17b102f253b876fe1586b03b803e63a309b4ee2"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"cairo-sys-rs", "cairo-sys-rs",
"glib", "glib",
"libc", "libc",
@@ -268,9 +268,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.2.63" version = "1.2.64"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "556e016178bb5662a08681bbe0f00f8e17631781a4dfc8c45e466e4b185ec27f" checksum = "dad887fd958be91b5098c0248def011f4523ab786cd411be668777e55063501f"
dependencies = [ dependencies = [
"find-msvc-tools", "find-msvc-tools",
"shlex", "shlex",
@@ -290,7 +290,7 @@ checksum = "d38f2da7a0a2c4ccf0065be06397cc26a81f4e528be095826eee9d4adbb8c60f"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"fnv", "fnv",
"uuid 1.23.2", "uuid 1.23.3",
] ]
[[package]] [[package]]
@@ -317,9 +317,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
[[package]] [[package]]
name = "chrono" name = "chrono"
version = "0.4.44" version = "0.4.45"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327"
dependencies = [ dependencies = [
"iana-time-zone", "iana-time-zone",
"num-traits", "num-traits",
@@ -398,7 +398,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97" checksum = "064badf302c3194842cf2c5d61f56cc88e54a759313879cdf03abdd27d0c3b97"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"core-foundation 0.10.1", "core-foundation 0.10.1",
"core-graphics-types", "core-graphics-types",
"foreign-types 0.5.0", "foreign-types 0.5.0",
@@ -411,7 +411,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"core-foundation 0.10.1", "core-foundation 0.10.1",
"libc", "libc",
] ]
@@ -574,7 +574,6 @@ version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
dependencies = [ dependencies = [
"powerfmt",
"serde_core", "serde_core",
] ]
@@ -672,7 +671,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"block2", "block2",
"libc", "libc",
"objc2", "objc2",
@@ -1228,7 +1227,7 @@ version = "0.18.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5" checksum = "233daaf6e83ae6a12a52055f568f9d7cf4671dabb78ff9560ab6da230ce00ee5"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-executor", "futures-executor",
@@ -1408,9 +1407,9 @@ dependencies = [
[[package]] [[package]]
name = "http" name = "http"
version = "1.4.1" version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8be7462df143984c4598a256ef469b251d7d7f9e271135073e78fc535414f3d0" checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425"
dependencies = [ dependencies = [
"bytes", "bytes",
"itoa", "itoa",
@@ -1804,13 +1803,12 @@ dependencies = [
[[package]] [[package]]
name = "js-sys" name = "js-sys"
version = "0.3.99" version = "0.3.102"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "142bc4740e452c1e57ade0cbc129f139c9093e354346f0872ef985f4f5cf5f11" checksum = "03d04c30968dffe80775bd4d7fb676131cd04a1fb46d2686dbffbaec2d9dfd31"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"futures-util", "futures-util",
"once_cell",
"wasm-bindgen", "wasm-bindgen",
] ]
@@ -1842,7 +1840,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a" checksum = "b750dcadc39a09dbadd74e118f6dd6598df77fa01df0cfcdc52c28dece74528a"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"serde", "serde",
"unicode-segmentation", "unicode-segmentation",
] ]
@@ -1940,9 +1938,9 @@ dependencies = [
[[package]] [[package]]
name = "log" name = "log"
version = "0.4.31" version = "0.4.32"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "113b30b4cd05f7c06868fdb2854f66a7b9fece9a48425351cd532e810d74024f" checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a"
[[package]] [[package]]
name = "lru-slab" name = "lru-slab"
@@ -1963,9 +1961,9 @@ dependencies = [
[[package]] [[package]]
name = "memchr" name = "memchr"
version = "2.8.1" version = "2.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8" checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4"
[[package]] [[package]]
name = "memoffset" name = "memoffset"
@@ -2005,7 +2003,7 @@ dependencies = [
[[package]] [[package]]
name = "moku" name = "moku"
version = "0.9.4" version = "0.10.0"
dependencies = [ dependencies = [
"dirs 5.0.1", "dirs 5.0.1",
"reqwest 0.12.28", "reqwest 0.12.28",
@@ -2071,7 +2069,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"jni-sys 0.3.1", "jni-sys 0.3.1",
"log", "log",
"ndk-sys", "ndk-sys",
@@ -2101,7 +2099,7 @@ version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"cfg-if", "cfg-if",
"cfg_aliases", "cfg_aliases",
"libc", "libc",
@@ -2169,7 +2167,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"block2", "block2",
"objc2", "objc2",
"objc2-core-foundation", "objc2-core-foundation",
@@ -2182,7 +2180,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"objc2", "objc2",
"objc2-foundation", "objc2-foundation",
] ]
@@ -2203,7 +2201,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"dispatch2", "dispatch2",
"objc2", "objc2",
] ]
@@ -2214,7 +2212,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807" checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"dispatch2", "dispatch2",
"objc2", "objc2",
"objc2-core-foundation", "objc2-core-foundation",
@@ -2247,7 +2245,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"objc2", "objc2",
"objc2-core-foundation", "objc2-core-foundation",
"objc2-core-graphics", "objc2-core-graphics",
@@ -2274,7 +2272,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"block2", "block2",
"libc", "libc",
"objc2", "objc2",
@@ -2297,7 +2295,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d" checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"objc2", "objc2",
"objc2-core-foundation", "objc2-core-foundation",
] ]
@@ -2308,7 +2306,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"objc2", "objc2",
"objc2-core-foundation", "objc2-core-foundation",
"objc2-foundation", "objc2-foundation",
@@ -2320,7 +2318,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"block2", "block2",
"objc2", "objc2",
"objc2-cloud-kit", "objc2-cloud-kit",
@@ -2351,7 +2349,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f" checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"block2", "block2",
"objc2", "objc2",
"objc2-app-kit", "objc2-app-kit",
@@ -2379,11 +2377,11 @@ dependencies = [
[[package]] [[package]]
name = "openssl" name = "openssl"
version = "0.10.80" version = "0.10.81"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"cfg-if", "cfg-if",
"foreign-types 0.3.2", "foreign-types 0.3.2",
"libc", "libc",
@@ -2410,9 +2408,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
[[package]] [[package]]
name = "openssl-sys" name = "openssl-sys"
version = "0.9.116" version = "0.9.117"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",
@@ -2609,7 +2607,7 @@ version = "0.18.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"crc32fast", "crc32fast",
"fdeflate", "fdeflate",
"flate2", "flate2",
@@ -2880,7 +2878,7 @@ version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
] ]
[[package]] [[package]]
@@ -2927,9 +2925,9 @@ dependencies = [
[[package]] [[package]]
name = "regex" name = "regex"
version = "1.12.3" version = "1.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba"
dependencies = [ dependencies = [
"aho-corasick", "aho-corasick",
"memchr", "memchr",
@@ -2950,9 +2948,9 @@ dependencies = [
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.8.10" version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4"
[[package]] [[package]]
name = "reqwest" name = "reqwest"
@@ -3095,7 +3093,7 @@ version = "1.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"errno", "errno",
"libc", "libc",
"linux-raw-sys", "linux-raw-sys",
@@ -3179,7 +3177,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"url", "url",
"uuid 1.23.2", "uuid 1.23.3",
] ]
[[package]] [[package]]
@@ -3230,7 +3228,7 @@ version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"core-foundation 0.10.1", "core-foundation 0.10.1",
"core-foundation-sys", "core-foundation-sys",
"libc", "libc",
@@ -3253,7 +3251,7 @@ version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c" checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"cssparser", "cssparser",
"derive_more", "derive_more",
"log", "log",
@@ -3385,9 +3383,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "3.20.0" version = "3.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e72c1c2cb7b223fafb600a619537a871c2818583d619401b785e7c0b746ccde2" checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"bs58", "bs58",
@@ -3405,9 +3403,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "3.20.0" version = "3.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b90c488738ecb4fb0262f41f43bc40efc5868d9fb744319ddf5f5317f417bfac" checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@@ -3525,9 +3523,9 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
[[package]] [[package]]
name = "smallvec" name = "smallvec"
version = "1.15.1" version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
[[package]] [[package]]
name = "socket2" name = "socket2"
@@ -3724,7 +3722,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"core-foundation 0.9.4", "core-foundation 0.9.4",
"system-configuration-sys", "system-configuration-sys",
] ]
@@ -3758,7 +3756,7 @@ version = "0.35.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9" checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"block2", "block2",
"core-foundation 0.10.1", "core-foundation 0.10.1",
"core-graphics", "core-graphics",
@@ -3904,7 +3902,7 @@ dependencies = [
"thiserror 2.0.18", "thiserror 2.0.18",
"time", "time",
"url", "url",
"uuid 1.23.2", "uuid 1.23.3",
"walkdir", "walkdir",
] ]
@@ -4171,7 +4169,7 @@ dependencies = [
"toml 1.1.2+spec-1.1.0", "toml 1.1.2+spec-1.1.0",
"url", "url",
"urlpattern", "urlpattern",
"uuid 1.23.2", "uuid 1.23.3",
"walkdir", "walkdir",
] ]
@@ -4251,12 +4249,11 @@ dependencies = [
[[package]] [[package]]
name = "time" name = "time"
version = "0.3.47" version = "0.3.48"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" checksum = "fc1aa89044e7786ffb2ec017acb22cb7de5b0be46d0f21aea2b224b8561e5db2"
dependencies = [ dependencies = [
"deranged", "deranged",
"itoa",
"num-conv", "num-conv",
"powerfmt", "powerfmt",
"serde_core", "serde_core",
@@ -4266,15 +4263,15 @@ dependencies = [
[[package]] [[package]]
name = "time-core" name = "time-core"
version = "0.1.8" version = "0.1.9"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109"
[[package]] [[package]]
name = "time-macros" name = "time-macros"
version = "0.2.27" version = "0.2.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" checksum = "9d3bfe86347f0cc659f586f01e26303ccd32418f26f30c7b0309b3ca3a07d695"
dependencies = [ dependencies = [
"num-conv", "num-conv",
"time-core", "time-core",
@@ -4505,7 +4502,7 @@ version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"bytes", "bytes",
"futures-util", "futures-util",
"http", "http",
@@ -4719,9 +4716,9 @@ dependencies = [
[[package]] [[package]]
name = "uuid" name = "uuid"
version = "1.23.2" version = "1.23.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7" checksum = "144d6b123cef80b301b8f72a9e2ca4370ddec21950d0a103dd22c437006d2db7"
dependencies = [ dependencies = [
"getrandom 0.4.2", "getrandom 0.4.2",
"js-sys", "js-sys",
@@ -4794,9 +4791,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
[[package]] [[package]]
name = "wasip2" name = "wasip2"
version = "1.0.3+wasi-0.2.9" version = "1.0.4+wasi-0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487"
dependencies = [ dependencies = [
"wit-bindgen 0.57.1", "wit-bindgen 0.57.1",
] ]
@@ -4812,9 +4809,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen" name = "wasm-bindgen"
version = "0.2.122" version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ed04576f974d2b2fba0f38c51dbc5518011e38c36bf1143164be765528fd409" checksum = "8ddb3f79143bced6de84270411622a2699cee572fc0875aeaf1e7867cf9fca1a"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"once_cell", "once_cell",
@@ -4825,9 +4822,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-futures" name = "wasm-bindgen-futures"
version = "0.4.72" version = "0.4.75"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9473dbd2991ae90b6291c3c32c30c6187ac49aa32f9905d1cce280ec1e110b0f" checksum = "503b14d284f2c8dac03b819967e155ea753f573586193b2b2c95990cb5d69280"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@@ -4835,9 +4832,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro" name = "wasm-bindgen-macro"
version = "0.2.122" version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "916151b09da36bd82f6615cbf3a419e2f0ba23a03c6160e8e92eb6bd4aa1dec6" checksum = "4e21a184b13fb19e157296e2c46056aec9092264fab83e4ba59e68c61b323c3d"
dependencies = [ dependencies = [
"quote", "quote",
"wasm-bindgen-macro-support", "wasm-bindgen-macro-support",
@@ -4845,9 +4842,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-macro-support" name = "wasm-bindgen-macro-support"
version = "0.2.122" version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "299047362ccbfce148b67ab7e73349f77748e00c8296f9542adfad2ad82c5c5e" checksum = "fecefd9c35bd935a20fc3fc344b5f29138961e4f47fb03297d88f2587afb5ebd"
dependencies = [ dependencies = [
"bumpalo", "bumpalo",
"proc-macro2", "proc-macro2",
@@ -4858,9 +4855,9 @@ dependencies = [
[[package]] [[package]]
name = "wasm-bindgen-shared" name = "wasm-bindgen-shared"
version = "0.2.122" version = "0.2.125"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a929b2c61f11ba3e9bc35b50c1f25cb38e0e892c0c231ae2b8cf78d5dad4437" checksum = "23939e44bb9a5d7576fa2b563dc2e136628f1224e88a8deed09e04858b77871f"
dependencies = [ dependencies = [
"unicode-ident", "unicode-ident",
] ]
@@ -4906,7 +4903,7 @@ version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [ dependencies = [
"bitflags 2.12.1", "bitflags 2.13.0",
"hashbrown 0.15.5", "hashbrown 0.15.5",
"indexmap 2.14.0", "indexmap 2.14.0",
"semver", "semver",
@@ -4914,9 +4911,9 @@ dependencies = [
[[package]] [[package]]
name = "web-sys" name = "web-sys"
version = "0.3.99" version = "0.3.102"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d621441cfc37b84979402712047321980c178f299193a3589d05b99e8763436" checksum = "a6430a72df5eb332242960fe84b3002a241163998241eb596d4f739b9757061d"
dependencies = [ dependencies = [
"js-sys", "js-sys",
"wasm-bindgen", "wasm-bindgen",
@@ -5759,7 +5756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"bitflags 2.12.1", "bitflags 2.13.0",
"indexmap 2.14.0", "indexmap 2.14.0",
"log", "log",
"serde", "serde",
@@ -5885,18 +5882,18 @@ dependencies = [
[[package]] [[package]]
name = "zerocopy" name = "zerocopy"
version = "0.8.50" version = "0.8.52"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b065d4f0e55f82fae73202e189638116a87c55ab6b8e6c2721e13dd9d854ad1" checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f"
dependencies = [ dependencies = [
"zerocopy-derive", "zerocopy-derive",
] ]
[[package]] [[package]]
name = "zerocopy-derive" name = "zerocopy-derive"
version = "0.8.50" version = "0.8.52"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b631b19d36a892ab55420c92dbc83ccd79274f25be714855d3074aa71cab639" checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@@ -5926,9 +5923,9 @@ dependencies = [
[[package]] [[package]]
name = "zeroize" name = "zeroize"
version = "1.8.2" version = "1.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"
[[package]] [[package]]
name = "zerotrie" name = "zerotrie"
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "moku" name = "moku"
version = "0.9.4" version = "0.10.0"
edition = "2021" edition = "2021"
[lib] [lib]
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"$schema": "https://schema.tauri.app/config/2", "$schema": "https://schema.tauri.app/config/2",
"productName": "Moku", "productName": "Moku",
"version": "0.9.4", "version": "0.10.0",
"identifier": "io.github.MokuProject.Moku", "identifier": "io.github.MokuProject.Moku",
"build": { "build": {
"devUrl": "http://localhost:1420", "devUrl": "http://localhost:1420",
+12 -14
View File
@@ -1,12 +1,13 @@
import { detectAdapter } from '$lib/platform-adapters' import { detectAdapter } from '$lib/platform-adapters'
import { initPlatformService } from '$lib/platform-service' import { initPlatformService } from '$lib/platform-service'
import { initRequestManager } from '$lib/request-manager' import { initRequestManager } from '$lib/request-manager'
import { appState } from '$lib/state/app.svelte' import { appState } from '$lib/state/app.svelte'
import { configureAuth, probeServer } from '$lib/core/auth' import { configureAuth, probeServer } from '$lib/core/auth'
import { loadSettings, loadLibrary, loadUpdates } from '$lib/core/persistence/persist' import { loadSettings, loadLibrary } from '$lib/core/persistence/persist'
import { loadSettingsIntoState } from '$lib/state/settings.svelte' import { loadSettingsIntoState, settingsState } from '$lib/state/settings.svelte'
import { historyState } from '$lib/state/history.svelte' import { historyState } from '$lib/state/history.svelte'
import { readerState } from '$lib/state/reader.svelte' import { readerState } from '$lib/state/reader.svelte'
import { seriesState } from '$lib/state/series.svelte'
const KEY_URL = 'moku_server_url' const KEY_URL = 'moku_server_url'
const KEY_AUTH = 'moku_auth_config' const KEY_AUTH = 'moku_auth_config'
@@ -34,12 +35,11 @@ async function boot() {
const [settingsData, libraryData] = await Promise.all([ const [settingsData, libraryData] = await Promise.all([
loadSettings(), loadSettings(),
loadLibrary(), loadLibrary(),
loadUpdates(),
]) ])
await loadSettingsIntoState(settingsData.settings) await loadSettingsIntoState(settingsData.settings)
readerState.bookmarks = libraryData.bookmarks seriesState.bookmarks = libraryData.bookmarks
readerState.markers = libraryData.markers readerState.markers = libraryData.markers
historyState.load(libraryData.sessions, libraryData.dailyReadCounts) historyState.load(libraryData.sessions, libraryData.dailyReadCounts)
@@ -49,8 +49,6 @@ async function boot() {
appState.serverUrl = savedUrl appState.serverUrl = savedUrl
appState.authMode = savedAuth.mode appState.authMode = savedAuth.mode
appState.authUser = savedAuth.user ?? ''
appState.authPass = savedAuth.pass ?? ''
configureAuth(savedUrl, savedAuth.mode, savedAuth.user, savedAuth.pass) configureAuth(savedUrl, savedAuth.mode, savedAuth.user, savedAuth.pass)
@@ -63,7 +61,7 @@ async function boot() {
}) })
const isTauri = platformAdapter.platform === 'tauri' const isTauri = platformAdapter.platform === 'tauri'
const autoStartServer = settingsData.settings.autoStartServer ?? false const autoStartServer = settingsState.settings.autoStartServer
if (isTauri && autoStartServer) { if (isTauri && autoStartServer) {
appState.status = 'booting' appState.status = 'booting'
+26 -15
View File
@@ -6,14 +6,25 @@
import { dedupeMangaById, shouldHideNsfw } from "$lib/core/util"; import { dedupeMangaById, shouldHideNsfw } from "$lib/core/util";
import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte"; import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte";
import ContextMenu from "$lib/components/shared/ui/ContextMenu.svelte"; import ContextMenu from "$lib/components/shared/ui/ContextMenu.svelte";
import { ArrowLeft, BookmarkSimple, FolderSimplePlus, Folder, CircleNotch } from "phosphor-svelte"; import { ArrowLeftIcon, BookmarkSimpleIcon, FolderSimplePlusIcon, FolderIcon, CircleNotchIcon } from "phosphor-svelte";
import type { Manga, Source, Category } from "$lib/types"; import type { Manga, Source, Category } from "$lib/types";
import type { MenuEntry } from "$lib/components/shared/ui/ContextMenu.svelte";
import { import {
PAGE_SIZE, INITIAL_PAGES, MAX_SOURCES, PAGE_SIZE, INITIAL_PAGES, MAX_SOURCES,
parseTags, tagsLabel, matchesAllTags, runConcurrent, parseTags, tagsLabel, matchesAllTags, runConcurrent,
} from "$lib/components/browse/lib/searchFilter"; } from "$lib/components/browse/lib/searchFilter";
interface MenuItem {
label: string;
icon?: any;
onClick: () => void;
danger?: boolean;
disabled?: boolean;
separator?: never;
children?: MenuEntry[];
}
interface MenuSeparator { separator: true }
type MenuEntry = MenuItem | MenuSeparator;
interface Props { interface Props {
genre: string; genre: string;
onBack: () => void; onBack: () => void;
@@ -63,17 +74,17 @@
const t = parseTags(filter); const t = parseTags(filter);
const pt = t[0] ?? ""; const pt = t[0] ?? "";
getAdapter().getMangaList({}).then((result) => { getAdapter().getMangaList({}).then((result: { items: Manga[] }) => {
if (!ctrl.signal.aborted) libraryManga = result.items; if (!ctrl.signal.aborted) libraryManga = result.items;
}).catch(() => {}); }).catch(() => {});
getAdapter().getSources().then(async (allSources) => { getAdapter().getSources().then(async (allSources: Source[]) => {
if (ctrl.signal.aborted) return; if (ctrl.signal.aborted) return;
const srcs = allSources.filter((s: Source) => s.id !== "0").slice(0, MAX_SOURCES); const srcs = allSources.filter((s: Source) => s.id !== "0").slice(0, MAX_SOURCES);
sources = srcs; sources = srcs;
for (const src of srcs) nextPageMap.set(src.id, -1); for (const src of srcs) nextPageMap.set(src.id, -1);
await runConcurrent(srcs, async (src) => { await runConcurrent(srcs, async (src: Source) => {
if (ctrl.signal.aborted) return; if (ctrl.signal.aborted) return;
const pageItems: Manga[] = []; const pageItems: Manga[] = [];
for (let page = 1; page <= INITIAL_PAGES; page++) { for (let page = 1; page <= INITIAL_PAGES; page++) {
@@ -108,7 +119,7 @@
const ctrl = new AbortController(); const ctrl = new AbortController();
abortCtrl = ctrl; abortCtrl = ctrl;
try { try {
await runConcurrent(srcs, async (src) => { await runConcurrent(srcs, async (src: Source) => {
const page = nextPageMap.get(src.id)!; const page = nextPageMap.get(src.id)!;
if (ctrl.signal.aborted) return; if (ctrl.signal.aborted) return;
let result: { items: Manga[]; hasNextPage: boolean } | null = null; let result: { items: Manga[]; hasNextPage: boolean } | null = null;
@@ -131,7 +142,7 @@
if (!catsLoaded) { if (!catsLoaded) {
catsLoaded = true; catsLoaded = true;
getAdapter().getCategories() getAdapter().getCategories()
.then((cats) => { categories = cats.filter((c) => c.id !== 0); }) .then((cats: Category[]) => { categories = cats.filter((c: Category) => c.id !== 0); })
.catch(console.error); .catch(console.error);
} }
} }
@@ -140,7 +151,7 @@
return [ return [
{ {
label: m.inLibrary ? "In Library" : "Add to library", label: m.inLibrary ? "In Library" : "Add to library",
icon: BookmarkSimple, icon: BookmarkSimpleIcon,
disabled: m.inLibrary, disabled: m.inLibrary,
onClick: () => getAdapter().addToLibrary(String(m.id)) onClick: () => getAdapter().addToLibrary(String(m.id))
.then(() => { sourceManga = sourceManga.map((x) => x.id === m.id ? { ...x, inLibrary: true } : x); }) .then(() => { sourceManga = sourceManga.map((x) => x.id === m.id ? { ...x, inLibrary: true } : x); })
@@ -149,15 +160,15 @@
...(categories.length > 0 ? [ ...(categories.length > 0 ? [
{ separator: true } as MenuEntry, { separator: true } as MenuEntry,
...categories.map((cat): MenuEntry => ({ ...categories.map((cat): MenuEntry => ({
label: (cat.mangas?.nodes ?? []).some((x: { id: number }) => x.id === m.id) ? `✓ ${cat.name}` : cat.name, label: (cat.mangas ?? []).some((x: Manga) => x.id === m.id) ? `✓ ${cat.name}` : cat.name,
icon: Folder, icon: FolderIcon,
onClick: () => getAdapter().updateMangaCategories(String(m.id), [cat.id], []).catch(console.error), onClick: () => getAdapter().updateMangaCategories(String(m.id), [cat.id], []).catch(console.error),
})), })),
] : []), ] : []),
{ separator: true }, { separator: true },
{ {
label: "New folder & add", label: "New folder & add",
icon: FolderSimplePlus, icon: FolderSimplePlusIcon,
onClick: async () => { onClick: async () => {
const name = prompt("Folder name:"); const name = prompt("Folder name:");
if (!name?.trim()) return; if (!name?.trim()) return;
@@ -177,7 +188,7 @@
<div class="root"> <div class="root">
<div class="header"> <div class="header">
<button class="back" onclick={onBack}> <button class="back" onclick={onBack}>
<ArrowLeft size={13} weight="light" /><span>Back</span> <ArrowLeftIcon size={13} weight="light" /><span>Back</span>
</button> </button>
<span class="title">{label}</span> <span class="title">{label}</span>
{#if !loadingInitial || filtered.length > 0} {#if !loadingInitial || filtered.length > 0}
@@ -204,7 +215,7 @@
{#each visibleItems as m, i (m.id)} {#each visibleItems as m, i (m.id)}
<button class="card" onclick={() => setPreviewManga(m)} oncontextmenu={(e) => { e.stopPropagation(); openCtx(e, m); }}> <button class="card" onclick={() => setPreviewManga(m)} oncontextmenu={(e) => { e.stopPropagation(); openCtx(e, m); }}>
<div class="cover-wrap"> <div class="cover-wrap">
<Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={i < 12 ? 12 - i : 0} /> <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={i < 12 ? 12 - i : 0} id={m.id} />
{#if m.inLibrary}<span class="in-library-badge">Saved</span>{/if} {#if m.inLibrary}<span class="in-library-badge">Saved</span>{/if}
</div> </div>
<p class="card-title">{m.title}</p> <p class="card-title">{m.title}</p>
@@ -213,7 +224,7 @@
{#if hasMore} {#if hasMore}
<div class="show-more-cell"> <div class="show-more-cell">
<button class="show-more-btn" onclick={loadMore} disabled={loadingMore}> <button class="show-more-btn" onclick={loadMore} disabled={loadingMore}>
{#if loadingMore}<CircleNotch size={13} weight="light" class="anim-spin" /> Loading…{:else}Show more{/if} {#if loadingMore}<CircleNotchIcon size={13} weight="light" class="anim-spin" /> Loading…{:else}Show more{/if}
</button> </button>
</div> </div>
{/if} {/if}
@@ -239,7 +250,7 @@
.cover-wrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); } .cover-wrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); }
:global(.cover) { width: 100%; height: 100%; object-fit: cover; transition: filter var(--t-base); will-change: filter; } :global(.cover) { width: 100%; height: 100%; object-fit: cover; transition: filter var(--t-base); will-change: filter; }
.in-library-badge { position: absolute; bottom: var(--sp-1); left: var(--sp-1); font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); padding: 2px 5px; border-radius: var(--radius-sm); } .in-library-badge { position: absolute; bottom: var(--sp-1); left: var(--sp-1); font-family: var(--font-ui); font-size: var(--text-2xs); letter-spacing: var(--tracking-wide); text-transform: uppercase; background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); padding: 2px 5px; border-radius: var(--radius-sm); }
.card-title { margin-top: var(--sp-2); font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; transition: color var(--t-base); } .card-title { margin-top: var(--sp-2); font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; transition: color var(--t-base); }
.card-skeleton { padding: 0; } .card-skeleton { padding: 0; }
.cover-skeleton { aspect-ratio: 2/3; border-radius: var(--radius-md); } .cover-skeleton { aspect-ratio: 2/3; border-radius: var(--radius-md); }
.title-skeleton { height: 11px; margin-top: var(--sp-2); width: 75%; } .title-skeleton { height: 11px; margin-top: var(--sp-2); width: 75%; }
+38 -29
View File
@@ -37,6 +37,8 @@
let kw_inputEl: HTMLInputElement | null = $state(null); let kw_inputEl: HTMLInputElement | null = $state(null);
let kw_abortCtrl: AbortController | null = null; let kw_abortCtrl: AbortController | null = null;
let kw_debounceTimer: ReturnType<typeof setTimeout> | null = null; let kw_debounceTimer: ReturnType<typeof setTimeout> | null = null;
let kw_localQuery = $state("");
let kw_pending = $state(false);
interface SourceResult { interface SourceResult {
source: Source; source: Source;
@@ -57,32 +59,37 @@
if (!loadingSources && pendingPrefill && allSources.length) { if (!loadingSources && pendingPrefill && allSources.length) {
const q = pendingPrefill; const q = pendingPrefill;
onPrefillConsumed(); onPrefillConsumed();
kw_localQuery = q;
onQueryChange(q); onQueryChange(q);
kwDoSearch(q); kwDoSearch(q);
} }
}); });
$effect(() => { function kwHandleInput(value: string) {
const q = query; kw_localQuery = value;
if (kw_debounceTimer) clearTimeout(kw_debounceTimer); if (kw_debounceTimer) clearTimeout(kw_debounceTimer);
if (!q.trim()) { kw_abortCtrl?.abort(); kw_results = []; return; } if (!value.trim()) { kw_abortCtrl?.abort(); kw_results = []; kw_pending = false; onQueryChange(""); return; }
kw_debounceTimer = setTimeout(() => kwDoSearch(q), 350); kw_pending = true;
return () => { if (kw_debounceTimer) clearTimeout(kw_debounceTimer); }; kw_debounceTimer = setTimeout(() => {
}); kw_pending = false;
onQueryChange(value);
kwDoSearch(value);
}, 2000);
}
function kwGetVisibleSources(): Source[] { const kw_visibleSources = $derived.by(() => {
let srcs = allSources; let srcs = allSources;
if (kw_selectedLangs.size > 0) if (kw_selectedLangs.size > 0)
srcs = srcs.filter((s) => kw_selectedLangs.has(s.lang)); srcs = srcs.filter((s) => kw_selectedLangs.has(s.lang));
if (settingsState.settings.contentLevel !== "unrestricted") if (settingsState.settings.contentLevel !== "unrestricted")
srcs = srcs.filter((s) => !shouldHideSource(s, settingsState.settings)); srcs = srcs.filter((s) => !shouldHideSource(s, settingsState.settings));
return srcs; return srcs;
} });
async function kwDoSearch(q: string) { async function kwDoSearch(q: string) {
const trimmed = q.trim(); const trimmed = q.trim();
if (!trimmed) return; if (!trimmed) return;
const visible = kwGetVisibleSources(); const visible = kw_visibleSources;
if (!visible.length) return; if (!visible.length) return;
kw_abortCtrl?.abort(); kw_abortCtrl?.abort();
@@ -95,13 +102,13 @@
await Promise.allSettled(visible.map(async (src) => { await Promise.allSettled(visible.map(async (src) => {
const idx = idxOf.get(src.id)!; const idx = idxOf.get(src.id)!;
try { try {
const result = await getAdapter().searchSource(src.id, trimmed, 1, ctrl.signal); const result: { items: Manga[]; hasNextPage: boolean } = await getAdapter().searchSource(src.id, trimmed, 1, ctrl.signal);
if (ctrl.signal.aborted) return; if (ctrl.signal.aborted) return;
const mangas = result.items.filter((m) => !shouldHideNsfw(m as any, settingsState.settings)); const mangas = result.items.filter((m) => !shouldHideNsfw(m as any, settingsState.settings));
kw_results = kw_results.map((r, i) => i === idx ? { ...r, mangas, loading: false } : r); kw_results[idx] = { ...kw_results[idx], mangas, loading: false };
} catch (e: any) { } catch (e: any) {
if (ctrl.signal.aborted || e?.name === "AbortError") return; if (ctrl.signal.aborted || e?.name === "AbortError") return;
kw_results = kw_results.map((r, i) => i === idx ? { ...r, loading: false, error: e.message ?? "Error" } : r); kw_results[idx] = { ...kw_results[idx], loading: false, error: e.message ?? "Error" };
} }
})); }));
} }
@@ -113,7 +120,7 @@
kw_selectedLangs = next; kw_selectedLangs = next;
} }
const kw_visibleCount = $derived(kwGetVisibleSources().length); const kw_visibleCount = $derived(kw_visibleSources.length);
const kw_anyLoading = $derived(kw_results.some((r) => r.loading)); const kw_anyLoading = $derived(kw_results.some((r) => r.loading));
const kw_allDone = $derived(kw_results.length > 0 && kw_results.every((r) => !r.loading)); const kw_allDone = $derived(kw_results.length > 0 && kw_results.every((r) => !r.loading));
const kw_hasResults = $derived(kw_results.some((r) => r.mangas.length > 0)); const kw_hasResults = $derived(kw_results.some((r) => r.mangas.length > 0));
@@ -142,18 +149,17 @@
</svg> </svg>
<input <input
bind:this={kw_inputEl} bind:this={kw_inputEl}
value={query} value={kw_localQuery}
oninput={(e) => onQueryChange((e.target as HTMLInputElement).value)} oninput={(e) => kwHandleInput((e.target as HTMLInputElement).value)}
class="searchInput" class="searchInput"
placeholder="Search across sources…" placeholder="Search across sources…"
use:focusOnMount
/> />
{#if kw_anyLoading} {#if kw_pending || kw_anyLoading}
<svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" style="color:var(--text-faint);flex-shrink:0" aria-hidden="true"> <svg width="13" height="13" viewBox="0 0 256 256" fill="currentColor" class="anim-spin" style="color:var(--text-faint);flex-shrink:0" aria-hidden="true">
<path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/> <path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"/>
</svg> </svg>
{:else if query} {:else if kw_localQuery}
<button class="clearBtn" title="Clear" onclick={() => { onQueryChange(""); kw_results = []; kw_inputEl?.focus(); }}>×</button> <button class="clearBtn" title="Clear" onclick={() => { kwHandleInput(""); kw_inputEl?.focus(); }}>×</button>
{/if} {/if}
{#if hasMultipleLangs} {#if hasMultipleLangs}
<button <button
@@ -193,7 +199,7 @@
{/if} {/if}
</div> </div>
{#if !query.trim()} {#if !kw_localQuery.trim()}
{#if popularLoading && popularResults.length === 0} {#if popularLoading && popularResults.length === 0}
<div class="searchGrid"> <div class="searchGrid">
{#each Array(24) as _, i (i)}<div class="skCard"><div class="skeleton skCover"></div></div>{/each} {#each Array(24) as _, i (i)}<div class="skCard"><div class="skeleton skCover"></div></div>{/each}
@@ -206,7 +212,7 @@
{#each popularResults as m (m.id)} {#each popularResults as m (m.id)}
<button class="srchCard" onclick={() => onPreview(m)}> <button class="srchCard" onclick={() => onPreview(m)}>
<div class="srchCoverWrap"> <div class="srchCoverWrap">
<Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={m._priority} /> <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={m._priority} id={m.id} />
<div class="srchGradient"></div> <div class="srchGradient"></div>
{#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if} {#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if}
<div class="srchFooter"> <div class="srchFooter">
@@ -235,16 +241,20 @@
</p> </p>
</div> </div>
{/if} {/if}
{:else if kw_pending}
<div class="searchGrid">
{#each Array(12) as _, i (i)}<div class="skCard"><div class="skeleton skCover"></div></div>{/each}
</div>
{:else} {:else}
{#if kw_flatResults.length > 0} {#if kw_flatResults.length > 0}
<div class="searchHeader"> <div class="searchHeader">
<span class="searchLabel">{kw_flatResults.length} result{kw_flatResults.length !== 1 ? "s" : ""}</span> <span class="searchLabel">{kw_flatResults.length} result{kw_flatResults.length !== 1 ? "s" : ""} for "{kw_localQuery.trim()}"</span>
</div> </div>
<div class="searchGrid"> <div class="searchGrid">
{#each kw_flatResults as m (m.id)} {#each kw_flatResults as m (m.id)}
<button class="srchCard" onclick={() => onPreview(m)}> <button class="srchCard" onclick={() => onPreview(m)}>
<div class="srchCoverWrap"> <div class="srchCoverWrap">
<Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={m._priority} /> <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={m._priority} id={m.id} />
<div class="srchGradient"></div> <div class="srchGradient"></div>
{#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if} {#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if}
<div class="srchFooter"> <div class="srchFooter">
@@ -264,16 +274,15 @@
</div> </div>
{:else if kw_allDone && !kw_hasResults} {:else if kw_allDone && !kw_hasResults}
<div class="empty"> <div class="empty">
<p class="emptyText">No results for "{query.trim()}"</p> <svg width="36" height="36" viewBox="0 0 256 256" fill="currentColor" class="emptyIcon" aria-hidden="true">
<path d="M229.66,218.34l-50.07-50.07a88,88,0,1,0-11.31,11.31l50.06,50.07a8,8,0,0,0,11.32-11.31ZM40,112a72,72,0,1,1,72,72A72.08,72.08,0,0,1,40,112Z"/>
</svg>
<p class="emptyText">No results for "{kw_localQuery.trim()}"</p>
<p class="emptyHint">Try a different spelling or fewer words</p> <p class="emptyHint">Try a different spelling or fewer words</p>
</div> </div>
{/if} {/if}
{/if} {/if}
<script module>
function focusOnMount(node: HTMLElement) { node.focus(); }
</script>
<style> <style>
.keywordBar { padding: var(--sp-3) var(--sp-4) var(--sp-2); flex-shrink: 0; display: flex; flex-direction: column; gap: var(--sp-2); } .keywordBar { padding: var(--sp-3) var(--sp-4) var(--sp-2); flex-shrink: 0; display: flex; flex-direction: column; gap: var(--sp-2); }
.searchBar { display: flex; align-items: center; gap: var(--sp-2); background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-lg); padding: var(--sp-2) var(--sp-3); transition: border-color var(--t-base); } .searchBar { display: flex; align-items: center; gap: var(--sp-2); background: var(--bg-raised); border: 1px solid var(--border-dim); border-radius: var(--radius-lg); padding: var(--sp-2) var(--sp-3); transition: border-color var(--t-base); }
@@ -306,7 +315,7 @@
.srchCoverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); transition: filter var(--t-base); } .srchCoverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); transform: translateZ(0); transition: filter var(--t-base); }
.srchGradient { position: absolute; inset: 0; z-index: 1; background: linear-gradient(to top, rgba(0,0,0,0.82) 0%, rgba(0,0,0,0.15) 50%, transparent 72%); pointer-events: none; } .srchGradient { position: absolute; inset: 0; z-index: 1; background: linear-gradient(to top, rgba(0,0,0,0.82) 0%, rgba(0,0,0,0.15) 50%, transparent 72%); pointer-events: none; }
.srchFooter { position: absolute; bottom: 0; left: 0; right: 0; z-index: 2; padding: var(--sp-2); pointer-events: none; } .srchFooter { position: absolute; bottom: 0; left: 0; right: 0; z-index: 2; padding: var(--sp-2); pointer-events: none; }
.srchTitle { font-size: var(--text-xs); font-weight: var(--weight-medium); color: rgba(255,255,255,0.92); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-shadow: 0 1px 4px rgba(0,0,0,0.7); } .srchTitle { font-size: var(--text-xs); font-weight: var(--weight-medium); color: rgba(255,255,255,0.92); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-shadow: 0 1px 4px rgba(0,0,0,0.7); }
.srchSource { font-family: var(--font-ui); font-size: 9px; color: rgba(255,255,255,0.45); letter-spacing: var(--tracking-wide); margin-top: 1px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .srchSource { font-family: var(--font-ui); font-size: 9px; color: rgba(255,255,255,0.45); letter-spacing: var(--tracking-wide); margin-top: 1px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.inLibBadge { position: absolute; top: var(--sp-2); left: var(--sp-2); z-index: 2; font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; } .inLibBadge { position: absolute; top: var(--sp-2); left: var(--sp-2); z-index: 2; font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; }
.skCard { display: flex; flex-direction: column; gap: var(--sp-2); flex-shrink: 0; width: 100%; } .skCard { display: flex; flex-direction: column; gap: var(--sp-2); flex-shrink: 0; width: 100%; }
+26 -14
View File
@@ -5,7 +5,6 @@
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import { settingsState } from "$lib/state/settings.svelte"; import { settingsState } from "$lib/state/settings.svelte";
import { setPreviewManga } from "$lib/state/series.svelte"; import { setPreviewManga } from "$lib/state/series.svelte";
import { dedupeMangaById } from "$lib/core/util";
import { toCachedManga, shouldHideNsfw, runConcurrent, type CachedManga } from "$lib/components/browse/lib/searchFilter"; import { toCachedManga, shouldHideNsfw, runConcurrent, type CachedManga } from "$lib/components/browse/lib/searchFilter";
import type { Manga, Source } from "$lib/types"; import type { Manga, Source } from "$lib/types";
@@ -39,6 +38,8 @@
goto(u.toString(), { replaceState: true, noScroll: true }); goto(u.toString(), { replaceState: true, noScroll: true });
} }
let pendingPrefill = $state("");
let tabsEl = $state<HTMLDivElement | undefined>(undefined); let tabsEl = $state<HTMLDivElement | undefined>(undefined);
let tabIndicator = $state({ left: 0, width: 0 }); let tabIndicator = $state({ left: 0, width: 0 });
@@ -64,22 +65,31 @@
const availableLangs = $derived(Array.from(new Set<string>(allSources.map((s) => s.lang))).sort()); const availableLangs = $derived(Array.from(new Set<string>(allSources.map((s) => s.lang))).sort());
const hasMultipleLangs = $derived(availableLangs.length > 1); const hasMultipleLangs = $derived(availableLangs.length > 1);
loadingSources = true; let sourcesAbort: AbortController | null = null;
getAdapter().getSources()
.then((nodes) => { $effect(() => {
localSource = nodes.find((s: Source) => s.id === "0") ?? null; sourcesAbort?.abort();
allSources = nodes.filter((s: Source) => s.id !== "0"); const ctrl = new AbortController();
startSourceCacheBuild(); sourcesAbort = ctrl;
popularStart(allSources); loadingSources = true;
}) getAdapter().getSources()
.catch(console.error) .then((nodes: Source[]) => {
.finally(() => { loadingSources = false; }); if (ctrl.signal.aborted) return;
localSource = nodes.find((s: Source) => s.id === "0") ?? null;
allSources = nodes.filter((s: Source) => s.id !== "0");
startSourceCacheBuild();
popularStart(allSources);
})
.catch(console.error)
.finally(() => { if (!ctrl.signal.aborted) loadingSources = false; });
return () => { ctrl.abort(); };
});
let popular_raw: Manga[] = $state([]); let popular_raw: Manga[] = $state([]);
let popular_loading = $state(false); let popular_loading = $state(false);
let popular_abortCtrl: AbortController | null = null; let popular_abortCtrl: AbortController | null = null;
let popular_sourcePool: Source[] = $state([]); let popular_sourcePool: Source[] = [];
let popular_sourceCursor = $state(0); let popular_sourceCursor = 0;
let popular_seenIds = new Set<number>(); let popular_seenIds = new Set<number>();
let popular_seenTitles = new Set<string>(); let popular_seenTitles = new Set<string>();
@@ -208,6 +218,7 @@
} }
onDestroy(() => { onDestroy(() => {
sourcesAbort?.abort();
popular_abortCtrl?.abort(); popular_abortCtrl?.abort();
sourceCacheAbort?.abort(); sourceCacheAbort?.abort();
}); });
@@ -248,11 +259,13 @@
{availableLangs} {availableLangs}
{hasMultipleLangs} {hasMultipleLangs}
{loadingSources} {loadingSources}
{pendingPrefill}
popularResults={popular_results} popularResults={popular_results}
popularLoading={popular_loading} popularLoading={popular_loading}
{sourceCache} {sourceCache}
query={urlQuery} query={urlQuery}
onQueryChange={setQuery} onQueryChange={setQuery}
onPrefillConsumed={() => { pendingPrefill = ""; }}
onPreview={(m) => setPreviewManga(m)} onPreview={(m) => setPreviewManga(m)}
/> />
{:else if urlTab === "tag"} {:else if urlTab === "tag"}
@@ -263,7 +276,6 @@
{sourceCacheLoading} {sourceCacheLoading}
{sourceCacheEnriching} {sourceCacheEnriching}
onPreview={(m) => setPreviewManga(m)} onPreview={(m) => setPreviewManga(m)}
onGenreDrill={(genre) => goto(`/browse?genre=${encodeURIComponent(genre)}`)}
/> />
{:else} {:else}
<SourceTab <SourceTab
+5 -5
View File
@@ -1,7 +1,7 @@
<script lang="ts"> <script lang="ts">
import { onDestroy } from "svelte"; import { onDestroy } from "svelte";
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import { settingsState } from "$lib/state/settings.svelte"; import { settingsState, updateSettings } from "$lib/state/settings.svelte";
import { shouldHideNsfw, shouldHideSource } from "$lib/core/util"; import { shouldHideNsfw, shouldHideSource } from "$lib/core/util";
import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte"; import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte";
import ContextMenu from "$lib/components/shared/ui/ContextMenu.svelte"; import ContextMenu from "$lib/components/shared/ui/ContextMenu.svelte";
@@ -20,7 +20,7 @@
const preferredLang = $derived(settingsState.settings.preferredExtensionLang ?? "en"); const preferredLang = $derived(settingsState.settings.preferredExtensionLang ?? "en");
let src_selectedLang = $state(preferredLang || "all"); let src_selectedLang = $state(settingsState.settings.preferredExtensionLang || "all");
let src_activeSource: Source | null = $state(null); let src_activeSource: Source | null = $state(null);
let src_browseResults: Manga[] = $state([]); let src_browseResults: Manga[] = $state([]);
let src_loadingBrowse = $state(false); let src_loadingBrowse = $state(false);
@@ -122,7 +122,7 @@
function togglePinnedSource(id: string) { function togglePinnedSource(id: string) {
const current = settingsState.settings.pinnedSourceIds ?? []; const current = settingsState.settings.pinnedSourceIds ?? [];
const next = current.includes(id) ? current.filter((x: string) => x !== id) : [...current, id]; const next = current.includes(id) ? current.filter((x: string) => x !== id) : [...current, id];
settingsState.updateSettings({ pinnedSourceIds: next }); updateSettings({ pinnedSourceIds: next });
} }
onDestroy(() => { src_abortCtrl?.abort(); }); onDestroy(() => { src_abortCtrl?.abort(); });
@@ -261,7 +261,7 @@
{#each src_browseResults as m, i (m.id)} {#each src_browseResults as m, i (m.id)}
<button class="card" onclick={() => onPreview(m)}> <button class="card" onclick={() => onPreview(m)}>
<div class="coverWrap"> <div class="coverWrap">
<Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={i < 12 ? 12 - i : 0} /> <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={i < 12 ? 12 - i : 0} id={m.id} />
{#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if} {#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if}
</div> </div>
<p class="cardTitle">{m.title}</p> <p class="cardTitle">{m.title}</p>
@@ -356,7 +356,7 @@
.tagGrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(110px, 1fr)); gap: var(--sp-4); padding: var(--sp-4); overflow-y: auto; flex: 1; align-content: start; } .tagGrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(110px, 1fr)); gap: var(--sp-4); padding: var(--sp-4); overflow-y: auto; flex: 1; align-content: start; }
.card { background: none; border: none; padding: 0; cursor: pointer; text-align: left; display: flex; flex-direction: column; gap: var(--sp-2); } .card { background: none; border: none; padding: 0; cursor: pointer; text-align: left; display: flex; flex-direction: column; gap: var(--sp-2); }
.coverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); } .coverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); }
.cardTitle { font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; } .cardTitle { font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; }
.inLibBadge { position: absolute; top: var(--sp-2); left: var(--sp-2); font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; } .inLibBadge { position: absolute; top: var(--sp-2); left: var(--sp-2); font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; }
.showMoreCell { grid-column: 1 / -1; display: flex; justify-content: center; padding: var(--sp-2) 0; } .showMoreCell { grid-column: 1 / -1; display: flex; justify-content: center; padding: var(--sp-2) 0; }
.showMoreBtn { display: inline-flex; align-items: center; gap: var(--sp-1); padding: 5px 12px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: none; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); color: var(--text-muted); cursor: pointer; transition: background var(--t-base), color var(--t-base), border-color var(--t-base); } .showMoreBtn { display: inline-flex; align-items: center; gap: var(--sp-1); padding: 5px 12px; border-radius: var(--radius-md); border: 1px solid var(--border-dim); background: none; font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); color: var(--text-muted); cursor: pointer; transition: background var(--t-base), color var(--t-base), border-color var(--t-base); }
+32 -15
View File
@@ -41,7 +41,8 @@
let tag_loadingMoreLocal = $state(false); let tag_loadingMoreLocal = $state(false);
let tag_localOffset = $state(0); let tag_localOffset = $state(0);
let tag_localHasNext = $state(false); let tag_localHasNext = $state(false);
let tag_abortLocal: AbortController | null = null; let tag_abortLocal: AbortController | null = null;
let tag_abortLoadMore: AbortController | null = null;
const renderLimit = $derived(settingsState.settings.renderLimit ?? 48); const renderLimit = $derived(settingsState.settings.renderLimit ?? 48);
@@ -52,9 +53,6 @@
untrack(() => tagFetchLocal(_tags, _mode, _statuses)); untrack(() => tagFetchLocal(_tags, _mode, _statuses));
}); });
$effect(() => {
if (tag_localHasNext && !tag_loadingMoreLocal && !tag_loadingLocal) tagLoadMoreLocal();
});
async function tagFetchLocal(activeTags: string[], tagMode: TagMode, activeStatuses: string[]) { async function tagFetchLocal(activeTags: string[], tagMode: TagMode, activeStatuses: string[]) {
if (activeTags.length === 0 && activeStatuses.length === 0) { if (activeTags.length === 0 && activeStatuses.length === 0) {
@@ -62,6 +60,7 @@
return; return;
} }
tag_abortLocal?.abort(); tag_abortLocal?.abort();
tag_abortLoadMore?.abort();
const ctrl = new AbortController(); const ctrl = new AbortController();
tag_abortLocal = ctrl; tag_abortLocal = ctrl;
tag_localResults = []; tag_totalCount = 0; tag_localOffset = 0; tag_localHasNext = false; tag_localResults = []; tag_totalCount = 0; tag_localOffset = 0; tag_localHasNext = false;
@@ -77,6 +76,7 @@
tag_totalCount = d.totalCount; tag_totalCount = d.totalCount;
tag_localHasNext = d.hasNextPage; tag_localHasNext = d.hasNextPage;
tag_localOffset = limit; tag_localOffset = limit;
if (d.hasNextPage && tag_localResults.length < 20) tagLoadMoreLocal();
} catch (e: any) { } catch (e: any) {
if (e?.name !== "AbortError") console.error(e); if (e?.name !== "AbortError") console.error(e);
} finally { } finally {
@@ -86,10 +86,10 @@
async function tagLoadMoreLocal() { async function tagLoadMoreLocal() {
if (tag_loadingMoreLocal || !tag_localHasNext) return; if (tag_loadingMoreLocal || !tag_localHasNext) return;
tag_loadingMoreLocal = true; tag_abortLoadMore?.abort();
tag_abortLocal?.abort();
const ctrl = new AbortController(); const ctrl = new AbortController();
tag_abortLocal = ctrl; tag_abortLoadMore = ctrl;
tag_loadingMoreLocal = true;
const limit = renderLimit; const limit = renderLimit;
try { try {
const d = await getAdapter().getMangasByGenre( const d = await getAdapter().getMangasByGenre(
@@ -191,13 +191,22 @@
let tag_autoSearchFired = $state(false); let tag_autoSearchFired = $state(false);
$effect(() => { $effect(() => {
tag_activeTags; void tag_activeTags;
tag_activeStatuses; void tag_activeStatuses;
untrack(() => { tag_autoSearchFired = false; }); untrack(() => { tag_autoSearchFired = false; });
if (!tag_loadingLocal && tag_hasActiveFilters && !tag_autoSearchFired && !tag_searchSources && sourceCacheReady) { });
if (tag_localResults.length < 20) { $effect(() => {
untrack(() => { tag_autoSearchFired = true; tag_searchSources = true; }); const _loadingLocal = tag_loadingLocal;
} const _hasFilters = tag_hasActiveFilters;
const _resultLen = tag_localResults.length;
const _cacheReady = sourceCacheReady;
if (!_loadingLocal && _hasFilters && _cacheReady) {
untrack(() => {
if (!tag_autoSearchFired && !tag_searchSources && _resultLen < 20) {
tag_autoSearchFired = true;
tag_searchSources = true;
}
});
} }
}); });
@@ -230,6 +239,7 @@
onDestroy(() => { onDestroy(() => {
tag_abortLocal?.abort(); tag_abortLocal?.abort();
tag_abortLoadMore?.abort();
tag_fanOutAbort?.abort(); tag_fanOutAbort?.abort();
}); });
</script> </script>
@@ -360,7 +370,7 @@
{#each tag_mergedResults as m, i (m.id)} {#each tag_mergedResults as m, i (m.id)}
<button class="card" onclick={() => onPreview(m)}> <button class="card" onclick={() => onPreview(m)}>
<div class="coverWrap"> <div class="coverWrap">
<Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={i < 12 ? 12 - i : 0} /> <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" priority={i < 12 ? 12 - i : 0} id={m.id} />
{#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if} {#if m.inLibrary}<span class="inLibBadge">Saved</span>{/if}
</div> </div>
<p class="cardTitle">{m.title}</p> <p class="cardTitle">{m.title}</p>
@@ -370,6 +380,10 @@
{#each Array(12) as _, i (i)} {#each Array(12) as _, i (i)}
<div class="skCard"><div class="skeleton skCover"></div><div class="skeleton skTitle"></div></div> <div class="skCard"><div class="skeleton skCover"></div><div class="skeleton skTitle"></div></div>
{/each} {/each}
{:else if tag_localHasNext}
<div class="loadMoreRow">
<button class="loadMoreBtn" onclick={tagLoadMoreLocal}>Load more</button>
</div>
{/if} {/if}
</div> </div>
{:else} {:else}
@@ -426,9 +440,12 @@
.tagClearAll:hover { color: var(--color-error); border-color: color-mix(in srgb, var(--color-error) 40%, transparent); background: var(--color-error-bg, color-mix(in srgb, var(--color-error) 8%, transparent)); } .tagClearAll:hover { color: var(--color-error); border-color: color-mix(in srgb, var(--color-error) 40%, transparent); background: var(--color-error-bg, color-mix(in srgb, var(--color-error) 8%, transparent)); }
.tagCheckMark { font-size: var(--text-xs); color: var(--accent-fg); margin-left: auto; } .tagCheckMark { font-size: var(--text-xs); color: var(--accent-fg); margin-left: auto; }
.tagGrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(110px, 1fr)); gap: var(--sp-4); padding: var(--sp-4); overflow-y: auto; flex: 1; align-content: start; will-change: scroll-position; } .tagGrid { display: grid; grid-template-columns: repeat(auto-fill, minmax(110px, 1fr)); gap: var(--sp-4); padding: var(--sp-4); overflow-y: auto; flex: 1; align-content: start; will-change: scroll-position; }
.loadMoreRow { grid-column: 1 / -1; display: flex; justify-content: center; padding: var(--sp-2) 0 var(--sp-4); }
.loadMoreBtn { font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide); color: var(--text-faint); background: none; border: 1px solid var(--border-dim); border-radius: var(--radius-md); padding: 6px 20px; cursor: pointer; transition: color var(--t-base), border-color var(--t-base), background var(--t-base); }
.loadMoreBtn:hover { color: var(--text-muted); border-color: var(--border-strong); background: var(--bg-raised); }
.card { background: none; border: none; padding: 0; cursor: pointer; text-align: left; display: flex; flex-direction: column; gap: var(--sp-2); } .card { background: none; border: none; padding: 0; cursor: pointer; text-align: left; display: flex; flex-direction: column; gap: var(--sp-2); }
.coverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); } .coverWrap { position: relative; aspect-ratio: 2/3; overflow: hidden; border-radius: var(--radius-md); background: var(--bg-raised); border: 1px solid var(--border-dim); }
.cardTitle { font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; transition: color var(--t-base); } .cardTitle { font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; transition: color var(--t-base); }
.inLibBadge { position: absolute; top: var(--sp-2); left: var(--sp-2); font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; } .inLibBadge { position: absolute; top: var(--sp-2); left: var(--sp-2); font-family: var(--font-ui); font-size: 9px; letter-spacing: var(--tracking-wide); background: var(--accent-muted); color: var(--accent-fg); border: 1px solid var(--accent-dim); border-radius: var(--radius-sm); padding: 1px 5px; }
.skCard { display: flex; flex-direction: column; gap: var(--sp-2); } .skCard { display: flex; flex-direction: column; gap: var(--sp-2); }
@keyframes shimmer { from { background-position: -200% 0 } to { background-position: 200% 0 } } @keyframes shimmer { from { background-position: -200% 0 } to { background-position: 200% 0 } }
+165 -32
View File
@@ -1,29 +1,67 @@
<script module lang="ts">
function getLiveSet(): Set<HTMLCanvasElement> {
const g = window as any
if (!g.__splashCanvasSet) g.__splashCanvasSet = new Set<HTMLCanvasElement>()
return g.__splashCanvasSet as Set<HTMLCanvasElement>
}
function pruneSet(set: Set<HTMLCanvasElement>) {
for (const el of set) if (!el.isConnected) set.delete(el)
}
export function splashDevRegister(el: HTMLCanvasElement) {
const set = getLiveSet()
pruneSet(set)
set.add(el)
}
export function splashDevUnregister(el: HTMLCanvasElement) {
const set = getLiveSet()
set.delete(el)
pruneSet(set)
}
export function splashDevLiveCount(): number {
const set = getLiveSet()
pruneSet(set)
return set.size
}
export function splashDevNextMount(): number {
const g = window as any
g.__splashTotalMounts = (g.__splashTotalMounts ?? 0) + 1
return g.__splashTotalMounts as number
}
</script>
<script lang="ts"> <script lang="ts">
import { onMount } from 'svelte' import { onMount } from 'svelte'
import logoUrl from '$lib/assets/moku-icon-splash.svg' import logoUrl from '$lib/assets/moku-icon-splash.svg'
import { platformService } from '$lib/platform-service' import { platformService } from '$lib/platform-service'
const isTauri = platformService.platform === 'tauri' const isTauri = platformService.platform === 'tauri'
const isDev = import.meta.env.DEV
interface Props { interface Props {
mode?: 'loading' | 'idle' | 'locked' mode?: 'loading' | 'idle' | 'locked'
ringFull?: boolean ringFull?: boolean
failed?: boolean failed?: boolean
notConfigured?: boolean notConfigured?: boolean
showCards?: boolean showCards?: boolean
showFps?: boolean showFps?: boolean
pinLen?: number showDevOverlay?: boolean
pinCorrect?: string pinLen?: number
onReady?: () => void pinCorrect?: string
onUnlock?: () => void onReady?: () => void
onRetry?: () => void onUnlock?: () => void
onBypass?: () => void onRetry?: () => void
onDismiss?: () => void onBypass?: () => void
onDismiss?: () => void
} }
let { let {
mode = 'loading', ringFull = false, failed = false, mode = 'loading', ringFull = false, failed = false,
notConfigured = false, showCards = true, showFps = false, notConfigured = false, showCards = true, showFps = false, showDevOverlay = false,
pinLen = 4, pinCorrect = '', pinLen = 4, pinCorrect = '',
onReady, onUnlock, onRetry, onBypass, onDismiss, onReady, onUnlock, onRetry, onBypass, onDismiss,
}: Props = $props() }: Props = $props()
@@ -59,7 +97,7 @@
setTimeout(() => cb?.(), EXIT_MS) setTimeout(() => cb?.(), EXIT_MS)
} }
let animFrame: number let animFrame = 0
let animStart: number | null = null let animStart: number | null = null
let animPhase = 1 let animPhase = 1
@@ -79,19 +117,18 @@
} }
$effect(() => { $effect(() => {
if (mode === 'loading' && !failed && !notConfigured && !ringFull) { if (mode !== 'loading' || failed || notConfigured || ringFull || !isTauri) return
if (!isTauri) return // no ring animation on web; probe outcome drives exit animStart = null
animStart = null animPhase = 1
animPhase = 1 animFrame = requestAnimationFrame(animateRing)
animFrame = requestAnimationFrame(animateRing) return () => cancelAnimationFrame(animFrame)
return () => cancelAnimationFrame(animFrame)
}
}) })
$effect(() => { $effect(() => {
if (!ringFull || mode === 'locked') { exitLock = false; exiting = false; return } if (!ringFull || mode === 'locked') { exitLock = false; exiting = false; return }
cancelAnimationFrame(animFrame) cancelAnimationFrame(animFrame)
ringProg = 1 animFrame = 0
ringProg = 1
setTimeout(() => triggerExit(onReady), 650) setTimeout(() => triggerExit(onReady), 650)
}) })
@@ -141,6 +178,7 @@
window.removeEventListener('touchstart', handler) window.removeEventListener('touchstart', handler)
} }
} }
return () => clearInterval(iv) return () => clearInterval(iv)
}) })
@@ -174,7 +212,7 @@
const speed = cfg.speedMin + hash(seed + 5) * (cfg.speedMax - cfg.speedMin) const speed = cfg.speedMin + hash(seed + 5) * (cfg.speedMax - cfg.speedMin)
const travel = vh + h + BUF const travel = vh + h + BUF
cards.push({ cards.push({
cx: (col + 0.5) * laneW + (hash(seed + 2) * 2 - 1) * Math.max(0, (laneW - w) / 2 - 2), cx: (col + 0.5) * laneW + (hash(seed + 2) * 2 - 1) * Math.max(0, (laneW - w) / 2 - 2),
w, h, w, h,
lines: 1 + Math.floor(hash(seed + 7) * 3), lines: 1 + Math.floor(hash(seed + 7) * 3),
alpha: cfg.alpha, alpha: cfg.alpha,
@@ -269,33 +307,99 @@
ctx.drawImage(vignette, 0, 0, cw, ch) ctx.drawImage(vignette, 0, 0, cw, ch)
} }
let fps = 0, fpsFrames = 0, fpsLast = 0 let fpsFrames = 0, fpsLast = -1
function tickFps(now: number) { function tickFps(now: number) {
if (fpsLast < 0) { fpsLast = now; return }
fpsFrames++ fpsFrames++
if (now - fpsLast >= 500) { if (now - fpsLast >= 500) {
fps = Math.round(fpsFrames / ((now - fpsLast) / 1000)) const fps = Math.round(fpsFrames / ((now - fpsLast) / 1000))
fpsFrames = 0 fpsFrames = 0
fpsLast = now fpsLast = now
if (fpsEl) fpsEl.textContent = `${fps} fps` if (fpsEl) fpsEl.textContent = `${fps} fps`
} }
} }
interface DevMetrics {
totalMounts: number
resizeCount: number
stampCount: number
mountedAt: number
lastResizeAt: number | null
}
let devMetrics = $state<DevMetrics | null>(null)
let uptimeSecs = $state(0)
let devLiveCount = $state(0)
$effect(() => {
if (!isDev || mode !== 'idle' || !devMetrics) return
const start = Date.now()
const iv = setInterval(() => { uptimeSecs = Math.floor((Date.now() - start) / 1000) }, 1000)
return () => clearInterval(iv)
})
function fmtUptime(s: number): string {
if (s < 60) return `${s}s`
return `${Math.floor(s / 60)}m ${s % 60}s`
}
function fmtAgo(ts: number | null): string {
if (ts === null) return '—'
const s = Math.floor((Date.now() - ts) / 1000)
if (s < 60) return `${s}s ago`
return `${Math.floor(s / 60)}m ago`
}
function mountCanvas(el: HTMLCanvasElement) { function mountCanvas(el: HTMLCanvasElement) {
const ctx = el.getContext('2d')! const ctx = el.getContext('2d')!
let live: RenderState | null = null let live: RenderState | null = null
let lastLogW = 0, lastLogH = 0, lastScale = 0, buildGen = 0 let lastLogW = 0, lastLogH = 0, lastScale = 0, buildGen = 0
if (isDev && mode === 'idle') {
splashDevRegister(el)
devLiveCount = splashDevLiveCount()
uptimeSecs = 0
devMetrics = {
totalMounts: splashDevNextMount(),
resizeCount: 0,
stampCount: 0,
mountedAt: Date.now(),
lastResizeAt: null,
}
}
function cleanup() {
if (live) {
live.stamps.forEach(c => { c.width = 0; c.height = 0 })
live.vignette.width = 0
live.vignette.height = 0
live = null
}
ctx.clearRect(0, 0, el.width, el.height)
}
function applySize(logW: number, logH: number, scale: number) { function applySize(logW: number, logH: number, scale: number) {
const gen = ++buildGen const gen = ++buildGen
if (logW <= 0 || logH <= 0) return if (logW <= 0 || logH <= 0) return
if (logW === lastLogW && logH === lastLogH && scale === lastScale) return if (logW === lastLogW && logH === lastLogH && scale === lastScale) return
lastLogW = logW; lastLogH = logH; lastScale = scale lastLogW = logW; lastLogH = logH; lastScale = scale
if (live) cleanup()
const built = buildCards(logW, logH) const built = buildCards(logW, logH)
const stamps = built.cards.map(c => buildStamp(c, scale)) const stamps = built.cards.map(c => buildStamp(c, scale))
const vig = buildVignette(logW, logH, scale) const vig = buildVignette(logW, logH, scale)
el.width = Math.round(logW * scale) el.width = Math.round(logW * scale)
el.height = Math.round(logH * scale) el.height = Math.round(logH * scale)
if (gen === buildGen) live = { cards: built.cards, trigs: built.trigs, stamps, vignette: vig, CW: el.width, CH: el.height, scale } if (gen === buildGen) {
live = { cards: built.cards, trigs: built.trigs, stamps, vignette: vig, CW: el.width, CH: el.height, scale }
if (isDev && mode === 'idle' && devMetrics) {
devMetrics = {
...devMetrics,
resizeCount: devMetrics.resizeCount + 1,
stampCount: stamps.length,
lastResizeAt: Date.now(),
}
}
}
} }
let extraCleanup: (() => void) | undefined let extraCleanup: (() => void) | undefined
@@ -341,10 +445,18 @@
document.addEventListener('visibilitychange', onVis) document.addEventListener('visibilitychange', onVis)
raf = requestAnimationFrame(frame) raf = requestAnimationFrame(frame)
return () => {
cancelAnimationFrame(raf) return {
extraCleanup?.() destroy() {
document.removeEventListener('visibilitychange', onVis) cancelAnimationFrame(raf)
cleanup()
extraCleanup?.()
document.removeEventListener('visibilitychange', onVis)
if (isDev && mode === 'idle') {
splashDevUnregister(el)
devLiveCount = splashDevLiveCount()
}
}
} }
} }
</script> </script>
@@ -357,6 +469,20 @@
{/if} {/if}
{/if} {/if}
{#if isDev && mode === 'idle' && devMetrics && showDevOverlay}
<div class="dev-overlay">
<span class="dev-title">canvas · idle splash</span>
<div class="dev-grid">
<span class="dev-k">live</span> <span class="dev-v" class:dev-warn={devLiveCount > 1}>{devLiveCount}</span>
<span class="dev-k">total mounts</span> <span class="dev-v">{devMetrics.totalMounts}</span>
<span class="dev-k">stamps</span> <span class="dev-v">{devMetrics.stampCount}</span>
<span class="dev-k">resizes</span> <span class="dev-v">{devMetrics.resizeCount}</span>
<span class="dev-k">uptime</span> <span class="dev-v">{fmtUptime(uptimeSecs)}</span>
<span class="dev-k">last resize</span> <span class="dev-v">{fmtAgo(devMetrics.lastResizeAt)}</span>
</div>
</div>
{/if}
{#if mode === 'idle'} {#if mode === 'idle'}
<div style="z-index:1;display:flex;flex-direction:column;align-items:center"> <div style="z-index:1;display:flex;flex-direction:column;align-items:center">
<div style="position:relative;width:{logoIdleSize}px;height:{logoIdleSize}px;margin-bottom:32px"> <div style="position:relative;width:{logoIdleSize}px;height:{logoIdleSize}px;margin-bottom:32px">
@@ -426,7 +552,7 @@
.logo-wrap { position:relative; width:72px; height:72px; display:flex; align-items:center; justify-content:center; } .logo-wrap { position:relative; width:72px; height:72px; display:flex; align-items:center; justify-content:center; }
.pin-card { z-index:1; width:min(280px,calc(100vw - 48px)); background:var(--bg-surface); border:1px solid var(--border-base); border-radius:var(--radius-xl); padding:var(--sp-6) var(--sp-5); display:flex; flex-direction:column; align-items:center; gap:var(--sp-3); box-shadow:0 32px 80px rgba(0,0,0,0.75); animation:cardIn 0.38s cubic-bezier(0.22,1,0.36,1) 0.06s both; } .pin-card { z-index:1; width:min(280px,calc(100vw - 48px)); background:var(--bg-surface); border:1px solid var(--border-base); border-radius:var(--radius-xl); padding:var(--sp-6) var(--sp-5); display:flex; flex-direction:column; align-items:center; gap:var(--sp-3); box-shadow:0 32px 80px rgba(0,0,0,0.75); animation:cardIn 0.38s cubic-bezier(0.22,1,0.36,1) 0.06s both; }
.pin-card--leaving { animation:cardOut 0.28s cubic-bezier(0.4,0,1,1) both; } .pin-card--leaving { animation:cardOut 0.28s cubic-bezier(0.4,0,1,1) both; }
.pin-label { font-family:var(--font-ui); font-size:var(--text-xs); color:var(--text-faint); letter-spacing:var(--tracking-wider); text-transform:uppercase; margin:0; } .pin-label { font-family:var(--font-ui); font-size:var(--text-xs); color:var(--text-faint); letter-spacing:var(--tracking-wider); text-transform:uppercase; margin:0; }
@@ -449,4 +575,11 @@
.err-btn:hover { border-color:var(--border-strong); color:var(--text-secondary); } .err-btn:hover { border-color:var(--border-strong); color:var(--text-secondary); }
.err-btn--primary { border-color:var(--accent-dim); color:var(--accent-fg); background:var(--accent-muted); } .err-btn--primary { border-color:var(--accent-dim); color:var(--accent-fg); background:var(--accent-muted); }
.err-btn--primary:hover { border-color:var(--accent); color:var(--accent-bright); } .err-btn--primary:hover { border-color:var(--accent); color:var(--accent-bright); }
.dev-overlay { position:absolute; top:12px; left:12px; z-index:10; background:rgba(0,0,0,0.72); border:1px solid rgba(255,255,255,0.10); border-radius:6px; padding:8px 10px; pointer-events:none; backdrop-filter:blur(6px); }
.dev-title { display:block; font-family:var(--font-ui); font-size:9px; letter-spacing:0.14em; text-transform:uppercase; color:var(--accent); margin-bottom:6px; }
.dev-grid { display:grid; grid-template-columns:auto auto; column-gap:12px; row-gap:2px; }
.dev-k { font-family:var(--font-ui); font-size:10px; color:var(--text-faint); white-space:nowrap; }
.dev-v { font-family:var(--font-ui); font-size:10px; color:var(--text-secondary); text-align:right; white-space:nowrap; }
.dev-warn { color:#f87171; }
</style> </style>
+34 -9
View File
@@ -16,15 +16,22 @@
let closeDialogOpen = $state(false) let closeDialogOpen = $state(false)
let closeRemember = $state(false) let closeRemember = $state(false)
onMount(async () => { onMount(() => {
isFullscreen = await win.isFullscreen() let unlistenResize: (() => void) | undefined
const unlistenResize = await win.onResized(async () => { let unlistenClose: (() => void) | undefined
win.isFullscreen().then(v => { isFullscreen = v })
win.onResized(async () => {
isFullscreen = await win.isFullscreen() isFullscreen = await win.isFullscreen()
}) }).then(u => { unlistenResize = u })
const unlistenClose = await win.listen('tauri://close-requested', handleCloseRequested)
win.listen('tauri://close-requested', handleCloseRequested)
.then(u => { unlistenClose = u })
return () => { return () => {
unlistenResize() unlistenResize?.()
unlistenClose() unlistenClose?.()
} }
}) })
@@ -56,6 +63,10 @@
if (choice === 'tray') await doHide() if (choice === 'tray') await doHide()
else await doQuit() else await doQuit()
} }
function onBackdropKey(e: KeyboardEvent) {
if (e.key === 'Escape') { closeDialogOpen = false; closeRemember = false }
}
</script> </script>
{#if !isFullscreen} {#if !isFullscreen}
@@ -99,8 +110,21 @@
{/if} {/if}
{#if closeDialogOpen} {#if closeDialogOpen}
<div class="close-backdrop" role="presentation" onclick={() => { closeDialogOpen = false; closeRemember = false; }}> <div
<div class="close-dialog" role="dialog" aria-modal="true" onclick={(e) => e.stopPropagation()}> class="close-backdrop"
role="presentation"
onclick={() => { closeDialogOpen = false; closeRemember = false }}
onkeydown={onBackdropKey}
>
<div
class="close-dialog"
role="dialog"
aria-modal="true"
aria-label="Close Moku"
tabindex="-1"
onclick={(e) => e.stopPropagation()}
onkeydown={(e) => e.stopPropagation()}
>
<div class="close-header"> <div class="close-header">
<p class="close-title">Close Moku?</p> <p class="close-title">Close Moku?</p>
<p class="close-sub">Choose how the app should exit.</p> <p class="close-sub">Choose how the app should exit.</p>
@@ -169,6 +193,7 @@
0 24px 64px rgba(0,0,0,0.7), 0 24px 64px rgba(0,0,0,0.7),
0 8px 24px rgba(0,0,0,0.4); 0 8px 24px rgba(0,0,0,0.4);
animation: cdPop 0.22s cubic-bezier(0.16,1,0.3,1) both; animation: cdPop 0.22s cubic-bezier(0.16,1,0.3,1) both;
outline: none;
} }
@keyframes cdPop { from { opacity: 0; transform: scale(0.96) translateY(6px) } to { opacity: 1; transform: none } } @keyframes cdPop { from { opacity: 0; transform: scale(0.96) translateY(6px) } to { opacity: 1; transform: none } }
-171
View File
@@ -1,171 +0,0 @@
const CARD_COUNT = 18
const CARD_W = 52
const CARD_H = 72
const CARD_RADIUS = 6
const DRIFT_SPEED = 0.018
interface Card {
x: number
y: number
vx: number
vy: number
rot: number
vrot: number
opacity: number
scale: number
hue: number
}
function makeCard(w: number, h: number): Card {
const side = Math.floor(Math.random() * 4)
const margin = 80
let x = 0, y = 0
if (side === 0) { x = Math.random() * w; y = -margin }
if (side === 1) { x = w + margin; y = Math.random() * h }
if (side === 2) { x = Math.random() * w; y = h + margin }
if (side === 3) { x = -margin; y = Math.random() * h }
const cx = w / 2, cy = h / 2
const dx = cx - x, dy = cy - y
const len = Math.sqrt(dx * dx + dy * dy) || 1
const spd = 0.12 + Math.random() * 0.1
return {
x,
y,
vx: (dx / len) * spd * (0.3 + Math.random() * 0.4),
vy: (dy / len) * spd * (0.3 + Math.random() * 0.4),
rot: Math.random() * Math.PI * 2,
vrot: (Math.random() - 0.5) * 0.006,
opacity: 0.025 + Math.random() * 0.055,
scale: 0.7 + Math.random() * 0.7,
hue: 120 + Math.random() * 40,
}
}
function drawCard(ctx: CanvasRenderingContext2D, c: Card) {
ctx.save()
ctx.globalAlpha = c.opacity
ctx.translate(c.x, c.y)
ctx.rotate(c.rot)
ctx.scale(c.scale, c.scale)
const w = CARD_W, h = CARD_H, r = CARD_RADIUS
const x = -w / 2, y = -h / 2
ctx.beginPath()
ctx.moveTo(x + r, y)
ctx.lineTo(x + w - r, y)
ctx.quadraticCurveTo(x + w, y, x + w, y + r)
ctx.lineTo(x + w, y + h - r)
ctx.quadraticCurveTo(x + w, y + h, x + w - r, y + h)
ctx.lineTo(x + r, y + h)
ctx.quadraticCurveTo(x, y + h, x, y + h - r)
ctx.lineTo(x, y + r)
ctx.quadraticCurveTo(x, y, x + r, y)
ctx.closePath()
ctx.strokeStyle = `hsla(${c.hue}, 28%, 62%, 0.9)`
ctx.lineWidth = 1 / c.scale
ctx.stroke()
const grad = ctx.createLinearGradient(x, y, x, y + h)
grad.addColorStop(0, `hsla(${c.hue}, 20%, 40%, 0.18)`)
grad.addColorStop(1, `hsla(${c.hue}, 20%, 20%, 0.06)`)
ctx.fillStyle = grad
ctx.fill()
ctx.restore()
}
export function mountCardCanvas(canvas: HTMLCanvasElement) {
const ctx = canvas.getContext('2d')!
let cards = Array.from({ length: CARD_COUNT }, () => makeCard(canvas.offsetWidth || 800, canvas.offsetHeight || 600))
let raf = 0
let running = true
function resize() {
const dpr = window.devicePixelRatio || 1
canvas.width = canvas.offsetWidth * dpr
canvas.height = canvas.offsetHeight * dpr
ctx.scale(dpr, dpr)
cards = Array.from({ length: CARD_COUNT }, () => makeCard(canvas.offsetWidth, canvas.offsetHeight))
}
function tick() {
if (!running) return
const w = canvas.offsetWidth, h = canvas.offsetHeight
ctx.clearRect(0, 0, w, h)
for (const c of cards) {
c.x += c.vx
c.y += c.vy
c.rot += c.vrot
const pad = 120
if (c.x < -pad || c.x > w + pad || c.y < -pad || c.y > h + pad) {
Object.assign(c, makeCard(w, h))
}
drawCard(ctx, c)
}
raf = requestAnimationFrame(tick)
}
const ro = new ResizeObserver(resize)
ro.observe(canvas)
resize()
tick()
return {
destroy() {
running = false
cancelAnimationFrame(raf)
ro.disconnect()
},
}
}
export function ringGeometry(r: number, pad: number) {
const size = (r + pad) * 2
const c = size / 2
const circ = 2 * Math.PI * r
return { size, c, circ }
}
const RING_STEPS = [
{ target: 0.15, duration: 400 },
{ target: 0.45, duration: 800 },
{ target: 0.72, duration: 600 },
{ target: 0.88, duration: 1000 },
{ target: 0.96, duration: 700 },
]
export function animateRingProgress(onProgress: (p: number) => void): () => void {
let current = 0.025
let stepIdx = 0
let start = performance.now()
let raf = 0
let stopped = false
function ease(t: number) {
return t < 0.5 ? 2 * t * t : -1 + (4 - 2 * t) * t
}
function tick(now: number) {
if (stopped) return
if (stepIdx >= RING_STEPS.length) return
const step = RING_STEPS[stepIdx]
const elapsed = now - start
const t = Math.min(elapsed / step.duration, 1)
const from = stepIdx === 0 ? 0.025 : RING_STEPS[stepIdx - 1].target
current = from + (step.target - from) * ease(t)
onProgress(current)
if (t >= 1) {
stepIdx++
start = now
}
raf = requestAnimationFrame(tick)
}
raf = requestAnimationFrame(tick)
return () => { stopped = true; cancelAnimationFrame(raf) }
}
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { CircleNotch, ArrowClockwise, X } from "phosphor-svelte"; import { CircleNotchIcon, ArrowClockwiseIcon, XIcon } from "phosphor-svelte";
import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte"; import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte";
import { longPress } from "$lib/core/ui/touchscreen"; import { longPress } from "$lib/core/ui/touchscreen";
import type { DownloadQueueItem } from "$lib/types/api"; import type { DownloadQueueItem } from "$lib/types/api";
@@ -78,12 +78,12 @@
<div class="actions"> <div class="actions">
{#if isError} {#if isError}
<button class="action-btn retry" onclick={(e) => { e.stopPropagation(); onRetry(item.chapter.id); }} disabled={isRemoving} title="Retry"> <button class="action-btn retry" onclick={(e) => { e.stopPropagation(); onRetry(item.chapter.id); }} disabled={isRemoving} title="Retry">
{#if isRemoving}<CircleNotch size={11} weight="light" class="anim-spin" />{:else}<ArrowClockwise size={11} weight="bold" />{/if} {#if isRemoving}<CircleNotchIcon size={11} weight="light" class="anim-spin" />{:else}<ArrowClockwiseIcon size={11} weight="bold" />{/if}
</button> </button>
{/if} {/if}
{#if !isActive} {#if !isActive}
<button class="action-btn remove" onclick={(e) => { e.stopPropagation(); onRemove(item.chapter.id); }} disabled={isRemoving} title="Remove"> <button class="action-btn remove" onclick={(e) => { e.stopPropagation(); onRemove(item.chapter.id); }} disabled={isRemoving} title="Remove">
{#if isRemoving}<CircleNotch size={11} weight="light" class="anim-spin" />{:else}<X size={12} weight="light" />{/if} {#if isRemoving}<CircleNotchIcon size={11} weight="light" class="anim-spin" />{:else}<XIcon size={12} weight="light" />{/if}
</button> </button>
{/if} {/if}
</div> </div>
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { CircleNotch } from "phosphor-svelte"; import { CircleNotchIcon } from "phosphor-svelte";
import DownloadItem from "$lib/components/downloads/DownloadItem.svelte"; import DownloadItem from "$lib/components/downloads/DownloadItem.svelte";
import type { DownloadQueueItem } from "$lib/types/api"; import type { DownloadQueueItem } from "$lib/types/api";
@@ -9,16 +9,14 @@
isRunning: boolean; isRunning: boolean;
dequeueing: Set<number>; dequeueing: Set<number>;
selected: Set<number>; selected: Set<number>;
onRemove: (chapterId: number) => void; onRemove: (chapterId: number) => void;
onRetry: (chapterId: number) => void; onRetry: (chapterId: number) => void;
onReorder: (chapterId: number, dir: "up" | "down") => void; onSelect: (chapterId: number, e: MouseEvent) => void;
onReorderEdge: (chapterId: number, edge: "top" | "bottom") => void;
onSelect: (chapterId: number, e: MouseEvent) => void;
} }
const { const {
queue, loading, isRunning, dequeueing, selected, queue, loading, isRunning, dequeueing, selected,
onRemove, onRetry, onReorder, onReorderEdge, onSelect, onRemove, onRetry, onSelect,
}: Props = $props(); }: Props = $props();
</script> </script>
@@ -54,8 +52,6 @@
isSelected={selected.has(item.chapter.id)} isSelected={selected.has(item.chapter.id)}
{onRemove} {onRemove}
{onRetry} {onRetry}
{onReorder}
{onReorderEdge}
{onSelect} {onSelect}
/> />
{/each} {/each}
@@ -165,10 +165,8 @@
isRunning={downloadStore.isRunning} isRunning={downloadStore.isRunning}
dequeueing={downloadStore.dequeueing} dequeueing={downloadStore.dequeueing}
selected={downloadStore.selected} selected={downloadStore.selected}
onRemove={(id) => downloadStore.dequeue(id)} onRemove={(id: number) => downloadStore.dequeue(id)}
onRetry={(id) => downloadStore.retryOne(id)} onRetry={(id: number) => downloadStore.retryOne(id)}
onReorder={(id, dir) => downloadStore.reorder(id, dir)}
onReorderEdge={(id, edge) => downloadStore.reorderToEdge(id, edge)}
onSelect={handleSelect} onSelect={handleSelect}
/> />
</div> </div>
@@ -219,7 +217,7 @@
.move-step { display: flex; align-items: center; border: 1px solid var(--border-dim); border-radius: var(--radius-sm); overflow: hidden; } .move-step { display: flex; align-items: center; border: 1px solid var(--border-dim); border-radius: var(--radius-sm); overflow: hidden; }
.move-step .sel-action-btn { border: none; border-radius: 0; background: none; padding: 3px 6px; } .move-step .sel-action-btn { border: none; border-radius: 0; background: none; padding: 3px 6px; }
.move-step .sel-action-btn:hover:not(:disabled) { background: var(--bg-overlay); border-color: transparent; } .move-step .sel-action-btn:hover:not(:disabled) { background: var(--bg-overlay); border-color: transparent; }
.move-input { width: 28px; background: none; border: none; border-left: 1px solid var(--border-dim); border-right: 1px solid var(--border-dim); color: var(--text-muted); font-family: var(--font-ui); font-size: var(--text-xs); text-align: center; padding: 2px 0; outline: none; -moz-appearance: textfield; } .move-input { width: 28px; background: none; border: none; border-left: 1px solid var(--border-dim); border-right: 1px solid var(--border-dim); color: var(--text-muted); font-family: var(--font-ui); font-size: var(--text-xs); text-align: center; padding: 2px 0; outline: none; -moz-appearance: textfield; appearance: textfield; }
.move-input::-webkit-outer-spin-button, .move-input::-webkit-inner-spin-button { -webkit-appearance: none; } .move-input::-webkit-outer-spin-button, .move-input::-webkit-inner-spin-button { -webkit-appearance: none; }
.move-input:focus { color: var(--text-primary); } .move-input:focus { color: var(--text-primary); }
@@ -25,19 +25,16 @@
let { pkgName, extensionName, iconUrl, cols, cropCovers, statsAlways, anims, sources, onBack, onSettings }: Props = $props(); let { pkgName, extensionName, iconUrl, cols, cropCovers, statsAlways, anims, sources, onBack, onSettings }: Props = $props();
const isLocal = pkgName === '__local__'; const isLocal = $derived(pkgName === '__local__');
// ── Library mode state ──────────────────────────────────────────────
let groups: SourceLibrary[] = $state([]); let groups: SourceLibrary[] = $state([]);
let sourceNodes: SourceNode[] = $state([]); let sourceNodes: SourceNode[] = $state([]);
// ── Local/browse mode state ──────────────────────────────────────────
let localItems: any[] = $state([]); let localItems: any[] = $state([]);
let localPage: number = $state(1); let localPage: number = $state(1);
let localHasNext: boolean = $state(false); let localHasNext: boolean = $state(false);
let localLoadingMore: boolean = $state(false); let localLoadingMore: boolean = $state(false);
// ── Shared state ─────────────────────────────────────────────────────
let loading = $state(true); let loading = $state(true);
let search = $state(""); let search = $state("");
let searchInput = $state(""); let searchInput = $state("");
@@ -49,8 +46,6 @@
const hasActiveFilters = $derived(Object.values(activeFilters).some(Boolean)); const hasActiveFilters = $derived(Object.values(activeFilters).some(Boolean));
let migrateTarget: { sourceId: string; sourceName: string; iconUrl: string; manga: LibraryManga[] } | null = $state(null); let migrateTarget: { sourceId: string; sourceName: string; iconUrl: string; manga: LibraryManga[] } | null = $state(null);
// ── Derived filtered lists ────────────────────────────────────────────
const allManga = $derived(isLocal ? localItems : groups.flatMap(g => g.manga)); const allManga = $derived(isLocal ? localItems : groups.flatMap(g => g.manga));
const filtered = $derived((() => { const filtered = $derived((() => {
@@ -414,7 +409,7 @@
.badge-done { background: rgba(255,255,255,0.18); color: rgba(255,255,255,0.9); border: 1px solid rgba(255,255,255,0.25); } .badge-done { background: rgba(255,255,255,0.18); color: rgba(255,255,255,0.9); border: 1px solid rgba(255,255,255,0.25); }
.badge-dl { background: rgba(0,0,0,0.55); color: rgba(255,255,255,0.8); border: 1px solid rgba(255,255,255,0.18); margin-left: auto; } .badge-dl { background: rgba(0,0,0,0.55); color: rgba(255,255,255,0.8); border: 1px solid rgba(255,255,255,0.18); margin-left: auto; }
.card-title { margin-top: var(--sp-2); font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; height: 2lh; } .card-title { margin-top: var(--sp-2); font-size: var(--text-sm); color: var(--text-secondary); line-height: var(--leading-snug); display: -webkit-box; -webkit-line-clamp: 2; line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; height: 2lh; }
.card.anims .card-title { transition: color var(--t-base); } .card.anims .card-title { transition: color var(--t-base); }
.card-skeleton { padding: 0; } .card-skeleton { padding: 0; }
@@ -104,8 +104,7 @@
async function loadRepos() { async function loadRepos() {
reposLoading = true; reposLoading = true;
try { try {
const d = await (getAdapter() as any).gql<{ settings: { extensionRepos: string[] } }>(`query GetSettings { settings { extensionRepos } }`); repos = await getAdapter().getExtensionRepos();
repos = d.settings.extensionRepos ?? [];
} catch (e) { console.error(e); } } catch (e) { console.error(e); }
finally { reposLoading = false; } finally { reposLoading = false; }
} }
@@ -113,11 +112,11 @@
async function saveRepos(updated: string[], intent: "add" | "remove") { async function saveRepos(updated: string[], intent: "add" | "remove") {
savingRepos = true; savingRepos = true;
try { try {
const d = await (getAdapter() as any).gql<{ setSettings: { settings: { extensionRepos: string[] } } }>(`mutation SetExtensionRepos($repos: [String!]!) { setSettings(input: { settings: { extensionRepos: $repos } }) { settings { extensionRepos } } }`, { repos: updated }); const removed = repos.find(r => !updated.includes(r)) ?? "";
repos = d.setSettings.settings.extensionRepos; repos = await getAdapter().setExtensionRepos(updated);
addToast(intent === "add" addToast(intent === "add"
? { kind: "success", title: "Repo added", body: updated[updated.length - 1] } ? { kind: "success", title: "Repo added", body: updated[updated.length - 1] }
: { kind: "info", title: "Repo removed", body: repos.find(r => !updated.includes(r)) ?? "" } : { kind: "info", title: "Repo removed", body: removed }
); );
} catch (e: any) { } catch (e: any) {
repoError = e instanceof Error ? e.message : "Failed to save"; repoError = e instanceof Error ? e.message : "Failed to save";
@@ -138,13 +137,11 @@
async function mutate(pkgName: string, op: "install" | "update" | "uninstall") { async function mutate(pkgName: string, op: "install" | "update" | "uninstall") {
working = new Set(working).add(pkgName); working = new Set(working).add(pkgName);
const label = extensions.find((e) => e.pkgName === pkgName)?.name ?? pkgName; const label = extensions.find((e) => e.pkgName === pkgName)?.name ?? pkgName;
const gqlArgs = {
install: { id: pkgName, install: true },
update: { id: pkgName, update: true },
uninstall: { id: pkgName, uninstall: true },
}[op];
try { try {
await getAdapter()[{ install: 'installExtension', update: 'updateExtension', uninstall: 'uninstallExtension' }[op] as 'installExtension'](pkgName); const adapter = getAdapter();
if (op === "install") await adapter.installExtension(pkgName);
else if (op === "update") await adapter.updateExtension(pkgName);
else await adapter.uninstallExtension(pkgName);
await load(); await load();
addToast({ addToast({
install: { kind: "download" as const, title: "Extension installed", body: label }, install: { kind: "download" as const, title: "Extension installed", body: label },
@@ -17,7 +17,7 @@ export type SourceNode = {
id: string; id: string;
displayName: string; displayName: string;
isConfigurable: boolean; isConfigurable: boolean;
extension: { pkgName: string }; extension?: { pkgName: string };
}; };
export function libraryByExtension( export function libraryByExtension(
@@ -66,17 +66,7 @@
editKey = null; editKey = null;
listOpen = null; listOpen = null;
try { try {
const d = await (getAdapter() as any).gql<{ source: { preferences: Preference[] } }>( prefs = (await getAdapter().getSourceSettings(src.id)) as Preference[];
`query GetSourceSettings($id: LongString!) { source(id: $id) { preferences {
... on CheckBoxPreference { type: __typename CheckBoxTitle: title CheckBoxSummary: summary CheckBoxDefault: default CheckBoxCurrentValue: currentValue key }
... on SwitchPreference { type: __typename SwitchPreferenceTitle: title SwitchPreferenceSummary: summary SwitchPreferenceDefault: default SwitchPreferenceCurrentValue: currentValue key }
... on ListPreference { type: __typename ListPreferenceTitle: title ListPreferenceSummary: summary ListPreferenceDefault: default ListPreferenceCurrentValue: currentValue entries entryValues key }
... on EditTextPreference { type: __typename EditTextPreferenceTitle: title EditTextPreferenceSummary: summary EditTextPreferenceDefault: default EditTextPreferenceCurrentValue: currentValue dialogTitle dialogMessage key }
... on MultiSelectListPreference { type: __typename MultiSelectListPreferenceTitle: title MultiSelectListPreferenceSummary: summary MultiSelectListPreferenceDefault: default MultiSelectListPreferenceCurrentValue: currentValue entries entryValues key }
} } }`,
{ id: String(src.id) },
);
prefs = d.source.preferences ?? [];
} catch (e: any) { } catch (e: any) {
addToast({ kind: "error", title: "Failed to load settings", body: e?.message ?? "" }); addToast({ kind: "error", title: "Failed to load settings", body: e?.message ?? "" });
} finally { } finally {
@@ -86,24 +76,9 @@
async function save(position: number, changeType: string, value: unknown) { async function save(position: number, changeType: string, value: unknown) {
if (!activeSource) return; if (!activeSource) return;
const pref = prefs[position]; saving = prefs[position].key;
saving = pref.key;
try { try {
await (getAdapter() as any).gql( prefs = (await getAdapter().updateSourcePreference(activeSource.id, position, changeType, value)) as Preference[];
`mutation UpdateSourcePreference($source: LongString!, $change: SourcePreferenceChangeInput!) { updateSourcePreference(input: { source: $source, change: $change }) { source { id } } }`,
{ source: String(activeSource.id), change: { position, [changeType]: value } },
);
const d = await (getAdapter() as any).gql<{ source: { preferences: Preference[] } }>(
`query GetSourceSettings($id: LongString!) { source(id: $id) { preferences {
... on CheckBoxPreference { type: __typename CheckBoxTitle: title CheckBoxCurrentValue: currentValue key }
... on SwitchPreference { type: __typename SwitchPreferenceTitle: title SwitchPreferenceCurrentValue: currentValue key }
... on ListPreference { type: __typename ListPreferenceTitle: title ListPreferenceCurrentValue: currentValue entries entryValues key }
... on EditTextPreference { type: __typename EditTextPreferenceTitle: title EditTextPreferenceCurrentValue: currentValue key }
... on MultiSelectListPreference { type: __typename MultiSelectListPreferenceTitle: title MultiSelectListPreferenceCurrentValue: currentValue entries entryValues key }
} } }`,
{ id: String(activeSource.id) },
);
prefs = d.source.preferences ?? [];
} catch (e: any) { } catch (e: any) {
addToast({ kind: "error", title: "Failed to save", body: e?.message ?? "" }); addToast({ kind: "error", title: "Failed to save", body: e?.message ?? "" });
} finally { } finally {
@@ -112,12 +112,10 @@
for (let i = 0; i < entries.length; i++) { for (let i = 0; i < entries.length; i++) {
entries[i] = { ...entries[i], status: "searching" }; entries[i] = { ...entries[i], status: "searching" };
try { try {
const d = await gql<{ fetchSourceManga: { mangas: Manga[] } }>(FETCH_SOURCE_MANGA, { const mangas = await getAdapter().searchManga(entries[i].manga.title, target.id);
source: target.id, type: "SEARCH", page: 1, query: entries[i].manga.title, const results = mangas
}); .map((m: Manga) => ({ manga: m, similarity: titleSimilarity(entries[i].manga.title, m.title) }))
const results = d.fetchSourceManga.mangas .sort((a: { manga: Manga; similarity: number }, b: { manga: Manga; similarity: number }) => b.similarity - a.similarity);
.map(m => ({ manga: m, similarity: titleSimilarity(entries[i].manga.title, m.title) }))
.sort((a, b) => b.similarity - a.similarity);
if (results.length > 0 && results[0].similarity > 0.3) { if (results.length > 0 && results[0].similarity > 0.3) {
entries[i] = { ...entries[i], match: results[0].manga, similarity: results[0].similarity, status: "found" }; entries[i] = { ...entries[i], match: results[0].manga, similarity: results[0].similarity, status: "found" };
@@ -147,17 +145,15 @@
for (const entry of toMigrate) { for (const entry of toMigrate) {
const idx = entries.indexOf(entry); const idx = entries.indexOf(entry);
try { try {
const d = await gql<{ fetchChapters: { chapters: Chapter[] } }>(FETCH_CHAPTERS, { mangaId: entry.match!.id }); const newChaps = await getAdapter().fetchChapters(String(entry.match!.id));
const newChaps = d.fetchChapters.chapters;
const toMarkRead: number[] = []; const toMarkRead: number[] = [];
const toMarkBookmarked: number[] = [];
for (const nc of newChaps) { // LibraryManga has no chapter detail — use unreadCount as a proxy:
const oldIdx = entries[idx].manga; // if unreadCount < total fetched, the user had read some, so carry them all over.
if (oldIdx) { const hadReads = entries[idx].manga.unreadCount < newChaps.length;
toMarkRead.push(nc.id); if (hadReads) {
} for (const nc of newChaps) toMarkRead.push(nc.id);
} }
if (toMarkRead.length) if (toMarkRead.length)
@@ -183,7 +179,7 @@
} }
</script> </script>
<div class="overlay" onclick={(e) => { if (e.target === e.currentTarget && phase !== "migrating") onClose(); }}> <div class="overlay" role="presentation" onclick={(e) => { if (e.target === e.currentTarget && phase !== "migrating") onClose(); }} onkeydown={(e) => { if (e.key === "Escape" && phase !== "migrating") onClose(); }}>
<div class="modal"> <div class="modal">
<div class="modal-header"> <div class="modal-header">
+3 -2
View File
@@ -5,6 +5,7 @@
import { getAdapter } from '$lib/request-manager' import { getAdapter } from '$lib/request-manager'
import { libraryState } from '$lib/state/library.svelte' import { libraryState } from '$lib/state/library.svelte'
import { homeState, setHeroSlot } from '$lib/state/home.svelte' import { homeState, setHeroSlot } from '$lib/state/home.svelte'
import { openReaderForChapter } from '$lib/state/series.svelte'
import { historyState } from '$lib/state/history.svelte' import { historyState } from '$lib/state/history.svelte'
import type { ReadSession } from '$lib/types/history' import type { ReadSession } from '$lib/types/history'
import HeroStage from '$lib/components/home/HeroStage.svelte' import HeroStage from '$lib/components/home/HeroStage.svelte'
@@ -107,7 +108,7 @@
heroAllChapters = all heroAllChapters = all
const lastReadIdx = heroEntry const lastReadIdx = heroEntry
? all.findLastIndex(c => c.id === heroEntry!.endChapterId) ? all.findLastIndex(c => c.id === heroEntry!.endChapterId)
: all.findLastIndex(c => c.isRead) : all.findLastIndex(c => c.read)
const startIdx = Math.max(0, lastReadIdx) const startIdx = Math.max(0, lastReadIdx)
heroChapters = all.slice(startIdx, startIdx + 5) heroChapters = all.slice(startIdx, startIdx + 5)
} catch { } catch {
@@ -129,7 +130,7 @@
if (!heroEntry && heroManga) { goto(`/series/${heroManga.id}`); return } if (!heroEntry && heroManga) { goto(`/series/${heroManga.id}`); return }
if (!heroEntry) return if (!heroEntry) return
const target = heroAllChapters.find(c => c.id === heroEntry!.endChapterId) ?? heroAllChapters[0] const target = heroAllChapters.find(c => c.id === heroEntry!.endChapterId) ?? heroAllChapters[0]
if (target) openChapter(target) if (target) openReaderForChapter(target, heroManga ?? null)
} }
function cycleNext() { activeIdx = (activeIdx + 1) % TOTAL_SLOTS; heroChapters = []; heroAllChapters = [] } function cycleNext() { activeIdx = (activeIdx + 1) % TOTAL_SLOTS; heroChapters = []; heroAllChapters = [] }
+24 -17
View File
@@ -9,6 +9,7 @@ export interface RecommendedManga {
const TOP_GENRES = 6 const TOP_GENRES = 6
const TARGET_PER_GENRE = 20 const TARGET_PER_GENRE = 20
const FALLBACK_GENRES = ['Action', 'Adventure', 'Fantasy', 'Romance', 'Comedy', 'Drama']
export function topGenres(history: ReadSession[], libraryManga: Manga[]): string[] { export function topGenres(history: ReadSession[], libraryManga: Manga[]): string[] {
const byId = new Map(libraryManga.map(m => [m.id, m])) const byId = new Map(libraryManga.map(m => [m.id, m]))
@@ -16,8 +17,8 @@ export function topGenres(history: ReadSession[], libraryManga: Manga[]): string
for (const session of history) { for (const session of history) {
const manga = byId.get(session.mangaId) const manga = byId.get(session.mangaId)
if (!manga?.genre?.length) continue if (!manga?.tags?.length) continue
for (const g of manga.genre) { for (const g of manga.tags) {
const key = g.toLowerCase() const key = g.toLowerCase()
const existing = tally.get(key) const existing = tally.get(key)
if (existing) existing.count++ if (existing) existing.count++
@@ -25,10 +26,12 @@ export function topGenres(history: ReadSession[], libraryManga: Manga[]): string
} }
} }
return [...tally.values()] const derived = [...tally.values()]
.sort((a, b) => b.count - a.count) .sort((a, b) => b.count - a.count)
.slice(0, TOP_GENRES) .slice(0, TOP_GENRES)
.map(e => e.original) .map(e => e.original)
return derived.length > 0 ? derived : FALLBACK_GENRES
} }
export async function fetchRecommendations( export async function fetchRecommendations(
@@ -36,20 +39,22 @@ export async function fetchRecommendations(
libraryManga: Manga[], libraryManga: Manga[],
signal?: AbortSignal, signal?: AbortSignal,
): Promise<RecommendedManga[]> { ): Promise<RecommendedManga[]> {
if (!history.length || !libraryManga.length) return []
const genres = topGenres(history, libraryManga) const genres = topGenres(history, libraryManga)
if (!genres.length) return []
const adapter = getAdapter() const adapter = getAdapter() as any
const globalSeen = new Set<number>(libraryManga.map(m => m.id)) const globalSeen = new Set<number>(libraryManga.map(m => m.id))
const perGenre = await Promise.all( const perGenre = await Promise.all(
genres.map(async genre => { genres.map(async genre => {
if (signal?.aborted) return [] if (signal?.aborted) return []
try { try {
const { items } = await adapter.getMangaList({ tags: [genre], inLibrary: false }) const { items } = await adapter.getMangasByGenre(
return items { genre: { like: `%${genre}%` } },
TARGET_PER_GENRE,
0,
signal,
)
return items as Manga[]
} catch { } catch {
return [] return []
} }
@@ -57,19 +62,21 @@ export async function fetchRecommendations(
) )
const merged: Manga[] = [] const merged: Manga[] = []
for (const items of perGenre) { outer: for (const items of perGenre) {
for (const m of items) { for (const m of items) {
if (signal?.aborted) break outer
if (globalSeen.has(m.id)) continue if (globalSeen.has(m.id)) continue
globalSeen.add(m.id) globalSeen.add(m.id)
merged.push(m) merged.push(m)
if (merged.length >= genres.length * TARGET_PER_GENRE) break
} }
} }
return merged.map(m => ({ return merged.map(m => {
manga: m, const mTagsLower = (m.tags ?? []).map(g => g.toLowerCase())
matchedGenres: (m.genre ?? []).filter(g => const matched = genres.filter(g => mTagsLower.includes(g.toLowerCase()))
genres.some(tg => tg.toLowerCase() === g.toLowerCase()) return {
), manga: m,
})) matchedGenres: matched.length > 0 ? matched : [genres[0]],
}
})
} }
+1 -2
View File
@@ -393,7 +393,7 @@
{:else} {:else}
<LibraryToolbar <LibraryToolbar
tab={libraryState.tab} tab={libraryState.tab}
tabSortMode={libraryState.tabSort[libraryState.tab]?.mode ?? 'alphabetical'} tabSortMode={libraryState.tabSort[libraryState.tab]?.mode ?? 'az'}
tabSortDir={libraryState.tabSort[libraryState.tab]?.dir ?? 'asc'} tabSortDir={libraryState.tabSort[libraryState.tab]?.dir ?? 'asc'}
tabStatus={libraryState.tabStatus[libraryState.tab] ?? 'ALL'} tabStatus={libraryState.tabStatus[libraryState.tab] ?? 'ALL'}
tabFilters={libraryState.tabFilters[libraryState.tab] ?? {}} tabFilters={libraryState.tabFilters[libraryState.tab] ?? {}}
@@ -423,7 +423,6 @@
onFilterPanelToggle={() => filterPanelOpen = !filterPanelOpen} onFilterPanelToggle={() => filterPanelOpen = !filterPanelOpen}
onRefresh={startRefresh} onRefresh={startRefresh}
onCancelRefresh={cancelRefresh} onCancelRefresh={cancelRefresh}
onRefreshCategory={refreshCategory}
onOpenDownloadsFolder={openDownloadsFolder} onOpenDownloadsFolder={openDownloadsFolder}
onTabDragStart={onTabDragStart} onTabDragStart={onTabDragStart}
onTabDragOver={onTabDragOver} onTabDragOver={onTabDragOver}
+10 -15
View File
@@ -1,5 +1,7 @@
<script lang="ts"> <script lang="ts">
import { CheckSquare, Trash, Folder } from 'phosphor-svelte' import { CheckSquare, Trash, Folder } from 'phosphor-svelte'
import Thumbnail from '$lib/components/shared/manga/Thumbnail.svelte'
import { settingsState } from '$lib/state/settings.svelte'
import type { Manga, Category } from '$lib/types' import type { Manga, Category } from '$lib/types'
interface Props { interface Props {
@@ -24,14 +26,10 @@
onCardClick, onCardContextMenu, onSelectAll, onExitSelect, onBulkRemove, onBulkMove, onCardClick, onCardContextMenu, onSelectAll, onExitSelect, onBulkRemove, onBulkMove,
}: Props = $props() }: Props = $props()
const THUMB_BASE = 'http://127.0.0.1:4567'
let movePanelOpen = $state(false) let movePanelOpen = $state(false)
function coverUrl(m: Manga) { const statsAlways = $derived(settingsState.settings.libraryStatsAlways ?? false)
const url = m.thumbnailUrl ?? '' const cropCovers = $derived(settingsState.settings.libraryCropCovers ?? true)
return url.startsWith('http') ? url : `${THUMB_BASE}${url}`
}
function onDocDown(e: MouseEvent) { function onDocDown(e: MouseEvent) {
if (movePanelOpen && !(e.target as HTMLElement).closest('.move-wrap')) movePanelOpen = false if (movePanelOpen && !(e.target as HTMLElement).closest('.move-wrap')) movePanelOpen = false
@@ -120,17 +118,12 @@
class="card" class="card"
class:card-selected={isSelected} class:card-selected={isSelected}
class:select-mode={selectMode} class:select-mode={selectMode}
class:stats-always={statsAlways}
onclick={(e) => onCardClick(e, m)} onclick={(e) => onCardClick(e, m)}
oncontextmenu={(e) => onCardContextMenu(e, m)} oncontextmenu={(e) => onCardContextMenu(e, m)}
> >
<div class="cover-wrap" class:completed={isCompleted}> <div class="cover-wrap" class:completed={isCompleted} class:cover-contain={!cropCovers}>
<img <Thumbnail src={m.thumbnailUrl} alt={m.title} class="cover" id={m.id} />
class="cover"
src={coverUrl(m)}
alt={m.title}
draggable="false"
loading="lazy"
/>
<div class="overlay"> <div class="overlay">
<div class="badges"> <div class="badges">
{#if isCompleted} {#if isCompleted}
@@ -247,7 +240,8 @@
} }
.cover-wrap.completed { box-shadow: inset 0 -2px 0 0 var(--accent); } .cover-wrap.completed { box-shadow: inset 0 -2px 0 0 var(--accent); }
.cover { width: 100%; height: 100%; object-fit: cover; display: block; } :global(.cover) { width: 100%; height: 100%; object-fit: cover; display: block; }
.cover-contain :global(.cover) { object-fit: contain; }
.overlay { .overlay {
position: absolute; bottom: 0; left: 0; right: 0; z-index: 2; position: absolute; bottom: 0; left: 0; right: 0; z-index: 2;
@@ -257,6 +251,7 @@
transition: opacity 0.18s ease; transition: opacity 0.18s ease;
} }
.card:not(.select-mode):hover .overlay { opacity: 1; } .card:not(.select-mode):hover .overlay { opacity: 1; }
.stats-always .overlay { opacity: 1; }
.badges { display: flex; align-items: flex-end; justify-content: space-between; gap: 4px; flex-wrap: wrap; } .badges { display: flex; align-items: flex-end; justify-content: space-between; gap: 4px; flex-wrap: wrap; }
.badge { .badge {
@@ -4,21 +4,19 @@
SortAscending, CaretUp, CaretDown, ArrowsClockwise, Star, X, CheckSquare, SortAscending, CaretUp, CaretDown, ArrowsClockwise, Star, X, CheckSquare,
} from "phosphor-svelte"; } from "phosphor-svelte";
import LibraryFilters from "./LibraryFilters.svelte"; import LibraryFilters from "./LibraryFilters.svelte";
import type { Category } from "@types"; import type { Category } from "$lib/types";
import type { LibrarySortMode, LibrarySortDir, LibraryStatusFilter, LibraryContentFilter } from "@store/state.svelte"; import type { LibrarySortOption, LibrarySortDir, LibraryStatusFilter, LibraryContentFilter } from "$lib/state/library.svelte";
interface Props { interface Props {
tab: string; tab: string;
tabSortMode: LibrarySortMode; tabSortMode: LibrarySortOption;
tabSortDir: LibrarySortDir; tabSortDir: LibrarySortDir;
tabStatus: LibraryStatusFilter; tabStatus: LibraryStatusFilter;
tabFilters: Partial<Record<LibraryContentFilter, boolean>>; tabFilters: Partial<Record<LibraryContentFilter, boolean>>;
hasActiveFilters: boolean; hasActiveFilters: boolean;
anims: boolean; anims?: boolean;
visibleCategories: Category[]; visibleCategories: Category[];
visibleTabIds: string[]; visibleTabIds: string[];
virtualTabIds: string[];
folderTabIds: string[];
completedCatId: number | null; completedCatId: number | null;
counts: Record<string, number>; counts: Record<string, number>;
search: string; search: string;
@@ -35,7 +33,7 @@
tabsEl: HTMLDivElement; tabsEl: HTMLDivElement;
onSearchChange: (v: string) => void; onSearchChange: (v: string) => void;
onTabChange: (f: string) => void; onTabChange: (f: string) => void;
onSortChange: (mode: LibrarySortMode) => void; onSortChange: (mode: LibrarySortOption) => void;
onSortDirToggle: () => void; onSortDirToggle: () => void;
onStatusChange: (s: LibraryStatusFilter) => void; onStatusChange: (s: LibraryStatusFilter) => void;
onFilterToggle: (f: LibraryContentFilter) => void; onFilterToggle: (f: LibraryContentFilter) => void;
@@ -44,7 +42,6 @@
onFilterPanelToggle: () => void; onFilterPanelToggle: () => void;
onRefresh: () => void; onRefresh: () => void;
onCancelRefresh: () => void; onCancelRefresh: () => void;
onRefreshCategory: (catId: number) => void;
onOpenDownloadsFolder: () => void; onOpenDownloadsFolder: () => void;
onTabDragStart: (e: DragEvent, id: string) => void; onTabDragStart: (e: DragEvent, id: string) => void;
onTabDragOver: (e: DragEvent, id: string, idx: number) => void; onTabDragOver: (e: DragEvent, id: string, idx: number) => void;
@@ -55,13 +52,13 @@
let { let {
tab, tabSortMode, tabSortDir, tabStatus, tabFilters, hasActiveFilters, tab, tabSortMode, tabSortDir, tabStatus, tabFilters, hasActiveFilters,
anims, visibleCategories, visibleTabIds, virtualTabIds, folderTabIds, completedCatId, anims = false, visibleCategories, visibleTabIds, completedCatId,
counts, search, refreshing, refreshProgress, refreshDone, refreshingCatId, counts, search, refreshing, refreshProgress, refreshDone, refreshingCatId,
activeDragKind, dragInsertIdx, dragTabId, dragOverTabId, sortPanelOpen, filterPanelOpen, activeDragKind, dragInsertIdx, dragTabId, dragOverTabId, sortPanelOpen, filterPanelOpen,
tabsEl = $bindable(), tabsEl = $bindable(),
onSearchChange, onTabChange, onSortChange, onSortDirToggle, onStatusChange, onSearchChange, onTabChange, onSortChange, onSortDirToggle, onStatusChange,
onFilterToggle, onFiltersClear, onSortPanelToggle, onFilterPanelToggle, onFilterToggle, onFiltersClear, onSortPanelToggle, onFilterPanelToggle,
onRefresh, onCancelRefresh, onRefreshCategory, onOpenDownloadsFolder, onRefresh, onCancelRefresh, onOpenDownloadsFolder,
onTabDragStart, onTabDragOver, onTabDragLeave, onTabDrop, onTabDragEnd, onTabDragStart, onTabDragOver, onTabDragLeave, onTabDrop, onTabDragEnd,
}: Props = $props(); }: Props = $props();
@@ -85,18 +82,18 @@
else if (ol + ow > pl + cw) tabsEl.scrollTo({ left: ol + ow - cw, behavior: "smooth" }); else if (ol + ow > pl + cw) tabsEl.scrollTo({ left: ol + ow - cw, behavior: "smooth" });
}); });
const SORT_LABELS: Record<LibrarySortMode, string> = { const SORT_LABELS: Record<LibrarySortOption, string> = {
az: "AZ", az: "AZ",
unreadCount: "Unread chapters", unreadCount: "Unread chapters",
totalChapters: "Total chapters", totalChapters: "Total chapters",
recentlyAdded: "Recently added", dateAdded: "Recently added",
recentlyRead: "Recently read", lastRead: "Recently read",
latestFetched: "Latest fetched chapter", latestFetched: "Latest fetched chapter",
latestUploaded: "Latest uploaded chapter", latestUploaded: "Latest uploaded chapter",
}; };
const ALL_SORT_MODES: LibrarySortMode[] = [ const ALL_SORT_MODES: LibrarySortOption[] = [
"az", "unreadCount", "totalChapters", "recentlyAdded", "recentlyRead", "latestFetched", "latestUploaded", "az", "unreadCount", "totalChapters", "dateAdded", "lastRead", "latestFetched", "latestUploaded",
]; ];
</script> </script>
+173 -353
View File
@@ -1,10 +1,27 @@
<script lang="ts"> <script lang="ts">
import { readerState } from "$lib/state/reader.svelte"; import { readerState } from "$lib/state/reader.svelte";
import { settingsState } from "$lib/state/settings.svelte";
import { createPinchTracker } from "$lib/components/reader/lib/pinchZoom"; import { createPinchTracker } from "$lib/components/reader/lib/pinchZoom";
import type { PinchTracker } from "$lib/components/reader/lib/pinchZoom"; import type { PinchTracker } from "$lib/components/reader/lib/pinchZoom";
import type { StripChapter } from "$lib/components/reader/lib/scrollHandler"; import { READ_LINE_PCT } from "$lib/components/reader/lib/scrollHandler";
import { settingsState } from "$lib/state/settings.svelte";
import LongstripViewer from "$lib/components/reader/viewer/LongstripViewer.svelte";
import SingleViewer from "$lib/components/reader/viewer/SingleViewer.svelte";
import DoubleViewer from "$lib/components/reader/viewer/DoubleViewer.svelte";
export interface StripChapter {
chapterId: number;
chapterName: string;
urls: string[];
}
type FlatPage = {
chapterId: number;
chapterName: string;
localIndex: number;
url: string;
total: number;
};
interface Props { interface Props {
style: string; style: string;
imgCls: string; imgCls: string;
@@ -14,10 +31,10 @@
pageReady: boolean; pageReady: boolean;
pageGroups: number[][]; pageGroups: number[][];
currentGroup: number[]; currentGroup: number[];
stripToRender: StripChapter[];
fadingOut: boolean; fadingOut: boolean;
tapToToggleBar: boolean; tapToToggleBar: boolean;
pinchZoomEnabled: boolean; pinchZoomEnabled: boolean;
useBlob: boolean;
barPosition: "top" | "left" | "right"; barPosition: "top" | "left" | "right";
onGetZoom: () => number; onGetZoom: () => number;
onSetZoom: (z: number) => void; onSetZoom: (z: number) => void;
@@ -26,139 +43,151 @@
onWheel: (e: WheelEvent) => void; onWheel: (e: WheelEvent) => void;
onToggleUi: () => void; onToggleUi: () => void;
bindContainer: (el: HTMLDivElement) => void; bindContainer: (el: HTMLDivElement) => void;
onPageChange: (page: number) => void;
onChapterChange: (chapterId: number) => void;
onCenterIdxChange:(flatIdx: number) => void;
onMarkRead: (chapterId: number) => void;
onAppend: () => void;
} }
const { const {
style, imgCls, effectiveWidth, loading, error, pageReady, style, imgCls, effectiveWidth, loading, error, pageReady,
pageGroups, currentGroup, stripToRender, fadingOut, pageGroups, currentGroup, fadingOut,
tapToToggleBar, pinchZoomEnabled, barPosition, tapToToggleBar, pinchZoomEnabled, useBlob, barPosition,
onGetZoom, onSetZoom, resolveUrl, onTap, onWheel, onToggleUi, bindContainer, onGetZoom, onSetZoom, resolveUrl, onTap, onWheel, onToggleUi, bindContainer,
onPageChange, onChapterChange, onCenterIdxChange, onMarkRead, onAppend,
}: Props = $props(); }: Props = $props();
const LOAD_RADIUS = 5; let stripChunks = $state<StripChapter[]>([]);
const UNLOAD_RADIUS = 10;
type FlatPage = { chapterId: number; chapterName: string; localIndex: number; url: string; total: number }; export function loadStrip(chapterId: number, chapterName: string, urls: string[], resumeTo = 0) {
stripChunks = [{ chapterId, chapterName, urls }];
if (resumeTo > 1) {
setTimeout(() => scrollToFlatIndex(resumeTo - 1), 0);
}
}
export async function appendStripChunk(chapterId: number, chapterName: string, urls: string[]) {
if (stripChunks.some(c => c.chapterId === chapterId)) return;
stripChunks = [...stripChunks, { chapterId, chapterName, urls }];
}
export function getStripChunks(): StripChapter[] {
return stripChunks;
}
const flatPages = $derived.by<FlatPage[]>(() => { const flatPages = $derived.by<FlatPage[]>(() => {
const out: FlatPage[] = []; const out: FlatPage[] = [];
for (const chunk of stripToRender) { for (const chunk of stripChunks) {
for (let i = 0; i < chunk.urls.length; i++) { for (let i = 0; i < chunk.urls.length; i++) {
out.push({ chapterId: chunk.chapterId, chapterName: chunk.chapterName, localIndex: i, url: chunk.urls[i], total: chunk.urls.length }); out.push({
chapterId: chunk.chapterId,
chapterName: chunk.chapterName,
localIndex: i,
url: chunk.urls[i],
total: chunk.urls.length,
});
} }
} }
return out; return out;
}); });
let loadedSet = $state(new Set<number>()); let currentSrc = $state<string | null>(null);
let resolvedSrc = $state<Record<number, string>>({}); let currentGroupSrcs = $state<(string | null)[]>([]);
let revokeQueue: string[] = [];
let observer: IntersectionObserver | null = null;
const elementIndex = new Map<Element, number>();
let viewportCenter = $state(0);
function scheduleRevoke(src: string) {
if (!src || !src.startsWith("blob:")) return;
revokeQueue.push(src);
requestAnimationFrame(() => {
const url = revokeQueue.shift();
if (url) { try { URL.revokeObjectURL(url); } catch {} }
});
}
function loadPage(idx: number) {
if (loadedSet.has(idx)) return;
const page = flatPages[idx];
if (!page) return;
const newSet = new Set(loadedSet);
newSet.add(idx);
loadedSet = newSet;
const priority = (page.localIndex < 8 && page.chapterId === flatPages[0]?.chapterId) ? 8 - page.localIndex : 0;
resolveUrl(page.url, priority).then(src => {
if (loadedSet.has(idx)) {
resolvedSrc = { ...resolvedSrc, [idx]: src };
} else {
scheduleRevoke(src);
}
});
}
function unloadPage(idx: number) {
if (!loadedSet.has(idx)) return;
const newSet = new Set(loadedSet);
newSet.delete(idx);
loadedSet = newSet;
const oldSrc = resolvedSrc[idx];
if (oldSrc) {
const next = { ...resolvedSrc };
delete next[idx];
resolvedSrc = next;
scheduleRevoke(oldSrc);
}
}
function recalcWindow() {
const center = viewportCenter;
const lo = center - LOAD_RADIUS;
const hi = center + LOAD_RADIUS;
const evictLo = center - UNLOAD_RADIUS;
const evictHi = center + UNLOAD_RADIUS;
for (let i = 0; i < flatPages.length; i++) {
if (i >= lo && i <= hi) loadPage(i);
else if (i < evictLo || i > evictHi) unloadPage(i);
}
}
$effect(() => { void viewportCenter; recalcWindow(); });
$effect(() => { void flatPages.length; recalcWindow(); });
function setupObserver(containerEl: HTMLElement) {
observer?.disconnect();
elementIndex.clear();
observer = new IntersectionObserver(
(entries) => {
let best = -1;
let bestRatio = -1;
for (const entry of entries) {
const idx = elementIndex.get(entry.target);
if (idx === undefined) continue;
if (entry.isIntersecting && entry.intersectionRatio > bestRatio) {
bestRatio = entry.intersectionRatio;
best = idx;
}
}
if (best >= 0 && best !== viewportCenter) viewportCenter = best;
},
{ root: containerEl, rootMargin: "0px", threshold: [0, 0.1, 0.5, 1.0] },
);
}
function observePage(el: HTMLDivElement, idx: number) {
elementIndex.set(el, idx);
observer?.observe(el);
return {
update(newIdx: number) { elementIndex.set(el, newIdx); },
destroy() { observer?.unobserve(el); elementIndex.delete(el); },
};
}
let lastChapterId = 0;
$effect(() => { $effect(() => {
const chapterId = readerState.activeChapter?.id ?? 0; if (style === "longstrip" || !pageReady) return;
if (chapterId === lastChapterId) return; const pageNum = readerState.pageNumber;
lastChapterId = chapterId; const urls = readerState.pageUrls;
loadedSet = new Set<number>(); const group = currentGroup;
resolvedSrc = {}; currentSrc = null;
const resume = readerState.resumePage; currentGroupSrcs = group.map(() => null);
viewportCenter = resume > 1 ? resume - 1 : 0; let cancelled = false;
if (style === "double") {
group.forEach((pg, i) => {
const url = urls[pg - 1];
if (!url) return;
resolveUrl(url, 999).then(src => {
if (cancelled) return;
currentGroupSrcs = currentGroupSrcs.map((s, j) => j === i ? src : s);
});
});
} else {
const url = urls[pageNum - 1];
if (url) resolveUrl(url, 999).then(src => { if (!cancelled) currentSrc = src; });
}
return () => { cancelled = true; };
}); });
$effect(() => {
void readerState.pageNumber;
if (style !== "longstrip" && containerEl) containerEl.scrollTo(0, 0);
});
let lastTrackedPage = 0;
let lastTrackedChapter = 0;
function handleScroll() {
if (style !== "longstrip" || !containerEl || !flatPages.length) return;
const containerRect = containerEl.getBoundingClientRect();
const readY = containerRect.top + containerEl.clientHeight * READ_LINE_PCT;
const slots = containerEl.querySelectorAll<HTMLElement>(".strip-slot");
let centerFlatIdx = 0;
let bestDist = Infinity;
slots.forEach((slot, idx) => {
const rect = slot.getBoundingClientRect();
const mid = (rect.top + rect.bottom) / 2;
const dist = Math.abs(mid - readY);
if (dist < bestDist) { bestDist = dist; centerFlatIdx = idx; }
});
onCenterIdxChange(centerFlatIdx);
const page = flatPages[centerFlatIdx];
if (!page) return;
const localPage = page.localIndex + 1;
if (localPage !== lastTrackedPage || page.chapterId !== lastTrackedChapter) {
lastTrackedPage = localPage;
lastTrackedChapter = page.chapterId;
onPageChange(localPage);
onChapterChange(page.chapterId);
}
for (const chunk of stripChunks) {
const lastLocalIdx = chunk.urls.length - 1;
let flatLastIdx = -1;
for (let i = 0; i < flatPages.length; i++) {
if (flatPages[i].chapterId === chunk.chapterId && flatPages[i].localIndex === lastLocalIdx) {
flatLastIdx = i;
break;
}
}
if (flatLastIdx < 0) continue;
const lastSlot = slots[flatLastIdx];
if (!lastSlot) continue;
const lastRect = lastSlot.getBoundingClientRect();
if (lastRect.bottom < readY) onMarkRead(chunk.chapterId);
}
const scrollBottom = containerEl.scrollTop + containerEl.clientHeight;
const scrollTotal = containerEl.scrollHeight;
if (scrollTotal - scrollBottom < containerEl.clientHeight * 1.5) onAppend();
}
const INSPECT_ZOOM_STEP = 0.15; const INSPECT_ZOOM_STEP = 0.15;
const INSPECT_ZOOM_MAX = 8; const INSPECT_ZOOM_MAX = 8;
let containerEl: HTMLDivElement; let containerEl = $state<HTMLDivElement | undefined>();
let stripRef: LongstripViewer | undefined = $state();
export function captureAnchor() { stripRef?.captureAnchor(); }
export function restoreAnchor() { stripRef?.restoreAnchor(); }
export function notifyScrollCenter(idx: number) { stripRef?.notifyScrollCenter(idx); }
export async function scrollToFlatIndex(idx: number) { await stripRef?.scrollToFlatIndex(idx); }
function getInspectImageEl(): HTMLElement | null { function getInspectImageEl(): HTMLElement | null {
if (!containerEl) return null; if (!containerEl) return null;
@@ -183,61 +212,6 @@
let inspectPanStartX = 0; let inspectPanStartX = 0;
let inspectPanStartY = 0; let inspectPanStartY = 0;
let stripDragging = $state(false);
let stripDragMoved = false;
let stripDragStartY = 0;
let stripScrollStart = 0;
let autoScrollPaused = false;
let autoScrollPauseTimer: ReturnType<typeof setTimeout> | null = null;
let midScrollActive = $state(false);
let midScrollOriginY = $state(0);
let midScrollCurrentY = 0;
let midScrollDisplayLevel = $state(0);
let midScrollRaf: number | null = null;
function startMidScroll(originY: number) {
midScrollActive = true;
midScrollOriginY = originY;
midScrollDisplayLevel = 0;
if (midScrollRaf) cancelAnimationFrame(midScrollRaf);
const tick = () => {
if (!midScrollActive || !containerEl) return;
const dy = midScrollCurrentY - midScrollOriginY;
const deadZone = 24;
const excess = Math.max(0, Math.abs(dy) - deadZone);
const speed = Math.sign(dy) * excess * 0.12;
containerEl.scrollTop += speed;
midScrollDisplayLevel = Math.sign(dy) * Math.min(5, Math.floor(excess / 30));
midScrollRaf = requestAnimationFrame(tick);
};
midScrollRaf = requestAnimationFrame(tick);
}
function stopMidScroll() {
midScrollActive = false;
midScrollDisplayLevel = 0;
if (midScrollRaf) { cancelAnimationFrame(midScrollRaf); midScrollRaf = null; }
}
function pauseAutoScroll() {
autoScrollPaused = true;
if (autoScrollPauseTimer) clearTimeout(autoScrollPauseTimer);
autoScrollPauseTimer = setTimeout(() => { autoScrollPaused = false; }, 2500);
}
$effect(() => {
if (style !== "longstrip" || !settingsState.settings.autoScroll) return;
let rafId: number;
const tick = () => {
if (!autoScrollPaused && containerEl) containerEl.scrollTop += (settingsState.settings.autoScrollSpeed ?? 5) * 0.5;
rafId = requestAnimationFrame(tick);
};
rafId = requestAnimationFrame(tick);
return () => cancelAnimationFrame(rafId);
});
let pinch: PinchTracker | null = null; let pinch: PinchTracker | null = null;
$effect(() => { $effect(() => {
@@ -255,27 +229,11 @@
} }
}); });
$effect(() => { if (style !== "longstrip") readerState.resetInspect(); });
export function onInspectMouseDown(e: MouseEvent) { export function onInspectMouseDown(e: MouseEvent) {
if ((e.target as Element).closest(".bar")) return; if ((e.target as Element).closest(".bar")) return;
if (e.button === 1 && style === "longstrip") { if (style === "longstrip") { stripRef?.onMouseDown(e); return; }
e.preventDefault();
if (midScrollActive) {
stopMidScroll();
} else {
settingsState.settings.autoScroll = false;
startMidScroll(e.clientY);
}
return;
}
if (style === "longstrip") {
stripDragging = true;
stripDragMoved = false;
stripDragStartY = e.clientY;
stripScrollStart = containerEl?.scrollTop ?? 0;
pauseAutoScroll();
e.preventDefault();
return;
}
if (readerState.inspectScale <= 1) return; if (readerState.inspectScale <= 1) return;
inspectDragging = true; inspectDragging = true;
inspectDragMoved = false; inspectDragMoved = false;
@@ -287,13 +245,7 @@
} }
export function onInspectMouseMove(e: MouseEvent) { export function onInspectMouseMove(e: MouseEvent) {
midScrollCurrentY = e.clientY; if (style === "longstrip") { stripRef?.onMouseMove(e); return; }
if (stripDragging) {
const dy = e.clientY - stripDragStartY;
if (!stripDragMoved && Math.abs(dy) > 4) stripDragMoved = true;
if (containerEl) containerEl.scrollTop = stripScrollStart - dy;
return;
}
if (!inspectDragging) return; if (!inspectDragging) return;
if (!inspectDragMoved && Math.abs(e.clientX - inspectDragStartX) + Math.abs(e.clientY - inspectDragStartY) > 4) inspectDragMoved = true; if (!inspectDragMoved && Math.abs(e.clientX - inspectDragStartX) + Math.abs(e.clientY - inspectDragStartY) > 4) inspectDragMoved = true;
const rawX = inspectPanStartX + (e.clientX - inspectDragStartX); const rawX = inspectPanStartX + (e.clientX - inspectDragStartX);
@@ -304,22 +256,19 @@
} }
export function onInspectMouseUp() { export function onInspectMouseUp() {
stripDragging = false; if (style === "longstrip") { stripRef?.onMouseUp(); return; }
inspectDragging = false; inspectDragging = false;
} }
export function onPointerDown(e: PointerEvent) { export function onPointerDown(e: PointerEvent) {
if ((e.target as Element).closest(".bar")) return; if ((e.target as Element).closest(".bar")) return;
pinch?.onPointerDown(e); pinch?.onPointerDown(e);
if (style === "longstrip") stripRef?.onPointerDown(e);
} }
export function onPointerMove(e: PointerEvent) { export function onPointerMove(e: PointerEvent) {
if (pinch?.isPinching()) { pinch.onPointerMove(e); return; } if (pinch?.isPinching()) { pinch.onPointerMove(e); return; }
if (stripDragging) { if (style === "longstrip") { stripRef?.onPointerMove(e); return; }
const dy = e.clientY - stripDragStartY;
if (!stripDragMoved && Math.abs(dy) > 4) stripDragMoved = true;
if (containerEl) containerEl.scrollTop = stripScrollStart - dy;
}
if (inspectDragging) { if (inspectDragging) {
if (!inspectDragMoved && Math.abs(e.clientX - inspectDragStartX) + Math.abs(e.clientY - inspectDragStartY) > 4) inspectDragMoved = true; if (!inspectDragMoved && Math.abs(e.clientX - inspectDragStartX) + Math.abs(e.clientY - inspectDragStartY) > 4) inspectDragMoved = true;
const rawX = inspectPanStartX + (e.clientX - inspectDragStartX); const rawX = inspectPanStartX + (e.clientX - inspectDragStartX);
@@ -332,13 +281,16 @@
export function onPointerUp(e: PointerEvent) { export function onPointerUp(e: PointerEvent) {
pinch?.onPointerUp(e); pinch?.onPointerUp(e);
if (!pinch?.isPinching()) { stripDragging = false; inspectDragging = false; } if (!pinch?.isPinching()) {
if (style === "longstrip") stripRef?.onPointerUp();
else inspectDragging = false;
}
} }
export function handleWheel(e: WheelEvent) { export function handleWheel(e: WheelEvent) {
if (style === "longstrip") { if (style === "longstrip") {
if (e.ctrlKey) { onWheel(e); } if (e.ctrlKey) onWheel(e);
else pauseAutoScroll(); else stripRef?.onWheel(e);
return; return;
} }
if (!e.ctrlKey) { onWheel(e); return; } if (!e.ctrlKey) { onWheel(e); return; }
@@ -348,14 +300,12 @@
if (next === readerState.inspectScale) return; if (next === readerState.inspectScale) return;
if (next === 1) { readerState.inspectScale = 1; readerState.inspectPanX = 0; readerState.inspectPanY = 0; return; } if (next === 1) { readerState.inspectScale = 1; readerState.inspectPanX = 0; readerState.inspectPanY = 0; return; }
const img = getInspectImageEl(); const img = getInspectImageEl();
const anchor = img ?? containerEl; const anchor = img ?? containerEl ?? null;
const rect = anchor?.getBoundingClientRect(); const rect = anchor?.getBoundingClientRect();
const cx = rect ? e.clientX - rect.left - rect.width / 2 : 0; const cx = rect ? e.clientX - rect.left - rect.width / 2 : 0;
const cy = rect ? e.clientY - rect.top - rect.height / 2 : 0; const cy = rect ? e.clientY - rect.top - rect.height / 2 : 0;
const ratio = next / readerState.inspectScale; const ratio = next / readerState.inspectScale;
const rawPanX = cx + (readerState.inspectPanX - cx) * ratio; const [clampedX, clampedY] = clampInspectPan(next, cx + (readerState.inspectPanX - cx) * ratio, cy + (readerState.inspectPanY - cy) * ratio);
const rawPanY = cy + (readerState.inspectPanY - cy) * ratio;
const [clampedX, clampedY] = clampInspectPan(next, rawPanX, rawPanY);
readerState.inspectScale = next; readerState.inspectScale = next;
readerState.inspectPanX = clampedX; readerState.inspectPanX = clampedX;
readerState.inspectPanY = clampedY; readerState.inspectPanY = clampedY;
@@ -365,11 +315,10 @@
function handleTap(e: MouseEvent) { function handleTap(e: MouseEvent) {
if (style === "longstrip") { if (style === "longstrip") {
if (stripDragMoved) { stripDragMoved = false; return; } if (stripRef?.consumeTap()) return;
return; return;
} }
if (inspectDragMoved) { inspectDragMoved = false; return; } if (inspectDragMoved) { inspectDragMoved = false; return; }
if (stripDragMoved) { stripDragMoved = false; return; }
if (tapToToggleBar) { if (tapToToggleBar) {
if (tapTimer) { clearTimeout(tapTimer); tapTimer = null; return; } if (tapTimer) { clearTimeout(tapTimer); tapTimer = null; return; }
tapTimer = setTimeout(() => { tapTimer = null; onTap(e); }, 220); tapTimer = setTimeout(() => { tapTimer = null; onTap(e); }, 220);
@@ -388,18 +337,7 @@
function setContainer(el: HTMLDivElement) { function setContainer(el: HTMLDivElement) {
containerEl = el; containerEl = el;
bindContainer(el); bindContainer(el);
if (style === "longstrip") setupObserver(el);
} }
$effect(() => {
if (style === "longstrip" && containerEl) {
setupObserver(containerEl);
} else if (style !== "longstrip") {
observer?.disconnect();
observer = null;
stopMidScroll();
}
});
</script> </script>
<div <div
@@ -413,10 +351,10 @@
onclick={handleTap} onclick={handleTap}
onauxclick={(e) => { if (e.button === 1 && style === "longstrip") e.preventDefault(); }} onauxclick={(e) => { if (e.button === 1 && style === "longstrip") e.preventDefault(); }}
ondblclick={handleDblClick} ondblclick={handleDblClick}
onscroll={style === "longstrip" ? handleScroll : undefined}
onmousedown={onInspectMouseDown} onmousedown={onInspectMouseDown}
onpointerdown={pinchZoomEnabled ? onPointerDown : undefined} onpointerdown={pinchZoomEnabled ? onPointerDown : undefined}
onwheel={(e) => { if (e.ctrlKey || style !== "longstrip") e.preventDefault(); }} onwheel={(e) => { if (e.ctrlKey || style !== "longstrip") e.preventDefault(); }}
style:cursor={style === "longstrip" ? (stripDragging ? "grabbing" : "grab") : undefined}
onkeydown={(e) => { onkeydown={(e) => {
if (e.key === " " && style === "longstrip") { if (e.key === " " && style === "longstrip") {
e.preventDefault(); e.preventDefault();
@@ -426,28 +364,9 @@
if ((e.key === "ArrowLeft" || e.key === "ArrowRight" || e.key === "ArrowUp" || e.key === "ArrowDown") && style !== "longstrip") e.preventDefault(); if ((e.key === "ArrowLeft" || e.key === "ArrowRight" || e.key === "ArrowUp" || e.key === "ArrowDown") && style !== "longstrip") e.preventDefault();
}} }}
> >
{#if midScrollActive}
<div class="midscroll-bar" class:midscroll-bar-right={barPosition !== "right"} class:midscroll-bar-left={barPosition === "right"}>
<div class="midscroll-segments">
{#each [5,4,3,2,1] as n}
<div class="midscroll-seg" class:midscroll-seg-lit={midScrollDisplayLevel < 0 && -midScrollDisplayLevel >= n}></div>
{/each}
<div class="midscroll-origin-dot"></div>
{#each [1,2,3,4,5] as n}
<div class="midscroll-seg" class:midscroll-seg-lit={midScrollDisplayLevel > 0 && midScrollDisplayLevel >= n}></div>
{/each}
</div>
<button class="midscroll-stop" onclick={stopMidScroll} title="Stop (middle click)">
<svg width="8" height="8" viewBox="0 0 8 8"><rect x="0" y="0" width="8" height="8" rx="1" fill="currentColor"/></svg>
</button>
</div>
{/if}
{#if loading} {#if loading}
<div class="center-overlay"> <div class="center-overlay">
<div class="page-loader page-loader-single" aria-hidden="true"> <div class="page-loader page-loader-single" aria-hidden="true">{@render skeleton()}</div>
{@render skeleton()}
</div>
</div> </div>
{/if} {/if}
@@ -456,74 +375,21 @@
{/if} {/if}
{#if style === "longstrip"} {#if style === "longstrip"}
{#each flatPages as page, gi (page.chapterId + ":" + page.localIndex)} <LongstripViewer
{@const src = resolvedSrc[gi]} bind:this={stripRef}
{@const isLoaded = loadedSet.has(gi)} {containerEl}
<div class="strip-slot" use:observePage={gi}> {flatPages}
{#if isLoaded && src} {imgCls}
<img {effectiveWidth}
{src} {resolveUrl}
alt="{page.chapterName} Page {page.localIndex + 1}" {barPosition}
data-local-page={page.localIndex + 1} />
data-chapter={page.chapterId}
data-total={page.total}
class="{imgCls}{settingsState.settings.pageGap ? ' strip-gap' : ''}"
loading="eager"
decoding="async"
draggable="false"
onload={(e) => {
const img = e.currentTarget as HTMLImageElement;
const slot = img.closest<HTMLElement>(".strip-slot");
if (slot && img.naturalWidth > 0) {
slot.style.setProperty("--aspect", String(img.naturalWidth / img.naturalHeight));
}
}}
/>
{:else}
<div class="strip-placeholder" aria-hidden="true">
{@render skeleton()}
</div>
{/if}
</div>
{/each}
<div style="height:1px;flex-shrink:0"></div>
{:else if style === "fade" && pageReady}
<div class="inspect-wrap" style="transform:scale({readerState.inspectScale}) translate({readerState.inspectPanX / readerState.inspectScale}px,{readerState.inspectPanY / readerState.inspectScale}px)">
{#await resolveUrl(readerState.pageUrls[readerState.pageNumber - 1], 999)}
<div class="page-loader page-loader-single" aria-hidden="true">{@render skeleton()}</div>
{:then src}
<img {src} alt="Page {readerState.pageNumber}" class={imgCls} decoding="async" style="opacity:{fadingOut ? 0 : 1};transition:opacity 0.1s ease" draggable="false" />
{/await}
</div>
{:else if style === "double" && pageReady} {:else if style === "double" && pageReady}
<div class="inspect-wrap" style="transform:scale({readerState.inspectScale}) translate({readerState.inspectPanX / readerState.inspectScale}px,{readerState.inspectPanY / readerState.inspectScale}px)"> <DoubleViewer {imgCls} {currentGroup} srcs={currentGroupSrcs} {pageGroups} />
{#if pageGroups.length}
<div class="double-wrap">
{#each currentGroup as pg, i (pg)}
{#await resolveUrl(readerState.pageUrls[pg - 1], 999)}
<div class="page-loader page-half {i === 0 ? 'gap-left' : 'gap-right'}" aria-hidden="true">{@render skeleton()}</div>
{:then src}
<img {src} alt="Page {pg}" class="{imgCls} page-half {i === 0 ? 'gap-left' : 'gap-right'}" decoding="async" draggable="false" />
{/await}
{/each}
</div>
{:else}
<div class="center-overlay">
<div class="page-loader page-loader-single" aria-hidden="true">{@render skeleton()}</div>
</div>
{/if}
</div>
{:else if pageReady} {:else if pageReady}
<div class="inspect-wrap" style="transform:scale({readerState.inspectScale}) translate({readerState.inspectPanX / readerState.inspectScale}px,{readerState.inspectPanY / readerState.inspectScale}px)"> <SingleViewer {imgCls} src={currentSrc} {fadingOut} isFade={style === "fade"} />
{#await resolveUrl(readerState.pageUrls[readerState.pageNumber - 1], 999)}
<div class="page-loader page-loader-single" aria-hidden="true">{@render skeleton()}</div>
{:then src}
<img {src} alt="Page {readerState.pageNumber}" class={imgCls} decoding="async" draggable="false" />
{/await}
</div>
{/if} {/if}
</div> </div>
@@ -546,19 +412,6 @@
:global(.pinch-active) .viewer { touch-action: none; } :global(.pinch-active) .viewer { touch-action: none; }
.inspect-wrap { display: flex; align-items: center; justify-content: center; transform-origin: center center; will-change: transform; }
.strip-slot { width: 100%; display: flex; flex-direction: column; align-items: center; }
.strip-placeholder {
width: var(--effective-width, 100%);
max-width: var(--effective-width, 100%);
aspect-ratio: var(--aspect, 0.667);
border-radius: var(--radius-sm);
display: flex;
align-items: stretch;
}
.page-loader { border-radius: var(--radius-sm); display: flex; align-items: stretch; } .page-loader { border-radius: var(--radius-sm); display: flex; align-items: stretch; }
.page-loader-single { .page-loader-single {
width: min(100%, var(--effective-width, 100%)); width: min(100%, var(--effective-width, 100%));
@@ -589,47 +442,14 @@
100% { stroke-dashoffset: -400; opacity: 0.25; } 100% { stroke-dashoffset: -400; opacity: 0.25; }
} }
.img { display: block; user-select: none; image-rendering: auto; } :global(.img) { display: block; user-select: none; image-rendering: auto; }
.img:global(.optimize-contrast) { image-rendering: -webkit-optimize-contrast; } :global(.img.optimize-contrast) { image-rendering: -webkit-optimize-contrast; }
:global(.fit-width) { max-width: var(--effective-width, 100%); width: 100%; height: auto; } :global(.fit-width) { max-width: var(--effective-width, 100%); width: 100%; height: auto; }
:global(.fit-height) { max-height: calc(var(--visual-vh, 100vh) - 80px); width: auto; max-width: var(--effective-width, 100%); height: auto; } :global(.fit-height) { max-height: calc(var(--visual-vh, 100vh) - 80px); width: auto; max-width: var(--effective-width, 100%); height: auto; }
:global(.fit-screen) { max-width: var(--effective-width, 100%); max-height: calc(var(--visual-vh, 100vh) - 80px); object-fit: contain; height: auto; } :global(.fit-screen) { max-width: var(--effective-width, 100%); max-height: calc(var(--visual-vh, 100vh) - 80px); object-fit: contain; height: auto; }
:global(.fit-original) { max-width: 100%; width: auto; height: auto; } :global(.fit-original) { max-width: 100%; width: auto; height: auto; }
:global(.strip-gap) { margin-bottom: 8px; } :global(.strip-gap) { margin-bottom: 8px; }
.double-wrap { display: flex; align-items: flex-start; justify-content: center; max-width: calc(var(--effective-width, 100%) * 2); width: 100%; }
.page-half { flex: 1; min-width: 0; object-fit: contain; }
.gap-left { margin-right: 2px; }
.gap-right { margin-left: 2px; }
.center-overlay { position: absolute; inset: 0; display: flex; align-items: center; justify-content: center; } .center-overlay { position: absolute; inset: 0; display: flex; align-items: center; justify-content: center; }
.error-msg { color: var(--color-error); font-size: var(--text-base); } .error-msg { color: var(--color-error); font-size: var(--text-base); }
.midscroll-bar {
position: fixed;
top: 50%;
transform: translateY(-50%);
z-index: 200;
display: flex;
flex-direction: column;
align-items: center;
gap: 8px;
padding: 10px 6px;
background: color-mix(in srgb, var(--bg-raised) 92%, transparent);
border: 1px solid var(--border-base);
border-radius: 10px;
box-shadow: 0 4px 16px rgba(0,0,0,0.45);
pointer-events: auto;
backdrop-filter: blur(6px);
-webkit-backdrop-filter: blur(6px);
}
.midscroll-bar-right { right: 8px; }
.midscroll-bar-left { left: 8px; }
.midscroll-segments { display: flex; flex-direction: column; align-items: center; gap: 3px; }
.midscroll-origin-dot { width: 6px; height: 6px; border-radius: 50%; border: 1.5px solid var(--accent-fg); opacity: 0.6; flex-shrink: 0; margin: 2px 0; }
.midscroll-seg { width: 4px; height: 14px; border-radius: 2px; background: var(--border-strong); transition: background 0.06s ease; flex-shrink: 0; }
.midscroll-seg-lit { background: var(--accent-fg); }
.midscroll-stop { width: 20px; height: 20px; display: flex; align-items: center; justify-content: center; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-fast), background var(--t-fast), border-color var(--t-fast); flex-shrink: 0; }
.midscroll-stop:hover { color: var(--text-primary); background: var(--bg-overlay); border-color: var(--border-strong); }
</style> </style>
+125 -139
View File
@@ -1,18 +1,21 @@
<script lang="ts"> <script lang="ts">
import { onMount, untrack, tick } from "svelte"; import { onMount, untrack, tick } from "svelte";
import { readerState, PAGE_STYLES } from "$lib/state/reader.svelte"; import { readerState, PAGE_STYLES } from "$lib/state/reader.svelte";
import type { PageStyle } from "$lib/state/reader.svelte";
import { settingsState, updateSettings } from "$lib/state/settings.svelte"; import { settingsState, updateSettings } from "$lib/state/settings.svelte";
import { app } from "$lib/state/app.svelte"; import { app, appState } from "$lib/state/app.svelte";
import { DEFAULT_KEYBINDS } from "$lib/core/keybinds/defaultBinds"; import { DEFAULT_KEYBINDS } from "$lib/core/keybinds/defaultBinds";
import { fetchPages, resolveUrl, preloadImage, measureAspect, buildPageGroups } from "$lib/components/reader/lib/pageLoader"; import { fetchPages, resolveUrl, preloadImage, measureAspect, buildPageGroups } from "$lib/components/reader/lib/pageLoader";
import { setupScrollTracking, appendNextChapter } from "$lib/components/reader/lib/scrollHandler";
import { createReaderKeyHandler } from "$lib/components/reader/lib/readerKeybinds"; import { createReaderKeyHandler } from "$lib/components/reader/lib/readerKeybinds";
import { markChapterRead, getMangaPrefs, toggleBookmark } from "$lib/components/reader/lib/chapterActions"; import { markChapterRead, getMangaPrefs, toggleBookmark } from "$lib/components/reader/lib/chapterActions";
import { goForward, goBack, jumpToPage } from "$lib/components/reader/lib/navigation"; import { goForward, goBack, jumpToPage } from "$lib/components/reader/lib/navigation";
import { clampZoom, captureZoomAnchor, restoreZoomAnchor } from "$lib/components/reader/lib/zoomHelpers"; import { clampZoom, captureZoomAnchor, restoreZoomAnchor } from "$lib/components/reader/lib/zoomHelpers";
import { loadChapter, scheduleResumeDismiss } from "$lib/components/reader/lib/chapterLoader"; import { loadChapter, scheduleResumeDismiss } from "$lib/components/reader/lib/chapterLoader";
import { historyState } from "$lib/state/history.svelte"; import { historyState } from "$lib/state/history.svelte";
import { setPreviewManga, seriesState } from "$lib/state/series.svelte";
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import { setReading, clearReading } from "$lib/core/discord";
import { revokeBlobUrl, cancelQueuedFetches, preloadBlobUrls } from "$lib/core/cache/imageCache";
import type { ReaderSettings } from "$lib/state/reader.svelte"; import type { ReaderSettings } from "$lib/state/reader.svelte";
import ReaderControls from "$lib/components/reader/ReaderControls.svelte"; import ReaderControls from "$lib/components/reader/ReaderControls.svelte";
import PageView from "$lib/components/reader/PageView.svelte"; import PageView from "$lib/components/reader/PageView.svelte";
@@ -43,17 +46,26 @@
const pinchZoomEnabled = $derived(settingsState.settings.pinchZoom ?? false); const pinchZoomEnabled = $derived(settingsState.settings.pinchZoom ?? false);
const containerized = $derived(settingsState.settings.readerContainerized ?? false); const containerized = $derived(settingsState.settings.readerContainerized ?? false);
let visibleChapterId = $state<number | null>(null);
const displayChapter = $derived( const displayChapter = $derived(
style === "longstrip" && readerState.visibleChapterId style === "longstrip" && visibleChapterId
? (readerState.activeChapterList.find(c => c.id === readerState.visibleChapterId) ?? readerState.activeChapter) ? (readerState.activeChapterList.find(c => c.id === visibleChapterId) ?? readerState.activeChapter)
: readerState.activeChapter : readerState.activeChapter
); );
const currentBookmark = $derived( const currentBookmark = $derived(
readerState.activeManga readerState.activeManga
? readerState.bookmarks.find(b => b.mangaId === readerState.activeManga!.id) ? seriesState.bookmarks.find(b => b.mangaId === readerState.activeManga!.id)
: undefined : undefined
); );
const currentGroup = $derived.by(() => {
const group = style === "double" && readerState.pageGroups.length
? (readerState.pageGroups.find(g => g.includes(readerState.pageNumber)) ?? [readerState.pageNumber])
: [readerState.pageNumber];
return rtl ? [...group].reverse() : group;
});
const isBookmarked = $derived( const isBookmarked = $derived(
!!currentBookmark && !!currentBookmark &&
currentBookmark.chapterId === displayChapter?.id && currentBookmark.chapterId === displayChapter?.id &&
@@ -68,7 +80,7 @@
const showResumeBanner = $derived( const showResumeBanner = $derived(
readerState.resumeVisible && readerState.resumePage > 1 && readerState.resumeVisible && readerState.resumePage > 1 &&
(style === "longstrip" ? readerState.stripResumeReady : readerState.pageNumber === readerState.resumePage) readerState.pageNumber === readerState.resumePage
); );
const adjacent = $derived.by(() => { const adjacent = $derived.by(() => {
@@ -84,9 +96,9 @@
const visibleChunkLastPage = $derived.by(() => { const visibleChunkLastPage = $derived.by(() => {
if (style !== "longstrip") return lastPage; if (style !== "longstrip") return lastPage;
const chId = readerState.visibleChapterId ?? readerState.activeChapter?.id; const chunks = pageViewRef?.getStripChunks() ?? [];
const chunk = readerState.stripChapters.find(c => c.chapterId === chId); const chId = visibleChapterId ?? readerState.activeChapter?.id;
return chunk?.urls.length ?? lastPage; return chunks.find(c => c.chapterId === chId)?.urls.length ?? lastPage;
}); });
const imgCls = $derived([ const imgCls = $derived([
@@ -98,21 +110,6 @@
effectiveReaderSettings.optimizeContrast && "optimize-contrast", effectiveReaderSettings.optimizeContrast && "optimize-contrast",
].filter(Boolean).join(" ")); ].filter(Boolean).join(" "));
const stripToRender = $derived(
style === "longstrip"
? (readerState.stripChapters.length > 0
? readerState.stripChapters
: [{ chapterId: readerState.activeChapter?.id ?? 0, chapterName: readerState.activeChapter?.name ?? "", urls: readerState.pageUrls }])
: []
);
const currentGroup = $derived.by(() => {
const group = style === "double" && readerState.pageGroups.length
? (readerState.pageGroups.find(g => g.includes(readerState.pageNumber)) ?? [readerState.pageNumber])
: [readerState.pageNumber];
return rtl ? [...group].reverse() : group;
});
const sliderPage = $derived.by(() => { const sliderPage = $derived.by(() => {
if (style === "double" && readerState.pageGroups.length) if (style === "double" && readerState.pageGroups.length)
return readerState.pageGroups.findIndex(g => g.includes(readerState.pageNumber)) + 1; return readerState.pageGroups.findIndex(g => g.includes(readerState.pageNumber)) + 1;
@@ -142,11 +139,8 @@
let abortCtrl = { current: null as AbortController | null }; let abortCtrl = { current: null as AbortController | null };
let hasNavigated = false; let hasNavigated = false;
let startAtLastPageRef = { current: false }; let startAtLastPageRef = { current: false };
let cleanupScroll: () => void = () => {}; let tickTimer: ReturnType<typeof setTimeout> | null = null;
let stripChaptersRef = readerState.stripChapters; let progressTimer: ReturnType<typeof setTimeout> | null = null;
let tickTimer: ReturnType<typeof setTimeout> | null = null;
$effect(() => { stripChaptersRef = readerState.stripChapters; });
function maybeMarkCurrentRead() { function maybeMarkCurrentRead() {
const ch = displayChapter ?? readerState.activeChapter; const ch = displayChapter ?? readerState.activeChapter;
@@ -208,6 +202,24 @@
const startAtLast = () => { startAtLastPageRef.current = true; }; const startAtLast = () => { startAtLastPageRef.current = true; };
function primedJump(page: number, commit = true) {
if (useBlob && commit && style !== "longstrip") {
cancelQueuedFetches();
const urls = readerState.pageUrls;
const lo = Math.max(0, page - 2);
const hi = Math.min(urls.length, page + 4);
preloadBlobUrls(urls.slice(lo, hi), 999);
}
jumpToPage(
page,
style,
lastPage,
style === "longstrip" ? (idx) => pageViewRef.scrollToFlatIndex(idx) : null,
visibleChapterId ?? readerState.activeChapter?.id ?? 0,
pageViewRef?.getStripChunks() ?? [],
);
}
const goNext = $derived(rtl const goNext = $derived(rtl
? () => goBack(style, adjacent, startAtLast) ? () => goBack(style, adjacent, startAtLast)
: () => goForward(style, adjacent, lastPage, maybeMarkCurrentRead, startAtLast)); : () => goForward(style, adjacent, lastPage, maybeMarkCurrentRead, startAtLast));
@@ -215,17 +227,23 @@
? () => goForward(style, adjacent, lastPage, maybeMarkCurrentRead, startAtLast) ? () => goForward(style, adjacent, lastPage, maybeMarkCurrentRead, startAtLast)
: () => goBack(style, adjacent, startAtLast)); : () => goBack(style, adjacent, startAtLast));
function handleCloseReader() {
clearReading().catch(() => {});
for (const url of readerState.pageUrls) revokeBlobUrl(url);
readerState.closeReader();
}
const onKey = createReaderKeyHandler({ const onKey = createReaderKeyHandler({
goNext: () => goNext(), goNext: () => goNext(),
goPrev: () => goPrev(), goPrev: () => goPrev(),
closeReader: () => readerState.closeReader(), closeReader: () => handleCloseReader(),
goToPage: (p) => jumpToPage(p, style, lastPage, containerEl), goToPage: (p) => primedJump(p),
lastPage: () => lastPage, lastPage: () => lastPage,
adjustZoom: (d) => { captureZoomAnchor(containerEl, style, zoomAnchor); applySettings({ readerZoom: clampZoom(zoom + d) }); restoreZoomAnchor(containerEl, zoomAnchor); }, adjustZoom: (d) => { captureZoomAnchor(containerEl, style, zoomAnchor); applySettings({ readerZoom: clampZoom(zoom + d) }); restoreZoomAnchor(containerEl, zoomAnchor); },
resetZoom: () => { captureZoomAnchor(containerEl, style, zoomAnchor); applySettings({ readerZoom: 1.0 }); restoreZoomAnchor(containerEl, zoomAnchor); }, resetZoom: () => { captureZoomAnchor(containerEl, style, zoomAnchor); applySettings({ readerZoom: 1.0 }); restoreZoomAnchor(containerEl, zoomAnchor); },
cycleStyle: () => { const idx = PAGE_STYLES.indexOf(style); applySettings({ pageStyle: PAGE_STYLES[(idx + 1) % PAGE_STYLES.length] }); }, cycleStyle: () => { const idx = PAGE_STYLES.indexOf(style); applySettings({ pageStyle: PAGE_STYLES[(idx + 1) % PAGE_STYLES.length] as PageStyle }); },
toggleDirection: () => applySettings({ readingDirection: rtl ? "ltr" : "rtl" }), toggleDirection: () => applySettings({ readingDirection: rtl ? "ltr" : "rtl" }),
openSettings: () => { app.setSettingsOpen(true); }, openSettings: () => { app.setSettingsOpen(true); },
toggleBookmark: () => toggleBookmark(displayChapter, readerState.pageNumber), toggleBookmark: () => toggleBookmark(displayChapter, readerState.pageNumber),
toggleAutoScroll: () => { if (style === "longstrip") updateSettings({ autoScroll: !(settingsState.settings.autoScroll ?? false) }); }, toggleAutoScroll: () => { if (style === "longstrip") updateSettings({ autoScroll: !(settingsState.settings.autoScroll ?? false) }); },
toggleMarker: () => { toggleMarker: () => {
@@ -238,11 +256,11 @@
}, },
chapterNext: () => { chapterNext: () => {
const ch = rtl ? adjacent.prev : adjacent.next; const ch = rtl ? adjacent.prev : adjacent.next;
if (ch) { maybeMarkCurrentRead(); readerState.openReader(ch, readerState.activeChapterList); } if (ch) { maybeMarkCurrentRead(); readerState.openReader(ch, readerState.activeManga); }
}, },
chapterPrev: () => { chapterPrev: () => {
const ch = rtl ? adjacent.next : adjacent.prev; const ch = rtl ? adjacent.next : adjacent.prev;
if (ch) readerState.openReader(ch, readerState.activeChapterList); if (ch) readerState.openReader(ch, readerState.activeManga);
}, },
closePopovers: () => readerState.closeAllPopovers(), closePopovers: () => readerState.closeAllPopovers(),
getKeybinds: () => settingsState.settings.keybinds ?? DEFAULT_KEYBINDS, getKeybinds: () => settingsState.settings.keybinds ?? DEFAULT_KEYBINDS,
@@ -252,7 +270,7 @@
function captureCurrentReaderSettings(): ReaderSettings { function captureCurrentReaderSettings(): ReaderSettings {
return { return {
pageStyle: style, pageStyle: style as PageStyle,
fitMode: fit, fitMode: fit,
readingDirection: (settingsState.settings.readingDirection ?? "ltr") as ReaderSettings["readingDirection"], readingDirection: (settingsState.settings.readingDirection ?? "ltr") as ReaderSettings["readingDirection"],
readerZoom: zoom, readerZoom: zoom,
@@ -299,10 +317,11 @@
} }
$effect(() => { $effect(() => {
const ch = readerState.activeChapter; const ch = readerState.activeChapter;
const manga = readerState.activeManga; if (ch) {
if (ch && manga) {
untrack(() => { untrack(() => {
const manga = readerState.activeManga;
if (!manga) return;
historyState.openSession( historyState.openSession(
manga.id, manga.title, manga.thumbnailUrl, manga.id, manga.title, manga.thumbnailUrl,
ch.id, ch.name, readerState.pageNumber, ch.id, ch.name, readerState.pageNumber,
@@ -312,10 +331,19 @@
} }
}); });
$effect(() => {
const ch = readerState.activeChapter;
const manga = readerState.activeManga;
const idle = appState.idleSplash;
if (ch && manga && !idle) {
untrack(() => setReading(manga, ch).catch(() => {}));
}
});
$effect(() => { $effect(() => {
const page = readerState.pageNumber; const page = readerState.pageNumber;
const chId = style === "longstrip" const chId = style === "longstrip"
? (readerState.visibleChapterId ?? readerState.activeChapter?.id) ? (visibleChapterId ?? readerState.activeChapter?.id)
: readerState.activeChapter?.id; : readerState.activeChapter?.id;
const chName = style === "longstrip" const chName = style === "longstrip"
? (readerState.activeChapterList.find(c => c.id === chId)?.name ?? readerState.activeChapter?.name ?? "") ? (readerState.activeChapterList.find(c => c.id === chId)?.name ?? readerState.activeChapter?.name ?? "")
@@ -338,107 +366,34 @@
if (style === "longstrip" && readerState.pageUrls.length && readerState.activeChapter) { if (style === "longstrip" && readerState.pageUrls.length && readerState.activeChapter) {
const ch = readerState.activeChapter; const ch = readerState.activeChapter;
const urls = readerState.pageUrls; const urls = readerState.pageUrls;
const targetPg = untrack(() => readerState.resumePage); const resumeTo = untrack(() => readerState.resumePage);
appending = false; visibleChapterId = ch.id;
readerState.stripChapters = [{ chapterId: ch.id, chapterName: ch.name, urls }]; appending = false;
readerState.visibleChapterId = ch.id; pageViewRef.loadStrip(ch.id, ch.name, urls, resumeTo);
tick().then(() => {
if (!containerEl) return;
if (targetPg > 1) {
const chId = ch.id;
const scrollToResumePage = () => {
const target = containerEl!.querySelector<HTMLImageElement>(`img[data-local-page="${targetPg}"][data-chapter="${chId}"]`);
if (!target) { requestAnimationFrame(scrollToResumePage); return; }
containerEl!.querySelectorAll<HTMLImageElement>(`img[data-chapter="${chId}"]`).forEach((img, i) => { if (i < targetPg) img.loading = "eager"; });
const doScroll = () => { target.scrollIntoView({ block: "start" }); readerState.stripResumeReady = true; };
if (target.complete && target.naturalHeight > 0) doScroll();
else { target.loading = "eager"; target.addEventListener("load", doScroll, { once: true }); }
};
scrollToResumePage();
return;
}
containerEl!.scrollTop = 0;
});
} }
}); });
$effect(() => { if (style !== "longstrip") readerState.resetInspect(); }); $effect(() => { if (style !== "longstrip") readerState.resetInspect(); });
$effect(() => { $effect(() => {
const chId = readerState.visibleChapterId; const chId = visibleChapterId;
if (!chId || style !== "longstrip") return; if (!chId || style !== "longstrip") return;
if (chId === readerState.activeChapter?.id) return; if (chId === readerState.activeChapter?.id) return;
const wasAppended = untrack(() => readerState.stripChapters.findIndex(c => c.chapterId === chId)) > 0;
if (wasAppended) {
untrack(() => {
readerState.resumePage = 0;
readerState.resumeVisible = false;
const prefs = getMangaPrefs(chId);
if (prefs.downloadAhead > 0) {
const list = readerState.activeChapterList;
const idx = list.findIndex(c => c.id === chId);
if (idx >= 0) {
const toQueue = list.slice(idx + 1, idx + 1 + prefs.downloadAhead)
.filter(c => !c.downloaded && !c.read)
.map(c => c.id);
if (toQueue.length) getAdapter().enqueueDownloads(toQueue.map(String)).catch(console.error);
}
}
});
return;
}
const bookmark = readerState.bookmarks.find(b => b.chapterId === chId);
if (bookmark && bookmark.pageNumber > 1) {
untrack(() => {
readerState.resumePage = bookmark.pageNumber;
readerState.resumeDismissed = false;
readerState.resumeVisible = true;
readerState.stripResumeReady = true;
scheduleResumeDismiss();
});
} else {
untrack(() => readerState.resetResume());
}
});
$effect(() => {
void style;
if (!containerEl) return;
untrack(() => { untrack(() => {
cleanupScroll(); readerState.resumePage = 0;
cleanupScroll = setupScrollTracking(containerEl!, { readerState.resumeVisible = false;
onPageChange: (p) => { readerState.pageNumber = p; }, const prefs = getMangaPrefs(chId);
onChapterChange: (id) => { readerState.visibleChapterId = id; }, if (prefs.downloadAhead > 0) {
onMarkRead: (id) => markChapterRead(id, markedRead), const list = readerState.activeChapterList;
onAppend: () => { const idx = list.findIndex(c => c.id === chId);
if (appending || !readerState.stripChapters.length) return; if (idx >= 0) {
appending = true; const toQueue = list.slice(idx + 1, idx + 1 + prefs.downloadAhead)
appendNextChapter( .filter(c => !c.downloaded && !c.read)
stripChaptersRef, .map(c => c.id);
readerState.activeChapterList, if (toQueue.length) getAdapter().enqueueDownloads(toQueue.map(String)).catch(console.error);
(id) => fetchPages(id, useBlob), }
(url) => preloadImage(url, useBlob),
(next) => { readerState.stripChapters = [...readerState.stripChapters, next]; appending = false; },
() => { appending = false; },
);
},
getStripChapters: () => stripChaptersRef,
getPageUrls: () => readerState.pageUrls,
shouldAutoMark: () => settingsState.settings.autoMarkRead ?? true,
});
});
});
$effect(() => {
if (readerState.activeChapter && readerState.activeChapterList.length) {
const idx = readerState.activeChapterList.findIndex(c => c.id === readerState.activeChapter!.id);
if (idx >= 0) {
const next = readerState.activeChapterList[idx + 1];
const prev = readerState.activeChapterList[idx - 1];
if (next) fetchPages(next.id, useBlob).then(urls => urls.slice(0, 8).forEach(u => preloadImage(u, useBlob))).catch(() => {});
if (prev) fetchPages(prev.id, useBlob).then(urls => urls.slice(0, 2).forEach(u => preloadImage(u, useBlob))).catch(() => {});
} }
} });
}); });
$effect(() => { $effect(() => {
@@ -507,13 +462,19 @@
if (pageNum > 1) hasNavigated = true; if (pageNum > 1) hasNavigated = true;
untrack(() => { untrack(() => {
if (!hasNavigated) return; if (!hasNavigated) return;
if (style === "longstrip" && readerState.visibleChapterId && chapterId !== readerState.visibleChapterId) return; if (style === "longstrip" && visibleChapterId && chapterId !== visibleChapterId) return;
if (settingsState.settings.autoBookmark ?? true) { if (settingsState.settings.autoBookmark ?? true) {
const existing = readerState.bookmarks.find(b => b.mangaId === mangaId && b.chapterId !== chapterId); seriesState.setBookmark({ mangaId, mangaTitle, thumbnailUrl: thumb, chapterId, chapterName, pageNumber: pageNum });
if (existing) readerState.removeBookmark(existing.chapterId);
readerState.addBookmark({ mangaId, mangaTitle, thumbnailUrl: thumb, chapterId, chapterName, pageNumber: pageNum });
} }
if (style !== "longstrip" && (settingsState.settings.autoMarkRead ?? true) && atLast) markChapterRead(chapterId, markedRead); if (style !== "longstrip" && (settingsState.settings.autoMarkRead ?? true) && atLast) markChapterRead(chapterId, markedRead);
if (pageNum > 1 && !markedRead.has(chapterId)) {
if (progressTimer) clearTimeout(progressTimer);
progressTimer = setTimeout(() => {
getAdapter().updateChaptersProgress([String(chapterId)], { lastPageRead: pageNum }).catch(console.error);
progressTimer = null;
}, 2_000);
}
}); });
} }
}); });
@@ -547,12 +508,12 @@
abortCtrl.current?.abort(); abortCtrl.current?.abort();
if (hideTimer) clearTimeout(hideTimer); if (hideTimer) clearTimeout(hideTimer);
if (roTimer) clearTimeout(roTimer); if (roTimer) clearTimeout(roTimer);
if (progressTimer) clearTimeout(progressTimer);
window.removeEventListener("keydown", onKey); window.removeEventListener("keydown", onKey);
window.removeEventListener("mousemove", pageViewRef.onInspectMouseMove); window.removeEventListener("mousemove", pageViewRef.onInspectMouseMove);
window.removeEventListener("mouseup", pageViewRef.onInspectMouseUp); window.removeEventListener("mouseup", pageViewRef.onInspectMouseUp);
window.removeEventListener("pointermove", pageViewRef.onPointerMove); window.removeEventListener("pointermove", pageViewRef.onPointerMove);
window.removeEventListener("pointerup", pageViewRef.onPointerUp); window.removeEventListener("pointerup", pageViewRef.onPointerUp);
cleanupScroll();
ro.disconnect(); ro.disconnect();
}; };
}); });
@@ -596,6 +557,7 @@
onClampZoom={clampZoom} onClampZoom={clampZoom}
onApplySettings={applySettings} onApplySettings={applySettings}
onSettingsOpen={() => { app.setSettingsOpen(true); }} onSettingsOpen={() => { app.setSettingsOpen(true); }}
onOpenPreview={() => { if (readerState.activeManga) setPreviewManga(readerState.activeManga); }}
{perMangaEnabled} {perMangaEnabled}
/> />
@@ -622,6 +584,7 @@
resumePage={readerState.resumePage} resumePage={readerState.resumePage}
resumeFading={readerState.resumeFading} resumeFading={readerState.resumeFading}
{adjacent} {adjacent}
{barPosition}
onDismissResume={() => { readerState.resumeVisible = false; readerState.resumeFading = false; }} onDismissResume={() => { readerState.resumeVisible = false; readerState.resumeFading = false; }}
/> />
@@ -632,10 +595,11 @@
error={readerState.error} error={readerState.error}
pageReady={readerState.pageReady} pageReady={readerState.pageReady}
pageGroups={readerState.pageGroups} pageGroups={readerState.pageGroups}
{currentGroup} {stripToRender} {currentGroup}
fadingOut={readerState.fadingOut} fadingOut={readerState.fadingOut}
{tapToToggleBar} {tapToToggleBar}
{pinchZoomEnabled} {pinchZoomEnabled}
{useBlob}
{barPosition} {barPosition}
onGetZoom={() => zoom} onGetZoom={() => zoom}
onSetZoom={(z) => { captureZoomAnchor(containerEl, style, zoomAnchor); applySettings({ readerZoom: z }); restoreZoomAnchor(containerEl, zoomAnchor); }} onSetZoom={(z) => { captureZoomAnchor(containerEl, style, zoomAnchor); applySettings({ readerZoom: z }); restoreZoomAnchor(containerEl, zoomAnchor); }}
@@ -644,6 +608,28 @@
onWheel={handleWheel} onWheel={handleWheel}
onToggleUi={toggleUiVisibility} onToggleUi={toggleUiVisibility}
{bindContainer} {bindContainer}
onPageChange={(p) => { readerState.pageNumber = p; }}
onChapterChange={(id) => { visibleChapterId = id; }}
onCenterIdxChange={(idx) => { pageViewRef?.notifyScrollCenter(idx); }}
onMarkRead={(id) => markChapterRead(id, markedRead)}
onAppend={() => {
if (appending) return;
const chunks = pageViewRef?.getStripChunks() ?? [];
if (!chunks.length) return;
const lastChunk = chunks[chunks.length - 1];
const list = readerState.activeChapterList;
const lastIdx = list.findIndex(c => c.id === lastChunk.chapterId);
if (lastIdx < 0 || lastIdx >= list.length - 1) return;
const next = list[lastIdx + 1];
if (!next || chunks.some(c => c.chapterId === next.id)) return;
appending = true;
fetchPages(next.id, useBlob)
.then(urls => {
urls.slice(0, 6).forEach(url => preloadImage(url, useBlob));
return pageViewRef.appendStripChunk(next.id, next.name, urls);
})
.finally(() => { appending = false; });
}}
/> />
{#snippet progressBarSnippet()} {#snippet progressBarSnippet()}
@@ -656,7 +642,7 @@
{barPosition} {barPosition}
onGoPrev={goPrev} onGoPrev={goPrev}
onGoNext={goNext} onGoNext={goNext}
onJumpToPage={(p) => jumpToPage(p, style, lastPage, containerEl)} onJumpToPage={(p, commit) => primedJump(p, commit)}
/> />
{/snippet} {/snippet}
@@ -670,7 +656,7 @@
{barPosition} {barPosition}
onGoPrev={goPrev} onGoPrev={goPrev}
onGoNext={goNext} onGoNext={goNext}
onJumpToPage={(p) => jumpToPage(p, style, lastPage, containerEl)} onJumpToPage={(p, commit) => primedJump(p, commit)}
/> />
{/if} {/if}
</div> </div>
@@ -36,6 +36,7 @@
onClampZoom: (z: number) => number; onClampZoom: (z: number) => number;
onApplySettings: (patch: Partial<ReaderSettings>) => void; onApplySettings: (patch: Partial<ReaderSettings>) => void;
onSettingsOpen: () => void; onSettingsOpen: () => void;
onOpenPreview: () => void;
perMangaEnabled: boolean; perMangaEnabled: boolean;
} }
@@ -47,7 +48,7 @@
barPosition, progressBar, barPosition, progressBar,
onCaptureZoomAnchor, onRestoreZoomAnchor, onCaptureZoomAnchor, onRestoreZoomAnchor,
onMaybeMarkRead, onToggleBookmark, onCommitMarker, onDeleteMarker, onMaybeMarkRead, onToggleBookmark, onCommitMarker, onDeleteMarker,
onClampZoom, onApplySettings, onSettingsOpen, onClampZoom, onApplySettings, onSettingsOpen, onOpenPreview,
perMangaEnabled, perMangaEnabled,
}: Props = $props(); }: Props = $props();
@@ -138,7 +139,7 @@
<div class="bar-divider"></div> <div class="bar-divider"></div>
<button class="icon-btn" <button class="icon-btn"
onclick={() => { if (adjacent.prev) { onMaybeMarkRead(); readerState.openReader(adjacent.prev, readerState.activeChapterList); } }} onclick={() => { if (adjacent.prev) { onMaybeMarkRead(); readerState.openReader(adjacent.prev); } }}
disabled={!adjacent.prev} disabled={!adjacent.prev}
title="Previous chapter"> title="Previous chapter">
{#if isVertical}<CaretUp size={13} weight="regular" />{:else}<CaretLeft size={13} weight="regular" />{/if} {#if isVertical}<CaretUp size={13} weight="regular" />{:else}<CaretLeft size={13} weight="regular" />{/if}
@@ -155,12 +156,12 @@
<span class="ch-info">&#xE2CE;</span> <span class="ch-info">&#xE2CE;</span>
{:else} {:else}
<span class="ch-marquee-track" onwheel={(e) => { e.stopPropagation(); (e.currentTarget as HTMLElement).scrollLeft += e.deltaY; }}> <span class="ch-marquee-track" onwheel={(e) => { e.stopPropagation(); (e.currentTarget as HTMLElement).scrollLeft += e.deltaY; }}>
<span class="ch-marquee-content"> <button class="ch-marquee-content ch-preview-btn" onclick={onOpenPreview}>
<span class="ch-title">{readerState.activeManga?.title}</span> <span class="ch-title">{readerState.activeManga?.title}</span>
<span class="ch-sep">/</span> <span class="ch-sep">/</span>
<span class="ch-name">{displayChapter?.name}</span> <span class="ch-name">{displayChapter?.name}</span>
</button>
</span> </span>
</span>
{/if} {/if}
</div> </div>
{#if !isVertical} {#if !isVertical}
@@ -178,7 +179,7 @@
</div> </div>
<button class="icon-btn" <button class="icon-btn"
onclick={() => { if (adjacent.next) { onMaybeMarkRead(); readerState.openReader(adjacent.next, readerState.activeChapterList); } }} onclick={() => { if (adjacent.next) { onMaybeMarkRead(); readerState.openReader(adjacent.next); } }}
disabled={!adjacent.next} disabled={!adjacent.next}
title="Next chapter"> title="Next chapter">
{#if isVertical}<CaretDown size={13} weight="regular" />{:else}<CaretRight size={13} weight="regular" />{/if} {#if isVertical}<CaretDown size={13} weight="regular" />{:else}<CaretRight size={13} weight="regular" />{/if}
@@ -494,6 +495,8 @@
.ch-marquee-track { overflow-x: auto; min-width: 0; flex: 1; scrollbar-width: none; } .ch-marquee-track { overflow-x: auto; min-width: 0; flex: 1; scrollbar-width: none; }
.ch-marquee-track::-webkit-scrollbar { display: none; } .ch-marquee-track::-webkit-scrollbar { display: none; }
.ch-marquee-content { display: inline-flex; align-items: center; gap: var(--sp-2); white-space: nowrap; } .ch-marquee-content { display: inline-flex; align-items: center; gap: var(--sp-2); white-space: nowrap; }
.ch-preview-btn { background: none; border: none; cursor: pointer; padding: 0; font-size: inherit; font-family: inherit; border-radius: var(--radius-sm); transition: opacity var(--t-fast); }
.ch-preview-btn:hover { opacity: 0.7; }
.ch-title { color: var(--text-secondary); font-weight: var(--weight-medium); } .ch-title { color: var(--text-secondary); font-weight: var(--weight-medium); }
.ch-sep { color: var(--text-faint); flex-shrink: 0; } .ch-sep { color: var(--text-faint); flex-shrink: 0; }
.ch-name { color: var(--text-muted); } .ch-name { color: var(--text-muted); }
+21 -28
View File
@@ -1,6 +1,5 @@
<script lang="ts"> <script lang="ts">
import { readerState } from "$lib/state/reader.svelte"; import { readerState } from "$lib/state/reader.svelte";
import { settingsState } from "$lib/state/settings.svelte";
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import type { Chapter } from "$lib/types"; import type { Chapter } from "$lib/types";
@@ -15,28 +14,6 @@
const { showResumeBanner, resumePage, resumeFading, adjacent, onDismissResume, barPosition }: Props = $props(); const { showResumeBanner, resumePage, resumeFading, adjacent, onDismissResume, barPosition }: Props = $props();
async function gqlMutation(query: string, variables: Record<string, unknown>): Promise<void> {
const base = settingsState.settings.serverUrl ?? "http://localhost:4567";
const headers: Record<string, string> = { "Content-Type": "application/json" };
const mode = settingsState.settings.serverAuthMode ?? "NONE";
if (mode === "BASIC_AUTH") {
const u = settingsState.settings.serverAuthUser?.trim() ?? "";
const p = settingsState.settings.serverAuthPass?.trim() ?? "";
if (u && p) headers["Authorization"] = `Basic ${btoa(`${u}:${p}`)}`;
}
const res = await fetch(`${base}/api/graphql`, {
method: "POST",
headers,
body: JSON.stringify({ query, variables }),
});
if (!res.ok) throw new Error(`HTTP ${res.status}`);
const json = await res.json();
if (json.errors?.length) throw new Error(json.errors[0].message);
}
const ENQUEUE_ONE = `mutation EnqueueOne($id: Int!) { fetchChapterPages(input: { chapterId: $id }) { chapter { id } } }`;
const ENQUEUE_MANY = `mutation EnqueueMany($ids: [Int!]!) { enqueueChaptersDownloads(input: { ids: $ids }) { downloadStatus { queue { chapter { id } } } } }`;
async function runDl(fn: () => Promise<void>) { async function runDl(fn: () => Promise<void>) {
readerState.dlBusy = true; readerState.dlBusy = true;
try { await fn(); } catch (e) { console.error(e); } try { await fn(); } catch (e) { console.error(e); }
@@ -44,11 +21,27 @@
readerState.dlOpen = false; readerState.dlOpen = false;
} }
let bannerMounted = $state(false);
let bannerFading = $state(false);
$effect(() => {
if (showResumeBanner) {
bannerMounted = true;
bannerFading = false;
} else if (bannerMounted) {
bannerFading = true;
}
});
const queueable = $derived(adjacent.remaining.filter(c => !c.downloaded)); const queueable = $derived(adjacent.remaining.filter(c => !c.downloaded));
function onBannerAnimationEnd() {
if (bannerFading) { bannerMounted = false; bannerFading = false; }
}
</script> </script>
{#if showResumeBanner} {#if bannerMounted}
<button class="resume-banner" class:fading={resumeFading} onclick={onDismissResume}> <button class="resume-banner" class:fading={bannerFading} onclick={onDismissResume} onanimationend={onBannerAnimationEnd}>
Bookmark at page {resumePage} Bookmark at page {resumePage}
</button> </button>
{/if} {/if}
@@ -60,14 +53,14 @@
<p class="dl-title">Download</p> <p class="dl-title">Download</p>
<button class="dl-option" disabled={readerState.dlBusy || !!chapter.downloaded} <button class="dl-option" disabled={readerState.dlBusy || !!chapter.downloaded}
onclick={() => runDl(() => gqlMutation(ENQUEUE_ONE, { id: chapter.id }))}> onclick={() => runDl(() => getAdapter().enqueueDownload(String(chapter.id)))}>
This chapter This chapter
<span class="dl-sub">{chapter.downloaded ? "Already downloaded" : chapter.name}</span> <span class="dl-sub">{chapter.downloaded ? "Already downloaded" : chapter.name}</span>
</button> </button>
<div class="dl-row"> <div class="dl-row">
<button class="dl-option" disabled={readerState.dlBusy || queueable.length === 0} <button class="dl-option" disabled={readerState.dlBusy || queueable.length === 0}
onclick={() => runDl(() => gqlMutation(ENQUEUE_MANY, { ids: queueable.slice(0, readerState.nextN).map(c => c.id) }))}> onclick={() => runDl(() => getAdapter().enqueueDownloads(queueable.slice(0, readerState.nextN).map(c => String(c.id))))}>
Next chapters Next chapters
<span class="dl-sub">{Math.min(readerState.nextN, queueable.length)} not yet downloaded</span> <span class="dl-sub">{Math.min(readerState.nextN, queueable.length)} not yet downloaded</span>
</button> </button>
@@ -79,7 +72,7 @@
</div> </div>
<button class="dl-option" disabled={readerState.dlBusy || queueable.length === 0} <button class="dl-option" disabled={readerState.dlBusy || queueable.length === 0}
onclick={() => runDl(() => gqlMutation(ENQUEUE_MANY, { ids: queueable.map(c => c.id) }))}> onclick={() => runDl(() => getAdapter().enqueueDownloads(queueable.map(c => String(c.id))))}>
All remaining All remaining
<span class="dl-sub">{queueable.length} not yet downloaded</span> <span class="dl-sub">{queueable.length} not yet downloaded</span>
</button> </button>
@@ -20,7 +20,7 @@
barPosition: "top" | "left" | "right"; barPosition: "top" | "left" | "right";
onGoPrev: () => void; onGoPrev: () => void;
onGoNext: () => void; onGoNext: () => void;
onJumpToPage: (page: number) => void; onJumpToPage: (page: number, commit?: boolean) => void;
} }
const { const {
@@ -32,12 +32,22 @@
const isVertical = $derived(barPosition === "left" || barPosition === "right"); const isVertical = $derived(barPosition === "left" || barPosition === "right");
const hValue = $derived(rtl ? sliderMax - sliderPage + 1 : sliderPage); const hPct = $derived(`--pct:${sliderPct}%`);
const hPct = $derived(`--pct:${sliderPct}%`);
function sliderValToPage(raw: number): number {
return rtl ? sliderMax - raw + 1 : raw;
}
function pageToSliderVal(page: number): number {
return rtl ? sliderMax - page + 1 : page;
}
function handleH(e: Event) { function handleH(e: Event) {
const raw = Number((e.target as HTMLInputElement).value); onJumpToPage(sliderValToPage(Number((e.target as HTMLInputElement).value)), false);
onJumpToPage(rtl ? sliderMax - raw + 1 : raw); }
function handleHCommit(e: Event) {
onJumpToPage(sliderValToPage(Number((e.target as HTMLInputElement).value)), true);
} }
function markerPct(pageNumber: number, forRtl = false): number { function markerPct(pageNumber: number, forRtl = false): number {
@@ -46,9 +56,9 @@
return ((ord - 1) / (sliderMax - 1)) * 100; return ((ord - 1) / (sliderMax - 1)) * 100;
} }
// Custom vertical slider
let trackEl = $state<HTMLDivElement | null>(null); let trackEl = $state<HTMLDivElement | null>(null);
let dragging = $state(false); let dragging = $state(false);
let pendingPage = 0;
function pctFromPointer(clientY: number): number { function pctFromPointer(clientY: number): number {
if (!trackEl) return 0; if (!trackEl) return 0;
@@ -64,22 +74,24 @@
if (e.button !== 0) return; if (e.button !== 0) return;
e.preventDefault(); e.preventDefault();
(e.currentTarget as HTMLElement).setPointerCapture(e.pointerId); (e.currentTarget as HTMLElement).setPointerCapture(e.pointerId);
dragging = true; dragging = true;
readerState.sliderDragging = true; readerState.sliderDragging = true;
const pct = pctFromPointer(e.clientY); pendingPage = pageFromPct(pctFromPointer(e.clientY));
onJumpToPage(pageFromPct(pct)); onJumpToPage(pendingPage, false);
} }
function handleTrackPointerMove(e: PointerEvent) { function handleTrackPointerMove(e: PointerEvent) {
if (!dragging) return; if (!dragging) return;
const pct = pctFromPointer(e.clientY); pendingPage = pageFromPct(pctFromPointer(e.clientY));
onJumpToPage(pageFromPct(pct)); onJumpToPage(pendingPage, false);
} }
function handleTrackPointerUp(e: PointerEvent) { function handleTrackPointerUp(e: PointerEvent) {
if (!dragging) return; if (!dragging) return;
dragging = false; dragging = false;
readerState.sliderDragging = false; readerState.sliderDragging = false;
readerState.sliderHover = false;
onJumpToPage(pendingPage, true);
} }
</script> </script>
@@ -102,8 +114,9 @@
style={hPct} style={hPct}
min={1} min={1}
max={sliderMax} max={sliderMax}
value={hValue} value={pageToSliderVal(sliderPage)}
oninput={handleH} oninput={handleH}
onchange={handleHCommit}
onmousedown={() => readerState.sliderDragging = true} onmousedown={() => readerState.sliderDragging = true}
onmouseup={() => readerState.sliderDragging = false} onmouseup={() => readerState.sliderDragging = false}
/> />
@@ -1,4 +1,5 @@
import { readerState, DEFAULT_MANGA_PREFS } from "$lib/state/reader.svelte"; import { readerState, DEFAULT_MANGA_PREFS } from "$lib/state/reader.svelte";
import { seriesState } from "$lib/state/series.svelte";
import { settingsState } from "$lib/state/settings.svelte"; import { settingsState } from "$lib/state/settings.svelte";
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import type { MangaPrefs } from "$lib/types/settings"; import type { MangaPrefs } from "$lib/types/settings";
@@ -18,7 +19,7 @@ export function markChapterRead(id: number, markedRead: Set<number>) {
const manga = readerState.activeManga; const manga = readerState.activeManga;
if (manga && chapter) { if (manga && chapter) {
readerState.addBookmark({ seriesState.setBookmark({
mangaId: manga.id, mangaId: manga.id,
mangaTitle: manga.title, mangaTitle: manga.title,
thumbnailUrl: manga.thumbnailUrl, thumbnailUrl: manga.thumbnailUrl,
@@ -35,8 +36,8 @@ export function markChapterRead(id: number, markedRead: Set<number>) {
const mangaId = readerState.activeManga?.id; const mangaId = readerState.activeManga?.id;
if (!mangaId) return; if (!mangaId) return;
readerState.activeChapterList = readerState.activeChapterList.map(c => seriesState.patchChapters(mangaId, chapters =>
c.id === id ? { ...c, read: true } : c chapters.map(c => c.id === id ? { ...c, read: true } : c),
); );
const prefs = getMangaPrefs(mangaId); const prefs = getMangaPrefs(mangaId);
@@ -79,15 +80,13 @@ export function toggleBookmark(chapter: typeof readerState.activeChapter, pageNu
const manga = readerState.activeManga; const manga = readerState.activeManga;
if (!chapter || !manga) return; if (!chapter || !manga) return;
const existing = readerState.bookmarks.find( const existing = seriesState.bookmarks.find(
b => b.mangaId === manga.id && b.chapterId === chapter.id && b.pageNumber === pageNumber, b => b.mangaId === manga.id && b.chapterId === chapter.id && b.pageNumber === pageNumber,
); );
if (existing) { if (existing) {
readerState.removeBookmark(chapter.id); seriesState.removeBookmark(chapter.id);
} else { } else {
const other = readerState.bookmarks.find(b => b.mangaId === manga.id && b.chapterId !== chapter.id); seriesState.setBookmark({
if (other) readerState.removeBookmark(other.chapterId);
readerState.addBookmark({
mangaId: manga.id, mangaId: manga.id,
mangaTitle: manga.title, mangaTitle: manga.title,
thumbnailUrl: manga.thumbnailUrl, thumbnailUrl: manga.thumbnailUrl,
@@ -103,9 +102,9 @@ export function commitMarker(color: MarkerColor, note: string, editId: string) {
const manga = readerState.activeManga; const manga = readerState.activeManga;
if (!chapter || !manga) return; if (!chapter || !manga) return;
if (editId) { if (editId) {
readerState.updateMarker(editId, { note: note.trim(), color }); seriesState.updateMarker(editId, { note: note.trim(), color });
} else { } else {
readerState.addMarker({ seriesState.addMarker({
mangaId: manga.id, mangaId: manga.id,
mangaTitle: manga.title, mangaTitle: manga.title,
thumbnailUrl: manga.thumbnailUrl, thumbnailUrl: manga.thumbnailUrl,
+38 -10
View File
@@ -1,13 +1,17 @@
import { readerState } from "$lib/state/reader.svelte"; import { readerState } from "$lib/state/reader.svelte";
import { fetchPages } from "./pageLoader"; import { seriesState } from "$lib/state/series.svelte";
import { cancelQueuedFetches } from "$lib/core/cache/imageCache"; import { fetchPages } from "./pageLoader";
import { clearResolvedUrlCache } from "$lib/core/cache/pageCache"; import { cancelQueuedFetches, revokeBlobUrl, preloadBlobUrls } from "$lib/core/cache/imageCache";
import { clearResolvedUrlCache, clearPageCache } from "$lib/core/cache/pageCache";
export function scheduleResumeDismiss() { export function scheduleResumeDismiss() {
setTimeout(() => { readerState.resumeFading = true; }, 1500); setTimeout(() => { readerState.resumeFading = true; }, 1500);
setTimeout(() => { readerState.resumeVisible = false; readerState.resumeFading = false; }, 2500); setTimeout(() => { readerState.resumeVisible = false; readerState.resumeFading = false; }, 2500);
} }
let prefetchedChapterId: number | null = null;
let prefetchedUrls: string[] = [];
export async function loadChapter( export async function loadChapter(
id: number, id: number,
useBlob: boolean, useBlob: boolean,
@@ -21,33 +25,57 @@ export async function loadChapter(
abortCtrl.current = ctrl; abortCtrl.current = ctrl;
cancelQueuedFetches(); cancelQueuedFetches();
if (useBlob) clearResolvedUrlCache(); if (useBlob) {
clearResolvedUrlCache();
for (const url of readerState.pageUrls) revokeBlobUrl(url);
if (prefetchedChapterId !== null && prefetchedChapterId !== id) {
for (const url of prefetchedUrls) revokeBlobUrl(url);
clearPageCache(prefetchedChapterId);
}
prefetchedChapterId = null;
prefetchedUrls = [];
}
startAtLastPage.current = false; startAtLastPage.current = false;
markedRead.clear(); markedRead.clear();
readerState.resetForChapter(); readerState.resetForChapter();
readerState.pageUrls = []; readerState.pageUrls = [];
const bookmark = readerState.bookmarks.find(b => b.chapterId === id); const bookmark = seriesState.bookmarks.find(b => b.chapterId === id);
const resumeTo = bookmark ? bookmark.pageNumber : 0; const resumeTo = bookmark ? bookmark.pageNumber : 0;
readerState.resumePage = resumeTo > 1 ? resumeTo : 0; readerState.resumePage = resumeTo > 1 ? resumeTo : 0;
readerState.resumeDismissed = false; readerState.resumeDismissed = false;
readerState.resumeVisible = resumeTo > 1; readerState.resumeVisible = false;
if (resumeTo > 1) scheduleResumeDismiss();
readerState.pageNumber = 1; readerState.pageNumber = 1;
try { try {
const urls = await fetchPages(id, useBlob, ctrl.signal, resumeTo > 1 ? resumeTo - 1 : 0); const urls = await fetchPages(id, useBlob, ctrl.signal, resumeTo > 1 ? resumeTo - 1 : 0);
if (ctrl.signal.aborted) return; if (ctrl.signal.aborted) return;
readerState.pageUrls = urls; readerState.pageUrls = urls;
if (useBlob && resumeTo > 1) {
const lo = Math.max(0, resumeTo - 2);
const hi = Math.min(urls.length, resumeTo + 4);
preloadBlobUrls(urls.slice(lo, hi), 900);
}
if (startAtLastPage.current) readerState.pageNumber = urls.length; if (startAtLastPage.current) readerState.pageNumber = urls.length;
else if (resumeTo > 1) readerState.pageNumber = Math.min(resumeTo, urls.length || resumeTo); else if (resumeTo > 1) readerState.pageNumber = Math.min(resumeTo, urls.length || resumeTo);
readerState.pageReady = true; readerState.pageReady = true;
readerState.loading = false; readerState.loading = false;
if (adjacent.next) fetchPages(adjacent.next.id, useBlob, ctrl.signal).catch(() => {}); if (resumeTo > 1) readerState.resumeVisible = true;
if (adjacent.next) {
prefetchedChapterId = adjacent.next.id;
fetchPages(adjacent.next.id, useBlob, ctrl.signal)
.then(fetched => {
if (!ctrl.signal.aborted && prefetchedChapterId === adjacent.next!.id) {
prefetchedUrls = fetched;
}
})
.catch(() => {});
}
} catch (e: unknown) { } catch (e: unknown) {
if (ctrl.signal.aborted) return; if (ctrl.signal.aborted) return;
readerState.error = e instanceof Error ? e.message : String(e); readerState.error = e instanceof Error ? e.message : String(e);
readerState.loading = false; readerState.loading = false;
} }
} }
+25 -10
View File
@@ -11,11 +11,11 @@ function advanceGroup(forward: boolean, adjacent: Adjacent, startAtLastPage: ()
const gi = readerState.pageGroups.findIndex(g => g.includes(readerState.pageNumber)); const gi = readerState.pageGroups.findIndex(g => g.includes(readerState.pageNumber));
if (forward) { if (forward) {
if (gi < readerState.pageGroups.length - 1) readerState.pageNumber = readerState.pageGroups[gi + 1][0]; if (gi < readerState.pageGroups.length - 1) readerState.pageNumber = readerState.pageGroups[gi + 1][0];
else if (adjacent.next) { readerState.pageNumber = 1; openReader(adjacent.next, readerState.activeChapterList); } else if (adjacent.next) { readerState.pageNumber = 1; openReader(adjacent.next); }
else closeReader(); else closeReader();
} else { } else {
if (gi > 0) readerState.pageNumber = readerState.pageGroups[gi - 1][0]; if (gi > 0) readerState.pageNumber = readerState.pageGroups[gi - 1][0];
else if (adjacent.prev) { startAtLastPage(); openReader(adjacent.prev, readerState.activeChapterList); } else if (adjacent.prev) { startAtLastPage(); openReader(adjacent.prev); }
} }
} }
@@ -35,7 +35,7 @@ export function goForward(
) { ) {
if (readerState.loading) return; if (readerState.loading) return;
if (style === "longstrip") { if (style === "longstrip") {
if (adjacent.next) { onMaybeMarkRead(); openReader(adjacent.next, readerState.activeChapterList); } if (adjacent.next) { onMaybeMarkRead(); openReader(adjacent.next); }
return; return;
} }
if (style === "double" && readerState.pageGroups.length) { advanceGroup(true, adjacent, startAtLastPage); return; } if (style === "double" && readerState.pageGroups.length) { advanceGroup(true, adjacent, startAtLastPage); return; }
@@ -46,14 +46,14 @@ export function goForward(
} else if (adjacent.next) { } else if (adjacent.next) {
onMaybeMarkRead(); onMaybeMarkRead();
readerState.pageNumber = 1; readerState.pageNumber = 1;
openReader(adjacent.next, readerState.activeChapterList); openReader(adjacent.next);
} else closeReader(); } else closeReader();
} }
export function goBack(style: string, adjacent: Adjacent, startAtLastPage: () => void) { export function goBack(style: string, adjacent: Adjacent, startAtLastPage: () => void) {
if (readerState.loading) return; if (readerState.loading) return;
if (style === "longstrip") { if (style === "longstrip") {
if (adjacent.prev) { startAtLastPage(); openReader(adjacent.prev, readerState.activeChapterList); } if (adjacent.prev) { startAtLastPage(); openReader(adjacent.prev); }
return; return;
} }
if (style === "double" && readerState.pageGroups.length) { advanceGroup(false, adjacent, startAtLastPage); return; } if (style === "double" && readerState.pageGroups.length) { advanceGroup(false, adjacent, startAtLastPage); return; }
@@ -61,17 +61,32 @@ export function goBack(style: string, adjacent: Adjacent, startAtLastPage: () =>
if (readerState.pageNumber > 1) { if (readerState.pageNumber > 1) {
if (style === "fade") animateFade(() => { readerState.pageNumber--; }); if (style === "fade") animateFade(() => { readerState.pageNumber--; });
else readerState.pageNumber--; else readerState.pageNumber--;
} else if (adjacent.prev) { startAtLastPage(); openReader(adjacent.prev, readerState.activeChapterList); } } else if (adjacent.prev) { startAtLastPage(); openReader(adjacent.prev); }
} }
export function jumpToPage(page: number, style: string, lastPage: number, containerEl: HTMLElement | null) { export function jumpToPage(
page: number,
style: string,
lastPage: number,
scrollToFlatIndex: ((idx: number) => void) | null,
activeChapterId: number,
chunks: { chapterId: number; urls: string[] }[],
) {
if (style === "longstrip") { if (style === "longstrip") {
const chId = readerState.visibleChapterId ?? readerState.activeChapter?.id; if (!scrollToFlatIndex || !chunks.length) return;
containerEl?.querySelector<HTMLImageElement>(`img[data-local-page="${page}"][data-chapter="${chId}"]`)?.scrollIntoView({ block: "start" }); let offset = 0;
for (const chunk of chunks) {
if (chunk.chapterId === activeChapterId) {
scrollToFlatIndex(offset + Math.max(0, page - 1));
return;
}
offset += chunk.urls.length;
}
scrollToFlatIndex(Math.max(0, page - 1));
return; return;
} }
if (style === "double" && readerState.pageGroups.length) { if (style === "double" && readerState.pageGroups.length) {
const group = readerState.pageGroups[page - 1]; const group = readerState.pageGroups.find(g => g.includes(page)) ?? readerState.pageGroups.findLast(g => g[0] <= page);
if (group) readerState.pageNumber = group[0]; if (group) readerState.pageNumber = group[0];
} else { } else {
readerState.pageNumber = Math.max(1, Math.min(lastPage, page)); readerState.pageNumber = Math.max(1, Math.min(lastPage, page));
+2 -2
View File
@@ -1,4 +1,4 @@
export { fetchPages, resolveUrl, preloadImage, measureAspect, clearPageCache, clearResolvedUrlCache } from "$lib/core/cache/pageCache"; export { fetchPages, resolveUrl, preloadImage, measureAspect, clearPageCache, clearResolvedUrlCache, getCachedAspect } from "$lib/core/cache/pageCache";
export function buildPageGroups(urls: string[], aspects: number[], offsetSpreads: boolean): number[][] { export function buildPageGroups(urls: string[], aspects: number[], offsetSpreads: boolean): number[][] {
const groups: number[][] = [[1]]; const groups: number[][] = [[1]];
@@ -10,4 +10,4 @@ export function buildPageGroups(urls: string[], aspects: number[], offsetSpreads
else { groups.push([i, i + 1]); i += 2; } else { groups.push([i, i + 1]); i += 2; }
} }
return groups; return groups;
} }
@@ -1,100 +1 @@
export const READ_LINE_PCT = 0.50; export const READ_LINE_PCT = 0.50;
export interface StripChapter {
chapterId: number;
chapterName: string;
urls: string[];
}
export interface ScrollHandlerCallbacks {
onPageChange: (page: number) => void;
onChapterChange: (chapterId: number) => void;
onMarkRead: (chapterId: number) => void;
onAppend: () => void;
getStripChapters: () => StripChapter[];
getPageUrls: () => string[];
shouldAutoMark: () => boolean;
}
export function setupScrollTracking(
containerEl: HTMLElement,
callbacks: ScrollHandlerCallbacks,
): () => void {
const { onPageChange, onChapterChange, onMarkRead, onAppend, getStripChapters, getPageUrls, shouldAutoMark } = callbacks;
let rafId: number | null = null;
function tick() {
rafId = null;
const imgs = containerEl.querySelectorAll<HTMLElement>("img[data-local-page]");
if (!imgs.length) return;
const containerTop = containerEl.getBoundingClientRect().top;
const readLineY = containerTop + containerEl.clientHeight * READ_LINE_PCT;
let lo = 0, hi = imgs.length - 1, best = 0;
while (lo <= hi) {
const mid = (lo + hi) >>> 1;
if (imgs[mid].getBoundingClientRect().top <= readLineY) { best = mid; lo = mid + 1; }
else hi = mid - 1;
}
const active = imgs[best];
const activePage = Number(active.dataset.localPage);
const activeChId = Number(active.dataset.chapter);
onPageChange(activePage);
if (activeChId) onChapterChange(activeChId);
if (shouldAutoMark() && activeChId) {
const chunks = getStripChapters();
const chunk = chunks.find(c => c.chapterId === activeChId);
const total = chunk ? chunk.urls.length : getPageUrls().length;
if (total > 0 && activePage >= total) onMarkRead(activeChId);
const atBottom = containerEl.scrollTop + containerEl.clientHeight >= containerEl.scrollHeight - 40;
if (atBottom) {
const last = chunks[chunks.length - 1];
if (last) onMarkRead(last.chapterId);
}
}
const pct = (containerEl.scrollTop + containerEl.clientHeight) / containerEl.scrollHeight;
if (pct >= 0.80) onAppend();
}
function onScroll() {
if (rafId !== null) return;
rafId = requestAnimationFrame(tick);
}
containerEl.addEventListener("scroll", onScroll, { passive: true });
return () => {
containerEl.removeEventListener("scroll", onScroll);
if (rafId !== null) cancelAnimationFrame(rafId);
};
}
export function appendNextChapter(
stripChapters: StripChapter[],
chapterList: { id: number; name: string }[],
fetchPages: (chapterId: number) => Promise<string[]>,
preloadImage: (url: string) => void,
onAppended: (next: StripChapter) => void,
onDone: () => void,
): void {
if (!stripChapters.length) return;
const lastChunk = stripChapters[stripChapters.length - 1];
const lastIdx = chapterList.findIndex(c => c.id === lastChunk.chapterId);
if (lastIdx < 0 || lastIdx >= chapterList.length - 1) return;
const next = chapterList[lastIdx + 1];
if (!next || stripChapters.some(c => c.chapterId === next.id)) return;
fetchPages(next.id)
.then(urls => { urls.slice(0, 6).forEach(preloadImage); return urls; })
.then(urls => {
if (stripChapters.some(c => c.chapterId === next.id)) { onDone(); return; }
onAppended({ chapterId: next.id, chapterName: next.name, urls });
onDone();
})
.catch(() => onDone());
}
@@ -0,0 +1,89 @@
<script lang="ts">
import { readerState } from "$lib/state/reader.svelte";
interface Props {
imgCls: string;
currentGroup: number[];
srcs: (string | null)[];
pageGroups: number[][];
}
const { imgCls, currentGroup, srcs, pageGroups }: Props = $props();
</script>
<div
class="inspect-wrap"
style="transform:scale({readerState.inspectScale}) translate({readerState.inspectPanX / readerState.inspectScale}px,{readerState.inspectPanY / readerState.inspectScale}px)"
>
{#if pageGroups.length}
<div class="double-wrap">
{#each currentGroup as pg, i (pg)}
{#if srcs[i]}
<img
src={srcs[i]}
alt="Page {pg}"
class="{imgCls} page-half {i === 0 ? 'gap-left' : 'gap-right'}"
decoding="async"
draggable="false"
/>
{:else}
<div class="page-loader page-half {i === 0 ? 'gap-left' : 'gap-right'}" aria-hidden="true">
{@render skeleton()}
</div>
{/if}
{/each}
</div>
{:else}
<div class="center-overlay">
<div class="page-loader page-loader-single" aria-hidden="true">{@render skeleton()}</div>
</div>
{/if}
</div>
{#snippet skeleton()}
<svg class="panel-skeleton" viewBox="0 0 100 150" fill="none" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet">
<rect class="ps-r ps-r1" x="2" y="2" width="62" height="88" rx="1"/>
<rect class="ps-r ps-r2" x="68" y="2" width="30" height="42" rx="1"/>
<rect class="ps-r ps-r3" x="68" y="48" width="30" height="42" rx="1"/>
<rect class="ps-r ps-r4" x="2" y="94" width="44" height="54" rx="1"/>
<rect class="ps-r ps-r5" x="50" y="94" width="48" height="54" rx="1"/>
</svg>
{/snippet}
<style>
.inspect-wrap { display: flex; align-items: center; justify-content: center; transform-origin: center center; will-change: transform; }
.double-wrap { display: flex; align-items: flex-start; justify-content: center; max-width: calc(var(--effective-width, 100%) * 2); width: 100%; }
.page-half { flex: 1; min-width: 0; object-fit: contain; }
.gap-left { margin-right: 2px; }
.gap-right { margin-left: 2px; }
.center-overlay { position: absolute; inset: 0; display: flex; align-items: center; justify-content: center; }
.page-loader { border-radius: var(--radius-sm); display: flex; align-items: stretch; }
.page-loader-single {
width: min(100%, var(--effective-width, 100%));
max-width: var(--effective-width, 100%);
max-height: calc(var(--visual-vh, 100vh) - 80px);
aspect-ratio: 2 / 3;
}
.panel-skeleton { width: 100%; height: 100%; }
.panel-skeleton :global(.ps-r) {
stroke: var(--border-strong); stroke-width: 0.8; fill: none;
stroke-dasharray: 400; stroke-dashoffset: 400;
animation: ps-shimmer 2s ease-in-out infinite;
}
.panel-skeleton :global(.ps-r1) { animation-delay: 0s; }
.panel-skeleton :global(.ps-r2) { animation-delay: 0.15s; }
.panel-skeleton :global(.ps-r3) { animation-delay: 0.3s; }
.panel-skeleton :global(.ps-r4) { animation-delay: 0.1s; }
.panel-skeleton :global(.ps-r5) { animation-delay: 0.25s; }
@keyframes ps-shimmer {
0% { stroke-dashoffset: 400; opacity: 0.25; }
40% { stroke-dashoffset: 0; opacity: 0.55; }
70% { stroke-dashoffset: 0; opacity: 0.55; }
100% { stroke-dashoffset: -400; opacity: 0.25; }
}
</style>
@@ -0,0 +1,409 @@
<script lang="ts">
import { tick } from "svelte";
import { readerState } from "$lib/state/reader.svelte";
import { settingsState } from "$lib/state/settings.svelte";
import { getCachedAspect } from "$lib/components/reader/lib/pageLoader";
export interface StripPage {
chapterId: number;
chapterName: string;
localIndex: number;
url: string;
total: number;
}
interface Props {
containerEl: HTMLDivElement | undefined;
flatPages: StripPage[];
imgCls: string;
effectiveWidth: number | undefined;
resolveUrl: (url: string, priority?: number) => Promise<string>;
barPosition: "top" | "left" | "right";
}
const { containerEl, flatPages, imgCls, effectiveWidth, resolveUrl, barPosition }: Props = $props();
const LOAD_RADIUS = 5;
const UNLOAD_RADIUS = 10;
let _loadedSet: Set<number> = new Set();
let _resolvedSrc: Record<number, string> = {};
let _version = $state(0);
const loadedSet = { has: (i: number) => _loadedSet.has(i) };
const resolvedSrc = { get: (i: number) => _resolvedSrc[i] as string | undefined };
let revokeQueue: string[] = [];
let centerIdx = $state(0);
const aspectMap = new Map<number, number>();
function scheduleRevoke(src: string) {
if (!src || !src.startsWith("blob:")) return;
revokeQueue.push(src);
requestAnimationFrame(() => {
const url = revokeQueue.shift();
if (url) { try { URL.revokeObjectURL(url); } catch {} }
});
}
function loadPage(idx: number) {
if (_loadedSet.has(idx)) return;
const page = flatPages[idx];
if (!page) return;
_loadedSet.add(idx);
const priority = (page.localIndex < 8 && page.chapterId === flatPages[0]?.chapterId) ? 8 - page.localIndex : 0;
resolveUrl(page.url, priority).then(src => {
if (_loadedSet.has(idx)) {
_resolvedSrc[idx] = src;
_version++;
} else {
scheduleRevoke(src);
}
});
}
function unloadPage(idx: number) {
if (!_loadedSet.has(idx)) return;
_loadedSet.delete(idx);
const aspect = aspectMap.get(idx);
if (aspect !== undefined && containerEl) {
const slot = containerEl.querySelectorAll<HTMLElement>(".strip-slot")[idx];
slot?.style.setProperty("--aspect", String(aspect));
}
const oldSrc = _resolvedSrc[idx];
if (oldSrc) {
delete _resolvedSrc[idx];
scheduleRevoke(oldSrc);
}
_version++;
}
let recalcTimer: ReturnType<typeof setTimeout> | null = null;
function recalcWindow(center: number) {
const lo = center - LOAD_RADIUS;
const hi = center + LOAD_RADIUS;
const evictLo = center - UNLOAD_RADIUS;
const evictHi = center + UNLOAD_RADIUS;
for (let i = 0; i < flatPages.length; i++) {
if (i >= lo && i <= hi) loadPage(i);
else if (i < evictLo || i > evictHi) unloadPage(i);
}
}
function scheduleRecalc(center: number) {
if (recalcTimer) return;
recalcTimer = setTimeout(() => { recalcTimer = null; recalcWindow(center); }, 50);
}
$effect(() => { void _version; });
$effect(() => { recalcWindow(centerIdx); });
$effect(() => { void flatPages.length; tick().then(() => recalcWindow(centerIdx)); });
let lastChapterId = 0;
$effect(() => {
let chapterId: number;
try { chapterId = readerState.activeChapter?.id ?? 0; } catch { return; }
if (chapterId === lastChapterId) return;
lastChapterId = chapterId;
_loadedSet = new Set<number>();
_resolvedSrc = {};
centerIdx = 0;
_version++;
aspectMap.clear();
});
export function notifyScrollCenter(idx: number) {
centerIdx = idx;
scheduleRecalc(idx);
}
export async function scrollToFlatIndex(idx: number) {
if (!containerEl || !flatPages.length) return;
centerIdx = idx;
recalcWindow(idx);
await tick();
if (!containerEl) return;
const slot = containerEl.querySelectorAll<HTMLElement>(".strip-slot")[idx];
if (slot) slot.scrollIntoView({ block: "start", behavior: "instant" });
}
let anchorEl: HTMLElement | null = null;
let anchorOffset = 0;
export function captureAnchor() {
if (!containerEl) return;
const readY = containerEl.getBoundingClientRect().top + containerEl.clientHeight * 0.5;
const imgs = containerEl.querySelectorAll<HTMLElement>("img[data-local-page]");
let best: HTMLElement | null = null;
let bestTop = -Infinity;
for (const img of imgs) {
const top = img.getBoundingClientRect().top;
if (top <= readY && top > bestTop) { bestTop = top; best = img; }
}
anchorEl = best;
anchorOffset = best ? readY - best.getBoundingClientRect().top : 0;
}
export function restoreAnchor() {
if (!containerEl || !anchorEl) return;
requestAnimationFrame(() => {
if (!anchorEl || !containerEl) return;
const readY = containerEl.getBoundingClientRect().top + containerEl.clientHeight * 0.5;
const delta = (readY - anchorEl.getBoundingClientRect().top) - anchorOffset;
containerEl.scrollTop -= delta;
anchorEl = null;
});
}
let autoScrollPaused = false;
let autoScrollPauseTimer: ReturnType<typeof setTimeout> | null = null;
export function pauseAutoScroll() {
autoScrollPaused = true;
if (autoScrollPauseTimer) clearTimeout(autoScrollPauseTimer);
autoScrollPauseTimer = setTimeout(() => { autoScrollPaused = false; }, 2500);
}
$effect(() => {
if (!settingsState.settings.autoScroll || !containerEl) return;
let rafId: number;
const tick = () => {
if (!autoScrollPaused && containerEl) containerEl.scrollTop += (settingsState.settings.autoScrollSpeed ?? 5) * 0.5;
rafId = requestAnimationFrame(tick);
};
rafId = requestAnimationFrame(tick);
return () => cancelAnimationFrame(rafId);
});
const HIDE_AFTER_MS = 5_000;
$effect(() => {
if (!containerEl) return;
let timer: ReturnType<typeof setTimeout> | null = null;
const show = () => {
containerEl.style.cursor = "";
if (timer) clearTimeout(timer);
timer = setTimeout(() => { if (containerEl) containerEl.style.cursor = "none"; }, HIDE_AFTER_MS);
};
show();
window.addEventListener("mousemove", show, { passive: true });
return () => {
if (containerEl) containerEl.style.cursor = "";
window.removeEventListener("mousemove", show);
if (timer) clearTimeout(timer);
};
});
let midScrollActive = $state(false);
let midScrollOriginY = $state(0);
let midScrollCurrentY = 0;
let midScrollDisplayLevel = $state(0);
let midScrollRaf: number | null = null;
function startMidScroll(originY: number) {
midScrollActive = true;
midScrollOriginY = originY;
midScrollDisplayLevel = 0;
if (midScrollRaf) cancelAnimationFrame(midScrollRaf);
const frame = () => {
if (!midScrollActive || !containerEl) return;
const dy = midScrollCurrentY - midScrollOriginY;
const excess = Math.max(0, Math.abs(dy) - 24);
containerEl.scrollTop += Math.sign(dy) * excess * 0.12;
midScrollDisplayLevel = Math.sign(dy) * Math.min(5, Math.floor(excess / 30));
midScrollRaf = requestAnimationFrame(frame);
};
midScrollRaf = requestAnimationFrame(frame);
}
export function stopMidScroll() {
midScrollActive = false;
midScrollDisplayLevel = 0;
if (midScrollRaf) { cancelAnimationFrame(midScrollRaf); midScrollRaf = null; }
}
let stripDragging = false;
let stripDragMoved = false;
let stripDragStartY = 0;
let stripScrollStart = 0;
function setDragCursor(dragging: boolean) {
if (containerEl) containerEl.style.cursor = dragging ? "grabbing" : "";
}
export function onMouseDown(e: MouseEvent) {
if ((e.target as Element).closest(".bar")) return;
if (e.button === 1) {
e.preventDefault();
if (midScrollActive) stopMidScroll();
else { settingsState.settings.autoScroll = false; startMidScroll(e.clientY); }
return;
}
stripDragging = true;
stripDragMoved = false;
stripDragStartY = e.clientY;
stripScrollStart = containerEl?.scrollTop ?? 0;
setDragCursor(true);
pauseAutoScroll();
e.preventDefault();
}
export function onMouseMove(e: MouseEvent) {
midScrollCurrentY = e.clientY;
if (!stripDragging) return;
const dy = e.clientY - stripDragStartY;
if (!stripDragMoved && Math.abs(dy) > 4) stripDragMoved = true;
if (containerEl) containerEl.scrollTop = stripScrollStart - dy;
}
export function onMouseUp() {
stripDragging = false;
setDragCursor(false);
}
export function onPointerDown(e: PointerEvent) {
if ((e.target as Element).closest(".bar")) return;
stripDragging = true;
stripDragMoved = false;
stripDragStartY = e.clientY;
stripScrollStart = containerEl?.scrollTop ?? 0;
setDragCursor(true);
pauseAutoScroll();
}
export function onPointerMove(e: PointerEvent) {
if (!stripDragging) return;
const dy = e.clientY - stripDragStartY;
if (!stripDragMoved && Math.abs(dy) > 4) stripDragMoved = true;
if (containerEl) containerEl.scrollTop = stripScrollStart - dy;
}
export function onPointerUp() {
stripDragging = false;
setDragCursor(false);
}
export function consumeTap(): boolean {
if (stripDragMoved) { stripDragMoved = false; return true; }
return false;
}
export function onWheel(e: WheelEvent) {
if (!e.ctrlKey) pauseAutoScroll();
}
</script>
{#if midScrollActive}
<div class="midscroll-bar" class:midscroll-bar-right={barPosition !== "right"} class:midscroll-bar-left={barPosition === "right"}>
<div class="midscroll-segments">
{#each [5,4,3,2,1] as n}
<div class="midscroll-seg" class:midscroll-seg-lit={midScrollDisplayLevel < 0 && -midScrollDisplayLevel >= n}></div>
{/each}
<div class="midscroll-origin-dot"></div>
{#each [1,2,3,4,5] as n}
<div class="midscroll-seg" class:midscroll-seg-lit={midScrollDisplayLevel > 0 && midScrollDisplayLevel >= n}></div>
{/each}
</div>
<button class="midscroll-stop" onclick={stopMidScroll} title="Stop (middle click)">
<svg width="8" height="8" viewBox="0 0 8 8"><rect x="0" y="0" width="8" height="8" rx="1" fill="currentColor"/></svg>
</button>
</div>
{/if}
{#each flatPages as page, gi (page.chapterId + ":" + page.localIndex)}
{@const src = _version >= 0 ? resolvedSrc.get(gi) : undefined}
{@const isLoaded = _version >= 0 ? loadedSet.has(gi) : false}
<div class="strip-slot" data-local-page={page.localIndex + 1} data-chapter={page.chapterId} style={getCachedAspect(page.url) != null ? `--aspect:${getCachedAspect(page.url)}` : undefined}>
{#if isLoaded && src}
<img
{src}
alt="{page.chapterName} Page {page.localIndex + 1}"
data-local-page={page.localIndex + 1}
data-chapter={page.chapterId}
data-total={page.total}
class="{imgCls}{settingsState.settings.pageGap ? ' strip-gap' : ''}"
loading="lazy"
decoding="async"
draggable="false"
onload={(e) => {
const img = e.currentTarget as HTMLImageElement;
const slot = img.closest<HTMLElement>(".strip-slot");
if (slot && img.naturalWidth > 0) {
const aspect = img.naturalWidth / img.naturalHeight;
slot.style.setProperty("--aspect", String(aspect));
aspectMap.set(gi, aspect);
}
}}
/>
{:else}
<div class="strip-placeholder" aria-hidden="true">{@render skeleton()}</div>
{/if}
</div>
{/each}
<div style="height:1px;flex-shrink:0"></div>
{#snippet skeleton()}
<svg class="panel-skeleton" viewBox="0 0 100 150" fill="none" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet">
<rect class="ps-r ps-r1" x="2" y="2" width="62" height="88" rx="1"/>
<rect class="ps-r ps-r2" x="68" y="2" width="30" height="42" rx="1"/>
<rect class="ps-r ps-r3" x="68" y="48" width="30" height="42" rx="1"/>
<rect class="ps-r ps-r4" x="2" y="94" width="44" height="54" rx="1"/>
<rect class="ps-r ps-r5" x="50" y="94" width="48" height="54" rx="1"/>
</svg>
{/snippet}
<style>
.strip-slot { width: 100%; display: flex; flex-direction: column; align-items: center; }
.strip-placeholder {
width: var(--effective-width, 100%);
max-width: var(--effective-width, 100%);
aspect-ratio: var(--aspect, 0.667);
border-radius: var(--radius-sm);
display: flex;
align-items: stretch;
}
.panel-skeleton { width: 100%; height: 100%; }
.panel-skeleton :global(.ps-r) {
stroke: var(--border-strong); stroke-width: 0.8; fill: none;
stroke-dasharray: 400; stroke-dashoffset: 400;
animation: ps-shimmer 2s ease-in-out infinite;
}
.panel-skeleton :global(.ps-r1) { animation-delay: 0s; }
.panel-skeleton :global(.ps-r2) { animation-delay: 0.15s; }
.panel-skeleton :global(.ps-r3) { animation-delay: 0.3s; }
.panel-skeleton :global(.ps-r4) { animation-delay: 0.1s; }
.panel-skeleton :global(.ps-r5) { animation-delay: 0.25s; }
@keyframes ps-shimmer {
0% { stroke-dashoffset: 400; opacity: 0.25; }
40% { stroke-dashoffset: 0; opacity: 0.55; }
70% { stroke-dashoffset: 0; opacity: 0.55; }
100% { stroke-dashoffset: -400; opacity: 0.25; }
}
.midscroll-bar {
position: fixed; top: 50%; transform: translateY(-50%);
z-index: 200; display: flex; flex-direction: column; align-items: center;
gap: 8px; padding: 10px 6px;
background: color-mix(in srgb, var(--bg-raised) 92%, transparent);
border: 1px solid var(--border-base); border-radius: 10px;
box-shadow: 0 4px 16px rgba(0,0,0,0.45);
pointer-events: auto; backdrop-filter: blur(6px); -webkit-backdrop-filter: blur(6px);
}
.midscroll-bar-right { right: 8px; }
.midscroll-bar-left { left: 8px; }
.midscroll-segments { display: flex; flex-direction: column; align-items: center; gap: 3px; }
.midscroll-origin-dot { width: 6px; height: 6px; border-radius: 50%; border: 1.5px solid var(--accent-fg); opacity: 0.6; flex-shrink: 0; margin: 2px 0; }
.midscroll-seg { width: 4px; height: 14px; border-radius: 2px; background: var(--border-strong); transition: background 0.06s ease; flex-shrink: 0; }
.midscroll-seg-lit { background: var(--accent-fg); }
.midscroll-stop { width: 20px; height: 20px; display: flex; align-items: center; justify-content: center; border-radius: var(--radius-sm); border: 1px solid var(--border-dim); background: none; color: var(--text-faint); cursor: pointer; transition: color var(--t-fast), background var(--t-fast), border-color var(--t-fast); flex-shrink: 0; }
.midscroll-stop:hover { color: var(--text-primary); background: var(--bg-overlay); border-color: var(--border-strong); }
</style>
@@ -0,0 +1,71 @@
<script lang="ts">
import { readerState } from "$lib/state/reader.svelte";
interface Props {
imgCls: string;
src: string | null;
fadingOut: boolean;
isFade: boolean;
}
const { imgCls, src, fadingOut, isFade }: Props = $props();
</script>
<div
class="inspect-wrap"
style="transform:scale({readerState.inspectScale}) translate({readerState.inspectPanX / readerState.inspectScale}px,{readerState.inspectPanY / readerState.inspectScale}px)"
>
{#if src}
<img
{src}
alt="Page {readerState.pageNumber}"
class={imgCls}
decoding="async"
draggable="false"
style={isFade ? `opacity:${fadingOut ? 0 : 1};transition:opacity 0.1s ease` : undefined}
/>
{:else}
<div class="page-loader page-loader-single" aria-hidden="true">{@render skeleton()}</div>
{/if}
</div>
{#snippet skeleton()}
<svg class="panel-skeleton" viewBox="0 0 100 150" fill="none" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid meet">
<rect class="ps-r ps-r1" x="2" y="2" width="62" height="88" rx="1"/>
<rect class="ps-r ps-r2" x="68" y="2" width="30" height="42" rx="1"/>
<rect class="ps-r ps-r3" x="68" y="48" width="30" height="42" rx="1"/>
<rect class="ps-r ps-r4" x="2" y="94" width="44" height="54" rx="1"/>
<rect class="ps-r ps-r5" x="50" y="94" width="48" height="54" rx="1"/>
</svg>
{/snippet}
<style>
.inspect-wrap { display: flex; align-items: center; justify-content: center; transform-origin: center center; will-change: transform; }
.page-loader { border-radius: var(--radius-sm); display: flex; align-items: stretch; }
.page-loader-single {
width: min(100%, var(--effective-width, 100%));
max-width: var(--effective-width, 100%);
max-height: calc(var(--visual-vh, 100vh) - 80px);
aspect-ratio: 2 / 3;
}
.panel-skeleton { width: 100%; height: 100%; }
.panel-skeleton :global(.ps-r) {
stroke: var(--border-strong); stroke-width: 0.8; fill: none;
stroke-dasharray: 400; stroke-dashoffset: 400;
animation: ps-shimmer 2s ease-in-out infinite;
}
.panel-skeleton :global(.ps-r1) { animation-delay: 0s; }
.panel-skeleton :global(.ps-r2) { animation-delay: 0.15s; }
.panel-skeleton :global(.ps-r3) { animation-delay: 0.3s; }
.panel-skeleton :global(.ps-r4) { animation-delay: 0.1s; }
.panel-skeleton :global(.ps-r5) { animation-delay: 0.25s; }
@keyframes ps-shimmer {
0% { stroke-dashoffset: 400; opacity: 0.25; }
40% { stroke-dashoffset: 0; opacity: 0.55; }
70% { stroke-dashoffset: 0; opacity: 0.55; }
100% { stroke-dashoffset: -400; opacity: 0.25; }
}
</style>
+51 -13
View File
@@ -4,15 +4,15 @@
import { cache, CACHE_KEYS, CACHE_GROUPS } from '$lib/core/cache/queryCache' import { cache, CACHE_KEYS, CACHE_GROUPS } from '$lib/core/cache/queryCache'
import { homeState, clearHistory } from '$lib/state/home.svelte' import { homeState, clearHistory } from '$lib/state/home.svelte'
import { historyState } from '$lib/state/history.svelte' import { historyState } from '$lib/state/history.svelte'
import { setActiveManga, openReader, setPreviewManga } from '$lib/state/series.svelte' import { setActiveManga, openReaderForChapter, setPreviewManga } from '$lib/state/series.svelte'
import { addToast } from '$lib/state/notifications.svelte' import { addToast } from '$lib/state/notifications.svelte'
import { buildChapterList } from '$lib/components/series/lib/chapterList' import { downloadStore } from '$lib/state/downloads.svelte'
import { groupByDay } from './lib/recentHistory' import { groupByDay } from './lib/recentHistory'
import { fetchedAtMs, parseServerTimestamp, groupUpdatesByDay } from './lib/recentUpdates' import { fetchedAtMs, parseServerTimestamp, groupUpdatesByDay } from './lib/recentUpdates'
import RecentToolbar from './RecentToolbar.svelte' import RecentToolbar from './RecentToolbar.svelte'
import UpdatesTab from './UpdatesTab.svelte' import UpdatesTab from './UpdatesTab.svelte'
import HistoryTab from './HistoryTab.svelte' import HistoryTab from './HistoryTab.svelte'
import type { Manga } from '$lib/types' import type { Manga, Chapter } from '$lib/types'
import type { RecentUpdate, UpdateGroup } from './lib/recentUpdates' import type { RecentUpdate, UpdateGroup } from './lib/recentUpdates'
import type { HistoryGroup } from './lib/recentHistory' import type { HistoryGroup } from './lib/recentHistory'
@@ -28,6 +28,7 @@
let updatesLoading: boolean = $state(true) let updatesLoading: boolean = $state(true)
let updatesError: string | null = $state(null) let updatesError: string | null = $state(null)
let openingId: number | null = $state(null) let openingId: number | null = $state(null)
let enqueueing: Set<number> = $state(new Set())
let updaterRunning: boolean = $state(false) let updaterRunning: boolean = $state(false)
let lastUpdatedTs: number | null = $state(null) let lastUpdatedTs: number | null = $state(null)
let updaterFinishedJobs: number | null = $state(null) let updaterFinishedJobs: number | null = $state(null)
@@ -121,9 +122,9 @@
if (force) cache.clear(key) if (force) cache.clear(key)
const [updatesRes, statusRes] = await Promise.all([ const [updatesRes, statusRes] = await Promise.all([
cache.get<RecentUpdate[]>( cache.get<Chapter[]>(
key, key,
() => getAdapter().getRecentlyUpdated(nextCtrl.signal), () => getAdapter().getRecentlyUpdated(),
RECENT_UPDATES_TTL_MS, RECENT_UPDATES_TTL_MS,
CACHE_GROUPS.LIBRARY, CACHE_GROUPS.LIBRARY,
), ),
@@ -137,7 +138,7 @@
if (nextCtrl.signal.aborted) return if (nextCtrl.signal.aborted) return
updates = (updatesRes ?? []) updates = (updatesRes ?? [])
.filter(item => item.manga?.inLibrary) .map(item => ({ ...item, isRead: item.read }))
.sort((a, b) => fetchedAtMs(b) - fetchedAtMs(a)) .sort((a, b) => fetchedAtMs(b) - fetchedAtMs(a))
} catch (e: any) { } catch (e: any) {
if (nextCtrl.signal.aborted) return if (nextCtrl.signal.aborted) return
@@ -168,13 +169,11 @@
const manga = mangaStub(item) const manga = mangaStub(item)
try { try {
const chapters = await getAdapter().getChapters(String(item.mangaId)) const chapters = await getAdapter().getChapters(String(item.mangaId))
const sorted = [...chapters].sort((a, b) => a.sourceOrder - b.sourceOrder) const target = chapters.find(ch => ch.id === item.id)
const list = buildChapterList(sorted, {}) if (target) openReaderForChapter(target, manga)
const target = list.find(ch => ch.id === item.id) else setPreviewManga(manga)
if (target) { setActiveManga(manga); openReader(target, list) }
else setActiveManga(manga)
} catch { } catch {
setActiveManga(manga) setPreviewManga(manga)
addToast({ kind: 'error', title: "Couldn't open chapter", body: 'Opened the series instead.' }) addToast({ kind: 'error', title: "Couldn't open chapter", body: 'Opened the series instead.' })
} finally { } finally {
openingId = null openingId = null
@@ -194,6 +193,42 @@
clearHistory() clearHistory()
historyConfirmClear = false historyConfirmClear = false
} }
async function enqueueUpdate(item: RecentUpdate) {
if (enqueueing.has(item.id)) return
enqueueing = new Set(enqueueing).add(item.id)
try {
const allowed = await downloadStore.enqueue(item.id)
if (allowed) addToast({ kind: 'download', title: 'Download queued', body: item.name ?? 'Chapter' })
} catch {
addToast({ kind: 'error', title: 'Download failed', body: 'Could not queue chapter.' })
} finally {
enqueueing.delete(item.id)
enqueueing = new Set(enqueueing)
}
}
async function deleteDownloaded(item: RecentUpdate) {
try {
await getAdapter().deleteDownloadedChapters([String(item.id)])
updates = updates.map(u => u.id === item.id ? { ...u, isDownloaded: false } : u)
} catch {
addToast({ kind: 'error', title: 'Delete failed', body: 'Could not delete download.' })
}
}
async function toggleLibraryUpdate() {
try {
if (updaterRunning) {
await getAdapter().stopLibraryUpdate()
} else {
await getAdapter().startLibraryUpdate()
scheduleStatusPoll()
}
} catch (e: any) {
addToast({ kind: 'error', title: 'Update error', body: e?.message ?? 'Failed' })
}
}
</script> </script>
<div class="root anim-fade-in"> <div class="root anim-fade-in">
@@ -218,13 +253,16 @@
error={updatesError} error={updatesError}
groups={updateGroups} groups={updateGroups}
{updatesSearch} {updatesSearch}
totalCount={updates.length} totalCount={updates.filter(u => !u.isRead).length}
{openingId} {openingId}
{enqueueing}
{updaterRunning} {updaterRunning}
{lastUpdatedLabel} {lastUpdatedLabel}
{updaterProgressLabel} {updaterProgressLabel}
onOpenUpdate={openUpdate} onOpenUpdate={openUpdate}
onOpenSeries={(item) => setActiveManga(mangaStub(item))} onOpenSeries={(item) => setActiveManga(mangaStub(item))}
onEnqueue={enqueueUpdate}
onDeleteDownload={deleteDownloaded}
/> />
{:else} {:else}
<HistoryTab <HistoryTab
+7 -16
View File
@@ -19,8 +19,10 @@
} }
let { let {
tab, historySearch, updatesSearch, historyConfirmClear, hasHistory, updatesLoading, tab, historySearch, updatesSearch, historyConfirmClear, hasHistory,
onTabChange, onHistorySearchChange, onUpdatesSearchChange, onHistoryClear, onRefreshUpdates, updatesLoading,
onTabChange, onHistorySearchChange, onUpdatesSearchChange,
onHistoryClear, onRefreshUpdates,
}: Props = $props() }: Props = $props()
</script> </script>
@@ -57,7 +59,7 @@
class="icon-btn" class="icon-btn"
onclick={onRefreshUpdates} onclick={onRefreshUpdates}
disabled={updatesLoading} disabled={updatesLoading}
title="Refresh updates" title="Reload update list"
> >
{#if updatesLoading} {#if updatesLoading}
<CircleNotch size={14} weight="light" class="anim-spin" /> <CircleNotch size={14} weight="light" class="anim-spin" />
@@ -79,19 +81,6 @@
{/if} {/if}
</div> </div>
<button
class="icon-btn"
onclick={onRefreshUpdates}
disabled={updatesLoading}
title="Refresh library"
>
{#if updatesLoading}
<CircleNotch size={14} weight="light" class="anim-spin" />
{:else}
<ArrowsClockwise size={14} weight="bold" />
{/if}
</button>
{#if hasHistory} {#if hasHistory}
<button <button
class="clear-btn" class="clear-btn"
@@ -155,6 +144,8 @@
} }
.icon-btn:hover:not(:disabled) { color: var(--text-primary); border-color: var(--border-strong); } .icon-btn:hover:not(:disabled) { color: var(--text-primary); border-color: var(--border-strong); }
.icon-btn:disabled { opacity: 0.45; cursor: default; } .icon-btn:disabled { opacity: 0.45; cursor: default; }
.icon-btn.running { color: var(--color-error); border-color: color-mix(in srgb, var(--color-error) 30%, transparent); background: var(--color-error-bg); }
.icon-btn.running:hover { color: var(--color-error); border-color: var(--color-error); }
.search-wrap { position: relative; display: flex; align-items: center; } .search-wrap { position: relative; display: flex; align-items: center; }
.search-wrap :global(.search-icon) { position: absolute; left: 8px; color: var(--text-faint); pointer-events: none; } .search-wrap :global(.search-icon) { position: absolute; left: 8px; color: var(--text-faint); pointer-events: none; }
+32 -10
View File
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { BookOpen, CircleNotch } from 'phosphor-svelte' import { BookOpen, CircleNotch, Download, Trash } from 'phosphor-svelte'
import Thumbnail from '$lib/components/shared/manga/Thumbnail.svelte' import Thumbnail from '$lib/components/shared/manga/Thumbnail.svelte'
import type { RecentUpdate, UpdateGroup } from './lib/recentUpdates' import type { RecentUpdate, UpdateGroup } from './lib/recentUpdates'
@@ -10,17 +10,20 @@
updatesSearch: string updatesSearch: string
totalCount: number totalCount: number
openingId: number | null openingId: number | null
enqueueing: Set<number>
updaterRunning: boolean updaterRunning: boolean
lastUpdatedLabel: string | null lastUpdatedLabel: string | null
updaterProgressLabel: string | null updaterProgressLabel: string | null
onOpenUpdate: (item: RecentUpdate) => void onOpenUpdate: (item: RecentUpdate) => void
onOpenSeries: (item: RecentUpdate) => void onOpenSeries: (item: RecentUpdate) => void
onEnqueue: (item: RecentUpdate) => void
onDeleteDownload: (item: RecentUpdate) => void
} }
let { let {
loading, error, groups, updatesSearch, totalCount, openingId, loading, error, groups, updatesSearch, totalCount, openingId, enqueueing,
updaterRunning, lastUpdatedLabel, updaterProgressLabel, updaterRunning, lastUpdatedLabel, updaterProgressLabel,
onOpenUpdate, onOpenSeries, onOpenUpdate, onOpenSeries, onEnqueue, onDeleteDownload,
}: Props = $props() }: Props = $props()
const filteredGroups = $derived(updatesSearch.trim() const filteredGroups = $derived(updatesSearch.trim()
@@ -63,7 +66,7 @@
<div class="bar-sep"></div> <div class="bar-sep"></div>
{/if} {/if}
{#if !loading && totalCount > 0} {#if !loading && totalCount > 0}
<span class="status-count">{totalCount} chapter{totalCount === 1 ? '' : 's'}</span> <span class="status-count">{totalCount} unread</span>
{/if} {/if}
</div> </div>
</div> </div>
@@ -138,7 +141,7 @@
<div class="update-info"> <div class="update-info">
<div class="title-row"> <div class="title-row">
<span class="series-title">{item.manga?.title ?? 'Unknown series'}</span> <span class="series-title">{item.manga?.title ?? 'Unknown series'}</span>
{#if !item.isRead}<span class="pill">Unread</span>{/if} {#if !item.isRead}<span class="pill" title="Unread"></span>{/if}
</div> </div>
<span class="chapter-title">{chapterLabel(item)}</span> <span class="chapter-title">{chapterLabel(item)}</span>
{#if (item.lastPageRead ?? 0) > 0 && !item.isRead} {#if (item.lastPageRead ?? 0) > 0 && !item.isRead}
@@ -146,6 +149,17 @@
{/if} {/if}
</div> </div>
<div class="row-end"> <div class="row-end">
{#if enqueueing.has(item.id)}
<CircleNotch size={14} weight="light" class="anim-spin" />
{:else if item.isDownloaded}
<button class="dl-btn dl-btn-delete" onclick={(e) => { e.stopPropagation(); onDeleteDownload(item) }} title="Delete download">
<Trash size={13} weight="light" />
</button>
{:else}
<button class="dl-btn" onclick={(e) => { e.stopPropagation(); onEnqueue(item) }} title="Download">
<Download size={13} weight="light" />
</button>
{/if}
{#if openingId === item.id} {#if openingId === item.id}
<CircleNotch size={14} weight="light" class="anim-spin" /> <CircleNotch size={14} weight="light" class="anim-spin" />
{:else} {:else}
@@ -258,12 +272,20 @@
.chapter-title { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-muted); } .chapter-title { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-muted); }
.meta-row { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); } .meta-row { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
.pill { .pill {
padding: 2px 6px; border-radius: var(--radius-full); width: 6px; height: 6px; border-radius: 50%;
background: var(--accent-muted); color: var(--accent-fg); background: var(--color-success, #22c55e); flex-shrink: 0;
font-family: var(--font-ui); font-size: var(--text-2xs);
letter-spacing: var(--tracking-wide); text-transform: uppercase; flex-shrink: 0;
} }
.row-end { color: var(--text-faint); display: flex; align-items: center; justify-content: center; width: 24px; flex-shrink: 0; } .row-end { color: var(--text-faint); display: flex; align-items: center; gap: var(--sp-1); justify-content: center; flex-shrink: 0; }
.dl-btn {
display: flex; align-items: center; justify-content: center;
width: 24px; height: 24px; border-radius: var(--radius-sm);
border: none; background: none; color: var(--text-faint); cursor: pointer;
transition: color var(--t-base), background var(--t-base);
}
.dl-btn:hover { color: var(--text-muted); background: var(--bg-overlay); }
.dl-btn-delete { color: var(--color-error); }
.dl-btn-delete:hover { background: var(--color-error-bg); }
.empty { .empty {
flex: 1; display: flex; flex-direction: column; align-items: center; flex: 1; display: flex; flex-direction: column; align-items: center;
+15 -4
View File
@@ -25,7 +25,10 @@ export interface UpdateStatus {
} }
export function fetchedAtMs(item: Pick<RecentUpdate, 'fetchedAt'>): number { export function fetchedAtMs(item: Pick<RecentUpdate, 'fetchedAt'>): number {
const ts = item.fetchedAt ? new Date(item.fetchedAt).getTime() : Date.now() if (!item.fetchedAt) return Date.now()
const numeric = Number(item.fetchedAt)
if (Number.isFinite(numeric)) return numeric * 1000
const ts = new Date(item.fetchedAt).getTime()
return Number.isFinite(ts) ? ts : Date.now() return Number.isFinite(ts) ? ts : Date.now()
} }
@@ -42,10 +45,18 @@ export function parseServerTimestamp(value: unknown): number | null {
export function groupUpdatesByDay(updates: RecentUpdate[]): UpdateGroup[] { export function groupUpdatesByDay(updates: RecentUpdate[]): UpdateGroup[] {
const grouped: Record<string, RecentUpdate[]> = {} const grouped: Record<string, RecentUpdate[]> = {}
const order: Record<string, number> = {}
for (const item of updates) { for (const item of updates) {
const label = dayLabel(fetchedAtMs(item)) const ts = fetchedAtMs(item)
if (!grouped[label]) grouped[label] = [] const label = dayLabel(ts)
if (!grouped[label]) {
grouped[label] = []
order[label] = ts
}
grouped[label].push(item) grouped[label].push(item)
if (ts > order[label]) order[label] = ts
} }
return Object.entries(grouped).map(([label, items]) => ({ label, items })) return Object.entries(grouped)
.sort(([a], [b]) => order[b] - order[a])
.map(([label, items]) => ({ label, items }))
} }
+45 -32
View File
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { Download, CheckCircle, Circle, CircleNotch, Trash } from 'phosphor-svelte' import { Download, CheckSquare, Square, CircleNotch, Trash } from 'phosphor-svelte'
import ContextMenu from '$lib/components/shared/ui/ContextMenu.svelte' import ContextMenu from '$lib/components/shared/ui/ContextMenu.svelte'
import type { MenuEntry } from '$lib/components/shared/ui/ContextMenu.svelte' import type { MenuEntry } from '$lib/components/shared/ui/ContextMenu.svelte'
import { longPress } from '$lib/core/ui/touchscreen' import { longPress } from '$lib/core/ui/touchscreen'
@@ -14,27 +14,39 @@
enqueueing: Set<number> enqueueing: Set<number>
chapterPage: number chapterPage: number
totalPages: number totalPages: number
scrollEl?: HTMLDivElement | null
onOpen: (ch: Chapter, inProgress: boolean) => void onOpen: (ch: Chapter, inProgress: boolean) => void
onToggleSelect: (id: number, e: MouseEvent | KeyboardEvent) => void onToggleSelect: (id: number, e: MouseEvent | KeyboardEvent) => void
onEnqueue: (ch: Chapter, e: MouseEvent) => void onEnqueue: (ch: Chapter, e: MouseEvent) => void
onDeleteDownload:(id: number) => void onDeleteDownload:(id: number) => void
onPageChange: (page: number) => void onPageChange: (page: number) => void
onPageSizeChange:(n: number) => void
buildCtxItems: (ch: Chapter, idx: number) => MenuEntry[] buildCtxItems: (ch: Chapter, idx: number) => MenuEntry[]
} }
let { let {
pageChapters, sortedChapters, viewMode, loadingChapters, pageChapters, sortedChapters, viewMode, loadingChapters,
selectedIds, enqueueing, chapterPage, totalPages, selectedIds, enqueueing, chapterPage, totalPages,
scrollEl = $bindable(null),
onOpen, onToggleSelect, onEnqueue, onDeleteDownload, onOpen, onToggleSelect, onEnqueue, onDeleteDownload,
onPageChange, buildCtxItems, onPageChange, onPageSizeChange, buildCtxItems,
}: Props = $props() }: Props = $props()
let ctx: { x: number; y: number; chapter: Chapter; idx: number } | null = $state(null) let ctx: { x: number; y: number; chapter: Chapter; idx: number } | null = $state(null)
let listEl: HTMLDivElement | null = $state(null)
const hasSelection = $derived(selectedIds.size > 0) const hasSelection = $derived(selectedIds.size > 0)
$effect(() => {
if (!listEl || viewMode !== 'list') return
const ro = new ResizeObserver(([entry]) => {
const firstRow = listEl!.querySelector('.ch-row') as HTMLElement | null
const rowH = firstRow ? firstRow.offsetHeight : 37
const n = Math.max(1, Math.floor(entry.contentRect.height / rowH))
onPageSizeChange(n)
})
ro.observe(listEl)
return () => ro.disconnect()
})
function chapterLongPress(node: HTMLElement, param: [Chapter, number]) { function chapterLongPress(node: HTMLElement, param: [Chapter, number]) {
const [ch, idx] = param const [ch, idx] = param
return longPress(node, { return longPress(node, {
@@ -50,7 +62,7 @@
} }
</script> </script>
<div class={viewMode === 'grid' ? 'ch-grid' : 'ch-list'} bind:this={scrollEl}> <div class={viewMode === 'grid' ? 'ch-grid' : 'ch-list'} bind:this={listEl}>
{#if loadingChapters && sortedChapters.length === 0} {#if loadingChapters && sortedChapters.length === 0}
{#if viewMode === 'grid'} {#if viewMode === 'grid'}
{#each Array(24) as _}<div class="grid-cell-skeleton skeleton"></div>{/each} {#each Array(24) as _}<div class="grid-cell-skeleton skeleton"></div>{/each}
@@ -65,15 +77,13 @@
{:else if viewMode === 'grid'} {:else if viewMode === 'grid'}
{#each sortedChapters as ch, i} {#each sortedChapters as ch, i}
{@const inProgress = !ch.read && (ch.lastPageRead ?? 0) > 0}
{@const isGridSelected = selectedIds.has(ch.id)} {@const isGridSelected = selectedIds.has(ch.id)}
<button <button
class="grid-cell" class="grid-cell"
class:read={ch.read} class:read={ch.read}
class:in-progress={inProgress}
class:grid-selected={isGridSelected} class:grid-selected={isGridSelected}
use:chapterLongPress={[ch, i]} use:chapterLongPress={[ch, i]}
onclick={(e) => hasSelection ? onToggleSelect(ch.id, e) : onOpen(ch, inProgress)} onclick={(e) => hasSelection ? onToggleSelect(ch.id, e) : onOpen(ch, !ch.read && (ch.lastPageRead ?? 0) > 0)}
oncontextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx: i } }} oncontextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx: i } }}
title={ch.name} title={ch.name}
> >
@@ -102,7 +112,7 @@
oncontextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx: idxInSorted } }} oncontextmenu={(e) => { e.preventDefault(); ctx = { x: e.clientX, y: e.clientY, chapter: ch, idx: idxInSorted } }}
> >
<button class="ch-check" class:ch-check-visible={hasSelection} onclick={(e) => onToggleSelect(ch.id, e)} title="Select"> <button class="ch-check" class:ch-check-visible={hasSelection} onclick={(e) => onToggleSelect(ch.id, e)} title="Select">
{#if isSelected}<CheckCircle size={15} weight="fill" />{:else}<Circle size={15} weight="light" />{/if} {#if isSelected}<CheckSquare size={15} weight="fill" />{:else}<Square size={15} weight="light" />{/if}
</button> </button>
<div class="ch-left"> <div class="ch-left">
<span class="ch-name">{ch.name}</span> <span class="ch-name">{ch.name}</span>
@@ -113,7 +123,7 @@
</div> </div>
</div> </div>
<div class="ch-right"> <div class="ch-right">
{#if ch.read}<CheckCircle size={14} weight="light" class="read-icon" />{/if} {#if ch.read}<CheckSquare size={14} weight="light" class="read-icon" />{/if}
{#if ch.downloaded} {#if ch.downloaded}
<div class="ch-dl-wrap"> <div class="ch-dl-wrap">
<Download size={13} weight="fill" class="ch-dl-icon" /> <Download size={13} weight="fill" class="ch-dl-icon" />
@@ -147,48 +157,51 @@
{/if} {/if}
<style> <style>
.ch-list { flex: 1; overflow-y: auto; } .ch-list { flex: 1; overflow: hidden; }
.ch-grid { flex: 1; overflow-y: auto; display: grid; grid-template-columns: repeat(auto-fill, minmax(42px, 1fr)); gap: 4px; padding: var(--sp-3); align-content: start; } .ch-grid { flex: 1; overflow: hidden; display: grid; grid-template-columns: repeat(auto-fill, minmax(42px, 1fr)); gap: 4px; padding: var(--sp-3); align-content: start; }
.ch-row { display: flex; align-items: center; padding: 10px var(--sp-4); border-bottom: 1px solid var(--border-dim); cursor: pointer; transition: background var(--t-fast); gap: var(--sp-3); } .ch-row { display: flex; align-items: center; padding: 8px var(--sp-4); border-bottom: 1px solid var(--border-dim); cursor: pointer; transition: background var(--t-fast); gap: var(--sp-3); }
.ch-row:hover { background: var(--bg-raised); } .ch-row:hover { background: var(--bg-raised); }
.ch-row.read { opacity: 0.45; } .ch-row.read { opacity: 0.5; }
.ch-left { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 3px; } .ch-left { flex: 1; min-width: 0; display: flex; flex-direction: column; gap: 2px; }
.ch-name { font-size: var(--text-sm); color: var(--text-secondary); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .ch-name { font-size: var(--text-sm); color: var(--text-secondary); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.ch-meta { display: flex; align-items: center; gap: var(--sp-2); flex-wrap: wrap; } .ch-meta { display: flex; align-items: center; gap: var(--sp-2); }
.ch-meta-item { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); } .ch-meta-item { font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
.ch-right { display: flex; align-items: center; gap: var(--sp-1); flex-shrink: 0; } .ch-right { display: flex; align-items: center; gap: var(--sp-1); flex-shrink: 0; }
:global(.read-icon) { color: var(--text-faint); } :global(.read-icon) { color: var(--text-faint); }
:global(.enqueue-icon) { color: var(--text-faint); } :global(.enqueue-icon) { color: var(--text-faint); }
.dl-btn { display: flex; align-items: center; justify-content: center; width: 24px; height: 24px; border-radius: var(--radius-sm); color: var(--text-faint); transition: color var(--t-base), background var(--t-base); opacity: 0; } .dl-btn { display: flex; align-items: center; justify-content: center; width: 24px; height: 24px; border-radius: var(--radius-sm); color: var(--text-faint); transition: color var(--t-base), background var(--t-base); }
.ch-row:hover .dl-btn { opacity: 1; }
.dl-btn:hover { color: var(--text-muted); background: var(--bg-overlay); } .dl-btn:hover { color: var(--text-muted); background: var(--bg-overlay); }
.dl-btn-delete { color: var(--color-error) !important; opacity: 0; } .dl-btn-delete { color: var(--color-error) !important; }
.ch-row:hover .dl-btn-delete { opacity: 1; }
.dl-btn-delete:hover { background: var(--color-error-bg) !important; } .dl-btn-delete:hover { background: var(--color-error-bg) !important; }
.ch-dl-wrap { position: relative; display: flex; align-items: center; justify-content: center; width: 24px; height: 24px; } .ch-dl-wrap { display: flex; align-items: center; gap: var(--sp-1); }
:global(.ch-dl-icon) { color: var(--text-faint); transition: opacity var(--t-fast); } :global(.ch-dl-icon) { color: var(--text-faint); }
.ch-row:hover .ch-dl-wrap :global(.ch-dl-icon) { opacity: 0; }
.ch-dl-wrap .dl-btn-delete { position: absolute; inset: 0; opacity: 0; }
.ch-row:hover .ch-dl-wrap .dl-btn-delete { opacity: 1; }
.ch-check { display: flex; align-items: center; justify-content: center; width: 20px; height: 20px; flex-shrink: 0; border-radius: var(--radius-sm); border: none; background: none; color: var(--text-faint); cursor: pointer; opacity: 0; transition: opacity var(--t-fast), color var(--t-fast); padding: 0; } .ch-check {
.ch-row:hover .ch-check { opacity: 1; } display: flex; align-items: center; justify-content: center;
.ch-check-visible { opacity: 1 !important; } width: 20px; height: 20px; flex-shrink: 0;
border-radius: var(--radius-sm); border: none; background: none;
color: var(--text-faint); cursor: pointer; padding: 0;
opacity: 0;
transform: translateX(-6px);
transition: opacity var(--t-fast), transform var(--t-fast), color var(--t-fast);
margin-right: -20px;
}
.ch-row:hover .ch-check { opacity: 1; transform: translateX(0); margin-right: 0; }
.ch-check-visible { opacity: 1 !important; transform: translateX(0) !important; margin-right: 0 !important; }
.ch-selected .ch-check { color: var(--accent-fg); }
.ch-selected { background: color-mix(in srgb, var(--accent) 8%, transparent) !important; } .ch-selected { background: color-mix(in srgb, var(--accent) 8%, transparent) !important; }
.ch-selected .ch-check { color: var(--accent-fg); opacity: 1; }
.row-skeleton { display: flex; flex-direction: column; gap: var(--sp-2); padding: 12px var(--sp-4); border-bottom: 1px solid var(--border-dim); } .row-skeleton { display: flex; flex-direction: column; gap: var(--sp-2); padding: 12px var(--sp-4); border-bottom: 1px solid var(--border-dim); }
.grid-cell { display: flex; align-items: center; justify-content: center; aspect-ratio: 1; border-radius: var(--radius-sm); background: var(--bg-raised); border: 1px solid var(--border-dim); font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-muted); cursor: pointer; position: relative; transition: background var(--t-fast), border-color var(--t-fast); } .grid-cell { display: flex; align-items: center; justify-content: center; aspect-ratio: 1; border-radius: var(--radius-sm); background: var(--bg-raised); border: 1px solid var(--border-dim); font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-muted); cursor: pointer; position: relative; transition: background var(--t-fast), border-color var(--t-fast); }
.grid-cell:hover { background: var(--bg-overlay); border-color: var(--border-strong); } .grid-cell:hover { background: var(--bg-overlay); border-color: var(--border-strong); }
.grid-cell.read { background: var(--color-read); color: var(--text-faint); border-color: transparent; } .grid-cell.read { background: var(--color-read); color: var(--text-faint); border-color: transparent; }
.grid-cell.in-progress { border-color: var(--accent-dim); color: var(--accent-fg); }
.grid-cell-num { font-size: 10px; } .grid-cell-num { font-size: 10px; }
.grid-cell-dot { position: absolute; bottom: 3px; right: 3px; width: 4px; height: 4px; border-radius: 50%; background: var(--text-faint); } .grid-cell-dot { position: absolute; bottom: 3px; right: 3px; width: 4px; height: 4px; border-radius: var(--radius-sm); background: var(--text-faint); }
.grid-cell-dl { position: absolute; top: 3px; left: 3px; width: 4px; height: 4px; border-radius: 50%; background: var(--accent-fg); } .grid-cell-dl { position: absolute; top: 3px; left: 3px; width: 4px; height: 4px; border-radius: var(--radius-sm); background: var(--accent-fg); }
.grid-cell-spinner { position: absolute; top: 2px; right: 2px; } .grid-cell-spinner { position: absolute; top: 2px; right: 2px; }
.grid-cell-skeleton { aspect-ratio: 1; border-radius: var(--radius-sm); } .grid-cell-skeleton { aspect-ratio: 1; border-radius: var(--radius-sm); }
.grid-selected { background: var(--accent-muted) !important; border-color: var(--accent-dim) !important; } .grid-selected { background: var(--accent-muted) !important; border-color: var(--accent-dim) !important; }
+11 -28
View File
@@ -6,7 +6,6 @@
} from 'phosphor-svelte' } from 'phosphor-svelte'
import type { Chapter, Category } from '$lib/types' import type { Chapter, Category } from '$lib/types'
import type { ChapterSortMode, ChapterSortDir } from './lib/chapterList' import type { ChapterSortMode, ChapterSortDir } from './lib/chapterList'
import { updateSettings } from '$lib/state/settings.svelte'
interface ContinueChapter { interface ContinueChapter {
chapter: Chapter chapter: Chapter
@@ -20,8 +19,6 @@
sortMode: ChapterSortMode sortMode: ChapterSortMode
sortDir: ChapterSortDir sortDir: ChapterSortDir
viewMode: 'list' | 'grid' viewMode: 'list' | 'grid'
chapterPage: number
totalPages: number
downloadedCount: number downloadedCount: number
totalCount: number totalCount: number
deletingAll: boolean deletingAll: boolean
@@ -52,11 +49,13 @@
onSetScanlatorBlacklist: (v: string[]) => void onSetScanlatorBlacklist: (v: string[]) => void
onSetScanlatorForce: (v: boolean) => void onSetScanlatorForce: (v: boolean) => void
onOpenFolder: () => void onOpenFolder: () => void
onSortModeChange: (v: ChapterSortMode) => void
onSortDirChange: (v: ChapterSortDir) => void
} }
let { let {
chapters, sortedChapters, sortMode, sortDir, viewMode, chapters, sortedChapters, sortMode, sortDir, viewMode,
chapterPage, totalPages, downloadedCount, totalCount, deletingAll, downloadedCount, totalCount, deletingAll,
hasSelection, selectedCount, continueChapter, hasSelection, selectedCount, continueChapter,
availableScanlators, scanlatorFilter, scanlatorBlacklist, scanlatorForce, availableScanlators, scanlatorFilter, scanlatorBlacklist, scanlatorForce,
allCategories, mangaCategories, catsLoading, refreshing, allCategories, mangaCategories, catsLoading, refreshing,
@@ -64,7 +63,7 @@
onMarkSelectedRead, onClearSelection, onEnqueueNext, onEnqueueMultiple, onMarkSelectedRead, onClearSelection, onEnqueueNext, onEnqueueMultiple,
onDeleteAll, onRefresh, onToggleCategory, onCreateCategory, onDeleteAll, onRefresh, onToggleCategory, onCreateCategory,
onSetScanlatorFilter, onSetScanlatorBlacklist, onSetScanlatorForce, onSetScanlatorFilter, onSetScanlatorBlacklist, onSetScanlatorForce,
onOpenFolder, onOpenFolder, onSortModeChange, onSortDirChange,
}: Props = $props() }: Props = $props()
let sortMenuOpen: boolean = $state(false) let sortMenuOpen: boolean = $state(false)
@@ -166,11 +165,11 @@
<button <button
class="sort-option" class="sort-option"
class:active={sortMode === val} class:active={sortMode === val}
onclick={() => { updateSettings({ chapterSortMode: val as ChapterSortMode }); onPageChange(1); sortMenuOpen = false }} onclick={() => { onSortModeChange(val as ChapterSortMode); onPageChange(1); sortMenuOpen = false }}
>{label}</button> >{label}</button>
{/each} {/each}
<div class="sort-divider"></div> <div class="sort-divider"></div>
<button class="sort-option" onclick={() => { updateSettings({ chapterSortDir: sortDir === 'desc' ? 'asc' : 'desc' }); onPageChange(1); sortMenuOpen = false }}> <button class="sort-option" onclick={() => { onSortDirChange(sortDir === 'desc' ? 'asc' : 'desc'); onPageChange(1); sortMenuOpen = false }}>
{sortDir === 'desc' ? '↑ Ascending' : '↓ Descending'} {sortDir === 'desc' ? '↑ Ascending' : '↓ Descending'}
</button> </button>
</div> </div>
@@ -276,9 +275,11 @@
<ArrowsClockwise size={14} weight="light" class={refreshing ? 'anim-spin' : ''} /> <ArrowsClockwise size={14} weight="light" class={refreshing ? 'anim-spin' : ''} />
</button> </button>
<button class="icon-btn" onclick={onOpenFolder} title="Open manga folder"> {#if downloadedCount > 0}
<FolderOpen size={14} weight="light" /> <button class="icon-btn" onclick={onOpenFolder} title="Open manga folder">
</button> <FolderOpen size={14} weight="light" />
</button>
{/if}
<div class="fp-wrap" bind:this={folderPickerRef}> <div class="fp-wrap" bind:this={folderPickerRef}>
<button class="icon-btn" class:active={hasFolders} onclick={() => folderPickerOpen = !folderPickerOpen}> <button class="icon-btn" class:active={hasFolders} onclick={() => folderPickerOpen = !folderPickerOpen}>
@@ -376,13 +377,6 @@
</div> </div>
{/if} {/if}
{#if totalPages > 1}
<div class="pagination">
<button class="page-btn" onclick={() => onPageChange(Math.max(1, chapterPage - 1))} disabled={chapterPage === 1}></button>
<span class="page-num">{chapterPage} / {totalPages}</span>
<button class="page-btn" onclick={() => onPageChange(Math.min(totalPages, chapterPage + 1))} disabled={chapterPage === totalPages}></button>
</div>
{/if}
</div> </div>
</div> </div>
@@ -571,17 +565,6 @@
.dl-unified-btn.dl-has-count:hover { background: var(--accent-muted); border-color: var(--accent); opacity: 0.9; } .dl-unified-btn.dl-has-count:hover { background: var(--accent-muted); border-color: var(--accent); opacity: 0.9; }
.dl-unified-btn.active { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); } .dl-unified-btn.active { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); }
.pagination { display: flex; align-items: center; gap: var(--sp-2); }
.page-btn {
font-family: var(--font-ui); font-size: var(--text-xs); letter-spacing: var(--tracking-wide);
padding: 4px 10px; border-radius: var(--radius-sm); border: 1px solid var(--border-dim);
color: var(--text-faint); background: none; cursor: pointer;
transition: color var(--t-base), border-color var(--t-base);
}
.page-btn:hover:not(:disabled) { color: var(--text-muted); border-color: var(--border-strong); }
.page-btn:disabled { opacity: 0.3; cursor: default; }
.page-num { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); letter-spacing: var(--tracking-wide); }
.sel-count { .sel-count {
font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-muted); font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-muted);
letter-spacing: var(--tracking-wide); padding: 0 var(--sp-1); letter-spacing: var(--tracking-wide); padding: 0 var(--sp-1);
+160 -241
View File
@@ -8,21 +8,23 @@
CheckCircle, Circle, ArrowFatLinesUp, ArrowFatLinesDown, CheckCircle, Circle, ArrowFatLinesUp, ArrowFatLinesDown,
ArrowFatLineUp, ArrowFatLineDown, Download, Trash, DownloadSimple, CheckSquare, ArrowFatLineUp, ArrowFatLineDown, Download, Trash, DownloadSimple, CheckSquare,
} from 'phosphor-svelte' } from 'phosphor-svelte'
import type { MenuEntry } from '$lib/components/shared/ui/ContextMenu.svelte'
type MenuSeparator = { separator: true }
type MenuItem = { label: string; icon?: any; onClick: () => void; danger?: boolean; disabled?: boolean; separator?: never; children?: MenuEntry[] }
type MenuEntry = MenuItem | MenuSeparator
import { getManga, getMangaList } from '$lib/request-manager/manga' import { getManga, getMangaList } from '$lib/request-manager/manga'
import { getChapters, fetchChapters, markChapterRead, markChaptersRead, deleteDownloadedChapters } from '$lib/request-manager/chapters' import { markChapterRead, markChaptersRead, deleteDownloadedChapters, fetchChapters } from '$lib/request-manager/chapters'
import { downloadStore } from '$lib/state/downloads.svelte' import { downloadStore } from '$lib/state/downloads.svelte'
import { getCategories, updateMangaCategories, createCategory as createCategoryReq, updateManga } from '$lib/request-manager/manga' import { getCategories, updateMangaCategories, createCategory as createCategoryReq, updateManga } from '$lib/request-manager/manga'
import { saveScroll, getScroll } from '$lib/state/app.svelte' import { saveScroll, getScroll } from '$lib/state/app.svelte'
import { seriesState, openReader, addBookmark, import { seriesState, openReaderForChapter, acknowledgeUpdate, addBookmark, clearMarkersForManga } from '$lib/state/series.svelte'
acknowledgeUpdate, clearMarkersForManga } from '$lib/state/series.svelte' import { updateSettings } from '$lib/state/settings.svelte'
import { DEFAULT_MANGA_PREFS } from '$lib/types/settings' import { DEFAULT_MANGA_PREFS } from '$lib/state/series.svelte'
import type { MangaPrefs } from '$lib/types/settings' import type { MangaPrefs } from '$lib/types/settings'
import { addToast } from '$lib/state/notifications.svelte' import { addToast } from '$lib/state/notifications.svelte'
import { trackingState } from '$lib/state/tracking.svelte' import { trackingState } from '$lib/state/tracking.svelte'
import { autoLinkLibrary } from '$lib/core/cover/autoLink' import { autoLinkLibrary } from '$lib/core/cover/autoLink'
import { buildChapterList } from '$lib/components/series/lib/chapterList' import { getPref, setPref } from '$lib/state/series.svelte'
import { getPref, setPref } from '$lib/components/series/lib/mangaPrefs'
import { openMangaFolder } from '$lib/core/filesystem' import { openMangaFolder } from '$lib/core/filesystem'
import type { Manga, Chapter, Category } from '$lib/types' import type { Manga, Chapter, Category } from '$lib/types'
import AutomationPanel from '$lib/components/series/panels/AutomationPanel.svelte' import AutomationPanel from '$lib/components/series/panels/AutomationPanel.svelte'
@@ -35,17 +37,13 @@
interface Props { mangaId: number } interface Props { mangaId: number }
let { mangaId }: Props = $props() let { mangaId }: Props = $props()
const CHAPTERS_PER_PAGE = 25 let chaptersPerPage: number = $state(25)
const MANGA_TTL_MS = 5 * 60 * 1000 const MANGA_TTL_MS = 5 * 60 * 1000
const CHAPTER_TTL_MS = 2 * 60 * 1000
const mangaCache: Map<number, { data: Manga; fetchedAt: number }> = new Map() const mangaCache: Map<number, { data: Manga; fetchedAt: number }> = new Map()
const chapterCache: Map<number, { data: Chapter[]; fetchedAt: number }> = new Map()
let manga: Manga | null = $state(null) let manga: Manga | null = $state(null)
let chapters: Chapter[] = $state([])
let loadingManga: boolean = $state(false) let loadingManga: boolean = $state(false)
let loadingChapters: boolean = $state(true)
let enqueueing: Set<number> = $state(new Set()) let enqueueing: Set<number> = $state(new Set())
let togglingLibrary: boolean = $state(false) let togglingLibrary: boolean = $state(false)
let chapterPage: number = $state(1) let chapterPage: number = $state(1)
@@ -66,42 +64,28 @@
let catsLoading: boolean = $state(false) let catsLoading: boolean = $state(false)
let chapterListEl: HTMLDivElement | null = $state(null) let chapterListEl: HTMLDivElement | null = $state(null)
let mangaAbort: AbortController | null = null let mangaAbort: AbortController | null = null
let chapterAbort: AbortController | null = null let prevMangaId: number | null = null
let loadingFor: number | null = null
let prevChapterIds = new Set<number>()
let prevMangaId: number | null = null
const get = <K extends keyof MangaPrefs>(key: K) => const get = <K extends keyof MangaPrefs>(key: K) => getPref(mangaId, key)
mangaId ? getPref(mangaId, key) : DEFAULT_MANGA_PREFS[key] const set = <K extends keyof MangaPrefs>(key: K, value: MangaPrefs[K]) => setPref(mangaId, key, value)
const set = <K extends keyof MangaPrefs>(key: K, value: MangaPrefs[K]) => {
if (mangaId) setPref(mangaId, key, value)
}
const hasSelection = $derived(selectedIds.size > 0) const chapters = $derived(seriesState.chaptersFor(mangaId))
const sortDir = $derived(seriesState.settings.chapterSortDir) const loadingChapters = $derived(seriesState.isLoadingChapters(mangaId))
const sortMode = $derived(seriesState.settings.chapterSortMode ?? 'source') const sortedChapters = $derived(seriesState.activeChapterList)
const scanlatorFilter = $derived((get('scanlatorFilter') ?? []) as string[]) const hasSelection = $derived(selectedIds.size > 0)
const scanlatorBlacklist = $derived((get('scanlatorBlacklist') ?? []) as string[])
const scanlatorForce = $derived((get('scanlatorForce') ?? false) as boolean)
const currentPrefs = $derived({
sortMode,
sortDir,
preferredScanlator: get('preferredScanlator') as string,
scanlatorFilter: scanlatorFilter as string[],
scanlatorBlacklist: scanlatorBlacklist as string[],
scanlatorForce: scanlatorForce as boolean,
})
const availableScanlators = $derived( const availableScanlators = $derived(
[...new Set(chapters.map(c => c.scanlator).filter((s): s is string => !!s?.trim()))] [...new Set(chapters.map(c => c.scanlator).filter((s): s is string => !!s?.trim()))]
.sort((a, b) => a.localeCompare(b)) .sort((a, b) => a.localeCompare(b))
) )
const sortedChapters = $derived(buildChapterList(chapters, currentPrefs)) const scanlatorFilter = $derived(get('scanlatorFilter') as string[])
const totalPages = $derived(Math.ceil(sortedChapters.length / CHAPTERS_PER_PAGE)) const scanlatorBlacklist = $derived(get('scanlatorBlacklist') as string[])
const pageChapters = $derived(sortedChapters.slice((chapterPage - 1) * CHAPTERS_PER_PAGE, chapterPage * CHAPTERS_PER_PAGE)) const scanlatorForce = $derived(get('scanlatorForce') as boolean)
const totalPages = $derived(Math.ceil(sortedChapters.length / chaptersPerPage))
const pageChapters = $derived(sortedChapters.slice((chapterPage - 1) * chaptersPerPage, chapterPage * chaptersPerPage))
const readCount = $derived(sortedChapters.filter(c => c.read).length) const readCount = $derived(sortedChapters.filter(c => c.read).length)
const totalCount = $derived(sortedChapters.length) const totalCount = $derived(sortedChapters.length)
const progressPct = $derived(totalCount > 0 ? (readCount / totalCount) * 100 : 0) const progressPct = $derived(totalCount > 0 ? (readCount / totalCount) * 100 : 0)
@@ -111,17 +95,14 @@
if (!sortedChapters.length) return null if (!sortedChapters.length) return null
const asc = [...sortedChapters].sort((a, b) => a.sourceOrder - b.sourceOrder) const asc = [...sortedChapters].sort((a, b) => a.sourceOrder - b.sourceOrder)
const anyRead = asc.some(c => c.read) const anyRead = asc.some(c => c.read)
const bookmark = mangaId const bookmark = seriesState.bookmarks.find(b => b.mangaId === mangaId)
? seriesState.bookmarks.find(b => b.mangaId === mangaId)
: null
const bookmarkedCh = bookmark ? asc.find(c => c.id === bookmark.chapterId) : null const bookmarkedCh = bookmark ? asc.find(c => c.id === bookmark.chapterId) : null
if (bookmarkedCh && !bookmarkedCh.read) { if (bookmarkedCh && !bookmarkedCh.read)
return { chapter: bookmarkedCh, type: (anyRead ? 'continue' : 'start') as const, resumePage: bookmark!.pageNumber } return { chapter: bookmarkedCh, type: (anyRead ? 'continue' : 'start') as 'continue' | 'start', resumePage: bookmark!.pageNumber }
}
const inProgress = asc.find(c => !c.read && (c.lastPageRead ?? 0) > 0) const inProgress = asc.find(c => !c.read && (c.lastPageRead ?? 0) > 0)
const firstUnread = asc.find(c => !c.read) const firstUnread = asc.find(c => !c.read)
const target = inProgress ?? firstUnread const target = inProgress ?? firstUnread
if (target) return { chapter: target, type: (anyRead ? 'continue' : 'start') as const, resumePage: null } if (target) return { chapter: target, type: (anyRead ? 'continue' : 'start') as 'continue' | 'start', resumePage: null }
return { chapter: asc[0], type: 'reread' as const, resumePage: null } return { chapter: asc[0], type: 'reread' as const, resumePage: null }
})()) })())
@@ -146,17 +127,6 @@
selectedIds = next selectedIds = next
} }
function applyChapters(nodes: Chapter[]) {
if (get('autoDownload') && prevChapterIds.size > 0) {
const filtered = buildChapterList(nodes, currentPrefs)
const newChapters = filtered.filter(c => !prevChapterIds.has(c.id) && !c.downloaded)
if (newChapters.length) enqueueMultiple(newChapters.map(c => c.id))
}
prevChapterIds = new Set(nodes.map(c => c.id))
chapters = nodes
if (mangaId && nodes.length > 0) checkAndMarkCompleted(mangaId, nodes)
}
function loadCategories(id: number) { function loadCategories(id: number) {
catsLoading = true catsLoading = true
getCategories() getCategories()
@@ -169,96 +139,63 @@
} }
async function checkAndMarkCompleted(id: number, chaps: Chapter[]) { async function checkAndMarkCompleted(id: number, chaps: Chapter[]) {
if (chaps.length && manga?.status !== 'ONGOING') { if (!chaps.length || manga?.status === 'ONGOING') return
const allRead = chaps.every(c => c.read) const allRead = chaps.every(c => c.read)
const completed = allCategories.find(c => c.name === 'Completed') const completed = allCategories.find(c => c.name === 'Completed')
if (completed) { if (!completed) return
const inCompleted = mangaCategories.some(c => c.id === completed.id) const inCompleted = mangaCategories.some(c => c.id === completed.id)
if (allRead && !inCompleted) mangaCategories = [...mangaCategories, completed] if (allRead && !inCompleted) {
else if (!allRead && inCompleted) mangaCategories = mangaCategories.filter(c => c.id !== completed.id) await updateMangaCategories(String(id), [completed.id], []).catch(console.error)
} mangaCategories = [...mangaCategories, completed]
} else if (!allRead && inCompleted) {
await updateMangaCategories(String(id), [], [completed.id]).catch(console.error)
mangaCategories = mangaCategories.filter(c => c.id !== completed.id)
} }
} }
function loadMangaData(id: number) { function loadMangaData(id: number) {
mangaAbort?.abort() mangaAbort?.abort()
const ctrl = new AbortController() const ctrl = new AbortController()
mangaAbort = ctrl; loadingFor = id mangaAbort = ctrl
const cached = mangaCache.get(id) const cached = mangaCache.get(id)
if (cached) { if (cached) {
manga = cached.data; loadingManga = false manga = cached.data
loadingManga = false
seriesState.setActiveManga(cached.data)
if (Date.now() - cached.fetchedAt < MANGA_TTL_MS) return if (Date.now() - cached.fetchedAt < MANGA_TTL_MS) return
getManga(id, ctrl.signal).then(m => { getManga(id, ctrl.signal)
if (ctrl.signal.aborted || loadingFor !== id) return .then(m => {
mangaCache.set(id, { data: m, fetchedAt: Date.now() }) if (ctrl.signal.aborted) return
manga = m mangaCache.set(id, { data: m, fetchedAt: Date.now() })
}).catch(() => {}) manga = m
seriesState.setActiveManga(m)
})
.catch(() => {})
return return
} }
loadingManga = true loadingManga = true
getManga(id, ctrl.signal).then(m => { getManga(id, ctrl.signal)
if (ctrl.signal.aborted || loadingFor !== id) return .then(m => {
mangaCache.set(id, { data: m, fetchedAt: Date.now() }) if (ctrl.signal.aborted) return
manga = m mangaCache.set(id, { data: m, fetchedAt: Date.now() })
}).catch(() => {}).finally(() => { if (!ctrl.signal.aborted && loadingFor === id) loadingManga = false }) manga = m
} seriesState.setActiveManga(m)
})
function loadChaptersData(id: number) { .catch(() => {})
chapterAbort?.abort() .finally(() => { if (!ctrl.signal.aborted) loadingManga = false })
const ctrl = new AbortController()
chapterAbort = ctrl
const cached = chapterCache.get(id)
if (cached) {
applyChapters(cached.data); loadingChapters = false
if (Date.now() - cached.fetchedAt < CHAPTER_TTL_MS) return
fetchChapters(id, ctrl.signal)
.then(() => getChapters(id, ctrl.signal))
.then(nodes => {
if (ctrl.signal.aborted || loadingFor !== id) return
chapterCache.set(id, { data: nodes, fetchedAt: Date.now() })
applyChapters(nodes)
}).catch(() => {})
return
}
chapters = []; loadingChapters = true
getChapters(id, ctrl.signal).then(nodes => {
if (ctrl.signal.aborted || loadingFor !== id) return
applyChapters(nodes); loadingChapters = false
return fetchChapters(id, ctrl.signal)
.then(() => getChapters(id, ctrl.signal))
.then(fresh => {
if (ctrl.signal.aborted || loadingFor !== id) return
chapterCache.set(id, { data: fresh, fetchedAt: Date.now() })
applyChapters(fresh)
})
}).catch(() => { if (!ctrl.signal.aborted) loadingChapters = false })
}
async function syncTrackersIntoChapters(id: number, chaps: Chapter[]) {
if (!seriesState.settings.trackerSyncBack) return
const records = trackingState.recordsFor(id)
if (!records.length) return
for (const record of records) {
try {
const { markedIds } = await trackingState.syncFromRemote(id, record, chaps, currentPrefs)
if (markedIds.length > 0) {
const idSet = new Set(markedIds)
chapters = chapters.map(c => idSet.has(c.id) ? { ...c, read: true } : c)
chapterCache.set(id, { data: chapters, fetchedAt: Date.now() })
}
} catch {}
}
} }
$effect(() => { $effect(() => {
const id = mangaId const id = mangaId
const shouldAutoLink = seriesState.settings.autoLinkOnOpen const shouldAutoLink = seriesState.settings.autoLinkOnOpen
if (id) untrack(() => { untrack(() => {
acknowledgeUpdate(id) acknowledgeUpdate(id)
loadMangaData(id) loadMangaData(id)
loadChaptersData(id) seriesState.loadChapters(id).then(() => {
checkAndMarkCompleted(id, seriesState.chaptersFor(id))
trackingState.loadForManga(id).then(() => syncTrackersIntoChapters(id))
})
loadCategories(id) loadCategories(id)
trackingState.loadForManga(id).then(() => syncTrackersIntoChapters(id, chapters))
if (shouldAutoLink) { if (shouldAutoLink) {
if (allMangaForLink.length) { if (allMangaForLink.length) {
autoLinkLibrary(manga, allMangaForLink) autoLinkLibrary(manga, allMangaForLink)
@@ -266,10 +203,7 @@
} else { } else {
loadingLinkList = true loadingLinkList = true
getMangaList() getMangaList()
.then(list => { .then(list => { allMangaForLink = list; return autoLinkLibrary(manga, list) })
allMangaForLink = list
return autoLinkLibrary(manga, list)
})
.then(n => { if (n > 0) addToast({ kind: 'success', title: 'Series linked', body: `${n} new link${n === 1 ? '' : 's'} found` }) }) .then(n => { if (n > 0) addToast({ kind: 'success', title: 'Series linked', body: `${n} new link${n === 1 ? '' : 's'} found` }) })
.catch(console.error) .catch(console.error)
.finally(() => { loadingLinkList = false }) .finally(() => { loadingLinkList = false })
@@ -278,13 +212,9 @@
}) })
}) })
let prevChapterId: number | null = null
$effect(() => { $effect(() => {
const wasOpen = prevChapterId !== null const wasOpen = seriesState.activeChapter !== null
prevChapterId = seriesState.activeChapter?.id ?? null if (!wasOpen) untrack(() => seriesState.loadChapters(mangaId, { force: true }))
if (wasOpen && !seriesState.activeChapter) {
untrack(() => { reloadChapters(mangaId) })
}
}) })
$effect(() => { $effect(() => {
@@ -292,12 +222,33 @@
if (id === prevMangaId) return if (id === prevMangaId) return
if (chapterListEl && prevMangaId !== null) saveScroll(`series:${prevMangaId}`, chapterListEl.scrollTop) if (chapterListEl && prevMangaId !== null) saveScroll(`series:${prevMangaId}`, chapterListEl.scrollTop)
prevMangaId = id prevMangaId = id
if (chapterListEl && id !== null) { if (chapterListEl) chapterListEl.scrollTo({ top: getScroll(`series:${id}`) })
chapterListEl.scrollTo({ top: getScroll(`series:${id}`) })
}
}) })
$effect(() => () => { mangaAbort?.abort(); chapterAbort?.abort() }) $effect(() => () => { mangaAbort?.abort() })
async function syncTrackersIntoChapters(id: number) {
if (!seriesState.settings.trackerSyncBack) return
const records = trackingState.recordsFor(id)
if (!records.length) return
const prefs = {
sortMode: seriesState.settings.chapterSortMode,
sortDir: seriesState.settings.chapterSortDir,
preferredScanlator: get('preferredScanlator') as string,
scanlatorFilter: scanlatorFilter,
scanlatorBlacklist: scanlatorBlacklist,
scanlatorForce: scanlatorForce,
}
for (const record of records) {
try {
const { markedIds } = await trackingState.syncFromRemote(id, record, seriesState.chaptersFor(id), prefs)
if (markedIds.length > 0) {
const idSet = new Set(markedIds)
seriesState.patchChapters(id, chaps => chaps.map(c => idSet.has(c.id) ? { ...c, read: true } : c))
}
} catch {}
}
}
async function toggleLibrary() { async function toggleLibrary() {
if (!manga) return if (!manga) return
@@ -305,23 +256,18 @@
const next = !manga.inLibrary const next = !manga.inLibrary
await updateManga(manga.id, { inLibrary: next }).catch(console.error) await updateManga(manga.id, { inLibrary: next }).catch(console.error)
manga = { ...manga, inLibrary: next } manga = { ...manga, inLibrary: next }
if (mangaCache.has(manga.id)) { const e = mangaCache.get(manga.id)!; mangaCache.set(manga.id, { ...e, data: manga }) } seriesState.setActiveManga(manga)
if (mangaCache.has(manga.id)) mangaCache.set(manga.id, { data: manga, fetchedAt: mangaCache.get(manga.id)!.fetchedAt })
togglingLibrary = false togglingLibrary = false
} }
async function reloadChapters(id: number) {
const nodes = await getChapters(id)
chapterCache.set(id, { data: nodes, fetchedAt: Date.now() })
applyChapters(nodes)
}
async function enqueue(ch: Chapter, e: MouseEvent) { async function enqueue(ch: Chapter, e: MouseEvent) {
e.stopPropagation() e.stopPropagation()
enqueueing = new Set(enqueueing).add(ch.id) enqueueing = new Set(enqueueing).add(ch.id)
const allowed = await downloadStore.enqueue(ch.id) const allowed = await downloadStore.enqueue(ch.id)
if (allowed) addToast({ kind: 'download', title: 'Download queued', body: ch.name }) if (allowed) addToast({ kind: 'download', title: 'Download queued', body: ch.name })
enqueueing.delete(ch.id); enqueueing = new Set(enqueueing) enqueueing.delete(ch.id); enqueueing = new Set(enqueueing)
reloadChapters(mangaId) seriesState.loadChapters(mangaId, { force: true })
} }
async function enqueueMultiple(chapterIds: number[]) { async function enqueueMultiple(chapterIds: number[]) {
@@ -331,26 +277,28 @@
if (!allowed) return if (!allowed) return
} }
addToast({ kind: 'download', title: 'Download queued', body: `${chapterIds.length} chapter${chapterIds.length !== 1 ? 's' : ''} added` }) addToast({ kind: 'download', title: 'Download queued', body: `${chapterIds.length} chapter${chapterIds.length !== 1 ? 's' : ''} added` })
reloadChapters(mangaId) seriesState.loadChapters(mangaId, { force: true })
} }
async function markRead(chapterId: number, isRead: boolean) { async function markRead(chapterId: number, isRead: boolean) {
await markChapterRead(chapterId, isRead).catch(console.error) await markChapterRead(chapterId, isRead).catch(console.error)
chapters = chapters.map(c => c.id === chapterId ? { ...c, read: isRead } : c) seriesState.patchChapters(mangaId, chaps => chaps.map(c => c.id === chapterId ? { ...c, read: isRead } : c))
chapterCache.set(mangaId, { data: chapters, fetchedAt: Date.now() }) checkAndMarkCompleted(mangaId, seriesState.chaptersFor(mangaId))
checkAndMarkCompleted(mangaId, chapters) const ch = seriesState.chaptersFor(mangaId).find(c => c.id === chapterId)
const ch = chapters.find(c => c.id === chapterId) const currentPrefs = {
sortMode: seriesState.settings.chapterSortMode, sortDir: seriesState.settings.chapterSortDir,
preferredScanlator: get('preferredScanlator') as string,
scanlatorFilter, scanlatorBlacklist, scanlatorForce,
}
if (ch) { if (ch) {
if (isRead) await trackingState.updateFromRead(mangaId, ch, chapters, currentPrefs) if (isRead) await trackingState.updateFromRead(mangaId, ch, seriesState.chaptersFor(mangaId), currentPrefs)
else await trackingState.updateFromUnread(mangaId, chapters, currentPrefs) else await trackingState.updateFromUnread(mangaId, seriesState.chaptersFor(mangaId), currentPrefs)
} }
if (isRead) { if (isRead) {
if (get('deleteOnRead')) { if (get('deleteOnRead') && ch?.downloaded) {
if (ch?.downloaded) { const delayMs = (get('deleteDelayHours') as number) * 3_600_000
const delayMs = (get('deleteDelayHours') as number) * 60 * 60 * 1000 const doDelete = () => deleteDownloaded(chapterId)
if (delayMs === 0) deleteDownloaded(chapterId) if (delayMs === 0) doDelete(); else setTimeout(doDelete, delayMs)
else setTimeout(() => deleteDownloaded(chapterId), delayMs)
}
} }
const ahead = get('downloadAhead') as number const ahead = get('downloadAhead') as number
if (ahead > 0) { if (ahead > 0) {
@@ -367,24 +315,27 @@
if (!ids.length) return if (!ids.length) return
await markChaptersRead(ids, isRead).catch(console.error) await markChaptersRead(ids, isRead).catch(console.error)
const idSet = new Set(ids) const idSet = new Set(ids)
chapters = chapters.map(c => idSet.has(c.id) ? { ...c, read: isRead } : c) seriesState.patchChapters(mangaId, chaps => chaps.map(c => idSet.has(c.id) ? { ...c, read: isRead } : c))
chapterCache.set(mangaId, { data: chapters, fetchedAt: Date.now() }) checkAndMarkCompleted(mangaId, seriesState.chaptersFor(mangaId))
checkAndMarkCompleted(mangaId, chapters) const currentPrefs = {
sortMode: seriesState.settings.chapterSortMode, sortDir: seriesState.settings.chapterSortDir,
preferredScanlator: get('preferredScanlator') as string,
scanlatorFilter, scanlatorBlacklist, scanlatorForce,
}
if (isRead) { if (isRead) {
const ascending = [...chapters].sort((a, b) => a.sourceOrder - b.sourceOrder) const chaps = seriesState.chaptersFor(mangaId)
const lastInBatch = ascending.filter(c => idSet.has(c.id)).at(-1) const lastRead = [...chaps].sort((a, b) => a.sourceOrder - b.sourceOrder).filter(c => idSet.has(c.id)).at(-1)
if (lastInBatch) await trackingState.updateFromRead(mangaId, lastInBatch, chapters, currentPrefs) if (lastRead) await trackingState.updateFromRead(mangaId, lastRead, chaps, currentPrefs)
} else { } else {
await trackingState.updateFromUnread(mangaId, chapters, currentPrefs) await trackingState.updateFromUnread(mangaId, seriesState.chaptersFor(mangaId), currentPrefs)
} }
if (isRead && get('deleteOnRead')) { if (isRead && get('deleteOnRead')) {
const toDelete = ids.filter(id => chapters.find(c => c.id === id)?.downloaded) const toDelete = ids.filter(id => seriesState.chaptersFor(mangaId).find(c => c.id === id)?.downloaded)
if (toDelete.length) { if (toDelete.length) {
const delayMs = (get('deleteDelayHours') as number) * 60 * 60 * 1000 const delayMs = (get('deleteDelayHours') as number) * 3_600_000
const doDelete = async () => { const doDelete = async () => {
await deleteDownloadedChapters(toDelete).catch(console.error) await deleteDownloadedChapters(toDelete).catch(console.error)
chapters = chapters.map(c => toDelete.includes(c.id) ? { ...c, downloaded: false } : c) seriesState.patchChapters(mangaId, chaps => chaps.map(c => toDelete.includes(c.id) ? { ...c, downloaded: false } : c))
chapterCache.set(mangaId, { data: chapters, fetchedAt: Date.now() })
} }
if (delayMs === 0) doDelete(); else setTimeout(doDelete, delayMs) if (delayMs === 0) doDelete(); else setTimeout(doDelete, delayMs)
} }
@@ -392,17 +343,16 @@
} }
async function deleteSelected() { async function deleteSelected() {
const ids = [...selectedIds].filter(id => chapters.find(c => c.id === id)?.downloaded) const ids = [...selectedIds].filter(id => seriesState.chaptersFor(mangaId).find(c => c.id === id)?.downloaded)
if (ids.length) { if (ids.length) {
await deleteDownloadedChapters(ids).catch(console.error) await deleteDownloadedChapters(ids).catch(console.error)
chapters = chapters.map(c => ids.includes(c.id) ? { ...c, downloaded: false } : c) seriesState.patchChapters(mangaId, chaps => chaps.map(c => ids.includes(c.id) ? { ...c, downloaded: false } : c))
chapterCache.set(mangaId, { data: chapters, fetchedAt: Date.now() })
} }
clearSelection() clearSelection()
} }
async function downloadSelected() { async function downloadSelected() {
await enqueueMultiple([...selectedIds].filter(id => !chapters.find(c => c.id === id)?.downloaded)) await enqueueMultiple([...selectedIds].filter(id => !seriesState.chaptersFor(mangaId).find(c => c.id === id)?.downloaded))
clearSelection() clearSelection()
} }
@@ -418,29 +368,30 @@
async function deleteDownloaded(chapterId: number) { async function deleteDownloaded(chapterId: number) {
await deleteDownloadedChapters([chapterId]).catch(console.error) await deleteDownloadedChapters([chapterId]).catch(console.error)
chapters = chapters.map(c => c.id === chapterId ? { ...c, downloaded: false } : c) seriesState.patchChapters(mangaId, chaps => chaps.map(c => c.id === chapterId ? { ...c, downloaded: false } : c))
chapterCache.set(mangaId, { data: chapters, fetchedAt: Date.now() })
} }
async function deleteAllDownloads() { async function deleteAllDownloads() {
const ids = chapters.filter(c => c.downloaded).map(c => c.id) const ids = seriesState.chaptersFor(mangaId).filter(c => c.downloaded).map(c => c.id)
if (!ids.length) return if (!ids.length) return
deletingAll = true deletingAll = true
await deleteDownloadedChapters(ids).catch(console.error) await deleteDownloadedChapters(ids).catch(console.error)
chapters = chapters.map(c => ({ ...c, downloaded: false })) seriesState.patchChapters(mangaId, chaps => chaps.map(c => ({ ...c, downloaded: false })))
chapterCache.set(mangaId, { data: chapters, fetchedAt: Date.now() })
deletingAll = false deletingAll = false
} }
async function refreshChapters() { async function refreshChapters() {
if (refreshing) return if (refreshing) return
refreshing = true refreshing = true
chapterCache.delete(mangaId) seriesState.invalidateChapters(mangaId)
fetchChapters(mangaId) fetchChapters(mangaId)
.then(() => reloadChapters(mangaId)) .then(() => seriesState.loadChapters(mangaId, { force: true }))
.then(() => addToast({ kind: 'success', title: 'Chapters refreshed', body: `${chapters.length} chapter${chapters.length !== 1 ? 's' : ''} available` })) .then(() => {
const count = seriesState.chaptersFor(mangaId).length
addToast({ kind: 'success', title: 'Chapters refreshed', body: `${count} chapter${count !== 1 ? 's' : ''} available` })
})
.catch(e => addToast({ kind: 'error', title: 'Refresh failed', body: e?.message })) .catch(e => addToast({ kind: 'error', title: 'Refresh failed', body: e?.message }))
.finally(() => refreshing = false) .finally(() => { refreshing = false })
} }
function buildCtxItems(ch: Chapter, idx: number): MenuEntry[] { function buildCtxItems(ch: Chapter, idx: number): MenuEntry[] {
@@ -472,57 +423,25 @@
} }
function openReaderWithAhead(ch: Chapter, inProgress: boolean) { function openReaderWithAhead(ch: Chapter, inProgress: boolean) {
const ascList = [...sortedChapters].sort((a, b) => a.sourceOrder - b.sourceOrder) if (inProgress && ch.lastPageRead && ch.lastPageRead > 1) {
const resumePage = inProgress ? ch.lastPageRead ?? null : null
const ahead = get('downloadAhead') as number
if (ahead > 0) {
const idx = ascList.indexOf(ch)
if (idx >= 0) {
const toQueue = ascList.slice(idx + 1, idx + 1 + ahead).filter(c => !c.downloaded).map(c => c.id)
if (toQueue.length) enqueueMultiple(toQueue)
}
}
if (inProgress && resumePage && resumePage > 1) {
const existing = seriesState.bookmarks.find(b => b.chapterId === ch.id) const existing = seriesState.bookmarks.find(b => b.chapterId === ch.id)
if (!existing || existing.pageNumber < resumePage) { if (!existing || existing.pageNumber < ch.lastPageRead) {
addBookmark({ addBookmark({
mangaId, mangaId,
mangaTitle: manga!.title, mangaTitle: manga!.title,
thumbnailUrl: manga!.thumbnailUrl, thumbnailUrl: manga!.thumbnailUrl,
chapterId: ch.id, chapterId: ch.id,
chapterName: ch.name, chapterName: ch.name,
pageNumber: resumePage, pageNumber: ch.lastPageRead,
}) })
} }
} }
openReader(ch, ascList, manga) openReaderForChapter(ch, manga)
} }
function handleContinue(cc: typeof continueChapter) { interface ContinueChapter { chapter: Chapter; type: 'start' | 'continue' | 'reread'; resumePage: number | null }
if (!cc) return function handleContinue(cc: ContinueChapter) {
const ascList = [...sortedChapters].sort((a, b) => a.sourceOrder - b.sourceOrder) openReaderForChapter(cc.chapter, manga)
const ahead = get('downloadAhead') as number
if (ahead > 0) {
const idx = ascList.indexOf(cc.chapter)
if (idx >= 0) {
const toQueue = ascList.slice(idx + 1, idx + 1 + ahead).filter(c => !c.downloaded).map(c => c.id)
if (toQueue.length) enqueueMultiple(toQueue)
}
}
if (cc.type === 'continue' && cc.resumePage && cc.resumePage > 1) {
const existing = seriesState.bookmarks.find(b => b.chapterId === cc.chapter.id)
if (!existing || existing.pageNumber < cc.resumePage) {
addBookmark({
mangaId,
mangaTitle: manga!.title,
thumbnailUrl: manga!.thumbnailUrl,
chapterId: cc.chapter.id,
chapterName: cc.chapter.name,
pageNumber: cc.resumePage,
})
}
}
openReader(cc.chapter, ascList, manga)
} }
async function openLinkPicker() { async function openLinkPicker() {
@@ -548,10 +467,10 @@
async function toggleCategory(cat: Category) { async function toggleCategory(cat: Category) {
const inCat = mangaCategories.some(c => c.id === cat.id) const inCat = mangaCategories.some(c => c.id === cat.id)
try { try {
await updateMangaCategories(mangaId, inCat ? [] : [cat.id], inCat ? [cat.id] : []) await updateMangaCategories(String(mangaId), inCat ? [] : [cat.id], inCat ? [cat.id] : [])
if (!inCat && !manga?.inLibrary) { if (!inCat && !manga?.inLibrary) {
await updateManga(mangaId, { inLibrary: true }).catch(console.error) await updateManga(mangaId, { inLibrary: true }).catch(console.error)
if (manga) manga = { ...manga, inLibrary: true } if (manga) { manga = { ...manga, inLibrary: true }; seriesState.setActiveManga(manga) }
} }
mangaCategories = inCat ? mangaCategories.filter(c => c.id !== cat.id) : [...mangaCategories, cat] mangaCategories = inCat ? mangaCategories.filter(c => c.id !== cat.id) : [...mangaCategories, cat]
} catch (e) { console.error(e) } } catch (e) { console.error(e) }
@@ -561,10 +480,10 @@
if (!name) return if (!name) return
try { try {
const cat = await createCategoryReq(name) const cat = await createCategoryReq(name)
await updateMangaCategories(mangaId, [cat.id], []) await updateMangaCategories(String(mangaId), [cat.id], [])
if (!manga?.inLibrary) { if (!manga?.inLibrary) {
await updateManga(mangaId, { inLibrary: true }).catch(console.error) await updateManga(mangaId, { inLibrary: true }).catch(console.error)
if (manga) manga = { ...manga, inLibrary: true } if (manga) { manga = { ...manga, inLibrary: true }; seriesState.setActiveManga(manga) }
} }
allCategories = [...allCategories, cat] allCategories = [...allCategories, cat]
mangaCategories = [...mangaCategories, cat] mangaCategories = [...mangaCategories, cat]
@@ -590,7 +509,7 @@
{loadingLinkList} {loadingLinkList}
{mangaCategories} {mangaCategories}
{togglingLibrary} {togglingLibrary}
onRead={handleContinue} onRead={(ch) => handleContinue(ch)}
onToggleLibrary={toggleLibrary} onToggleLibrary={toggleLibrary}
onDeleteAll={deleteAllDownloads} onDeleteAll={deleteAllDownloads}
onMigrateOpen={() => migrateOpen = true} onMigrateOpen={() => migrateOpen = true}
@@ -602,15 +521,13 @@
onGenreClick={(genre) => goto(`/browse?genre=${encodeURIComponent(genre)}`)} onGenreClick={(genre) => goto(`/browse?genre=${encodeURIComponent(genre)}`)}
/> />
<div class="list-wrap"> <div class="list-wrap" bind:this={chapterListEl}>
<SeriesActions <SeriesActions
{chapters} {chapters}
{sortedChapters} {sortedChapters}
{sortMode} sortMode={seriesState.settings.chapterSortMode}
{sortDir} sortDir={seriesState.settings.chapterSortDir}
{viewMode} {viewMode}
{chapterPage}
{totalPages}
{downloadedCount} {downloadedCount}
{totalCount} {totalCount}
{deletingAll} {deletingAll}
@@ -640,6 +557,8 @@
onSetScanlatorFilter={(v) => set('scanlatorFilter', v)} onSetScanlatorFilter={(v) => set('scanlatorFilter', v)}
onSetScanlatorBlacklist={(v) => set('scanlatorBlacklist', v)} onSetScanlatorBlacklist={(v) => set('scanlatorBlacklist', v)}
onSetScanlatorForce={(v) => set('scanlatorForce', v)} onSetScanlatorForce={(v) => set('scanlatorForce', v)}
onSortModeChange={(v) => updateSettings({ chapterSortMode: v })}
onSortDirChange={(v) => updateSettings({ chapterSortDir: v })}
onOpenFolder={() => manga && openMangaFolder(manga)} onOpenFolder={() => manga && openMangaFolder(manga)}
/> />
@@ -652,12 +571,12 @@
{enqueueing} {enqueueing}
{chapterPage} {chapterPage}
{totalPages} {totalPages}
bind:scrollEl={chapterListEl}
onOpen={openReaderWithAhead} onOpen={openReaderWithAhead}
onToggleSelect={toggleSelect} onToggleSelect={toggleSelect}
onEnqueue={enqueue} onEnqueue={enqueue}
onDeleteDownload={deleteDownloaded} onDeleteDownload={deleteDownloaded}
onPageChange={(p) => chapterPage = p} onPageChange={(p) => chapterPage = p}
onPageSizeChange={(n) => { chaptersPerPage = n; chapterPage = Math.min(chapterPage, Math.ceil(sortedChapters.length / n) || 1) }}
{buildCtxItems} {buildCtxItems}
/> />
</div> </div>
@@ -666,7 +585,7 @@
{#if markersOpen && manga} {#if markersOpen && manga}
<div class="panel-overlay" role="presentation" onclick={() => markersOpen = false}> <div class="panel-overlay" role="presentation" onclick={() => markersOpen = false}>
<div class="panel-drawer" role="presentation" onclick={(e) => e.stopPropagation()}> <div class="panel-drawer" role="presentation" onclick={(e) => e.stopPropagation()}>
<MarkersPanel mangaId={manga.id} {chapters} onClose={() => markersOpen = false} /> <MarkersPanel mangaId={manga.id} chapters={seriesState.chaptersFor(manga.id)} onClose={() => markersOpen = false} />
</div> </div>
</div> </div>
{/if} {/if}
@@ -702,7 +621,7 @@
{#if migrateOpen && manga} {#if migrateOpen && manga}
<MigrateModal <MigrateModal
{manga} {manga}
currentChapters={chapters} currentChapters={seriesState.chaptersFor(manga.id)}
onClose={() => migrateOpen = false} onClose={() => migrateOpen = false}
onMigrated={(newManga) => { goto(`/series/${newManga.id}`); migrateOpen = false }} onMigrated={(newManga) => { goto(`/series/${newManga.id}`); migrateOpen = false }}
/> />
+13 -6
View File
@@ -9,7 +9,8 @@
import { get } from 'svelte/store' import { get } from 'svelte/store'
import Thumbnail from '$lib/components/shared/manga/Thumbnail.svelte' import Thumbnail from '$lib/components/shared/manga/Thumbnail.svelte'
import { resolvedCover } from '$lib/core/cover/coverResolver' import { resolvedCover } from '$lib/core/cover/coverResolver'
import type { MangaPrefs } from '$lib/types/settings' import type { Manga, Chapter, Category } from '$lib/types'
import { seriesState } from '$lib/state/series.svelte' import { seriesState } from '$lib/state/series.svelte'
import { setPreviewManga } from '$lib/state/series.svelte' import { setPreviewManga } from '$lib/state/series.svelte'
@@ -59,6 +60,7 @@
let manageOpen: boolean = $state(false) let manageOpen: boolean = $state(false)
let genresExpanded: boolean = $state(false) let genresExpanded: boolean = $state(false)
let descExpanded: boolean = $state(false)
let altOpen: boolean = $state(false) let altOpen: boolean = $state(false)
const statusLabel = $derived( const statusLabel = $derived(
@@ -93,7 +95,7 @@
<div class="cover-wrap"> <div class="cover-wrap">
<button class="cover-btn" onclick={() => manga && setPreviewManga(manga)} title="Quick preview" disabled={!manga}> <button class="cover-btn" onclick={() => manga && setPreviewManga(manga)} title="Quick preview" disabled={!manga}>
<Thumbnail src={resolvedCover(seriesState.activeManga?.id ?? manga?.id ?? 0, seriesState.activeManga?.thumbnailUrl ?? manga?.thumbnailUrl ?? "")} alt={seriesState.activeManga?.title ?? manga?.title ?? ""} class="cover" /> <Thumbnail src={resolvedCover(manga?.id ?? seriesState.activeManga?.id ?? 0, manga?.thumbnailUrl ?? seriesState.activeManga?.thumbnailUrl ?? "")} alt={manga?.title ?? seriesState.activeManga?.title ?? ""} class="cover" id={manga?.id ?? seriesState.activeManga?.id} />
</button> </button>
</div> </div>
@@ -104,7 +106,7 @@
</div> </div>
{:else} {:else}
<div class="meta"> <div class="meta">
<p class="title">{manga?.title}</p> <button class="title" onclick={() => manga && setPreviewManga(manga)} disabled={!manga}>{manga?.title}</button>
{#if manga?.author || manga?.artist} {#if manga?.author || manga?.artist}
<p class="byline">{[manga?.author, manga?.artist].filter(Boolean).filter((v, i, a) => a.indexOf(v) === i).join(' · ')}</p> <p class="byline">{[manga?.author, manga?.artist].filter(Boolean).filter((v, i, a) => a.indexOf(v) === i).join(' · ')}</p>
@@ -148,8 +150,8 @@
{#if manga?.description} {#if manga?.description}
<div class="desc-wrap"> <div class="desc-wrap">
<p class="desc">{manga.description}</p> <p class="desc" class:desc-open={descExpanded}>{manga.description}</p>
<button class="expand-toggle" onclick={() => genresExpanded = !genresExpanded}>Read more</button> <button class="expand-toggle" onclick={() => descExpanded = !descExpanded}>{descExpanded ? 'Show less' : 'Read more'}</button>
</div> </div>
{/if} {/if}
</div> </div>
@@ -161,7 +163,7 @@
<Play size={12} weight="fill" /> <Play size={12} weight="fill" />
{continueChapter.type === 'reread' ? 'Read again' {continueChapter.type === 'reread' ? 'Read again'
: continueChapter.type === 'start' ? 'Start reading' : continueChapter.type === 'start' ? 'Start reading'
: `Continue · Ch.${continueChapter.chapter.chapterNumber}${continueChapter.resumePage ? ` p.${continueChapter.resumePage}` : ''}`} : `Continue · Ch.${continueChapter.chapter.chapterNumber}`}
</button> </button>
{/if} {/if}
<div class="actions"> <div class="actions">
@@ -277,7 +279,11 @@
font-size: var(--text-base); font-weight: var(--weight-medium); font-size: var(--text-base); font-weight: var(--weight-medium);
color: var(--text-primary); line-height: var(--leading-snug); color: var(--text-primary); line-height: var(--leading-snug);
letter-spacing: var(--tracking-tight); letter-spacing: var(--tracking-tight);
background: none; border: none; padding: 0; text-align: left; cursor: pointer;
transition: color var(--t-base);
} }
.title:hover:not(:disabled) { color: var(--accent-fg); }
.title:disabled { cursor: default; }
.byline { font-size: var(--text-xs); color: var(--text-muted); font-family: var(--font-ui); } .byline { font-size: var(--text-xs); color: var(--text-muted); font-family: var(--font-ui); }
.badges { display: flex; flex-wrap: wrap; gap: var(--sp-1); } .badges { display: flex; flex-wrap: wrap; gap: var(--sp-1); }
@@ -328,6 +334,7 @@
font-size: var(--text-xs); color: var(--text-muted); line-height: var(--leading-base); font-size: var(--text-xs); color: var(--text-muted); line-height: var(--leading-base);
display: -webkit-box; -webkit-line-clamp: 4; -webkit-box-orient: vertical; overflow: hidden; display: -webkit-box; -webkit-line-clamp: 4; -webkit-box-orient: vertical; overflow: hidden;
} }
.desc.desc-open { display: block; -webkit-line-clamp: unset; overflow: visible; }
.expand-toggle { .expand-toggle {
font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-2xs); color: var(--text-faint);
letter-spacing: var(--tracking-wide); align-self: flex-start; transition: color var(--t-base); letter-spacing: var(--tracking-wide); align-self: flex-start; transition: color var(--t-base);
@@ -64,16 +64,4 @@ export function buildChapterList(chapters: Chapter[], prefs: ChapterDisplayPrefs
export function chaptersAscending(chapters: Chapter[]): Chapter[] { export function chaptersAscending(chapters: Chapter[]): Chapter[] {
return [...chapters].sort((a, b) => a.sourceOrder - b.sourceOrder) return [...chapters].sort((a, b) => a.sourceOrder - b.sourceOrder)
}
export function buildReaderChapterList(
chapters: Chapter[],
prefs: Pick<ChapterDisplayPrefs, 'preferredScanlator' | 'scanlatorFilter'> | undefined,
): Chapter[] {
return buildChapterList(chapters, {
sortMode: 'source',
sortDir: 'asc',
preferredScanlator: prefs?.preferredScanlator,
scanlatorFilter: prefs?.scanlatorFilter,
})
} }
@@ -1,19 +0,0 @@
import { settingsState, updateSettings } from '$lib/state/settings.svelte'
import { DEFAULT_MANGA_PREFS } from '$lib/types/settings'
import type { MangaPrefs } from '$lib/types/settings'
export { DEFAULT_MANGA_PREFS } from '$lib/types/settings'
export function getPref<K extends keyof MangaPrefs>(mangaId: number, key: K): MangaPrefs[K] {
const prefs = settingsState.settings.mangaPrefs?.[mangaId] ?? {}
return (prefs[key] ?? DEFAULT_MANGA_PREFS[key]) as MangaPrefs[K]
}
export function setPref<K extends keyof MangaPrefs>(mangaId: number, key: K, value: MangaPrefs[K]) {
updateSettings({
mangaPrefs: {
...settingsState.settings.mangaPrefs,
[mangaId]: { ...(settingsState.settings.mangaPrefs?.[mangaId] ?? {}), [key]: value },
},
})
}
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { X } from "phosphor-svelte"; import { X } from "phosphor-svelte";
import { getPref, setPref } from "$lib/components/series/lib/mangaPrefs"; import { getPref, setPref } from "$lib/state/series.svelte";
import { settingsState } from "$lib/state/settings.svelte"; import { settingsState } from "$lib/state/settings.svelte";
import { libraryState } from "$lib/state/library.svelte"; import { libraryState } from "$lib/state/library.svelte";
import { resolvedCover } from "$lib/core/cover/coverResolver"; import { resolvedCover } from "$lib/core/cover/coverResolver";
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { X, CaretLeft, CaretRight, CircleNotch } from "phosphor-svelte"; import { X, CaretLeft, CaretRight, CircleNotch } from "phosphor-svelte";
import { setPref } from "$lib/components/series/lib/mangaPrefs"; import { setPref } from "$lib/state/series.svelte";
import { coverCandidatesSync, dedupeByImage } from "$lib/core/cover/coverResolver"; import { coverCandidatesSync, dedupeByImage } from "$lib/core/cover/coverResolver";
import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte"; import Thumbnail from "$lib/components/shared/manga/Thumbnail.svelte";
import type { Manga } from "$lib/types"; import type { Manga } from "$lib/types";
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { X, MapPin, Trash, PencilSimple, Check } from "phosphor-svelte"; import { X, MapPin, Trash, PencilSimple, Check } from "phosphor-svelte";
import { seriesState, updateMarker, removeMarker, openReader } from "$lib/state/series.svelte"; import { seriesState, updateMarker, removeMarker, openReaderForChapter } from "$lib/state/series.svelte";
import type { MarkerEntry, MarkerColor } from "$lib/types/history"; import type { MarkerEntry, MarkerColor } from "$lib/types/history";
import type { Chapter } from "$lib/types"; import type { Chapter } from "$lib/types";
@@ -58,7 +58,7 @@
const chapter = chapters.find(c => c.id === m.chapterId); const chapter = chapters.find(c => c.id === m.chapterId);
if (!chapter) return; if (!chapter) return;
const chaptersAsc = [...chapters].sort((a, b) => a.sourceOrder - b.sourceOrder); const chaptersAsc = [...chapters].sort((a, b) => a.sourceOrder - b.sourceOrder);
openReader(chapter, chaptersAsc); openReaderForChapter(chapter);
} }
function formatDate(ts: number): string { function formatDate(ts: number): string {
@@ -0,0 +1,540 @@
<script lang="ts">
import { Bug, Lightbulb, X, ArrowSquareOut, ClipboardText, Check, CaretDown, CaretRight } from 'phosphor-svelte'
import { platformService } from '$lib/platform-service'
import { requestManager } from '$lib/request-manager'
import { settingsState } from '$lib/state/settings.svelte'
import type { Settings } from '$lib/types/settings'
import {
SETTINGS_GROUPS,
buildEnvironmentBlock,
buildSettingsBlock,
buildIssueUrl,
type ReportType,
type BugFields,
type FeatureFields,
} from './lib/bugReport'
interface Props { onClose: () => void }
let { onClose }: Props = $props()
type Step = 'type' | 'compose'
let step: Step = $state('type')
let reportType: ReportType = $state('bug')
let title = $state('')
let description = $state('')
let steps = $state('')
let expected = $state('')
let actual = $state('')
let problem = $state('')
let solution = $state('')
let alternatives = $state('')
let serverVersion = $state<string | undefined>(undefined)
$effect(() => {
requestManager.meta.getAboutServer()
.then(s => { serverVersion = s.version })
.catch(() => {})
})
let selectedKeys = $state<Set<keyof Settings>>(new Set())
let expandedGroups = $state<Set<string>>(new Set(['Library', 'Reader']))
function toggleGroup(label: string) {
const next = new Set(expandedGroups)
next.has(label) ? next.delete(label) : next.add(label)
expandedGroups = next
}
function selectGroupAll(keys: (keyof Settings)[]) {
const next = new Set(selectedKeys)
const allOn = keys.every(k => next.has(k))
keys.forEach(k => allOn ? next.delete(k) : next.add(k))
selectedKeys = next
}
function toggleKey(k: keyof Settings) {
const next = new Set(selectedKeys)
next.has(k) ? next.delete(k) : next.add(k)
selectedKeys = next
}
let copied = $state(false)
function buildPreview(): string {
const env = buildEnvironmentBlock(serverVersion)
const sets = buildSettingsBlock([...selectedKeys])
if (reportType === 'bug') {
return [
`**Description**\n${description || '(empty)'}`,
`**Steps to Reproduce**\n${steps || '(empty)'}`,
`**Expected**\n${expected || '(empty)'}`,
`**Actual**\n${actual || '(empty)'}`,
`**Environment**\n${env}`,
sets ? `**Relevant Settings**\n\`\`\`yaml\n${sets}\n\`\`\`` : null,
].filter(Boolean).join('\n\n')
} else {
return [
`**Problem / Motivation**\n${problem || '(empty)'}`,
`**Proposed Solution**\n${solution || '(empty)'}`,
alternatives ? `**Alternatives**\n${alternatives}` : null,
`**Environment**\n${env}`,
].filter(Boolean).join('\n\n')
}
}
async function handleCopy() {
await navigator.clipboard.writeText(buildPreview())
copied = true
setTimeout(() => (copied = false), 2000)
}
async function handleOpen() {
const settingsBlock = buildSettingsBlock([...selectedKeys])
const fields: BugFields | FeatureFields = reportType === 'bug'
? { description, steps, expected, actual }
: { problem, solution, alternatives }
const url = buildIssueUrl(reportType, settingsBlock, title, fields, serverVersion)
await platformService.openExternal(url)
}
function onKey(e: KeyboardEvent) { if (e.key === 'Escape') onClose() }
function formatKeyVal(key: keyof Settings): string {
const v = settingsState.settings[key]
if (v === undefined || v === null) return '~'
if (typeof v === 'boolean') return v ? 'true' : 'false'
if (typeof v === 'string') return v === '' ? '""' : v.length > 18 ? v.slice(0, 18) + '…' : v
if (typeof v === 'number') return String(v)
return '…'
}
const envBlock = $derived(buildEnvironmentBlock(serverVersion))
const canSubmit = $derived(
reportType === 'bug'
? title.trim().length > 0 && description.trim().length > 0
: title.trim().length > 0 && problem.trim().length > 0
)
function autoResize(node: HTMLTextAreaElement) {
function resize() {
node.style.height = 'auto'
node.style.height = node.scrollHeight + 'px'
}
resize()
node.addEventListener('input', resize)
return { destroy() { node.removeEventListener('input', resize) } }
}
</script>
<svelte:window onkeydown={onKey} />
<div class="br-backdrop"
role="button" tabindex="-1" aria-label="Close"
onclick={(e) => { if (e.target === e.currentTarget) onClose() }}
onkeydown={(e) => e.key === 'Escape' && onClose()}>
<div class="br-shell" role="dialog" aria-label="Report an issue"
onclick={(e) => e.stopPropagation()}
onkeydown={(e) => e.stopPropagation()}>
<header class="br-header">
<div class="br-header-left">
{#if reportType === 'bug'}
<Bug size={15} weight="duotone" class="br-header-icon bug" />
{:else}
<Lightbulb size={15} weight="duotone" class="br-header-icon feature" />
{/if}
<span class="br-title">
{step === 'type' ? 'Report an Issue' : reportType === 'bug' ? 'Bug Report' : 'Feature Request'}
</span>
</div>
<button class="br-close" onclick={onClose} aria-label="Close"><X size={14} weight="bold" /></button>
</header>
{#if step === 'type'}
<div class="br-type-step">
<p class="br-type-hint">What would you like to submit?</p>
<div class="br-type-cards">
<button class="br-type-card" class:selected={reportType === 'bug'}
onclick={() => { reportType = 'bug'; step = 'compose' }}>
<Bug size={28} weight="duotone" />
<span class="br-type-name">Bug Report</span>
<span class="br-type-desc">Something isn't working as expected</span>
</button>
<button class="br-type-card" class:selected={reportType === 'feature'}
onclick={() => { reportType = 'feature'; step = 'compose' }}>
<Lightbulb size={28} weight="duotone" />
<span class="br-type-name">Feature Request</span>
<span class="br-type-desc">Suggest an improvement or new idea</span>
</button>
</div>
</div>
{:else}
<div class="br-compose">
<div class="br-form">
<div class="br-form-scroll">
<div class="br-field">
<label class="br-label" for="br-title">Title <span class="br-required">*</span></label>
<input id="br-title" class="br-input" bind:value={title}
placeholder={reportType === 'bug' ? 'Short summary of the bug' : 'Short summary of your idea'}
maxlength={120} spellcheck />
</div>
{#if reportType === 'bug'}
<div class="br-field">
<label class="br-label" for="br-desc">Description <span class="br-required">*</span></label>
<textarea id="br-desc" class="br-textarea" bind:value={description}
use:autoResize
placeholder="What's broken? A clear, concise summary." rows={3} spellcheck></textarea>
</div>
<div class="br-field">
<label class="br-label" for="br-steps">Steps to Reproduce</label>
<textarea id="br-steps" class="br-textarea" bind:value={steps}
use:autoResize
placeholder={"1. Open Settings → Library\n2. Enable \"Always show card stats\"\n3. Return to Library\n4. Unread counts are not visible"}
rows={4} spellcheck></textarea>
</div>
<div class="br-field-row">
<div class="br-field">
<label class="br-label" for="br-expected">Expected</label>
<textarea id="br-expected" class="br-textarea" bind:value={expected}
use:autoResize
placeholder="What should have happened?" rows={2} spellcheck></textarea>
</div>
<div class="br-field">
<label class="br-label" for="br-actual">Actual</label>
<textarea id="br-actual" class="br-textarea" bind:value={actual}
use:autoResize
placeholder="What actually happened?" rows={2} spellcheck></textarea>
</div>
</div>
{:else}
<div class="br-field">
<label class="br-label" for="br-problem">Problem / Motivation <span class="br-required">*</span></label>
<textarea id="br-problem" class="br-textarea" bind:value={problem}
use:autoResize
placeholder="What gap or frustration does this address?" rows={3} spellcheck></textarea>
</div>
<div class="br-field">
<label class="br-label" for="br-solution">Proposed Solution <span class="br-required">*</span></label>
<textarea id="br-solution" class="br-textarea" bind:value={solution}
use:autoResize
placeholder="What would you like to see?" rows={3} spellcheck></textarea>
</div>
<div class="br-field">
<label class="br-label" for="br-alt">Alternatives Considered</label>
<textarea id="br-alt" class="br-textarea" bind:value={alternatives}
use:autoResize
placeholder="Any workarounds or other approaches?" rows={2} spellcheck></textarea>
</div>
{/if}
<div class="br-field">
<label class="br-label">Environment <span class="br-auto">auto-filled</span></label>
<pre class="br-env-block">{envBlock}</pre>
</div>
</div>
</div>
{#if reportType === 'bug'}
<div class="br-sidebar">
<div class="br-sidebar-header">
<span class="br-sidebar-title">Include Settings</span>
<span class="br-sidebar-hint">Select groups relevant to the bug</span>
</div>
<div class="br-sidebar-scroll">
{#each SETTINGS_GROUPS as group}
{@const selectedInGroup = group.keys.filter(k => selectedKeys.has(k)).length}
{@const allSelected = selectedInGroup === group.keys.length}
{@const expanded = expandedGroups.has(group.label)}
<div class="br-group">
<div class="br-group-row">
<button class="br-group-toggle" onclick={() => toggleGroup(group.label)}>
{#if expanded}
<CaretDown size={9} weight="bold" />
{:else}
<CaretRight size={9} weight="bold" />
{/if}
<span class="br-group-label">{group.label}</span>
{#if selectedInGroup > 0}
<span class="br-group-count">{selectedInGroup}</span>
{/if}
</button>
<button class="br-group-all"
class:active={allSelected}
onclick={() => selectGroupAll(group.keys)}
title={allSelected ? 'Deselect all' : 'Select all'}>
{allSelected ? 'none' : 'all'}
</button>
</div>
{#if expanded}
<div class="br-key-list">
{#each group.keys as key}
<label class="br-key-row">
<input type="checkbox"
checked={selectedKeys.has(key)}
onchange={() => toggleKey(key)}
class="br-checkbox" />
<span class="br-key-name">{key}</span>
<span class="br-key-val">{formatKeyVal(key)}</span>
</label>
{/each}
</div>
{/if}
</div>
{/each}
</div>
</div>
{/if}
</div>
<footer class="br-footer">
<button class="br-btn ghost" onclick={() => (step = 'type')}>Back</button>
<div class="br-footer-right">
<button class="br-btn secondary" onclick={handleCopy} title="Copy report to clipboard">
{#if copied}
<Check size={13} /><span>Copied!</span>
{:else}
<ClipboardText size={13} /><span>Copy</span>
{/if}
</button>
<button class="br-btn primary" disabled={!canSubmit} onclick={handleOpen}>
<ArrowSquareOut size={13} /><span>Open on GitHub</span>
</button>
</div>
</footer>
{/if}
</div>
</div>
<style>
.br-backdrop {
position: fixed; inset: 0;
z-index: calc(var(--z-settings) + 1);
display: flex; align-items: center; justify-content: center;
background: rgba(0,0,0,0.55);
backdrop-filter: blur(4px);
animation: br-fade 0.14s ease both;
}
@keyframes br-fade { from { opacity: 0 } to { opacity: 1 } }
@keyframes br-scale { from { transform: scale(0.96); opacity: 0 } to { transform: scale(1); opacity: 1 } }
.br-shell {
width: min(820px, calc(100vw - 32px));
height: min(600px, calc(100vh - 64px));
display: flex; flex-direction: column;
background: var(--bg-surface);
border: 1px solid var(--border-base);
border-radius: var(--radius-2xl);
box-shadow: 0 0 0 1px var(--border-dim), 0 32px 80px rgba(0,0,0,0.7);
overflow: hidden;
animation: br-scale 0.2s cubic-bezier(0.16,1,0.3,1) both;
}
.br-header {
display: flex; align-items: center; justify-content: space-between;
padding: 14px var(--sp-5);
border-bottom: 1px solid var(--border-dim);
flex-shrink: 0;
}
.br-header-left { display: flex; align-items: center; gap: var(--sp-2); }
.br-title { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-primary); }
:global(.br-header-icon.bug) { color: var(--color-error); }
:global(.br-header-icon.feature) { color: var(--accent-fg); }
.br-close {
display: flex; align-items: center; justify-content: center;
width: 28px; height: 28px;
border-radius: var(--radius-md); border: none; background: none;
color: var(--text-faint); cursor: pointer;
transition: color var(--t-base), background var(--t-base);
}
.br-close:hover { color: var(--text-muted); background: var(--bg-raised); }
.br-type-step {
flex: 1; display: flex; flex-direction: column;
align-items: center; justify-content: center;
gap: var(--sp-5); padding: var(--sp-6);
}
.br-type-hint {
font-family: var(--font-ui); font-size: var(--text-xs);
letter-spacing: var(--tracking-wide);
color: var(--text-faint); text-transform: uppercase;
}
.br-type-cards { display: flex; gap: var(--sp-4); }
.br-type-card {
display: flex; flex-direction: column; align-items: center;
gap: var(--sp-2); padding: var(--sp-6) var(--sp-8);
border-radius: var(--radius-xl);
border: 1px solid var(--border-base);
background: var(--bg-raised);
cursor: pointer; color: var(--text-secondary);
transition: border-color var(--t-base), background var(--t-base), color var(--t-base);
min-width: 180px;
}
.br-type-card:hover { border-color: var(--border-strong); background: var(--bg-overlay); color: var(--text-primary); }
.br-type-card.selected { border-color: var(--accent); background: var(--accent-muted); color: var(--accent-fg); }
.br-type-name { font-size: var(--text-sm); font-weight: var(--weight-medium); }
.br-type-desc {
font-family: var(--font-ui); font-size: var(--text-xs);
letter-spacing: var(--tracking-wide); color: var(--text-faint);
text-align: center;
}
.br-compose { flex: 1; display: flex; overflow: hidden; min-height: 0; }
.br-form { flex: 1; display: flex; flex-direction: column; overflow: hidden; min-width: 0; border-right: 1px solid var(--border-dim); }
.br-form-scroll { flex: 1; overflow-y: auto; padding: var(--sp-4) var(--sp-5); display: flex; flex-direction: column; gap: var(--sp-3); }
.br-field { display: flex; flex-direction: column; gap: 5px; }
.br-field-row { display: flex; gap: var(--sp-3); }
.br-field-row .br-field { flex: 1; }
.br-label {
font-family: var(--font-ui); font-size: var(--text-xs);
letter-spacing: var(--tracking-wide);
color: var(--text-faint); display: flex; align-items: center; gap: var(--sp-1);
}
.br-required { color: var(--color-error); }
.br-auto {
font-size: var(--text-2xs); padding: 1px 6px;
border-radius: var(--radius-full);
background: var(--accent-muted); color: var(--accent-fg);
border: 1px solid var(--accent-dim);
}
.br-input, .br-textarea {
background: var(--bg-raised); border: 1px solid var(--border-dim);
border-radius: var(--radius-md);
font-size: var(--text-sm); color: var(--text-primary);
padding: 8px var(--sp-3); outline: none; resize: none;
font-family: inherit; line-height: var(--leading-snug);
transition: border-color var(--t-base);
overflow: hidden;
}
.br-input:focus, .br-textarea:focus { border-color: var(--border-focus); }
.br-input::placeholder, .br-textarea::placeholder { color: var(--text-faint); }
.br-env-block {
font-family: monospace; font-size: 11px;
color: var(--text-faint); line-height: var(--leading-base);
background: var(--bg-raised); border: 1px solid var(--border-dim);
border-radius: var(--radius-md); padding: var(--sp-3);
white-space: pre-wrap; margin: 0;
}
.br-sidebar {
width: 220px; flex-shrink: 0;
display: flex; flex-direction: column;
background: var(--bg-base);
}
.br-sidebar-header {
padding: var(--sp-3) var(--sp-4) var(--sp-2);
border-bottom: 1px solid var(--border-dim);
display: flex; flex-direction: column; gap: 2px; flex-shrink: 0;
}
.br-sidebar-title {
font-family: var(--font-ui); font-size: var(--text-xs);
letter-spacing: var(--tracking-wide); color: var(--text-secondary);
font-weight: var(--weight-medium);
}
.br-sidebar-hint {
font-family: var(--font-ui); font-size: var(--text-2xs);
letter-spacing: var(--tracking-wide); color: var(--text-faint);
}
.br-sidebar-scroll { flex: 1; overflow-y: auto; padding: var(--sp-1) 0 var(--sp-2); }
.br-group { display: flex; flex-direction: column; }
.br-group-row {
display: flex; align-items: center;
padding: 3px var(--sp-3) 3px var(--sp-3);
gap: var(--sp-1);
}
.br-group-toggle {
flex: 1; display: flex; align-items: center; gap: 5px;
background: none; border: none; cursor: pointer;
color: var(--text-faint); padding: 2px 0;
transition: color var(--t-fast);
min-width: 0;
}
.br-group-toggle:hover { color: var(--text-secondary); }
.br-group-label {
font-family: var(--font-ui); font-size: var(--text-2xs);
letter-spacing: var(--tracking-wider); text-transform: uppercase;
color: inherit;
}
.br-group-count {
font-family: var(--font-ui); font-size: var(--text-2xs);
padding: 0 5px; border-radius: var(--radius-full);
background: var(--accent-muted); color: var(--accent-fg);
border: 1px solid var(--accent-dim);
line-height: 1.6;
}
.br-group-all {
font-family: var(--font-ui); font-size: var(--text-2xs);
letter-spacing: var(--tracking-wide);
background: none; border: none; cursor: pointer;
color: var(--text-faint); padding: 2px 6px;
border-radius: var(--radius-sm);
transition: color var(--t-fast), background var(--t-fast);
flex-shrink: 0;
}
.br-group-all:hover, .br-group-all.active { color: var(--accent-fg); background: var(--accent-muted); }
.br-key-list { display: flex; flex-direction: column; padding-bottom: var(--sp-1); }
.br-key-row {
display: flex; align-items: center; gap: var(--sp-2);
padding: 3px var(--sp-3) 3px 24px; cursor: pointer;
transition: background var(--t-fast);
}
.br-key-row:hover { background: var(--bg-raised); }
.br-checkbox { accent-color: var(--accent); flex-shrink: 0; cursor: pointer; }
.br-key-name {
flex: 1; font-family: monospace; font-size: 10px;
color: var(--text-secondary);
overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
}
.br-key-val {
font-family: monospace; font-size: 10px;
color: var(--text-faint); flex-shrink: 0;
max-width: 52px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
}
.br-footer {
display: flex; align-items: center; justify-content: space-between;
padding: var(--sp-3) var(--sp-5);
border-top: 1px solid var(--border-dim);
flex-shrink: 0;
}
.br-footer-right { display: flex; gap: var(--sp-2); }
.br-btn {
display: flex; align-items: center; gap: var(--sp-1);
font-family: var(--font-ui); font-size: var(--text-xs);
letter-spacing: var(--tracking-wide);
padding: 6px var(--sp-4); border-radius: var(--radius-md);
cursor: pointer; border: 1px solid transparent;
transition: background var(--t-base), color var(--t-base), border-color var(--t-base), opacity var(--t-base);
}
.br-btn:disabled { opacity: 0.4; cursor: not-allowed; }
.br-btn.ghost { background: none; color: var(--text-faint); border-color: transparent; }
.br-btn.ghost:hover { color: var(--text-secondary); background: var(--bg-raised); }
.br-btn.secondary { background: none; color: var(--text-muted); border-color: var(--border-dim); }
.br-btn.secondary:hover { border-color: var(--border-strong); color: var(--text-secondary); }
.br-btn.primary { background: var(--accent-muted); color: var(--accent-fg); border-color: var(--accent-dim); }
.br-btn.primary:not(:disabled):hover { filter: brightness(1.12); }
</style>
+3 -8
View File
@@ -10,9 +10,7 @@
/* ── Backdrop & Modal Shell ───────────────────────────────────────── */ /* ── Backdrop & Modal Shell ───────────────────────────────────────── */
.s-backdrop { .s-backdrop {
position: fixed; inset: 0; position: fixed; inset: 0;
background: rgba(0,0,0,0.6);
backdrop-filter: blur(8px);
-webkit-backdrop-filter: blur(8px);
z-index: var(--z-settings); z-index: var(--z-settings);
display: flex; align-items: center; justify-content: center; display: flex; align-items: center; justify-content: center;
animation: s-fade-in 0.14s ease both; animation: s-fade-in 0.14s ease both;
@@ -29,10 +27,7 @@
overflow: visible; overflow: visible;
position: relative; position: relative;
animation: s-scale-in 0.2s cubic-bezier(0.16,1,0.3,1) both; animation: s-scale-in 0.2s cubic-bezier(0.16,1,0.3,1) both;
box-shadow: box-shadow: 0 0 0 1px var(--border-dim), 0 24px 64px rgba(0,0,0,0.6);
0 0 0 1px rgba(255,255,255,0.04) inset,
0 24px 80px rgba(0,0,0,0.7),
0 8px 24px rgba(0,0,0,0.4);
} }
@@ -46,7 +41,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 1px; gap: 1px;
overflow-y: auto; overflow-y: hidden;
border-radius: var(--radius-2xl) 0 0 var(--radius-2xl); border-radius: var(--radius-2xl) 0 0 var(--radius-2xl);
} }
+30 -7
View File
@@ -1,6 +1,6 @@
<script lang="ts"> <script lang="ts">
import { tick } from 'svelte' import { tick } from 'svelte'
import { X, Book, Image, Sliders, Info, Keyboard, Gear, HardDrives, FolderSimple, Wrench, PaintBrush, ListChecks, Lock, ShieldCheck, Robot } from 'phosphor-svelte' import { X, Book, Image, Sliders, Info, Keyboard, Gear, HardDrives, FolderSimple, Wrench, PaintBrush, ListChecks, Lock, ShieldCheck, Robot, Bug } from 'phosphor-svelte'
import { settingsState, updateSettings } from '$lib/state/settings.svelte' import { settingsState, updateSettings } from '$lib/state/settings.svelte'
import { eventToKeybind } from '$lib/core/keybinds/keybindEngine' import { eventToKeybind } from '$lib/core/keybinds/keybindEngine'
import type { Keybinds } from '$lib/core/keybinds/defaultBinds' import type { Keybinds } from '$lib/core/keybinds/defaultBinds'
@@ -19,6 +19,8 @@
import ContentSettings from './sections/ContentSettings.svelte' import ContentSettings from './sections/ContentSettings.svelte'
import AboutSettings from './sections/AboutSettings.svelte' import AboutSettings from './sections/AboutSettings.svelte'
import DevtoolsSettings from './sections/DevToolsSettings.svelte' import DevtoolsSettings from './sections/DevToolsSettings.svelte'
import ModalBlur from '$lib/components/shared/ui/ModalBlur.svelte'
import BugReporter from './BugReporter.svelte'
interface Props { onclose?: () => void; onOpenThemeEditor?: (id?: string | null) => void } interface Props { onclose?: () => void; onOpenThemeEditor?: (id?: string | null) => void }
let { onclose, onOpenThemeEditor }: Props = $props() let { onclose, onOpenThemeEditor }: Props = $props()
@@ -42,11 +44,12 @@
] ]
const anims = $derived(settingsState.settings.qolAnimations ?? true) const anims = $derived(settingsState.settings.qolAnimations ?? true)
let tab: Tab = $state('general') let tab: Tab = $state('general')
let prevTabIndex = $state(0) let prevTabIndex = $state(0)
let tabSlideDir = $state<'up'|'down'>('down') let tabSlideDir = $state<'up'|'down'>('down')
let tabIconKey = $state(0) let tabIconKey = $state(0)
let contentBodyEl: HTMLDivElement let contentBodyEl: HTMLDivElement
let bugReporterOpen = $state(false)
$effect(() => { tab; tick().then(() => contentBodyEl?.scrollTo({ top: 0 })) }) $effect(() => { tab; tick().then(() => contentBodyEl?.scrollTo({ top: 0 })) })
@@ -65,7 +68,7 @@
let listeningKey: keyof Keybinds | null = $state(null) let listeningKey: keyof Keybinds | null = $state(null)
$effect(() => { $effect(() => {
const onKey = (e: KeyboardEvent) => { if (e.key === 'Escape' && !listeningKey) { e.stopPropagation(); close() } } const onKey = (e: KeyboardEvent) => { if (e.key === 'Escape' && !listeningKey && !bugReporterOpen) { e.stopPropagation(); close() } }
window.addEventListener('keydown', onKey, true) window.addEventListener('keydown', onKey, true)
return () => window.removeEventListener('keydown', onKey, true) return () => window.removeEventListener('keydown', onKey, true)
}) })
@@ -111,6 +114,7 @@
}) })
</script> </script>
<ModalBlur />
<div class="s-backdrop" role="presentation" tabindex="-1" <div class="s-backdrop" role="presentation" tabindex="-1"
onclick={(e) => { if (e.target === e.currentTarget) close() }} onclick={(e) => { if (e.target === e.currentTarget) close() }}
onkeydown={(e) => { if (e.key === 'Escape') { e.stopPropagation(); close() } }}> onkeydown={(e) => { if (e.key === 'Escape') { e.stopPropagation(); close() } }}>
@@ -132,6 +136,11 @@
</button> </button>
{/each} {/each}
</nav> </nav>
<div class="s-sidebar-spacer"></div>
<button class="s-nav-item s-bug-btn" class:anims onclick={() => (bugReporterOpen = true)}>
<Bug size={14} weight="light" />
<span>Report an Issue</span>
</button>
</div> </div>
<div class="s-content"> <div class="s-content">
@@ -187,4 +196,18 @@
</div> </div>
</div> </div>
</div> </div>
{#if bugReporterOpen}
<BugReporter onClose={() => (bugReporterOpen = false)} />
{/if}
<style>
.s-sidebar-spacer { flex: 1; }
.s-bug-btn { color: var(--text-faint) !important; }
.s-bug-btn:hover {
color: var(--color-error) !important;
background: var(--color-error-bg) !important;
}
</style>
@@ -0,0 +1,159 @@
import { appState } from '$lib/state/app.svelte'
import { settingsState } from '$lib/state/settings.svelte'
import type { Settings } from '$lib/types/settings'
export type ReportType = 'bug' | 'feature'
export const SETTINGS_GROUPS: { label: string; keys: (keyof Settings)[] }[] = [
{
label: 'Library',
keys: [
'libraryStatsAlways', 'libraryCropCovers', 'libraryPageSize',
'libraryBranches', 'libraryShowAllInSaved', 'libraryHideCompletedInSaved',
'savedIsDefaultCategory', 'defaultLibraryCategoryId',
],
},
{
label: 'Reader',
keys: [
'pageStyle', 'fitMode', 'readingDirection', 'readerZoom',
'pageGap', 'optimizeContrast', 'offsetDoubleSpreads',
'preloadPages', 'autoMarkRead', 'autoNextChapter',
'markReadOnNext', 'autoBookmark', 'autoScroll', 'autoScrollSpeed',
'readerDebounceMs', 'readerContainerized', 'barPosition',
],
},
{
label: 'Server',
keys: ['serverUrl', 'autoStartServer', 'suwayomiWebUI', 'serverAuthMode'],
},
{
label: 'Appearance',
keys: ['theme', 'uiZoom', 'compactSidebar', 'gpuAcceleration', 'qolAnimations', 'systemThemeSync'],
},
{
label: 'Downloads',
keys: ['downloadToastsEnabled', 'downloadAutoRetry', 'storageLimitGb', 'serverDownloadsPath'],
},
{
label: 'Content & Extensions',
keys: ['contentLevel', 'sourceOverridesEnabled', 'preferredExtensionLang', 'flareSolverrEnabled', 'socksProxyEnabled'],
},
{
label: 'Automation',
keys: ['automationEnabled', 'automationEnforceGlobal'],
},
{
label: 'Tracking',
keys: ['trackerSyncBack', 'trackerSyncBackThreshold', 'trackerRespectScanlatorFilter'],
},
{
label: 'Performance',
keys: ['renderLimit', 'pinchZoom'],
},
]
const REDACTED = new Set<keyof Settings>([
'serverAuthUser', 'serverAuthPass', 'appLockPin',
'socksProxyUsername', 'socksProxyPassword',
'keybinds', 'customThemes', 'heroSlots', 'mangaLinks', 'mangaPrefs',
'libraryTabSort', 'libraryTabStatus', 'libraryTabFilters',
'nsfwAllowedSourceIds', 'nsfwBlockedSourceIds',
'mangaReaderSettings', 'readerPresets',
'hiddenCategoryIds', 'libraryPinnedTabOrder', 'hiddenLibraryTabs',
'pinnedSourceIds', 'extraScanDirs',
])
function detectOs(): string {
const ua = navigator.userAgent
if (ua.includes('Windows NT 10.0')) {
const build = ua.match(/Windows NT 10\.0(?:\.(\d+))?/)
return build ? `Windows 10/11 (NT ${build[0].replace('Windows ', '')})` : 'Windows 10/11'
}
if (ua.includes('Windows')) return 'Windows'
if (ua.includes('Mac OS X')) {
const v = ua.match(/Mac OS X ([\d_]+)/)
return v ? `macOS ${v[1].replace(/_/g, '.')}` : 'macOS'
}
if (ua.includes('Linux')) return 'Linux'
return 'unknown'
}
export function buildEnvironmentBlock(serverVersion?: string): string {
const s = settingsState.settings
const host = (() => { try { return new URL(s.serverUrl || '').host } catch { return s.serverUrl || 'unknown' } })()
const serverLine = serverVersion
? `- Server: Suwayomi ${serverVersion} (${host})`
: `- Server: Suwayomi (${host})`
return [
`- Moku Version: ${appState.version || 'unknown'}`,
`- Platform: ${appState.platform}`,
`- OS: ${detectOs()}`,
serverLine,
`- Auth Mode: ${s.serverAuthMode}`,
].join('\n')
}
export function buildSettingsBlock(keys: (keyof Settings)[]): string {
const s = settingsState.settings
return keys
.filter(k => !REDACTED.has(k))
.map(k => {
const v = s[k]
if (v === undefined || v === null) return `${k}: ~`
if (typeof v === 'string' && v === '') return `${k}: ""`
return `${k}: ${JSON.stringify(v)}`
})
.join('\n')
}
export interface BugFields {
description: string
steps: string
expected: string
actual: string
}
export interface FeatureFields {
problem: string
solution: string
alternatives: string
}
export function buildIssueUrl(
type: ReportType,
settingsBlock: string,
title: string,
fields: BugFields | FeatureFields,
serverVersion?: string,
): string {
const base = 'https://github.com/moku-project/Moku/issues/new'
const prefix = type === 'bug' ? '[Bug] ' : '[Feature Request] '
const common = {
template: type === 'bug' ? 'bug_report.yml' : 'feature_request.yml',
title: title.startsWith(prefix) ? title : `${prefix}${title}`,
environment: buildEnvironmentBlock(serverVersion),
}
const specific = type === 'bug'
? {
description: (fields as BugFields).description,
steps: (fields as BugFields).steps,
expected: (fields as BugFields).expected,
actual: (fields as BugFields).actual,
settings: settingsBlock,
}
: {
problem: (fields as FeatureFields).problem,
solution: (fields as FeatureFields).solution,
alternatives: (fields as FeatureFields).alternatives,
}
const merged: Record<string, string> = {}
for (const [k, v] of Object.entries({ ...common, ...specific })) {
if (v !== undefined) merged[k] = v
}
const params = new URLSearchParams(merged)
return `${base}?${params.toString()}`
}
@@ -76,7 +76,7 @@
let entries = 0, oldest: number | null = null, newest: number | null = null let entries = 0, oldest: number | null = null, newest: number | null = null
const foundKeys: string[] = [] const foundKeys: string[] = []
const checkKey = (k: string) => { const checkKey = (k: string) => {
const age = cache.ageOf(k) const age = cache?.ageOf?.(k)
if (age !== undefined) { if (age !== undefined) {
entries++ entries++
foundKeys.push(k) foundKeys.push(k)
@@ -85,7 +85,7 @@
if (newest === null || ts > newest) newest = ts if (newest === null || ts > newest) newest = ts
} }
} }
['library', 'sources', 'popular'].forEach(checkKey) ['library', 'sources', 'popular'].forEach(checkKey);
['Action','Romance','Fantasy','Comedy','Drama','Horror','Sci-Fi','Adventure','Thriller', ['Action','Romance','Fantasy','Comedy','Drama','Horror','Sci-Fi','Adventure','Thriller',
'Isekai','Supernatural','Historical','Psychological','Sports','Mystery','Mecha', 'Isekai','Supernatural','Historical','Psychological','Sports','Mystery','Mecha',
'Slice of Life','School Life','Martial Arts','Magic','Military'].forEach(g => checkKey(`genre:${g}`)) 'Slice of Life','School Life','Martial Arts','Magic','Military'].forEach(g => checkKey(`genre:${g}`))
@@ -102,9 +102,10 @@
} }
function triggerSplash() { function triggerSplash() {
if (appState.devSplash) return
splashTriggered = true splashTriggered = true
setTimeout(() => splashTriggered = false, 200) setTimeout(() => splashTriggered = false, 200)
;(window as any).__mokuShowSplash?.() appState.devSplash = true
} }
async function testWindowsHello() { async function testWindowsHello() {
@@ -192,7 +193,7 @@
<div class="s-dev-grid"> <div class="s-dev-grid">
<span class="s-dev-key">Filter</span> <span class="s-dev-val">{appState.libraryFilter}</span> <span class="s-dev-key">Filter</span> <span class="s-dev-val">{appState.libraryFilter}</span>
<span class="s-dev-key">Folders</span> <span class="s-dev-val">{appState.categories.filter(c => c.id !== 0).map(c => c.name).join(', ') || 'none'}</span> <span class="s-dev-key">Folders</span> <span class="s-dev-val">{appState.categories.filter(c => c.id !== 0).map(c => c.name).join(', ') || 'none'}</span>
<span class="s-dev-key">History</span> <span class="s-dev-val">{appState.history.length} entries</span> <span class="s-dev-key">History</span> <span class="s-dev-val">{appState.history?.length ?? 0} entries</span>
<span class="s-dev-key">Cache</span> <span class="s-dev-val">{perfSnapshot?.cacheEntries ?? '—'} entries</span> <span class="s-dev-key">Cache</span> <span class="s-dev-val">{perfSnapshot?.cacheEntries ?? '—'} entries</span>
<span class="s-dev-key">Toasts</span> <span class="s-dev-val">{appState.toasts.length} queued</span> <span class="s-dev-key">Toasts</span> <span class="s-dev-val">{appState.toasts.length} queued</span>
<span class="s-dev-key">Version</span> <span class="s-dev-val">{appVersion} · {import.meta.env.MODE}</span> <span class="s-dev-key">Version</span> <span class="s-dev-val">{appVersion} · {import.meta.env.MODE}</span>
@@ -54,7 +54,7 @@
const name = newFolderName.trim() const name = newFolderName.trim()
if (!name) return if (!name) return
try { try {
const cat = await getAdapter().createCategory({ name }) const cat = await getAdapter().createCategory(name)
categories = [...categories, cat] categories = [...categories, cat]
newFolderName = '' newFolderName = ''
} catch (e: any) { catsError = e?.message ?? 'Failed to create folder' } } catch (e: any) { catsError = e?.message ?? 'Failed to create folder' }
@@ -65,7 +65,7 @@
async function commitEdit() { async function commitEdit() {
if (editingId !== null && editingName.trim()) { if (editingId !== null && editingName.trim()) {
try { try {
await getAdapter().updateCategory({ id: editingId, name: editingName.trim() }) await (getAdapter() as any).updateCategory(editingId, { name: editingName.trim() })
categories = categories.map(c => c.id === editingId ? { ...c, name: editingName.trim() } : c) categories = categories.map(c => c.id === editingId ? { ...c, name: editingName.trim() } : c)
} catch (e: any) { catsError = e?.message ?? 'Failed to rename' } } catch (e: any) { catsError = e?.message ?? 'Failed to rename' }
} }
@@ -74,7 +74,7 @@
async function deleteFolder(id: number) { async function deleteFolder(id: number) {
try { try {
await getAdapter().deleteCategory({ id }) await getAdapter().deleteCategory(id)
categories = categories.filter(c => c.id !== id) categories = categories.filter(c => c.id !== id)
} catch (e: any) { catsError = e?.message ?? 'Failed to delete folder' } } catch (e: any) { catsError = e?.message ?? 'Failed to delete folder' }
} }
@@ -85,7 +85,7 @@
const next = !cat[flag] const next = !cat[flag]
categories = categories.map(c => c.id === id ? { ...c, [flag]: next } : c) categories = categories.map(c => c.id === id ? { ...c, [flag]: next } : c)
try { try {
await getAdapter().updateCategories({ ids: [id], patch: { [flag]: next ? 'INCLUDE' : 'EXCLUDE' } }) await (getAdapter() as any).updateCategories([id], { [flag]: next ? 'INCLUDE' : 'EXCLUDE' })
} catch (e: any) { } catch (e: any) {
categories = categories.map(c => c.id === id ? { ...c, [flag]: !next } : c) categories = categories.map(c => c.id === id ? { ...c, [flag]: !next } : c)
catsError = e?.message ?? 'Failed to update folder' catsError = e?.message ?? 'Failed to update folder'
@@ -117,7 +117,7 @@
const optimistic = [...zeroCat, ...reordered.map((c, i) => ({ ...c, order: i + 1 }))] const optimistic = [...zeroCat, ...reordered.map((c, i) => ({ ...c, order: i + 1 }))]
categories = optimistic categories = optimistic
const serverPosition = sToIdx + 1 const serverPosition = sToIdx + 1
getAdapter().updateCategoryOrder({ id: fromNumId, position: serverPosition }) getAdapter().updateCategoryOrder(fromNumId, serverPosition)
.then((updated: Category[]) => { .then((updated: Category[]) => {
categories = [ categories = [
...zeroCat, ...zeroCat,
@@ -189,6 +189,7 @@
{#if isBuiltin || cat} {#if isBuiltin || cat}
<div <div
class="s-folder-row" class="s-folder-row"
role="listitem"
class:dragging={dragStrId === id} class:dragging={dragStrId === id}
class:drop-above={dragOverStrId === id && dragStrId !== id && dropPosition === 'above'} class:drop-above={dragOverStrId === id && dragStrId !== id && dropPosition === 'above'}
class:drop-below={dragOverStrId === id && dragStrId !== id && dropPosition === 'below'} class:drop-below={dragOverStrId === id && dragStrId !== id && dropPosition === 'below'}
@@ -205,7 +206,7 @@
<DotsSixVertical size={14} weight="bold" /> <DotsSixVertical size={14} weight="bold" />
</span> </span>
<span class="s-folder-name">{cat?.name ?? 'Completed'}</span> <span class="s-folder-name">{cat?.name ?? 'Completed'}</span>
<span class="s-folder-count">{cat?.mangas?.nodes?.length ?? 0} manga</span> <span class="s-folder-count">{cat?.mangas?.length ?? 0} manga</span>
<span class="s-folder-badge">built-in</span> <span class="s-folder-badge">built-in</span>
<div class="s-folder-actions"> <div class="s-folder-actions">
<button class="s-btn-icon" class:muted={hidden} onclick={() => toggleHidden(id)} title={hidden ? 'Show tab in library' : 'Hide tab from library'}> <button class="s-btn-icon" class:muted={hidden} onclick={() => toggleHidden(id)} title={hidden ? 'Show tab in library' : 'Hide tab from library'}>
@@ -235,16 +236,17 @@
onblur={commitEdit} use:focusInput /> onblur={commitEdit} use:focusInput />
<button class="s-btn-icon" onclick={commitEdit} title="Save"></button> <button class="s-btn-icon" onclick={commitEdit} title="Save"></button>
{:else} {:else}
<div class="s-folder-identity" draggable="true" <div class="s-folder-identity" role="button" tabindex="0" draggable="true"
ondragstart={(e) => onDragStart(e, id)} ondragstart={(e) => onDragStart(e, id)}
ondragend={onDragEnd}> ondragend={onDragEnd}
onkeydown={(e) => e.key === 'Enter' && startEdit(cat.id, cat.name)}>
<span class="s-folder-icon"> <span class="s-folder-icon">
<FolderSimple size={14} weight="light" /> <FolderSimple size={14} weight="light" />
<DotsSixVertical size={14} weight="bold" /> <DotsSixVertical size={14} weight="bold" />
</span> </span>
<span class="s-folder-name" onclick={(e) => { e.stopPropagation(); startEdit(cat.id, cat.name) }} title="Click to rename">{cat.name}</span> <button class="s-folder-name" onclick={(e) => { e.stopPropagation(); startEdit(cat.id, cat.name) }} title="Click to rename">{cat.name}</button>
</div> </div>
<span class="s-folder-count">{cat.mangas?.nodes.length ?? 0} manga</span> <span class="s-folder-count">{cat.mangas?.length ?? 0} manga</span>
<div class="s-folder-actions"> <div class="s-folder-actions">
<button class="s-btn-icon" <button class="s-btn-icon"
class:active={(settingsState.settings.defaultLibraryCategoryId ?? null) === cat.id} class:active={(settingsState.settings.defaultLibraryCategoryId ?? null) === cat.id}
@@ -332,6 +334,8 @@
.s-folder-icon { .s-folder-icon {
display: grid; display: grid;
flex-shrink: 0; flex-shrink: 0;
overflow: visible;
padding: 1px;
} }
.s-folder-icon > :global(*) { grid-area: 1 / 1; transition: opacity 0.12s; } .s-folder-icon > :global(*) { grid-area: 1 / 1; transition: opacity 0.12s; }
.s-folder-icon > :global(*:last-child) { opacity: 0; } .s-folder-icon > :global(*:last-child) { opacity: 0; }
@@ -83,8 +83,8 @@
<div class="s-section"> <div class="s-section">
<div class="s-section-body"> <div class="s-section-body">
<div class="s-row"> <div class="s-row">
<div class="s-row-info"><span class="s-label">Reading history</span><span class="s-desc">{homeState.history.length} entries</span></div> <div class="s-row-info"><span class="s-label">Reading history</span><span class="s-desc">{homeState.history?.length ?? 0} entries</span></div>
<button class="s-btn s-btn-danger" onclick={clearHistory} disabled={homeState.history.length === 0}>Clear</button> <button class="s-btn s-btn-danger" onclick={clearHistory} disabled={!homeState.history?.length}>Clear</button>
</div> </div>
</div> </div>
</div> </div>
@@ -1,7 +1,8 @@
<script lang="ts"> <script lang="ts">
import { settingsState, updateSettings } from '$lib/state/settings.svelte' import { settingsState, updateSettings } from '$lib/state/settings.svelte'
import { requestManager } from '$lib/request-manager' import { requestManager } from '$lib/request-manager'
import { authSession, loginUI } from '$lib/core/auth' import { retryBoot } from '$lib/state/boot.svelte'
import { authSession, configureAuth } from '$lib/core/auth'
interface Props { selectOpen: string | null; toggleSelect: (id: string) => void } interface Props { selectOpen: string | null; toggleSelect: (id: string) => void }
let { selectOpen, toggleSelect }: Props = $props() let { selectOpen, toggleSelect }: Props = $props()
@@ -13,9 +14,15 @@
let secSaved = $state<string | null>(null) let secSaved = $state<string | null>(null)
let secLoaded = $state(false) let secLoaded = $state(false)
let authMode = $state(settingsState.settings.serverAuthMode ?? 'NONE') function normalizeForUI(mode: string | undefined): 'NONE' | 'BASIC_AUTH' | 'UI_LOGIN' {
if (mode === 'BASIC_AUTH' || mode === 'UI_LOGIN') return mode
return 'NONE'
}
let authMode = $state(normalizeForUI(settingsState.settings.serverAuthMode))
let authUsername = $state(settingsState.settings.serverAuthUser ?? '') let authUsername = $state(settingsState.settings.serverAuthUser ?? '')
let authPassword = $state('') let authPassword = $state('')
let authDirty = $state(false)
let socksEnabled = $state(settingsState.settings.socksProxyEnabled ?? false) let socksEnabled = $state(settingsState.settings.socksProxyEnabled ?? false)
let socksHost = $state(settingsState.settings.socksProxyHost ?? '') let socksHost = $state(settingsState.settings.socksProxyHost ?? '')
@@ -60,28 +67,23 @@
setTimeout(() => lockSaved = false, 2000) setTimeout(() => lockSaved = false, 2000)
} }
function normalizeAuthMode(mode: string): 'NONE' | 'BASIC_AUTH' | 'UI_LOGIN' {
if (mode === 'BASIC_AUTH' || mode === 'UI_LOGIN' || mode === 'NONE') return mode
return 'NONE'
}
function showSaved(key: string) { function showSaved(key: string) {
secSaved = key; secError = null secSaved = key; secError = null
setTimeout(() => { if (secSaved === key) secSaved = null }, 2000) setTimeout(() => { if (secSaved === key) secSaved = null }, 2000)
} }
$effect(() => { $effect(() => {
if (!secLoaded) { secLoaded = true; authSession.clearTokens(); loadServerSecurity() } if (!secLoaded) { secLoaded = true; loadServerSecurity() }
}) })
async function loadServerSecurity() { async function loadServerSecurity() {
try { try {
const s = await requestManager.extensions.getServerSecurity() const s = await requestManager.extensions.getServerSecurity()
const serverMode = normalizeAuthMode(s.authMode) if (!authDirty) {
if (serverMode !== 'UI_LOGIN') authSession.clearTokens() authMode = normalizeForUI(s.authMode)
authMode = serverMode authUsername = s.authUsername || ''
authUsername = s.authUsername || '' updateSettings({ serverAuthMode: authMode, serverAuthUser: authUsername })
updateSettings({ serverAuthMode: serverMode, serverAuthUser: authUsername }) }
socksEnabled = s.socksProxyEnabled; socksHost = s.socksProxyHost socksEnabled = s.socksProxyEnabled; socksHost = s.socksProxyHost
socksPort = s.socksProxyPort; socksVersion = s.socksProxyVersion socksPort = s.socksProxyPort; socksVersion = s.socksProxyVersion
socksUsername = s.socksProxyUsername socksUsername = s.socksProxyUsername
@@ -95,37 +97,28 @@
flareSolverrTimeout: flareTimeout, flareSolverrSessionName: flareSession, flareSolverrTimeout: flareTimeout, flareSolverrSessionName: flareSession,
flareSolverrSessionTtl: flareTtl, flareSolverrAsResponseFallback: flareFallback, flareSolverrSessionTtl: flareTtl, flareSolverrAsResponseFallback: flareFallback,
}) })
} catch {} } catch (e: any) {
console.warn('[SecuritySettings] loadServerSecurity failed:', e?.message ?? e)
}
} }
async function saveAuth() { async function saveAuth() {
if (authMode === 'NONE') { await clearAuth(); return } if (authMode === 'NONE') { await clearAuth(); return }
if (!authUsername.trim() || !authPassword.trim()) { secError = 'Username and password are required'; return } if (!authUsername.trim() || !authPassword.trim()) { secError = 'Username and password are required'; return }
secLoading = true; secError = null secLoading = true; secError = null
const prev = { mode: settingsState.settings.serverAuthMode, user: settingsState.settings.serverAuthUser, pass: settingsState.settings.serverAuthPass }
try { try {
const newUser = authUsername.trim() const newUser = authUsername.trim()
const newPass = authPassword.trim() const newPass = authPassword.trim()
authSession.clearTokens()
if (authMode === 'UI_LOGIN') {
await loginUI(newUser, newPass)
updateSettings({ serverAuthMode: 'UI_LOGIN', serverAuthUser: newUser, serverAuthPass: '' })
} else {
updateSettings({ serverAuthMode: 'BASIC_AUTH', serverAuthUser: newUser, serverAuthPass: newPass })
}
await requestManager.extensions.setServerAuth({ authMode, authUsername: newUser, authPassword: newPass }) await requestManager.extensions.setServerAuth({ authMode, authUsername: newUser, authPassword: newPass })
authSession.clearTokens()
updateSettings({ serverAuthMode: authMode as any, serverAuthUser: newUser, serverAuthPass: authMode === 'BASIC_AUTH' ? newPass : '' })
configureAuth(settingsState.settings.serverUrl ?? '', authMode as any, newUser, authMode === 'BASIC_AUTH' ? newPass : undefined)
authPassword = '' authPassword = ''
authDirty = false
showSaved('auth') showSaved('auth')
retryBoot(authMode as any, newUser, newPass)
} catch (e: any) { } catch (e: any) {
const msg = e?.message ?? 'Failed to save authentication settings' secError = e?.message ?? 'Failed to save authentication settings'
const authMismatch = /unauthorized|unauthenticated|authentication|401/i.test(msg)
if (!authMismatch) {
authSession.clearTokens()
updateSettings({ serverAuthMode: prev.mode, serverAuthUser: prev.user, serverAuthPass: prev.pass })
}
secError = authMismatch
? 'Saved local auth settings, but the server rejected the update. Verify your new credentials with the current server configuration.'
: msg
} finally { secLoading = false } } finally { secLoading = false }
} }
@@ -134,9 +127,11 @@
const prev = { mode: settingsState.settings.serverAuthMode, user: settingsState.settings.serverAuthUser, pass: settingsState.settings.serverAuthPass } const prev = { mode: settingsState.settings.serverAuthMode, user: settingsState.settings.serverAuthUser, pass: settingsState.settings.serverAuthPass }
try { try {
await requestManager.extensions.setServerAuth({ authMode: 'NONE', authUsername: '', authPassword: '' }) await requestManager.extensions.setServerAuth({ authMode: 'NONE', authUsername: '', authPassword: '' })
authSession.clearTokens()
configureAuth(settingsState.settings.serverUrl ?? '', 'NONE')
updateSettings({ serverAuthMode: 'NONE', serverAuthUser: '', serverAuthPass: '' }) updateSettings({ serverAuthMode: 'NONE', serverAuthUser: '', serverAuthPass: '' })
authMode = 'NONE'; authUsername = ''; authPassword = '' authMode = 'NONE'; authUsername = ''; authPassword = ''; authDirty = false
authSession.clearTokens(); showSaved('auth') showSaved('auth')
} catch (e: any) { } catch (e: any) {
updateSettings({ serverAuthMode: prev.mode, serverAuthUser: prev.user, serverAuthPass: prev.pass }) updateSettings({ serverAuthMode: prev.mode, serverAuthUser: prev.user, serverAuthPass: prev.pass })
secError = e?.message ?? 'Failed to disable authentication' secError = e?.message ?? 'Failed to disable authentication'
@@ -186,6 +181,7 @@
authMode = 'NONE' authMode = 'NONE'
authUsername = '' authUsername = ''
authPassword = '' authPassword = ''
authDirty = false
updateSettings({ serverAuthMode: 'NONE', serverAuthUser: '', serverAuthPass: '' }) updateSettings({ serverAuthMode: 'NONE', serverAuthUser: '', serverAuthPass: '' })
showSaved('auth') showSaved('auth')
} }
@@ -214,23 +210,28 @@
<div class="s-segment"> <div class="s-segment">
{#each [{ value: 'NONE', label: 'None' }, { value: 'BASIC_AUTH', label: 'Basic' }, { value: 'UI_LOGIN', label: 'UI Login' }] as opt} {#each [{ value: 'NONE', label: 'None' }, { value: 'BASIC_AUTH', label: 'Basic' }, { value: 'UI_LOGIN', label: 'UI Login' }] as opt}
<button class="s-segment-btn" class:active={authMode === opt.value} <button class="s-segment-btn" class:active={authMode === opt.value}
onclick={() => authMode = opt.value as any} disabled={secLoading}>{opt.label}</button> onclick={() => { authMode = opt.value as any; authPassword = ''; authDirty = true }} disabled={secLoading}>{opt.label}</button>
{/each} {/each}
</div> </div>
</div> </div>
{#if authMode !== 'NONE'} {#if authMode !== 'NONE'}
<div class="s-row"> <div class="s-row">
<div class="s-row-info"><span class="s-label">Username</span></div> <div class="s-row-info"><span class="s-label">Username</span></div>
<input class="s-input" bind:value={authUsername} placeholder="Username" autocomplete="off" spellcheck="false" disabled={secLoading} /> <input class="s-input" bind:value={authUsername} oninput={() => authDirty = true} placeholder="Username" autocomplete="off" spellcheck="false" disabled={secLoading} />
</div> </div>
<div class="s-row"> <div class="s-row">
<div class="s-row-info"><span class="s-label">Password</span></div> <div class="s-row-info"><span class="s-label">Password</span></div>
<div class="s-field-wrap"> <div class="s-field-wrap">
<input class="s-input" type={showAuthPass ? 'text' : 'password'} bind:value={authPassword} placeholder="Password" autocomplete="off" spellcheck="false" disabled={secLoading} /> <input class="s-input" type={showAuthPass ? 'text' : 'password'} bind:value={authPassword} oninput={() => authDirty = true} placeholder="Password" autocomplete="off" spellcheck="false" disabled={secLoading} />
<button class="s-eye-btn" onclick={() => showAuthPass = !showAuthPass} tabindex="-1" aria-label={showAuthPass ? 'Hide password' : 'Show password'}>{@html showAuthPass ? EyeClose : EyeOpen}</button> <button class="s-eye-btn" onclick={() => showAuthPass = !showAuthPass} tabindex="-1" aria-label={showAuthPass ? 'Hide password' : 'Show password'}>{@html showAuthPass ? EyeClose : EyeOpen}</button>
</div> </div>
</div> </div>
{/if} {/if}
{#if authMode !== 'NONE' && settingsState.settings.serverAuthMode === authMode && !authPassword}
<div class="s-row">
<span class="s-desc" style="color: var(--text-muted)">Re-enter your password to update credentials.</span>
</div>
{/if}
{#if settingsState.settings.serverAuthMode === 'BASIC_AUTH'} {#if settingsState.settings.serverAuthMode === 'BASIC_AUTH'}
<div class="s-row"> <div class="s-row">
<span class="s-desc">Images are proxied through Tauri when Basic Auth is active, which reduces loading speed.</span> <span class="s-desc">Images are proxied through Tauri when Basic Auth is active, which reduces loading speed.</span>
@@ -250,8 +251,16 @@
</button> </button>
{/if} {/if}
<button class="s-btn s-btn-accent" onclick={saveAuth} <button class="s-btn s-btn-accent" onclick={saveAuth}
disabled={secLoading || ((authMode === 'BASIC_AUTH' || authMode === 'UI_LOGIN') && (!authUsername.trim() || !authPassword.trim()))}> disabled={secLoading || (authMode !== 'NONE' && (!authUsername.trim() || !authPassword.trim()))}>
{secLoading ? 'Saving…' : secSaved === 'auth' ? 'Saved ✓' : settingsState.settings.serverAuthMode === 'BASIC_AUTH' ? 'Update' : authMode === 'NONE' ? 'Save' : 'Enable'} {#if secLoading}
Saving…
{:else if secSaved === 'auth'}
Saved ✓
{:else if authMode === 'NONE'}
Save
{:else}
{authDirty ? 'Enable' : 'Save'}
{/if}
</button> </button>
</div> </div>
</div> </div>
@@ -12,6 +12,9 @@
import { clearBlobCache } from '$lib/core/cache/imageCache' import { clearBlobCache } from '$lib/core/cache/imageCache'
import { clearPageCache } from '$lib/request-manager' import { clearPageCache } from '$lib/request-manager'
import { cache as queryCache } from '$lib/core/cache/queryCache' import { cache as queryCache } from '$lib/core/cache/queryCache'
import { getAdapter } from '$lib/request-manager'
import { requestManager } from '$lib/request-manager'
import type { ValidateBackupResult, RestoreStatus } from '$lib/server-adapters/types'
const supportsFilesystem = platformService.isSupported('filesystem') const supportsFilesystem = platformService.isSupported('filesystem')
@@ -79,7 +82,7 @@
await Promise.all([ await Promise.all([
platformService.clearMokuCache(), platformService.clearMokuCache(),
platformService.clearSuwayomiCache(), platformService.clearSuwayomiCache(),
gql(`mutation { clearCachedImages(input: { cachedPages: true, cachedThumbnails: true, downloadedThumbnails: false }) { cachedPages cachedThumbnails } }`), getAdapter().clearCachedImages({ cachedPages: true, cachedThumbnails: true, downloadedThumbnails: false }),
]) ])
} }
@@ -168,11 +171,7 @@
if (!supportsFilesystem) return if (!supportsFilesystem) return
storageLoading = true; storageError = null storageLoading = true; storageError = null
try { try {
const pathData = await gql<{ settings: { downloadsPath: string | null; localSourcePath: string | null } }>( const { downloadsPath: dl, localSourcePath: loc } = await getAdapter().getDownloadsPath()
`{ settings { downloadsPath localSourcePath } }`
)
const dl = pathData.settings.downloadsPath ?? ''
const loc = pathData.settings.localSourcePath ?? ''
downloadsPathInput = dl; localSourcePathInput = loc downloadsPathInput = dl; localSourcePathInput = loc
confirmedDownloadsPath = dl; confirmedLocalSourcePath = loc confirmedDownloadsPath = dl; confirmedLocalSourcePath = loc
updateSettings({ serverDownloadsPath: dl, serverLocalSourcePath: loc }) updateSettings({ serverDownloadsPath: dl, serverLocalSourcePath: loc })
@@ -218,8 +217,8 @@
if (dlErr || locErr) { pathsFieldError = { ...(dlErr ? { dl: dlErr } : {}), ...(locErr ? { loc: locErr } : {}) }; return } if (dlErr || locErr) { pathsFieldError = { ...(dlErr ? { dl: dlErr } : {}), ...(locErr ? { loc: locErr } : {}) }; return }
pathsSaving = true pathsSaving = true
try { try {
await gql(`mutation($path: String!) { setSettings(input: { settings: { downloadsPath: $path } }) { settings { downloadsPath } } }`, { path: dl }) await getAdapter().setDownloadsPath(dl)
if (loc) await gql(`mutation($path: String!) { setSettings(input: { settings: { localSourcePath: $path } }) { settings { localSourcePath } } }`, { path: loc }) if (loc) await getAdapter().setLocalSourcePath(loc)
updateSettings({ serverDownloadsPath: dl, serverLocalSourcePath: loc }) updateSettings({ serverDownloadsPath: dl, serverLocalSourcePath: loc })
if (supportsFilesystem && !isExternalServer) { if (supportsFilesystem && !isExternalServer) {
const oldDl = confirmedDownloadsPath || defaultDownloadsPath const oldDl = confirmedDownloadsPath || defaultDownloadsPath
@@ -301,8 +300,7 @@
async function createBackup() { async function createBackup() {
backupLoading = true; backupError = null backupLoading = true; backupError = null
try { try {
const data = await gql<{ createBackup: { url: string } }>(`mutation { createBackup { url } }`) const { url } = await getAdapter().createBackup()
const { url } = data.createBackup
const name = url.split('/').pop() ?? url const name = url.split('/').pop() ?? url
backupList = [{ url, name }, ...backupList] backupList = [{ url, name }, ...backupList]
await saveBackupList() await saveBackupList()
@@ -313,7 +311,7 @@
async function deleteBackup(url: string) { async function deleteBackup(url: string) {
backupList = backupList.map(b => b.url === url ? { ...b, deleting: true } : b) backupList = backupList.map(b => b.url === url ? { ...b, deleting: true } : b)
try { try {
await fetch(`${serverUrl()}${url}`, { method: 'DELETE', headers: buildAuthHeaders() }) await getAdapter().deleteBackup(url)
backupList = backupList.filter(b => b.url !== url) backupList = backupList.filter(b => b.url !== url)
await saveBackupList() await saveBackupList()
} catch (e: any) { } catch (e: any) {
@@ -324,9 +322,7 @@
async function downloadBackup(backup: BackupEntry) { async function downloadBackup(backup: BackupEntry) {
try { try {
const resp = await fetch(`${serverUrl()}${backup.url}`, { headers: buildAuthHeaders() }) const blob = await getAdapter().downloadBackup(backup.url)
if (!resp.ok) throw new Error(`Server returned ${resp.status}`)
const blob = await resp.blob()
if ('showSaveFilePicker' in window) { if ('showSaveFilePicker' in window) {
try { try {
const handle = await (window as any).showSaveFilePicker({ const handle = await (window as any).showSaveFilePicker({
@@ -349,12 +345,11 @@
let restoreLoading = $state(false) let restoreLoading = $state(false)
let restoreError = $state<string | null>(null) let restoreError = $state<string | null>(null)
let restoreJobId = $state<string | null>(null) let restoreStatus = $state<RestoreStatus | null>(null)
let restoreStatus = $state<{ mangaProgress: number; state: string; totalManga: number } | null>(null)
let restorePollInterval = $state<ReturnType<typeof setInterval> | null>(null) let restorePollInterval = $state<ReturnType<typeof setInterval> | null>(null)
let validateLoading = $state(false) let validateLoading = $state(false)
let validateError = $state<string | null>(null) let validateError = $state<string | null>(null)
let validateResult = $state<{ missingSources: { id: string; name: string }[]; missingTrackers: { name: string }[] } | null>(null) let validateResult = $state<ValidateBackupResult | null>(null)
let restoreFile = $state<File | null>(null) let restoreFile = $state<File | null>(null)
function stopRestorePoll() { function stopRestorePoll() {
@@ -363,62 +358,19 @@
async function pollRestoreStatus(id: string) { async function pollRestoreStatus(id: string) {
try { try {
const data = await gql<{ restoreStatus: { mangaProgress: number; state: string; totalManga: number } }>( const status = await getAdapter().pollRestoreStatus(id)
`query($id: String!) { restoreStatus(id: $id) { mangaProgress state totalManga } }`,
{ id }
)
const status = data.restoreStatus
restoreStatus = status restoreStatus = status
if (status?.state === 'SUCCESS' || status?.state === 'FAILURE') stopRestorePoll() if (status?.state === 'SUCCESS' || status?.state === 'FAILURE') stopRestorePoll()
} catch {} } catch {}
} }
function buildBackupFormData(file: File, query: string, variables: Record<string, unknown>) {
const form = new FormData()
form.append('operations', JSON.stringify({ query, variables }))
form.append('map', JSON.stringify({ '0': ['variables.backup'] }))
form.append('0', file, file.name)
return form
}
function buildAuthHeaders(): Record<string, string> {
const headers: Record<string, string> = { Accept: 'application/json' }
const pass = settingsState.settings.serverAuthPass ?? '', user = settingsState.settings.serverAuthUser ?? ''
if (settingsState.settings.serverAuthMode === 'BASIC_AUTH' && user && pass)
headers['Authorization'] = 'Basic ' + btoa(`${user}:${pass}`)
return headers
}
function serverUrl(): string {
return (settingsState.settings.serverUrl ?? 'http://localhost:4567').replace(/\/$/, '')
}
async function gql<T = unknown>(query: string, variables?: Record<string, unknown>): Promise<T> {
const res = await fetch(`${serverUrl()}/api/graphql`, {
method: 'POST',
headers: { 'Content-Type': 'application/json', ...buildAuthHeaders() },
body: JSON.stringify({ query, variables }),
})
const json = await res.json()
if (json.errors?.length) throw new Error(json.errors[0].message)
return json.data as T
}
async function submitRestore() { async function submitRestore() {
if (!restoreFile) return if (!restoreFile) return
restoreLoading = true; restoreError = null; restoreStatus = null; restoreJobId = null restoreLoading = true; restoreError = null; restoreStatus = null
stopRestorePoll() stopRestorePoll()
try { try {
const form = buildBackupFormData( const result = await requestManager.meta.restoreBackup(restoreFile)
restoreFile, restoreStatus = result.status
`mutation RestoreBackup($backup: Upload!) { restoreBackup(input: { backup: $backup }) { id status { mangaProgress state totalManga } } }`,
{ backup: null }
)
const resp = await fetch(`${serverUrl()}/api/graphql`, { method: 'POST', headers: buildAuthHeaders(), body: form })
const json = await resp.json()
if (json.errors?.length) throw new Error(json.errors[0].message)
const result = json.data.restoreBackup
restoreJobId = result.id; restoreStatus = result.status
if (result.status?.state !== 'SUCCESS' && result.status?.state !== 'FAILURE') if (result.status?.state !== 'SUCCESS' && result.status?.state !== 'FAILURE')
restorePollInterval = setInterval(() => pollRestoreStatus(result.id), 1500) restorePollInterval = setInterval(() => pollRestoreStatus(result.id), 1500)
} catch (e: any) { restoreError = e?.message ?? 'Failed to start restore' } } catch (e: any) { restoreError = e?.message ?? 'Failed to start restore' }
@@ -429,15 +381,7 @@
if (!restoreFile) return if (!restoreFile) return
validateLoading = true; validateError = null; validateResult = null validateLoading = true; validateError = null; validateResult = null
try { try {
const form = buildBackupFormData( validateResult = await requestManager.meta.validateBackup(restoreFile)
restoreFile,
`query ValidateBackup($backup: Upload!) { validateBackup(input: { backup: $backup }) { missingSources { id name } missingTrackers { name } } }`,
{ backup: null }
)
const resp = await fetch(`${serverUrl()}/api/graphql`, { method: 'POST', headers: buildAuthHeaders(), body: form })
const json = await resp.json()
if (json.errors?.length) throw new Error(json.errors[0].message)
validateResult = json.data.validateBackup
} catch (e: any) { validateError = e?.message ?? 'Failed to validate backup' } } catch (e: any) { validateError = e?.message ?? 'Failed to validate backup' }
finally { validateLoading = false } finally { validateLoading = false }
} }
@@ -3,6 +3,7 @@
import { settingsState, updateSettings } from "$lib/state/settings.svelte"; import { settingsState, updateSettings } from "$lib/state/settings.svelte";
import { toast } from "$lib/state/notifications.svelte"; import { toast } from "$lib/state/notifications.svelte";
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import { platformService } from "$lib/platform-service";
import { syncBackFromTracker } from "$lib/components/tracking/lib/trackingSync"; import { syncBackFromTracker } from "$lib/components/tracking/lib/trackingSync";
import { trackingState } from "$lib/state/tracking.svelte"; import { trackingState } from "$lib/state/tracking.svelte";
import type { Tracker, TrackRecord } from "$lib/types/index"; import type { Tracker, TrackRecord } from "$lib/types/index";
@@ -41,7 +42,7 @@
async function startOAuth(tracker: Tracker) { async function startOAuth(tracker: Tracker) {
if (!tracker.authUrl) return; if (!tracker.authUrl) return;
oauthTrackerId = tracker.id; oauthCallbackInput = ""; oauthTrackerId = tracker.id; oauthCallbackInput = "";
window.open(tracker.authUrl, "_blank"); await platformService.openExternal(tracker.authUrl);
} }
async function submitOAuth() { async function submitOAuth() {
@@ -274,6 +275,7 @@
<style> <style>
.s-tracker-status-row { display: flex; align-items: center; gap: var(--sp-2); flex-wrap: wrap; } .s-tracker-status-row { display: flex; align-items: center; gap: var(--sp-2); flex-wrap: wrap; }
.s-tracker-status-row .s-pill { border-radius: 4px; }
.s-pill-warn { background: color-mix(in srgb, var(--color-warn, #c97c2b) 15%, transparent); color: var(--color-warn, #c97c2b); border-color: color-mix(in srgb, var(--color-warn, #c97c2b) 35%, transparent); } .s-pill-warn { background: color-mix(in srgb, var(--color-warn, #c97c2b) 15%, transparent); color: var(--color-warn, #c97c2b); border-color: color-mix(in srgb, var(--color-warn, #c97c2b) 35%, transparent); }
.s-banner-dismissible { cursor: pointer; max-height: 8rem; overflow-y: auto; } .s-banner-dismissible { cursor: pointer; max-height: 8rem; overflow-y: auto; }
.s-banner-dismissible:hover { opacity: 0.85; } .s-banner-dismissible:hover { opacity: 0.85; }
@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
import { onMount, onDestroy } from "svelte"; import { onMount, onDestroy, untrack } from "svelte";
import { import {
X, BookmarkSimple, ArrowSquareOut, Play, CircleNotch, X, BookmarkSimple, ArrowSquareOut, Play, CircleNotch,
Books, CaretDown, FolderSimplePlus, Folder, LinkSimpleHorizontalBreak, Image, Books, CaretDown, FolderSimplePlus, Folder, LinkSimpleHorizontalBreak, Image,
@@ -16,16 +16,13 @@
import { addToast } from "$lib/state/notifications.svelte"; import { addToast } from "$lib/state/notifications.svelte";
import { import {
seriesState, seriesState,
setPreviewManga, setActiveManga, openReader, addBookmark, setPreviewManga, addBookmark, openReaderForChapter,
} from "$lib/state/series.svelte"; } from "$lib/state/series.svelte";
import { app } from "$lib/state/app.svelte";
import type { Manga, Chapter, Category } from "$lib/types"; import type { Manga, Chapter, Category } from "$lib/types";
import ModalBlur from '$lib/components/shared/ui/ModalBlur.svelte';
let manga: Manga | null = $state(null); let manga: Manga | null = $state(null);
let chapters: Chapter[] = $state([]);
let loadingDetail = $state(false); let loadingDetail = $state(false);
let loadingChapters = $state(false);
let togglingLib = $state(false); let togglingLib = $state(false);
let descExpanded = $state(false); let descExpanded = $state(false);
let folderOpen = $state(false); let folderOpen = $state(false);
@@ -43,8 +40,6 @@
let loadingLinkList = $state(false); let loadingLinkList = $state(false);
let coverPickerOpen = $state(false); let coverPickerOpen = $state(false);
let originNavPage = app.navPage;
const linkedIds = $derived( const linkedIds = $derived(
seriesState.previewManga seriesState.previewManga
? (settingsState.settings.mangaLinks?.[seriesState.previewManga.id] ?? []) ? (settingsState.settings.mangaLinks?.[seriesState.previewManga.id] ?? [])
@@ -56,12 +51,15 @@
); );
const displayManga = $derived(manga ?? seriesState.previewManga); const displayManga = $derived(manga ?? seriesState.previewManga);
const mangaId = $derived(seriesState.previewManga?.id ?? null);
const chapters = $derived(mangaId != null ? seriesState.chaptersFor(mangaId) : []);
const loadingChapters = $derived(mangaId != null ? seriesState.isLoadingChapters(mangaId) : false);
const totalCount = $derived(chapters.length); const totalCount = $derived(chapters.length);
const readCount = $derived(chapters.filter((c) => c.read).length); const readCount = $derived(chapters.filter((c) => c.read).length);
const unreadCount = $derived(totalCount - readCount); const unreadCount = $derived(totalCount - readCount);
const downloadedCount = $derived(chapters.filter((c) => c.downloaded).length); const downloadedCount = $derived(chapters.filter((c) => c.downloaded).length);
const bookmarkCount = $derived(chapters.filter((c) => c.bookmarked).length); const bookmarkCount = $derived(chapters.filter((c) => c.bookmarked).length);
const inLibrary = $derived(manga?.inLibrary ?? seriesState.previewManga?.inLibrary ?? false); const inLibrary = $derived((manga as Manga | null)?.inLibrary ?? seriesState.previewManga?.inLibrary ?? false);
const scanlators = $derived( const scanlators = $derived(
[...new Set(chapters.map((c) => c.scanlator).filter((s): s is string => !!s?.trim()))], [...new Set(chapters.map((c) => c.scanlator).filter((s): s is string => !!s?.trim()))],
); );
@@ -100,7 +98,7 @@
const inProgress = asc.find((c) => !c.read && (c.lastPageRead ?? 0) > 0); const inProgress = asc.find((c) => !c.read && (c.lastPageRead ?? 0) > 0);
if (inProgress) return { ch: inProgress, type: "continue" as const, resumePage: inProgress.lastPageRead! }; if (inProgress) return { ch: inProgress, type: "continue" as const, resumePage: inProgress.lastPageRead! };
const firstUnread = asc.find((c) => !c.read); const firstUnread = asc.find((c) => !c.read);
if (firstUnread) return { ch: firstUnread, type: (anyRead ? "continue" : "start") as const, resumePage: null }; if (firstUnread) return { ch: firstUnread, type: (anyRead ? "continue" as const : "start" as const), resumePage: null };
return { ch: asc[0], type: "reread" as const, resumePage: null }; return { ch: asc[0], type: "reread" as const, resumePage: null };
}); });
@@ -112,16 +110,12 @@
return `Continue · Ch.${ch.chapterNumber}${resumePage ? ` p.${resumePage}` : ""}`; return `Continue · Ch.${ch.chapterNumber}${resumePage ? ` p.${resumePage}` : ""}`;
}); });
let detailAbort: AbortController | null = null;
let detailAbort: AbortController | null = null;
let chapterAbort: AbortController | null = null;
function close() { function close() {
detailAbort?.abort(); detailAbort?.abort();
chapterAbort?.abort();
setPreviewManga(null); setPreviewManga(null);
manga = null; chapters = []; descExpanded = false; manga = null; descExpanded = false;
folderOpen = false; creatingFolder = false; newFolderName = ""; fetchError = null; folderOpen = false; creatingFolder = false; newFolderName = ""; fetchError = null;
} }
@@ -133,10 +127,14 @@
linkPickerOpen = true; linkPickerOpen = true;
if (allMangaForLink.length) return; if (allMangaForLink.length) return;
loadingLinkList = true; loadingLinkList = true;
getAdapter().getMangaList({}) try {
.then((d) => { allMangaForLink = d.items; }) const result = await getAdapter().getMangaList({});
.catch(console.error) allMangaForLink = result.items;
.finally(() => { loadingLinkList = false; }); } catch (e) {
console.error(e);
} finally {
loadingLinkList = false;
}
} }
function closeLinkPicker() { linkPickerOpen = false; } function closeLinkPicker() { linkPickerOpen = false; }
@@ -145,91 +143,82 @@
coverPickerOpen = true; coverPickerOpen = true;
if (allMangaForLink.length) return; if (allMangaForLink.length) return;
loadingLinkList = true; loadingLinkList = true;
getAdapter().getMangaList({}) try {
.then((d) => { allMangaForLink = d.items; }) const result = await getAdapter().getMangaList({});
.catch(console.error) allMangaForLink = result.items;
.finally(() => { loadingLinkList = false; }); } catch (e) {
console.error(e);
} finally {
loadingLinkList = false;
}
} }
$effect(() => { $effect(() => {
const shouldAutoLink = settingsState.settings.autoLinkOnOpen;
const focal = seriesState.previewManga; const focal = seriesState.previewManga;
if (focal) { if (!focal) return;
originNavPage = app.navPage;
load(focal.id); untrack(() => {
loadDetail(focal.id);
seriesState.loadChapters(focal.id);
loadCategories(focal.id); loadCategories(focal.id);
const shouldAutoLink = settingsState.settings.autoLinkOnOpen;
if (shouldAutoLink) { if (shouldAutoLink) {
if (allMangaForLink.length) { if (allMangaForLink.length) {
autoLinkLibrary(focal, allMangaForLink) autoLinkLibrary(focal, allMangaForLink)
.then(n => { if (n > 0) addToast({ kind: "success", title: "Series linked", body: `${n} new link${n === 1 ? "" : "s"} found` }); }); .then((n: number) => { if (n > 0) addToast({ kind: "success", title: "Series linked", body: `${n} new link${n === 1 ? "" : "s"} found` }); });
} else { } else {
loadingLinkList = true; loadingLinkList = true;
getAdapter().getMangaList({}) (async () => {
.then((d) => { try {
allMangaForLink = d.items; const result = await getAdapter().getMangaList({});
return autoLinkLibrary(focal, d.items); allMangaForLink = result.items;
}) const n = await autoLinkLibrary(focal, result.items);
.then(n => { if (n > 0) addToast({ kind: "success", title: "Series linked", body: `${n} new link${n === 1 ? "" : "s"} found` }); }) if (n > 0) addToast({ kind: "success", title: "Series linked", body: `${n} new link${n === 1 ? "" : "s"} found` });
.catch(console.error) } catch (e) {
.finally(() => { loadingLinkList = false; }); console.error(e);
} finally {
loadingLinkList = false;
}
})();
} }
} }
} });
}); });
async function load(id: number) { async function loadDetail(id: number) {
detailAbort?.abort(); chapterAbort?.abort(); detailAbort?.abort();
const dCtrl = new AbortController(), cCtrl = new AbortController(); const ctrl = new AbortController();
detailAbort = dCtrl; chapterAbort = cCtrl; detailAbort = ctrl;
manga = seriesState.previewManga as Manga; manga = seriesState.previewManga as Manga;
chapters = []; descExpanded = false; fetchError = null; descExpanded = false; fetchError = null;
loadingDetail = true; loadingChapters = true; loadingDetail = true;
(async (): Promise<Manga> => { const key = CACHE_KEYS.MANGA(id);
const key = CACHE_KEYS.MANGA(id); try {
if (cache.has(key)) return cache.get(key, () => Promise.resolve(seriesState.previewManga as Manga)) as Promise<Manga>; let fullManga: Manga;
try { if (cache.has(key)) {
return await getAdapter().fetchManga(String(id), dCtrl.signal); fullManga = await (cache.get(key, () => Promise.resolve(seriesState.previewManga as Manga)) as Promise<Manga>);
} catch (e: any) { } else {
if (e?.name === "AbortError") throw e; try {
const local = await getAdapter().getManga(String(id), dCtrl.signal); fullManga = await getAdapter().fetchManga(String(id), ctrl.signal);
if (local) return local; } catch (e: any) {
throw new Error("Could not load manga details"); if (e?.name === "AbortError") return;
const local = await getAdapter().getManga(String(id), ctrl.signal);
if (local) fullManga = local;
else throw new Error("Could not load manga details");
}
if (!cache.has(key)) cache.get(key, () => Promise.resolve(fullManga));
} }
})() if (ctrl.signal.aborted) return;
.then((fullManga) => { manga = fullManga;
if (dCtrl.signal.aborted) return; } catch (e: any) {
if (!cache.has(CACHE_KEYS.MANGA(id))) if (e?.name === "AbortError") return;
cache.get(CACHE_KEYS.MANGA(id), () => Promise.resolve(fullManga)); manga = seriesState.previewManga as Manga;
manga = fullManga; loadingDetail = false; fetchError = "Could not load full details — showing cached data";
}) } finally {
.catch((e) => { if (!ctrl.signal.aborted) loadingDetail = false;
if (e?.name === "AbortError") return; }
manga = seriesState.previewManga as Manga;
fetchError = "Could not load full details — showing cached data";
loadingDetail = false;
});
getAdapter().getChapters(String(id), cCtrl.signal)
.then(async (nodes) => {
if (cCtrl.signal.aborted) return;
let sorted = [...nodes].sort((a, b) => a.sourceOrder - b.sourceOrder);
if (sorted.length === 0) {
try {
const fetched = await getAdapter().fetchChapters(String(id), cCtrl.signal);
if (!cCtrl.signal.aborted)
sorted = [...fetched].sort((a, b) => a.sourceOrder - b.sourceOrder);
} catch (e: any) {
if (e?.name === "AbortError") return;
}
}
if (!cCtrl.signal.aborted) {
chapters = sorted;
if (sorted.length > 0) checkAndMarkCompleted(id, sorted);
}
})
.catch(() => {})
.finally(() => { if (!cCtrl.signal.aborted) loadingChapters = false; });
} }
async function toggleLibrary() { async function toggleLibrary() {
@@ -257,58 +246,68 @@
function openSeriesDetail() { function openSeriesDetail() {
if (!displayManga) return; if (!displayManga) return;
setActiveManga(displayManga); goto(`/series/${displayManga.id}`);
setNavPage(originNavPage);
close(); close();
} }
function loadCategories(mangaId: number) { function handleRead() {
if (!continueChapter || !displayManga) return;
const { ch, type, resumePage } = continueChapter;
if (type === "continue" && resumePage && resumePage > 1) {
const existing = seriesState.bookmarks.find((b) => b.chapterId === ch.id);
if (!existing || existing.pageNumber < resumePage) {
addBookmark({
mangaId: displayManga.id,
mangaTitle: displayManga.title,
thumbnailUrl: displayManga.thumbnailUrl,
chapterId: ch.id,
chapterName: ch.name,
pageNumber: resumePage,
});
}
}
openReaderForChapter(ch, displayManga);
close();
}
function loadCategories(id: number) {
catsLoading = true; catsLoading = true;
getAdapter().getCategories() getAdapter().getCategories()
.then((cats) => { .then((cats: Category[]) => {
allCategories = cats.filter((c) => c.id !== 0); allCategories = cats.filter((c: Category) => c.id !== 0);
mangaCategories = allCategories.filter((c) => c.mangas?.nodes?.some((m) => m.id === mangaId)); mangaCategories = allCategories.filter((c: Category) => c.mangas?.some((m: Manga) => m.id === id));
}) })
.catch(console.error) .catch(console.error)
.finally(() => { catsLoading = false; }); .finally(() => { catsLoading = false; });
} }
async function checkAndMarkCompleted(mangaId: number, chaps: Chapter[]) { async function checkAndMarkCompleted(id: number, chaps: Chapter[]) {
const mangaStatus = (manga ?? displayManga)?.status; const isOngoing = (manga ?? displayManga)?.status === "ONGOING";
const isOngoing = mangaStatus === "ONGOING";
if (!chaps.length || isOngoing) return; if (!chaps.length || isOngoing) return;
const allRead = chaps.every((c) => c.read); const allRead = chaps.every((c) => c.read);
const completed = allCategories.find((c) => c.name === "Completed"); const completed = allCategories.find((c) => c.name === "Completed");
if (!completed) return; if (!completed) return;
const inCompleted = mangaCategories.some((c) => c.id === completed.id); const inCompleted = mangaCategories.some((c) => c.id === completed.id);
if (allRead && !inCompleted) { if (allRead && !inCompleted) {
await getAdapter().updateMangaCategories(String(mangaId), [completed.id], []).catch(console.error); await getAdapter().updateMangaCategories(String(id), [completed.id], []).catch(console.error);
mangaCategories = [...mangaCategories, completed]; mangaCategories = [...mangaCategories, completed];
} else if (!allRead && inCompleted) { } else if (!allRead && inCompleted) {
await getAdapter().updateMangaCategories(String(mangaId), [], [completed.id]).catch(console.error); await getAdapter().updateMangaCategories(String(id), [], [completed.id]).catch(console.error);
mangaCategories = mangaCategories.filter((c) => c.id !== completed.id); mangaCategories = mangaCategories.filter((c) => c.id !== completed.id);
} }
} }
async function toggleCategory(cat: Category) { async function toggleCategory(cat: Category) {
if (!seriesState.previewManga) return; if (!seriesState.previewManga) return;
const mangaId = seriesState.previewManga.id; const id = seriesState.previewManga.id;
const inCat = mangaCategories.some((c) => c.id === cat.id); const inCat = mangaCategories.some((c) => c.id === cat.id);
await getAdapter().updateMangaCategories( await getAdapter().updateMangaCategories(String(id), inCat ? [] : [cat.id], inCat ? [cat.id] : []).catch(console.error);
String(mangaId),
inCat ? [] : [cat.id],
inCat ? [cat.id] : [],
).catch(console.error);
if (!inCat && !inLibrary) { if (!inCat && !inLibrary) {
await getAdapter().addToLibrary(String(mangaId)).catch(console.error); await getAdapter().addToLibrary(String(id)).catch(console.error);
if (manga) manga = { ...manga, inLibrary: true }; if (manga) manga = { ...manga, inLibrary: true };
cache.clear(CACHE_KEYS.LIBRARY); cache.clear(CACHE_KEYS.LIBRARY);
} }
mangaCategories = inCat mangaCategories = inCat ? mangaCategories.filter((c) => c.id !== cat.id) : [...mangaCategories, cat];
? mangaCategories.filter((c) => c.id !== cat.id)
: [...mangaCategories, cat];
} }
async function handleFolderCreate() { async function handleFolderCreate() {
@@ -348,11 +347,11 @@
onDestroy(() => { onDestroy(() => {
window.removeEventListener("keydown", onKey); window.removeEventListener("keydown", onKey);
detailAbort?.abort(); detailAbort?.abort();
chapterAbort?.abort();
}); });
</script> </script>
{#if seriesState.previewManga} {#if seriesState.previewManga}
<ModalBlur blur={4} dim={0.72} />
<div <div
class="backdrop" class="backdrop"
role="button" role="button"
@@ -546,24 +545,7 @@
</div> </div>
{/if} {/if}
{#if continueChapter} {#if continueChapter}
<button class="read-btn" onclick={() => { <button class="read-btn" onclick={handleRead}>
const { ch, type, resumePage } = continueChapter!;
if (type === "continue" && resumePage && resumePage > 1) {
const existing = seriesState.bookmarks.find((b) => b.chapterId === ch.id);
if (!existing || existing.pageNumber < resumePage) {
addBookmark({
mangaId: displayManga!.id,
mangaTitle: displayManga!.title,
thumbnailUrl: displayManga!.thumbnailUrl,
chapterId: ch.id,
chapterName: ch.name,
pageNumber: resumePage,
});
}
}
openReader(ch, chapters, displayManga);
close();
}}>
<Play size={12} weight="fill" />{continueLabel} <Play size={12} weight="fill" />{continueLabel}
</button> </button>
{/if} {/if}
@@ -674,15 +656,11 @@
/> />
{/if} {/if}
<style> <style>
.backdrop { .backdrop {
position: fixed; inset: 0; position: fixed; inset: 0;
background: rgba(0,0,0,0.72);
z-index: var(--z-settings); z-index: var(--z-settings);
display: flex; align-items: center; justify-content: center; display: flex; align-items: center; justify-content: center;
backdrop-filter: blur(4px); -webkit-backdrop-filter: blur(4px);
animation: fadeIn 0.12s ease both; animation: fadeIn 0.12s ease both;
} }
.modal { .modal {
@@ -873,8 +851,8 @@
.read-btn:hover { filter: brightness(1.1); } .read-btn:hover { filter: brightness(1.1); }
.desc-block { display: flex; flex-direction: column; gap: var(--sp-2); border-top: 1px solid var(--border-dim); padding-top: var(--sp-3); } .desc-block { display: flex; flex-direction: column; gap: var(--sp-2); border-top: 1px solid var(--border-dim); padding-top: var(--sp-3); }
.desc { font-size: var(--text-sm); color: var(--text-muted); line-height: var(--leading-base); display: -webkit-box; -webkit-line-clamp: 5; -webkit-box-orient: vertical; overflow: hidden; } .desc { font-size: var(--text-sm); color: var(--text-muted); line-height: var(--leading-base); display: -webkit-box; -webkit-line-clamp: 5; line-clamp: 5; -webkit-box-orient: vertical; overflow: hidden; }
.desc.desc-open { display: block; -webkit-line-clamp: unset; overflow: visible; } .desc.desc-open { display: block; -webkit-line-clamp: unset; line-clamp: unset; overflow: visible; }
.desc-toggle { .desc-toggle {
display: flex; align-items: center; gap: var(--sp-1); align-self: flex-start; display: flex; align-items: center; gap: var(--sp-1); align-self: flex-start;
font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint);
@@ -4,6 +4,7 @@
let { let {
src, src,
id = undefined,
alt = "", alt = "",
class: cls = "", class: cls = "",
loading = "lazy", loading = "lazy",
@@ -13,6 +14,7 @@
...rest ...rest
}: { }: {
src: string | null | undefined; src: string | null | undefined;
id?: string | number;
alt?: string; alt?: string;
class?: string; class?: string;
loading?: string; loading?: string;
@@ -27,10 +29,14 @@
return typeof url === "string" && url.trim() ? url.replace(/\/$/, "") : "http://127.0.0.1:4567"; return typeof url === "string" && url.trim() ? url.replace(/\/$/, "") : "http://127.0.0.1:4567";
} }
function withBust(url: string): string {
return id != null ? `${url}${url.includes('?') ? '&' : '?'}id=${id}` : url;
}
function plainThumbUrl(path: string | null | undefined): string { function plainThumbUrl(path: string | null | undefined): string {
if (!path) return ""; if (!path) return "";
if (path.startsWith("http")) return path; const base = path.startsWith("http") ? path : `${getServerUrl()}${path}`;
return `${getServerUrl()}${path}`; return withBust(base);
} }
const isAuth = $derived((settingsState.settings.serverAuthMode ?? "NONE") !== "NONE"); const isAuth = $derived((settingsState.settings.serverAuthMode ?? "NONE") !== "NONE");
@@ -45,15 +51,15 @@
if (!_isAuth || !_src) { blobUrl = ""; return; } if (!_isAuth || !_src) { blobUrl = ""; return; }
const id = ++reqId; const myId = ++reqId;
const bareUrl = _src.startsWith("http") ? _src : `${getServerUrl()}${_src}`; const bareUrl = _src.startsWith("http") ? _src : `${getServerUrl()}${_src}`;
getBlobUrl(bareUrl, _priority) getBlobUrl(withBust(bareUrl), _priority)
.then(u => { if (id === reqId) blobUrl = u; }) .then(u => { if (myId === reqId) blobUrl = u; })
.catch(() => { if (id === reqId) blobUrl = ""; }); .catch(() => { if (myId === reqId) blobUrl = ""; });
}); });
const plainUrl = $derived(plainThumbUrl(src)); const plainUrl = $derived(plainThumbUrl(src));
const resolved = $derived(isAuth ? (blobUrl || plainUrl) || undefined : plainUrl || undefined); const resolved = $derived(isAuth ? (blobUrl || plainUrl) || undefined : plainUrl || undefined);
</script> </script>
<img src={resolved} {alt} class={cls} {loading} {decoding} {onerror} {...rest} /> <img src={resolved} {alt} class={cls} {loading} {decoding} {onerror} {...rest} />
@@ -0,0 +1,40 @@
<script lang="ts">
let {
blur = 8,
dim = 0.6,
zIndex = 'var(--z-settings)',
animate = true,
}: {
blur?: number
dim?: number
zIndex?: string | number
animate?: boolean
} = $props()
</script>
<div
class="modal-blur"
class:animate
style="--blur:{blur}px; --dim:{dim}; --z:{zIndex}"
></div>
<style>
.modal-blur {
position: fixed;
inset: 0;
backdrop-filter: blur(var(--blur));
-webkit-backdrop-filter: blur(var(--blur));
background: rgba(0, 0, 0, var(--dim));
pointer-events: none;
z-index: var(--z);
}
.modal-blur.animate {
animation: blur-in 0.14s ease both;
}
@keyframes blur-in {
from { opacity: 0 }
to { opacity: 1 }
}
</style>
@@ -10,6 +10,7 @@
import { markManyRead } from "$lib/request-manager/chapters"; import { markManyRead } from "$lib/request-manager/chapters";
import type { Tracker, TrackRecord, TrackSearch } from "$lib/types"; import type { Tracker, TrackRecord, TrackSearch } from "$lib/types";
import type { Chapter } from "$lib/types"; import type { Chapter } from "$lib/types";
import ModalBlur from '$lib/components/shared/ui/ModalBlur.svelte'
let { mangaId, mangaTitle, onClose }: { let { mangaId, mangaTitle, onClose }: {
mangaId: number; mangaId: number;
@@ -250,6 +251,7 @@
} }
}} /> }} />
<ModalBlur blur={4} dim={0.68} />
<div class="backdrop" role="presentation" onclick={(e) => { if (e.target === e.currentTarget) onClose(); }}> <div class="backdrop" role="presentation" onclick={(e) => { if (e.target === e.currentTarget) onClose(); }}>
<div class="modal" role="dialog" aria-label="Tracking"> <div class="modal" role="dialog" aria-label="Tracking">
@@ -497,6 +499,7 @@
{#if confirmUnbindId !== null} {#if confirmUnbindId !== null}
{@const rec = records.find(r => r.id === confirmUnbindId)} {@const rec = records.find(r => r.id === confirmUnbindId)}
{@const trk = rec ? trackerFor(rec.trackerId) : null} {@const trk = rec ? trackerFor(rec.trackerId) : null}
<ModalBlur blur={2} dim={0.45} zIndex="calc(var(--z-settings) + 1)" />
<div class="confirm-backdrop" role="button" tabindex="-1" aria-label="Cancel" <div class="confirm-backdrop" role="button" tabindex="-1" aria-label="Cancel"
onclick={() => confirmUnbindId = null} onclick={() => confirmUnbindId = null}
onkeydown={(e) => { if (e.key === "Escape") confirmUnbindId = null; }}> onkeydown={(e) => { if (e.key === "Escape") confirmUnbindId = null; }}>
@@ -515,10 +518,9 @@
<style> <style>
.backdrop { .backdrop {
position: fixed; inset: 0; background: rgba(0,0,0,0.68); position: fixed; inset: 0;
z-index: var(--z-settings); z-index: var(--z-settings);
display: flex; align-items: center; justify-content: center; display: flex; align-items: center; justify-content: center;
backdrop-filter: blur(4px); -webkit-backdrop-filter: blur(4px);
animation: fadeIn 0.12s ease both; animation: fadeIn 0.12s ease both;
} }
.modal { .modal {
@@ -646,7 +648,7 @@
.result-row:hover:not(:disabled) .result-action { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); } .result-row:hover:not(:disabled) .result-action { color: var(--accent-fg); border-color: var(--accent-dim); background: var(--accent-muted); }
.result-action-on { color: var(--accent-fg) !important; border-color: var(--accent-dim) !important; background: var(--accent-muted) !important; } .result-action-on { color: var(--accent-fg) !important; border-color: var(--accent-dim) !important; background: var(--accent-muted) !important; }
.confirm-backdrop { position: fixed; inset: 0; z-index: calc(var(--z-settings) + 1); background: rgba(0,0,0,0.45); backdrop-filter: blur(2px); display: flex; align-items: center; justify-content: center; animation: fadeIn 0.1s ease both; } .confirm-backdrop { position: fixed; inset: 0; z-index: calc(var(--z-settings) + 1); display: flex; align-items: center; justify-content: center; animation: fadeIn 0.1s ease both; }
.confirm-modal { background: var(--bg-surface); border: 1px solid var(--border-dim); border-radius: var(--radius-xl); padding: var(--sp-5); width: 260px; display: flex; flex-direction: column; gap: var(--sp-3); box-shadow: 0 16px 48px rgba(0,0,0,0.5); animation: scaleIn 0.15s ease both; } .confirm-modal { background: var(--bg-surface); border: 1px solid var(--border-dim); border-radius: var(--radius-xl); padding: var(--sp-5); width: 260px; display: flex; flex-direction: column; gap: var(--sp-3); box-shadow: 0 16px 48px rgba(0,0,0,0.5); animation: scaleIn 0.15s ease both; }
.confirm-title { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-primary); margin: 0; } .confirm-title { font-size: var(--text-sm); font-weight: var(--weight-medium); color: var(--text-primary); margin: 0; }
.confirm-body { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); line-height: 1.5; margin: 0; letter-spacing: var(--tracking-wide); } .confirm-body { font-family: var(--font-ui); font-size: var(--text-xs); color: var(--text-faint); line-height: 1.5; margin: 0; letter-spacing: var(--tracking-wide); }
+59 -74
View File
@@ -1,4 +1,5 @@
const DEFAULT_URL = 'http://127.0.0.1:4567' const DEFAULT_URL = 'http://127.0.0.1:4567'
const SKEW_MS = 60_000 * 2
interface AuthConfig { interface AuthConfig {
baseUrl: string baseUrl: string
@@ -10,74 +11,61 @@ interface AuthConfig {
export interface UiAuthDebugStatus { export interface UiAuthDebugStatus {
mode: 'NONE' | 'BASIC_AUTH' | 'UI_LOGIN' mode: 'NONE' | 'BASIC_AUTH' | 'UI_LOGIN'
hasSession: boolean hasSession: boolean
hasRefreshToken: boolean
accessExpiresAt: number | null accessExpiresAt: number | null
refreshExpiresAt: number | null
accessExpiresInMs: number | null accessExpiresInMs: number | null
refreshExpiresInMs: number | null
shouldRefreshSoon: boolean shouldRefreshSoon: boolean
refreshInFlight: boolean refreshInFlight: boolean
skewMs: number skewMs: number
} }
const SKEW_MS = 60_000 * 2
let config: AuthConfig = { baseUrl: DEFAULT_URL, mode: 'NONE' } let config: AuthConfig = { baseUrl: DEFAULT_URL, mode: 'NONE' }
let accessToken: string | null = null let accessToken: string | null = null
let refreshToken: string | null = null let refreshToken: string | null = null
let accessExpiresAt: number | null = null let accessExpiresAt: number | null = null
let refreshExpiresAt: number | null = null let refreshInFlight = false
let refreshInFlight = false
function parseExpiry(token: string): number | null { function parseExpiry(token: string): number | null {
try { try {
const payload = JSON.parse(atob(token.split('.')[1])) const payload = JSON.parse(atob(token.split('.')[1]))
return typeof payload.exp === 'number' ? payload.exp * 1000 : null return typeof payload.exp === 'number' ? payload.exp * 1000 : null
} catch { } catch { return null }
return null
}
} }
export const authSession = { export const authSession = {
clearTokens() { clearTokens() {
accessToken = null accessToken = null
refreshToken = null refreshToken = null
accessExpiresAt = null accessExpiresAt = null
refreshExpiresAt = null
}, },
} }
export function getUIAccessToken(): string | null { export function getUIAccessToken(): string | null { return accessToken }
return accessToken
}
export function getUiAuthDebugStatus(): UiAuthDebugStatus { export function getUiAuthDebugStatus(): UiAuthDebugStatus {
const now = Date.now() const now = Date.now()
const accessExpiresInMs = accessExpiresAt !== null ? accessExpiresAt - now : null const accessExpiresInMs = accessExpiresAt !== null ? accessExpiresAt - now : null
const refreshExpiresInMs = refreshExpiresAt !== null ? refreshExpiresAt - now : null
return { return {
mode: config.mode, mode: config.mode,
hasSession: accessToken !== null, hasSession: accessToken !== null,
hasRefreshToken: refreshToken !== null,
accessExpiresAt, accessExpiresAt,
refreshExpiresAt,
accessExpiresInMs, accessExpiresInMs,
refreshExpiresInMs, shouldRefreshSoon: accessExpiresInMs !== null && accessExpiresInMs < SKEW_MS,
shouldRefreshSoon: accessExpiresInMs !== null && accessExpiresInMs < SKEW_MS,
refreshInFlight, refreshInFlight,
skewMs: SKEW_MS, skewMs: SKEW_MS,
} }
} }
export function configureAuth( export function configureAuth(
baseUrl: string, baseUrl: string,
mode: 'NONE' | 'BASIC_AUTH' | 'UI_LOGIN', mode: 'NONE' | 'BASIC_AUTH' | 'UI_LOGIN',
user?: string, user?: string,
pass?: string, pass?: string,
): void { ): void {
config = { baseUrl: baseUrl.replace(/\/$/, ''), mode, user, pass } config = { baseUrl: baseUrl.replace(/\/$/, ''), mode, user, pass }
authSession.clearTokens() accessToken = null
refreshToken = null
accessExpiresAt = null
} }
export function authHeaders(): Record<string, string> { export function authHeaders(): Record<string, string> {
@@ -90,16 +78,18 @@ export function authHeaders(): Record<string, string> {
return {} return {}
} }
async function gqlRaw(query: string, variables?: Record<string, unknown>): Promise<unknown> { async function gql<T>(query: string, variables?: Record<string, unknown>, bare = false): Promise<T> {
const headers: Record<string, string> = { 'Content-Type': 'application/json' }
if (!bare) Object.assign(headers, authHeaders())
const res = await fetch(`${config.baseUrl}/api/graphql`, { const res = await fetch(`${config.baseUrl}/api/graphql`, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json', ...authHeaders() }, headers,
body: JSON.stringify({ query, variables }), body: JSON.stringify({ query, variables }),
}) })
if (!res.ok) throw new Error(`HTTP ${res.status}`) if (!res.ok) throw new Error(`HTTP ${res.status}`)
const json = await res.json() const json = await res.json()
if (json.errors?.length) throw new Error(json.errors[0].message) if (json.errors?.length) throw new Error(json.errors[0].message)
return json.data return json.data as T
} }
export async function probeServer(): Promise<'ok' | 'auth_required' | 'unreachable'> { export async function probeServer(): Promise<'ok' | 'auth_required' | 'unreachable'> {
@@ -107,7 +97,7 @@ export async function probeServer(): Promise<'ok' | 'auth_required' | 'unreachab
const res = await fetch(`${config.baseUrl}/api/graphql`, { const res = await fetch(`${config.baseUrl}/api/graphql`, {
method: 'POST', method: 'POST',
headers: { 'Content-Type': 'application/json', ...authHeaders() }, headers: { 'Content-Type': 'application/json', ...authHeaders() },
body: JSON.stringify({ query: '{ aboutServer { name } }' }), body: JSON.stringify({ query: '{ settings { authMode } }' }),
}) })
if (res.status === 401 || res.status === 403) return 'auth_required' if (res.status === 401 || res.status === 403) return 'auth_required'
if (!res.ok) return 'unreachable' if (!res.ok) return 'unreachable'
@@ -116,17 +106,7 @@ export async function probeServer(): Promise<'ok' | 'auth_required' | 'unreachab
/unauthorized|unauthenticated/i.test(e.message) /unauthorized|unauthenticated/i.test(e.message)
) )
return isAuthError ? 'auth_required' : 'ok' return isAuthError ? 'auth_required' : 'ok'
} catch { } catch { return 'unreachable' }
return 'unreachable'
}
}
export async function loginBasic(user: string, pass: string): Promise<void> {
config.user = user
config.pass = pass
config.mode = 'BASIC_AUTH'
const probe = await probeServer()
if (probe !== 'ok') throw new Error('Invalid credentials')
} }
const LOGIN_MUTATION = ` const LOGIN_MUTATION = `
@@ -145,30 +125,29 @@ const REFRESH_MUTATION = `
} }
` `
export async function loginUI(user: string, pass: string): Promise<void> { export async function loginBasic(user: string, pass: string): Promise<void> {
const data = await gqlRaw(LOGIN_MUTATION, { username: user, password: pass }) as { const prev = { user: config.user, pass: config.pass, mode: config.mode }
login: { accessToken: string; refreshToken: string } config.user = user
config.pass = pass
config.mode = 'BASIC_AUTH'
const probe = await probeServer()
if (probe !== 'ok') {
config.user = prev.user
config.pass = prev.pass
config.mode = prev.mode as typeof config.mode
throw new Error('Invalid credentials')
} }
accessToken = data.login.accessToken
refreshToken = data.login.refreshToken
accessExpiresAt = parseExpiry(accessToken)
refreshExpiresAt = parseExpiry(refreshToken)
config.mode = 'UI_LOGIN'
config.user = user
} }
export async function refreshAccessToken(): Promise<boolean> { export async function loginUI(user: string, pass: string): Promise<void> {
if (!refreshToken) return false const data = await gql<{ login: { accessToken: string; refreshToken: string } }>(
try { LOGIN_MUTATION, { username: user, password: pass }, true
const data = await gqlRaw(REFRESH_MUTATION, { refreshToken }) as { )
refreshToken: { accessToken: string } accessToken = data.login.accessToken
} refreshToken = data.login.refreshToken
accessToken = data.refreshToken.accessToken accessExpiresAt = parseExpiry(accessToken)
accessExpiresAt = parseExpiry(accessToken) config.mode = 'UI_LOGIN'
return true config.user = user
} catch {
return false
}
} }
export async function refreshUiAccessToken(force = false): Promise<string | null> { export async function refreshUiAccessToken(force = false): Promise<string | null> {
@@ -179,9 +158,15 @@ export async function refreshUiAccessToken(force = false): Promise<string | null
if (refreshInFlight) return accessToken if (refreshInFlight) return accessToken
refreshInFlight = true refreshInFlight = true
try { try {
const ok = await refreshAccessToken() const data = await gql<{ refreshToken: { accessToken: string } }>(
return ok ? accessToken : null REFRESH_MUTATION, { refreshToken }
)
accessToken = data.refreshToken.accessToken
accessExpiresAt = parseExpiry(accessToken)
return accessToken
} catch {
return null
} finally { } finally {
refreshInFlight = false refreshInFlight = false
} }
} }
+18 -18
View File
@@ -1,13 +1,13 @@
import { fetch as tauriFetch } from "@tauri-apps/plugin-http"; import { platformService } from "$lib/platform-service";
import { settingsState } from "$lib/state/settings.svelte"; import { settingsState } from "$lib/state/settings.svelte";
import { getUIAccessToken } from "$lib/core/auth"; import { getUIAccessToken } from "$lib/core/auth";
const cache = new Map<string, string>(); const cache = new Map<string, string>();
const inflight = new Map<string, Promise<string>>(); const inflight = new Map<string, Promise<string>>();
const MAX_CONCURRENT = 6; const MAX_CONCURRENT = 6;
let active = 0; let active = 0;
let drainScheduled = false; let drainScheduled = false;
let clearing = false; let generation = 0;
interface QueueEntry { interface QueueEntry {
url: string; url: string;
@@ -19,25 +19,24 @@ interface QueueEntry {
const queue: QueueEntry[] = []; const queue: QueueEntry[] = [];
async function getAuthHeaders(): Promise<Record<string, string>> { async function getAuthHeaders(): Promise<Record<string, string>> {
const mode = settingsState.serverAuthMode ?? "NONE"; const mode = settingsState.settings.serverAuthMode ?? "NONE";
if (mode === "UI_LOGIN") { if (mode === "UI_LOGIN") {
const token = await getUIAccessToken(); const token = getUIAccessToken();
return token ? { Authorization: `Bearer ${token}` } : {}; return token ? { Authorization: `Bearer ${token}` } : {};
} }
if (mode === "BASIC_AUTH") { if (mode === "BASIC_AUTH") {
const user = settingsState.serverAuthUser?.trim() ?? ""; const user = settingsState.settings.serverAuthUser?.trim() ?? "";
const pass = settingsState.serverAuthPass?.trim() ?? ""; const pass = settingsState.settings.serverAuthPass?.trim() ?? "";
return user && pass ? { Authorization: `Basic ${btoa(`${user}:${pass}`)}` } : {}; return user && pass ? { Authorization: `Basic ${btoa(`${user}:${pass}`)}` } : {};
} }
return {}; return {};
} }
async function doFetch(url: string): Promise<string> { async function doFetch(url: string, gen: number): Promise<string> {
const headers = await getAuthHeaders(); const headers = await getAuthHeaders();
const res = await tauriFetch(url, { method: "GET", headers }); if (gen !== generation) throw new DOMException("Cancelled", "AbortError");
if (!res.ok) throw new Error(`${res.status}`); const blob = await platformService.fetchImage(url, headers);
const blob = await res.blob(); if (gen !== generation) throw new DOMException("Cancelled", "AbortError");
if (clearing) throw new DOMException("Cancelled", "AbortError");
const blobUrl = URL.createObjectURL(blob); const blobUrl = URL.createObjectURL(blob);
cache.set(url, blobUrl); cache.set(url, blobUrl);
return blobUrl; return blobUrl;
@@ -57,8 +56,9 @@ function drain() {
drainScheduled = false; drainScheduled = false;
while (active < MAX_CONCURRENT && queue.length > 0) { while (active < MAX_CONCURRENT && queue.length > 0) {
const entry = queue.shift()!; const entry = queue.shift()!;
const gen = generation;
active++; active++;
doFetch(entry.url) doFetch(entry.url, gen)
.then(entry.resolve, entry.reject) .then(entry.resolve, entry.reject)
.finally(() => { active--; drain(); }); .finally(() => { active--; drain(); });
} }
@@ -109,6 +109,7 @@ export function preloadBlobUrls(urls: string[], basePriority = 0): void {
export function revokeBlobUrl(url: string): void { export function revokeBlobUrl(url: string): void {
const blob = cache.get(url); const blob = cache.get(url);
if (blob) { URL.revokeObjectURL(blob); cache.delete(url); } if (blob) { URL.revokeObjectURL(blob); cache.delete(url); }
inflight.delete(url);
} }
export function deprioritizeQueue(): void { export function deprioritizeQueue(): void {
@@ -125,10 +126,9 @@ export function cancelQueuedFetches(): void {
} }
export function clearBlobCache(): void { export function clearBlobCache(): void {
clearing = true; generation++;
cancelQueuedFetches(); cancelQueuedFetches();
inflight.clear();
cache.forEach(blob => URL.revokeObjectURL(blob)); cache.forEach(blob => URL.revokeObjectURL(blob));
cache.clear(); cache.clear();
inflight.clear();
clearing = false;
} }
+9 -2
View File
@@ -1,5 +1,5 @@
import { getBlobUrl, preloadBlobUrls } from "$lib/core/cache/imageCache"; import { getBlobUrl, preloadBlobUrls, revokeBlobUrl } from "$lib/core/cache/imageCache";
import { settingsState } from "$lib/state/settings.svelte"; import { settingsState } from "$lib/state/settings.svelte";
const pageCache = new Map<number, string[]>(); const pageCache = new Map<number, string[]>();
const inflight = new Map<number, Promise<string[]>>(); const inflight = new Map<number, Promise<string[]>>();
@@ -90,10 +90,17 @@ export function preloadImage(url: string, useBlob: boolean): void {
} }
export function clearResolvedUrlCache(): void { export function clearResolvedUrlCache(): void {
for (const promise of resolvedUrlCache.values()) {
promise.then(blobUrl => { if (blobUrl) revokeBlobUrl(blobUrl); }).catch(() => {});
}
resolvedUrlCache.clear(); resolvedUrlCache.clear();
aspectCache.clear(); aspectCache.clear();
} }
export function getCachedAspect(url: string): number | undefined {
return aspectCache.get(url);
}
export function clearPageCache(chapterId?: number): void { export function clearPageCache(chapterId?: number): void {
if (chapterId !== undefined) { if (chapterId !== undefined) {
pageCache.delete(chapterId); pageCache.delete(chapterId);
+37 -18
View File
@@ -1,4 +1,5 @@
import { platformService } from '$lib/platform-service' import { platformService } from '$lib/platform-service'
import { settingsState } from '$lib/state/settings.svelte'
import type { Manga } from '$lib/types/manga' import type { Manga } from '$lib/types/manga'
import type { Chapter } from '$lib/types/chapter' import type { Chapter } from '$lib/types/chapter'
@@ -9,11 +10,8 @@ const APP_BUTTONS = [
const FALLBACK_IMAGE = 'moku_logo' const FALLBACK_IMAGE = 'moku_logo'
let sessionStart: number | null = null let sessionStart: number | null = null
let activeMangaId: number | null = null
function isPublicUrl(url: string | null | undefined): boolean {
return typeof url === 'string' && url.startsWith('https://')
}
function trunc(s: string, max = 128): string { function trunc(s: string, max = 128): string {
return s.length <= max ? s : `${s.slice(0, max - 1)}` return s.length <= max ? s : `${s.slice(0, max - 1)}`
@@ -24,34 +22,54 @@ function formatChapter(chapter: Chapter): string {
return `Chapter ${Number.isInteger(n) ? n : n.toFixed(1)}` return `Chapter ${Number.isInteger(n) ? n : n.toFixed(1)}`
} }
export async function initRpc(): Promise<void> { // Suwayomi always returns the proxy path (/api/v1/manga/{id}/thumbnail), never the raw CDN URL.
if (!platformService.isSupported('discord-rpc')) return // The proxy URL is only useful to Discord when the server is publicly reachable over HTTPS.
sessionStart = Date.now() // For localhost setups cover art falls back to the app logo until Suwayomi exposes rawThumbnailUrl.
function resolveCoverUrl(manga: Manga): string {
const serverBase = (settingsState.settings.serverUrl ?? '').replace(/\/$/, '')
if (!serverBase.startsWith('https://')) return FALLBACK_IMAGE
const path = manga.thumbnailUrl?.startsWith('/') ? manga.thumbnailUrl : `/api/v1/manga/${manga.id}/thumbnail`
return `${serverBase}${path}`
} }
export async function destroyRpc(): Promise<void> { function buildPresence(manga: Manga, chapter: Chapter, coverUrl: string) {
if (!platformService.isSupported('discord-rpc')) return return {
sessionStart = null
}
export async function setReading(manga: Manga, chapter: Chapter): Promise<void> {
if (!platformService.isSupported('discord-rpc')) return
await platformService.setDiscordPresence({
details: trunc(manga.title), details: trunc(manga.title),
state: `${formatChapter(chapter)} · Reading`, state: `${formatChapter(chapter)} · Reading`,
timestamps: { start: sessionStart ?? Date.now() }, timestamps: { start: sessionStart ?? Date.now() },
assets: { assets: {
largeImage: isPublicUrl(manga.thumbnailUrl) ? manga.thumbnailUrl : FALLBACK_IMAGE, largeImage: coverUrl,
largeText: trunc(manga.title), largeText: trunc(manga.title),
smallImage: FALLBACK_IMAGE, smallImage: FALLBACK_IMAGE,
smallText: 'Moku', smallText: 'Moku',
}, },
buttons: APP_BUTTONS, buttons: APP_BUTTONS,
}) }
}
export async function initRpc(): Promise<void> {
if (!platformService.isSupported('discord-rpc')) return
if (!settingsState.settings.discordRpc) return
sessionStart = Date.now()
}
export async function destroyRpc(): Promise<void> {
if (!platformService.isSupported('discord-rpc')) return
sessionStart = null
activeMangaId = null
await platformService.clearDiscordPresence()
}
export async function setReading(manga: Manga, chapter: Chapter): Promise<void> {
if (!platformService.isSupported('discord-rpc')) return
if (!settingsState.settings.discordRpc) return
activeMangaId = manga.id
await platformService.setDiscordPresence(buildPresence(manga, chapter, resolveCoverUrl(manga)))
} }
export async function setIdle(): Promise<void> { export async function setIdle(): Promise<void> {
if (!platformService.isSupported('discord-rpc')) return if (!platformService.isSupported('discord-rpc')) return
if (!settingsState.settings.discordRpc) return
await platformService.setDiscordPresence({ await platformService.setDiscordPresence({
details: 'Browsing', details: 'Browsing',
timestamps: { start: sessionStart ?? Date.now() }, timestamps: { start: sessionStart ?? Date.now() },
@@ -62,5 +80,6 @@ export async function setIdle(): Promise<void> {
export async function clearReading(): Promise<void> { export async function clearReading(): Promise<void> {
if (!platformService.isSupported('discord-rpc')) return if (!platformService.isSupported('discord-rpc')) return
if (!settingsState.settings.discordRpc) return
await platformService.clearDiscordPresence() await platformService.clearDiscordPresence()
} }
+7 -6
View File
@@ -17,8 +17,9 @@ interface StoredVault {
data: string data: string
} }
function toB64(buf: ArrayBuffer): string { function toB64(buf: ArrayBuffer | Uint8Array): string {
return btoa(String.fromCharCode(...new Uint8Array(buf))) const bytes = buf instanceof Uint8Array ? buf : new Uint8Array(buf)
return btoa(String.fromCharCode(...bytes))
} }
function fromB64(s: string): Uint8Array { function fromB64(s: string): Uint8Array {
@@ -29,7 +30,7 @@ async function deriveKey(pin: string, salt: Uint8Array): Promise<CryptoKey> {
const enc = new TextEncoder() const enc = new TextEncoder()
const keyMat = await crypto.subtle.importKey('raw', enc.encode(pin), 'PBKDF2', false, ['deriveKey']) const keyMat = await crypto.subtle.importKey('raw', enc.encode(pin), 'PBKDF2', false, ['deriveKey'])
return crypto.subtle.deriveKey( return crypto.subtle.deriveKey(
{ name: 'PBKDF2', salt, iterations: SALT_ITERATIONS, hash: 'SHA-256' }, { name: 'PBKDF2', salt: salt.slice(), iterations: SALT_ITERATIONS, hash: 'SHA-256' },
keyMat, keyMat,
{ name: 'AES-GCM', length: 256 }, { name: 'AES-GCM', length: 256 },
false, false,
@@ -74,11 +75,11 @@ export async function unlockVault(pin: string): Promise<VaultPayload | null> {
if (!stored) return null if (!stored) return null
try { try {
const key = await deriveKey(pin, fromB64(stored.salt)) const key = await deriveKey(pin, fromB64(stored.salt).slice())
const plain = await crypto.subtle.decrypt( const plain = await crypto.subtle.decrypt(
{ name: 'AES-GCM', iv: fromB64(stored.iv) }, { name: 'AES-GCM', iv: fromB64(stored.iv).slice() },
key, key,
fromB64(stored.data), fromB64(stored.data).slice(),
) )
return JSON.parse(new TextDecoder().decode(plain)) as VaultPayload return JSON.parse(new TextDecoder().decode(plain)) as VaultPayload
} catch { } catch {
@@ -3,6 +3,7 @@ import { getCurrentWindow } from '@tauri-apps/api
import { listen } from '@tauri-apps/api/event' import { listen } from '@tauri-apps/api/event'
import { open } from '@tauri-apps/plugin-dialog' import { open } from '@tauri-apps/plugin-dialog'
import { readFile, writeFile } from '@tauri-apps/plugin-fs' import { readFile, writeFile } from '@tauri-apps/plugin-fs'
import { fetch as tauriFetch } from '@tauri-apps/plugin-http'
import { open as openUrl } from '@tauri-apps/plugin-shell' import { open as openUrl } from '@tauri-apps/plugin-shell'
import { getVersion } from '@tauri-apps/api/app' import { getVersion } from '@tauri-apps/api/app'
import { connect, disconnect, setActivity, clearActivity } from 'tauri-plugin-discord-rpc-api' import { connect, disconnect, setActivity, clearActivity } from 'tauri-plugin-discord-rpc-api'
@@ -116,6 +117,12 @@ export class TauriAdapter implements PlatformAdapter {
return invoke('get_auto_backup_dir') return invoke('get_auto_backup_dir')
} }
async fetchImage(url: string, headers: Record<string, string>): Promise<Blob> {
const res = await tauriFetch(url, { method: 'GET', headers })
if (!res.ok) throw new Error(`${res.status}`)
return res.blob()
}
async launchServer(config: ServerLaunchConfig): Promise<void> { async launchServer(config: ServerLaunchConfig): Promise<void> {
await invoke('spawn_server', { await invoke('spawn_server', {
binary: config.binary ?? '', binary: config.binary ?? '',
+2
View File
@@ -93,6 +93,8 @@ export interface PlatformAdapter {
migrateDownloads(src: string, dst: string): Promise<void> migrateDownloads(src: string, dst: string): Promise<void>
getAutoBackupDir(): Promise<string> getAutoBackupDir(): Promise<string>
fetchImage(url: string, headers: Record<string, string>): Promise<Blob>
launchServer(config: ServerLaunchConfig): Promise<void> launchServer(config: ServerLaunchConfig): Promise<void>
stopServer(): Promise<void> stopServer(): Promise<void>
getServerStatus(): Promise<'running' | 'stopped' | 'error'> getServerStatus(): Promise<'running' | 'stopped' | 'error'>
+6
View File
@@ -61,6 +61,12 @@ export class WebAdapter implements PlatformAdapter {
async migrateDownloads(_src: string, _dst: string): Promise<void> {} async migrateDownloads(_src: string, _dst: string): Promise<void> {}
async getAutoBackupDir(): Promise<string> { return '' } async getAutoBackupDir(): Promise<string> { return '' }
async fetchImage(url: string, headers: Record<string, string>): Promise<Blob> {
const res = await fetch(url, { method: 'GET', headers })
if (!res.ok) throw new Error(`${res.status}`)
return res.blob()
}
async launchServer(_config: ServerLaunchConfig): Promise<void> {} async launchServer(_config: ServerLaunchConfig): Promise<void> {}
async stopServer(): Promise<void> {} async stopServer(): Promise<void> {}
async getServerStatus(): Promise<'running' | 'stopped' | 'error'> { return 'stopped' } async getServerStatus(): Promise<'running' | 'stopped' | 'error'> { return 'stopped' }
+2
View File
@@ -42,6 +42,8 @@ export const platformService = {
migrateDownloads:(src: string, dst: string) => get().migrateDownloads(src, dst), migrateDownloads:(src: string, dst: string) => get().migrateDownloads(src, dst),
getAutoBackupDir:() => get().getAutoBackupDir(), getAutoBackupDir:() => get().getAutoBackupDir(),
fetchImage: (url: string, headers: Record<string, string>) => get().fetchImage(url, headers),
launchServer: (c: ServerLaunchConfig) => get().launchServer(c), launchServer: (c: ServerLaunchConfig) => get().launchServer(c),
stopServer: () => get().stopServer(), stopServer: () => get().stopServer(),
getServerStatus: () => get().getServerStatus(), getServerStatus: () => get().getServerStatus(),
+6 -61
View File
@@ -1,6 +1,4 @@
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import { seriesState } from "$lib/state/series.svelte";
import { readerState } from "$lib/state/reader.svelte";
import type { Chapter } from "$lib/types"; import type { Chapter } from "$lib/types";
export async function getChapters(mangaId: number, signal?: AbortSignal): Promise<Chapter[]> { export async function getChapters(mangaId: number, signal?: AbortSignal): Promise<Chapter[]> {
@@ -11,78 +9,25 @@ export async function fetchChapters(mangaId: number, signal?: AbortSignal): Prom
return getAdapter().fetchChapters(String(mangaId), signal); return getAdapter().fetchChapters(String(mangaId), signal);
} }
export async function loadChapters(mangaId: string) { export async function markChapterRead(id: number, read: boolean): Promise<void> {
seriesState.chaptersLoading = true;
seriesState.chaptersError = null;
try {
seriesState.chapters = await getAdapter().getChapters(mangaId);
} catch (e) {
seriesState.chaptersError = String(e);
} finally {
seriesState.chaptersLoading = false;
}
}
export async function loadChapterPages(chapterId: string, signal?: AbortSignal) {
readerState.pagesLoading = true;
readerState.pagesError = null;
try {
readerState.pages = await getAdapter().getChapterPages(chapterId, signal);
} catch (e) {
if (e instanceof DOMException && e.name === "AbortError") return;
readerState.pagesError = String(e);
} finally {
readerState.pagesLoading = false;
}
}
export async function markChapterRead(id: number, read: boolean) {
await getAdapter().markChapterRead(String(id), read); await getAdapter().markChapterRead(String(id), read);
const chapter = seriesState.chapters.find(c => c.id === id);
if (chapter) chapter.read = read;
} }
export async function markChaptersRead(ids: number[], read: boolean) { export async function markChaptersRead(ids: number[], read: boolean): Promise<void> {
await getAdapter().markChaptersRead(ids.map(String), read); await getAdapter().markChaptersRead(ids.map(String), read);
const idSet = new Set(ids);
for (const c of seriesState.chapters) {
if (idSet.has(c.id)) c.read = read;
}
} }
export async function markRead(id: string, read: boolean) { export async function markManyRead(ids: string[], read: boolean): Promise<void> {
await getAdapter().markChapterRead(id, read);
const numId = Number(id);
const chapter = seriesState.chapters.find(c => c.id === numId);
if (chapter) chapter.read = read;
}
export async function markManyRead(ids: string[], read: boolean) {
await getAdapter().markChaptersRead(ids, read); await getAdapter().markChaptersRead(ids, read);
const numIds = new Set(ids.map(Number));
for (const c of seriesState.chapters) {
if (numIds.has(c.id)) c.read = read;
}
} }
export async function updateChaptersProgress( export async function updateChaptersProgress(
ids: string[], ids: string[],
patch: { isRead?: boolean; isBookmarked?: boolean; lastPageRead?: number }, patch: { isRead?: boolean; isBookmarked?: boolean; lastPageRead?: number },
) { ): Promise<void> {
await getAdapter().updateChaptersProgress(ids, patch); await getAdapter().updateChaptersProgress(ids, patch);
const numIds = new Set(ids.map(Number));
for (const c of seriesState.chapters) {
if (!numIds.has(c.id)) continue;
if (patch.isRead !== undefined) c.read = patch.isRead;
if (patch.isBookmarked !== undefined) c.bookmarked = patch.isBookmarked;
if (patch.lastPageRead !== undefined) c.lastPageRead = patch.lastPageRead;
}
} }
export async function deleteDownloadedChapters(ids: number[]) { export async function deleteDownloadedChapters(ids: number[]): Promise<void> {
await getAdapter().deleteDownloadedChapters(ids.map(String)); await getAdapter().deleteDownloadedChapters(ids.map(String));
const idSet = new Set(ids);
for (const c of seriesState.chapters) {
if (idSet.has(c.id)) c.downloaded = false;
}
} }
+7 -23
View File
@@ -3,7 +3,7 @@ import { libraryState } from "$lib/state/library.svelte";
import { addToast } from "$lib/state/notifications.svelte"; import { addToast } from "$lib/state/notifications.svelte";
import { seriesState } from "$lib/state/series.svelte"; import { seriesState } from "$lib/state/series.svelte";
import type { MangaFilters, MangaMeta } from "$lib/server-adapters/types"; import type { MangaFilters, MangaMeta } from "$lib/server-adapters/types";
import type { Manga, Chapter, Category } from "$lib/types"; import type { Manga, Category } from "$lib/types";
export async function loadLibrary(filters: MangaFilters = { inLibrary: true }) { export async function loadLibrary(filters: MangaFilters = { inLibrary: true }) {
libraryState.loading = true; libraryState.loading = true;
@@ -36,28 +36,12 @@ export async function updateManga(id: number, patch: { inLibrary?: boolean }): P
if (patch.inLibrary === false) await getAdapter().removeFromLibrary(String(id)); if (patch.inLibrary === false) await getAdapter().removeFromLibrary(String(id));
} }
export async function loadManga(id: string) { export async function loadManga(id: string): Promise<Manga> {
seriesState.loading = true; return getAdapter().getManga(id);
seriesState.error = null;
try {
seriesState.current = await getAdapter().getManga(id);
} catch (e) {
seriesState.error = String(e);
} finally {
seriesState.loading = false;
}
} }
export async function fetchManga(id: string) { export async function fetchManga(id: string): Promise<Manga> {
seriesState.loading = true; return getAdapter().fetchManga(id);
seriesState.error = null;
try {
seriesState.current = await getAdapter().fetchManga(id);
} catch (e) {
seriesState.error = String(e);
} finally {
seriesState.loading = false;
}
} }
export async function searchManga(query: string, sourceId?: string) { export async function searchManga(query: string, sourceId?: string) {
@@ -84,12 +68,12 @@ export async function removeFromLibrary(mangaId: string) {
export async function updateMangaMeta(id: string, meta: Partial<MangaMeta>) { export async function updateMangaMeta(id: string, meta: Partial<MangaMeta>) {
await getAdapter().updateMangaMeta(id, meta); await getAdapter().updateMangaMeta(id, meta);
if (String(seriesState.current?.id) === id) await loadManga(id); if (String(seriesState.activeManga?.id) === id) seriesState.setActiveManga(await getAdapter().getManga(id));
} }
export async function deleteMangaMeta(id: string, key: string) { export async function deleteMangaMeta(id: string, key: string) {
await getAdapter().deleteMangaMeta(id, key); await getAdapter().deleteMangaMeta(id, key);
if (String(seriesState.current?.id) === id) await loadManga(id); if (String(seriesState.activeManga?.id) === id) seriesState.setActiveManga(await getAdapter().getManga(id));
} }
export async function refreshLibrary() { export async function refreshLibrary() {
+9
View File
@@ -1,4 +1,5 @@
import { getAdapter } from "$lib/request-manager"; import { getAdapter } from "$lib/request-manager";
import type { ValidateBackupResult, RestoreStatus } from "$lib/server-adapters/types";
export async function getAboutServer() { export async function getAboutServer() {
return getAdapter().getAboutServer(); return getAdapter().getAboutServer();
@@ -6,4 +7,12 @@ export async function getAboutServer() {
export async function getAboutWebUI() { export async function getAboutWebUI() {
return getAdapter().getAboutWebUI(); return getAdapter().getAboutWebUI();
}
export async function restoreBackup(file: File): Promise<{ id: string; status: RestoreStatus }> {
return getAdapter().restoreBackup(file);
}
export async function validateBackup(file: File): Promise<ValidateBackupResult> {
return getAdapter().validateBackup(file);
} }
+2 -2
View File
@@ -20,9 +20,9 @@ export const GET_CHAPTER = `
export const GET_RECENTLY_UPDATED = ` export const GET_RECENTLY_UPDATED = `
query GetRecentlyUpdated { query GetRecentlyUpdated {
chapters(orderBy: FETCHED_AT, orderByType: DESC, first: 300) { chapters(orderBy: FETCHED_AT, orderByType: DESC, first: 300, filter: { inLibrary: { equalTo: true } }) {
nodes { nodes {
id name chapterNumber sourceOrder isRead lastPageRead mangaId fetchedAt id name chapterNumber sourceOrder isRead isDownloaded lastPageRead mangaId fetchedAt
manga { id title thumbnailUrl inLibrary } manga { id title thumbnailUrl inLibrary }
} }
} }
+157 -41
View File
@@ -16,6 +16,8 @@ import type {
TrackRecordPatch, TrackRecordPatch,
AboutServer, AboutServer,
AboutWebUI, AboutWebUI,
RestoreStatus,
ValidateBackupResult,
} from '$lib/server-adapters/types' } from '$lib/server-adapters/types'
import type { DownloadStatus } from '$lib/types/api' import type { DownloadStatus } from '$lib/types/api'
import type { Manga, Chapter, Extension, Source, Tracker, TrackRecord, Category } from '$lib/types' import type { Manga, Chapter, Extension, Source, Tracker, TrackRecord, Category } from '$lib/types'
@@ -40,10 +42,10 @@ import {
SET_MANGA_META, SET_MANGA_META,
DELETE_MANGA_META, DELETE_MANGA_META,
CREATE_BACKUP, CREATE_BACKUP,
RESTORE_BACKUP,
FETCH_SOURCE_MANGA, FETCH_SOURCE_MANGA,
LIBRARY_UPDATE_STATUS, LIBRARY_UPDATE_STATUS,
MANGAS_BY_GENRE, MANGAS_BY_GENRE,
POLL_RESTORE_STATUS,
} from './manga' } from './manga'
import { import {
GET_CHAPTERS, GET_CHAPTERS,
@@ -101,6 +103,7 @@ import {
UPDATE_TRACK, UPDATE_TRACK,
LOGIN_TRACKER_CREDENTIALS, LOGIN_TRACKER_CREDENTIALS,
LOGOUT_TRACKER, LOGOUT_TRACKER,
LOGIN_TRACKER_OAUTH,
} from './tracking' } from './tracking'
import { import {
GET_ABOUT_SERVER, GET_ABOUT_SERVER,
@@ -110,7 +113,10 @@ import {
GET_METAS, GET_METAS,
SET_SOCKS_PROXY, SET_SOCKS_PROXY,
SET_FLARE_SOLVERR, SET_FLARE_SOLVERR,
RESTORE_BACKUP,
VALIDATE_BACKUP,
} from './meta' } from './meta'
import { authHeaders } from '$lib/core/auth'
import { import {
type GQLResponse, type GQLResponse,
mapManga, mapManga,
@@ -137,14 +143,9 @@ function mapDownloadStatus(raw: { state: string; queue: RawQueueItem[] }): Downl
export class SuwayomiAdapter implements ServerAdapter { export class SuwayomiAdapter implements ServerAdapter {
private baseUrl = 'http://127.0.0.1:4567' private baseUrl = 'http://127.0.0.1:4567'
private authHeader: string | null = null
async connect(config: ServerConfig): Promise<void> { async connect(config: ServerConfig): Promise<void> {
this.baseUrl = config.baseUrl.replace(/\/$/, '') this.baseUrl = config.baseUrl.replace(/\/$/, '')
if (config.credentials) {
const { username, password } = config.credentials
this.authHeader = 'Basic ' + btoa(`${username}:${password}`)
}
initPageCache(this.gql.bind(this), this.getServerUrl.bind(this)) initPageCache(this.gql.bind(this), this.getServerUrl.bind(this))
} }
@@ -155,9 +156,9 @@ export class SuwayomiAdapter implements ServerAdapter {
async getStatus(): Promise<ServerStatus> { async getStatus(): Promise<ServerStatus> {
try { try {
const res = await fetch(`${this.baseUrl}/api/graphql`, { const res = await fetch(`${this.baseUrl}/api/graphql`, {
method: 'POST', method: 'POST',
headers: this.headers(), headers: { 'Content-Type': 'application/json', ...authHeaders() },
body: JSON.stringify({ query: '{ aboutServer { name } }' }), body: JSON.stringify({ query: '{ aboutServer { name } }' }),
}) })
return res.ok ? 'connected' : 'error' return res.ok ? 'connected' : 'error'
} catch { } catch {
@@ -166,9 +167,7 @@ export class SuwayomiAdapter implements ServerAdapter {
} }
private headers(): Record<string, string> { private headers(): Record<string, string> {
const h: Record<string, string> = { 'Content-Type': 'application/json' } return { 'Content-Type': 'application/json', ...authHeaders() }
if (this.authHeader) h['Authorization'] = this.authHeader
return h
} }
private async gql<T>( private async gql<T>(
@@ -177,9 +176,9 @@ export class SuwayomiAdapter implements ServerAdapter {
signal?: AbortSignal, signal?: AbortSignal,
): Promise<T> { ): Promise<T> {
const res = await fetch(`${this.baseUrl}/api/graphql`, { const res = await fetch(`${this.baseUrl}/api/graphql`, {
method: 'POST', method: 'POST',
headers: this.headers(), headers: this.headers(),
body: JSON.stringify({ query, variables }), body: JSON.stringify({ query, variables }),
signal, signal,
}) })
if (!res.ok) throw new Error(`Suwayomi HTTP ${res.status}`) if (!res.ok) throw new Error(`Suwayomi HTTP ${res.status}`)
@@ -220,6 +219,26 @@ export class SuwayomiAdapter implements ServerAdapter {
return { items, hasNextPage: false } return { items, hasNextPage: false }
} }
async getMangasByGenre(
filter: Record<string, unknown>,
first: number,
offset: number,
signal?: AbortSignal,
): Promise<{ items: Manga[]; hasNextPage: boolean; totalCount: number }> {
const data = await this.gql<{
mangas: {
nodes: Record<string, unknown>[]
pageInfo: { hasNextPage: boolean }
totalCount: number
}
}>(MANGAS_BY_GENRE, { filter, first, offset }, signal)
return {
items: data.mangas.nodes.map(mapManga),
hasNextPage: data.mangas.pageInfo.hasNextPage,
totalCount: data.mangas.totalCount,
}
}
async searchManga(query: string, sourceId?: string): Promise<Manga[]> { async searchManga(query: string, sourceId?: string): Promise<Manga[]> {
if (!sourceId) return [] if (!sourceId) return []
const data = await this.gql<{ fetchSourceManga: { mangas: Record<string, unknown>[] } }>( const data = await this.gql<{ fetchSourceManga: { mangas: Record<string, unknown>[] } }>(
@@ -251,9 +270,9 @@ export class SuwayomiAdapter implements ServerAdapter {
await this.gql(DELETE_MANGA_META, { mangaId: Number(id), key }) await this.gql(DELETE_MANGA_META, { mangaId: Number(id), key })
} }
async getChapters(mangaId: string): Promise<Chapter[]> { async getChapters(mangaId: string, signal?: AbortSignal): Promise<Chapter[]> {
const data = await this.gql<{ chapters: { nodes: Record<string, unknown>[] } }>( const data = await this.gql<{ chapters: { nodes: Record<string, unknown>[] } }>(
GET_CHAPTERS, { mangaId: Number(mangaId) } GET_CHAPTERS, { mangaId: Number(mangaId) }, signal
) )
return data.chapters.nodes.map(mapChapter) return data.chapters.nodes.map(mapChapter)
} }
@@ -272,17 +291,15 @@ export class SuwayomiAdapter implements ServerAdapter {
return data.fetchChapterPages.pages.map((url, index) => ({ index, url })) return data.fetchChapterPages.pages.map((url, index) => ({ index, url }))
} }
async fetchChapters(mangaId: string): Promise<Chapter[]> { async fetchChapters(mangaId: string, signal?: AbortSignal): Promise<Chapter[]> {
const data = await this.gql<{ fetchChapters: { chapters: Record<string, unknown>[] } }>( const data = await this.gql<{ fetchChapters: { chapters: Record<string, unknown>[] } }>(
FETCH_CHAPTERS, { mangaId: Number(mangaId) } FETCH_CHAPTERS, { mangaId: Number(mangaId) }, signal
) )
return data.fetchChapters.chapters.map(mapChapter) return data.fetchChapters.chapters.map(mapChapter)
} }
async getRecentlyUpdated(): Promise<Chapter[]> { async getRecentlyUpdated(): Promise<Chapter[]> {
const data = await this.gql<{ chapters: { nodes: Record<string, unknown>[] } }>( const data = await this.gql<{ chapters: { nodes: Record<string, unknown>[] } }>(GET_RECENTLY_UPDATED)
GET_RECENTLY_UPDATED
)
return data.chapters.nodes.map(mapChapter) return data.chapters.nodes.map(mapChapter)
} }
@@ -357,9 +374,7 @@ export class SuwayomiAdapter implements ServerAdapter {
reorderChapterDownload: { downloadStatus: { state: string; queue: RawQueueItem[] } } reorderChapterDownload: { downloadStatus: { state: string; queue: RawQueueItem[] } }
}>(REORDER_DOWNLOAD, { chapterId: Number(chapterId), to }) }>(REORDER_DOWNLOAD, { chapterId: Number(chapterId), to })
return mapDownloadStatus(data.reorderChapterDownload.downloadStatus) return mapDownloadStatus(data.reorderChapterDownload.downloadStatus)
} catch { } catch { return null }
return null
}
} }
async clearDownloads(): Promise<void> { async clearDownloads(): Promise<void> {
@@ -410,6 +425,18 @@ export class SuwayomiAdapter implements ServerAdapter {
await this.gql(INSTALL_EXTERNAL_EXTENSION, { url }) await this.gql(INSTALL_EXTERNAL_EXTENSION, { url })
} }
async getExtensionRepos(): Promise<string[]> {
const data = await this.gql<{ settings: { extensionRepos: string[] } }>(GET_SETTINGS)
return data.settings.extensionRepos ?? []
}
async setExtensionRepos(repos: string[]): Promise<string[]> {
const data = await this.gql<{ setSettings: { settings: { extensionRepos: string[] } } }>(
SET_EXTENSION_REPOS, { repos }
)
return data.setSettings.settings.extensionRepos
}
async getSources(): Promise<Source[]> { async getSources(): Promise<Source[]> {
const data = await this.gql<{ sources: { nodes: Source[] } }>(GET_SOURCES) const data = await this.gql<{ sources: { nodes: Source[] } }>(GET_SOURCES)
return data.sources.nodes return data.sources.nodes
@@ -425,6 +452,29 @@ export class SuwayomiAdapter implements ServerAdapter {
} }
} }
async getSourceSettings(sourceId: string): Promise<unknown[]> {
const data = await this.gql<{ source: { preferences: unknown[] } }>(
GET_SOURCE_SETTINGS, { id: sourceId }
)
return data.source.preferences ?? []
}
async updateSourcePreference(
sourceId: string,
position: number,
changeType: string,
value: unknown,
): Promise<unknown[]> {
await this.gql(UPDATE_SOURCE_PREFERENCE, {
source: sourceId,
change: { position, [changeType]: value },
})
const data = await this.gql<{ source: { preferences: unknown[] } }>(
GET_SOURCE_SETTINGS, { id: sourceId }
)
return data.source.preferences ?? []
}
async getCategories(): Promise<Category[]> { async getCategories(): Promise<Category[]> {
const data = await this.gql<{ categories: { nodes: Record<string, unknown>[] } }>(GET_CATEGORIES) const data = await this.gql<{ categories: { nodes: Record<string, unknown>[] } }>(GET_CATEGORIES)
return data.categories.nodes.map(mapCategory) return data.categories.nodes.map(mapCategory)
@@ -441,6 +491,21 @@ export class SuwayomiAdapter implements ServerAdapter {
await this.gql(DELETE_CATEGORY, { id }) await this.gql(DELETE_CATEGORY, { id })
} }
async updateCategory(id: number, patch: { name?: string; includeInUpdate?: string; includeInDownload?: string }): Promise<Category> {
const data = await this.gql<{ updateCategory: { category: Record<string, unknown> } }>(
UPDATE_CATEGORY, { id, ...patch }
)
return mapCategory(data.updateCategory.category)
}
async updateCategories(
ids: number[],
patch: { includeInUpdate?: 'INCLUDE' | 'EXCLUDE'; includeInDownload?: 'INCLUDE' | 'EXCLUDE' },
): Promise<void> {
// Suwayomi has no bulk-category-patch mutation; fan out individually.
await Promise.all(ids.map(id => this.gql(UPDATE_CATEGORY, { id, ...patch })))
}
async updateCategoryOrder(id: number, position: number): Promise<Category[]> { async updateCategoryOrder(id: number, position: number): Promise<Category[]> {
const data = await this.gql<{ updateCategoryOrder: { categories: Record<string, unknown>[] } }>( const data = await this.gql<{ updateCategoryOrder: { categories: Record<string, unknown>[] } }>(
UPDATE_CATEGORY_ORDER, { id, position } UPDATE_CATEGORY_ORDER, { id, position }
@@ -510,6 +575,18 @@ export class SuwayomiAdapter implements ServerAdapter {
await this.gql(TRACK_PROGRESS, { mangaId: Number(mangaId) }) await this.gql(TRACK_PROGRESS, { mangaId: Number(mangaId) })
} }
async loginTrackerOAuth(trackerId: string, callbackUrl: string): Promise<void> {
await this.gql(LOGIN_TRACKER_OAUTH, { trackerId: Number(trackerId), callbackUrl })
}
async loginTrackerCredentials(trackerId: string, username: string, password: string): Promise<void> {
await this.gql(LOGIN_TRACKER_CREDENTIALS, { trackerId: Number(trackerId), username, password })
}
async logoutTracker(trackerId: string): Promise<void> {
await this.gql(LOGOUT_TRACKER, { trackerId: Number(trackerId) })
}
async getServerSecurity(): Promise<ServerSecurity> { async getServerSecurity(): Promise<ServerSecurity> {
const data = await this.gql<{ settings: ServerSecurity }>(GET_SERVER_SECURITY) const data = await this.gql<{ settings: ServerSecurity }>(GET_SERVER_SECURITY)
return data.settings return data.settings
@@ -546,26 +623,59 @@ export class SuwayomiAdapter implements ServerAdapter {
} }
} }
async getMangasByGenre( async getDownloadsPath(): Promise<{ downloadsPath: string; localSourcePath: string }> {
filter: Record<string, unknown>, const data = await this.gql<{ settings: { downloadsPath: string | null; localSourcePath: string | null } }>(
first: number, GET_DOWNLOADS_PATH
offset: number, )
signal?: AbortSignal,
): Promise<{ items: Manga[]; hasNextPage: boolean; totalCount: number }> {
const data = await this.gql<{
mangas: {
nodes: Record<string, unknown>[]
pageInfo: { hasNextPage: boolean }
totalCount: number
}
}>(MANGAS_BY_GENRE, { filter, first, offset }, signal)
return { return {
items: data.mangas.nodes.map(mapManga), downloadsPath: data.settings.downloadsPath ?? '',
hasNextPage: data.mangas.pageInfo.hasNextPage, localSourcePath: data.settings.localSourcePath ?? '',
totalCount: data.mangas.totalCount,
} }
} }
async setDownloadsPath(path: string): Promise<void> {
await this.gql(SET_DOWNLOADS_PATH, { path })
}
async setLocalSourcePath(path: string): Promise<void> {
await this.gql(SET_LOCAL_SOURCE_PATH, { path })
}
async createBackup(): Promise<{ url: string }> {
const data = await this.gql<{ createBackup: { url: string } }>(CREATE_BACKUP)
return data.createBackup
}
private multipartGql<T>(query: string, file: File): Promise<T> {
const form = new FormData()
form.append('operations', JSON.stringify({ query, variables: { backup: null } }))
form.append('map', JSON.stringify({ '0': ['variables.backup'] }))
form.append('0', file, file.name)
const headers: Record<string, string> = { Accept: 'application/json', ...authHeaders() }
return fetch(`${this.baseUrl}/api/graphql`, { method: 'POST', headers, body: form })
.then(r => { if (!r.ok) throw new Error(`Suwayomi HTTP ${r.status}`); return r.json() })
.then((json: GQLResponse<T>) => { if (json.errors?.length) throw new Error(json.errors[0].message); return json.data })
}
async restoreBackup(file: File): Promise<{ id: string; status: RestoreStatus }> {
const data = await this.multipartGql<{ restoreBackup: { id: string; status: RestoreStatus } }>(RESTORE_BACKUP, file)
return data.restoreBackup
}
async validateBackup(file: File): Promise<ValidateBackupResult> {
const data = await this.multipartGql<{ validateBackup: ValidateBackupResult }>(VALIDATE_BACKUP, file)
return data.validateBackup
}
async pollRestoreStatus(id: string): Promise<RestoreStatus> {
const data = await this.gql<{ restoreStatus: RestoreStatus }>(POLL_RESTORE_STATUS, { id })
return data.restoreStatus
}
async clearCachedImages(opts: { cachedPages: boolean; cachedThumbnails: boolean; downloadedThumbnails: boolean }): Promise<void> {
await this.gql(CLEAR_CACHED_IMAGES, opts)
}
async checkForUpdates(mangaIds?: string[]): Promise<UpdateResult[]> { async checkForUpdates(mangaIds?: string[]): Promise<UpdateResult[]> {
if (mangaIds?.length) { if (mangaIds?.length) {
const results: UpdateResult[] = [] const results: UpdateResult[] = []
@@ -581,6 +691,10 @@ export class SuwayomiAdapter implements ServerAdapter {
return [] return []
} }
async startLibraryUpdate(): Promise<void> {
await this.gql(UPDATE_LIBRARY)
}
async stopLibraryUpdate(): Promise<void> { async stopLibraryUpdate(): Promise<void> {
await this.gql(UPDATE_STOP) await this.gql(UPDATE_STOP)
} }
@@ -590,9 +704,11 @@ export class SuwayomiAdapter implements ServerAdapter {
libraryUpdateStatus: { libraryUpdateStatus: {
jobsInfo: { isRunning: boolean; finishedJobs: number; totalJobs: number } jobsInfo: { isRunning: boolean; finishedJobs: number; totalJobs: number }
} }
lastUpdateTimestamp: { timestamp: string } | null
}>(LIBRARY_UPDATE_STATUS) }>(LIBRARY_UPDATE_STATUS)
const { isRunning, finishedJobs, totalJobs } = data.libraryUpdateStatus.jobsInfo const { isRunning, finishedJobs, totalJobs } = data.libraryUpdateStatus.jobsInfo
return { isRunning, finishedJobs, totalJobs } const lastUpdated = data.lastUpdateTimestamp ? Number(data.lastUpdateTimestamp.timestamp) : undefined
return { isRunning, finishedJobs, totalJobs, lastUpdated }
} }
clearPageCache(chapterId?: number): void { clearPageCache(chapterId?: number): void {
+19 -4
View File
@@ -59,7 +59,7 @@ export const LIBRARY_UPDATE_STATUS = `
export const MANGAS_BY_GENRE = ` export const MANGAS_BY_GENRE = `
query MangasByGenre($filter: MangaFilterInput, $first: Int, $offset: Int) { query MangasByGenre($filter: MangaFilterInput, $first: Int, $offset: Int) {
mangas(filter: $filter, first: $first, offset: $offset, orderBy: IN_LIBRARY_AT, orderByType: DESC) { mangas(filter: $filter, first: $first, offset: $offset) {
nodes { nodes {
id title thumbnailUrl inLibrary genre status id title thumbnailUrl inLibrary genre status
source { id displayName } source { id displayName }
@@ -76,6 +76,12 @@ export const GET_DOWNLOADS_PATH = `
} }
` `
export const POLL_RESTORE_STATUS = `
query PollRestoreStatus($id: String!) {
restoreStatus(id: $id) { mangaProgress state totalManga }
}
`
export const FETCH_MANGA = ` export const FETCH_MANGA = `
mutation FetchManga($id: Int!) { mutation FetchManga($id: Int!) {
fetchManga(input: { id: $id }) { fetchManga(input: { id: $id }) {
@@ -128,9 +134,9 @@ export const CREATE_CATEGORY = `
` `
export const UPDATE_CATEGORY = ` export const UPDATE_CATEGORY = `
mutation UpdateCategory($id: Int!, $name: String) { mutation UpdateCategory($id: Int!, $name: String, $includeInUpdate: IncludeOrExclude, $includeInDownload: IncludeOrExclude) {
updateCategory(input: { id: $id, patch: { name: $name } }) { updateCategory(input: { id: $id, patch: { name: $name, includeInUpdate: $includeInUpdate, includeInDownload: $includeInDownload } }) {
category { id name order } category { id name order includeInUpdate includeInDownload }
} }
} }
` `
@@ -214,6 +220,15 @@ export const RESTORE_BACKUP = `
} }
` `
export const VALIDATE_BACKUP = `
query ValidateBackup($backup: Upload!) {
validateBackup(input: { backup: $backup }) {
missingSources { id name }
missingTrackers { name }
}
}
`
export const FETCH_SOURCE_MANGA = ` export const FETCH_SOURCE_MANGA = `
mutation FetchSourceManga($source: LongString!, $type: FetchSourceMangaType!, $page: Int!, $query: String, $filters: [FilterChangeInput!]) { mutation FetchSourceManga($source: LongString!, $type: FetchSourceMangaType!, $page: Int!, $query: String, $filters: [FilterChangeInput!]) {
fetchSourceManga(input: { source: $source, type: $type, page: $page, query: $query, filters: $filters }) { fetchSourceManga(input: { source: $source, type: $type, page: $page, query: $query, filters: $filters }) {
+22
View File
@@ -60,6 +60,28 @@ export const SET_SOCKS_PROXY = `
} }
` `
export const RESTORE_BACKUP = `
mutation RestoreBackup($backup: Upload!) {
restoreBackup(input: { backup: $backup }) {
id status { mangaProgress state totalManga }
}
}
`
export const VALIDATE_BACKUP = `
query ValidateBackup($backup: Upload!) {
validateBackup(input: { backup: $backup }) {
missingSources { id name } missingTrackers { name }
}
}
`
export const CREATE_BACKUP = `
mutation CreateBackup {
createBackup(input: {}) { url }
}
`
export const SET_FLARE_SOLVERR = ` export const SET_FLARE_SOLVERR = `
mutation SetFlareSolverr( mutation SetFlareSolverr(
$flareSolverrEnabled: Boolean! $flareSolverrEnabled: Boolean!
@@ -114,6 +114,14 @@ export const LOGIN_TRACKER_CREDENTIALS = `
} }
` `
export const LOGIN_TRACKER_OAUTH = `
mutation LoginTrackerOAuth($trackerId: Int!, $callbackUrl: String!) {
loginTrackerOAuth(input: { trackerId: $trackerId, callbackUrl: $callbackUrl }) {
isLoggedIn
}
}
`
export const LOGOUT_TRACKER = ` export const LOGOUT_TRACKER = `
mutation LogoutTracker($trackerId: Int!) { mutation LogoutTracker($trackerId: Int!) {
logoutTracker(input: { trackerId: $trackerId }) { logoutTracker(input: { trackerId: $trackerId }) {
+33 -2
View File
@@ -77,6 +77,7 @@ export interface LibraryUpdateProgress {
isRunning: boolean isRunning: boolean
finishedJobs: number finishedJobs: number
totalJobs: number totalJobs: number
lastUpdated?: number
} }
export interface ServerSecurity { export interface ServerSecurity {
@@ -128,6 +129,17 @@ export interface TrackRecordPatch {
private?: boolean private?: boolean
} }
export interface RestoreStatus {
mangaProgress: number
state: string
totalManga: number
}
export interface ValidateBackupResult {
missingSources: { id: string; name: string }[]
missingTrackers: { name: string }[]
}
export interface ServerAdapter { export interface ServerAdapter {
connect(config: ServerConfig): Promise<void> connect(config: ServerConfig): Promise<void>
getStatus(): Promise<ServerStatus> getStatus(): Promise<ServerStatus>
@@ -135,7 +147,9 @@ export interface ServerAdapter {
getManga(id: string, signal?: AbortSignal): Promise<Manga> getManga(id: string, signal?: AbortSignal): Promise<Manga>
getMangaList(filters: MangaFilters): Promise<PaginatedResult<Manga>> getMangaList(filters: MangaFilters): Promise<PaginatedResult<Manga>>
getMangasByGenre(filter: Record<string, unknown>, first: number, offset: number, signal?: AbortSignal): Promise<{ items: Manga[]; hasNextPage: boolean; totalCount: number }>
searchManga(query: string, sourceId?: string): Promise<Manga[]> searchManga(query: string, sourceId?: string): Promise<Manga[]>
searchSource(sourceId: string, query: string, page?: number, signal?: AbortSignal): Promise<PaginatedResult<Manga>>
fetchManga(id: string): Promise<Manga> fetchManga(id: string): Promise<Manga>
addToLibrary(mangaId: string): Promise<void> addToLibrary(mangaId: string): Promise<void>
removeFromLibrary(mangaId: string): Promise<void> removeFromLibrary(mangaId: string): Promise<void>
@@ -143,10 +157,10 @@ export interface ServerAdapter {
updateMangaMeta(id: string, meta: Partial<MangaMeta>): Promise<void> updateMangaMeta(id: string, meta: Partial<MangaMeta>): Promise<void>
deleteMangaMeta(id: string, key: string): Promise<void> deleteMangaMeta(id: string, key: string): Promise<void>
getChapters(mangaId: string): Promise<Chapter[]> getChapters(mangaId: string, signal?: AbortSignal): Promise<Chapter[]>
getChapter(id: string): Promise<Chapter> getChapter(id: string): Promise<Chapter>
getChapterPages(id: string, signal?: AbortSignal): Promise<Page[]> getChapterPages(id: string, signal?: AbortSignal): Promise<Page[]>
fetchChapters(mangaId: string): Promise<Chapter[]> fetchChapters(mangaId: string, signal?: AbortSignal): Promise<Chapter[]>
getRecentlyUpdated(): Promise<Chapter[]> getRecentlyUpdated(): Promise<Chapter[]>
markChapterRead(id: string, read: boolean): Promise<void> markChapterRead(id: string, read: boolean): Promise<void>
markChaptersRead(ids: string[], read: boolean): Promise<void> markChaptersRead(ids: string[], read: boolean): Promise<void>
@@ -175,9 +189,13 @@ export interface ServerAdapter {
updateExtension(id: string): Promise<void> updateExtension(id: string): Promise<void>
updateExtensions(ids: string[]): Promise<void> updateExtensions(ids: string[]): Promise<void>
installExternalExtension(url: string): Promise<void> installExternalExtension(url: string): Promise<void>
getExtensionRepos(): Promise<string[]>
setExtensionRepos(repos: string[]): Promise<string[]>
getSources(): Promise<Source[]> getSources(): Promise<Source[]>
browseSource(sourceId: string, page: number): Promise<PaginatedResult<Manga>> browseSource(sourceId: string, page: number): Promise<PaginatedResult<Manga>>
getSourceSettings(sourceId: string): Promise<unknown[]>
updateSourcePreference(sourceId: string, position: number, changeType: string, value: unknown): Promise<unknown[]>
getCategories(): Promise<Category[]> getCategories(): Promise<Category[]>
createCategory(name: string): Promise<Category> createCategory(name: string): Promise<Category>
@@ -196,13 +214,26 @@ export interface ServerAdapter {
updateTrackRecord(recordId: string, patch: TrackRecordPatch): Promise<TrackRecord> updateTrackRecord(recordId: string, patch: TrackRecordPatch): Promise<TrackRecord>
fetchTrackRecord(recordId: string): Promise<TrackRecord> fetchTrackRecord(recordId: string): Promise<TrackRecord>
syncTracking(mangaId: string): Promise<void> syncTracking(mangaId: string): Promise<void>
loginTrackerOAuth(trackerId: string, callbackUrl: string): Promise<void>
loginTrackerCredentials(trackerId: string, username: string, password: string): Promise<void>
logoutTracker(trackerId: string): Promise<void>
getServerSecurity(): Promise<ServerSecurity> getServerSecurity(): Promise<ServerSecurity>
setServerAuth(input: SetServerAuthInput): Promise<void> setServerAuth(input: SetServerAuthInput): Promise<void>
setSocksProxy(input: SetSocksProxyInput): Promise<void> setSocksProxy(input: SetSocksProxyInput): Promise<void>
setFlareSolverr(input: SetFlareSolverrInput): Promise<void> setFlareSolverr(input: SetFlareSolverrInput): Promise<void>
getDownloadsPath(): Promise<{ downloadsPath: string; localSourcePath: string }>
setDownloadsPath(path: string): Promise<void>
setLocalSourcePath(path: string): Promise<void>
createBackup(): Promise<{ url: string }>
restoreBackup(file: File): Promise<{ id: string; status: RestoreStatus }>
validateBackup(file: File): Promise<ValidateBackupResult>
pollRestoreStatus(id: string): Promise<RestoreStatus>
clearCachedImages(opts: { cachedPages: boolean; cachedThumbnails: boolean; downloadedThumbnails: boolean }): Promise<void>
checkForUpdates(mangaIds?: string[]): Promise<UpdateResult[]> checkForUpdates(mangaIds?: string[]): Promise<UpdateResult[]>
startLibraryUpdate(): Promise<void>
stopLibraryUpdate(): Promise<void> stopLibraryUpdate(): Promise<void>
getLibraryUpdateStatus(): Promise<LibraryUpdateProgress> getLibraryUpdateStatus(): Promise<LibraryUpdateProgress>
clearPageCache(chapterId?: number): void clearPageCache(chapterId?: number): void

Some files were not shown because too many files have changed in this diff Show More