Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
67cf3044f1 | ||
|
|
66be35c3d4 | ||
|
|
046cfe62b8 | ||
|
|
e3dcbec1f2 | ||
|
|
99abc8f205 | ||
|
|
3638e0e5df | ||
|
|
aef182e7e8 | ||
|
|
6853725ca0 | ||
|
|
4c80076762 | ||
|
|
52d27ec996 | ||
|
|
66eb1b49a1 | ||
|
|
22425e0bad | ||
|
|
50481e6aed | ||
|
|
bedbe0ef52 | ||
|
|
7914cf4dc1 | ||
|
|
39a7f3cc38 | ||
|
|
630f07a462 | ||
|
|
9cba54df14 | ||
|
|
4ff8ae303c | ||
|
|
6c2ec83cb1 | ||
|
|
677ab2d928 | ||
|
|
fb32d6c850 | ||
|
|
110f97caf9 | ||
|
|
0563c91b9e | ||
|
|
3b9f4b549c | ||
|
|
d5c819ee94 | ||
|
|
153859a735 | ||
|
|
1c61aadb22 | ||
|
|
8d40b211ed | ||
|
|
6229a59561 | ||
|
|
cfd654b267 | ||
|
|
0bc7cba428 | ||
|
|
65ecc099b6 | ||
|
|
65a6ae9373 | ||
|
|
2fbbd0e090 | ||
|
|
eee45bc8f8 | ||
|
|
1c8df80c27 | ||
|
|
5673a44310 | ||
|
|
c63f08ac91 | ||
|
|
f2e69dc852 | ||
|
|
8a1807c262 | ||
|
|
47b33cdb91 | ||
|
|
2d7d895dda | ||
|
|
0d33799199 | ||
|
|
2ac906cf37 | ||
|
|
cf065fc5fe | ||
|
|
55ee412a1b | ||
|
|
2275df40a8 | ||
|
|
78ffafe21a | ||
|
|
6e09129d0c | ||
|
|
476fec8c04 | ||
|
|
7af0969e38 | ||
|
|
3df0644bd8 | ||
|
|
5d079b05c9 | ||
|
|
4d44db0949 | ||
|
|
4a54af3245 | ||
|
|
7e734dbf19 | ||
|
|
e7eeaa518f | ||
|
|
39866bee8d | ||
|
|
85092fa893 | ||
|
|
2128a2d705 | ||
|
|
558446b9e4 |
No files matched your search
@@ -3,7 +3,15 @@ name: Android
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
tags: ['v*']
|
||||
# A `v*` tag reaches this workflow through release.yml, which calls it and
|
||||
# publishes the signed APK. Triggering on the tag here as well would build
|
||||
# the release twice.
|
||||
workflow_call:
|
||||
inputs:
|
||||
signed_release:
|
||||
required: false
|
||||
default: false
|
||||
type: boolean
|
||||
pull_request:
|
||||
paths:
|
||||
- 'android/**'
|
||||
@@ -31,8 +39,8 @@ env:
|
||||
CARGO_TERM_COLOR: always
|
||||
ANDROID_API: '36'
|
||||
ANDROID_BUILD_TOOLS: '37.0.0'
|
||||
ANDROID_NDK: '29.0.14206865'
|
||||
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/29.0.14206865
|
||||
ANDROID_NDK: '30.0.16248370'
|
||||
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/30.0.16248370
|
||||
|
||||
jobs:
|
||||
build:
|
||||
@@ -74,14 +82,23 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: '17'
|
||||
|
||||
# The action's default `packages` includes `tools`, which cmdline-tools
|
||||
# 16.0 no longer offers, so sdkmanager exits 1. The SDK pieces this
|
||||
# build needs are installed explicitly below.
|
||||
- uses: android-actions/setup-android@v3
|
||||
with:
|
||||
packages: platform-tools
|
||||
log-accepted-android-sdk-licenses: false
|
||||
|
||||
- name: Install native build prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install --no-install-recommends \
|
||||
autoconf automake build-essential cmake curl git gperf libtool \
|
||||
meson nasm ninja-build pkg-config python3 unzip wget xz-utils yasm
|
||||
autoconf automake build-essential cmake curl git gperf libdbus-1-dev \
|
||||
libtool nasm ninja-build pkg-config python3 unzip wget xz-utils yasm
|
||||
# Not apt's meson: noble ships 1.3.2, and the fontconfig that the pinned
|
||||
# mpv-android revision builds requires >= 1.11.
|
||||
pipx install meson==1.12.1
|
||||
|
||||
- name: Install Android SDK and NDK
|
||||
run: >-
|
||||
@@ -90,12 +107,53 @@ jobs:
|
||||
"build-tools;${ANDROID_BUILD_TOOLS}"
|
||||
"ndk;${ANDROID_NDK}"
|
||||
|
||||
- uses: dtolnay/rust-toolchain@stable
|
||||
- id: toolchain
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
toolchain: '1.96'
|
||||
targets: aarch64-linux-android,x86_64-linux-android
|
||||
|
||||
# The registry and the installed helpers only. rust-cache reads
|
||||
# `target/android/<triple>` as a profile directory and deletes the
|
||||
# `release` tree under it before saving, so with its target caching on
|
||||
# every run rebuilt both ABIs from scratch.
|
||||
- uses: Swatinem/rust-cache@v2.9.1
|
||||
with:
|
||||
shared-key: android-registry
|
||||
cache-targets: false
|
||||
cache-on-failure: true
|
||||
|
||||
# The target directory as is: the host build the UniFFI bindings come
|
||||
# from and both cargo-ndk ABIs. One entry for both jobs, since the signed
|
||||
# build compiles the same crates for the same targets. A new lockfile
|
||||
# starts from the last one's tree, so a version bump rebuilds only the
|
||||
# workspace crates.
|
||||
- id: target
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: target
|
||||
key: rust-target-android-${{ steps.toolchain.outputs.cachekey }}-${{ hashFiles('Cargo.lock') }}
|
||||
restore-keys: rust-target-android-${{ steps.toolchain.outputs.cachekey }}-
|
||||
|
||||
# libmpv and its dependency tree are the slowest part of the build, and
|
||||
# depend only on the pinned revision and the build script, which stamps
|
||||
# its output with both and skips the build when the stamp matches. Built
|
||||
# and saved in steps of its own, so a later failure in Gradle does not
|
||||
# discard it the way a post-job cache save would.
|
||||
- id: libmpv
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: android/app/build/generated/mpv
|
||||
key: libmpv-${{ hashFiles('scripts/build-libmpv-android.sh') }}
|
||||
|
||||
- name: Build libmpv
|
||||
run: bash scripts/build-libmpv-android.sh
|
||||
|
||||
- if: steps.libmpv.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: android/app/build/generated/mpv
|
||||
key: ${{ steps.libmpv.outputs.cache-primary-key }}
|
||||
|
||||
- uses: gradle/actions/setup-gradle@v4
|
||||
with:
|
||||
@@ -124,9 +182,15 @@ jobs:
|
||||
- name: Android checks and artifacts
|
||||
run: bash scripts/build-android.sh all
|
||||
|
||||
- if: steps.target.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: target
|
||||
key: ${{ steps.target.outputs.cache-primary-key }}
|
||||
|
||||
signed-release:
|
||||
name: Signed release
|
||||
if: false
|
||||
if: startsWith(github.ref, 'refs/tags/v') || inputs.signed_release
|
||||
needs: build
|
||||
runs-on: ubuntu-24.04
|
||||
env:
|
||||
@@ -141,14 +205,23 @@ jobs:
|
||||
distribution: temurin
|
||||
java-version: '17'
|
||||
|
||||
# The action's default `packages` includes `tools`, which cmdline-tools
|
||||
# 16.0 no longer offers, so sdkmanager exits 1. The SDK pieces this
|
||||
# build needs are installed explicitly below.
|
||||
- uses: android-actions/setup-android@v3
|
||||
with:
|
||||
packages: platform-tools
|
||||
log-accepted-android-sdk-licenses: false
|
||||
|
||||
- name: Install native build prerequisites
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install --no-install-recommends \
|
||||
autoconf automake build-essential cmake curl git gperf libtool \
|
||||
meson nasm ninja-build pkg-config python3 unzip wget xz-utils yasm
|
||||
autoconf automake build-essential cmake curl git gperf libdbus-1-dev \
|
||||
libtool nasm ninja-build pkg-config python3 unzip wget xz-utils yasm
|
||||
# Not apt's meson: noble ships 1.3.2, and the fontconfig that the pinned
|
||||
# mpv-android revision builds requires >= 1.11.
|
||||
pipx install meson==1.12.1
|
||||
|
||||
- name: Install Android SDK and NDK
|
||||
run: >-
|
||||
@@ -157,12 +230,53 @@ jobs:
|
||||
"build-tools;${ANDROID_BUILD_TOOLS}"
|
||||
"ndk;${ANDROID_NDK}"
|
||||
|
||||
- uses: dtolnay/rust-toolchain@stable
|
||||
- id: toolchain
|
||||
uses: dtolnay/rust-toolchain@stable
|
||||
with:
|
||||
toolchain: '1.96'
|
||||
targets: aarch64-linux-android,x86_64-linux-android
|
||||
|
||||
# The registry and the installed helpers only. rust-cache reads
|
||||
# `target/android/<triple>` as a profile directory and deletes the
|
||||
# `release` tree under it before saving, so with its target caching on
|
||||
# every run rebuilt both ABIs from scratch.
|
||||
- uses: Swatinem/rust-cache@v2.9.1
|
||||
with:
|
||||
shared-key: android-registry
|
||||
cache-targets: false
|
||||
cache-on-failure: true
|
||||
|
||||
# The target directory as is: the host build the UniFFI bindings come
|
||||
# from and both cargo-ndk ABIs. One entry for both jobs, since the signed
|
||||
# build compiles the same crates for the same targets. A new lockfile
|
||||
# starts from the last one's tree, so a version bump rebuilds only the
|
||||
# workspace crates.
|
||||
- id: target
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: target
|
||||
key: rust-target-android-${{ steps.toolchain.outputs.cachekey }}-${{ hashFiles('Cargo.lock') }}
|
||||
restore-keys: rust-target-android-${{ steps.toolchain.outputs.cachekey }}-
|
||||
|
||||
# libmpv and its dependency tree are the slowest part of the build, and
|
||||
# depend only on the pinned revision and the build script, which stamps
|
||||
# its output with both and skips the build when the stamp matches. Built
|
||||
# and saved in steps of its own, so a later failure in Gradle does not
|
||||
# discard it the way a post-job cache save would.
|
||||
- id: libmpv
|
||||
uses: actions/cache/restore@v6
|
||||
with:
|
||||
path: android/app/build/generated/mpv
|
||||
key: libmpv-${{ hashFiles('scripts/build-libmpv-android.sh') }}
|
||||
|
||||
- name: Build libmpv
|
||||
run: bash scripts/build-libmpv-android.sh
|
||||
|
||||
- if: steps.libmpv.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: android/app/build/generated/mpv
|
||||
key: ${{ steps.libmpv.outputs.cache-primary-key }}
|
||||
|
||||
- uses: gradle/actions/setup-gradle@v4
|
||||
with:
|
||||
@@ -188,10 +302,30 @@ jobs:
|
||||
- name: Build signed APK and AAB
|
||||
run: bash scripts/build-android.sh signed
|
||||
|
||||
- if: steps.target.outputs.cache-hit != 'true'
|
||||
uses: actions/cache/save@v6
|
||||
with:
|
||||
path: target
|
||||
key: ${{ steps.target.outputs.cache-primary-key }}
|
||||
|
||||
# The APK bundles a GPL libmpv, so its corresponding source ships next to
|
||||
# it. The AAB is for Play only and stays out of the GitHub release.
|
||||
- name: Stage release files
|
||||
run: |
|
||||
version="$(sed -n 's/^version = "\([^"]*\)"/\1/p' Cargo.toml | head -n1)"
|
||||
mkdir -p dist/android
|
||||
cp android/app/build/outputs/apk/release/app-release.apk \
|
||||
"dist/android/proton-stream-$version-android.apk"
|
||||
cp android/app/build/generated/mpv/mpv-android-source-*.tar.gz dist/android/
|
||||
|
||||
- uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: android-signed
|
||||
path: |
|
||||
android/app/build/outputs/apk/release/*.apk
|
||||
android/app/build/outputs/bundle/release/*.aab
|
||||
name: android
|
||||
path: dist/android/*
|
||||
if-no-files-found: error
|
||||
|
||||
- uses: actions/upload-artifact@v7
|
||||
with:
|
||||
name: android-bundle
|
||||
path: android/app/build/outputs/bundle/release/*.aab
|
||||
if-no-files-found: error
|
||||
@@ -20,9 +20,6 @@ permissions:
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
# Android remains a workflow artifact only until the native libmpv adapter,
|
||||
# corresponding-source bundle, and on-device verification are complete.
|
||||
ANDROID_PUBLIC_RELEASE_ENABLED: 'false'
|
||||
|
||||
jobs:
|
||||
verify:
|
||||
@@ -60,11 +57,6 @@ jobs:
|
||||
! grep -q '^\[patch\.crates-io\]' Cargo.toml ||
|
||||
{ echo "::error::Cargo.toml carries [patch.crates-io]; releases build against the registry"; exit 1; }
|
||||
|
||||
- name: Android publication remains blocked
|
||||
run: |
|
||||
test "$ANDROID_PUBLIC_RELEASE_ENABLED" = false
|
||||
echo "Android APK/AAB publication is blocked until native playback is release-ready."
|
||||
|
||||
linux:
|
||||
name: Linux artifacts
|
||||
needs: verify
|
||||
@@ -148,25 +140,38 @@ jobs:
|
||||
dist/*.msi
|
||||
if-no-files-found: error
|
||||
|
||||
# The signed APK plus the corresponding source of the libmpv it bundles. The
|
||||
# keystore and its passwords come from the ANDROID_RELEASE_* secrets.
|
||||
android:
|
||||
name: Android
|
||||
needs: verify
|
||||
uses: ./.github/workflows/android.yml
|
||||
with:
|
||||
signed_release: true
|
||||
secrets: inherit
|
||||
|
||||
publish:
|
||||
name: Publish desktop artifacts
|
||||
name: Publish
|
||||
if: startsWith(github.ref, 'refs/tags/')
|
||||
needs: [linux, windows]
|
||||
needs: [linux, windows, android]
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: write
|
||||
steps:
|
||||
# By name: the Android workflow also uploads the AAB, which is for Play
|
||||
# and does not belong on the release.
|
||||
- uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: linux
|
||||
path: artifacts
|
||||
- uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: windows
|
||||
path: artifacts
|
||||
- uses: actions/download-artifact@v8
|
||||
with:
|
||||
name: android
|
||||
path: artifacts
|
||||
merge-multiple: true
|
||||
|
||||
- name: Refuse mobile artifacts while Android publishing is blocked
|
||||
run: |
|
||||
if find artifacts -type f \( -name '*.apk' -o -name '*.aab' \) -print -quit | grep -q .; then
|
||||
echo "::error::Android publishing is disabled while native playback remains incomplete"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Checksums
|
||||
run: |
|
||||
|
||||
@@ -20,3 +20,9 @@
|
||||
/packaging/pkg/
|
||||
/packaging/src/
|
||||
/packaging/*.pkg.tar.zst
|
||||
|
||||
# iOS generated state: XcodeGen owns the project and the Info.plist, and
|
||||
# scripts/build-ios.sh writes the bindings and DerivedData under ios/build.
|
||||
/ios/build/
|
||||
/ios/*.xcodeproj/
|
||||
/ios/ProtonStream/Info.plist
|
||||
@@ -119,12 +119,6 @@ dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "allocator-api2"
|
||||
version = "0.2.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
|
||||
|
||||
[[package]]
|
||||
name = "android-activity"
|
||||
version = "0.6.1"
|
||||
@@ -1767,6 +1761,15 @@ dependencies = [
|
||||
"unicode-segmentation",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui-phosphor"
|
||||
version = "0.13.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "249826f9529c1757d71dbbb3a22ec101b21110ab663c45fb771c2b86121379e4"
|
||||
dependencies = [
|
||||
"egui",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "egui-wgpu"
|
||||
version = "0.35.0"
|
||||
@@ -2061,12 +2064,6 @@ version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||
|
||||
[[package]]
|
||||
name = "foldhash"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
|
||||
|
||||
[[package]]
|
||||
name = "foldhash"
|
||||
version = "0.2.0"
|
||||
@@ -2352,7 +2349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d99fc21d493812643aae86d53b7bbd02f376434a90317e8a790bc209fdd6605e"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"foldhash 0.2.0",
|
||||
"foldhash",
|
||||
"hashbrown 0.17.1",
|
||||
"log",
|
||||
"peniko",
|
||||
@@ -2528,24 +2525,13 @@ dependencies = [
|
||||
"ahash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.15.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
|
||||
dependencies = [
|
||||
"allocator-api2",
|
||||
"equivalent",
|
||||
"foldhash 0.1.5",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "hashbrown"
|
||||
version = "0.16.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
|
||||
dependencies = [
|
||||
"foldhash 0.2.0",
|
||||
"foldhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2554,7 +2540,7 @@ version = "0.17.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
|
||||
dependencies = [
|
||||
"foldhash 0.2.0",
|
||||
"foldhash",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3243,11 +3229,11 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
|
||||
|
||||
[[package]]
|
||||
name = "lru"
|
||||
version = "0.12.5"
|
||||
version = "0.18.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
|
||||
checksum = "ef9ac18847474e638e3702b76c65d4eb93428471a74778ef0f1be711717f89b5"
|
||||
dependencies = [
|
||||
"hashbrown 0.15.5",
|
||||
"hashbrown 0.17.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4313,12 +4299,12 @@ checksum = "3d595e54a326bc53c1c197b32d295e14b169e3cfeaa8dc82b529f947fba6bcf5"
|
||||
|
||||
[[package]]
|
||||
name = "proton-drive-rs"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "11faa95cf40bd87d4d48435cdf9b16fff5f14caf45b3a565a941fd4a6e18cefe"
|
||||
checksum = "d6ce113d234474821d34787436ee80e1458e3d8a8f97212219615ed315eb70be"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"base64 0.22.1",
|
||||
"base64 0.23.0",
|
||||
"bytes",
|
||||
"futures",
|
||||
"getrandom 0.4.3",
|
||||
@@ -4340,13 +4326,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proton-sdk"
|
||||
version = "0.6.3"
|
||||
version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7de99acbd776f7bad5e1e1f3c40d7df3e4ef7411984d02370008ba1ff270a047"
|
||||
checksum = "2a33c67df9694f90ce60e5b34984275956244138511b4640ca0d100e1dac8b3d"
|
||||
dependencies = [
|
||||
"aes-gcm 0.11.0",
|
||||
"async-trait",
|
||||
"base64 0.22.1",
|
||||
"base64 0.23.0",
|
||||
"bcrypt",
|
||||
"bytes",
|
||||
"chrono",
|
||||
@@ -4373,7 +4359,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-android"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"android_logger",
|
||||
"jni 0.21.1",
|
||||
@@ -4392,13 +4378,15 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-app"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"chrono",
|
||||
"dbus",
|
||||
"directories",
|
||||
"eframe",
|
||||
"egui",
|
||||
"egui-phosphor",
|
||||
"futures",
|
||||
"image",
|
||||
"parking_lot",
|
||||
@@ -4410,7 +4398,9 @@ dependencies = [
|
||||
"serde",
|
||||
"serde_json",
|
||||
"sha2 0.10.9",
|
||||
"skrifa",
|
||||
"souvlaki",
|
||||
"tauri-winrt-notification",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"tracing-subscriber",
|
||||
@@ -4419,7 +4409,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-cli"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"clap",
|
||||
@@ -4437,7 +4427,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-core"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"directories",
|
||||
"futures",
|
||||
@@ -4455,7 +4445,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-meta"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"pstr-core",
|
||||
"reqwest",
|
||||
@@ -4468,7 +4458,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-player"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"libloading",
|
||||
@@ -4483,7 +4473,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pstr-stream"
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"futures",
|
||||
@@ -5533,7 +5523,7 @@ dependencies = [
|
||||
"dispatch",
|
||||
"objc",
|
||||
"thiserror 1.0.69",
|
||||
"windows",
|
||||
"windows 0.44.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -5624,6 +5614,17 @@ version = "1.0.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
|
||||
|
||||
[[package]]
|
||||
name = "tauri-winrt-notification"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f37a6c354fd28fc9e322ed9bd47e3959576dad28c9d58ea1cf888cce1c7ccb36"
|
||||
dependencies = [
|
||||
"thiserror 2.0.19",
|
||||
"windows 0.62.2",
|
||||
"windows-version",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "tempfile"
|
||||
version = "3.27.0"
|
||||
@@ -6684,6 +6685,27 @@ dependencies = [
|
||||
"windows-targets 0.42.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows"
|
||||
version = "0.62.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
|
||||
dependencies = [
|
||||
"windows-collections",
|
||||
"windows-core",
|
||||
"windows-future",
|
||||
"windows-numerics",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-collections"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
|
||||
dependencies = [
|
||||
"windows-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.62.2"
|
||||
@@ -6697,6 +6719,17 @@ dependencies = [
|
||||
"windows-strings",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-future"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
|
||||
dependencies = [
|
||||
"windows-core",
|
||||
"windows-link",
|
||||
"windows-threading",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-implement"
|
||||
version = "0.60.2"
|
||||
@@ -6725,6 +6758,16 @@ version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
|
||||
|
||||
[[package]]
|
||||
name = "windows-numerics"
|
||||
version = "0.3.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
|
||||
dependencies = [
|
||||
"windows-core",
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-result"
|
||||
version = "0.4.1"
|
||||
@@ -6860,6 +6903,24 @@ dependencies = [
|
||||
"windows_x86_64_msvc 0.53.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-threading"
|
||||
version = "0.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
|
||||
dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-version"
|
||||
version = "0.1.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631"
|
||||
dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.42.2"
|
||||
|
||||
@@ -11,7 +11,7 @@ members = [
|
||||
]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.4.2"
|
||||
version = "1.1.2"
|
||||
edition = "2024"
|
||||
license = "MIT"
|
||||
repository = "https://github.com/narrrl/proton-stream"
|
||||
@@ -28,8 +28,8 @@ authors = ["Nils Pukropp <contact@narl.io>"]
|
||||
opt-level = 2
|
||||
|
||||
[workspace.dependencies]
|
||||
proton-sdk = { version = "0.6.3" }
|
||||
proton-drive-rs = { version = "0.6.3" }
|
||||
proton-sdk = { version = "0.7.2" }
|
||||
proton-drive-rs = { version = "0.7.2" }
|
||||
|
||||
# Internal crates.
|
||||
pstr-core = { path = "crates/pstr-core" }
|
||||
@@ -51,6 +51,8 @@ anyhow = "1"
|
||||
tracing = "0.1"
|
||||
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
||||
directories = "5"
|
||||
# Local dates for the history page. Already in the tree through the SDK.
|
||||
chrono = { version = "0.4", default-features = false, features = ["clock"] }
|
||||
sha2 = "0.10"
|
||||
# `bundled` so a Windows build needs no system SQLite.
|
||||
rusqlite = { version = "0.32", features = ["bundled"] }
|
||||
@@ -77,6 +79,12 @@ eframe = { version = "0.35", default-features = false, features = [
|
||||
"x11",
|
||||
] }
|
||||
egui = "0.35"
|
||||
# The icons on buttons. Glyphs like ⏭ and 🔊 come out of whichever fallback
|
||||
# font has them, at its own size and baseline; an icon font is one set.
|
||||
egui-phosphor = { version = "0.13", default-features = false, features = ["regular"] }
|
||||
# Tests only: reads the bundled fonts' character maps. The version epaint
|
||||
# already builds, so it costs no extra compile.
|
||||
skrifa = { version = "0.42", default-features = false, features = ["std"] }
|
||||
# Poster thumbnails only: Proton renders them as JPEG, and a decoder that also
|
||||
# pulls in every exotic format is weight this app has no use for.
|
||||
image = { version = "0.25", default-features = false, features = ["jpeg", "png", "webp"] }
|
||||
@@ -93,9 +101,11 @@ souvlaki = { version = "0.8", default-features = false, features = ["use_dbus"]
|
||||
# hold it for.
|
||||
dbus = "0.9"
|
||||
windows-sys = "0.61"
|
||||
# Toasts on Windows. Linux notifications go over the `dbus` above.
|
||||
tauri-winrt-notification = "0.8"
|
||||
rpassword = "7"
|
||||
libloading = "0.8"
|
||||
lru = "0.12"
|
||||
lru = "0.18"
|
||||
# `async fn` in traits is stable at MSRV 1.96 but is not dyn-compatible, and the
|
||||
# stream layer needs a `dyn` block source so its cache, ring and read-ahead can
|
||||
# be tested against a fake without a network or an account.
|
||||
|
||||
@@ -0,0 +1,170 @@
|
||||
# Android plan
|
||||
|
||||
Where the Android client stands against the desktop app, and what to change to
|
||||
make it feel like a modern streaming app rather than a settings form with a
|
||||
player attached. Written 2026-10-03 from a source review and four screenshots
|
||||
(Library, Title, Shares, Settings) taken on a phone running v0.5.0.
|
||||
|
||||
Android last caught up with the desktop on 2026-08-10 (`4ef6225`); the desktop
|
||||
gained about twenty features on 2026-10-02 that Android does not have.
|
||||
|
||||
## Status (2026-10-03)
|
||||
|
||||
Done: section 0, every parity item, and every recommendation in section 2 —
|
||||
the Library, Title, Shares, Settings and Downloads redesigns, per-page app
|
||||
bars drawn edge to edge, search behind an icon, skeleton loading and
|
||||
generated placeholder art, Settings sub-pages and a language picker, a
|
||||
long-press Change match, Inter, light and tablet screenshots, the library
|
||||
and a title side by side from 840 dp, a poster-to-backdrop shared element
|
||||
transition, and predictive back on the title page.
|
||||
|
||||
Two departures from the text below. The tablet layout is a two-pane `Row`
|
||||
rather than `ListDetailPaneScaffold`, which would have added the
|
||||
`adaptive-layout` artifact for one split. Pull to refresh shows the
|
||||
indicator while a crawl runs, but not the crawl's progress.
|
||||
|
||||
Not yet verified on a device; the host gate (ktlint, unit and screenshot
|
||||
tests) passes, and Android lint runs in CI.
|
||||
|
||||
## 0. CI (done)
|
||||
|
||||
Every `Android` workflow run since August failed in `:app:buildRustHost`:
|
||||
`pstr-core` pulls `keyring` → `dbus-secret-service` → `libdbus-sys`, which needs
|
||||
`libdbus-1-dev` on the host. Because no run ever succeeded, no cache was ever
|
||||
saved, so each run started from nothing.
|
||||
|
||||
- `libdbus-1-dev` added to both jobs' apt install.
|
||||
- `Swatinem/rust-cache` shares one key between the two jobs and saves on failure.
|
||||
- `android/app/build/generated/mpv` is cached on the hash of
|
||||
`scripts/build-libmpv-android.sh`; the script writes a `STAMP` (revision plus
|
||||
its own hash) last and skips the whole libmpv build when the stamp matches.
|
||||
|
||||
Later runs also needed meson 1.12.1 from PyPI (noble's 1.3.2 is too old for
|
||||
the pinned fontconfig), libmpv built and cached in its own steps so a later
|
||||
failure keeps it, and lint's `OldTargetApi` made informational. A cached run
|
||||
restores libmpv in under a minute.
|
||||
|
||||
## 1. Desktop parity
|
||||
|
||||
Ordered by value on a phone.
|
||||
|
||||
1. **Open share links from outside the app.** The manifest has only the
|
||||
launcher intent. Add an `ACTION_VIEW` filter for `drive.proton.me/urls/*` and
|
||||
an `ACTION_SEND` (`text/plain`) filter; both open the add-share dialog with
|
||||
the link filled in. Desktop: `4a54af3`, `53a1d0a`.
|
||||
2. **Streaming cache budget.** Android runs on the fixed 4 GiB default
|
||||
(`DiskCacheConfig::DEFAULT_BUDGET_BYTES`), large for a phone. Expose
|
||||
`DiskCache::set_budget` through `pstr-android`, add a 1–16 GiB choice with a
|
||||
usage readout under Storage. Desktop: `a432a93`.
|
||||
3. **Hardware-decoding switch.** `pstr_mpv.cpp` hard-codes
|
||||
`hwdec=auto-copy-safe`; a device with green frames has no way out. A
|
||||
Settings toggle, applied from the next file.
|
||||
4. **Episode list in the player.** A bottom sheet (portrait) or side panel
|
||||
(landscape) with the title's episodes, opened on the playing season and
|
||||
scrolled to the playing episode. Desktop: `7e734db`.
|
||||
5. **Long-press menu on tiles.** Play/resume, mark watched or unwatched,
|
||||
download, change match, remove from Continue watching, in a
|
||||
`ModalBottomSheet`. Desktop: `c5808a5`.
|
||||
6. **Undo on snackbars** for marking a title and leaving Continue watching.
|
||||
`AppUiState.message` is a bare string today; it needs an action. Desktop:
|
||||
`79c3f68`.
|
||||
7. **History tab.** Needs a bridge call over the `pstr-core::library` query
|
||||
the desktop page uses. Desktop: `e7eeaa5`.
|
||||
8. **Buffered range on the seek bar** from mpv's `demuxer-cache-time`.
|
||||
9. **Up-next card** with the next episode's still and a countdown ring instead
|
||||
of "Up next in 7s" text.
|
||||
10. **Featured banner** at the top of the library. Desktop: `7d03736`.
|
||||
11. **Bundled Inter** in `ui/theme/Type.kt`, so both clients read the same.
|
||||
Desktop: `558446b`.
|
||||
|
||||
## 2. UI recommendations
|
||||
|
||||
### Everywhere
|
||||
|
||||
- **Colours stay the theme's.** The red is the Persona theme's accent and the
|
||||
card tint comes from the shared palette, so the redesign changes layout and
|
||||
button hierarchy, not colours.
|
||||
- **One button hierarchy.** At most one filled accent button per screen;
|
||||
secondary actions tonal or outlined; destructive actions behind a menu and a
|
||||
confirmation, never a filled red button in a list row.
|
||||
- **Edge-to-edge, per-screen titles.** The "proton-stream" app bar on every
|
||||
page wastes a band of height. Library uses a collapsing large title; Title
|
||||
pages draw the backdrop under the status bar; other tabs use their name.
|
||||
- **Skeletons instead of spinners** for library and title loading, and
|
||||
generated placeholder art (gradient from the accent plus the title's
|
||||
initials) instead of a black card with a play triangle (Akira).
|
||||
- **Pull-to-refresh** (`PullToRefreshBox`) replaces the top-bar refresh icon,
|
||||
with crawl progress shown in the indicator area.
|
||||
- **Split `ui/ProtonStreamApp.kt`** (1665 lines) into one file per screen
|
||||
before the work below; every item touches it.
|
||||
|
||||
### Library
|
||||
|
||||
- Poster grid (2:3, `posterUrl`) at three columns on a phone, title under the
|
||||
poster with no card body. The current 210 dp cropped backdrops fit two titles
|
||||
per screen.
|
||||
- Continue watching: 16:9 still with the progress bar laid over the bottom
|
||||
edge of the image and "S03E11 · 12 min left" under it.
|
||||
- Search becomes an icon in the app bar that expands into an M3 `SearchBar`,
|
||||
instead of a permanent field above everything.
|
||||
- Fix "1 episodes" (line ~507; the season header already pluralises).
|
||||
|
||||
### Title page
|
||||
|
||||
- Full-bleed backdrop with a gradient scrim, poster, title and meta chips
|
||||
(year, score, genres) over it, collapsing as the page scrolls.
|
||||
- Synopsis clamped to three lines with "More".
|
||||
- One full-width primary button, "Resume S03E11" or "Play S01E01", then a row
|
||||
of icon actions: download, mark watched, and a ⋮ menu holding Start over,
|
||||
Change match and More on AniList. Today five buttons of three styles wrap
|
||||
over three lines.
|
||||
- Drop the "Preferred tracks" form and its Save button from this page. The
|
||||
player already remembers tracks by name per title (`d3c5f07`); expose any
|
||||
override from the player's track chooser.
|
||||
- Season picker as a dropdown chip or tabs, not stacked accordions; a 40
|
||||
episode title is one long scroll today.
|
||||
- Episode rows: 16:9 still with progress overlay, "1 · Mother and Children"
|
||||
(provider name, else "Episode 1") rather than the raw file name
|
||||
`[Judas] Oshi no Ko - S01E01.mkv`, runtime or air date as supporting text,
|
||||
watched and download state as small trailing icons. The red `S01E01` label
|
||||
above each row goes.
|
||||
|
||||
### Shares
|
||||
|
||||
- `ListItem` rows: name, "12 titles · crawled 2 h ago" or the failure, and a ⋮
|
||||
menu with Refresh, Re-enter link and Remove (confirmed). The current row
|
||||
wraps "Custom password stored securely" over three lines beside three
|
||||
differently styled actions.
|
||||
- "Add share" as an extended FAB, which is also where the share-link intent
|
||||
from parity item 1 lands.
|
||||
|
||||
### Settings
|
||||
|
||||
- Grouped `ListItem` rows (headline, one line of supporting text, trailing
|
||||
switch), with the long explanations moved into the supporting line or an
|
||||
info dialog. Today each toggle carries a paragraph.
|
||||
- Split into sub-pages once storage and decoding settings land: Playback,
|
||||
Downloads & storage, Appearance, Metadata, About.
|
||||
- Language fields become a picker dialog over a language list, not free text.
|
||||
- Storage shows a usage bar (cache, offline episodes) above the budget choice.
|
||||
|
||||
### Robustness
|
||||
|
||||
- Screenshot tests (Roborazzi, JVM, no device) for each screen in light and
|
||||
dark, phone and tablet, at font scale 1.0 and 1.5 — the redesign changes
|
||||
every screen, and `docs/TESTING.md` has no visual layer today.
|
||||
- 48 dp minimum touch targets and content descriptions on the new icon-only
|
||||
actions.
|
||||
- Tablet: `ListDetailPaneScaffold` for library + title, since
|
||||
`NavigationSuiteScaffold` already switches to a rail there.
|
||||
- Shared-element transition from a poster to its title page, and predictive
|
||||
back.
|
||||
|
||||
## Suggested order
|
||||
|
||||
1. CI green (section 0).
|
||||
2. Split `ProtonStreamApp.kt`; add screenshot tests for the current screens.
|
||||
3. Parity 1–3 (small, phone-specific fixes).
|
||||
4. Button hierarchy and Inter — every later screen inherits them.
|
||||
5. Title page, then Library, then Shares and Settings.
|
||||
6. Parity 4–10.
|
||||
@@ -35,8 +35,12 @@ Its toolchain, emulator, signing, and release instructions are in [`docs/ANDROID
|
||||
|
||||
```bash
|
||||
cargo run --release -p pstr-app # the app
|
||||
proton-stream 'https://drive.proton.me/urls/TOKEN#fragment' # open the Add form with a link
|
||||
```
|
||||
|
||||
One window at a time: a second launch brings the open window forward and
|
||||
hands it any share link it was given, then exits.
|
||||
|
||||
The `pstr` CLI does the same work headlessly, and is what tells you which layer
|
||||
is broken:
|
||||
|
||||
@@ -68,7 +72,7 @@ against the SDK's own range download.
|
||||
| Transcoding | None. mpv demuxes and decodes natively. |
|
||||
| UI | egui/eframe on glow; mpv renders into the same GL context. |
|
||||
| Themes | The shipped near-black palette, Catppuccin Latte, Frappé, Macchiato and Mocha, and a Persona 5 one — black, white and one loud red, which is what the Red accent is there for — each with a choice of nine accents, drawn as a gradient unless you turn that off. Picked on the Settings page, applied without a restart. |
|
||||
| Metadata | Filename parsing, with optional AniList/TMDB enrichment — **off by default**, because enabling it sends your library's titles to a third party. It brings posters, synopses and per-episode titles; a title the scorer refuses to guess about can be pinned by hand, and a pinned match is never overwritten. |
|
||||
| Metadata | Filename parsing, with optional AniList/TMDB enrichment — **off by default**, because enabling it sends your library's titles to a third party. It brings posters, synopses, fanart and per-episode titles and synopses (for AniList, from ani.zip, which is sent the matched ids); a title the scorer refuses to guess about can be pinned by hand, and a pinned match is never overwritten. The library sorts by name, watch, add or air date, rating and popularity, folds a franchise into one tile, and shelves titles by director, studio and genre. See [docs/METADATA.md](docs/METADATA.md). |
|
||||
| Platforms | Linux and Windows; macOS packaging is written but has not been run on a Mac. A native Android 12+ client is available featuring a Material 3 UI and immersive fullscreen playback. |
|
||||
|
||||
## Building
|
||||
@@ -106,6 +110,9 @@ see [`docs/ANDROID.md`](docs/ANDROID.md) for exact setup and release signing.
|
||||
- The block cache holds decrypted content. It lives in your cache directory,
|
||||
can be deleted at any time the app is not running, and can be sized or
|
||||
emptied from Settings → Storage.
|
||||
- A share link given as a command-line argument is visible to other users of
|
||||
the machine in the process list while that launch runs, and may land in
|
||||
shell history. Pasting it into the window (Ctrl+V) does neither.
|
||||
- The desktop's media widget is handed the title, the episode and a `file://`
|
||||
path to artwork already on disk — never a provider URL, so the shell never
|
||||
contacts a metadata provider on its own.
|
||||
@@ -115,3 +122,6 @@ see [`docs/ANDROID.md`](docs/ANDROID.md) for exact setup and release signing.
|
||||
The shared Rust crates and desktop application are MIT licensed. The Android
|
||||
application and its combined native distribution are GPL-3.0-or-later; see
|
||||
[`android/LICENSE.md`](android/LICENSE.md) and the bundled-component notices.
|
||||
The desktop application embeds the Inter typeface, under the SIL Open Font
|
||||
License 1.1 ([`crates/pstr-app/assets/fonts/Inter-OFL.txt`](crates/pstr-app/assets/fonts/Inter-OFL.txt)),
|
||||
and the Phosphor icon font, under MIT.
|
||||
@@ -7,11 +7,12 @@ distributions.
|
||||
| Component | License |
|
||||
|---|---|
|
||||
| mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
|
||||
| LLVM libc++ shared runtime (Android NDK r29) | Apache-2.0 WITH LLVM-exception |
|
||||
| LLVM libc++ shared runtime (Android NDK r30) | Apache-2.0 WITH LLVM-exception |
|
||||
| AndroidX and Jetpack Compose | Apache-2.0 |
|
||||
| Kotlin | Apache-2.0 |
|
||||
| JNA | Apache-2.0 or LGPL-2.1-or-later |
|
||||
| UniFFI | MPL-2.0 |
|
||||
| Inter typeface (bundled, `Inter-OFL.txt`) | OFL-1.1 |
|
||||
| proton-stream shared Rust crates | MIT |
|
||||
|
||||
This summary is not a replacement for dependency license files. Before a
|
||||
|
||||
@@ -6,6 +6,7 @@ plugins {
|
||||
alias(libs.plugins.kotlin.android)
|
||||
alias(libs.plugins.kotlin.compose)
|
||||
alias(libs.plugins.ktlint)
|
||||
alias(libs.plugins.roborazzi)
|
||||
}
|
||||
|
||||
val repositoryRoot = rootProject.projectDir.parentFile
|
||||
@@ -46,7 +47,7 @@ android {
|
||||
namespace = "io.narl.protonstream"
|
||||
compileSdk = 36
|
||||
buildToolsVersion = "37.0.0"
|
||||
ndkVersion = "29.0.14206865"
|
||||
ndkVersion = "30.0.16248370"
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "io.narl.protonstream"
|
||||
@@ -142,6 +143,9 @@ android {
|
||||
"GradleDependency",
|
||||
"NewerVersionAvailable",
|
||||
"AndroidGradlePluginVersion",
|
||||
// The same for the platform: raising targetSdk opts into new
|
||||
// behaviour and needs its own pass on a device.
|
||||
"OldTargetApi",
|
||||
)
|
||||
sarifReport = true
|
||||
}
|
||||
@@ -176,20 +180,16 @@ val uniffiSourceDir = layout.buildDirectory.dir("generated/source/uniffi")
|
||||
val hostRustLibrary = repositoryRoot.resolve(
|
||||
"target/debug/${System.mapLibraryName("pstr_android")}",
|
||||
)
|
||||
val stagedMpvDir = layout.buildDirectory.dir("generated/mpv")
|
||||
|
||||
val buildLibmpvAndroid by tasks.registering(Exec::class) {
|
||||
group = "native"
|
||||
description = "Builds the pinned GPL libmpv and stages both Android ABIs."
|
||||
workingDir(repositoryRoot)
|
||||
commandLine("bash", repositoryRoot.resolve("scripts/build-libmpv-android.sh").absolutePath)
|
||||
inputs.file(repositoryRoot.resolve("scripts/build-libmpv-android.sh"))
|
||||
outputs.files(
|
||||
stagedMpvDir.map { it.file("jniLibs/arm64-v8a/libmpv.so") },
|
||||
stagedMpvDir.map { it.file("jniLibs/x86_64/libmpv.so") },
|
||||
stagedMpvDir.map { it.file("include/mpv/client.h") },
|
||||
stagedMpvDir.map { it.file("REVISION") },
|
||||
)
|
||||
// No declared outputs: the script's STAMP is the up-to-date check. Gradle
|
||||
// deletes the declared outputs of a task it has no history for, which on a
|
||||
// fresh CI checkout threw away the tree just restored from the cache and
|
||||
// rebuilt libmpv from source on every run.
|
||||
}
|
||||
|
||||
val buildRustHost by tasks.registering(Exec::class) {
|
||||
@@ -269,6 +269,11 @@ dependencies {
|
||||
testImplementation(libs.robolectric)
|
||||
testImplementation(libs.androidx.test.core)
|
||||
testImplementation(libs.androidx.work.testing)
|
||||
testImplementation(platform(libs.androidx.compose.bom))
|
||||
testImplementation(libs.androidx.compose.ui.test.junit4)
|
||||
testImplementation(libs.roborazzi)
|
||||
testImplementation(libs.roborazzi.compose)
|
||||
testImplementation(libs.roborazzi.junit.rule)
|
||||
|
||||
androidTestImplementation(libs.androidx.test.junit)
|
||||
androidTestImplementation(libs.androidx.test.core)
|
||||
@@ -292,6 +297,13 @@ ktlint {
|
||||
}
|
||||
}
|
||||
|
||||
// Screenshot baselines live beside the tests that draw them, so a change to how
|
||||
// a screen looks shows up in review as a changed image. `recordRoborazziDebug`
|
||||
// rewrites them; `verifyRoborazziDebug` fails on any difference.
|
||||
roborazzi {
|
||||
outputDir.set(file("src/test/screenshots"))
|
||||
}
|
||||
|
||||
// The generated UniFFI directory is a main source dir, so ktlint reads it even
|
||||
// though the filter above drops every file in it. Without this, Gradle refuses
|
||||
// the build for an undeclared dependency between the two tasks.
|
||||
|
||||
@@ -11,7 +11,9 @@
|
||||
android:name=".ProtonStreamApplication"
|
||||
android:allowBackup="false"
|
||||
android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
android:icon="@drawable/ic_launcher_foreground"
|
||||
android:enableOnBackInvokedCallback="true"
|
||||
tools:targetApi="33"
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.ProtonStream">
|
||||
@@ -29,6 +31,7 @@
|
||||
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:label="@string/launcher_name"
|
||||
android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|uiMode|density|fontScale|locale|layoutDirection|keyboardHidden"
|
||||
android:exported="true"
|
||||
android:launchMode="singleTask"
|
||||
@@ -38,6 +41,24 @@
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<!--
|
||||
Proton Drive public links. autoVerify="false", said explicitly:
|
||||
the domain is Proton's, so this can never be a verified App Link.
|
||||
Android only opens these here once "Open supported links" is
|
||||
allowed in the app's settings; sharing a link to the app works
|
||||
without that.
|
||||
-->
|
||||
<intent-filter android:autoVerify="false">
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
<data android:scheme="https" android:host="drive.proton.me" android:pathPrefix="/urls/" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.SEND" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<data android:mimeType="text/plain" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
</application>
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION AND CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
@@ -6,11 +6,12 @@ complete GNU GPL version 3 text is packaged beside this file as `GPL-3.0.txt`.
|
||||
| Component | License |
|
||||
|---|---|
|
||||
| mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
|
||||
| LLVM libc++ shared runtime (Android NDK r29) | Apache-2.0 WITH LLVM-exception |
|
||||
| LLVM libc++ shared runtime (Android NDK r30) | Apache-2.0 WITH LLVM-exception |
|
||||
| AndroidX and Jetpack Compose | Apache-2.0 |
|
||||
| Kotlin | Apache-2.0 |
|
||||
| JNA | Apache-2.0 or LGPL-2.1-or-later |
|
||||
| UniFFI | MPL-2.0 |
|
||||
| Inter typeface (bundled, `Inter-OFL.txt`) | OFL-1.1 |
|
||||
| proton-stream reusable Rust crates | MIT |
|
||||
|
||||
Before release, replace this dependency summary with an inventory generated
|
||||
|
||||
@@ -31,6 +31,8 @@ extern "C" {
|
||||
namespace {
|
||||
|
||||
constexpr const char *kProtocol = "pstr";
|
||||
/// mpv's `hwdec` when hardware decoding is on. Why this value: `Player()`.
|
||||
constexpr const char *kHardwareDecoding = "auto-copy-safe";
|
||||
|
||||
struct StreamCookie {
|
||||
uint64_t handle;
|
||||
@@ -191,6 +193,9 @@ struct PlaybackState {
|
||||
/// Between a seek being issued and playback actually resuming. The seek bar
|
||||
/// has moved but the picture has not.
|
||||
bool seeking = false;
|
||||
/// How far into the file the demuxer has read ahead, in seconds; what the
|
||||
/// seek bar shades, so a jump into it is known to cost no fetch.
|
||||
double cached_until = 0.0;
|
||||
/// True between `loadfile` being issued and mpv acknowledging it with
|
||||
/// `START_FILE`. Everything mpv reports in that window still describes the
|
||||
/// *outgoing* file — including the `END_FILE(STOP)` that stopping it emits —
|
||||
@@ -216,6 +221,7 @@ class Player {
|
||||
option("vo", "libmpv");
|
||||
option("force-window", "no");
|
||||
option("video-timing-offset", "0");
|
||||
// The default; `load` sets it per file from the viewer's setting.
|
||||
// `-copy-safe`, not `-safe`. The direct MediaCodec decoders render into
|
||||
// an `ANativeWindow` the decoder is handed at init, and this player has
|
||||
// none to give: the picture goes through `vo_libmpv` and an EGL pbuffer,
|
||||
@@ -224,7 +230,7 @@ class Player {
|
||||
// `hevc_mediacodec: Both surface and native_window are NULL` before
|
||||
// falling back. The copy variants decode in hardware and hand back
|
||||
// ordinary frames, which is what this render path can actually use.
|
||||
option("hwdec", "auto-copy-safe");
|
||||
option("hwdec", kHardwareDecoding);
|
||||
option("cache", "yes");
|
||||
option("cache-secs", "30");
|
||||
option("demuxer-readahead-secs", "30");
|
||||
@@ -245,6 +251,7 @@ class Player {
|
||||
observe("video-params/dh", 7, MPV_FORMAT_INT64);
|
||||
observe("paused-for-cache", 8, MPV_FORMAT_FLAG);
|
||||
observe("cache-buffering-state", 9, MPV_FORMAT_INT64);
|
||||
observe("demuxer-cache-time", 10, MPV_FORMAT_DOUBLE);
|
||||
// Errors mpv reports about the file itself, rather than about the
|
||||
// request that opened it. Without these a failed demux is silent.
|
||||
mpv_request_log_messages(mpv_, "error");
|
||||
@@ -294,8 +301,12 @@ class Player {
|
||||
}
|
||||
|
||||
bool load(uint64_t handle, double start, const std::string &audio,
|
||||
const std::string &subtitle, bool subtitles) {
|
||||
const std::string &subtitle, bool subtitles,
|
||||
bool hardware_decoding) {
|
||||
if (!mpv_) return false;
|
||||
// Per file, before `loadfile`: a device whose decoder shows green
|
||||
// frames is fixed from the next episode without restarting the core.
|
||||
set_string("hwdec", hardware_decoding ? kHardwareDecoding : "no");
|
||||
// No wait for a render context. It is created with the render thread and
|
||||
// needs no window, and a load that cannot get one plays audio anyway —
|
||||
// waiting for a surface here is what made background playback fail after
|
||||
@@ -591,6 +602,7 @@ class Player {
|
||||
else if (!std::strcmp(property.name, "video-params/dh")) state_.video_height = static_cast<double>(*static_cast<int64_t *>(property.data));
|
||||
else if (!std::strcmp(property.name, "paused-for-cache")) state_.buffering = *static_cast<int *>(property.data);
|
||||
else if (!std::strcmp(property.name, "cache-buffering-state")) state_.cache_percent = static_cast<double>(*static_cast<int64_t *>(property.data));
|
||||
else if (!std::strcmp(property.name, "demuxer-cache-time")) state_.cached_until = *static_cast<double *>(property.data);
|
||||
}
|
||||
|
||||
static void render_update(void *opaque) noexcept {
|
||||
@@ -822,7 +834,7 @@ extern "C" JNIEXPORT void JNICALL Java_io_narl_protonstream_playback_NativeMpvHo
|
||||
extern "C" JNIEXPORT void JNICALL Java_io_narl_protonstream_playback_NativeMpvHost_nativeDetachSurface(JNIEnv *, jobject, jlong handle) noexcept {
|
||||
c_boundary([=] { if (auto *p = from(handle)) p->detach(); });
|
||||
}
|
||||
extern "C" JNIEXPORT jboolean JNICALL Java_io_narl_protonstream_playback_NativeMpvHost_nativeLoad(JNIEnv *env, jobject, jlong handle, jlong stream, jdouble start, jstring audio, jstring subtitle, jboolean subtitles) noexcept {
|
||||
extern "C" JNIEXPORT jboolean JNICALL Java_io_narl_protonstream_playback_NativeMpvHost_nativeLoad(JNIEnv *env, jobject, jlong handle, jlong stream, jdouble start, jstring audio, jstring subtitle, jboolean subtitles, jboolean hardware_decoding) noexcept {
|
||||
return c_boundary<jboolean>(JNI_FALSE, [=] {
|
||||
std::string audio_text;
|
||||
std::string subtitle_text;
|
||||
@@ -832,7 +844,8 @@ extern "C" JNIEXPORT jboolean JNICALL Java_io_narl_protonstream_playback_NativeM
|
||||
auto *p = from(handle);
|
||||
return static_cast<jboolean>(
|
||||
p && p->load(static_cast<uint64_t>(stream), start, audio_text,
|
||||
subtitle_text, subtitles == JNI_TRUE)
|
||||
subtitle_text, subtitles == JNI_TRUE,
|
||||
hardware_decoding == JNI_TRUE)
|
||||
? JNI_TRUE
|
||||
: JNI_FALSE);
|
||||
});
|
||||
@@ -868,8 +881,8 @@ extern "C" JNIEXPORT jdoubleArray JNICALL Java_io_narl_protonstream_playback_Nat
|
||||
state.video_width, state.video_height,
|
||||
static_cast<jdouble>(state.end_reason),
|
||||
state.buffering ? 1.0 : 0.0, state.cache_percent,
|
||||
state.seeking ? 1.0 : 0.0};
|
||||
constexpr jsize kFields = 13;
|
||||
state.seeking ? 1.0 : 0.0, state.cached_until};
|
||||
constexpr jsize kFields = 14;
|
||||
jdoubleArray result = env->NewDoubleArray(kFields);
|
||||
if (!result) return static_cast<jdoubleArray>(nullptr);
|
||||
env->SetDoubleArrayRegion(result, 0, kFields, values);
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
package io.narl.protonstream
|
||||
|
||||
import android.content.Intent
|
||||
|
||||
/**
|
||||
* A Proton Drive public link, wherever in a piece of text it sits.
|
||||
*
|
||||
* The fragment is kept: it is the share's secret, and a link without it cannot
|
||||
* be opened. Matching stops at whitespace and at the quotes and brackets a
|
||||
* message app wraps a link in, which never occur in a link itself.
|
||||
*/
|
||||
private val SHARE_LINK = Regex("""https://drive\.proton\.me/urls/[^\s"'<>()\[\]]+""")
|
||||
|
||||
/** The share link an `ACTION_VIEW` URL or an `ACTION_SEND` text carries, if any. */
|
||||
internal fun shareLinkFrom(action: String?, url: String?, text: CharSequence?): String? = when (action) {
|
||||
Intent.ACTION_VIEW -> url?.let { SHARE_LINK.matchEntire(it)?.value }
|
||||
Intent.ACTION_SEND -> text?.let { SHARE_LINK.find(it)?.value }
|
||||
else -> null
|
||||
}
|
||||
|
||||
internal fun Intent.shareLink(): String? =
|
||||
shareLinkFrom(action, dataString, getCharSequenceExtra(Intent.EXTRA_TEXT))
|
||||
@@ -48,6 +48,9 @@ import uniffi.pstr_android.PaletteRecord
|
||||
class MainActivity : ComponentActivity() {
|
||||
private val playerHost = mutableStateOf<NativeMpvHost?>(null)
|
||||
private val inPictureInPicture = mutableStateOf(false)
|
||||
|
||||
/** A share link handed over by a browser or the share sheet, until the Add form takes it. */
|
||||
private val incomingShareLink = mutableStateOf<String?>(null)
|
||||
/**
|
||||
* Whether a bind is outstanding, which is what has to be unbound.
|
||||
*
|
||||
@@ -97,6 +100,9 @@ class MainActivity : ComponentActivity() {
|
||||
// Infallible by construction — an unreadable theme file resolves to the
|
||||
// shipped default rather than throwing.
|
||||
runCatching { NativeRuntime.storedPalette() }.onSuccess(AppearanceState::seed)
|
||||
// Only on a fresh start: a recreated activity is handed the intent it
|
||||
// was launched with again, and would offer to add the same share twice.
|
||||
if (savedInstanceState == null) incomingShareLink.value = intent.shareLink()
|
||||
enableEdgeToEdge()
|
||||
// Re-applied on every change, not just at startup: picking Latte from
|
||||
// the settings page has to turn the status bar's icons dark in the same
|
||||
@@ -134,7 +140,12 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
setContent {
|
||||
ProtonStreamTheme {
|
||||
ProtonStreamApp(playerHost.value, inPictureInPicture.value)
|
||||
ProtonStreamApp(
|
||||
playerHost.value,
|
||||
inPictureInPicture.value,
|
||||
shareLink = incomingShareLink.value,
|
||||
onShareLinkTaken = { incomingShareLink.value = null },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -159,6 +170,13 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
// singleTask: a link opened while the app is running arrives here, not in
|
||||
// a second activity.
|
||||
override fun onNewIntent(intent: Intent) {
|
||||
super.onNewIntent(intent)
|
||||
intent.shareLink()?.let { incomingShareLink.value = it }
|
||||
}
|
||||
|
||||
override fun onUserLeaveHint() {
|
||||
super.onUserLeaveHint()
|
||||
// The backstop for launchers that still send this instead of arming
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package io.narl.protonstream.native
|
||||
|
||||
import android.content.Context
|
||||
import io.narl.protonstream.settings.SettingsStore
|
||||
import java.io.File
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
@@ -56,5 +57,9 @@ object NativeRuntime {
|
||||
}
|
||||
|
||||
private fun createEngine(): AndroidEngine =
|
||||
AndroidEngine(paths(), KeystoreSecretStore(appContext))
|
||||
AndroidEngine(paths(), KeystoreSecretStore(appContext)).apply {
|
||||
// The budget is Android's setting, so the engine starts on the
|
||||
// default and is told the chosen one before anything streams.
|
||||
setStreamCacheBudget(SettingsStore.gibToBytes(SettingsStore(appContext).cacheBudgetGib))
|
||||
}
|
||||
}
|
||||
@@ -75,6 +75,8 @@ data class MpvPlaybackState(
|
||||
val cachePercent: Double = 0.0,
|
||||
/** A seek has been issued but playback has not resumed at the new position. */
|
||||
val seeking: Boolean = false,
|
||||
/** How far the demuxer has read ahead, in seconds into the file. */
|
||||
val cachedUntil: Double = 0.0,
|
||||
) {
|
||||
/** Whether the picture is stopped for a reason the viewer did not choose. */
|
||||
val stalled: Boolean get() = (buffering || seeking) && !paused && !ended
|
||||
@@ -184,12 +186,16 @@ class NativeMpvHost private constructor(private val nativeHandle: Long) : Libmpv
|
||||
audioLanguage: String?,
|
||||
subtitleLanguage: String?,
|
||||
subtitles: Boolean,
|
||||
hardwareDecoding: Boolean,
|
||||
) {
|
||||
check(size > 0uL) { "Cannot play an empty stream" }
|
||||
try {
|
||||
withContext(Dispatchers.IO) {
|
||||
val loaded = withOpenHandle {
|
||||
nativeLoad(it, nativeHandle.toLong(), startPosition, audioLanguage, subtitleLanguage, subtitles).also { loaded ->
|
||||
nativeLoad(
|
||||
it, nativeHandle.toLong(), startPosition, audioLanguage, subtitleLanguage, subtitles,
|
||||
hardwareDecoding,
|
||||
).also { loaded ->
|
||||
if (loaded) {
|
||||
// The outgoing stream is released by mpv closing it,
|
||||
// not from here: `loadfile` is asynchronous and its
|
||||
@@ -309,6 +315,7 @@ class NativeMpvHost private constructor(private val nativeHandle: Long) : Libmpv
|
||||
buffering = values[BUFFERING] != 0.0,
|
||||
cachePercent = values[CACHE_PERCENT],
|
||||
seeking = values[SEEKING] != 0.0,
|
||||
cachedUntil = values[CACHED_UNTIL],
|
||||
)
|
||||
mutableState.value = next
|
||||
// The listeners drive the media session and the player UI,
|
||||
@@ -398,7 +405,15 @@ class NativeMpvHost private constructor(private val nativeHandle: Long) : Libmpv
|
||||
private external fun nativeDestroy(handle: Long)
|
||||
private external fun nativeAttachSurface(handle: Long, surface: Surface)
|
||||
private external fun nativeDetachSurface(handle: Long)
|
||||
private external fun nativeLoad(handle: Long, stream: Long, start: Double, audio: String?, subtitle: String?, subtitles: Boolean): Boolean
|
||||
private external fun nativeLoad(
|
||||
handle: Long,
|
||||
stream: Long,
|
||||
start: Double,
|
||||
audio: String?,
|
||||
subtitle: String?,
|
||||
subtitles: Boolean,
|
||||
hardwareDecoding: Boolean,
|
||||
): Boolean
|
||||
private external fun nativePause(handle: Long, paused: Boolean)
|
||||
private external fun nativeSeek(handle: Long, position: Double)
|
||||
private external fun nativeVolume(handle: Long, volume: Double)
|
||||
@@ -419,7 +434,7 @@ class NativeMpvHost private constructor(private val nativeHandle: Long) : Libmpv
|
||||
|
||||
companion object {
|
||||
/** Fields `nativeState` fills, in the order `pstr_mpv.cpp` writes them. */
|
||||
private const val FIELDS = 13
|
||||
private const val FIELDS = 14
|
||||
private const val GENERATION = 6
|
||||
private const val WIDTH = 7
|
||||
private const val HEIGHT = 8
|
||||
@@ -427,6 +442,7 @@ class NativeMpvHost private constructor(private val nativeHandle: Long) : Libmpv
|
||||
private const val BUFFERING = 10
|
||||
private const val CACHE_PERCENT = 11
|
||||
private const val SEEKING = 12
|
||||
private const val CACHED_UNTIL = 13
|
||||
|
||||
init {
|
||||
System.loadLibrary("pstr_android")
|
||||
|
||||
@@ -76,6 +76,7 @@ import androidx.compose.ui.viewinterop.AndroidView
|
||||
import androidx.core.view.WindowCompat
|
||||
import androidx.core.view.WindowInsetsCompat
|
||||
import androidx.core.view.WindowInsetsControllerCompat
|
||||
import io.narl.protonstream.settings.SettingsStore
|
||||
import io.narl.protonstream.native.NativeRuntime
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.AccentTrack
|
||||
@@ -83,6 +84,19 @@ import io.narl.protonstream.ui.theme.EdgedButton
|
||||
import io.narl.protonstream.ui.theme.QuietButton
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
import io.narl.protonstream.ui.thumbnailSource
|
||||
import androidx.compose.foundation.lazy.rememberLazyListState
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.material3.ModalBottomSheet
|
||||
import androidx.compose.material.icons.filled.VideoLibrary
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import io.narl.protonstream.ui.theme.AccentProgress
|
||||
import androidx.compose.animation.core.LinearEasing
|
||||
import androidx.compose.animation.core.animateFloatAsState
|
||||
import androidx.compose.animation.core.tween
|
||||
import io.narl.protonstream.ui.RemoteArtwork
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.ui.draw.clip
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
@@ -207,6 +221,7 @@ fun PlayerScreen(
|
||||
nativeHost.play(
|
||||
key, startup.nativeHandle, startup.size, startup.startPosition,
|
||||
startup.audioLanguage, startup.subtitleLanguage, startup.subtitles,
|
||||
SettingsStore(context).hardwareDecoding,
|
||||
)
|
||||
// After the load, because mpv keeps none of the three across one.
|
||||
nativeHost.setVolume(startup.volume)
|
||||
@@ -272,6 +287,12 @@ fun PlayerScreen(
|
||||
nativeHost.beginTransition()
|
||||
onIndexChange(index - 1)
|
||||
}
|
||||
fun jumpTo(target: Int) {
|
||||
if (target == index || target !in episodes.indices) return
|
||||
save()
|
||||
nativeHost.beginTransition()
|
||||
onIndexChange(target)
|
||||
}
|
||||
|
||||
// What the media notification, the lock screen and Picture-in-Picture show.
|
||||
// None of them can reach this composition, and all three have to name the
|
||||
@@ -281,7 +302,7 @@ fun PlayerScreen(
|
||||
NowPlaying(
|
||||
media = key,
|
||||
title = episode.label,
|
||||
show = title.canonicalName ?: title.name,
|
||||
show = title.displayName,
|
||||
detail = episode.detail,
|
||||
artworkUrl = title.posterUrl ?: title.backdropUrl,
|
||||
artworkFile = episode.thumbnailSource,
|
||||
@@ -404,7 +425,7 @@ fun PlayerScreen(
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
)
|
||||
Text(
|
||||
listOfNotNull(title.canonicalName ?: title.name, episode.detail.takeIf(String::isNotBlank))
|
||||
listOfNotNull(title.displayName, episode.detail.takeIf(String::isNotBlank))
|
||||
.joinToString(" • "),
|
||||
color = Color.White.copy(alpha = 0.7f),
|
||||
maxLines = 1,
|
||||
@@ -444,6 +465,9 @@ fun PlayerScreen(
|
||||
hasNext = next != null,
|
||||
onPrevious = { retreat() },
|
||||
onNext = { advance() },
|
||||
episodes = episodes,
|
||||
playing = index,
|
||||
onEpisode = { jumpTo(it) },
|
||||
onRotate = { landscapeLocked = activity?.toggleLandscape() ?: false },
|
||||
landscapeLocked = landscapeLocked,
|
||||
)
|
||||
@@ -591,11 +615,15 @@ private fun PlayerControls(
|
||||
hasNext: Boolean,
|
||||
onPrevious: () -> Unit,
|
||||
onNext: () -> Unit,
|
||||
episodes: List<EpisodeRecord>,
|
||||
playing: Int,
|
||||
onEpisode: (Int) -> Unit,
|
||||
onRotate: () -> Unit,
|
||||
landscapeLocked: Boolean,
|
||||
) {
|
||||
val scope = rememberCoroutineScope()
|
||||
var choosing by remember { mutableStateOf<String?>(null) }
|
||||
var showEpisodes by remember { mutableStateOf(false) }
|
||||
var showChapters by remember { mutableStateOf(false) }
|
||||
var showSpeeds by remember { mutableStateOf(false) }
|
||||
// What the store says, so the dialog opens on the rate that is playing.
|
||||
@@ -638,7 +666,12 @@ private fun PlayerControls(
|
||||
scrubbing = null
|
||||
},
|
||||
valueRange = 0f..duration,
|
||||
track = { AccentTrack(it) },
|
||||
track = {
|
||||
AccentTrack(
|
||||
it,
|
||||
buffered = if (state.duration > 0) (state.cachedUntil / state.duration).toFloat() else 0f,
|
||||
)
|
||||
},
|
||||
)
|
||||
ChapterMarks(chapters, state.duration, Modifier.matchParentSize())
|
||||
}
|
||||
@@ -664,6 +697,9 @@ private fun PlayerControls(
|
||||
CompactIcon(Icons.Default.SkipNext, "Next episode", enabled = hasNext, onClick = onNext)
|
||||
}
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
if (episodes.size > 1) {
|
||||
CompactIcon(Icons.Default.VideoLibrary, "Episodes") { showEpisodes = true }
|
||||
}
|
||||
if (chapters.size > 1) {
|
||||
CompactIcon(Icons.AutoMirrored.Filled.Toc, "Chapters") { showChapters = true }
|
||||
}
|
||||
@@ -716,6 +752,14 @@ private fun PlayerControls(
|
||||
},
|
||||
)
|
||||
}
|
||||
if (showEpisodes) {
|
||||
EpisodeChooser(
|
||||
episodes = episodes,
|
||||
playing = playing,
|
||||
onDismiss = { showEpisodes = false },
|
||||
onSelect = { showEpisodes = false; onEpisode(it) },
|
||||
)
|
||||
}
|
||||
if (showChapters) {
|
||||
ChapterChooser(
|
||||
chapters = chapters,
|
||||
@@ -870,6 +914,83 @@ private fun ChapterChooser(
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* The title's episodes, from the player: a sheet rather than a dialog, opened
|
||||
* scrolled to the one playing so the next few are in view without a search.
|
||||
* Each row has its still, its name, and whether it is playing, watched or
|
||||
* part way.
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun EpisodeChooser(
|
||||
episodes: List<EpisodeRecord>,
|
||||
playing: Int,
|
||||
onDismiss: () -> Unit,
|
||||
onSelect: (Int) -> Unit,
|
||||
) {
|
||||
val list = rememberLazyListState(initialFirstVisibleItemIndex = (playing - 1).coerceAtLeast(0))
|
||||
ModalBottomSheet(onDismissRequest = onDismiss) {
|
||||
Text(
|
||||
"Episodes",
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
modifier = Modifier.padding(horizontal = 24.dp, vertical = 8.dp),
|
||||
)
|
||||
LazyColumn(state = list, contentPadding = PaddingValues(bottom = 24.dp)) {
|
||||
itemsIndexed(episodes, key = { _, it -> it.linkId }) { position, episode ->
|
||||
val current = position == playing
|
||||
Row(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.clickable { onSelect(position) }
|
||||
.background(
|
||||
if (current) MaterialTheme.colorScheme.secondaryContainer else Color.Transparent,
|
||||
)
|
||||
.padding(horizontal = 16.dp, vertical = 8.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Box(Modifier.width(112.dp).aspectRatio(16f / 9f).clip(MaterialTheme.shapes.small)) {
|
||||
RemoteArtwork(
|
||||
episode.stillUrl,
|
||||
episode.label,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = episode.thumbnailSource,
|
||||
labelled = false,
|
||||
)
|
||||
episode.progress?.takeIf { !episode.watched && !current }?.let { progress ->
|
||||
AccentProgress(
|
||||
progress = { progress.toFloat().coerceIn(0f, 1f) },
|
||||
modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
|
||||
)
|
||||
}
|
||||
}
|
||||
Column(Modifier.weight(1f).padding(start = 12.dp)) {
|
||||
Text(
|
||||
episode.providerName ?: episode.label,
|
||||
style = MaterialTheme.typography.titleSmall,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
Text(
|
||||
when {
|
||||
current -> "Playing"
|
||||
episode.watched -> "${episode.label} · Watched"
|
||||
episode.resumeAt != null -> "${episode.label} · Part way"
|
||||
else -> episode.label
|
||||
},
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = if (current) {
|
||||
MaterialTheme.colorScheme.primary
|
||||
} else {
|
||||
MaterialTheme.colorScheme.onSurfaceVariant
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The countdown into the next episode, shown once the credits run starts.
|
||||
*
|
||||
@@ -898,26 +1019,65 @@ private fun UpNextCard(
|
||||
}
|
||||
// `showing` already implies a non-null episode, and the compiler knows it.
|
||||
if (!showing) return
|
||||
// Eased between ticks, so the ring runs down rather than stepping once a
|
||||
// second.
|
||||
val ring by animateFloatAsState(
|
||||
targetValue = remaining.toFloat() / UP_NEXT_SECONDS,
|
||||
animationSpec = tween(durationMillis = 1_000, easing = LinearEasing),
|
||||
label = "up-next countdown",
|
||||
)
|
||||
Column(
|
||||
modifier
|
||||
.background(MaterialTheme.colorScheme.surfaceContainerHighest, MaterialTheme.shapes.small)
|
||||
.width(280.dp)
|
||||
.background(MaterialTheme.colorScheme.surfaceContainerHighest, MaterialTheme.shapes.medium)
|
||||
.padding(12.dp),
|
||||
) {
|
||||
Text(
|
||||
"Up next in ${remaining}s",
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
)
|
||||
Text(
|
||||
upNext.label,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
style = MaterialTheme.typography.titleSmall,
|
||||
)
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 8.dp)) {
|
||||
AccentButton(onClick = onPlayNow) { Text("Play now") }
|
||||
QuietButton(onClick = { held = true }) { Text("Watch till the end") }
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
// The next episode's still, so the card says which episode
|
||||
// without being read; the ring over it is both the countdown and
|
||||
// the button that skips it.
|
||||
Box(
|
||||
Modifier
|
||||
.width(112.dp)
|
||||
.aspectRatio(16f / 9f)
|
||||
.clip(MaterialTheme.shapes.small)
|
||||
.clickable(onClick = onPlayNow),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
RemoteArtwork(
|
||||
upNext.stillUrl,
|
||||
upNext.label,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = upNext.thumbnailSource,
|
||||
labelled = false,
|
||||
)
|
||||
Box(Modifier.size(40.dp).clip(CircleShape).background(Color.Black.copy(alpha = 0.5f)))
|
||||
CircularProgressIndicator(
|
||||
progress = { ring },
|
||||
modifier = Modifier.size(40.dp),
|
||||
color = Color.White,
|
||||
trackColor = Color.White.copy(alpha = 0.25f),
|
||||
strokeWidth = 3.dp,
|
||||
)
|
||||
Icon(Icons.Default.PlayArrow, contentDescription = "Play now", tint = Color.White)
|
||||
}
|
||||
Column(Modifier.weight(1f).padding(start = 12.dp)) {
|
||||
Text(
|
||||
"Up next in ${remaining}s",
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
)
|
||||
Text(
|
||||
upNext.providerName ?: upNext.label,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
style = MaterialTheme.typography.titleSmall,
|
||||
)
|
||||
}
|
||||
}
|
||||
QuietButton(onClick = { held = true }, modifier = Modifier.padding(top = 4.dp)) {
|
||||
Text("Watch till the end")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -92,6 +92,7 @@ interface LibmpvHost {
|
||||
audioLanguage: String? = null,
|
||||
subtitleLanguage: String? = null,
|
||||
subtitles: Boolean = true,
|
||||
hardwareDecoding: Boolean = true,
|
||||
)
|
||||
|
||||
/** Calls pstr_android_stream_release exactly once for a published handle. */
|
||||
|
||||
@@ -20,9 +20,34 @@ class SettingsStore(context: Context) {
|
||||
get() = preferences.getBoolean(KEY_BACKGROUND_AUDIO, true)
|
||||
set(value) { preferences.edit().putBoolean(KEY_BACKGROUND_AUDIO, value).apply() }
|
||||
|
||||
private companion object {
|
||||
const val NAME = "proton_stream_settings"
|
||||
const val KEY_WIFI_ONLY = "wifi_only"
|
||||
const val KEY_BACKGROUND_AUDIO = "background_audio"
|
||||
/**
|
||||
* Whether mpv may decode in hardware. Off is the way out for a device whose
|
||||
* MediaCodec decoder shows green or torn frames; it costs battery, so it is
|
||||
* on unless the viewer turns it off. Read at each load, so a change applies
|
||||
* from the next file.
|
||||
*/
|
||||
var hardwareDecoding: Boolean
|
||||
get() = preferences.getBoolean(KEY_HARDWARE_DECODING, true)
|
||||
set(value) { preferences.edit().putBoolean(KEY_HARDWARE_DECODING, value).apply() }
|
||||
|
||||
/** The streaming cache's budget, in GiB. See [CACHE_BUDGET_CHOICES]. */
|
||||
var cacheBudgetGib: Int
|
||||
get() = preferences.getInt(KEY_CACHE_BUDGET_GIB, DEFAULT_CACHE_BUDGET_GIB)
|
||||
set(value) { preferences.edit().putInt(KEY_CACHE_BUDGET_GIB, value).apply() }
|
||||
|
||||
companion object {
|
||||
/** The desktop's range, in the steps a phone's storage is bought in. */
|
||||
val CACHE_BUDGET_CHOICES = listOf(1, 2, 4, 8, 16)
|
||||
|
||||
/** `DiskCacheConfig::DEFAULT_BUDGET_BYTES`, so an unset choice changes nothing. */
|
||||
const val DEFAULT_CACHE_BUDGET_GIB = 4
|
||||
|
||||
fun gibToBytes(gib: Int): ULong = gib.toULong() * 1024uL * 1024uL * 1024uL
|
||||
|
||||
private const val NAME = "proton_stream_settings"
|
||||
private const val KEY_WIFI_ONLY = "wifi_only"
|
||||
private const val KEY_BACKGROUND_AUDIO = "background_audio"
|
||||
private const val KEY_HARDWARE_DECODING = "hardware_decoding"
|
||||
private const val KEY_CACHE_BUDGET_GIB = "cache_budget_gib"
|
||||
}
|
||||
}
|
||||
@@ -25,6 +25,8 @@ import kotlinx.coroutines.flow.callbackFlow
|
||||
import kotlinx.coroutines.channels.awaitClose
|
||||
import kotlinx.coroutines.withContext
|
||||
import io.narl.protonstream.native.NativeRuntime
|
||||
import uniffi.pstr_android.ArrangementRecord
|
||||
import uniffi.pstr_android.LibrarySort
|
||||
import uniffi.pstr_android.ShareRecord
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
import uniffi.pstr_android.OfflineRecord
|
||||
@@ -33,12 +35,21 @@ import uniffi.pstr_android.MetadataProvider
|
||||
import uniffi.pstr_android.MetadataSettingsRecord
|
||||
import uniffi.pstr_android.StorageUsageRecord
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
import uniffi.pstr_android.WatchStateRecord
|
||||
|
||||
data class AppUiState(
|
||||
val loading: Boolean = true,
|
||||
val refreshing: Boolean = false,
|
||||
val query: String = "",
|
||||
val titles: List<TitleRecord> = emptyList(),
|
||||
/**
|
||||
* The grid: [titles] ordered, each franchise folded into one tile when
|
||||
* [grouped], and the shelves above it. Null until the bridge has answered,
|
||||
* when the grid falls back to [titles] as they are.
|
||||
*/
|
||||
val arrangement: ArrangementRecord? = null,
|
||||
val sort: LibrarySort = LibrarySort.NAME,
|
||||
val grouped: Boolean = true,
|
||||
val shares: List<ShareRecord> = emptyList(),
|
||||
val offline: List<OfflineRecord> = emptyList(),
|
||||
val metadataSettings: MetadataSettingsRecord = MetadataSettingsRecord(
|
||||
@@ -49,8 +60,16 @@ data class AppUiState(
|
||||
),
|
||||
val storage: StorageUsageRecord = StorageUsageRecord(0uL, 0uL, 0uL, 0uL),
|
||||
val message: String? = null,
|
||||
/** What Undo on [message] puts back, when the message offers one. */
|
||||
val undo: List<WatchSnapshot>? = null,
|
||||
)
|
||||
|
||||
/**
|
||||
* One episode's watch state as it was before a change the viewer can undo.
|
||||
* Null [state] means it had never been played.
|
||||
*/
|
||||
data class WatchSnapshot(val shareId: String, val linkId: String, val state: WatchStateRecord?)
|
||||
|
||||
@OptIn(FlowPreview::class)
|
||||
class AppViewModel(context: Context, private val workManager: WorkManager) : ViewModel() {
|
||||
private val appContext = context.applicationContext
|
||||
@@ -77,6 +96,12 @@ class AppViewModel(context: Context, private val workManager: WorkManager) : Vie
|
||||
}
|
||||
}
|
||||
|
||||
/** Reorder the grid, or fold or unfold its franchises. */
|
||||
fun arrange(sort: LibrarySort, grouped: Boolean) {
|
||||
mutableState.update { it.copy(sort = sort, grouped = grouped) }
|
||||
viewModelScope.launch { reloadLibrary(mutableState.value.query) }
|
||||
}
|
||||
|
||||
fun search(query: String) {
|
||||
mutableState.update { it.copy(query = query) }
|
||||
searchQuery.value = query
|
||||
@@ -185,7 +210,101 @@ class AppViewModel(context: Context, private val workManager: WorkManager) : Vie
|
||||
}
|
||||
}
|
||||
|
||||
fun dismissMessage() = mutableState.update { it.copy(message = null) }
|
||||
fun dismissMessage() = mutableState.update { it.copy(message = null, undo = null) }
|
||||
|
||||
/**
|
||||
* Every episode of a title watched or unwatched, with an Undo: a whole
|
||||
* title's positions are what this throws away, and a mis-tap on a tile's
|
||||
* menu should not cost them.
|
||||
*/
|
||||
fun setTitleWatched(title: TitleRecord, watched: Boolean) {
|
||||
val episodes = title.seasons.flatMap { it.episodes }
|
||||
changeWatch(
|
||||
episodes,
|
||||
"${title.displayName} marked ${if (watched) "watched" else "unwatched"}",
|
||||
) { engine, episode, before ->
|
||||
val duration = before?.durationSecs
|
||||
engine.saveWatchState(
|
||||
episode.shareId,
|
||||
episode.linkId,
|
||||
if (watched) duration ?: 0.0 else 0.0,
|
||||
duration,
|
||||
watched,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Off Continue watching by forgetting where the episode stopped — what the
|
||||
* desktop does — with an Undo that puts the position back.
|
||||
*/
|
||||
fun forgetPosition(title: TitleRecord, episode: EpisodeRecord) {
|
||||
changeWatch(
|
||||
listOf(episode),
|
||||
"${title.displayName} removed from Continue watching",
|
||||
) { engine, target, before ->
|
||||
engine.saveWatchState(target.shareId, target.linkId, 0.0, before?.durationSecs, false)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Off the history page: the position and the watched mark both go, which
|
||||
* is "never played", with an Undo.
|
||||
*/
|
||||
fun removeFromHistory(title: TitleRecord, episode: EpisodeRecord) {
|
||||
changeWatch(
|
||||
listOf(episode),
|
||||
"${episode.label} of ${title.displayName} removed from history",
|
||||
) { engine, target, before ->
|
||||
engine.saveWatchState(target.shareId, target.linkId, 0.0, before?.durationSecs, false)
|
||||
}
|
||||
}
|
||||
|
||||
/** Put back what the last undoable change replaced. */
|
||||
fun undo() {
|
||||
val snapshots = mutableState.value.undo ?: return
|
||||
mutableState.update { it.copy(message = null, undo = null) }
|
||||
viewModelScope.launch {
|
||||
runCatching {
|
||||
withContext(Dispatchers.IO) {
|
||||
val engine = NativeRuntime.engine()
|
||||
snapshots.forEach { snapshot ->
|
||||
val state = snapshot.state
|
||||
engine.saveWatchState(
|
||||
snapshot.shareId,
|
||||
snapshot.linkId,
|
||||
state?.positionSecs ?: 0.0,
|
||||
state?.durationSecs,
|
||||
state?.watched ?: false,
|
||||
)
|
||||
}
|
||||
}
|
||||
}.onFailure(::reportError)
|
||||
reload()
|
||||
}
|
||||
}
|
||||
|
||||
private fun changeWatch(
|
||||
episodes: List<EpisodeRecord>,
|
||||
message: String,
|
||||
change: (uniffi.pstr_android.AndroidEngine, EpisodeRecord, WatchStateRecord?) -> Unit,
|
||||
) {
|
||||
viewModelScope.launch {
|
||||
runCatching {
|
||||
withContext(Dispatchers.IO) {
|
||||
val engine = NativeRuntime.engine()
|
||||
episodes.map { episode ->
|
||||
val before = engine.watchState(episode.shareId, episode.linkId)
|
||||
change(engine, episode, before)
|
||||
WatchSnapshot(episode.shareId, episode.linkId, before)
|
||||
}
|
||||
}
|
||||
}.onSuccess { snapshots ->
|
||||
mutableState.update { it.copy(message = message, undo = snapshots) }
|
||||
}.onFailure(::reportError)
|
||||
reload()
|
||||
}
|
||||
}
|
||||
|
||||
fun reportError(error: Throwable) {
|
||||
mutableState.update { it.copy(message = error.message ?: "Unexpected error") }
|
||||
@@ -341,9 +460,12 @@ class AppViewModel(context: Context, private val workManager: WorkManager) : Vie
|
||||
// and cached: a full reload is the one place that has
|
||||
// already paid for a walk of the offline files.
|
||||
engine.pruneOfflineFiles()
|
||||
val current = mutableState.value
|
||||
val query = current.query.takeIf(String::isNotBlank)
|
||||
Reloaded(
|
||||
engine.shares(),
|
||||
engine.library(mutableState.value.query.takeIf(String::isNotBlank)),
|
||||
engine.library(query),
|
||||
engine.arrangement(query, current.sort, current.grouped),
|
||||
engine.offlineFiles(),
|
||||
engine.metadataSettings(),
|
||||
engine.storageUsage(),
|
||||
@@ -354,6 +476,7 @@ class AppViewModel(context: Context, private val workManager: WorkManager) : Vie
|
||||
loading = false,
|
||||
shares = result.shares,
|
||||
titles = result.titles,
|
||||
arrangement = result.arrangement,
|
||||
offline = result.offline,
|
||||
metadataSettings = result.metadataSettings,
|
||||
storage = result.storage,
|
||||
@@ -366,10 +489,16 @@ class AppViewModel(context: Context, private val workManager: WorkManager) : Vie
|
||||
}
|
||||
|
||||
private suspend fun reloadLibrary(query: String) {
|
||||
val current = mutableState.value
|
||||
runCatching {
|
||||
withContext(Dispatchers.IO) { NativeRuntime.engine().library(query.takeIf(String::isNotBlank)) }
|
||||
}.onSuccess { titles -> mutableState.update { it.copy(titles = titles) } }
|
||||
.onFailure { error -> mutableState.update { it.copy(message = error.message) } }
|
||||
withContext(Dispatchers.IO) {
|
||||
val engine = NativeRuntime.engine()
|
||||
val search = query.takeIf(String::isNotBlank)
|
||||
engine.library(search) to engine.arrangement(search, current.sort, current.grouped)
|
||||
}
|
||||
}.onSuccess { (titles, arrangement) ->
|
||||
mutableState.update { it.copy(titles = titles, arrangement = arrangement) }
|
||||
}.onFailure { error -> mutableState.update { it.copy(message = error.message) } }
|
||||
}
|
||||
|
||||
class Factory(private val context: Context, private val workManager: WorkManager) : ViewModelProvider.Factory {
|
||||
@@ -381,6 +510,7 @@ class AppViewModel(context: Context, private val workManager: WorkManager) : Vie
|
||||
private data class Reloaded(
|
||||
val shares: List<ShareRecord>,
|
||||
val titles: List<TitleRecord>,
|
||||
val arrangement: ArrangementRecord,
|
||||
val offline: List<OfflineRecord>,
|
||||
val metadataSettings: MetadataSettingsRecord,
|
||||
val storage: StorageUsageRecord,
|
||||
|
||||
@@ -0,0 +1,139 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.animation.AnimatedVisibilityScope
|
||||
import androidx.compose.animation.ExperimentalSharedTransitionApi
|
||||
import androidx.compose.animation.SharedTransitionScope
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.RowScope
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.TopAppBarColors
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.staticCompositionLocalOf
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
|
||||
/**
|
||||
* A tab's page: its own name in an app bar, over whatever the page holds.
|
||||
*
|
||||
* One bar for the whole app said "proton-stream" on every page, which is a band
|
||||
* of height spent naming the app the viewer is already in. The bar draws under
|
||||
* the status bar itself, which is why the shell hands pages no top padding;
|
||||
* [content] gets the rest of [padding] (the navigation bar and the mini
|
||||
* transport) to apply as it scrolls.
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
internal fun TabPage(
|
||||
title: String,
|
||||
padding: PaddingValues,
|
||||
navigationIcon: @Composable () -> Unit = {},
|
||||
actions: @Composable RowScope.() -> Unit = {},
|
||||
content: @Composable (PaddingValues) -> Unit,
|
||||
) {
|
||||
// Pinned: the bar stays, and takes the container tint once the page has
|
||||
// scrolled under it, so the edge between the two is still visible.
|
||||
val scroll = TopAppBarDefaults.pinnedScrollBehavior()
|
||||
Column(Modifier.fillMaxSize().nestedScroll(scroll.nestedScrollConnection)) {
|
||||
TopAppBar(
|
||||
title = { Text(title) },
|
||||
navigationIcon = navigationIcon,
|
||||
actions = actions,
|
||||
colors = pageBarColors(),
|
||||
scrollBehavior = scroll,
|
||||
)
|
||||
Box(Modifier.weight(1f)) { content(padding) }
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The page's own background until something scrolls under the bar, then the
|
||||
* container tint. A bar in `surface` from the start read as a band across the
|
||||
* top of a page drawn in `background`.
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
internal fun pageBarColors(): TopAppBarColors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = MaterialTheme.colorScheme.background,
|
||||
scrolledContainerColor = MaterialTheme.colorScheme.surfaceContainer,
|
||||
)
|
||||
|
||||
/**
|
||||
* The shared-element scopes the library-to-title switch runs in, or null where
|
||||
* there is none — the two-pane layout, a screenshot, a preview. Locals rather
|
||||
* than parameters, because the poster that animates is three calls deep in the
|
||||
* grid and nothing between needs to know.
|
||||
*/
|
||||
@OptIn(ExperimentalSharedTransitionApi::class)
|
||||
internal val LocalSharedTransition = staticCompositionLocalOf<SharedTransitionScope?> { null }
|
||||
internal val LocalPaneVisibility = staticCompositionLocalOf<AnimatedVisibilityScope?> { null }
|
||||
|
||||
/**
|
||||
* A title's art as one element across the switch: the poster tapped in the
|
||||
* grid grows into the backdrop of the page it opens, and shrinks back on the
|
||||
* way out, so the page is visibly *that* title's rather than a new screen.
|
||||
*/
|
||||
@OptIn(ExperimentalSharedTransitionApi::class)
|
||||
@Composable
|
||||
internal fun Modifier.sharedArt(key: String): Modifier {
|
||||
val transition = LocalSharedTransition.current ?: return this
|
||||
val visibility = LocalPaneVisibility.current ?: return this
|
||||
return with(transition) {
|
||||
this@sharedArt.sharedBounds(rememberSharedContentState("art/$key"), visibility)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun EmptyState(title: String, body: String) {
|
||||
Box(Modifier.fillMaxSize(), contentAlignment = Alignment.Center) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(title, style = MaterialTheme.typography.titleMedium)
|
||||
Text(body, style = MaterialTheme.typography.bodyMedium)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Where Play on a title lands: the most recently played part-watched episode,
|
||||
* else the first unwatched one, else the first — the desktop's `next_up`.
|
||||
*/
|
||||
internal fun nextUpIndex(playlist: List<EpisodeRecord>): Int =
|
||||
playlist.withIndex().filter { it.value.resumeAt != null }.maxByOrNull { it.value.lastPlayed }?.index
|
||||
?: playlist.indexOfFirst { !it.watched }.takeIf { it >= 0 }
|
||||
?: 0
|
||||
|
||||
internal fun formatBytes(bytes: ULong): String {
|
||||
val value = bytes.toDouble()
|
||||
return when {
|
||||
value >= 1024 * 1024 * 1024 -> "%.1f GiB".format(value / (1024 * 1024 * 1024))
|
||||
value >= 1024 * 1024 -> "%.1f MiB".format(value / (1024 * 1024))
|
||||
value >= 1024 -> "%.1f KiB".format(value / 1024)
|
||||
else -> "$bytes bytes"
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* What an episode row is headed with: "1. Mother and Children".
|
||||
*
|
||||
* The provider's name for the episode, else the name the filename gave it,
|
||||
* else "Episode 1". The bare filename only when none of those exist — a column
|
||||
* of `[Group] Show - S01E01.mkv` is forty rows that differ in two characters.
|
||||
*/
|
||||
internal fun EpisodeRecord.heading(position: Int): String {
|
||||
val named = providerName ?: detail.takeIf { it != name }
|
||||
val number = number?.toInt()
|
||||
return when {
|
||||
named != null && number != null -> "$number. $named"
|
||||
named != null -> named
|
||||
number != null -> "Episode $number"
|
||||
else -> name.substringBeforeLast('.').ifBlank { "Episode ${position + 1}" }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,243 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.Pause
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
import androidx.compose.material.icons.outlined.Delete
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.ListItem
|
||||
import androidx.compose.material3.ListItemDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.livedata.observeAsState
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.work.WorkManager
|
||||
import io.narl.protonstream.download.DownloadCoordinator
|
||||
import io.narl.protonstream.download.DownloadStateStore
|
||||
import io.narl.protonstream.download.RetainedDownload
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.AccentProgress
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
import uniffi.pstr_android.OfflineRecord
|
||||
import uniffi.pstr_android.SeasonRecord
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
|
||||
/** One show's saved episodes, and the show itself where the library has it. */
|
||||
private data class OfflineGroup(val name: String, val title: TitleRecord?, val files: List<OfflineRecord>)
|
||||
|
||||
@Composable
|
||||
internal fun DownloadsScreen(
|
||||
state: AppUiState,
|
||||
onRemove: (OfflineRecord) -> Unit,
|
||||
onPause: (RetainedDownload) -> Unit,
|
||||
onResume: (RetainedDownload) -> Unit,
|
||||
onDeletePartial: (RetainedDownload) -> Unit,
|
||||
padding: PaddingValues,
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val work = WorkManager.getInstance(context).getWorkInfosByTagLiveData(DownloadCoordinator.TAG)
|
||||
val downloads by work.observeAsState(emptyList())
|
||||
// Reading retained metadata on every WorkInfo transition also hydrates
|
||||
// paused/failed/cancelled entries after WorkManager history is pruned.
|
||||
val retained = remember(downloads) { DownloadStateStore(context).records() }
|
||||
// Which show each saved file is from. The offline record knows its episode
|
||||
// but not its show, and the library is the only thing that does.
|
||||
val groups = remember(state.offline, state.titles) {
|
||||
val shows = state.titles.flatMap { title ->
|
||||
title.seasons.flatMap(SeasonRecord::episodes).map { "${it.shareId}/${it.linkId}" to title }
|
||||
}.toMap()
|
||||
state.offline
|
||||
.groupBy { shows["${it.shareId}/${it.linkId}"] }
|
||||
.map { (title, files) ->
|
||||
OfflineGroup(title?.displayName ?: "Not in the library", title, files)
|
||||
}
|
||||
.sortedBy { it.name }
|
||||
}
|
||||
// Deleting a saved episode asks first: it is the viewer's own choice to
|
||||
// keep it, and getting it back is a download, not a tap.
|
||||
var deleting by remember { mutableStateOf<OfflineRecord?>(null) }
|
||||
TabPage("Downloads", padding) { body ->
|
||||
if (retained.isEmpty() && state.offline.isEmpty()) {
|
||||
Box(Modifier.fillMaxSize().padding(body)) {
|
||||
EmptyState("No downloads", "Episodes, seasons and shows saved offline appear here.")
|
||||
}
|
||||
return@TabPage
|
||||
}
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize().padding(body),
|
||||
contentPadding = PaddingValues(bottom = 24.dp),
|
||||
) {
|
||||
if (state.offline.isNotEmpty()) {
|
||||
item(key = "summary") {
|
||||
Text(
|
||||
"${state.offline.size} ${if (state.offline.size == 1) "episode" else "episodes"} · " +
|
||||
"${formatBytes(state.offline.sumOf { it.size })} on this device",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(horizontal = 16.dp, vertical = 4.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
// What is still arriving comes first: it is the part of the page
|
||||
// that changes, and the part with something to do.
|
||||
if (retained.isNotEmpty()) {
|
||||
item(key = "in-progress") { SectionHeading("In progress") }
|
||||
items(retained, key = { "partial/${it.shareId}/${it.linkId}" }) { download ->
|
||||
PartialRow(download, onPause, onResume, onDeletePartial)
|
||||
}
|
||||
}
|
||||
// Under the show they belong to, as on desktop: a saved season is
|
||||
// fourteen rows, and fourteen rows of "Episode 3" name nothing.
|
||||
groups.forEach { group ->
|
||||
item(key = "group/${group.name}") {
|
||||
SectionHeading(
|
||||
group.name,
|
||||
"${group.files.size} ${if (group.files.size == 1) "episode" else "episodes"} · " +
|
||||
formatBytes(group.files.sumOf { it.size }),
|
||||
)
|
||||
}
|
||||
items(group.files, key = { "${it.shareId}/${it.linkId}" }) { file ->
|
||||
SavedRow(file, group.title, onDelete = { deleting = file })
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
deleting?.let { file ->
|
||||
AlertDialog(
|
||||
onDismissRequest = { deleting = null },
|
||||
title = { Text("Delete this download?") },
|
||||
text = {
|
||||
Text(
|
||||
"${file.episode?.label ?: "The episode"} (${formatBytes(file.size)}) leaves this device. " +
|
||||
"It still streams, and can be downloaded again.",
|
||||
)
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(onClick = {
|
||||
deleting = null
|
||||
onRemove(file)
|
||||
}) { Text("Delete") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = { deleting = null }) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun SectionHeading(title: String, caption: String? = null) {
|
||||
Column(Modifier.padding(start = 16.dp, end = 16.dp, top = 20.dp, bottom = 4.dp)) {
|
||||
Text(title, style = MaterialTheme.typography.titleMedium, maxLines = 1, overflow = TextOverflow.Ellipsis)
|
||||
caption?.let {
|
||||
Text(it, style = MaterialTheme.typography.bodySmall, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** A saved episode: its still, what it is, its size, and a way to remove it. */
|
||||
@Composable
|
||||
private fun SavedRow(file: OfflineRecord, title: TitleRecord?, onDelete: () -> Unit) {
|
||||
val episode = file.episode
|
||||
ListItem(
|
||||
leadingContent = {
|
||||
RemoteArtwork(
|
||||
episode?.stillUrl ?: title?.backdropUrl,
|
||||
title?.name ?: file.linkId,
|
||||
Modifier.width(96.dp).aspectRatio(16f / 9f).clip(MaterialTheme.shapes.small),
|
||||
fallback = episode?.thumbnailSource,
|
||||
labelled = episode == null,
|
||||
)
|
||||
},
|
||||
headlineContent = {
|
||||
Text(episode?.heading(0) ?: file.linkId, maxLines = 2, overflow = TextOverflow.Ellipsis)
|
||||
},
|
||||
supportingContent = {
|
||||
Text(listOfNotNull(episode?.label, formatBytes(file.size)).joinToString(" · "))
|
||||
},
|
||||
trailingContent = {
|
||||
IconButton(onClick = onDelete) {
|
||||
Icon(Icons.Outlined.Delete, contentDescription = "Delete download")
|
||||
}
|
||||
},
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A download not yet finished: how far it has got, why it stopped if it did,
|
||||
* and pause or resume beside cancel.
|
||||
*/
|
||||
@Composable
|
||||
private fun PartialRow(
|
||||
download: RetainedDownload,
|
||||
onPause: (RetainedDownload) -> Unit,
|
||||
onResume: (RetainedDownload) -> Unit,
|
||||
onDeletePartial: (RetainedDownload) -> Unit,
|
||||
) {
|
||||
val active = download.status == RetainedDownload.STATUS_RUNNING ||
|
||||
download.status == RetainedDownload.STATUS_QUEUED
|
||||
ListItem(
|
||||
headlineContent = { Text(download.label, maxLines = 2, overflow = TextOverflow.Ellipsis) },
|
||||
supportingContent = {
|
||||
Column {
|
||||
Text(
|
||||
listOfNotNull(
|
||||
download.status.replaceFirstChar { it.uppercase() },
|
||||
download.total.takeIf { it > 0L }?.let {
|
||||
"${formatBytes(download.downloaded.toULong())} of ${formatBytes(it.toULong())}"
|
||||
},
|
||||
).joinToString(" · "),
|
||||
)
|
||||
if (download.total > 0L) {
|
||||
AccentProgress(
|
||||
progress = { (download.downloaded.toFloat() / download.total).coerceIn(0f, 1f) },
|
||||
modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
|
||||
)
|
||||
}
|
||||
download.error?.let { Text(it, color = MaterialTheme.colorScheme.error) }
|
||||
}
|
||||
},
|
||||
trailingContent = {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
if (active) {
|
||||
IconButton(onClick = { onPause(download) }) {
|
||||
Icon(Icons.Default.Pause, contentDescription = "Pause download")
|
||||
}
|
||||
} else {
|
||||
IconButton(onClick = { onResume(download) }) {
|
||||
Icon(Icons.Default.PlayArrow, contentDescription = "Resume download")
|
||||
}
|
||||
}
|
||||
// What has arrived so far is discarded; nothing finished is.
|
||||
IconButton(onClick = { onDeletePartial(download) }) {
|
||||
Icon(Icons.Default.Close, contentDescription = "Cancel and delete what has arrived")
|
||||
}
|
||||
}
|
||||
},
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,183 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import io.narl.protonstream.ui.theme.AccentProgress
|
||||
import java.time.Instant
|
||||
import java.time.LocalDate
|
||||
import java.time.ZoneId
|
||||
import java.time.format.DateTimeFormatter
|
||||
import java.time.format.TextStyle
|
||||
import java.util.Locale
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
import uniffi.pstr_android.SeasonRecord
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
|
||||
/** One played episode, with the title it belongs to and its place in that title's playlist. */
|
||||
internal data class Played(val title: TitleRecord, val episode: EpisodeRecord, val index: Int)
|
||||
|
||||
/**
|
||||
* Every episode that has been started or finished, newest first — the
|
||||
* desktop's `Library::history`, over the records the library already holds.
|
||||
*
|
||||
* A row marked unwatched again sits at position zero, which is "never played"
|
||||
* for every purpose here, so it is left out. Progress stands in for the
|
||||
* position: it is non-zero exactly when the position is.
|
||||
*/
|
||||
internal fun history(titles: List<TitleRecord>): List<Played> =
|
||||
titles.flatMap { title ->
|
||||
title.seasons.flatMap(SeasonRecord::episodes).withIndex()
|
||||
.filter { (_, episode) -> episode.watched || (episode.progress ?: 0.0) > 0.0 }
|
||||
.map { (index, episode) -> Played(title, episode, index) }
|
||||
}.sortedByDescending { it.episode.lastPlayed }
|
||||
|
||||
/**
|
||||
* "Today", "Yesterday", a weekday within the last week, then a date — how the
|
||||
* history page heads each day.
|
||||
*/
|
||||
internal fun dayHeading(day: LocalDate, today: LocalDate, locale: Locale = Locale.getDefault()): String = when {
|
||||
day == today -> "Today"
|
||||
day == today.minusDays(1) -> "Yesterday"
|
||||
day.isAfter(today.minusDays(7)) -> day.dayOfWeek.getDisplayName(TextStyle.FULL, locale)
|
||||
day.year == today.year -> day.format(DateTimeFormatter.ofPattern("d MMMM", locale))
|
||||
else -> day.format(DateTimeFormatter.ofPattern("d MMMM yyyy", locale))
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun HistoryScreen(
|
||||
state: AppUiState,
|
||||
onPlay: (TitleRecord, Int) -> Unit,
|
||||
onTitle: (TitleRecord) -> Unit,
|
||||
onRemove: (TitleRecord, EpisodeRecord) -> Unit,
|
||||
padding: PaddingValues,
|
||||
zone: ZoneId = remember { ZoneId.systemDefault() },
|
||||
today: LocalDate = LocalDate.now(zone),
|
||||
) {
|
||||
val days = remember(state.titles) {
|
||||
history(state.titles).groupBy { Instant.ofEpochSecond(it.episode.lastPlayed).atZone(zone).toLocalDate() }
|
||||
}
|
||||
if (days.isEmpty()) {
|
||||
TabPage("History", padding) { body ->
|
||||
Box(Modifier.fillMaxSize().padding(body)) {
|
||||
EmptyState("Nothing watched yet", "Episodes you play show up here, newest first.")
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
TabPage("History", padding) { body ->
|
||||
LazyColumn(Modifier.fillMaxSize().padding(body), contentPadding = PaddingValues(bottom = 24.dp)) {
|
||||
days.forEach { (day, played) ->
|
||||
item(key = "day/$day") {
|
||||
Text(
|
||||
dayHeading(day, today),
|
||||
style = MaterialTheme.typography.titleSmall,
|
||||
color = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.padding(start = 16.dp, end = 16.dp, top = 20.dp, bottom = 4.dp),
|
||||
)
|
||||
}
|
||||
items(played, key = { "${it.episode.shareId}/${it.episode.linkId}" }) { entry ->
|
||||
HistoryRow(
|
||||
entry,
|
||||
onPlay = { onPlay(entry.title, entry.index) },
|
||||
onTitle = { onTitle(entry.title) },
|
||||
onRemove = { onRemove(entry.title, entry.episode) },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The still plays the episode, the text opens its title, and the cross takes
|
||||
* it off the page — the same three targets the desktop row has.
|
||||
*/
|
||||
@Composable
|
||||
private fun HistoryRow(entry: Played, onPlay: () -> Unit, onTitle: () -> Unit, onRemove: () -> Unit) {
|
||||
val episode = entry.episode
|
||||
Row(
|
||||
Modifier.fillMaxWidth().padding(start = 16.dp, end = 4.dp, top = 6.dp, bottom = 6.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
Box(
|
||||
Modifier
|
||||
.width(128.dp)
|
||||
.aspectRatio(16f / 9f)
|
||||
.clip(MaterialTheme.shapes.small)
|
||||
.clickable(onClick = onPlay),
|
||||
) {
|
||||
RemoteArtwork(
|
||||
episode.stillUrl ?: entry.title.backdropUrl,
|
||||
episode.label,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = episode.thumbnailSource,
|
||||
labelled = false,
|
||||
)
|
||||
episode.progress?.takeIf { !episode.watched }?.let { progress ->
|
||||
AccentProgress(
|
||||
progress = { progress.toFloat().coerceIn(0f, 1f) },
|
||||
modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
|
||||
)
|
||||
}
|
||||
}
|
||||
Column(Modifier.weight(1f).clickable(onClick = onTitle).padding(horizontal = 12.dp, vertical = 4.dp)) {
|
||||
Text(
|
||||
entry.title.displayName,
|
||||
style = MaterialTheme.typography.titleSmall,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
Text(
|
||||
episode.providerName?.let { "${episode.label} · $it" } ?: episode.label,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
Text(
|
||||
if (episode.watched) "Finished" else episode.stoppedAt(),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
IconButton(onClick = onRemove) {
|
||||
Icon(Icons.Default.Close, contentDescription = "Remove from history")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** "Stopped at 12:04 of 23:40", or as much of it as is known. */
|
||||
private fun EpisodeRecord.stoppedAt(): String {
|
||||
val at = resumeAt ?: return "Started"
|
||||
val duration = progress?.takeIf { it > 0.0 }?.let { at / it }
|
||||
return "Stopped at ${clock(at)}" + (duration?.let { " of ${clock(it)}" } ?: "")
|
||||
}
|
||||
|
||||
private fun clock(seconds: Double): String {
|
||||
val total = seconds.toInt().coerceAtLeast(0)
|
||||
val hours = total / 3_600
|
||||
return if (hours > 0) "%d:%02d:%02d".format(hours, total % 3_600 / 60, total % 60)
|
||||
else "%d:%02d".format(total / 60, total % 60)
|
||||
}
|
||||
@@ -0,0 +1,183 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.ListItem
|
||||
import androidx.compose.material3.ListItemDefaults
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.RadioButton
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.ui.unit.dp
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
|
||||
/**
|
||||
* The languages offered by name, as the three-letter tag a Matroska file
|
||||
* carries.
|
||||
*
|
||||
* The same short list the desktop names tracks from (`pstr-player`'s
|
||||
* `language_name`): what the shares this app is pointed at actually contain.
|
||||
* mpv treats the two- and three-letter forms of a language as one, so the tag
|
||||
* chosen here also matches a file that says "ja". Anything else is still one
|
||||
* typed tag away.
|
||||
*/
|
||||
internal val LANGUAGES: List<Pair<String, String>> = listOf(
|
||||
"jpn" to "Japanese",
|
||||
"eng" to "English",
|
||||
"ger" to "German",
|
||||
"fre" to "French",
|
||||
"spa" to "Spanish",
|
||||
"ita" to "Italian",
|
||||
"por" to "Portuguese",
|
||||
"dut" to "Dutch",
|
||||
"rus" to "Russian",
|
||||
"pol" to "Polish",
|
||||
"swe" to "Swedish",
|
||||
"dan" to "Danish",
|
||||
"nor" to "Norwegian",
|
||||
"fin" to "Finnish",
|
||||
"cze" to "Czech",
|
||||
"hun" to "Hungarian",
|
||||
"tur" to "Turkish",
|
||||
"ara" to "Arabic",
|
||||
"heb" to "Hebrew",
|
||||
"hin" to "Hindi",
|
||||
"kor" to "Korean",
|
||||
"chi" to "Chinese",
|
||||
"tha" to "Thai",
|
||||
"vie" to "Vietnamese",
|
||||
"ukr" to "Ukrainian",
|
||||
"rum" to "Romanian",
|
||||
"gre" to "Greek",
|
||||
"ind" to "Indonesian",
|
||||
"may" to "Malay",
|
||||
)
|
||||
|
||||
/**
|
||||
* "Japanese", for a tag in any of the forms a file or the desktop may have
|
||||
* stored — "jpn", "ja", "JA-jp" — and the tag itself for one not on the list.
|
||||
* Null is no preference.
|
||||
*/
|
||||
internal fun languageLabel(tag: String?): String {
|
||||
val value = tag?.trim()?.takeIf(String::isNotEmpty) ?: return "No preference"
|
||||
return languageOf(value)?.second ?: value
|
||||
}
|
||||
|
||||
/** The listed language a tag names, matching either ISO 639 form. */
|
||||
private fun languageOf(tag: String): Pair<String, String>? {
|
||||
val base = tag.split('-', '_').first().lowercase()
|
||||
return LANGUAGES.firstOrNull { (code, _) -> code == base || TWO_LETTER[code] == base || terminology(code) == base }
|
||||
}
|
||||
|
||||
/** ISO 639-2/T, for the handful whose bibliographic code differs. */
|
||||
private fun terminology(code: String): String? = when (code) {
|
||||
"ger" -> "deu"
|
||||
"fre" -> "fra"
|
||||
"dut" -> "nld"
|
||||
"cze" -> "ces"
|
||||
"chi" -> "zho"
|
||||
"rum" -> "ron"
|
||||
"gre" -> "ell"
|
||||
"may" -> "msa"
|
||||
else -> null
|
||||
}
|
||||
|
||||
/** ISO 639-1, the form a file or the desktop may also have stored. */
|
||||
private val TWO_LETTER = mapOf(
|
||||
"jpn" to "ja", "eng" to "en", "ger" to "de", "fre" to "fr", "spa" to "es", "ita" to "it",
|
||||
"por" to "pt", "dut" to "nl", "rus" to "ru", "pol" to "pl", "swe" to "sv", "dan" to "da",
|
||||
"nor" to "no", "fin" to "fi", "cze" to "cs", "hun" to "hu", "tur" to "tr", "ara" to "ar",
|
||||
"heb" to "he", "hin" to "hi", "kor" to "ko", "chi" to "zh", "tha" to "th", "vie" to "vi",
|
||||
"ukr" to "uk", "rum" to "ro", "gre" to "el", "ind" to "id", "may" to "ms",
|
||||
)
|
||||
|
||||
/**
|
||||
* A language preference as a row, opening a list to choose from.
|
||||
*
|
||||
* It was a free-text field asking for "jpn or eng", which is a question only
|
||||
* someone who has read a Matroska header can answer.
|
||||
*/
|
||||
@Composable
|
||||
internal fun LanguageSetting(headline: String, value: String?, onChange: (String?) -> Unit) {
|
||||
var choosing by remember { mutableStateOf(false) }
|
||||
ListItem(
|
||||
headlineContent = { Text(headline) },
|
||||
supportingContent = { Text(languageLabel(value)) },
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
modifier = Modifier.clickable(role = Role.Button) { choosing = true },
|
||||
)
|
||||
if (choosing) {
|
||||
LanguageDialog(
|
||||
headline,
|
||||
value,
|
||||
onDismiss = { choosing = false },
|
||||
onChoose = {
|
||||
choosing = false
|
||||
onChange(it)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun LanguageDialog(headline: String, value: String?, onDismiss: () -> Unit, onChoose: (String?) -> Unit) {
|
||||
val current = value?.let(::languageOf)?.first ?: value
|
||||
// A tag that is not on the list starts in the field, so it is shown and
|
||||
// can be edited rather than silently replaced.
|
||||
var typed by remember { mutableStateOf(current?.takeIf { tag -> LANGUAGES.none { it.first == tag } }.orEmpty()) }
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
title = { Text(headline) },
|
||||
text = {
|
||||
Column {
|
||||
LazyColumn(Modifier.fillMaxWidth().heightIn(max = 360.dp)) {
|
||||
item(key = "none") { LanguageOption("No preference", current == null) { onChoose(null) } }
|
||||
items(LANGUAGES, key = { it.first }) { (code, name) ->
|
||||
LanguageOption(name, current == code) { onChoose(code) }
|
||||
}
|
||||
}
|
||||
HorizontalDivider(Modifier.padding(vertical = 8.dp))
|
||||
OutlinedTextField(
|
||||
value = typed,
|
||||
onValueChange = { typed = it },
|
||||
label = { Text("Another tag") },
|
||||
supportingText = { Text("As it appears in the file, such as \"tgl\"") },
|
||||
singleLine = true,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(enabled = typed.isNotBlank(), onClick = { onChoose(typed.trim().lowercase()) }) {
|
||||
Text("Use tag")
|
||||
}
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = onDismiss) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun LanguageOption(name: String, selected: Boolean, onClick: () -> Unit) {
|
||||
ListItem(
|
||||
headlineContent = { Text(name, style = MaterialTheme.typography.bodyLarge) },
|
||||
leadingContent = { RadioButton(selected = selected, onClick = null) },
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
modifier = Modifier.clickable(role = Role.RadioButton, onClick = onClick),
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,706 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.material3.LargeTopAppBar
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.ui.focus.FocusRequester
|
||||
import androidx.compose.ui.focus.focusRequester
|
||||
import androidx.compose.ui.input.nestedscroll.nestedScroll
|
||||
import androidx.compose.ui.text.input.ImeAction
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
import java.time.LocalDate
|
||||
import androidx.compose.foundation.combinedClickable
|
||||
import androidx.compose.material.icons.filled.CheckCircle
|
||||
import androidx.compose.material.icons.filled.Download
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material.icons.filled.Info
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
import androidx.compose.material.icons.filled.RemoveCircleOutline
|
||||
import androidx.compose.material.icons.outlined.CheckCircle
|
||||
import androidx.compose.material3.ListItem
|
||||
import androidx.compose.material3.ListItemDefaults
|
||||
import androidx.compose.material3.ModalBottomSheet
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import io.narl.protonstream.download.DownloadCoordinator
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.foundation.lazy.grid.GridCells
|
||||
import androidx.compose.foundation.lazy.grid.GridItemSpan
|
||||
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
|
||||
import androidx.compose.foundation.lazy.grid.items
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
import androidx.compose.material3.pulltorefresh.PullToRefreshBox
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import io.narl.protonstream.ui.theme.AccentProgress
|
||||
import androidx.compose.material.icons.automirrored.filled.Sort
|
||||
import androidx.compose.material.icons.filled.Check
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.DropdownMenuItem
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
import uniffi.pstr_android.LibrarySort
|
||||
import uniffi.pstr_android.SeasonRecord
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
import uniffi.pstr_android.TitleType
|
||||
|
||||
/**
|
||||
* How many shows the continue-watching shelf holds.
|
||||
*
|
||||
* A shelf is a shortcut, not a second library: past about this many it is
|
||||
* quicker to search for the thing than to scroll the shelf looking for it.
|
||||
*/
|
||||
private const val CONTINUE_WATCHING_MAX = 12
|
||||
|
||||
/** One row of the continue-watching shelf: which episode, and where it sits. */
|
||||
private data class Resumable(val title: TitleRecord, val episode: EpisodeRecord, val index: Int)
|
||||
|
||||
/** One tile of the grid: the title drawn, and how many more of its franchise it stands for. */
|
||||
private data class Tile(val title: TitleRecord, val folded: Int)
|
||||
|
||||
/** A row above the grid: titles that share a director, a studio or a genre. */
|
||||
private data class Shelf(val label: String, val titles: List<TitleRecord>)
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
internal fun LibraryScreen(
|
||||
state: AppUiState,
|
||||
onSearch: (String) -> Unit,
|
||||
onResume: (TitleRecord, Int) -> Unit,
|
||||
onTitle: (TitleRecord) -> Unit,
|
||||
onRefresh: () -> Unit,
|
||||
onSetTitleWatched: (TitleRecord, Boolean) -> Unit,
|
||||
onForgetPosition: (TitleRecord, EpisodeRecord) -> Unit,
|
||||
padding: PaddingValues,
|
||||
onMatchChanged: () -> Unit = {},
|
||||
onError: (Throwable) -> Unit = {},
|
||||
onArrange: (LibrarySort, Boolean) -> Unit = { _, _ -> },
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
// What a long press opened a menu for: a title, or a Continue watching card.
|
||||
var menuFor by remember { mutableStateOf<TitleRecord?>(null) }
|
||||
var menuResume by remember { mutableStateOf<Resumable?>(null) }
|
||||
var matching by remember { mutableStateOf<TitleRecord?>(null) }
|
||||
// Most recently played first, one episode per show: a shelf that lists four
|
||||
// episodes of the same series is a shelf with room for nothing else.
|
||||
val resumable = remember(state.titles) {
|
||||
state.titles.mapNotNull { title ->
|
||||
val playlist = title.seasons.flatMap(SeasonRecord::episodes)
|
||||
playlist.withIndex()
|
||||
.filter { it.value.resumeAt != null && !it.value.watched }
|
||||
.maxByOrNull { it.value.lastPlayed }
|
||||
?.let { Resumable(title, it.value, it.index) }
|
||||
}.sortedByDescending { it.episode.lastPlayed }.take(CONTINUE_WATCHING_MAX)
|
||||
}
|
||||
// Search is an icon until it is wanted: a permanent field above the
|
||||
// library spent a band of every visit on something used in few of them.
|
||||
var searching by rememberSaveable { mutableStateOf(state.query.isNotEmpty()) }
|
||||
val closeSearch = {
|
||||
searching = false
|
||||
onSearch("")
|
||||
}
|
||||
BackHandler(enabled = searching, onBack = closeSearch)
|
||||
// The large title folds into the bar as the grid scrolls, and comes back
|
||||
// only at the top: the page says what it is on arrival, then gets out of
|
||||
// the way.
|
||||
val scroll = TopAppBarDefaults.exitUntilCollapsedScrollBehavior()
|
||||
Column(Modifier.fillMaxSize().nestedScroll(scroll.nestedScrollConnection)) {
|
||||
if (searching) {
|
||||
SearchBar(state.query, onSearch, closeSearch)
|
||||
} else {
|
||||
LargeTopAppBar(
|
||||
title = { Text("Library") },
|
||||
actions = {
|
||||
IconButton(onClick = { searching = true }) {
|
||||
Icon(Icons.Default.Search, contentDescription = "Search library")
|
||||
}
|
||||
ArrangeMenu(state.sort, state.grouped, onArrange)
|
||||
// Pull to refresh is the gesture; the icon stays for a
|
||||
// viewer who does not know it.
|
||||
IconButton(onClick = onRefresh, enabled = !state.refreshing) {
|
||||
Icon(Icons.Default.Refresh, contentDescription = "Refresh")
|
||||
}
|
||||
},
|
||||
colors = pageBarColors(),
|
||||
scrollBehavior = scroll,
|
||||
)
|
||||
}
|
||||
PullToRefreshBox(
|
||||
isRefreshing = state.refreshing,
|
||||
onRefresh = onRefresh,
|
||||
modifier = Modifier.weight(1f).padding(padding),
|
||||
) {
|
||||
when {
|
||||
state.loading -> LibrarySkeleton()
|
||||
state.titles.isEmpty() && state.query.isNotBlank() -> EmptyState(
|
||||
"Nothing matches",
|
||||
"No title in the library is called “${state.query.trim()}”.",
|
||||
)
|
||||
state.titles.isEmpty() -> EmptyState(
|
||||
"Your library is empty",
|
||||
"Add a Proton Drive public link under Shares, then refresh.",
|
||||
)
|
||||
else -> LibraryGrid(
|
||||
state,
|
||||
resumable,
|
||||
onResume,
|
||||
onTitle,
|
||||
onTitleMenu = { menuFor = it },
|
||||
onResumeMenu = { menuResume = it },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
menuFor?.let { title ->
|
||||
val playlist = title.seasons.flatMap(SeasonRecord::episodes)
|
||||
val allWatched = title.episodeCount > 0uL && title.watchedCount == title.episodeCount
|
||||
TileMenu(title.displayName, title.caption(), onDismiss = { menuFor = null }) {
|
||||
MenuRow(Icons.Default.PlayArrow, if (playlist.any { it.resumeAt != null }) "Resume" else "Play") {
|
||||
onResume(title, nextUpIndex(playlist))
|
||||
}
|
||||
MenuRow(Icons.Default.Info, "Open") { onTitle(title) }
|
||||
MenuRow(Icons.Default.Download, "Download all") { DownloadCoordinator.enqueue(context, playlist) }
|
||||
MenuRow(
|
||||
if (allWatched) Icons.Outlined.CheckCircle else Icons.Default.CheckCircle,
|
||||
if (allWatched) "Mark unwatched" else "Mark watched",
|
||||
) { onSetTitleWatched(title, !allWatched) }
|
||||
// The same search the title page offers, for the tile that is
|
||||
// plainly wrong — the wrong poster is what the grid shows.
|
||||
MenuRow(Icons.Default.Edit, "Change match") { matching = title }
|
||||
}
|
||||
}
|
||||
matching?.let { title ->
|
||||
ChangeMatchDialog(
|
||||
title = title,
|
||||
onDismiss = { matching = null },
|
||||
onChanged = {
|
||||
matching = null
|
||||
onMatchChanged()
|
||||
},
|
||||
onError = onError,
|
||||
)
|
||||
}
|
||||
menuResume?.let { entry ->
|
||||
TileMenu(
|
||||
entry.title.displayName,
|
||||
entry.episode.label,
|
||||
onDismiss = { menuResume = null },
|
||||
) {
|
||||
MenuRow(Icons.Default.PlayArrow, "Resume") { onResume(entry.title, entry.index) }
|
||||
MenuRow(Icons.Default.Info, "Open") { onTitle(entry.title) }
|
||||
MenuRow(Icons.Default.RemoveCircleOutline, "Remove from Continue watching") {
|
||||
onForgetPosition(entry.title, entry.episode)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The grid's order, and whether a franchise is one tile or one per title —
|
||||
* the same choices the desktop offers beside its grid, behind one icon here
|
||||
* because a phone's bar has room for three.
|
||||
*/
|
||||
@Composable
|
||||
private fun ArrangeMenu(sort: LibrarySort, grouped: Boolean, onArrange: (LibrarySort, Boolean) -> Unit) {
|
||||
var open by remember { mutableStateOf(false) }
|
||||
Box {
|
||||
IconButton(onClick = { open = true }) {
|
||||
Icon(Icons.AutoMirrored.Filled.Sort, contentDescription = "Sort library")
|
||||
}
|
||||
DropdownMenu(expanded = open, onDismissRequest = { open = false }) {
|
||||
LibrarySort.entries.forEach { option ->
|
||||
DropdownMenuItem(
|
||||
text = { Text(option.label()) },
|
||||
leadingIcon = {
|
||||
if (option == sort) Icon(Icons.Default.Check, contentDescription = null)
|
||||
},
|
||||
onClick = {
|
||||
open = false
|
||||
onArrange(option, grouped)
|
||||
},
|
||||
)
|
||||
}
|
||||
HorizontalDivider()
|
||||
DropdownMenuItem(
|
||||
text = { Text("One tile per franchise") },
|
||||
leadingIcon = {
|
||||
if (grouped) Icon(Icons.Default.Check, contentDescription = null)
|
||||
},
|
||||
onClick = {
|
||||
open = false
|
||||
onArrange(sort, !grouped)
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** What each order is called. The desktop says the same. */
|
||||
private fun LibrarySort.label() = when (this) {
|
||||
LibrarySort.NAME -> "A – Z"
|
||||
LibrarySort.RECENT -> "Recently watched"
|
||||
LibrarySort.ADDED -> "Recently added"
|
||||
LibrarySort.RELEASE -> "Newest"
|
||||
LibrarySort.RATING -> "Highest rated"
|
||||
LibrarySort.POPULARITY -> "Most popular"
|
||||
}
|
||||
|
||||
/**
|
||||
* The bar while searching: back closes the search and clears it, and the field
|
||||
* takes the keyboard as soon as it opens, since opening it is asking to type.
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun SearchBar(query: String, onSearch: (String) -> Unit, onClose: () -> Unit) {
|
||||
val focus = remember { FocusRequester() }
|
||||
LaunchedEffect(Unit) { focus.requestFocus() }
|
||||
TopAppBar(
|
||||
navigationIcon = {
|
||||
IconButton(onClick = onClose) {
|
||||
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Close search")
|
||||
}
|
||||
},
|
||||
title = {
|
||||
// A filled pill rather than an outlined form field: search is how
|
||||
// the page is navigated, not a value being entered.
|
||||
TextField(
|
||||
value = query,
|
||||
onValueChange = onSearch,
|
||||
modifier = Modifier.fillMaxWidth().padding(end = 8.dp).focusRequester(focus),
|
||||
singleLine = true,
|
||||
shape = CircleShape,
|
||||
placeholder = { Text("Search library") },
|
||||
trailingIcon = {
|
||||
if (query.isNotEmpty()) {
|
||||
IconButton(onClick = { onSearch("") }) {
|
||||
Icon(Icons.Default.Close, contentDescription = "Clear search")
|
||||
}
|
||||
}
|
||||
},
|
||||
keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
|
||||
colors = TextFieldDefaults.colors(
|
||||
focusedIndicatorColor = Color.Transparent,
|
||||
unfocusedIndicatorColor = Color.Transparent,
|
||||
disabledIndicatorColor = Color.Transparent,
|
||||
),
|
||||
)
|
||||
},
|
||||
colors = pageBarColors(),
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* A long press's menu, from the bottom of the screen where the thumb already
|
||||
* is. Each row closes it before doing its thing.
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun TileMenu(
|
||||
heading: String,
|
||||
caption: String,
|
||||
onDismiss: () -> Unit,
|
||||
rows: @Composable MenuScope.() -> Unit,
|
||||
) {
|
||||
ModalBottomSheet(onDismissRequest = onDismiss) {
|
||||
Column(Modifier.padding(bottom = 24.dp)) {
|
||||
Text(
|
||||
heading,
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(horizontal = 24.dp),
|
||||
)
|
||||
Text(
|
||||
caption,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(start = 24.dp, end = 24.dp, bottom = 8.dp),
|
||||
)
|
||||
MenuScope(onDismiss).rows()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class MenuScope(val dismiss: () -> Unit)
|
||||
|
||||
@Composable
|
||||
private fun MenuScope.MenuRow(icon: ImageVector, label: String, onClick: () -> Unit) {
|
||||
ListItem(
|
||||
headlineContent = { Text(label) },
|
||||
leadingContent = { Icon(icon, contentDescription = null) },
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
modifier = Modifier.clickable { dismiss(); onClick() }.padding(horizontal = 8.dp),
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun LibraryGrid(
|
||||
state: AppUiState,
|
||||
resumable: List<Resumable>,
|
||||
onResume: (TitleRecord, Int) -> Unit,
|
||||
onTitle: (TitleRecord) -> Unit,
|
||||
onTitleMenu: (TitleRecord) -> Unit,
|
||||
onResumeMenu: (Resumable) -> Unit,
|
||||
) {
|
||||
// The arrangement names titles by key; before it has arrived, the titles
|
||||
// as they came are the grid.
|
||||
val byKey = remember(state.titles) { state.titles.associateBy { it.key } }
|
||||
val tiles = remember(state.titles, state.arrangement) {
|
||||
state.arrangement?.tiles?.mapNotNull { tile -> byKey[tile.key]?.let { Tile(it, tile.folded.toInt()) } }
|
||||
?: state.titles.map { Tile(it, 0) }
|
||||
}
|
||||
val shelves = remember(state.titles, state.arrangement) {
|
||||
state.arrangement?.shelves.orEmpty()
|
||||
.map { shelf -> Shelf(shelf.label, shelf.keys.mapNotNull(byKey::get)) }
|
||||
.filter { it.titles.isNotEmpty() }
|
||||
}
|
||||
// Posters, three across on a phone. Cropped backdrops at full width fitted
|
||||
// two titles to a screen, which is a library read one row at a time.
|
||||
LazyVerticalGrid(
|
||||
columns = GridCells.Adaptive(108.dp),
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp),
|
||||
contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 24.dp),
|
||||
) {
|
||||
// Above the grid, and only when there is something in it: what a viewer
|
||||
// opening the app wants is almost always the thing they were part way
|
||||
// through. Inside the grid rather than pinned over it, so the shelf
|
||||
// scrolls away with the rest.
|
||||
val featured = if (state.query.isBlank()) featured(state.titles, resumable) else null
|
||||
featured?.let { title ->
|
||||
item(key = "featured", span = { GridItemSpan(maxLineSpan) }) {
|
||||
FeaturedBanner(
|
||||
title,
|
||||
resume = resumable.firstOrNull { it.title.key == title.key },
|
||||
onPlay = { onResume(title, it) },
|
||||
onOpen = { onTitle(title) },
|
||||
)
|
||||
}
|
||||
}
|
||||
if (state.query.isBlank() && resumable.isNotEmpty()) {
|
||||
item(key = "continue-watching", span = { GridItemSpan(maxLineSpan) }) {
|
||||
Column {
|
||||
Text("Continue watching", style = MaterialTheme.typography.titleMedium)
|
||||
LazyRow(
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
contentPadding = PaddingValues(top = 10.dp),
|
||||
) {
|
||||
items(resumable, key = { "${it.episode.shareId}/${it.episode.linkId}" }) { entry ->
|
||||
ContinueCard(
|
||||
entry,
|
||||
onClick = { onResume(entry.title, entry.index) },
|
||||
onLongClick = { onResumeMenu(entry) },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (state.query.isBlank()) {
|
||||
shelves.forEach { shelf ->
|
||||
item(key = "shelf-${shelf.label}", span = { GridItemSpan(maxLineSpan) }) {
|
||||
Column {
|
||||
Text(shelf.label, style = MaterialTheme.typography.titleMedium)
|
||||
LazyRow(
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
contentPadding = PaddingValues(top = 10.dp),
|
||||
) {
|
||||
items(shelf.titles, key = { it.key }) { title ->
|
||||
PosterTile(
|
||||
title,
|
||||
onClick = { onTitle(title) },
|
||||
onLongClick = { onTitleMenu(title) },
|
||||
modifier = Modifier.width(SHELF_TILE_WIDTH),
|
||||
shared = false,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (resumable.isNotEmpty() || shelves.isNotEmpty()) {
|
||||
item(key = "library-heading", span = { GridItemSpan(maxLineSpan) }) {
|
||||
Text("All titles", style = MaterialTheme.typography.titleMedium, modifier = Modifier.padding(top = 8.dp))
|
||||
}
|
||||
}
|
||||
}
|
||||
items(tiles, key = { it.title.key }) { tile ->
|
||||
PosterTile(
|
||||
tile.title,
|
||||
onClick = { onTitle(tile.title) },
|
||||
onLongClick = { onTitleMenu(tile.title) },
|
||||
folded = tile.folded,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The grid's shape before the catalog has answered: posters and their two
|
||||
* lines of text as blocks, so the page does not jump when the titles land.
|
||||
*/
|
||||
@Composable
|
||||
private fun LibrarySkeleton() {
|
||||
LazyVerticalGrid(
|
||||
columns = GridCells.Adaptive(108.dp),
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(16.dp),
|
||||
contentPadding = PaddingValues(start = 16.dp, end = 16.dp, top = 8.dp, bottom = 24.dp),
|
||||
userScrollEnabled = false,
|
||||
) {
|
||||
items(SKELETON_TILES) {
|
||||
Column {
|
||||
Skeleton(Modifier.fillMaxWidth().aspectRatio(2f / 3f).clip(MaterialTheme.shapes.medium))
|
||||
Spacer(Modifier.height(8.dp))
|
||||
Skeleton(Modifier.fillMaxWidth(0.8f).height(12.dp).clip(MaterialTheme.shapes.small))
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Skeleton(Modifier.fillMaxWidth(0.5f).height(10.dp).clip(MaterialTheme.shapes.small))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** A shelf's covers: a little narrower than the grid's, so the row reads as a row. */
|
||||
private val SHELF_TILE_WIDTH = 112.dp
|
||||
|
||||
/** Enough placeholder tiles to fill a tablet's first screen. */
|
||||
private const val SKELETON_TILES = 18
|
||||
|
||||
/**
|
||||
* The title the banner shows: the one watched last, or with nothing part
|
||||
* watched, one of the titles the provider has a backdrop for, turning over
|
||||
* once a day — the desktop's `featured`.
|
||||
*/
|
||||
private fun featured(titles: List<TitleRecord>, resumable: List<Resumable>): TitleRecord? {
|
||||
resumable.firstOrNull()?.let { return it.title }
|
||||
val pictured = titles.filter { it.backdropUrl != null }
|
||||
if (pictured.isEmpty()) return null
|
||||
return pictured[(LocalDate.now().toEpochDay() % pictured.size).toInt()]
|
||||
}
|
||||
|
||||
/** Large art behind the name, rating, genres and three lines of synopsis. */
|
||||
@Composable
|
||||
private fun FeaturedBanner(title: TitleRecord, resume: Resumable?, onPlay: (Int) -> Unit, onOpen: () -> Unit) {
|
||||
val playlist = remember(title) { title.seasons.flatMap(SeasonRecord::episodes) }
|
||||
Box(Modifier.fillMaxWidth().aspectRatio(4f / 3f).clip(MaterialTheme.shapes.large)) {
|
||||
RemoteArtwork(
|
||||
title.backdropUrl ?: title.posterUrl,
|
||||
title.displayName,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = title.thumbnailSource,
|
||||
labelled = false,
|
||||
)
|
||||
Box(
|
||||
Modifier.fillMaxSize().background(
|
||||
Brush.verticalGradient(0.35f to Color.Transparent, 1f to Color.Black.copy(alpha = 0.85f)),
|
||||
),
|
||||
)
|
||||
Column(Modifier.align(Alignment.BottomStart).padding(16.dp)) {
|
||||
Text(
|
||||
title.displayName,
|
||||
style = MaterialTheme.typography.headlineMedium,
|
||||
color = Color.White,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
Text(
|
||||
listOfNotNull(
|
||||
title.rating?.let { "★ %.1f".format(it) },
|
||||
title.genres.takeIf { it.isNotEmpty() }?.take(3)?.joinToString(", "),
|
||||
).joinToString(" · ").ifEmpty { title.caption() },
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = Color.White.copy(alpha = 0.8f),
|
||||
)
|
||||
title.overview?.let {
|
||||
Text(
|
||||
it.trim(),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = Color.White.copy(alpha = 0.8f),
|
||||
maxLines = 3,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(top = 6.dp),
|
||||
)
|
||||
}
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(top = 12.dp)) {
|
||||
AccentButton(onClick = { onPlay(resume?.index ?: nextUpIndex(playlist)) }) {
|
||||
Icon(Icons.Default.PlayArrow, contentDescription = null)
|
||||
Spacer(Modifier.width(6.dp))
|
||||
Text(if (resume != null) "Resume" else "Play")
|
||||
}
|
||||
TonalButton(onClick = onOpen) { Text("More info") }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** A part-watched episode: its still, where it was left, and what is left of it. */
|
||||
@Composable
|
||||
private fun ContinueCard(entry: Resumable, onClick: () -> Unit, onLongClick: () -> Unit) {
|
||||
Column(
|
||||
Modifier
|
||||
.width(220.dp)
|
||||
.clip(MaterialTheme.shapes.medium)
|
||||
.combinedClickable(onClick = onClick, onLongClick = onLongClick),
|
||||
) {
|
||||
Box(Modifier.fillMaxWidth().aspectRatio(16f / 9f).clip(MaterialTheme.shapes.medium)) {
|
||||
RemoteArtwork(
|
||||
entry.episode.stillUrl ?: entry.title.backdropUrl,
|
||||
entry.title.displayName,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = entry.episode.thumbnailSource,
|
||||
)
|
||||
entry.episode.progress?.let { progress ->
|
||||
AccentProgress(
|
||||
progress = { progress.toFloat().coerceIn(0f, 1f) },
|
||||
modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
|
||||
)
|
||||
}
|
||||
}
|
||||
Text(
|
||||
entry.title.displayName,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(top = 8.dp),
|
||||
)
|
||||
Text(
|
||||
listOfNotNull(entry.episode.label, entry.episode.timeLeft()).joinToString(" · "),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* One title: its poster, and its name and size under it rather than in a card.
|
||||
*
|
||||
* [folded] is how many more titles of its franchise the tile stands for, said
|
||||
* in the corner. [shared] is whether the poster grows into the title page —
|
||||
* only one copy of a title on screen can, and a shelf may hold the same title
|
||||
* as the grid.
|
||||
*/
|
||||
@Composable
|
||||
private fun PosterTile(
|
||||
title: TitleRecord,
|
||||
onClick: () -> Unit,
|
||||
onLongClick: () -> Unit,
|
||||
modifier: Modifier = Modifier,
|
||||
folded: Int = 0,
|
||||
shared: Boolean = true,
|
||||
) {
|
||||
Column(
|
||||
modifier
|
||||
.clip(MaterialTheme.shapes.medium)
|
||||
.combinedClickable(onClick = onClick, onLongClick = onLongClick),
|
||||
) {
|
||||
Box {
|
||||
RemoteArtwork(
|
||||
title.posterUrl ?: title.backdropUrl,
|
||||
title.displayName,
|
||||
(if (shared) Modifier.sharedArt(title.key) else Modifier)
|
||||
.fillMaxWidth()
|
||||
.aspectRatio(2f / 3f)
|
||||
.clip(MaterialTheme.shapes.medium),
|
||||
fallback = title.thumbnailSource,
|
||||
)
|
||||
if (folded > 0) {
|
||||
Text(
|
||||
"+$folded",
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = Color.White,
|
||||
modifier = Modifier
|
||||
.align(Alignment.TopEnd)
|
||||
.padding(6.dp)
|
||||
.clip(MaterialTheme.shapes.small)
|
||||
.background(Color.Black.copy(alpha = 0.7f))
|
||||
.padding(horizontal = 6.dp, vertical = 2.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(Modifier.height(6.dp))
|
||||
Text(
|
||||
title.displayName,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
// Two lines, not one: at a large font scale "2023 · 7 episodes" does
|
||||
// not fit a poster's width, and one line cut it to "2023 · 7".
|
||||
Text(
|
||||
title.caption(),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/** "2023 · 11 episodes", or "1988 · Film" — never "1 episodes". */
|
||||
private fun TitleRecord.caption(): String = listOfNotNull(
|
||||
(metadataYear ?: year)?.toString(),
|
||||
when {
|
||||
(metadataKind ?: kind) == TitleType.FILM && episodeCount == 1uL -> "Film"
|
||||
episodeCount == 1uL -> "1 episode"
|
||||
else -> "$episodeCount episodes"
|
||||
},
|
||||
).joinToString(" · ")
|
||||
|
||||
/**
|
||||
* "12 min left", from where the episode was left and how far through that is.
|
||||
* Null when either is unknown — a guess would be worse than no figure.
|
||||
*/
|
||||
private fun EpisodeRecord.timeLeft(): String? {
|
||||
val at = resumeAt ?: return null
|
||||
val fraction = progress?.takeIf { it > 0.0 && it < 1.0 } ?: return null
|
||||
val minutes = ((at / fraction - at) / 60).toInt()
|
||||
return if (minutes < 1) "under a minute left" else "$minutes min left"
|
||||
}
|
||||
@@ -6,8 +6,13 @@ import android.graphics.BitmapFactory
|
||||
import android.util.LruCache
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.animation.core.RepeatMode
|
||||
import androidx.compose.animation.core.animateFloat
|
||||
import androidx.compose.animation.core.infiniteRepeatable
|
||||
import androidx.compose.animation.core.rememberInfiniteTransition
|
||||
import androidx.compose.animation.core.tween
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
@@ -16,12 +21,19 @@ import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.staticCompositionLocalOf
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.ImageBitmap
|
||||
import androidx.compose.ui.graphics.graphicsLayer
|
||||
import androidx.compose.ui.graphics.lerp
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import io.narl.protonstream.native.NativeRuntime
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
@@ -64,7 +76,9 @@ internal val EpisodeRecord.thumbnailSource: ThumbnailSource
|
||||
*
|
||||
* [fallback] is used only when there is no provider artwork or it fails to
|
||||
* load, which — with metadata off — is the common case rather than the rare
|
||||
* one.
|
||||
* one. Until either answers, the box pulses as a skeleton; when neither has
|
||||
* anything, it shows [ArtworkPlaceholder] rather than an empty card — without
|
||||
* initials when [labelled] is false, for art with the name already over it.
|
||||
*/
|
||||
@Composable
|
||||
internal fun RemoteArtwork(
|
||||
@@ -72,19 +86,98 @@ internal fun RemoteArtwork(
|
||||
description: String,
|
||||
modifier: Modifier = Modifier,
|
||||
fallback: ThumbnailSource? = null,
|
||||
labelled: Boolean = true,
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
var image by remember(url, fallback) { mutableStateOf<ImageBitmap?>(null) }
|
||||
LaunchedEffect(url, fallback) {
|
||||
image = (loadArtwork(context, url) ?: loadThumbnail(fallback))?.asImageBitmap()
|
||||
val enabled = LocalArtworkLoading.current
|
||||
var image by remember(url, fallback) { mutableStateOf<ArtworkLoad>(ArtworkLoad.Pending) }
|
||||
LaunchedEffect(url, fallback, enabled) {
|
||||
if (!enabled) {
|
||||
image = ArtworkLoad.Missing
|
||||
return@LaunchedEffect
|
||||
}
|
||||
image = (loadArtwork(context, url) ?: loadThumbnail(fallback))
|
||||
?.let { ArtworkLoad.Loaded(it.asImageBitmap()) }
|
||||
?: ArtworkLoad.Missing
|
||||
}
|
||||
Box(modifier.background(MaterialTheme.colorScheme.surfaceVariant), contentAlignment = Alignment.Center) {
|
||||
image?.let {
|
||||
Image(it, description, Modifier.fillMaxSize(), contentScale = ContentScale.Crop)
|
||||
} ?: Text("▶", style = MaterialTheme.typography.displaySmall)
|
||||
when (val loaded = image) {
|
||||
ArtworkLoad.Pending -> Skeleton(modifier)
|
||||
ArtworkLoad.Missing -> ArtworkPlaceholder(description, modifier, labelled)
|
||||
is ArtworkLoad.Loaded -> Image(loaded.image, description, modifier, contentScale = ContentScale.Crop)
|
||||
}
|
||||
}
|
||||
|
||||
private sealed interface ArtworkLoad {
|
||||
data object Pending : ArtworkLoad
|
||||
data object Missing : ArtworkLoad
|
||||
data class Loaded(val image: ImageBitmap) : ArtworkLoad
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether [RemoteArtwork] fetches anything at all.
|
||||
*
|
||||
* Off in the screenshot tests: there is no bridge on the host, and whether a
|
||||
* failed fetch lands before or after the capture would decide between a
|
||||
* skeleton and a placeholder in the committed image.
|
||||
*/
|
||||
internal val LocalArtworkLoading = staticCompositionLocalOf { true }
|
||||
|
||||
/**
|
||||
* Something being loaded: the surface tint, breathing.
|
||||
*
|
||||
* A spinner per tile is a grid of spinners; a shape where the poster will be
|
||||
* says what is coming and where, and settles the layout before it arrives.
|
||||
*/
|
||||
@Composable
|
||||
internal fun Skeleton(modifier: Modifier = Modifier) {
|
||||
val pulse by rememberInfiniteTransition(label = "skeleton").animateFloat(
|
||||
initialValue = 0.55f,
|
||||
targetValue = 1f,
|
||||
animationSpec = infiniteRepeatable(tween(800), RepeatMode.Reverse),
|
||||
label = "skeleton alpha",
|
||||
)
|
||||
Box(modifier.graphicsLayer { alpha = pulse }.background(MaterialTheme.colorScheme.surfaceVariant))
|
||||
}
|
||||
|
||||
/**
|
||||
* Art for a title that has none: the accent as a gradient, and its initials.
|
||||
*
|
||||
* A black card with a play triangle on it said nothing about which title it
|
||||
* was, so a grid of unmatched titles was a grid of identical cards. Each name
|
||||
* sets where on the accent ramp its gradient starts, so neighbours differ
|
||||
* while every one stays in the theme's colours.
|
||||
*/
|
||||
@Composable
|
||||
internal fun ArtworkPlaceholder(name: String, modifier: Modifier = Modifier, labelled: Boolean = true) {
|
||||
val scheme = MaterialTheme.colorScheme
|
||||
val brush = remember(name, scheme.primary, scheme.secondary) {
|
||||
val start = lerp(scheme.primary, scheme.secondary, (name.hashCode().mod(5)) / 4f)
|
||||
Brush.linearGradient(listOf(start, lerp(start, Color.Black, 0.55f)))
|
||||
}
|
||||
BoxWithConstraints(modifier.background(brush), contentAlignment = Alignment.Center) {
|
||||
if (!labelled) return@BoxWithConstraints
|
||||
val size = with(LocalDensity.current) { (minOf(maxWidth, maxHeight) * 0.3f).toSp() }
|
||||
Text(
|
||||
initials(name),
|
||||
color = Color.White.copy(alpha = 0.9f),
|
||||
fontSize = size,
|
||||
fontWeight = FontWeight.SemiBold,
|
||||
maxLines = 1,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* "Oshi no Ko" is "OK", "Akira" is "A": the first letters of up to two
|
||||
* capitalised words, so particles and articles in a romanised name do not
|
||||
* take a slot. A name with no capitals uses its first two words.
|
||||
*/
|
||||
internal fun initials(name: String): String {
|
||||
val words = name.split(' ', '-', '_', '.', ':').filter { word -> word.firstOrNull()?.isLetterOrDigit() == true }
|
||||
val picked = words.filter { it.first().isUpperCase() || it.first().isDigit() }.ifEmpty { words }
|
||||
return picked.take(2).joinToString("") { it.first().uppercase() }
|
||||
}
|
||||
|
||||
/**
|
||||
* The same HTTPS-only fetch behind the library grid, reusable off the composition.
|
||||
*
|
||||
|
||||
@@ -0,0 +1,623 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.ColumnScope
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material.icons.automirrored.filled.ManageSearch
|
||||
import androidx.compose.material.icons.filled.Info
|
||||
import androidx.compose.material.icons.filled.Palette
|
||||
import androidx.compose.material.icons.filled.PlayCircle
|
||||
import androidx.compose.material.icons.filled.Storage
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.foundation.border
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.FlowRow
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.lazy.grid.items
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Switch
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import androidx.compose.ui.window.SecureFlagPolicy
|
||||
import androidx.compose.ui.unit.dp
|
||||
import io.narl.protonstream.settings.SettingsStore
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
import io.narl.protonstream.download.DownloadCoordinator
|
||||
import io.narl.protonstream.native.NativeRuntime
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.AppearanceState
|
||||
import io.narl.protonstream.ui.theme.EdgedButton
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
import uniffi.pstr_android.MetadataProvider
|
||||
import uniffi.pstr_android.FlavorChoice
|
||||
import uniffi.pstr_android.AppearanceRecord
|
||||
import uniffi.pstr_android.TitleNamesChoice
|
||||
import uniffi.pstr_android.AccentChoice
|
||||
import uniffi.pstr_android.PlaybackPrefsRecord
|
||||
import androidx.compose.material3.ListItem
|
||||
import androidx.compose.material3.ListItemDefaults
|
||||
import androidx.compose.material3.FilterChip
|
||||
import androidx.compose.foundation.selection.toggleable
|
||||
import androidx.compose.ui.semantics.Role
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.height
|
||||
import io.narl.protonstream.ui.theme.AccentProgress
|
||||
|
||||
@Composable
|
||||
internal fun SettingsScreen(
|
||||
state: AppUiState,
|
||||
onSaveMetadata: (Boolean, MetadataProvider, String, String) -> Unit,
|
||||
onMatchAgain: () -> Unit,
|
||||
onClearCache: () -> Unit,
|
||||
onRemoveAllOffline: () -> Unit,
|
||||
padding: PaddingValues,
|
||||
initialPage: SettingsPage? = null,
|
||||
// A parameter so the screenshot tests can pin it: read from the package,
|
||||
// every version bump changed the committed image of this page.
|
||||
version: String = appVersion(),
|
||||
/** The library's names changed, and it has to be read again to show them. */
|
||||
onNamesChanged: () -> Unit = {},
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val settings = remember { SettingsStore(context) }
|
||||
var wifiOnly by remember { mutableStateOf(settings.wifiOnly) }
|
||||
var backgroundAudio by remember { mutableStateOf(settings.backgroundAudio) }
|
||||
var hardwareDecoding by remember { mutableStateOf(settings.hardwareDecoding) }
|
||||
var cacheBudgetGib by remember { mutableStateOf(settings.cacheBudgetGib) }
|
||||
// Playback preferences are the shared store's, not this app's: they are the
|
||||
// same file the desktop client reads, so a language chosen on one is the
|
||||
// language the other starts in.
|
||||
var prefs by remember { mutableStateOf<PlaybackPrefsRecord?>(null) }
|
||||
val scope = rememberCoroutineScope()
|
||||
fun update(change: (PlaybackPrefsRecord) -> PlaybackPrefsRecord) {
|
||||
val next = change(prefs ?: return)
|
||||
prefs = next
|
||||
scope.launch(Dispatchers.IO) {
|
||||
runCatching { NativeRuntime.engine().setPlaybackPrefs(next) }
|
||||
}
|
||||
}
|
||||
LaunchedEffect(Unit) {
|
||||
runCatching { withContext(Dispatchers.IO) { NativeRuntime.engine().playbackPrefs() } }
|
||||
.onSuccess { prefs = it }
|
||||
}
|
||||
var confirmDelete by remember { mutableStateOf(false) }
|
||||
var showMetadata by remember { mutableStateOf(false) }
|
||||
var legalDocument by remember { mutableStateOf<LegalDocument?>(null) }
|
||||
// One row per area on the first page, each opening its own page: grouped
|
||||
// on one page, the storage controls sat a long scroll below playback, and
|
||||
// every setting added made the rest harder to find.
|
||||
var page by rememberSaveable { mutableStateOf(initialPage) }
|
||||
BackHandler(enabled = page != null) { page = null }
|
||||
val back: @Composable () -> Unit = {
|
||||
IconButton(onClick = { page = null }) {
|
||||
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back to settings")
|
||||
}
|
||||
}
|
||||
when (page) {
|
||||
null -> TabPage("Settings", padding) { body ->
|
||||
Column(Modifier.fillMaxSize().padding(body).verticalScroll(rememberScrollState())) {
|
||||
SettingsPage.entries.forEach { entry ->
|
||||
ListItem(
|
||||
headlineContent = { Text(entry.title) },
|
||||
supportingContent = {
|
||||
Text(
|
||||
when (entry) {
|
||||
SettingsPage.Playback -> "Autoplay, languages and decoding"
|
||||
SettingsPage.Storage -> "${formatBytes(state.storage.cacheBytes)} cached · " +
|
||||
"${state.storage.offlineCount} offline"
|
||||
SettingsPage.Appearance -> "Palette, accent and gradient"
|
||||
SettingsPage.Metadata -> if (state.metadataSettings.enabled) {
|
||||
"On · ${state.metadataSettings.provider.displayName()}"
|
||||
} else {
|
||||
"Off"
|
||||
}
|
||||
SettingsPage.About -> "Version $version · licences"
|
||||
},
|
||||
)
|
||||
},
|
||||
leadingContent = { Icon(entry.icon, contentDescription = null) },
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
modifier = Modifier.clickable { page = entry },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
SettingsPage.Playback -> SettingsSubPage(SettingsPage.Playback, padding, back) {
|
||||
prefs?.let { current ->
|
||||
SettingSwitch(
|
||||
"Autoplay next episode",
|
||||
"Starts the next episode when the credits begin",
|
||||
current.autoplayNext,
|
||||
) { on -> update { it.copy(autoplayNext = on) } }
|
||||
// Off is the safer default: a mis-named chapter then costs a tap on
|
||||
// Skip rather than a scene.
|
||||
SettingSwitch(
|
||||
"Skip openings and endings",
|
||||
"Uses the release's chapters; off shows a Skip button instead",
|
||||
current.autoSkip,
|
||||
) { on -> update { it.copy(autoSkip = on) } }
|
||||
SettingSwitch("Subtitles", "Shown by default where a file has them", current.subtitles) { on ->
|
||||
update { it.copy(subtitles = on) }
|
||||
}
|
||||
// Preferences, not filters: a file with nothing in the language
|
||||
// plays its own default track. A show that has been given its
|
||||
// own choice keeps it.
|
||||
LanguageSetting("Audio language", current.audioLanguage) { tag ->
|
||||
update { it.copy(audioLanguage = tag) }
|
||||
}
|
||||
LanguageSetting("Subtitle language", current.subtitleLanguage) { tag ->
|
||||
update { it.copy(subtitleLanguage = tag) }
|
||||
}
|
||||
}
|
||||
SettingSwitch(
|
||||
"Hardware decoding",
|
||||
"Turn off if video shows green or torn frames",
|
||||
hardwareDecoding,
|
||||
) {
|
||||
hardwareDecoding = it
|
||||
settings.hardwareDecoding = it
|
||||
}
|
||||
SettingSwitch(
|
||||
"Background audio",
|
||||
"Keeps playing with the app closed, from the notification",
|
||||
backgroundAudio,
|
||||
) {
|
||||
backgroundAudio = it
|
||||
settings.backgroundAudio = it
|
||||
}
|
||||
}
|
||||
SettingsPage.Storage -> SettingsSubPage(SettingsPage.Storage, padding, back) {
|
||||
SettingSwitch("Download on Wi-Fi only", "Mobile data is never used for downloads", wifiOnly) {
|
||||
wifiOnly = it
|
||||
settings.wifiOnly = it
|
||||
// Constraints are baked in at enqueue time, so a queue that already
|
||||
// exists keeps the policy it was queued under until it is re-issued.
|
||||
DownloadCoordinator.applyNetworkPolicy(context)
|
||||
}
|
||||
Column(Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
|
||||
Text("Streaming cache")
|
||||
Text(
|
||||
"${formatBytes(state.storage.cacheBytes)} of $cacheBudgetGib GiB used",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
AccentProgress(
|
||||
progress = {
|
||||
(state.storage.cacheBytes.toDouble() / SettingsStore.gibToBytes(cacheBudgetGib).toDouble())
|
||||
.toFloat().coerceIn(0f, 1f)
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),
|
||||
)
|
||||
// What has been watched is kept up to this much, so going back over
|
||||
// a scene costs no download. A lower choice frees the difference at
|
||||
// once. Wrapping, so five chips survive a narrow phone at a large
|
||||
// font scale.
|
||||
FlowRow(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
SettingsStore.CACHE_BUDGET_CHOICES.forEach { gib ->
|
||||
FilterChip(
|
||||
selected = gib == cacheBudgetGib,
|
||||
onClick = {
|
||||
cacheBudgetGib = gib
|
||||
settings.cacheBudgetGib = gib
|
||||
scope.launch(Dispatchers.IO) {
|
||||
runCatching {
|
||||
NativeRuntime.engine().setStreamCacheBudget(SettingsStore.gibToBytes(gib))
|
||||
}
|
||||
}
|
||||
},
|
||||
label = { Text("$gib GiB") },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
// The cache is rebuildable, so it goes without asking. Offline episodes
|
||||
// are a choice the viewer made, so that one asks.
|
||||
SettingAction("Clear streaming cache", "Frees ${formatBytes(state.storage.cacheBytes)}", onClick = onClearCache)
|
||||
SettingAction(
|
||||
"Delete all offline episodes",
|
||||
"${state.storage.offlineCount} " + (if (state.storage.offlineCount == 1uL) "episode" else "episodes") +
|
||||
" · ${formatBytes(state.storage.offlineBytes)}" +
|
||||
(
|
||||
state.storage.partialBytes.takeIf { it > 0uL }
|
||||
?.let { " · ${formatBytes(it)} unfinished" }
|
||||
.orEmpty()
|
||||
),
|
||||
enabled = state.storage.offlineCount > 0uL || state.storage.partialBytes > 0uL,
|
||||
onClick = { confirmDelete = true },
|
||||
)
|
||||
}
|
||||
SettingsPage.Appearance -> SettingsSubPage(SettingsPage.Appearance, padding, back) {
|
||||
Column(Modifier.padding(horizontal = 16.dp)) { AppearancePicker(onNamesChanged) }
|
||||
}
|
||||
SettingsPage.Metadata -> SettingsSubPage(SettingsPage.Metadata, padding, back) {
|
||||
SettingAction(
|
||||
"Metadata enrichment",
|
||||
if (state.metadataSettings.enabled) {
|
||||
"On · ${state.metadataSettings.provider.displayName()} · sends title names to it"
|
||||
} else {
|
||||
"Off, the privacy default"
|
||||
},
|
||||
onClick = { showMetadata = true },
|
||||
)
|
||||
// Every title looked up again, matched ones included: the way out of a
|
||||
// library the provider answered wrong, which otherwise stays wrong for
|
||||
// as long as the match is remembered.
|
||||
SettingAction(
|
||||
"Match everything again",
|
||||
"Looks every title up again, hand-picked matches excepted",
|
||||
enabled = state.metadataSettings.enabled && !state.refreshing,
|
||||
onClick = onMatchAgain,
|
||||
)
|
||||
}
|
||||
SettingsPage.About -> SettingsSubPage(SettingsPage.About, padding, back) {
|
||||
ListItem(
|
||||
headlineContent = { Text("Proton Stream") },
|
||||
supportingContent = { Text("Version $version") },
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
)
|
||||
SettingAction("Licence", "GPL-3.0-or-later. Comes with absolutely no warranty.") {
|
||||
legalDocument = LegalDocument("GNU GPL v3", "licenses/GPL-3.0.txt")
|
||||
}
|
||||
SettingAction("Third-party notices", "libmpv, Inter and the other components bundled") {
|
||||
legalDocument = LegalDocument("Third-party notices", "licenses/THIRD_PARTY_NOTICES.md")
|
||||
}
|
||||
}
|
||||
}
|
||||
if (confirmDelete) {
|
||||
AlertDialog(
|
||||
onDismissRequest = { confirmDelete = false },
|
||||
title = { Text("Delete all offline episodes?") },
|
||||
text = {
|
||||
Text(
|
||||
"${state.storage.offlineCount} episodes (${formatBytes(state.storage.offlineBytes)}) " +
|
||||
"will be removed from this device. Watch history is kept, and anything " +
|
||||
"deleted can be downloaded again.",
|
||||
)
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(onClick = { confirmDelete = false; onRemoveAllOffline() }) { Text("Delete") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = { confirmDelete = false }) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
legalDocument?.let { document ->
|
||||
LegalDocumentDialog(document, onDismiss = { legalDocument = null })
|
||||
}
|
||||
if (showMetadata) {
|
||||
MetadataSettingsDialog(
|
||||
current = state.metadataSettings,
|
||||
onDismiss = { showMetadata = false },
|
||||
onSave = { enabled, provider, language, key ->
|
||||
onSaveMetadata(enabled, provider, language, key)
|
||||
showMetadata = false
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/** The areas the first page lists, each a page of its own. */
|
||||
internal enum class SettingsPage(val title: String, val icon: ImageVector) {
|
||||
Playback("Playback", Icons.Default.PlayCircle),
|
||||
Storage("Downloads and storage", Icons.Default.Storage),
|
||||
Appearance("Appearance", Icons.Default.Palette),
|
||||
Metadata("Metadata", Icons.AutoMirrored.Filled.ManageSearch),
|
||||
About("About", Icons.Default.Info),
|
||||
}
|
||||
|
||||
/** One area's page: its name, a way back, and its rows. */
|
||||
@Composable
|
||||
private fun SettingsSubPage(
|
||||
page: SettingsPage,
|
||||
padding: PaddingValues,
|
||||
back: @Composable () -> Unit,
|
||||
rows: @Composable ColumnScope.() -> Unit,
|
||||
) {
|
||||
TabPage(page.title, padding, navigationIcon = back) { body ->
|
||||
Column(Modifier.fillMaxSize().padding(body).verticalScroll(rememberScrollState())) {
|
||||
rows()
|
||||
Spacer(Modifier.height(24.dp))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** The installed version, as the launcher and the store show it. */
|
||||
@Composable
|
||||
private fun appVersion(): String {
|
||||
val context = LocalContext.current
|
||||
return remember {
|
||||
runCatching { context.packageManager.getPackageInfo(context.packageName, 0).versionName }
|
||||
.getOrNull() ?: "unknown"
|
||||
}
|
||||
}
|
||||
|
||||
/** A switch with its one line of explanation; the whole row toggles it. */
|
||||
@Composable
|
||||
private fun SettingSwitch(headline: String, supporting: String, checked: Boolean, onChecked: (Boolean) -> Unit) {
|
||||
ListItem(
|
||||
headlineContent = { Text(headline) },
|
||||
supportingContent = { Text(supporting) },
|
||||
trailingContent = { Switch(checked = checked, onCheckedChange = null) },
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
modifier = Modifier.toggleable(value = checked, role = Role.Switch, onValueChange = onChecked),
|
||||
)
|
||||
}
|
||||
|
||||
/** A row that does something when tapped: opens a dialog, clears a cache. */
|
||||
@Composable
|
||||
private fun SettingAction(
|
||||
headline: String,
|
||||
supporting: String,
|
||||
enabled: Boolean = true,
|
||||
onClick: () -> Unit,
|
||||
) {
|
||||
val colors = ListItemDefaults.colors(containerColor = Color.Transparent)
|
||||
ListItem(
|
||||
headlineContent = { Text(headline) },
|
||||
supportingContent = { Text(supporting) },
|
||||
colors = if (enabled) {
|
||||
colors
|
||||
} else {
|
||||
ListItemDefaults.colors(
|
||||
containerColor = Color.Transparent,
|
||||
headlineColor = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.38f),
|
||||
supportingColor = MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.38f),
|
||||
)
|
||||
},
|
||||
modifier = Modifier.clickable(enabled = enabled, onClick = onClick),
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun MetadataSettingsDialog(
|
||||
current: uniffi.pstr_android.MetadataSettingsRecord,
|
||||
onDismiss: () -> Unit,
|
||||
onSave: (Boolean, MetadataProvider, String, String) -> Unit,
|
||||
) {
|
||||
var enabled by remember { mutableStateOf(current.enabled) }
|
||||
var provider by remember { mutableStateOf(current.provider) }
|
||||
var language by remember { mutableStateOf(current.language) }
|
||||
var apiKey by remember { mutableStateOf("") }
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
properties = DialogProperties(securePolicy = SecureFlagPolicy.SecureOn),
|
||||
title = { Text("Metadata enrichment") },
|
||||
text = {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text("Off by default: enabling sends the titles in your library to a third party, associated with your IP address and subject to their privacy policy. With AniList, the matched ids also go to ani.zip for episode names and wide artwork.")
|
||||
SettingToggle("Enable enrichment", enabled) { enabled = it }
|
||||
Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
MetadataProvider.entries.forEach { option ->
|
||||
if (option == provider) AccentButton(onClick = { provider = option }) { Text(option.displayName()) }
|
||||
else EdgedButton(onClick = { provider = option }) { Text(option.displayName()) }
|
||||
}
|
||||
}
|
||||
Text(
|
||||
if (provider == MetadataProvider.ANI_LIST) "Anime; no account or API key required."
|
||||
else "Film and television; requires a free TMDB API key.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
if (provider == MetadataProvider.TMDB) {
|
||||
OutlinedTextField(language, { language = it }, label = { Text("Language") }, singleLine = true)
|
||||
OutlinedTextField(
|
||||
apiKey,
|
||||
{ apiKey = it },
|
||||
label = { Text(if (current.ready) "TMDB API key (leave blank to keep)" else "TMDB API key") },
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
singleLine = true,
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(
|
||||
enabled = !enabled || provider != MetadataProvider.TMDB || current.ready || apiKey.isNotBlank(),
|
||||
onClick = { onSave(enabled, provider, language.ifBlank { "en" }, apiKey) },
|
||||
) { Text("Save") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = onDismiss) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
|
||||
internal fun MetadataProvider.displayName(): String = when (this) {
|
||||
MetadataProvider.ANI_LIST -> "AniList"
|
||||
MetadataProvider.TMDB -> "TMDB"
|
||||
}
|
||||
|
||||
private data class LegalDocument(val title: String, val assetPath: String)
|
||||
|
||||
@Composable
|
||||
private fun LegalDocumentDialog(document: LegalDocument, onDismiss: () -> Unit) {
|
||||
val context = LocalContext.current
|
||||
var contents by remember(document.assetPath) { mutableStateOf("Loading…") }
|
||||
LaunchedEffect(document.assetPath) {
|
||||
contents = runCatching {
|
||||
withContext(Dispatchers.IO) {
|
||||
context.assets.open(document.assetPath).bufferedReader().use { it.readText() }
|
||||
}
|
||||
}.getOrElse { error -> "Unable to load this document: ${error.message}" }
|
||||
}
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
title = { Text(document.title) },
|
||||
text = {
|
||||
LazyColumn(Modifier.fillMaxWidth().heightIn(max = 520.dp)) {
|
||||
item { Text(contents, style = MaterialTheme.typography.bodySmall) }
|
||||
}
|
||||
},
|
||||
confirmButton = { AccentButton(onClick = onDismiss) { Text("Close") } },
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun SettingToggle(label: String, checked: Boolean, onChecked: (Boolean) -> Unit) {
|
||||
Row(Modifier.fillMaxWidth().padding(vertical = 14.dp), verticalAlignment = Alignment.CenterVertically) {
|
||||
Text(label, Modifier.weight(1f))
|
||||
Switch(checked = checked, onCheckedChange = onChecked)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Flavour, accent and gradients — the same three the desktop client offers.
|
||||
*
|
||||
* Every colour is resolved by Rust, so a swatch here is the colour the app will
|
||||
* actually paint rather than an approximation of it, and the choice is stored in
|
||||
* the file both clients read.
|
||||
*/
|
||||
@Composable
|
||||
private fun AppearancePicker(onNamesChanged: () -> Unit) {
|
||||
val scope = rememberCoroutineScope()
|
||||
var choice by remember { mutableStateOf<AppearanceRecord?>(null) }
|
||||
var swatches by remember { mutableStateOf<Map<AccentChoice, Color>>(emptyMap()) }
|
||||
|
||||
suspend fun repaint(next: AppearanceRecord, store: Boolean) {
|
||||
runCatching {
|
||||
withContext(Dispatchers.IO) {
|
||||
val engine = NativeRuntime.engine()
|
||||
if (store) engine.setAppearance(next)
|
||||
val palette = engine.previewPalette(next)
|
||||
// Every accent as it would look in *this* flavour: a swatch row
|
||||
// that keeps Mocha's pastels while Latte is selected is a row
|
||||
// that lies about what the next tap does.
|
||||
val row = AccentChoice.entries.associateWith { accent ->
|
||||
Color(engine.previewPalette(next.copy(accent = accent)).accent.toInt())
|
||||
}
|
||||
palette to row
|
||||
}
|
||||
}.onSuccess { (palette, row) ->
|
||||
choice = next
|
||||
swatches = row
|
||||
AppearanceState.apply(palette)
|
||||
}
|
||||
}
|
||||
|
||||
LaunchedEffect(Unit) {
|
||||
runCatching { withContext(Dispatchers.IO) { NativeRuntime.engine().appearance() } }
|
||||
.onSuccess { repaint(it, store = false) }
|
||||
}
|
||||
|
||||
val current = choice ?: return
|
||||
Text("Palette", style = MaterialTheme.typography.bodyMedium, modifier = Modifier.padding(top = 8.dp))
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(vertical = 8.dp)) {
|
||||
items(FlavorChoice.entries.toList(), key = { it.name }) { flavor ->
|
||||
val selected = flavor == current.flavor
|
||||
if (selected) {
|
||||
AccentButton(onClick = {}) { Text(flavor.label()) }
|
||||
} else {
|
||||
EdgedButton(onClick = {
|
||||
scope.launch { repaint(current.copy(flavor = flavor), store = true) }
|
||||
}) { Text(flavor.label()) }
|
||||
}
|
||||
}
|
||||
}
|
||||
Text("Accent", style = MaterialTheme.typography.bodyMedium)
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(10.dp), modifier = Modifier.padding(vertical = 8.dp)) {
|
||||
items(AccentChoice.entries.toList(), key = { it.name }) { accent ->
|
||||
val swatch = swatches[accent] ?: MaterialTheme.colorScheme.surfaceVariant
|
||||
Box(
|
||||
Modifier
|
||||
.size(36.dp)
|
||||
.clip(CircleShape)
|
||||
.background(swatch)
|
||||
.border(
|
||||
width = if (accent == current.accent) 3.dp else 1.dp,
|
||||
color = if (accent == current.accent) {
|
||||
MaterialTheme.colorScheme.onBackground
|
||||
} else {
|
||||
MaterialTheme.colorScheme.outline
|
||||
},
|
||||
shape = CircleShape,
|
||||
)
|
||||
.clickable {
|
||||
scope.launch { repaint(current.copy(accent = accent), store = true) }
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
Text("Title names", style = MaterialTheme.typography.bodyMedium)
|
||||
LazyRow(horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.padding(vertical = 8.dp)) {
|
||||
items(TitleNamesChoice.entries.toList(), key = { it.name }) { names ->
|
||||
if (names == current.names) {
|
||||
AccentButton(onClick = {}) { Text(names.label()) }
|
||||
} else {
|
||||
EdgedButton(onClick = {
|
||||
scope.launch {
|
||||
repaint(current.copy(names = names), store = true)
|
||||
onNamesChanged()
|
||||
}
|
||||
}) { Text(names.label()) }
|
||||
}
|
||||
}
|
||||
}
|
||||
Text(
|
||||
"What a matched title is called. Its other names still find it in search.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
modifier = Modifier.padding(bottom = 8.dp),
|
||||
)
|
||||
SettingToggle("Paint the accent as a gradient", current.gradients) { on ->
|
||||
scope.launch { repaint(current.copy(gradients = on), store = true) }
|
||||
}
|
||||
Text(
|
||||
"Off is the safer setting on a panel that bands: a slow ramp across a wide bar " +
|
||||
"shows every step it is drawn from, and flat is better than striped.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
modifier = Modifier.padding(bottom = 14.dp),
|
||||
)
|
||||
}
|
||||
|
||||
/** What each name setting is called. The desktop client says the same. */
|
||||
private fun TitleNamesChoice.label() = when (this) {
|
||||
TitleNamesChoice.LIBRARY -> "As in the share"
|
||||
TitleNamesChoice.ENGLISH -> "English"
|
||||
TitleNamesChoice.ROMAJI -> "Romaji"
|
||||
}
|
||||
|
||||
/** What each palette family is called. The desktop client says the same. */
|
||||
private fun FlavorChoice.label() = when (this) {
|
||||
FlavorChoice.PROTON -> "Proton"
|
||||
FlavorChoice.LATTE -> "Catppuccin Latte"
|
||||
FlavorChoice.FRAPPE -> "Catppuccin Frappé"
|
||||
FlavorChoice.MACCHIATO -> "Catppuccin Macchiato"
|
||||
FlavorChoice.MOCHA -> "Catppuccin Mocha"
|
||||
FlavorChoice.PERSONA5 -> "Persona 5"
|
||||
}
|
||||
@@ -0,0 +1,284 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.lazy.grid.items
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Refresh
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import androidx.compose.ui.window.SecureFlagPolicy
|
||||
import androidx.compose.ui.unit.dp
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
import uniffi.pstr_android.ShareRecord
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.material3.ExtendedFloatingActionButton
|
||||
import androidx.compose.material3.ListItem
|
||||
import androidx.compose.material3.ListItemDefaults
|
||||
import androidx.compose.material3.DropdownMenu
|
||||
import androidx.compose.material3.DropdownMenuItem
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material.icons.filled.MoreVert
|
||||
import androidx.compose.material.icons.filled.Key
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material.icons.filled.FolderShared
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
@Composable
|
||||
internal fun SharesScreen(
|
||||
shares: List<ShareRecord>,
|
||||
onAdd: (String, String, String?) -> Unit,
|
||||
onRepair: (String, String, String?) -> Unit,
|
||||
onRefresh: (String) -> Unit,
|
||||
onRemove: (String) -> Unit,
|
||||
incomingLink: String?,
|
||||
onIncomingLinkTaken: () -> Unit,
|
||||
padding: PaddingValues,
|
||||
) {
|
||||
var showAdd by remember { mutableStateOf(false) }
|
||||
var repairing by remember { mutableStateOf<ShareRecord?>(null) }
|
||||
var removing by remember { mutableStateOf<ShareRecord?>(null) }
|
||||
TabPage("Shares", padding) { body ->
|
||||
Box(Modifier.fillMaxSize().padding(body)) {
|
||||
if (shares.isEmpty()) {
|
||||
EmptyState("No shares yet", "Add a Proton Drive public link to build your library.")
|
||||
} else {
|
||||
LazyColumn(contentPadding = PaddingValues(top = 8.dp, bottom = 96.dp)) {
|
||||
items(shares, key = { it.id }) { share ->
|
||||
ShareRow(
|
||||
share = share,
|
||||
onRefresh = { onRefresh(share.id) },
|
||||
onRepair = { repairing = share },
|
||||
onRemove = { removing = share },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
// Where a thumb is, and the one thing this page is for. The share
|
||||
// sheet and a tapped link land in the same form.
|
||||
ExtendedFloatingActionButton(
|
||||
onClick = { showAdd = true },
|
||||
icon = { Icon(Icons.Default.Add, contentDescription = null) },
|
||||
text = { Text("Add share") },
|
||||
containerColor = MaterialTheme.colorScheme.primary,
|
||||
contentColor = MaterialTheme.colorScheme.onPrimary,
|
||||
modifier = Modifier.align(Alignment.BottomEnd).padding(16.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
if (showAdd || incomingLink != null) {
|
||||
AddShareDialog(
|
||||
initialUrl = incomingLink.orEmpty(),
|
||||
onDismiss = { showAdd = false; onIncomingLinkTaken() },
|
||||
onAdd = onAdd,
|
||||
)
|
||||
}
|
||||
repairing?.let { share ->
|
||||
RepairShareDialog(
|
||||
share = share,
|
||||
onDismiss = { repairing = null },
|
||||
onRepair = { url, password -> onRepair(share.id, url, password) },
|
||||
)
|
||||
}
|
||||
removing?.let { share ->
|
||||
// Asked, because it cannot be undone: the link's secret, its offline
|
||||
// files and its watch positions all go (`Catalog::remove_share`).
|
||||
AlertDialog(
|
||||
onDismissRequest = { removing = null },
|
||||
title = { Text("Remove ${share.name}?") },
|
||||
text = {
|
||||
Text(
|
||||
"Its titles leave the library, and its offline episodes and watch " +
|
||||
"progress are deleted. Adding the link again starts it fresh.",
|
||||
)
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(onClick = { removing = null; onRemove(share.id) }) { Text("Remove") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = { removing = null }) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* One share: its name, how it is unlocked, and its actions behind a menu.
|
||||
*
|
||||
* Three differently styled controls beside the name squeezed it into a column
|
||||
* a word wide; one icon leaves the row its width.
|
||||
*/
|
||||
@Composable
|
||||
private fun ShareRow(
|
||||
share: ShareRecord,
|
||||
onRefresh: () -> Unit,
|
||||
onRepair: () -> Unit,
|
||||
onRemove: () -> Unit,
|
||||
) {
|
||||
var menu by remember { mutableStateOf(false) }
|
||||
ListItem(
|
||||
headlineContent = { Text(share.name, fontWeight = FontWeight.SemiBold) },
|
||||
supportingContent = {
|
||||
Text(if (share.hasCustomPassword) "Link and custom password, stored securely" else "Public link")
|
||||
},
|
||||
leadingContent = {
|
||||
Icon(
|
||||
Icons.Default.FolderShared,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
)
|
||||
},
|
||||
trailingContent = {
|
||||
Box {
|
||||
IconButton(onClick = { menu = true }) {
|
||||
Icon(Icons.Default.MoreVert, contentDescription = "Actions for ${share.name}")
|
||||
}
|
||||
DropdownMenu(expanded = menu, onDismissRequest = { menu = false }) {
|
||||
// One share, not the library: a link that has just had files
|
||||
// added should not cost a walk of every other one.
|
||||
DropdownMenuItem(
|
||||
text = { Text("Refresh") },
|
||||
leadingIcon = { Icon(Icons.Default.Refresh, contentDescription = null) },
|
||||
onClick = { menu = false; onRefresh() },
|
||||
)
|
||||
// Not a remove: a share whose secret has become unreadable
|
||||
// cannot be removed either, since removal deletes a secret
|
||||
// the store can no longer touch.
|
||||
DropdownMenuItem(
|
||||
text = { Text("Re-enter link") },
|
||||
leadingIcon = { Icon(Icons.Default.Key, contentDescription = null) },
|
||||
onClick = { menu = false; onRepair() },
|
||||
)
|
||||
DropdownMenuItem(
|
||||
text = { Text("Remove") },
|
||||
leadingIcon = { Icon(Icons.Default.Delete, contentDescription = null) },
|
||||
onClick = { menu = false; onRemove() },
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
colors = ListItemDefaults.colors(containerColor = Color.Transparent),
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
* Re-enter the link for a share the app can no longer decrypt its secret for.
|
||||
*
|
||||
* It has to be the *same* link — a different token is a different share, and
|
||||
* repointing this one at it would leave every catalog row and every offline file
|
||||
* describing something that is not there. Rust enforces that; this only says so.
|
||||
*/
|
||||
@Composable
|
||||
private fun RepairShareDialog(
|
||||
share: ShareRecord,
|
||||
onDismiss: () -> Unit,
|
||||
onRepair: (String, String?) -> Unit,
|
||||
) {
|
||||
var url by remember { mutableStateOf("") }
|
||||
var password by remember { mutableStateOf("") }
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
properties = DialogProperties(securePolicy = SecureFlagPolicy.SecureOn),
|
||||
title = { Text("Re-enter link for ${share.name}") },
|
||||
text = {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
Text(
|
||||
"The stored credentials for this share cannot be read — usually after a " +
|
||||
"screen-lock change or a device restore. Entering the same link again " +
|
||||
"restores access without losing the library or anything downloaded.",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
)
|
||||
OutlinedTextField(
|
||||
url,
|
||||
{ url = it },
|
||||
label = { Text("Public share URL") },
|
||||
singleLine = true,
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
)
|
||||
OutlinedTextField(
|
||||
password,
|
||||
{ password = it },
|
||||
label = { Text("Custom password (optional)") },
|
||||
singleLine = true,
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
)
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(
|
||||
onClick = { onRepair(url.trim(), password); onDismiss() },
|
||||
enabled = url.isNotBlank(),
|
||||
) { Text("Restore") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = onDismiss) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
private fun AddShareDialog(
|
||||
initialUrl: String,
|
||||
onDismiss: () -> Unit,
|
||||
onAdd: (String, String, String?) -> Unit,
|
||||
) {
|
||||
var name by remember { mutableStateOf("") }
|
||||
var url by remember(initialUrl) { mutableStateOf(initialUrl) }
|
||||
var password by remember { mutableStateOf("") }
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
properties = DialogProperties(securePolicy = SecureFlagPolicy.SecureOn),
|
||||
title = { Text("Add Proton Drive share") },
|
||||
text = {
|
||||
Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
OutlinedTextField(name, { name = it }, label = { Text("Library name") }, singleLine = true)
|
||||
OutlinedTextField(
|
||||
url,
|
||||
{ url = it },
|
||||
label = { Text("Public share URL") },
|
||||
singleLine = true,
|
||||
// The URL fragment is a secret. Password input disables
|
||||
// IME learning/suggestions while normal long-press paste
|
||||
// remains available.
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
)
|
||||
OutlinedTextField(
|
||||
password,
|
||||
{ password = it },
|
||||
label = { Text("Custom password (optional)") },
|
||||
singleLine = true,
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
)
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
AccentButton(
|
||||
onClick = { onAdd(name.trim(), url.trim(), password); onDismiss() },
|
||||
enabled = name.isNotBlank() && url.isNotBlank(),
|
||||
) { Text("Add") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = onDismiss) { Text("Cancel") } },
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1,706 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import android.content.Intent
|
||||
import androidx.activity.compose.PredictiveBackHandler
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.runtime.mutableFloatStateOf
|
||||
import androidx.compose.ui.graphics.graphicsLayer
|
||||
import kotlin.coroutines.cancellation.CancellationException
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.BoxWithConstraints
|
||||
import androidx.compose.foundation.layout.statusBarsPadding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.lazy.itemsIndexed
|
||||
import androidx.compose.foundation.lazy.grid.items
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.CheckCircle
|
||||
import androidx.compose.material.icons.outlined.CheckCircle
|
||||
import androidx.compose.material.icons.filled.Download
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material.icons.filled.Pause
|
||||
import androidx.compose.material.icons.filled.PlayArrow
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.livedata.observeAsState
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.core.net.toUri
|
||||
import androidx.work.WorkManager
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
import io.narl.protonstream.download.DownloadCoordinator
|
||||
import io.narl.protonstream.download.DownloadStateStore
|
||||
import io.narl.protonstream.download.RetainedDownload
|
||||
import io.narl.protonstream.native.NativeRuntime
|
||||
import io.narl.protonstream.ui.theme.AccentButton
|
||||
import io.narl.protonstream.ui.theme.AccentProgress
|
||||
import io.narl.protonstream.ui.theme.EdgedButton
|
||||
import io.narl.protonstream.ui.theme.QuietButton
|
||||
import io.narl.protonstream.ui.theme.TonalButton
|
||||
import io.narl.protonstream.ui.theme.solid
|
||||
import androidx.compose.foundation.border
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
import uniffi.pstr_android.TitleType
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
import uniffi.pstr_android.SeasonRecord
|
||||
import uniffi.pstr_android.MatchRecord
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.material3.FilterChip
|
||||
import androidx.compose.material.icons.filled.Replay
|
||||
import androidx.compose.material.icons.filled.DownloadDone
|
||||
import androidx.compose.material.icons.automirrored.filled.OpenInNew
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
|
||||
@Composable
|
||||
internal fun TitleScreen(
|
||||
title: TitleRecord,
|
||||
playerReady: Boolean,
|
||||
onPlay: (List<EpisodeRecord>, Int) -> Unit,
|
||||
onBack: () -> Unit,
|
||||
onPreferenceError: (Throwable) -> Unit,
|
||||
onMetadataChanged: () -> Unit,
|
||||
onSetWatched: (EpisodeRecord, Boolean) -> Unit,
|
||||
padding: PaddingValues,
|
||||
/** Every title of its franchise, in release order, this one included. */
|
||||
franchise: List<TitleRecord> = emptyList(),
|
||||
onOpenTitle: (TitleRecord) -> Unit = {},
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
var showMatch by remember(title.key) { mutableStateOf(false) }
|
||||
var overviewOpen by remember(title.key) { mutableStateOf(false) }
|
||||
|
||||
// Predictive back: the page shrinks towards the library as the gesture
|
||||
// is dragged, and springs back if it is let go of, so the viewer sees
|
||||
// where back goes before committing to it.
|
||||
var backProgress by remember { mutableFloatStateOf(0f) }
|
||||
PredictiveBackHandler { gesture ->
|
||||
try {
|
||||
gesture.collect { backProgress = it.progress }
|
||||
onBack()
|
||||
} catch (cancelled: CancellationException) {
|
||||
backProgress = 0f
|
||||
throw cancelled
|
||||
}
|
||||
}
|
||||
|
||||
// Display order across seasons: what previous/next and autoplay walk, and
|
||||
// the same order the desktop client uses.
|
||||
val playlist = remember(title) { title.seasons.flatMap(SeasonRecord::episodes) }
|
||||
val nextUp = remember(playlist) { nextUpIndex(playlist) }
|
||||
val upNext = playlist.getOrNull(nextUp)
|
||||
// One season on screen at a time, opened on the one Play would land in: a
|
||||
// forty-episode show as stacked sections is one long scroll to the part
|
||||
// that matters.
|
||||
var seasonIndex by remember(title.key) {
|
||||
mutableStateOf(
|
||||
title.seasons.indexOfFirst { season -> season.episodes.any { it.linkId == upNext?.linkId } }
|
||||
.coerceAtLeast(0),
|
||||
)
|
||||
}
|
||||
val season = title.seasons.getOrNull(seasonIndex)
|
||||
// Live download state per episode, so a row can show progress and be paused
|
||||
// without a trip to the Downloads tab.
|
||||
val work by WorkManager.getInstance(context)
|
||||
.getWorkInfosByTagLiveData(DownloadCoordinator.TAG).observeAsState(emptyList())
|
||||
val downloads = remember(work) { DownloadStateStore(context).records() }
|
||||
|
||||
// On a tablet the page keeps a phone's reading width, centred: a Play
|
||||
// button and synopsis lines two thousand pixels wide are read by turning
|
||||
// the head. The backdrop still spans the window, but no taller than about
|
||||
// half of it, or a landscape tablet opened on a picture and nothing else.
|
||||
BoxWithConstraints(
|
||||
Modifier
|
||||
.fillMaxSize()
|
||||
.graphicsLayer {
|
||||
val scale = 1f - 0.1f * backProgress
|
||||
scaleX = scale
|
||||
scaleY = scale
|
||||
shape = RoundedCornerShape((32 * backProgress).dp)
|
||||
clip = backProgress > 0f
|
||||
}
|
||||
.padding(padding),
|
||||
) {
|
||||
val side = ((maxWidth - READABLE_WIDTH) / 2).coerceAtLeast(0.dp)
|
||||
val backdropHeight = minOf(maxWidth * 9f / 16f, maxHeight * 0.55f)
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
contentPadding = PaddingValues(bottom = 24.dp),
|
||||
verticalArrangement = Arrangement.spacedBy(8.dp),
|
||||
) {
|
||||
item(key = "backdrop") {
|
||||
// Edge to edge, fading into the page: the art is the first thing
|
||||
// the page says, and a framed thumbnail with a margin round it read
|
||||
// as one card among the many below it.
|
||||
Box(Modifier.sharedArt(title.key).fillMaxWidth().height(backdropHeight)) {
|
||||
RemoteArtwork(
|
||||
title.backdropUrl ?: title.posterUrl,
|
||||
title.displayName,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = title.thumbnailSource,
|
||||
labelled = false,
|
||||
)
|
||||
Box(
|
||||
Modifier.fillMaxSize().background(
|
||||
Brush.verticalGradient(
|
||||
0.45f to Color.Transparent,
|
||||
1f to MaterialTheme.colorScheme.background,
|
||||
),
|
||||
),
|
||||
)
|
||||
IconButton(
|
||||
onClick = onBack,
|
||||
modifier = Modifier
|
||||
.statusBarsPadding()
|
||||
.padding(8.dp)
|
||||
.clip(CircleShape)
|
||||
.background(Color.Black.copy(alpha = 0.4f)),
|
||||
) {
|
||||
Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Back to library", tint = Color.White)
|
||||
}
|
||||
}
|
||||
}
|
||||
item(key = "heading") {
|
||||
Column(Modifier.padding(horizontal = side + 16.dp)) {
|
||||
Text(title.displayName, style = MaterialTheme.typography.headlineMedium)
|
||||
// The other names it goes by: the share's when the shown one
|
||||
// is the provider's, and the original-language one.
|
||||
listOfNotNull(
|
||||
title.name.takeIf { it != title.displayName },
|
||||
title.originalName?.takeIf { it != title.displayName && it != title.canonicalName },
|
||||
).joinToString(" · ").takeIf(String::isNotEmpty)?.let {
|
||||
Text(it, style = MaterialTheme.typography.bodyMedium, color = MaterialTheme.colorScheme.onSurfaceVariant)
|
||||
}
|
||||
Text(
|
||||
listOfNotNull(
|
||||
title.formatLabel,
|
||||
title.seasonLabel ?: (title.metadataYear ?: title.year)?.toString(),
|
||||
title.rating?.let { "★ %.1f".format(it) },
|
||||
"${title.watchedCount} of ${title.episodeCount} watched".takeIf { title.episodeCount > 1uL },
|
||||
).joinToString(" · "),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(top = 6.dp),
|
||||
)
|
||||
// Who made it, and whether more is coming — the desktop's
|
||||
// line of facts, on a line of its own so neither wraps.
|
||||
listOfNotNull(
|
||||
title.studios.takeIf { it.isNotEmpty() }?.take(2)?.joinToString(", "),
|
||||
title.directors.firstOrNull()?.let { "dir. $it" },
|
||||
airingNote(title),
|
||||
).joinToString(" · ").takeIf(String::isNotEmpty)?.let {
|
||||
Text(
|
||||
it,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(top = 2.dp),
|
||||
)
|
||||
}
|
||||
// The one thing the page is for, full width and naming what it
|
||||
// will play: "Resume" alone left the viewer guessing which
|
||||
// episode of forty it meant.
|
||||
AccentButton(
|
||||
onClick = { onPlay(playlist, nextUp) },
|
||||
enabled = playerReady && playlist.isNotEmpty(),
|
||||
modifier = Modifier.fillMaxWidth().padding(top = 16.dp),
|
||||
) {
|
||||
Icon(Icons.Default.PlayArrow, contentDescription = null, modifier = Modifier.size(20.dp))
|
||||
Spacer(Modifier.width(8.dp))
|
||||
Text(
|
||||
when {
|
||||
!playerReady -> "Player loading…"
|
||||
upNext == null -> "Play"
|
||||
upNext.resumeAt != null -> "Resume ${upNext.label}"
|
||||
title.watchedCount > 0uL -> "Continue with ${upNext.label}"
|
||||
playlist.size == 1 -> "Play"
|
||||
else -> "Play ${upNext.label}"
|
||||
},
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
}
|
||||
// Everything else as labelled icons in one row: four actions of
|
||||
// three button styles used to wrap over three lines and bury
|
||||
// the episodes under them.
|
||||
Row(Modifier.fillMaxWidth().padding(top = 12.dp)) {
|
||||
// Only where it would do something different: an unstarted
|
||||
// show already starts at the beginning.
|
||||
if (upNext?.resumeAt != null || title.watchedCount > 0uL) {
|
||||
TitleAction(Icons.Default.Replay, "Start over", Modifier.weight(1f), enabled = playerReady) {
|
||||
onPlay(playlist, 0)
|
||||
}
|
||||
}
|
||||
TitleAction(Icons.Default.Download, "Download", Modifier.weight(1f)) {
|
||||
DownloadCoordinator.enqueue(context, playlist)
|
||||
}
|
||||
TitleAction(Icons.Default.Edit, "Match", Modifier.weight(1f)) { showMatch = true }
|
||||
// The provider's own page for this title: where a viewer goes
|
||||
// to check that the thing the app matched is what they have.
|
||||
title.externalUrl?.let { url ->
|
||||
TitleAction(
|
||||
Icons.AutoMirrored.Filled.OpenInNew,
|
||||
title.metadataProvider?.displayName() ?: "Provider",
|
||||
Modifier.weight(1f),
|
||||
) {
|
||||
runCatching {
|
||||
context.startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
|
||||
}.onFailure(onPreferenceError)
|
||||
}
|
||||
}
|
||||
}
|
||||
title.overview?.let { overview ->
|
||||
// Three lines, then a tap for the rest: a synopsis with its
|
||||
// source notes ran to a screen and a half on a phone.
|
||||
Text(
|
||||
overview.trim(),
|
||||
maxLines = if (overviewOpen) Int.MAX_VALUE else 3,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier
|
||||
.padding(top = 12.dp)
|
||||
.clickable { overviewOpen = !overviewOpen },
|
||||
)
|
||||
}
|
||||
// Genres as chips, then the provider's tags quieter after
|
||||
// them: a tag is its community describing it, not what it
|
||||
// is filed as.
|
||||
if (title.genres.isNotEmpty() || title.tags.isNotEmpty()) {
|
||||
Text(
|
||||
(title.genres + title.tags.take(4)).joinToString(" · "),
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(top = 10.dp),
|
||||
)
|
||||
}
|
||||
// Said plainly, because it changes what a re-match will do: a
|
||||
// hand-picked match is not overwritten by an automatic pass.
|
||||
if (title.manualMatch) {
|
||||
Text(
|
||||
"Matched by hand",
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
modifier = Modifier.padding(top = 8.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
if (franchise.size > 1) {
|
||||
item(key = "franchise") {
|
||||
Column(Modifier.padding(top = 12.dp)) {
|
||||
Text(
|
||||
"In this franchise",
|
||||
style = MaterialTheme.typography.titleMedium,
|
||||
modifier = Modifier.padding(horizontal = side + 16.dp),
|
||||
)
|
||||
LazyRow(
|
||||
horizontalArrangement = Arrangement.spacedBy(12.dp),
|
||||
contentPadding = PaddingValues(start = side + 16.dp, end = side + 16.dp, top = 10.dp),
|
||||
) {
|
||||
items(franchise, key = { it.key }) { member ->
|
||||
FranchiseTile(member, here = member.key == title.key) { onOpenTitle(member) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
item(key = "seasons") {
|
||||
Row(
|
||||
Modifier.fillMaxWidth().padding(start = side + 16.dp, end = side + 4.dp, top = 12.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
) {
|
||||
LazyRow(Modifier.weight(1f), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
|
||||
itemsIndexed(title.seasons, key = { _, it -> it.label }) { index, entry ->
|
||||
FilterChip(
|
||||
selected = index == seasonIndex,
|
||||
onClick = { seasonIndex = index },
|
||||
label = { Text(entry.label) },
|
||||
)
|
||||
}
|
||||
}
|
||||
season?.let {
|
||||
IconButton(onClick = { DownloadCoordinator.enqueue(context, it.episodes) }) {
|
||||
Icon(Icons.Default.Download, contentDescription = "Download ${it.label}")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
season?.let { shown ->
|
||||
itemsIndexed(shown.episodes, key = { _, it -> it.linkId }) { position, episode ->
|
||||
Box(Modifier.padding(horizontal = side)) {
|
||||
EpisodeRow(
|
||||
episode = episode,
|
||||
numbering = episode.numbering(shown.number, position),
|
||||
position = position,
|
||||
download = downloads.firstOrNull {
|
||||
it.shareId == episode.shareId && it.linkId == episode.linkId
|
||||
},
|
||||
playerReady = playerReady,
|
||||
onPlay = { onPlay(playlist, playlist.indexOfFirst { it.linkId == episode.linkId }) },
|
||||
onDownload = { DownloadCoordinator.enqueue(context, episode) },
|
||||
onPause = { DownloadCoordinator.pause(context, it) },
|
||||
onResume = { DownloadCoordinator.resume(context, it) },
|
||||
onSetWatched = { onSetWatched(episode, it) },
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (showMatch) {
|
||||
ChangeMatchDialog(
|
||||
title = title,
|
||||
onDismiss = { showMatch = false },
|
||||
onChanged = { showMatch = false; onMetadataChanged() },
|
||||
onError = onPreferenceError,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* One part of the franchise: its cover, what it is and when. This title's own
|
||||
* is marked rather than left out, so the row says where it sits in the story.
|
||||
*/
|
||||
@Composable
|
||||
private fun FranchiseTile(title: TitleRecord, here: Boolean, onClick: () -> Unit) {
|
||||
Column(
|
||||
Modifier
|
||||
.width(96.dp)
|
||||
.clip(MaterialTheme.shapes.medium)
|
||||
.clickable(enabled = !here, onClick = onClick),
|
||||
) {
|
||||
RemoteArtwork(
|
||||
title.posterUrl ?: title.backdropUrl,
|
||||
title.displayName,
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.aspectRatio(2f / 3f)
|
||||
.clip(MaterialTheme.shapes.medium)
|
||||
.then(
|
||||
if (here) {
|
||||
Modifier.border(2.dp, MaterialTheme.colorScheme.primary, MaterialTheme.shapes.medium)
|
||||
} else {
|
||||
Modifier
|
||||
},
|
||||
),
|
||||
fallback = title.thumbnailSource,
|
||||
)
|
||||
Text(
|
||||
title.displayName,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
fontWeight = if (here) FontWeight.SemiBold else null,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(top = 6.dp),
|
||||
)
|
||||
Text(
|
||||
listOfNotNull(
|
||||
title.formatLabel ?: if (title.kind == TitleType.FILM) "Film" else "Series",
|
||||
(title.metadataYear ?: title.year)?.toString(),
|
||||
).joinToString(" · "),
|
||||
style = MaterialTheme.typography.labelSmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 1,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* "Episode 7 on Sat 11 Oct" while one is due, "Airing" while it is airing with
|
||||
* no date yet, else nothing.
|
||||
*/
|
||||
private fun airingNote(title: TitleRecord): String? {
|
||||
val at = title.nextAiringAt
|
||||
val episode = title.nextEpisode
|
||||
if (at != null && episode != null) {
|
||||
val day = java.time.Instant.ofEpochSecond(at).atZone(java.time.ZoneId.systemDefault())
|
||||
return "episode $episode on " + day.format(java.time.format.DateTimeFormatter.ofPattern("EEE d MMM"))
|
||||
}
|
||||
return if (title.airing) "airing" else null
|
||||
}
|
||||
|
||||
/** How wide the page's text and controls run on a window wider than a phone. */
|
||||
private val READABLE_WIDTH = 720.dp
|
||||
|
||||
/** One of the title's secondary actions: an icon with its name under it. */
|
||||
@Composable
|
||||
private fun TitleAction(
|
||||
icon: ImageVector,
|
||||
label: String,
|
||||
modifier: Modifier = Modifier,
|
||||
enabled: Boolean = true,
|
||||
onClick: () -> Unit,
|
||||
) {
|
||||
Column(
|
||||
modifier
|
||||
.clip(MaterialTheme.shapes.medium)
|
||||
.clickable(enabled = enabled, onClick = onClick)
|
||||
.padding(vertical = 8.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally,
|
||||
) {
|
||||
Icon(icon, contentDescription = null)
|
||||
Text(
|
||||
label,
|
||||
style = MaterialTheme.typography.labelMedium,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(top = 4.dp),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* `S03E38`, `E38`, or the row's place in the season.
|
||||
*
|
||||
* Mirrors `Episode::numbering` in `pstr-core`, plus the desktop client's
|
||||
* fallback to the season folder's number. The last case is deliberately *not*
|
||||
* printed as an episode number — nothing in the name numbered this file, and
|
||||
* `#4` says "fourth in the list" where `E04` would be a claim about the show.
|
||||
* Some ordinal is required regardless: a season of rows that all read the same
|
||||
* is a season the viewer cannot navigate at all.
|
||||
*/
|
||||
private fun EpisodeRecord.numbering(fallbackSeason: UInt?, position: Int): String {
|
||||
val season = this.season ?: fallbackSeason
|
||||
val number = this.number
|
||||
return when {
|
||||
season != null && number != null -> "S%02dE%02d".format(season.toInt(), number.toInt())
|
||||
number != null -> "E%02d".format(number.toInt())
|
||||
else -> "#${position + 1}"
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* One episode: play it, see where it was left, and drive its download.
|
||||
*
|
||||
* The row *is* the play button — the still, the number and the name are one
|
||||
* target, which is what lets the trailing controls be two icons in a fixed
|
||||
* column rather than a second row of buttons under every episode.
|
||||
*/
|
||||
@Composable
|
||||
private fun EpisodeRow(
|
||||
episode: EpisodeRecord,
|
||||
numbering: String,
|
||||
position: Int,
|
||||
download: RetainedDownload?,
|
||||
playerReady: Boolean,
|
||||
onPlay: () -> Unit,
|
||||
onDownload: () -> Unit,
|
||||
onPause: (RetainedDownload) -> Unit,
|
||||
onResume: (RetainedDownload) -> Unit,
|
||||
onSetWatched: (Boolean) -> Unit,
|
||||
) {
|
||||
val running = download?.status == RetainedDownload.STATUS_RUNNING ||
|
||||
download?.status == RetainedDownload.STATUS_QUEUED
|
||||
val heading = episode.heading(position)
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.clickable(enabled = playerReady, onClick = onPlay)
|
||||
.padding(horizontal = 16.dp, vertical = 6.dp),
|
||||
) {
|
||||
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||
// With metadata off the provider has no still, and Proton's own
|
||||
// thumbnail is a frame of this very episode. Where it was left sits
|
||||
// on the still's lower edge, the way every streaming app shows it.
|
||||
Box(
|
||||
Modifier
|
||||
.width(128.dp)
|
||||
.aspectRatio(16f / 9f)
|
||||
.clip(MaterialTheme.shapes.small),
|
||||
contentAlignment = Alignment.Center,
|
||||
) {
|
||||
RemoteArtwork(
|
||||
episode.stillUrl,
|
||||
heading,
|
||||
Modifier.fillMaxSize(),
|
||||
fallback = episode.thumbnailSource,
|
||||
labelled = false,
|
||||
)
|
||||
episode.progress?.takeIf { !episode.watched }?.let { progress ->
|
||||
AccentProgress(
|
||||
progress = { progress.toFloat().coerceIn(0f, 1f) },
|
||||
modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
|
||||
)
|
||||
}
|
||||
}
|
||||
Column(Modifier.weight(1f).padding(horizontal = 12.dp)) {
|
||||
Text(
|
||||
heading,
|
||||
style = MaterialTheme.typography.titleSmall,
|
||||
// Seen episodes stay legible but stop competing with the
|
||||
// one the viewer has not watched yet.
|
||||
color = if (episode.watched) {
|
||||
MaterialTheme.colorScheme.onSurfaceVariant
|
||||
} else {
|
||||
MaterialTheme.colorScheme.onSurface
|
||||
},
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
)
|
||||
Text(
|
||||
listOfNotNull(
|
||||
numbering,
|
||||
episode.size?.let(::formatBytes),
|
||||
episode.airDate,
|
||||
).joinToString(" · "),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(top = 2.dp),
|
||||
)
|
||||
}
|
||||
// Watched is a judgement the viewer is allowed to overrule: a
|
||||
// half-watched episode they are done with, or one the 90 % rule
|
||||
// marked seen because they sat through the credits.
|
||||
IconButton(onClick = { onSetWatched(!episode.watched) }) {
|
||||
Icon(
|
||||
if (episode.watched) Icons.Default.CheckCircle else Icons.Outlined.CheckCircle,
|
||||
contentDescription = if (episode.watched) "Mark unwatched" else "Mark watched",
|
||||
tint = if (episode.watched) {
|
||||
MaterialTheme.colorScheme.primary
|
||||
} else {
|
||||
MaterialTheme.colorScheme.outline
|
||||
},
|
||||
)
|
||||
}
|
||||
// One slot, always the same width, whatever state the download
|
||||
// is in — including "there is nothing to say", where an empty
|
||||
// box keeps the rows above and below it aligned.
|
||||
Box(Modifier.size(48.dp), contentAlignment = Alignment.Center) {
|
||||
when {
|
||||
episode.offline -> Icon(
|
||||
Icons.Default.DownloadDone,
|
||||
contentDescription = "Saved offline",
|
||||
tint = MaterialTheme.colorScheme.tertiary,
|
||||
)
|
||||
running -> IconButton(onClick = { onPause(download!!) }) {
|
||||
Icon(Icons.Default.Pause, contentDescription = "Pause download")
|
||||
}
|
||||
download != null -> IconButton(onClick = { onResume(download) }) {
|
||||
Icon(Icons.Default.Download, contentDescription = "Resume download")
|
||||
}
|
||||
else -> IconButton(onClick = onDownload) {
|
||||
Icon(Icons.Default.Download, contentDescription = "Download")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
episode.providerOverview?.let {
|
||||
Text(
|
||||
it,
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
maxLines = 2,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier.padding(top = 6.dp),
|
||||
)
|
||||
}
|
||||
download?.takeIf { it.total > 0L && !episode.offline }?.let { active ->
|
||||
AccentProgress(
|
||||
progress = { (active.downloaded.toFloat() / active.total).coerceIn(0f, 1f) },
|
||||
modifier = Modifier.fillMaxWidth().padding(top = 8.dp),
|
||||
fill = solid(MaterialTheme.colorScheme.tertiary),
|
||||
)
|
||||
Text(
|
||||
"${active.status.replaceFirstChar { it.uppercase() }} · " +
|
||||
"${formatBytes(active.downloaded.toULong())} of ${formatBytes(active.total.toULong())}",
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
internal fun ChangeMatchDialog(
|
||||
title: TitleRecord,
|
||||
onDismiss: () -> Unit,
|
||||
onChanged: () -> Unit,
|
||||
onError: (Throwable) -> Unit,
|
||||
) {
|
||||
var term by remember(title.key) { mutableStateOf(title.canonicalName ?: title.name) }
|
||||
var searching by remember { mutableStateOf(false) }
|
||||
var options by remember { mutableStateOf<List<MatchRecord>>(emptyList()) }
|
||||
val scope = rememberCoroutineScope()
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
title = { Text("Change match") },
|
||||
text = {
|
||||
Column {
|
||||
Text("Search the configured metadata provider. Nothing is stored until you choose an entry.")
|
||||
OutlinedTextField(term, { term = it }, Modifier.fillMaxWidth().padding(vertical = 8.dp), singleLine = true)
|
||||
AccentButton(enabled = term.isNotBlank() && !searching, onClick = {
|
||||
searching = true
|
||||
scope.launch {
|
||||
runCatching {
|
||||
withContext(Dispatchers.IO) { NativeRuntime.engine().searchMatches(title.key, term) }
|
||||
}.onSuccess { options = it }.onFailure(onError)
|
||||
searching = false
|
||||
}
|
||||
}) { Text(if (searching) "Searching…" else "Search") }
|
||||
LazyColumn(Modifier.fillMaxWidth().heightIn(max = 300.dp)) {
|
||||
items(options, key = { "${it.provider}:${it.remoteId}" }) { option ->
|
||||
EdgedButton(
|
||||
onClick = {
|
||||
scope.launch {
|
||||
runCatching {
|
||||
withContext(Dispatchers.IO) { NativeRuntime.engine().chooseMatch(title.key, option) }
|
||||
}.onSuccess { onChanged() }.onFailure(onError)
|
||||
}
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth().padding(top = 6.dp),
|
||||
) {
|
||||
Column(Modifier.fillMaxWidth()) {
|
||||
Text(option.name, fontWeight = FontWeight.SemiBold)
|
||||
Text(listOfNotNull(option.year?.toString(), option.originalName).joinToString(" · "))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
QuietButton(onClick = {
|
||||
scope.launch {
|
||||
runCatching { withContext(Dispatchers.IO) { NativeRuntime.engine().forgetMatch(title.key) } }
|
||||
.onSuccess { onChanged() }.onFailure(onError)
|
||||
}
|
||||
}) { Text("Forget match") }
|
||||
},
|
||||
dismissButton = { TonalButton(onClick = onDismiss) { Text("Close") } },
|
||||
)
|
||||
}
|
||||
@@ -2,6 +2,7 @@ package io.narl.protonstream.ui.theme
|
||||
|
||||
import androidx.compose.foundation.Canvas
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.RowScope
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
@@ -9,6 +10,7 @@ import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.FilledTonalButton
|
||||
import androidx.compose.material3.LocalMinimumInteractiveComponentSize
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.NavigationBarItemDefaults
|
||||
import androidx.compose.material3.NavigationDrawerItemDefaults
|
||||
@@ -18,14 +20,18 @@ import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteDefaul
|
||||
import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteItemColors
|
||||
import androidx.compose.material3.SliderState
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.minimumInteractiveComponentSize
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.geometry.CornerRadius
|
||||
import androidx.compose.ui.geometry.Size
|
||||
import androidx.compose.ui.graphics.Brush
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.SolidColor
|
||||
import androidx.compose.ui.unit.Dp
|
||||
import androidx.compose.ui.unit.dp
|
||||
|
||||
/**
|
||||
@@ -68,17 +74,30 @@ internal fun AccentButton(
|
||||
content: @Composable RowScope.() -> Unit,
|
||||
) {
|
||||
val shape = MaterialTheme.shapes.small
|
||||
Button(
|
||||
onClick = onClick,
|
||||
// Only while it is live: a disabled button keeps Material's flat
|
||||
// disabled container, because a greyed control that still wears the
|
||||
// one strong colour in the window reads as pressable.
|
||||
modifier = if (enabled) modifier.background(accentBrush(), shape) else modifier,
|
||||
enabled = enabled,
|
||||
shape = shape,
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent),
|
||||
content = content,
|
||||
)
|
||||
// The button pads itself out to the 48dp minimum touch target, and a
|
||||
// background on its modifier fills that whole target — 8dp taller than
|
||||
// the 40dp container every other button draws. So the padding is taken
|
||||
// here, outside the ramp, and the button inside is told not to add its
|
||||
// own. The box hands its size down, so a `fillMaxWidth` still reaches it.
|
||||
Box(
|
||||
modifier.minimumInteractiveComponentSize(),
|
||||
contentAlignment = Alignment.Center,
|
||||
propagateMinConstraints = true,
|
||||
) {
|
||||
CompositionLocalProvider(LocalMinimumInteractiveComponentSize provides Dp.Unspecified) {
|
||||
Button(
|
||||
onClick = onClick,
|
||||
// Only while it is live: a disabled button keeps Material's flat
|
||||
// disabled container, because a greyed control that still wears the
|
||||
// one strong colour in the window reads as pressable.
|
||||
modifier = if (enabled) Modifier.background(accentBrush(), shape) else Modifier,
|
||||
enabled = enabled,
|
||||
shape = shape,
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color.Transparent),
|
||||
content = content,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
@@ -168,11 +187,21 @@ internal fun AccentProgress(
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
internal fun AccentTrack(state: SliderState, modifier: Modifier = Modifier) {
|
||||
internal fun AccentTrack(state: SliderState, modifier: Modifier = Modifier, buffered: Float = 0f) {
|
||||
val brush = accentBrush()
|
||||
Canvas(modifier.fillMaxWidth().height(TRACK_HEIGHT.dp)) {
|
||||
val radius = CornerRadius(size.height / 2)
|
||||
drawRoundRect(color = Color.White.copy(alpha = 0.30f), cornerRadius = radius)
|
||||
// What is already read ahead, lighter than the rest and under the
|
||||
// played part: a jump that lands in it costs no fetch.
|
||||
val ahead = size.width * buffered.coerceIn(0f, 1f)
|
||||
if (ahead >= size.height) {
|
||||
drawRoundRect(
|
||||
color = Color.White.copy(alpha = 0.55f),
|
||||
size = Size(ahead, size.height),
|
||||
cornerRadius = radius,
|
||||
)
|
||||
}
|
||||
val done = size.width * state.coercedValueAsFraction
|
||||
if (done >= size.height) {
|
||||
drawRoundRect(brush = brush, size = Size(done, size.height), cornerRadius = radius)
|
||||
|
||||
@@ -29,7 +29,7 @@ internal val ProtonShapes = Shapes(
|
||||
/** The radius `pstr-app` draws everything at. */
|
||||
internal const val CORNER = 8f
|
||||
|
||||
/** A badge over artwork — `ui/mod.rs` is the other place this number lives. */
|
||||
/** A badge over artwork — `theme::radius::BADGE` in pstr-app is the other place this number lives. */
|
||||
internal const val CORNER_TIGHT = 4f
|
||||
|
||||
/** A bottom sheet, which has no desktop counterpart. */
|
||||
|
||||
@@ -2,9 +2,28 @@ package io.narl.protonstream.ui.theme
|
||||
|
||||
import androidx.compose.material3.Typography
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.Font
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import io.narl.protonstream.R
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
/**
|
||||
* Inter, the desktop client's face, from the same two files.
|
||||
*
|
||||
* Only Regular and SemiBold ship, as on the desktop. A `Medium` role resolves
|
||||
* to Regular by the usual weight matching rather than to a synthesised bold,
|
||||
* which is how the desktop draws it too.
|
||||
*
|
||||
* Above [ProtonTypography] on purpose: top-level properties initialise in
|
||||
* file order, and a ramp built first would capture this as null and fall back
|
||||
* to the system face without a word.
|
||||
*/
|
||||
internal val Inter = FontFamily(
|
||||
Font(R.font.inter_regular, FontWeight.Normal),
|
||||
Font(R.font.inter_semibold, FontWeight.SemiBold),
|
||||
)
|
||||
|
||||
/**
|
||||
* The type ramp, which is the desktop client's type ramp.
|
||||
*
|
||||
@@ -72,4 +91,5 @@ private fun role(size: Float, weight: FontWeight) = TextStyle(
|
||||
fontSize = size.sp,
|
||||
lineHeight = (size * 1.35f).sp,
|
||||
fontWeight = weight,
|
||||
fontFamily = Inter,
|
||||
)
|
||||
@@ -0,0 +1,20 @@
|
||||
<!--
|
||||
The launcher tile: packaging/io.narl.proton-stream.svg's face gradient, on
|
||||
the full 108dp canvas because the launcher cuts its own shape out of it.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp" android:height="108dp"
|
||||
android:viewportWidth="108" android:viewportHeight="108">
|
||||
<path android:pathData="M0,0h108v108h-108z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient android:type="linear"
|
||||
android:startX="0" android:startY="0"
|
||||
android:endX="108" android:endY="108">
|
||||
<item android:offset="0" android:color="#FFA48BFF" />
|
||||
<item android:offset="0.55" android:color="#FF7552FF" />
|
||||
<item android:offset="1" android:color="#FF5B36F2" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
</vector>
|
||||
@@ -1,6 +1,34 @@
|
||||
<!--
|
||||
The play mark from packaging/io.narl.proton-stream.svg, cut into the blocks a
|
||||
revision is fetched in. The paths are in the SVG's 128-unit space; the group
|
||||
maps its 104-unit tile onto the 72dp a launcher shows of a 108dp layer.
|
||||
It centres x=70, between the glyph's centroid (66) and its box (73): the
|
||||
SVG's own centre, 64, leaves it sitting visibly right in a round mask.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="108dp" android:height="108dp"
|
||||
android:viewportWidth="108" android:viewportHeight="108">
|
||||
<path android:fillColor="#CBA6F7" android:pathData="M24,22h60v64h-60z" />
|
||||
<path android:fillColor="#1E1E2E" android:pathData="M45,39l26,15 -26,15z" />
|
||||
<group
|
||||
android:pivotX="70" android:pivotY="62"
|
||||
android:scaleX="0.6923" android:scaleY="0.6923"
|
||||
android:translateX="-16" android:translateY="-8">
|
||||
<group android:translateY="3">
|
||||
<clip-path android:pathData="M0,0h63v128h-63zM68.5,0h10v128h-10zM84,0h44v128h-44z" />
|
||||
<path android:fillColor="#4D2E1596" android:pathData="M50,41.5v41a6,6 0,0 0,9.1 5.1l34.2,-20.5a6,6 0,0 0,0 -10.3L59.1,36.4A6,6 0,0 0,50 41.5z" />
|
||||
</group>
|
||||
<group>
|
||||
<clip-path android:pathData="M0,0h63v128h-63zM68.5,0h10v128h-10zM84,0h44v128h-44z" />
|
||||
<path android:pathData="M50,41.5v41a6,6 0,0 0,9.1 5.1l34.2,-20.5a6,6 0,0 0,0 -10.3L59.1,36.4A6,6 0,0 0,50 41.5z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient android:type="linear"
|
||||
android:startX="0" android:startY="36"
|
||||
android:endX="0" android:endY="88">
|
||||
<item android:offset="0" android:color="#FFFFFFFF" />
|
||||
<item android:offset="1" android:color="#FFECE6FF" />
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
</group>
|
||||
</group>
|
||||
</vector>
|
||||
@@ -0,0 +1,12 @@
|
||||
<!-- The foreground's glyph as one flat shape, for themed launcher icons. -->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="108dp" android:height="108dp"
|
||||
android:viewportWidth="108" android:viewportHeight="108">
|
||||
<group
|
||||
android:pivotX="70" android:pivotY="62"
|
||||
android:scaleX="0.6923" android:scaleY="0.6923"
|
||||
android:translateX="-16" android:translateY="-8">
|
||||
<clip-path android:pathData="M0,0h63v128h-63zM68.5,0h10v128h-10zM84,0h44v128h-44z" />
|
||||
<path android:fillColor="#FFFFFFFF" android:pathData="M50,41.5v41a6,6 0,0 0,9.1 5.1l34.2,-20.5a6,6 0,0 0,0 -10.3L59.1,36.4A6,6 0,0 0,50 41.5z" />
|
||||
</group>
|
||||
</vector>
|
||||
@@ -1,13 +1,16 @@
|
||||
<!--
|
||||
The status-bar glyph. Android tints small icons to a single colour and drops
|
||||
everything that is not opaque, so this is the launcher mark reduced to one
|
||||
white silhouette rather than the two-tone drawable.
|
||||
everything that is not opaque, so this is the launcher's sliced play mark as
|
||||
one white silhouette, scaled from the SVG's 128-unit space onto 24dp.
|
||||
-->
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp" android:height="24dp"
|
||||
android:viewportWidth="24" android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFFFF"
|
||||
android:fillType="evenOdd"
|
||||
android:pathData="M4,4h16v16h-16zM10,8.5l5.5,3.5 -5.5,3.5z" />
|
||||
<group
|
||||
android:pivotX="70" android:pivotY="62"
|
||||
android:scaleX="0.37" android:scaleY="0.37"
|
||||
android:translateX="-58" android:translateY="-50">
|
||||
<clip-path android:pathData="M0,0h63v128h-63zM68.5,0h10v128h-10zM84,0h44v128h-44z" />
|
||||
<path android:fillColor="#FFFFFFFF" android:pathData="M50,41.5v41a6,6 0,0 0,9.1 5.1l34.2,-20.5a6,6 0,0 0,0 -10.3L59.1,36.4A6,6 0,0 0,50 41.5z" />
|
||||
</group>
|
||||
</vector>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<background android:drawable="@drawable/ic_launcher_background" />
|
||||
<foreground android:drawable="@drawable/ic_launcher_foreground" />
|
||||
<monochrome android:drawable="@drawable/ic_launcher_monochrome" />
|
||||
</adaptive-icon>
|
||||
@@ -1,3 +1,9 @@
|
||||
<resources>
|
||||
<string name="app_name">proton-stream</string>
|
||||
<!-- Settings, recents, notifications and the share sheet: room for the full name. -->
|
||||
<string name="app_name">Proton Stream</string>
|
||||
<!--
|
||||
Under the launcher icon, where about ten characters fit before the
|
||||
launcher cuts the label off; "proton-stream" showed as "proton-st…".
|
||||
-->
|
||||
<string name="launcher_name">Stream</string>
|
||||
</resources>
|
||||
@@ -0,0 +1,37 @@
|
||||
package io.narl.protonstream
|
||||
|
||||
import android.content.Intent
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Assert.assertNull
|
||||
import org.junit.Test
|
||||
|
||||
class IncomingShareLinkTest {
|
||||
private val link = "https://drive.proton.me/urls/ABC123#s3cr3t"
|
||||
|
||||
@Test
|
||||
fun `a viewed share link is taken whole, fragment included`() {
|
||||
assertEquals(link, shareLinkFrom(Intent.ACTION_VIEW, link, null))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a viewed url that is not an https share link is ignored`() {
|
||||
assertNull(shareLinkFrom(Intent.ACTION_VIEW, "https://drive.proton.me/u/0/", null))
|
||||
assertNull(shareLinkFrom(Intent.ACTION_VIEW, "http://drive.proton.me/urls/ABC123#s3cr3t", null))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a shared message yields the link inside it`() {
|
||||
assertEquals(link, shareLinkFrom(Intent.ACTION_SEND, null, "Season two is up: $link enjoy"))
|
||||
assertEquals(link, shareLinkFrom(Intent.ACTION_SEND, null, "(<$link>)"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a shared message without a link yields nothing`() {
|
||||
assertNull(shareLinkFrom(Intent.ACTION_SEND, null, "no link here"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `other actions are ignored`() {
|
||||
assertNull(shareLinkFrom(Intent.ACTION_MAIN, link, link))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class ArtworkTest {
|
||||
@Test
|
||||
fun `initials skip the lower-case particles of a romanised name`() {
|
||||
assertEquals("OK", initials("Oshi no Ko"))
|
||||
assertEquals("AH", initials("Ano Hi Mita Hana no Namae o Bokutachi wa Mada Shiranai."))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a one-word name has one initial`() {
|
||||
assertEquals("A", initials("Akira"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a name with no capitals falls back to its first two words`() {
|
||||
assertEquals("BW", initials("blue world order"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `punctuation and separators are not words`() {
|
||||
assertEquals("S2", initials("Steins;Gate - 2"))
|
||||
assertEquals("", initials(" - "))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,58 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import java.time.LocalDate
|
||||
import java.util.Locale
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
import uniffi.pstr_android.SeasonRecord
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
import uniffi.pstr_android.TitleType
|
||||
|
||||
class HistoryTest {
|
||||
private fun episode(link: String, watched: Boolean, progress: Double?, lastPlayed: Long) = EpisodeRecord(
|
||||
shareId = "s", volumeId = "v", linkId = link, name = "$link.mkv", label = link, detail = "$link.mkv",
|
||||
season = 1u, number = null, size = null, progress = progress, resumeAt = progress?.let { it * 1000 },
|
||||
watched = watched, offline = false, providerName = null, providerOverview = null, stillUrl = null,
|
||||
airDate = null, lastPlayed = lastPlayed,
|
||||
)
|
||||
|
||||
private fun title(key: String, vararg episodes: EpisodeRecord) = TitleRecord(
|
||||
key = key, name = key, year = null, kind = TitleType.SERIES, watchedCount = 0uL,
|
||||
episodeCount = episodes.size.toULong(), canonicalName = null, originalName = null, overview = null,
|
||||
metadataProvider = null, metadataId = null, metadataYear = null, metadataKind = null, posterUrl = null,
|
||||
backdropUrl = null, rating = null, genres = emptyList(), providerEpisodeCount = null, externalUrl = null,
|
||||
manualMatch = false, seasons = listOf(SeasonRecord(1u, "Season 1", episodes.toList())),
|
||||
displayName = key, wideUrl = null, formatLabel = null, seasonLabel = null, studios = emptyList(),
|
||||
directors = emptyList(), tags = emptyList(), airing = false, nextEpisode = null, nextAiringAt = null,
|
||||
franchise = emptyList(),
|
||||
)
|
||||
|
||||
@Test
|
||||
fun `history is every started or finished episode, newest first, across titles`() {
|
||||
val titles = listOf(
|
||||
title(
|
||||
"a",
|
||||
episode("a1", watched = true, progress = 1.0, lastPlayed = 30),
|
||||
// Marked unwatched again: a row at zero, which is not a play.
|
||||
episode("a2", watched = false, progress = 0.0, lastPlayed = 40),
|
||||
episode("a3", watched = false, progress = null, lastPlayed = 0),
|
||||
),
|
||||
title("b", episode("b1", watched = false, progress = 0.4, lastPlayed = 50)),
|
||||
)
|
||||
val played = history(titles)
|
||||
assertEquals(listOf("b1", "a1"), played.map { it.episode.linkId })
|
||||
assertEquals(0, played.last().index)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `days are headed relative to today, then by date`() {
|
||||
val today = LocalDate.of(2026, 10, 3) // a Saturday
|
||||
val english = Locale.ENGLISH
|
||||
assertEquals("Today", dayHeading(today, today, english))
|
||||
assertEquals("Yesterday", dayHeading(today.minusDays(1), today, english))
|
||||
assertEquals("Monday", dayHeading(LocalDate.of(2026, 9, 28), today, english))
|
||||
assertEquals("26 September", dayHeading(LocalDate.of(2026, 9, 26), today, english))
|
||||
assertEquals("3 October 2025", dayHeading(LocalDate.of(2025, 10, 3), today, english))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import org.junit.Assert.assertEquals
|
||||
import org.junit.Test
|
||||
|
||||
class LanguagePickerTest {
|
||||
@Test
|
||||
fun `a stored tag reads as its language in either ISO form`() {
|
||||
assertEquals("Japanese", languageLabel("jpn"))
|
||||
assertEquals("Japanese", languageLabel("ja"))
|
||||
assertEquals("German", languageLabel("deu"))
|
||||
assertEquals("German", languageLabel("ger"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a region suffix and capitals do not hide the language`() {
|
||||
assertEquals("Portuguese", languageLabel("PT-br"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a tag not on the list is shown as typed, and blank is no preference`() {
|
||||
assertEquals("tgl", languageLabel("tgl"))
|
||||
assertEquals("No preference", languageLabel(null))
|
||||
assertEquals("No preference", languageLabel(" "))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `every listed language has a two-letter form`() {
|
||||
LANGUAGES.forEach { (code, name) -> assertEquals(code, name, languageLabel(code)) }
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,316 @@
|
||||
package io.narl.protonstream.ui
|
||||
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.CompositionLocalProvider
|
||||
import androidx.compose.ui.test.junit4.createComposeRule
|
||||
import androidx.compose.ui.platform.LocalDensity
|
||||
import androidx.compose.ui.test.onRoot
|
||||
import androidx.compose.ui.unit.Density
|
||||
import androidx.test.core.app.ApplicationProvider
|
||||
import androidx.work.testing.WorkManagerTestInitHelper
|
||||
import com.github.takahirom.roborazzi.RobolectricDeviceQualifiers
|
||||
import com.github.takahirom.roborazzi.captureRoboImage
|
||||
import io.narl.protonstream.ui.theme.AppearanceState
|
||||
import io.narl.protonstream.ui.theme.ProtonFallback
|
||||
import io.narl.protonstream.ui.theme.ProtonStreamTheme
|
||||
import java.time.LocalDate
|
||||
import java.time.ZoneOffset
|
||||
import org.junit.Before
|
||||
import org.junit.Rule
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.robolectric.RobolectricTestRunner
|
||||
import org.robolectric.annotation.Config
|
||||
import org.robolectric.annotation.GraphicsMode
|
||||
import uniffi.pstr_android.ArrangementRecord
|
||||
import uniffi.pstr_android.EpisodeRecord
|
||||
import uniffi.pstr_android.OfflineRecord
|
||||
import uniffi.pstr_android.PaletteRecord
|
||||
import uniffi.pstr_android.SeasonRecord
|
||||
import uniffi.pstr_android.ShareRecord
|
||||
import uniffi.pstr_android.ShelfRecord
|
||||
import uniffi.pstr_android.StorageUsageRecord
|
||||
import uniffi.pstr_android.TileRecord
|
||||
import uniffi.pstr_android.TitleRecord
|
||||
import uniffi.pstr_android.TitleType
|
||||
|
||||
/**
|
||||
* Every screen, drawn from fixed records, against a committed image.
|
||||
*
|
||||
* The screens are about to be redesigned one by one, and a layout regression —
|
||||
* a row that wraps, a button pushed off the edge — compiles and passes every
|
||||
* other test. Here it is a changed PNG in review. No artwork is loaded: the
|
||||
* bridge is not available on the host, so every tile shows its generated
|
||||
* placeholder, which is also what a title without metadata looks like on a
|
||||
* phone.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner::class)
|
||||
@GraphicsMode(GraphicsMode.Mode.NATIVE)
|
||||
@Config(qualifiers = RobolectricDeviceQualifiers.Pixel7)
|
||||
class ScreenshotTest {
|
||||
@get:Rule val compose = createComposeRule()
|
||||
|
||||
@Before
|
||||
fun setUp() {
|
||||
WorkManagerTestInitHelper.initializeTestWorkManager(ApplicationProvider.getApplicationContext())
|
||||
// The palette is process-wide and the sandbox outlives a test, so a
|
||||
// light capture would otherwise repaint every one after it.
|
||||
AppearanceState.apply(ProtonFallback)
|
||||
}
|
||||
|
||||
private fun captureLight(name: String, content: @Composable () -> Unit) {
|
||||
AppearanceState.apply(LATTE)
|
||||
capture(name, content)
|
||||
}
|
||||
|
||||
private fun capture(name: String, content: @Composable () -> Unit) {
|
||||
compose.setContent {
|
||||
ProtonStreamTheme {
|
||||
CompositionLocalProvider(LocalArtworkLoading provides false) {
|
||||
Surface(color = MaterialTheme.colorScheme.background) { content() }
|
||||
}
|
||||
}
|
||||
}
|
||||
compose.onRoot().captureRoboImage("src/test/screenshots/$name.png")
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the library on a phone`() = capture("library-phone") {
|
||||
LibraryScreen(LIBRARY, {}, { _, _ -> }, {}, {}, { _, _ -> }, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = RobolectricDeviceQualifiers.MediumTablet)
|
||||
fun `the library on a tablet`() = capture("library-tablet") {
|
||||
LibraryScreen(LIBRARY, {}, { _, _ -> }, {}, {}, { _, _ -> }, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the library in the light palette`() = captureLight("library-phone-light") {
|
||||
LibraryScreen(LIBRARY, {}, { _, _ -> }, {}, {}, { _, _ -> }, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a title in the light palette`() = captureLight("title-phone-light") {
|
||||
TitleScreen(SERIES, true, { _, _ -> }, {}, {}, {}, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = RobolectricDeviceQualifiers.MediumTablet)
|
||||
fun `a title on a tablet`() = capture("title-tablet") {
|
||||
TitleScreen(SERIES, true, { _, _ -> }, {}, {}, {}, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
@Config(qualifiers = RobolectricDeviceQualifiers.MediumTablet)
|
||||
fun `the history page on a tablet`() = capture("history-tablet") {
|
||||
HistoryScreen(LIBRARY, { _, _ -> }, {}, { _, _ -> }, PaddingValues(), ZoneOffset.UTC, LocalDate.of(2026, 9, 21))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the library at a large font scale`() = capture("library-phone-large-font") {
|
||||
// Robolectric has no font-scale qualifier; the density is what Compose
|
||||
// reads it from, so the scale is set there.
|
||||
val density = LocalDensity.current
|
||||
CompositionLocalProvider(LocalDensity provides Density(density.density, fontScale = 1.5f)) {
|
||||
LibraryScreen(LIBRARY, {}, { _, _ -> }, {}, {}, { _, _ -> }, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `an empty library`() = capture("library-empty") {
|
||||
LibraryScreen(AppUiState(loading = false), {}, { _, _ -> }, {}, {}, { _, _ -> }, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the library while the catalog loads`() = capture("library-loading") {
|
||||
LibraryScreen(AppUiState(), {}, { _, _ -> }, {}, {}, { _, _ -> }, { _, _ -> }, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `a title with seasons`() = capture("title-phone") {
|
||||
TitleScreen(SERIES, true, { _, _ -> }, {}, {}, {}, { _, _ -> }, PaddingValues(), franchise = listOf(SERIES, SEQUEL))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the shares page`() = capture("shares-phone") {
|
||||
SharesScreen(LIBRARY.shares, { _, _, _ -> }, { _, _, _ -> }, {}, {}, null, {}, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the settings page`() = capture("settings-phone") {
|
||||
SettingsScreen(LIBRARY, { _, _, _, _ -> }, {}, {}, {}, PaddingValues(), version = "1.0.0")
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the playback settings`() = capture("settings-playback") {
|
||||
SettingsScreen(LIBRARY, { _, _, _, _ -> }, {}, {}, {}, PaddingValues(), SettingsPage.Playback)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the storage settings`() = capture("settings-storage") {
|
||||
SettingsScreen(LIBRARY, { _, _, _, _ -> }, {}, {}, {}, PaddingValues(), SettingsPage.Storage)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the history page`() = capture("history-phone") {
|
||||
// Fixed day and zone: "Today" and "Yesterday" are relative, and an
|
||||
// image that changes with the date is no baseline.
|
||||
HistoryScreen(LIBRARY, { _, _ -> }, {}, { _, _ -> }, PaddingValues(), ZoneOffset.UTC, LocalDate.of(2026, 9, 21))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the downloads page with a season saved`() = capture("downloads-phone") {
|
||||
val saved = SERIES.seasons.first().episodes.take(2).map {
|
||||
OfflineRecord(it.shareId, it.linkId, "revision", 1_300_000_000uL, it)
|
||||
}
|
||||
// One title: the fixtures reuse link ids across titles, so with the
|
||||
// whole library the episodes would be filed under whichever came last.
|
||||
DownloadsScreen(LIBRARY.copy(titles = listOf(SERIES), offline = saved), {}, {}, {}, {}, PaddingValues())
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `the downloads page with nothing offline`() = capture("downloads-empty") {
|
||||
DownloadsScreen(LIBRARY, {}, {}, {}, {}, PaddingValues())
|
||||
}
|
||||
|
||||
private companion object {
|
||||
/** Catppuccin Latte with the default accent, as `Palette::resolve` gives it. */
|
||||
val LATTE = PaletteRecord(
|
||||
background = 0xFFEFF1F5u,
|
||||
surface = 0xFFE6E9EFu,
|
||||
sunken = 0xFFDCE0E8u,
|
||||
card = 0xFFCCD0DAu,
|
||||
cardHover = 0xFFBCC0CCu,
|
||||
border = 0xFFBCC0CCu,
|
||||
text = 0xFF4C4F69u,
|
||||
muted = 0xFF6C6F85u,
|
||||
accent = 0xFF732FCCu,
|
||||
accentAlt = 0xFF1856D1u,
|
||||
accentDim = 0xFFC4BBE4u,
|
||||
onAccent = 0xFFEFF1F5u,
|
||||
danger = 0xFFD20F39u,
|
||||
elevated = 0xFFAAAEBDu,
|
||||
dangerDim = 0xFFE7D1D5u,
|
||||
light = true,
|
||||
)
|
||||
|
||||
fun episode(season: UInt, number: UInt, watched: Boolean = false, progress: Double? = null): EpisodeRecord {
|
||||
// `detail` is the filename unless the filename named the episode,
|
||||
// which is what the bridge sends.
|
||||
val file = "[Group] Oshi no Ko - S%02dE%02d.mkv".format(season.toInt(), number.toInt())
|
||||
return episodeRecord(season, number, file, watched, progress)
|
||||
}
|
||||
|
||||
fun episodeRecord(season: UInt, number: UInt, file: String, watched: Boolean, progress: Double?) = EpisodeRecord(
|
||||
shareId = "share",
|
||||
volumeId = "volume",
|
||||
linkId = "s${season}e$number",
|
||||
name = file,
|
||||
label = "S%02dE%02d".format(season.toInt(), number.toInt()),
|
||||
detail = file,
|
||||
season = season,
|
||||
number = number,
|
||||
size = 1_300_000_000uL,
|
||||
progress = progress,
|
||||
resumeAt = progress?.let { it * 1440 },
|
||||
watched = watched,
|
||||
offline = false,
|
||||
providerName = if (number == 1u) "Mother and Children" else null,
|
||||
providerOverview = null,
|
||||
stillUrl = null,
|
||||
airDate = null,
|
||||
// 2026-09-21 for the part-watched one, the day before for the rest.
|
||||
lastPlayed = when {
|
||||
progress != null -> 1_790_000_000L
|
||||
watched -> 1_789_900_000L - number.toLong() * 600
|
||||
else -> 0L
|
||||
},
|
||||
)
|
||||
|
||||
fun title(key: String, name: String, seasons: List<SeasonRecord>, overview: String? = null) = TitleRecord(
|
||||
key = key,
|
||||
name = name,
|
||||
year = 2023u,
|
||||
kind = TitleType.SERIES,
|
||||
watchedCount = seasons.sumOf { s -> s.episodes.count { it.watched } }.toULong(),
|
||||
episodeCount = seasons.sumOf { it.episodes.size }.toULong(),
|
||||
canonicalName = null,
|
||||
originalName = null,
|
||||
overview = overview,
|
||||
metadataProvider = null,
|
||||
metadataId = null,
|
||||
metadataYear = null,
|
||||
metadataKind = null,
|
||||
posterUrl = null,
|
||||
backdropUrl = null,
|
||||
rating = 8.4,
|
||||
genres = listOf("Drama", "Mystery"),
|
||||
providerEpisodeCount = null,
|
||||
externalUrl = null,
|
||||
manualMatch = false,
|
||||
seasons = seasons,
|
||||
displayName = name,
|
||||
wideUrl = null,
|
||||
formatLabel = null,
|
||||
seasonLabel = null,
|
||||
studios = emptyList(),
|
||||
directors = emptyList(),
|
||||
tags = emptyList(),
|
||||
airing = false,
|
||||
nextEpisode = null,
|
||||
nextAiringAt = null,
|
||||
franchise = emptyList(),
|
||||
)
|
||||
|
||||
val SERIES = title(
|
||||
"oshi-no-ko",
|
||||
"Oshi no Ko",
|
||||
listOf(
|
||||
SeasonRecord(1u, "Season 1", (1u..4u).map { episode(1u, it, watched = it < 3u) }),
|
||||
SeasonRecord(2u, "Season 2", (1u..3u).map { episode(2u, it, progress = if (it == 1u) 0.4 else null) }),
|
||||
),
|
||||
overview = "A doctor in a countryside clinic is reborn as the child of the idol he followed.",
|
||||
).copy(
|
||||
formatLabel = "TV",
|
||||
seasonLabel = "Spring 2023",
|
||||
studios = listOf("Doga Kobo"),
|
||||
directors = listOf("Daisuke Hiramaki"),
|
||||
tags = listOf("Idol", "Reincarnation"),
|
||||
franchise = listOf("oshi-no-ko", "oshi-no-ko-film"),
|
||||
)
|
||||
|
||||
/** The rest of [SERIES]'s franchise, for the title page's row of it. */
|
||||
val SEQUEL = title("oshi-no-ko-film", "Oshi no Ko: The Final Act", listOf(SeasonRecord(null, "Film", listOf(episode(1u, 1u)))))
|
||||
.copy(kind = TitleType.FILM, year = 2024u, formatLabel = "Film", franchise = SERIES.franchise)
|
||||
|
||||
val FILM = title("akira", "Akira", listOf(SeasonRecord(null, "Film", listOf(episode(1u, 1u)))))
|
||||
.copy(kind = TitleType.FILM, year = 1988u)
|
||||
|
||||
val LIBRARY = AppUiState(
|
||||
loading = false,
|
||||
titles = listOf(
|
||||
FILM,
|
||||
SERIES,
|
||||
title("ano-hana", "Ano Hi Mita Hana no Namae o Bokutachi wa Mada Shiranai.", listOf(SeasonRecord(1u, "Season 1", (1u..11u).map { episode(1u, it) }))),
|
||||
title("bleach", "Bleach", listOf(SeasonRecord(1u, "Season 1", (1u..2u).map { episode(1u, it) }))),
|
||||
),
|
||||
// Bleach stands for one more title of its franchise, and one shelf
|
||||
// sits above the grid: what the bridge's arrangement would give.
|
||||
arrangement = ArrangementRecord(
|
||||
tiles = listOf("akira", "ano-hana", "bleach", "oshi-no-ko").map {
|
||||
TileRecord(it, if (it == "bleach") 1u else 0u)
|
||||
},
|
||||
shelves = listOf(ShelfRecord("From MAPPA", listOf("oshi-no-ko", "bleach", "akira"))),
|
||||
),
|
||||
shares = listOf(
|
||||
ShareRecord("anime", "anime", true),
|
||||
ShareRecord("films", "films", false),
|
||||
),
|
||||
storage = StorageUsageRecord(6_400_000_000uL, 3uL, 0uL, 1_100_000_000uL),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 114 KiB |
|
After Width: | Height: | Size: 217 KiB |
|
After Width: | Height: | Size: 194 KiB |
|
After Width: | Height: | Size: 36 KiB |
|
After Width: | Height: | Size: 49 KiB |
|
After Width: | Height: | Size: 813 KiB |
|
After Width: | Height: | Size: 768 KiB |
|
After Width: | Height: | Size: 806 KiB |
|
After Width: | Height: | Size: 1.3 MiB |
|
After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 49 KiB |
|
After Width: | Height: | Size: 73 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 631 KiB |
|
After Width: | Height: | Size: 669 KiB |
|
After Width: | Height: | Size: 1.1 MiB |
@@ -14,6 +14,7 @@ androidx-test-core = "1.7.0"
|
||||
androidx-test-junit = "1.3.0"
|
||||
androidx-test-runner = "1.7.0"
|
||||
ktlint-plugin = "13.1.0"
|
||||
roborazzi = "1.76.0"
|
||||
|
||||
[libraries]
|
||||
androidx-core = { module = "androidx.core:core-ktx", version = "1.17.0" }
|
||||
@@ -41,9 +42,13 @@ robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectr
|
||||
androidx-test-core = { module = "androidx.test:core-ktx", version.ref = "androidx-test-core" }
|
||||
androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
|
||||
androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidx-test-runner" }
|
||||
roborazzi = { module = "io.github.takahirom.roborazzi:roborazzi", version.ref = "roborazzi" }
|
||||
roborazzi-compose = { module = "io.github.takahirom.roborazzi:roborazzi-compose", version.ref = "roborazzi" }
|
||||
roborazzi-junit-rule = { module = "io.github.takahirom.roborazzi:roborazzi-junit-rule", version.ref = "roborazzi" }
|
||||
|
||||
[plugins]
|
||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
|
||||
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
|
||||
ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-plugin" }
|
||||
roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }
|
||||
@@ -11,12 +11,13 @@ use std::sync::{Arc, OnceLock};
|
||||
|
||||
use parking_lot::Mutex;
|
||||
use pstr_core::appearance::{Accent, Appearance, Flavor, Palette};
|
||||
use pstr_core::browse::Sort;
|
||||
use pstr_core::catalog::{Catalog, OfflineFile, TitleTrackPrefs, WatchState, build_rows};
|
||||
use pstr_core::chapters::{Chapter, ChapterRole};
|
||||
use pstr_core::config::AppDirs;
|
||||
use pstr_core::library::{Episode, Library, Title, TitleKind};
|
||||
use pstr_core::metadata::{
|
||||
EpisodeGuide, MetadataConfig, MetadataRecord, ProviderId, TitleMetadata,
|
||||
EpisodeGuide, MetadataConfig, MetadataRecord, ProviderId, TitleMetadata, TitleNames,
|
||||
};
|
||||
use pstr_core::prefs::PlaybackPrefs;
|
||||
use pstr_core::proton_drive_rs::{ProtonDrivePublicLinkClient, ThumbnailType};
|
||||
@@ -175,6 +176,55 @@ pub struct AppearanceRecord {
|
||||
pub flavor: FlavorChoice,
|
||||
pub accent: AccentChoice,
|
||||
pub gradients: bool,
|
||||
/// Which name a title goes by. Shared with the desktop.
|
||||
pub names: TitleNamesChoice,
|
||||
}
|
||||
|
||||
/// The shared `pstr_core::metadata::TitleNames`.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, uniffi::Enum)]
|
||||
pub enum TitleNamesChoice {
|
||||
/// The share's folder name.
|
||||
Library,
|
||||
English,
|
||||
Romaji,
|
||||
}
|
||||
|
||||
/// The shared `pstr_core::browse::Sort`.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, uniffi::Enum)]
|
||||
pub enum LibrarySort {
|
||||
Name,
|
||||
Recent,
|
||||
Added,
|
||||
Release,
|
||||
Rating,
|
||||
Popularity,
|
||||
}
|
||||
|
||||
/// One tile of the library grid.
|
||||
#[derive(Debug, Clone, uniffi::Record)]
|
||||
pub struct TileRecord {
|
||||
/// The title drawn.
|
||||
pub key: String,
|
||||
/// How many other titles of its franchise it stands for.
|
||||
pub folded: u32,
|
||||
}
|
||||
|
||||
/// One row of titles that share a director, studio or genre.
|
||||
#[derive(Debug, Clone, uniffi::Record)]
|
||||
pub struct ShelfRecord {
|
||||
pub label: String,
|
||||
pub keys: Vec<String>,
|
||||
}
|
||||
|
||||
/// The library grid, ordered and folded, and the shelves above it — what
|
||||
/// `pstr_core::browse` and `pstr_core::shelves` make of the library, as keys
|
||||
/// into [`AndroidEngine::library`]'s titles.
|
||||
#[derive(Debug, Clone, uniffi::Record)]
|
||||
pub struct ArrangementRecord {
|
||||
pub tiles: Vec<TileRecord>,
|
||||
/// Empty while searching: a shelf of titles the search did not find reads
|
||||
/// as the search not working.
|
||||
pub shelves: Vec<ShelfRecord>,
|
||||
}
|
||||
|
||||
/// One flavour and accent resolved into colours, packed as `0xAARRGGBB`.
|
||||
@@ -264,6 +314,10 @@ pub struct MatchRecord {
|
||||
pub genres: Vec<String>,
|
||||
pub episode_count: Option<u32>,
|
||||
pub external_url: Option<String>,
|
||||
/// `TitleDetails` as JSON, opaque to Kotlin: carried so that a match
|
||||
/// picked by hand keeps the studios, relations and dates search found,
|
||||
/// rather than losing them on the way back across the bridge.
|
||||
pub details: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, uniffi::Record)]
|
||||
@@ -323,6 +377,26 @@ pub struct TitleRecord {
|
||||
pub external_url: Option<String>,
|
||||
pub manual_match: bool,
|
||||
pub seasons: Vec<SeasonRecord>,
|
||||
/// The name to show, as the viewer's name setting has it.
|
||||
pub display_name: String,
|
||||
/// The widest art there is: fanart, else the provider's banner.
|
||||
pub wide_url: Option<String>,
|
||||
/// `TV`, `Film`, `OVA` — the provider's format, said for a person.
|
||||
pub format_label: Option<String>,
|
||||
/// `Spring 2013`.
|
||||
pub season_label: Option<String>,
|
||||
pub studios: Vec<String>,
|
||||
pub directors: Vec<String>,
|
||||
pub tags: Vec<String>,
|
||||
/// Still airing.
|
||||
pub airing: bool,
|
||||
/// The next episode to air and when, Unix seconds — only while that is
|
||||
/// still ahead.
|
||||
pub next_episode: Option<u32>,
|
||||
pub next_airing_at: Option<i64>,
|
||||
/// Every title of its franchise, in release order, its own key included;
|
||||
/// empty for a title that stands alone.
|
||||
pub franchise: Vec<String>,
|
||||
}
|
||||
|
||||
/// Playback preferences that outlive one file, one title and one launch.
|
||||
@@ -717,7 +791,6 @@ struct Connection {
|
||||
generation: u64,
|
||||
library: Arc<SharedLibrary>,
|
||||
open_failures: Vec<String>,
|
||||
#[allow(dead_code)]
|
||||
source: StreamSource,
|
||||
}
|
||||
|
||||
@@ -754,6 +827,9 @@ pub struct AndroidEngine {
|
||||
/// between one episode and the next, so age — not just a share-store
|
||||
/// mutation — is a reason to reauthenticate before opening anything.
|
||||
session_refreshed: Mutex<HashMap<String, std::time::Instant>>,
|
||||
/// The streaming cache's budget in bytes, for the next connection and,
|
||||
/// through [`AndroidEngine::set_stream_cache_budget`], the open one.
|
||||
cache_budget: AtomicU64,
|
||||
}
|
||||
|
||||
/// How long a visitor session is assumed good for without a refresh.
|
||||
@@ -798,6 +874,7 @@ impl AndroidEngine {
|
||||
share_generation: AtomicU64::new(0),
|
||||
thumbnails: tokio::sync::Semaphore::new(THUMBNAIL_CONCURRENCY),
|
||||
session_refreshed: Mutex::new(HashMap::new()),
|
||||
cache_budget: AtomicU64::new(DiskCacheConfig::DEFAULT_BUDGET_BYTES),
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -945,23 +1022,70 @@ impl AndroidEngine {
|
||||
/// table scans, a `Library::build` and a full record conversion per
|
||||
/// keystroke.
|
||||
pub fn library(&self, search: Option<String>) -> Result<Vec<TitleRecord>, BridgeError> {
|
||||
let titles = self.all_title_records()?;
|
||||
let needle = search.unwrap_or_default().trim().to_lowercase();
|
||||
if needle.is_empty() {
|
||||
return Ok(titles);
|
||||
}
|
||||
Ok(titles
|
||||
.into_iter()
|
||||
.filter(|title| {
|
||||
title.name.to_lowercase().contains(&needle)
|
||||
|| title.seasons.iter().any(|season| {
|
||||
season
|
||||
.episodes
|
||||
.iter()
|
||||
.any(|episode| episode.name.to_lowercase().contains(&needle))
|
||||
let query = search.unwrap_or_default();
|
||||
self.with_library(|cached| {
|
||||
if query.trim().is_empty() {
|
||||
return cached.titles.clone();
|
||||
}
|
||||
let found: std::collections::HashSet<&str> =
|
||||
pstr_core::browse::search(&cached.library, &cached.metadata, &query)
|
||||
.into_iter()
|
||||
.map(|title| title.key.as_str())
|
||||
.collect();
|
||||
cached
|
||||
.titles
|
||||
.iter()
|
||||
.filter(|title| found.contains(title.key.as_str()))
|
||||
.cloned()
|
||||
.collect()
|
||||
})
|
||||
}
|
||||
|
||||
/// The library grid for `search`, in `sort` order, each franchise folded
|
||||
/// into one tile when `grouped` — and the shelves above it. Keys into
|
||||
/// [`AndroidEngine::library`]'s titles, so the records cross the bridge
|
||||
/// once.
|
||||
pub fn arrangement(
|
||||
&self,
|
||||
search: Option<String>,
|
||||
sort: LibrarySort,
|
||||
grouped: bool,
|
||||
) -> Result<ArrangementRecord, BridgeError> {
|
||||
let query = search.unwrap_or_default();
|
||||
self.with_library(|cached| {
|
||||
let titles = pstr_core::browse::search(&cached.library, &cached.metadata, &query);
|
||||
let tiles = pstr_core::browse::arrange(
|
||||
&titles,
|
||||
pstr_core::browse::Order {
|
||||
sort: sort_choice(sort),
|
||||
grouped,
|
||||
names: cached.names,
|
||||
metadata: &cached.metadata,
|
||||
added: &cached.added,
|
||||
},
|
||||
);
|
||||
let shelves = if query.trim().is_empty() {
|
||||
pstr_core::shelves::pick(&cached.library.titles, &cached.metadata, SHELVES)
|
||||
.into_iter()
|
||||
.map(|shelf| ShelfRecord {
|
||||
label: shelf.label,
|
||||
keys: shelf.keys,
|
||||
})
|
||||
})
|
||||
.collect())
|
||||
.collect()
|
||||
} else {
|
||||
Vec::new()
|
||||
};
|
||||
ArrangementRecord {
|
||||
tiles: tiles
|
||||
.iter()
|
||||
.map(|tile| TileRecord {
|
||||
key: titles[tile.lead].key.clone(),
|
||||
folded: (tile.members.len() - 1) as u32,
|
||||
})
|
||||
.collect(),
|
||||
shelves,
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
pub fn metadata_settings(&self) -> Result<MetadataSettingsRecord, BridgeError> {
|
||||
@@ -1177,8 +1301,14 @@ impl AndroidEngine {
|
||||
}
|
||||
|
||||
pub fn set_appearance(&self, appearance: AppearanceRecord) -> Result<(), BridgeError> {
|
||||
pstr_core::appearance::save(&self.dirs, &appearance_choice(appearance))
|
||||
.map_err(BridgeError::from_display)
|
||||
// The record has no grid shape — Android's is always covers — so the
|
||||
// desktop's is kept as it was stored.
|
||||
let stored = pstr_core::appearance::load(&self.dirs).unwrap_or_default();
|
||||
let appearance = Appearance {
|
||||
tiles: stored.tiles,
|
||||
..appearance_choice(appearance)
|
||||
};
|
||||
pstr_core::appearance::save(&self.dirs, &appearance).map_err(BridgeError::from_display)
|
||||
}
|
||||
|
||||
/// The colours the stored choice resolves to.
|
||||
@@ -1279,6 +1409,22 @@ impl AndroidEngine {
|
||||
.map_err(BridgeError::from_display)?
|
||||
}
|
||||
|
||||
/// Set how much the streaming cache may hold. An open connection's cache
|
||||
/// evicts down to it at once; a lower budget is a request for the space
|
||||
/// back, not only a limit on what comes next.
|
||||
pub fn set_stream_cache_budget(&self, bytes: u64) {
|
||||
self.cache_budget.store(bytes, Ordering::Release);
|
||||
let source = self
|
||||
.connection
|
||||
.lock()
|
||||
.as_ref()
|
||||
.map(|open| open.source.clone());
|
||||
if let Some(source) = source {
|
||||
self.runtime
|
||||
.spawn(async move { source.set_disk_budget(bytes).await });
|
||||
}
|
||||
}
|
||||
|
||||
/// Drop the cached blocks. Rebuildable by definition: this is the one thing
|
||||
/// here that can be reclaimed without losing something the viewer chose.
|
||||
pub fn clear_block_cache(&self) -> Result<u64, BridgeError> {
|
||||
@@ -1401,44 +1547,29 @@ impl AndroidEngine {
|
||||
impl AndroidEngine {
|
||||
/// One enrichment pass over the whole library.
|
||||
///
|
||||
/// Two kinds of work, and the difference is a request saved: a title that
|
||||
/// already has a good match but no episode list needs the episode request
|
||||
/// only. Both run fanned out under a semaphore, and a provider error counts
|
||||
/// against the run rather than ending it — one rate-limited title must not
|
||||
/// leave the other thirty unenriched. This mirrors the desktop engine's
|
||||
/// `run_match`, which is the reference for the behaviour.
|
||||
/// What to do per title is decided by `pstr_meta::service::plan`, the same
|
||||
/// as on the desktop. The work runs fanned out under a semaphore, and a
|
||||
/// provider error counts against the run rather than ending it — one
|
||||
/// rate-limited title must not leave the other thirty unenriched. This
|
||||
/// mirrors the desktop engine's `run_match`, which is the reference for the
|
||||
/// behaviour.
|
||||
async fn match_titles_inner(&self, force: bool) -> Result<MatchSummary, BridgeError> {
|
||||
let service = Arc::new(self.metadata_service()?);
|
||||
let provider = service.provider();
|
||||
let (titles, stored) = self.titles_and_metadata()?;
|
||||
let listed = self
|
||||
let enriched = self
|
||||
.catalog
|
||||
.lock()
|
||||
.episode_metadata_ages()
|
||||
.enrichment_ages()
|
||||
.map_err(BridgeError::from_display)?;
|
||||
|
||||
let mut pending: Vec<Work> = Vec::new();
|
||||
for title in titles {
|
||||
let record = stored.get(&title.key);
|
||||
// A hand-picked entry is never searched for again, not even by
|
||||
// "match again" — that button means "the automatic answers are
|
||||
// wrong", and re-deciding the one title the viewer already fixed by
|
||||
// hand is the opposite of what they asked for. Its episode list is
|
||||
// still fetched below if it is missing.
|
||||
let pinned = record.is_some_and(|record| record.manual && record.provider == provider);
|
||||
if !pinned && (force || !pstr_meta::service::is_usable(record, provider)) {
|
||||
pending.push(Work::Match(title));
|
||||
continue;
|
||||
}
|
||||
let has_episodes = listed
|
||||
.get(&title.key)
|
||||
.is_some_and(|(asked, _)| *asked == provider);
|
||||
if let Some(found) = record.and_then(|record| record.metadata.clone())
|
||||
&& !has_episodes
|
||||
{
|
||||
pending.push(Work::Episodes(title, Box::new(found)));
|
||||
}
|
||||
}
|
||||
let pending = pstr_meta::service::plan(
|
||||
titles,
|
||||
&stored,
|
||||
&enriched,
|
||||
provider,
|
||||
service.has_details(),
|
||||
force,
|
||||
);
|
||||
|
||||
let permits = Arc::new(tokio::sync::Semaphore::new(LOOKUP_CONCURRENCY));
|
||||
let mut lookups = tokio::task::JoinSet::new();
|
||||
@@ -1447,32 +1578,15 @@ impl AndroidEngine {
|
||||
let permits = Arc::clone(&permits);
|
||||
lookups.spawn(async move {
|
||||
let _permit = permits.acquire().await.ok()?;
|
||||
Some(match work {
|
||||
Work::Match(title) => match service.record(&title).await {
|
||||
Ok(record) => {
|
||||
// Only for a title that matched: there is no id to
|
||||
// ask about otherwise.
|
||||
let episodes = match &record.metadata {
|
||||
Some(found) => service.title_episodes(&title, found).await,
|
||||
None => Vec::new(),
|
||||
};
|
||||
Ok((record.title_key.clone(), Some(record), episodes))
|
||||
}
|
||||
Err(error) => Err(error.to_string()),
|
||||
},
|
||||
Work::Episodes(title, found) => {
|
||||
let episodes = service.title_episodes(&title, &found).await;
|
||||
Ok((title.key, None, episodes))
|
||||
}
|
||||
})
|
||||
Some(service.work(&work).await.map_err(|error| error.to_string()))
|
||||
});
|
||||
}
|
||||
|
||||
let mut summary = MatchSummary::default();
|
||||
while let Some(joined) = lookups.join_next().await {
|
||||
match joined.map_err(BridgeError::from_display)? {
|
||||
Some(Ok((title_key, record, episodes))) => {
|
||||
if let Some(record) = &record {
|
||||
Some(Ok(outcome)) => {
|
||||
if let Some(record) = &outcome.record {
|
||||
if record.metadata.is_some() {
|
||||
summary.matched += 1;
|
||||
} else {
|
||||
@@ -1483,16 +1597,16 @@ impl AndroidEngine {
|
||||
log::warn!("store metadata for {}: {error}", record.title_key);
|
||||
}
|
||||
}
|
||||
if !episodes.is_empty() {
|
||||
summary.episodes += episodes.len() as u32;
|
||||
let stored = self.catalog.lock().set_episode_metadata(
|
||||
&title_key,
|
||||
if let Some(enrichment) = &outcome.enrichment {
|
||||
summary.episodes += enrichment.episodes.len() as u32;
|
||||
let stored = self.catalog.lock().set_enrichment(
|
||||
&outcome.title_key,
|
||||
provider,
|
||||
now(),
|
||||
&episodes,
|
||||
enrichment,
|
||||
);
|
||||
if let Err(error) = stored {
|
||||
log::warn!("store episodes for {title_key}: {error}");
|
||||
log::warn!("store enrichment for {}: {error}", outcome.title_key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1520,13 +1634,19 @@ impl AndroidEngine {
|
||||
}
|
||||
|
||||
/// Every title as a bridge record, rebuilt only when the catalog moved.
|
||||
fn all_title_records(&self) -> Result<Vec<TitleRecord>, BridgeError> {
|
||||
/// Run `read` over the library, its metadata and its records, rebuilt
|
||||
/// only when the catalog or the name setting has changed since.
|
||||
fn with_library<T>(&self, read: impl FnOnce(&CachedLibrary) -> T) -> Result<T, BridgeError> {
|
||||
let names = pstr_core::appearance::load(&self.dirs)
|
||||
.unwrap_or_default()
|
||||
.names;
|
||||
let catalog = self.catalog.lock();
|
||||
let writes = catalog.writes();
|
||||
if let Some(cached) = self.library_cache.lock().as_ref()
|
||||
&& cached.writes == writes
|
||||
&& cached.names == names
|
||||
{
|
||||
return Ok(cached.titles.clone());
|
||||
return Ok(read(cached));
|
||||
}
|
||||
|
||||
let files = catalog.all_files().map_err(BridgeError::from_display)?;
|
||||
@@ -1540,26 +1660,61 @@ impl AndroidEngine {
|
||||
let offline = catalog
|
||||
.all_offline_files()
|
||||
.map_err(BridgeError::from_display)?;
|
||||
let first_seen = catalog.first_seen().map_err(BridgeError::from_display)?;
|
||||
drop(catalog);
|
||||
|
||||
let library = Library::build(files, &watch);
|
||||
let all: Vec<&Title> = library.titles.iter().collect();
|
||||
let franchises: HashMap<String, Vec<String>> = pstr_core::franchise::group(&all, &metadata)
|
||||
.into_iter()
|
||||
.filter(|franchise| franchise.members.len() > 1)
|
||||
.flat_map(|franchise| {
|
||||
let keys: Vec<String> = franchise
|
||||
.members
|
||||
.iter()
|
||||
.map(|&index| all[index].key.clone())
|
||||
.collect();
|
||||
keys.clone().into_iter().map(move |key| (key, keys.clone()))
|
||||
})
|
||||
.collect();
|
||||
let now = now();
|
||||
let titles: Vec<TitleRecord> = library
|
||||
.titles
|
||||
.iter()
|
||||
.map(|title| {
|
||||
title_record(
|
||||
let mut record = title_record(
|
||||
title,
|
||||
&offline,
|
||||
metadata.get(&title.key),
|
||||
guides.get(&title.key),
|
||||
)
|
||||
);
|
||||
record.display_name =
|
||||
pstr_core::browse::display_name(title, &metadata, names).to_owned();
|
||||
record.franchise = franchises.get(&title.key).cloned().unwrap_or_default();
|
||||
if let Some(details) = metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.and_then(|found| found.details.as_ref())
|
||||
&& let Some((episode, at)) = details.next_airing(now)
|
||||
{
|
||||
record.next_episode = Some(episode);
|
||||
record.next_airing_at = Some(at);
|
||||
}
|
||||
record
|
||||
})
|
||||
.collect();
|
||||
*self.library_cache.lock() = Some(CachedLibrary {
|
||||
let added = library.added_at(&first_seen);
|
||||
let cached = CachedLibrary {
|
||||
writes,
|
||||
titles: titles.clone(),
|
||||
});
|
||||
Ok(titles)
|
||||
names,
|
||||
library,
|
||||
metadata,
|
||||
added,
|
||||
titles,
|
||||
};
|
||||
let answer = read(&cached);
|
||||
*self.library_cache.lock() = Some(cached);
|
||||
Ok(answer)
|
||||
}
|
||||
|
||||
fn titles_and_metadata(
|
||||
@@ -1723,8 +1878,10 @@ impl AndroidEngine {
|
||||
let opener = Arc::new(LibraryOpener::new(Arc::clone(&library)));
|
||||
let source = StreamSource::new(
|
||||
opener,
|
||||
StreamConfig::default()
|
||||
.with_disk_cache(DiskCacheConfig::new(self.dirs.block_cache())),
|
||||
StreamConfig::default().with_disk_cache(
|
||||
DiskCacheConfig::new(self.dirs.block_cache())
|
||||
.with_budget(self.cache_budget.load(Ordering::Acquire)),
|
||||
),
|
||||
)
|
||||
.await
|
||||
.map_err(BridgeError::from_display)?;
|
||||
@@ -2316,17 +2473,14 @@ fn normalized_language(language: Option<String>) -> Option<String> {
|
||||
/// The library conversion, valid while the catalog has not been written to.
|
||||
struct CachedLibrary {
|
||||
writes: u64,
|
||||
names: TitleNames,
|
||||
library: Library,
|
||||
metadata: HashMap<String, MetadataRecord>,
|
||||
/// When each title last gained a file.
|
||||
added: HashMap<String, i64>,
|
||||
titles: Vec<TitleRecord>,
|
||||
}
|
||||
|
||||
/// One title's share of an enrichment pass.
|
||||
enum Work {
|
||||
/// Search for it, and take its episodes if it matches.
|
||||
Match(Title),
|
||||
/// It is already matched; only the episode list is missing.
|
||||
Episodes(Title, Box<TitleMetadata>),
|
||||
}
|
||||
|
||||
/// How many provider lookups may be in flight at once.
|
||||
///
|
||||
/// Deliberately small. Both providers rate-limit by client, and a phone
|
||||
@@ -2378,9 +2532,29 @@ fn appearance_record(appearance: Appearance) -> AppearanceRecord {
|
||||
Accent::Red => AccentChoice::Red,
|
||||
},
|
||||
gradients: appearance.gradients,
|
||||
names: match appearance.names {
|
||||
TitleNames::Library => TitleNamesChoice::Library,
|
||||
TitleNames::English => TitleNamesChoice::English,
|
||||
TitleNames::Romaji => TitleNamesChoice::Romaji,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
fn sort_choice(sort: LibrarySort) -> Sort {
|
||||
match sort {
|
||||
LibrarySort::Name => Sort::Name,
|
||||
LibrarySort::Recent => Sort::Recent,
|
||||
LibrarySort::Added => Sort::Added,
|
||||
LibrarySort::Release => Sort::Release,
|
||||
LibrarySort::Rating => Sort::Rating,
|
||||
LibrarySort::Popularity => Sort::Popularity,
|
||||
}
|
||||
}
|
||||
|
||||
/// How many shelves the library shows above the grid — fewer than the
|
||||
/// desktop's four, because on a phone each is a screen's height.
|
||||
const SHELVES: usize = 3;
|
||||
|
||||
fn appearance_choice(record: AppearanceRecord) -> Appearance {
|
||||
Appearance {
|
||||
flavor: match record.flavor {
|
||||
@@ -2403,6 +2577,12 @@ fn appearance_choice(record: AppearanceRecord) -> Appearance {
|
||||
AccentChoice::Red => Accent::Red,
|
||||
},
|
||||
gradients: record.gradients,
|
||||
names: match record.names {
|
||||
TitleNamesChoice::Library => TitleNames::Library,
|
||||
TitleNamesChoice::English => TitleNames::English,
|
||||
TitleNamesChoice::Romaji => TitleNames::Romaji,
|
||||
},
|
||||
..Appearance::default()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2476,6 +2656,7 @@ fn title_record(
|
||||
guide: Option<&EpisodeGuide>,
|
||||
) -> TitleRecord {
|
||||
let metadata = record.and_then(|record| record.metadata.as_ref());
|
||||
let details = metadata.and_then(|found| found.details.as_ref());
|
||||
TitleRecord {
|
||||
key: title.key.clone(),
|
||||
name: title.name.clone(),
|
||||
@@ -2500,6 +2681,17 @@ fn title_record(
|
||||
provider_episode_count: metadata.and_then(|metadata| metadata.episodes),
|
||||
external_url: metadata.and_then(|metadata| metadata.url.clone()),
|
||||
manual_match: record.is_some_and(|record| record.manual),
|
||||
display_name: metadata.map_or_else(|| title.name.clone(), |found| found.name.clone()),
|
||||
wide_url: metadata.and_then(|found| found.wide_art().map(str::to_owned)),
|
||||
format_label: details.and_then(|details| details.format_label().map(str::to_owned)),
|
||||
season_label: details.and_then(|details| details.season_label()),
|
||||
studios: details.map_or_else(Vec::new, |details| details.studios.clone()),
|
||||
directors: details.map_or_else(Vec::new, |details| details.directors.clone()),
|
||||
tags: details.map_or_else(Vec::new, |details| details.tags.clone()),
|
||||
airing: details.is_some_and(|details| details.is_airing()),
|
||||
next_episode: None,
|
||||
next_airing_at: None,
|
||||
franchise: Vec::new(),
|
||||
seasons: title
|
||||
.seasons
|
||||
.iter()
|
||||
@@ -2559,6 +2751,10 @@ fn match_record(metadata: TitleMetadata) -> MatchRecord {
|
||||
genres: metadata.genres,
|
||||
episode_count: metadata.episodes,
|
||||
external_url: metadata.url,
|
||||
details: metadata
|
||||
.details
|
||||
.as_ref()
|
||||
.and_then(|details| serde_json::to_string(details).ok()),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2577,6 +2773,10 @@ fn title_metadata(record: MatchRecord) -> TitleMetadata {
|
||||
genres: record.genres,
|
||||
episodes: record.episode_count,
|
||||
url: record.external_url,
|
||||
details: record
|
||||
.details
|
||||
.as_deref()
|
||||
.and_then(|details| serde_json::from_str(details).ok()),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2640,6 +2840,7 @@ mod tests {
|
||||
flavor,
|
||||
accent: AccentChoice::Mauve,
|
||||
gradients: true,
|
||||
names: super::TitleNamesChoice::English,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2952,6 +3153,11 @@ mod tests {
|
||||
genres: vec!["Action".to_owned(), "Sci-Fi".to_owned()],
|
||||
episodes: Some(26),
|
||||
url: Some("https://anilist.co/anime/1".to_owned()),
|
||||
details: Some(pstr_core::metadata::TitleDetails {
|
||||
studios: vec!["Sunrise".to_owned()],
|
||||
related: vec!["5".to_owned()],
|
||||
..Default::default()
|
||||
}),
|
||||
};
|
||||
|
||||
assert_eq!(title_metadata(match_record(metadata.clone())), metadata);
|
||||
@@ -2989,6 +3195,117 @@ mod tests {
|
||||
assert_eq!(pstr_android_stream_size(handle), -1);
|
||||
}
|
||||
|
||||
/// The arrangement folds a franchise into its series, and the name
|
||||
/// setting — stored in the file the desktop reads — renames the tile
|
||||
/// without anything in the catalog changing.
|
||||
#[test]
|
||||
fn the_library_folds_a_franchise_and_follows_the_name_setting() {
|
||||
use pstr_core::catalog::CatalogNode;
|
||||
use pstr_core::metadata::{MetadataRecord, TitleDetails};
|
||||
|
||||
let root = std::env::temp_dir().join(format!(
|
||||
"pstr-android-arrangement-{}-{}",
|
||||
std::process::id(),
|
||||
super::now()
|
||||
));
|
||||
let engine = AndroidEngine::new(
|
||||
AndroidPaths {
|
||||
config: root.join("config").to_string_lossy().into_owned(),
|
||||
data: root.join("data").to_string_lossy().into_owned(),
|
||||
cache: root.join("cache").to_string_lossy().into_owned(),
|
||||
},
|
||||
Box::<MemorySecrets>::default(),
|
||||
)
|
||||
.expect("engine");
|
||||
|
||||
let file = |link: &str, name: &str| CatalogNode {
|
||||
share_id: "s".into(),
|
||||
link_id: link.into(),
|
||||
volume_id: "v".into(),
|
||||
parent_link_id: None,
|
||||
name: name.into(),
|
||||
is_folder: false,
|
||||
media_type: None,
|
||||
size: None,
|
||||
active_revision_id: None,
|
||||
parsed: pstr_core::naming::parse(name),
|
||||
};
|
||||
let matched = |key: &str, id: &str, name: &str, kind, related: &str| MetadataRecord {
|
||||
title_key: key.into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(TitleMetadata {
|
||||
provider: ProviderId::AniList,
|
||||
remote_id: id.into(),
|
||||
name: name.into(),
|
||||
original_name: None,
|
||||
overview: None,
|
||||
year: None,
|
||||
kind,
|
||||
poster_url: None,
|
||||
backdrop_url: None,
|
||||
rating: None,
|
||||
genres: Vec::new(),
|
||||
episodes: None,
|
||||
url: None,
|
||||
details: Some(TitleDetails {
|
||||
related: vec![related.into()],
|
||||
..TitleDetails::default()
|
||||
}),
|
||||
}),
|
||||
fetched_at: 0,
|
||||
manual: false,
|
||||
};
|
||||
{
|
||||
let mut catalog = engine.catalog.lock();
|
||||
catalog
|
||||
.replace_share(
|
||||
"s",
|
||||
&[
|
||||
file("a", "Sousou no Frieren S01E01.mkv"),
|
||||
file("b", "Made in Abyss Dawn of the Deep Soul.mkv"),
|
||||
],
|
||||
)
|
||||
.expect("crawl");
|
||||
catalog
|
||||
.set_metadata(&matched(
|
||||
"sousou no frieren",
|
||||
"1",
|
||||
"Frieren",
|
||||
TitleKind::Series,
|
||||
"2",
|
||||
))
|
||||
.expect("match");
|
||||
catalog
|
||||
.set_metadata(&matched(
|
||||
"made in abyss dawn of the deep soul",
|
||||
"2",
|
||||
"Dawn of the Deep Soul",
|
||||
TitleKind::Film,
|
||||
"1",
|
||||
))
|
||||
.expect("match");
|
||||
}
|
||||
|
||||
let arranged = engine
|
||||
.arrangement(None, super::LibrarySort::Name, true)
|
||||
.expect("arrange");
|
||||
assert_eq!(arranged.tiles.len(), 1);
|
||||
assert_eq!(arranged.tiles[0].key, "sousou no frieren");
|
||||
assert_eq!(arranged.tiles[0].folded, 1);
|
||||
let titles = engine.library(Some("frieren".into())).expect("library");
|
||||
assert_eq!(titles.len(), 1);
|
||||
assert_eq!(titles[0].display_name, "Frieren");
|
||||
assert_eq!(titles[0].franchise.len(), 2);
|
||||
|
||||
let mut appearance = engine.appearance().expect("appearance");
|
||||
appearance.names = super::TitleNamesChoice::Library;
|
||||
engine.set_appearance(appearance).expect("store");
|
||||
let titles = engine.library(Some("frieren".into())).expect("library");
|
||||
assert_eq!(titles[0].display_name, "Sousou no Frieren");
|
||||
|
||||
let _ = std::fs::remove_dir_all(root);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn share_mutations_cleanup_even_when_secret_deletion_fails() {
|
||||
let unique = format!(
|
||||
|
||||
@@ -2,3 +2,9 @@
|
||||
# UniFFI's default JVM cleaner references java.lang.ref.Cleaner (API 33).
|
||||
# Android uses the JNA cleaner, which is available on our minSdk 31 runtime.
|
||||
disable_java_cleaner = true
|
||||
|
||||
[bindings.swift]
|
||||
# The iOS client (`ios/`) compiles the generated file straight into the app
|
||||
# target and reaches the C side through its bridging header, so the names are
|
||||
# what that header and `ios/project.yml` expect.
|
||||
module_name = "PstrBridge"
|
||||
@@ -24,17 +24,25 @@ tracing.workspace = true
|
||||
tracing-subscriber.workspace = true
|
||||
eframe.workspace = true
|
||||
egui.workspace = true
|
||||
egui-phosphor.workspace = true
|
||||
image.workspace = true
|
||||
sha2.workspace = true
|
||||
parking_lot.workspace = true
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
directories.workspace = true
|
||||
chrono.workspace = true
|
||||
souvlaki.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
skrifa.workspace = true
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
dbus.workspace = true
|
||||
|
||||
[target.'cfg(windows)'.dependencies]
|
||||
windows-sys = { workspace = true, features = ["Win32_System_Power"] }
|
||||
# Named pipes, for handing a second launch's request to the open window.
|
||||
tokio = { workspace = true, features = ["net"] }
|
||||
windows-sys = { workspace = true, features = ["Win32_System_Power", "Win32_System_Registry"] }
|
||||
tauri-winrt-notification.workspace = true
|
||||
raw-window-handle = "0.6"
|
||||
@@ -0,0 +1,92 @@
|
||||
Copyright (c) 2016 The Inter Project Authors (https://github.com/rsms/inter)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
http://scripts.sil.org/OFL
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION AND CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
|
After Width: | Height: | Size: 13 KiB |
@@ -12,7 +12,7 @@ use pstr_core::Share;
|
||||
use pstr_core::appearance::Appearance;
|
||||
use pstr_core::config::AppDirs;
|
||||
use pstr_core::library::Library;
|
||||
use pstr_core::metadata::{EpisodeGuide, MetadataConfig, MetadataRecord};
|
||||
use pstr_core::metadata::{EpisodeGuide, MetadataConfig, MetadataRecord, TitleNames};
|
||||
|
||||
use crate::engine::{
|
||||
DownloadItem, DownloadKey, Engine, Event, ImageCache, describe_failures, watch_state,
|
||||
@@ -46,6 +46,7 @@ impl FrameTimer {
|
||||
started: std::time::Instant::now(),
|
||||
page: match page {
|
||||
Page::Library => "library",
|
||||
Page::History => "history",
|
||||
Page::Title(_) => "title",
|
||||
Page::Shares => "shares",
|
||||
Page::Downloads => "downloads",
|
||||
@@ -80,6 +81,8 @@ const UP_NEXT_SECONDS: f64 = 10.0;
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Page {
|
||||
Library,
|
||||
/// Everything played, newest first.
|
||||
History,
|
||||
/// One title, by [`pstr_core::library::Title::key`].
|
||||
Title(String),
|
||||
Shares,
|
||||
@@ -91,6 +94,15 @@ pub enum Page {
|
||||
Player,
|
||||
}
|
||||
|
||||
/// The pages in the top bar, in order. Ctrl+1 to Ctrl+5 go by position here.
|
||||
const NAV: [Page; 5] = [
|
||||
Page::Library,
|
||||
Page::History,
|
||||
Page::Shares,
|
||||
Page::Downloads,
|
||||
Page::Settings,
|
||||
];
|
||||
|
||||
/// Something a click asked for, applied once the frame is drawn.
|
||||
pub enum Action {
|
||||
Goto(Page),
|
||||
@@ -177,6 +189,14 @@ pub enum Action {
|
||||
share_id: String,
|
||||
link_id: String,
|
||||
},
|
||||
/// Take one file off the history page: forget its position and its
|
||||
/// watched mark, with an Undo.
|
||||
RemoveFromHistory {
|
||||
share_id: String,
|
||||
link_id: String,
|
||||
},
|
||||
/// Open or close the list of episodes beside the picture.
|
||||
ToggleEpisodes,
|
||||
/// Put watch states back as they were — what Undo does.
|
||||
RestoreWatch(Vec<(String, String, pstr_core::catalog::WatchState)>),
|
||||
ClearStreamCache,
|
||||
@@ -193,6 +213,8 @@ pub enum Action {
|
||||
FocusSearch,
|
||||
/// Show a different slice of the library, or in a different order.
|
||||
SetShelf(Filter, Sort),
|
||||
/// Fold each franchise into one tile, or show every title.
|
||||
SetGrouped(bool),
|
||||
/// Open or close the list of keyboard shortcuts.
|
||||
ToggleShortcuts,
|
||||
/// One page back: a title to the library, the library to nowhere.
|
||||
@@ -282,23 +304,55 @@ impl Matcher {
|
||||
/// every title by when it was last played. Neither is slow once; both were
|
||||
/// being done on every frame, and while a film plays under the transport bar
|
||||
/// that is the film's frame rate.
|
||||
#[derive(Default)]
|
||||
pub struct LibraryView {
|
||||
/// The query `matches` answers, as typed.
|
||||
query: String,
|
||||
/// Which titles the grid shows, and in what order.
|
||||
pub filter: Filter,
|
||||
pub sort: Sort,
|
||||
/// The filter and order `matches` was built with.
|
||||
built_with: (Filter, Sort),
|
||||
/// One tile per franchise rather than one per title. See
|
||||
/// `pstr_core::franchise`.
|
||||
pub grouped: bool,
|
||||
/// What `matches` was built with.
|
||||
built_with: Option<(Filter, Sort, bool, TitleNames)>,
|
||||
/// Indices into [`Library::titles`].
|
||||
pub matches: Vec<usize>,
|
||||
/// In a grouped grid, how many other titles a tile stands for, by index.
|
||||
pub folded: HashMap<usize, usize>,
|
||||
/// Every title in a franchise of more than one, by key: the keys of the
|
||||
/// whole franchise in release order, its own included.
|
||||
pub franchises: HashMap<String, Vec<String>>,
|
||||
/// The rows above the grid, as a heading and indices.
|
||||
pub shelves: Vec<(String, Vec<usize>)>,
|
||||
/// Every played episode, newest first, for the history page.
|
||||
pub history: Vec<ui::history::Entry>,
|
||||
/// The "Continue watching" shelf, most recent first, as indices.
|
||||
pub resumable: Vec<usize>,
|
||||
/// The library changed under the lists.
|
||||
/// The library or what is known about it changed under the lists.
|
||||
stale: bool,
|
||||
}
|
||||
|
||||
impl Default for LibraryView {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
query: String::new(),
|
||||
filter: Filter::default(),
|
||||
sort: Sort::default(),
|
||||
// On: a share holding a series and its three films is four tiles
|
||||
// of the same picture otherwise.
|
||||
grouped: true,
|
||||
built_with: None,
|
||||
matches: Vec::new(),
|
||||
folded: HashMap::new(),
|
||||
franchises: HashMap::new(),
|
||||
shelves: Vec::new(),
|
||||
history: Vec::new(),
|
||||
resumable: Vec::new(),
|
||||
stale: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Which titles the grid shows.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
||||
pub enum Filter {
|
||||
@@ -328,51 +382,104 @@ impl Filter {
|
||||
}
|
||||
}
|
||||
|
||||
/// What order the grid is in.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
||||
pub enum Sort {
|
||||
/// The library's own order: by name, ignoring a leading article.
|
||||
#[default]
|
||||
Name,
|
||||
/// Most recently played first.
|
||||
Recent,
|
||||
/// Newest first, undated last.
|
||||
Year,
|
||||
pub use pstr_core::browse::Sort;
|
||||
|
||||
/// What the library view is built from, besides the library itself.
|
||||
pub struct ViewInputs<'a> {
|
||||
pub query: &'a str,
|
||||
pub metadata: &'a HashMap<String, MetadataRecord>,
|
||||
pub names: TitleNames,
|
||||
/// When each title last gained a file, by key.
|
||||
pub added: &'a HashMap<String, i64>,
|
||||
}
|
||||
|
||||
/// How many shelves the library shows above the grid.
|
||||
const SHELVES: usize = 4;
|
||||
|
||||
impl LibraryView {
|
||||
fn refresh(&mut self, library: &Library, query: &str) {
|
||||
if !self.stale && self.query == query && self.built_with == (self.filter, self.sort) {
|
||||
fn refresh(&mut self, library: &Library, inputs: ViewInputs<'_>) {
|
||||
use pstr_core::library::Title;
|
||||
|
||||
let built_with = (self.filter, self.sort, self.grouped, inputs.names);
|
||||
if !self.stale && self.query == inputs.query && self.built_with == Some(built_with) {
|
||||
return;
|
||||
}
|
||||
let index_of = |title: &pstr_core::library::Title| {
|
||||
let metadata = inputs.metadata;
|
||||
if self.stale {
|
||||
let all: Vec<&Title> = library.titles.iter().collect();
|
||||
self.franchises = pstr_core::franchise::group(&all, metadata)
|
||||
.into_iter()
|
||||
.filter(|franchise| franchise.members.len() > 1)
|
||||
.flat_map(|franchise| {
|
||||
let keys: Vec<String> = franchise
|
||||
.members
|
||||
.iter()
|
||||
.map(|&index| all[index].key.clone())
|
||||
.collect();
|
||||
keys.clone().into_iter().map(move |key| (key, keys.clone()))
|
||||
})
|
||||
.collect();
|
||||
let index: HashMap<&str, usize> = library
|
||||
.titles
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(at, title)| (title.key.as_str(), at))
|
||||
.collect();
|
||||
self.shelves = pstr_core::shelves::pick(&library.titles, metadata, SHELVES)
|
||||
.into_iter()
|
||||
.map(|shelf| {
|
||||
let indices = shelf
|
||||
.keys
|
||||
.iter()
|
||||
.filter_map(|key| index.get(key.as_str()).copied())
|
||||
.collect();
|
||||
(shelf.label, indices)
|
||||
})
|
||||
.collect();
|
||||
}
|
||||
|
||||
let titles: Vec<&Title> = pstr_core::browse::search(library, metadata, inputs.query)
|
||||
.into_iter()
|
||||
.filter(|title| self.filter.admits(title))
|
||||
.collect();
|
||||
let tiles = pstr_core::browse::arrange(
|
||||
&titles,
|
||||
pstr_core::browse::Order {
|
||||
sort: self.sort,
|
||||
grouped: self.grouped,
|
||||
names: inputs.names,
|
||||
metadata,
|
||||
added: inputs.added,
|
||||
},
|
||||
);
|
||||
let index_of = |title: &Title| {
|
||||
library
|
||||
.titles
|
||||
.iter()
|
||||
.position(|candidate| std::ptr::eq(candidate, title))
|
||||
};
|
||||
let mut matches: Vec<&pstr_core::library::Title> = library
|
||||
.search(query)
|
||||
.into_iter()
|
||||
.filter(|title| self.filter.admits(title))
|
||||
// Indices into what was arranged, made indices into the library.
|
||||
let entries: Vec<(usize, usize)> = tiles
|
||||
.iter()
|
||||
.filter_map(|tile| Some((index_of(titles[tile.lead])?, tile.members.len())))
|
||||
.collect();
|
||||
match self.sort {
|
||||
Sort::Name => {}
|
||||
// Stable, so titles never played keep their alphabetical order
|
||||
// after the ones that have been.
|
||||
Sort::Recent => matches.sort_by_key(|title| std::cmp::Reverse(title.last_played())),
|
||||
Sort::Year => matches.sort_by_key(|title| std::cmp::Reverse(title.year.unwrap_or(0))),
|
||||
}
|
||||
self.matches = matches.into_iter().filter_map(index_of).collect();
|
||||
self.built_with = (self.filter, self.sort);
|
||||
|
||||
self.folded = entries
|
||||
.iter()
|
||||
.filter(|(_, members)| *members > 1)
|
||||
.map(|(lead, members)| (*lead, members - 1))
|
||||
.collect();
|
||||
self.matches = entries.into_iter().map(|(lead, _)| lead).collect();
|
||||
self.built_with = Some(built_with);
|
||||
if self.stale {
|
||||
self.history = ui::history::entries(library);
|
||||
self.resumable = library
|
||||
.continue_watching()
|
||||
.into_iter()
|
||||
.filter_map(index_of)
|
||||
.collect();
|
||||
}
|
||||
self.query = query.to_owned();
|
||||
self.query = inputs.query.to_owned();
|
||||
self.stale = false;
|
||||
}
|
||||
}
|
||||
@@ -394,6 +501,8 @@ pub struct ShareForm {
|
||||
pub struct App {
|
||||
engine: Engine,
|
||||
events: Receiver<Event>,
|
||||
/// What later launches asked for. See [`crate::instance`].
|
||||
requests: Receiver<crate::instance::Request>,
|
||||
pub page: Page,
|
||||
pub library: Library,
|
||||
pub shares: Vec<Share>,
|
||||
@@ -403,6 +512,8 @@ pub struct App {
|
||||
pub posters: ImageCache,
|
||||
/// What the providers have said, keyed by title key.
|
||||
pub metadata: HashMap<String, MetadataRecord>,
|
||||
/// When each title last gained a file, by key — for "Recently added".
|
||||
pub added: HashMap<String, i64>,
|
||||
/// What they said about the episodes under those titles.
|
||||
pub episodes: HashMap<String, EpisodeGuide>,
|
||||
pub settings: MetadataConfig,
|
||||
@@ -435,6 +546,8 @@ pub struct App {
|
||||
/// Chapters already skipped on their own in this player, so seeking back
|
||||
/// into an opening on purpose is not undone a frame later.
|
||||
auto_skipped: (u64, Vec<i64>),
|
||||
/// Whether the episode list is out on the player page.
|
||||
pub episode_drawer: bool,
|
||||
/// Set while the window is fullscreen, so `F` can toggle rather than only
|
||||
/// ever entering. egui has no way to ask the platform.
|
||||
pub fullscreen: bool,
|
||||
@@ -473,13 +586,17 @@ impl App {
|
||||
cc: &eframe::CreationContext<'_>,
|
||||
runtime: std::sync::Arc<tokio::runtime::Runtime>,
|
||||
dirs: AppDirs,
|
||||
instance: crate::instance::Listener,
|
||||
request: crate::instance::Request,
|
||||
) -> anyhow::Result<Self> {
|
||||
let requests = instance.serve(&runtime, &cc.egui_ctx, request);
|
||||
// After the engine, not before: the engine is what reads the stored
|
||||
// theme, and a window that paints one frame in the default palette
|
||||
// before switching is a window that flashes on every launch.
|
||||
let window = crate::window::WindowMemory::new(dirs.window_file());
|
||||
let notifier = crate::notify::Notifier::new(&dirs.cache);
|
||||
let (engine, events) = Engine::new(runtime, dirs, cc.egui_ctx.clone())?;
|
||||
theme::install_font_fallbacks(&cc.egui_ctx);
|
||||
theme::install_fonts(&cc.egui_ctx);
|
||||
theme::apply(&cc.egui_ctx, engine.appearance());
|
||||
|
||||
// Paint from the catalog immediately; the network catches up. A library
|
||||
@@ -493,12 +610,14 @@ impl App {
|
||||
Ok(Self {
|
||||
engine,
|
||||
events,
|
||||
requests,
|
||||
page: Page::Library,
|
||||
library: Library::default(),
|
||||
shares: Vec::new(),
|
||||
thumbs: ImageCache::default(),
|
||||
posters: ImageCache::default(),
|
||||
metadata: HashMap::new(),
|
||||
added: HashMap::new(),
|
||||
episodes: HashMap::new(),
|
||||
settings,
|
||||
api_key: String::new(),
|
||||
@@ -517,6 +636,7 @@ impl App {
|
||||
warmed: 0,
|
||||
auto_skipped: (0, Vec::new()),
|
||||
fullscreen: false,
|
||||
episode_drawer: false,
|
||||
opening: None,
|
||||
connecting: true,
|
||||
crawling: false,
|
||||
@@ -526,7 +646,7 @@ impl App {
|
||||
media_cover: None,
|
||||
inhibitor: crate::inhibit::Inhibitor::new(),
|
||||
shown_page: (None, 0.0),
|
||||
notifier: crate::notify::Notifier::new(),
|
||||
notifier,
|
||||
downloads: Vec::new(),
|
||||
offline_files: std::collections::HashSet::new(),
|
||||
confirm_partial_delete: None,
|
||||
@@ -579,8 +699,9 @@ impl App {
|
||||
self.connecting = false;
|
||||
self.note(ctx, format!("could not open the shares: {error}"), true);
|
||||
}
|
||||
Event::LibraryLoaded(library) => {
|
||||
Event::LibraryLoaded(library, added) => {
|
||||
self.library = library;
|
||||
self.added = added;
|
||||
self.loaded = true;
|
||||
self.view.stale = true;
|
||||
}
|
||||
@@ -645,6 +766,8 @@ impl App {
|
||||
self.posters.forget(&key);
|
||||
}
|
||||
self.metadata = records;
|
||||
// Names, franchises and shelves all come from it.
|
||||
self.view.stale = true;
|
||||
}
|
||||
Event::EpisodeMetadata(episodes) => self.episodes = episodes,
|
||||
Event::MetadataConfig(config) => {
|
||||
@@ -942,6 +1065,7 @@ impl App {
|
||||
posters: &mut self.posters,
|
||||
metadata: &self.metadata,
|
||||
episodes: &self.episodes,
|
||||
names: self.engine.appearance().names,
|
||||
}
|
||||
.still(&title.key, episode)
|
||||
});
|
||||
@@ -1053,6 +1177,39 @@ impl App {
|
||||
self.engine.set_playback_prefs(prefs, commit);
|
||||
}
|
||||
|
||||
/// Reset one file to never played, with an Undo. What leaving Continue
|
||||
/// watching and leaving the history both come down to: the two are read
|
||||
/// off the same watch state.
|
||||
fn forget_watch(
|
||||
&mut self,
|
||||
ctx: &egui::Context,
|
||||
share_id: String,
|
||||
link_id: String,
|
||||
place: &str,
|
||||
) {
|
||||
let found = self.library.titles.iter().find_map(|title| {
|
||||
let episode = title.episodes().find(|episode| {
|
||||
episode.node.share_id == share_id && episode.node.link_id == link_id
|
||||
})?;
|
||||
Some((title.name.clone(), episode.watch))
|
||||
});
|
||||
let Some((name, Some(before))) = found else {
|
||||
return;
|
||||
};
|
||||
self.engine.save_watch_state(
|
||||
share_id.clone(),
|
||||
link_id.clone(),
|
||||
watch_state(0.0, before.duration_secs, false),
|
||||
);
|
||||
let now = ctx.input(|input| input.time);
|
||||
self.toasts.push_with(
|
||||
now,
|
||||
format!("removed {name} from {place}"),
|
||||
"Undo",
|
||||
Action::RestoreWatch(vec![(share_id, link_id, before)]),
|
||||
);
|
||||
}
|
||||
|
||||
fn apply(&mut self, ctx: &egui::Context, action: Action) {
|
||||
match action {
|
||||
Action::Goto(page) => self.page = page,
|
||||
@@ -1154,6 +1311,7 @@ impl App {
|
||||
self.view.filter = filter;
|
||||
self.view.sort = sort;
|
||||
}
|
||||
Action::SetGrouped(grouped) => self.view.grouped = grouped,
|
||||
Action::Back => match self.page {
|
||||
Page::Title(_) => self.page = Page::Library,
|
||||
// Back out of a search before out of anything else: it is the
|
||||
@@ -1318,28 +1476,12 @@ impl App {
|
||||
);
|
||||
}
|
||||
Action::ForgetPosition { share_id, link_id } => {
|
||||
let found = self.library.titles.iter().find_map(|title| {
|
||||
let episode = title.episodes().find(|episode| {
|
||||
episode.node.share_id == share_id && episode.node.link_id == link_id
|
||||
})?;
|
||||
Some((title.name.clone(), episode.watch))
|
||||
});
|
||||
let Some((name, Some(before))) = found else {
|
||||
return;
|
||||
};
|
||||
self.engine.save_watch_state(
|
||||
share_id.clone(),
|
||||
link_id.clone(),
|
||||
watch_state(0.0, before.duration_secs, false),
|
||||
);
|
||||
let now = ctx.input(|input| input.time);
|
||||
self.toasts.push_with(
|
||||
now,
|
||||
format!("removed {name} from Continue watching"),
|
||||
"Undo",
|
||||
Action::RestoreWatch(vec![(share_id, link_id, before)]),
|
||||
);
|
||||
self.forget_watch(ctx, share_id, link_id, "Continue watching");
|
||||
}
|
||||
Action::RemoveFromHistory { share_id, link_id } => {
|
||||
self.forget_watch(ctx, share_id, link_id, "history");
|
||||
}
|
||||
Action::ToggleEpisodes => self.episode_drawer = !self.episode_drawer,
|
||||
Action::RestoreWatch(states) => {
|
||||
for (share_id, link_id, state) in states {
|
||||
self.engine.save_watch_state(share_id, link_id, state);
|
||||
@@ -1432,14 +1574,14 @@ impl App {
|
||||
focus_search: bool,
|
||||
) {
|
||||
ui.horizontal(|ui| {
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
ui.label(
|
||||
theme::Role::Heading
|
||||
.rich("proton-stream")
|
||||
.strong()
|
||||
.color(theme::accent()),
|
||||
);
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
let on_library = matches!(self.page, Page::Library | Page::Title(_));
|
||||
let active = self
|
||||
@@ -1459,12 +1601,13 @@ impl App {
|
||||
} else {
|
||||
format!("Downloads ({active})")
|
||||
};
|
||||
let pages = [Page::Library, Page::Shares, Page::Downloads, Page::Settings];
|
||||
let pages = NAV;
|
||||
let clicked = ui::tabs(
|
||||
ui,
|
||||
ui.id().with("nav"),
|
||||
&[
|
||||
("Library", on_library),
|
||||
("History", self.page == Page::History),
|
||||
("Shares", self.page == Page::Shares),
|
||||
(&downloads, self.page == Page::Downloads),
|
||||
("Settings", self.page == Page::Settings),
|
||||
@@ -1475,7 +1618,7 @@ impl App {
|
||||
}
|
||||
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
if self.crawling {
|
||||
if ui
|
||||
.small_button("Stop")
|
||||
@@ -1493,7 +1636,10 @@ impl App {
|
||||
ui.add(egui::Spinner::new().size(16.0));
|
||||
ui.label(ui::muted("connecting"));
|
||||
} else if ui
|
||||
.button("Refresh")
|
||||
.button(format!(
|
||||
"{} Refresh",
|
||||
egui_phosphor::regular::ARROW_CLOCKWISE
|
||||
))
|
||||
.on_hover_text("Re-crawl every share")
|
||||
.clicked()
|
||||
{
|
||||
@@ -1501,7 +1647,7 @@ impl App {
|
||||
}
|
||||
|
||||
if on_library && !self.library.is_empty() {
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
ui::search_field(ui, search, focus_search);
|
||||
}
|
||||
});
|
||||
@@ -1524,6 +1670,15 @@ impl eframe::App for App {
|
||||
self.window.observe(ctx);
|
||||
|
||||
let mut actions: Vec<Action> = Vec::new();
|
||||
while let Ok(request) = self.requests.try_recv() {
|
||||
// A second launch is someone looking for this window, so it comes
|
||||
// forward even when there is nothing else to do.
|
||||
ctx.send_viewport_cmd(egui::ViewportCommand::Minimized(false));
|
||||
ctx.send_viewport_cmd(egui::ViewportCommand::Focus);
|
||||
if let crate::instance::Request::AddShare(url) = request {
|
||||
actions.push(Action::PasteShare(url));
|
||||
}
|
||||
}
|
||||
self.media.drain(self.playback.as_ref(), &mut actions);
|
||||
let cover = self.media_cover();
|
||||
self.media.show(self.playback.as_ref(), cover.as_deref());
|
||||
@@ -1552,7 +1707,13 @@ impl eframe::App for App {
|
||||
speed: playback.speed,
|
||||
skip_to: playback.skippable().map(|(_, end)| end),
|
||||
});
|
||||
shortcuts(ctx, self.fullscreen, state, &mut actions);
|
||||
shortcuts(
|
||||
ctx,
|
||||
self.fullscreen,
|
||||
self.episode_drawer,
|
||||
state,
|
||||
&mut actions,
|
||||
);
|
||||
|
||||
// Before the draw, because drawing does not mutate — and it can
|
||||
// push an action of its own, which is why it takes the same list.
|
||||
@@ -1562,8 +1723,31 @@ impl eframe::App for App {
|
||||
playback,
|
||||
opening,
|
||||
overlay,
|
||||
engine,
|
||||
library,
|
||||
thumbs,
|
||||
posters,
|
||||
metadata,
|
||||
episodes,
|
||||
episode_drawer,
|
||||
..
|
||||
} = self;
|
||||
let list = playback
|
||||
.as_ref()
|
||||
.and_then(|playback| library.get(&playback.target.title_key))
|
||||
.filter(|title| title.episode_count() > 1)
|
||||
.map(|title| ui::player::Episodes {
|
||||
title,
|
||||
art: ui::Art {
|
||||
engine,
|
||||
thumbs,
|
||||
posters,
|
||||
metadata,
|
||||
episodes,
|
||||
names: engine.appearance().names,
|
||||
},
|
||||
open: *episode_drawer,
|
||||
});
|
||||
// No panels: the controls are drawn over the picture, and a nav bar
|
||||
// above a film is the one thing every player agrees not to do.
|
||||
egui::CentralPanel::default()
|
||||
@@ -1578,6 +1762,7 @@ impl eframe::App for App {
|
||||
overlay,
|
||||
up_next,
|
||||
neighbours,
|
||||
episodes: list,
|
||||
},
|
||||
&mut actions,
|
||||
);
|
||||
@@ -1658,7 +1843,15 @@ impl eframe::App for App {
|
||||
});
|
||||
self.search = search;
|
||||
self.focus_search = false;
|
||||
self.view.refresh(&self.library, &self.search);
|
||||
self.view.refresh(
|
||||
&self.library,
|
||||
ViewInputs {
|
||||
query: &self.search,
|
||||
metadata: &self.metadata,
|
||||
names: self.engine.appearance().names,
|
||||
added: &self.added,
|
||||
},
|
||||
);
|
||||
|
||||
let App {
|
||||
engine,
|
||||
@@ -1744,6 +1937,7 @@ impl eframe::App for App {
|
||||
posters: &mut *posters,
|
||||
metadata,
|
||||
episodes,
|
||||
names: engine.appearance().names,
|
||||
};
|
||||
match page {
|
||||
Page::Library => ui::library::show(
|
||||
@@ -1754,6 +1948,7 @@ impl eframe::App for App {
|
||||
view,
|
||||
loaded: *loaded,
|
||||
search,
|
||||
tiles: engine.appearance().tiles,
|
||||
},
|
||||
&mut actions,
|
||||
),
|
||||
@@ -1762,6 +1957,7 @@ impl eframe::App for App {
|
||||
&mut art,
|
||||
library,
|
||||
key,
|
||||
view.franchises.get(key.as_str()).map(Vec::as_slice),
|
||||
ui::title::OfflineView {
|
||||
downloads,
|
||||
files: offline_files,
|
||||
@@ -1773,6 +1969,9 @@ impl eframe::App for App {
|
||||
ui::settings::show(ui, settings, prefs, api_key, &mut actions)
|
||||
}
|
||||
Page::Downloads => ui::downloads::show(ui, downloads, &mut actions),
|
||||
Page::History => {
|
||||
ui::history::show(ui, &mut art, library, &view.history, &mut actions)
|
||||
}
|
||||
// Drawn above, without any of these panels.
|
||||
Page::Player => {}
|
||||
}
|
||||
@@ -1788,6 +1987,7 @@ impl eframe::App for App {
|
||||
posters,
|
||||
metadata,
|
||||
episodes,
|
||||
names: engine.appearance().names,
|
||||
};
|
||||
ui::matcher::show(ctx, open, &mut art, settings.provider, &mut actions);
|
||||
}
|
||||
@@ -1911,7 +2111,7 @@ fn screenshot_name(title: &str, caption: &str, position: f64) -> String {
|
||||
/// rather than in one: the cut between two pages of tiles reads as a flicker,
|
||||
/// a short fade as a change of place.
|
||||
fn page_fade(ctx: &egui::Context, shown: &mut (Option<Page>, f64), page: &Page) -> f32 {
|
||||
const SECONDS: f64 = 0.14;
|
||||
const SECONDS: f64 = theme::motion::STATE as f64;
|
||||
let now = ctx.input(|input| input.time);
|
||||
if shown.0.as_ref() != Some(page) {
|
||||
// The first page of a launch is there at once; only changes fade.
|
||||
@@ -1922,7 +2122,7 @@ fn page_fade(ctx: &egui::Context, shown: &mut (Option<Page>, f64), page: &Page)
|
||||
if progress < 1.0 {
|
||||
ctx.request_repaint();
|
||||
}
|
||||
1.0 - (1.0 - progress).powi(3)
|
||||
theme::motion::ease_out(progress)
|
||||
}
|
||||
|
||||
/// What the top bar says while shares are being listed: one share by name,
|
||||
@@ -1941,7 +2141,8 @@ fn crawl_label(progress: &std::collections::BTreeMap<String, usize>) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
/// Titles whose tile art is not what it was.
|
||||
/// Texture keys whose picture is not what it was: a title's tile art, its cover
|
||||
/// and its wide art each.
|
||||
///
|
||||
/// Compared by URL: the same URL is the same picture, and anything else —
|
||||
/// a different one, a new one, or none any more — has to be fetched or
|
||||
@@ -1950,19 +2151,27 @@ fn changed_art(
|
||||
before: &HashMap<String, MetadataRecord>,
|
||||
after: &HashMap<String, MetadataRecord>,
|
||||
) -> Vec<String> {
|
||||
let url = |records: &HashMap<String, MetadataRecord>, key: &str| {
|
||||
records
|
||||
.get(key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.and_then(|metadata| metadata.tile_art())
|
||||
.map(|(url, _)| url.to_owned())
|
||||
// Every picture a title is drawn with, in the order of the keys below.
|
||||
let urls = |records: &HashMap<String, MetadataRecord>, key: &str| {
|
||||
let found = records.get(key).and_then(|record| record.metadata.as_ref());
|
||||
[
|
||||
found
|
||||
.and_then(|metadata| metadata.tile_art())
|
||||
.map(|(url, _)| url.to_owned()),
|
||||
found.and_then(|metadata| metadata.poster_url.clone()),
|
||||
found.and_then(|metadata| metadata.wide_art().map(str::to_owned)),
|
||||
]
|
||||
};
|
||||
let mut keys: Vec<String> = before
|
||||
.keys()
|
||||
.chain(after.keys())
|
||||
.filter(|key| url(before, key) != url(after, key))
|
||||
.cloned()
|
||||
.collect();
|
||||
let mut keys: Vec<String> = Vec::new();
|
||||
for key in before.keys().chain(after.keys()) {
|
||||
let (old, new) = (urls(before, key), urls(after, key));
|
||||
let texture_keys = [key.clone(), ui::poster_key(key), ui::wide_key(key)];
|
||||
for ((old, new), texture) in old.iter().zip(&new).zip(texture_keys) {
|
||||
if old != new {
|
||||
keys.push(texture);
|
||||
}
|
||||
}
|
||||
}
|
||||
keys.sort_unstable();
|
||||
keys.dedup();
|
||||
keys
|
||||
@@ -2005,13 +2214,14 @@ fn global_shortcuts(ctx: &egui::Context, page: &Page, actions: &mut Vec<Action>)
|
||||
(Key::Num2, 1),
|
||||
(Key::Num3, 2),
|
||||
(Key::Num4, 3),
|
||||
(Key::Num5, 4),
|
||||
] {
|
||||
if input.consume_key(Modifiers::COMMAND, key) {
|
||||
tab = Some(index);
|
||||
}
|
||||
}
|
||||
if input.consume_key(Modifiers::COMMAND, Key::Comma) {
|
||||
tab = Some(3);
|
||||
tab = Some(4);
|
||||
}
|
||||
// A share link pasted anywhere outside a text field is someone adding
|
||||
// a share, wherever they happen to be.
|
||||
@@ -2026,7 +2236,7 @@ fn global_shortcuts(ctx: &egui::Context, page: &Page, actions: &mut Vec<Action>)
|
||||
}
|
||||
});
|
||||
if let Some(index) = tab {
|
||||
let page = [Page::Library, Page::Shares, Page::Downloads, Page::Settings][index].clone();
|
||||
let page = NAV[index].clone();
|
||||
actions.push(Action::Goto(page));
|
||||
}
|
||||
}
|
||||
@@ -2069,6 +2279,7 @@ fn step_speed(speed: f64, faster: bool) -> f64 {
|
||||
fn shortcuts(
|
||||
ctx: &egui::Context,
|
||||
fullscreen: bool,
|
||||
drawer: bool,
|
||||
playing: Option<PlayerKeys>,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
@@ -2098,6 +2309,7 @@ fn shortcuts(
|
||||
Key::S,
|
||||
Key::OpenBracket,
|
||||
Key::CloseBracket,
|
||||
Key::E,
|
||||
Key::Escape,
|
||||
]
|
||||
.into_iter()
|
||||
@@ -2141,6 +2353,9 @@ fn shortcuts(
|
||||
// Escape leaves fullscreen first and the page second, which is what
|
||||
// it does everywhere else and what stops one press from both
|
||||
// un-maximising the window and hiding the film.
|
||||
Key::E => actions.push(Action::ToggleEpisodes),
|
||||
// The episode list is the innermost thing open, so it goes first.
|
||||
Key::Escape if drawer => actions.push(Action::ToggleEpisodes),
|
||||
Key::Escape if fullscreen => actions.push(Action::ToggleFullscreen),
|
||||
Key::Escape => actions.push(Action::LeavePlayer),
|
||||
_ => {}
|
||||
@@ -2205,6 +2420,7 @@ mod tests {
|
||||
genres: Vec::new(),
|
||||
episodes: None,
|
||||
url: None,
|
||||
details: None,
|
||||
});
|
||||
(
|
||||
key.into(),
|
||||
@@ -2294,9 +2510,20 @@ mod tests {
|
||||
record("added", Some("w")),
|
||||
]
|
||||
.into();
|
||||
// The tile and the cover are both drawn from the poster here; the
|
||||
// wide art has nothing to be.
|
||||
assert_eq!(
|
||||
changed_art(&before, &after),
|
||||
vec!["added", "dropped", "found", "moved"]
|
||||
vec![
|
||||
"added",
|
||||
"dropped",
|
||||
"found",
|
||||
"moved",
|
||||
"poster:added",
|
||||
"poster:dropped",
|
||||
"poster:found",
|
||||
"poster:moved"
|
||||
]
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -160,6 +160,11 @@ struct PartialMarker {
|
||||
/// difference is VRAM held for every title in the library.
|
||||
const THUMBNAIL_MAX_EDGE: u32 = 640;
|
||||
|
||||
/// The longest edge of a picture drawn across the whole window. 1920 is what
|
||||
/// a provider's fanart is, so nothing is scaled up and a 4K screen gets the
|
||||
/// best there is.
|
||||
pub const WIDE_MAX_EDGE: u32 = 1920;
|
||||
|
||||
/// What the background side tells the UI.
|
||||
pub enum Event {
|
||||
/// The share list changed on disk.
|
||||
@@ -175,8 +180,9 @@ pub enum Event {
|
||||
},
|
||||
/// Shares could not be opened at all.
|
||||
ConnectFailed(String),
|
||||
/// The catalog was re-read.
|
||||
LibraryLoaded(Library),
|
||||
/// The catalog was re-read: the library, and when each title last
|
||||
/// gained a file.
|
||||
LibraryLoaded(Library, HashMap<String, i64>),
|
||||
/// A crawl finished for one share.
|
||||
Crawled {
|
||||
share_id: String,
|
||||
@@ -307,6 +313,10 @@ pub struct Engine {
|
||||
/// whenever the settings change, so nothing holds a client for a provider
|
||||
/// the viewer has switched away from.
|
||||
metadata: Arc<Mutex<Enrichment>>,
|
||||
/// False until [`Engine::metadata`] holds what the settings resolve to.
|
||||
/// Only ever false at launch, while the API key is read off the UI
|
||||
/// thread; see [`Engine::new`].
|
||||
enrichment_settled: Arc<tokio::sync::watch::Sender<bool>>,
|
||||
/// Volume, mute and language preferences. Held here rather than in the UI
|
||||
/// because a new player is built from them, and the player is started from
|
||||
/// a background event.
|
||||
@@ -402,6 +412,21 @@ impl Engine {
|
||||
Appearance::default()
|
||||
});
|
||||
|
||||
// A provider with an API key needs it out of the OS credential store,
|
||||
// and that can be a D-Bus round trip to a keyring that has to unlock
|
||||
// first — not something to hold the first frame for. Built on the
|
||||
// blocking pool instead; until it lands, everything that needs the
|
||||
// provider waits for it rather than concluding there is none.
|
||||
let deferred = config.enabled && config.provider.needs_api_key();
|
||||
let enrichment = if deferred {
|
||||
Enrichment {
|
||||
config: config.clone(),
|
||||
service: None,
|
||||
}
|
||||
} else {
|
||||
Enrichment::build(config.clone())
|
||||
};
|
||||
|
||||
let track_prefs = catalog.all_title_track_prefs().unwrap_or_else(|error| {
|
||||
tracing::warn!("read show track preferences: {error}");
|
||||
HashMap::new()
|
||||
@@ -415,7 +440,8 @@ impl Engine {
|
||||
catalog: Arc::new(Mutex::new(catalog)),
|
||||
thumbnails: Arc::new(tokio::sync::Semaphore::new(THUMBNAIL_CONCURRENCY)),
|
||||
lookups: Arc::new(tokio::sync::Semaphore::new(LOOKUP_CONCURRENCY)),
|
||||
metadata: Arc::new(Mutex::new(Enrichment::build(config))),
|
||||
metadata: Arc::new(Mutex::new(enrichment)),
|
||||
enrichment_settled: Arc::new(tokio::sync::watch::channel(!deferred).0),
|
||||
prefs: Arc::new(Mutex::new(prefs)),
|
||||
appearance: Arc::new(Mutex::new(appearance)),
|
||||
track_prefs: Arc::new(Mutex::new(track_prefs)),
|
||||
@@ -428,6 +454,12 @@ impl Engine {
|
||||
events,
|
||||
ctx,
|
||||
};
|
||||
if deferred {
|
||||
let deferred = engine.clone();
|
||||
engine.runtime.spawn_blocking(move || {
|
||||
deferred.install_enrichment(Enrichment::build(config), true);
|
||||
});
|
||||
}
|
||||
Ok((engine, receiver))
|
||||
}
|
||||
|
||||
@@ -537,12 +569,15 @@ impl Engine {
|
||||
|
||||
// ---------------------------------------------------------------- shares
|
||||
|
||||
/// Re-read the share list.
|
||||
/// Re-read the share list, off the UI thread: it is a file read, and at
|
||||
/// launch the first frame should not wait on the disk for it.
|
||||
pub fn load_shares(&self) {
|
||||
match self.store.list() {
|
||||
Ok(shares) => self.emit(Event::Shares(shares)),
|
||||
Err(error) => self.fail("read the share list", error),
|
||||
}
|
||||
let engine = self.clone();
|
||||
self.runtime
|
||||
.spawn_blocking(move || match engine.store.list() {
|
||||
Ok(shares) => engine.emit(Event::Shares(shares)),
|
||||
Err(error) => engine.fail("read the share list", error),
|
||||
});
|
||||
}
|
||||
|
||||
/// Add a share, then open and crawl it — which is what "add" means to
|
||||
@@ -710,15 +745,16 @@ impl Engine {
|
||||
self.runtime.spawn_blocking(move || {
|
||||
let result = {
|
||||
let catalog = engine.catalog.lock();
|
||||
catalog
|
||||
.all_files()
|
||||
.and_then(|files| Ok((files, catalog.all_watch_states()?)))
|
||||
catalog.all_files().and_then(|files| {
|
||||
Ok((files, catalog.all_watch_states()?, catalog.first_seen()?))
|
||||
})
|
||||
};
|
||||
match result {
|
||||
Ok((files, watch)) => {
|
||||
Ok((files, watch, first_seen)) => {
|
||||
let library = Library::build(files, &watch);
|
||||
let targets = download_targets(&library);
|
||||
engine.emit(Event::LibraryLoaded(library));
|
||||
let added = library.added_at(&first_seen);
|
||||
engine.emit(Event::LibraryLoaded(library, added));
|
||||
engine.refresh_offline(Some(targets));
|
||||
}
|
||||
Err(error) => engine.fail("read the catalog", error),
|
||||
@@ -1742,6 +1778,38 @@ impl Engine {
|
||||
});
|
||||
}
|
||||
|
||||
/// Put `built` in place and mark the provider settled.
|
||||
///
|
||||
/// `only_if_unsettled` is for the launch-time build: a settings change
|
||||
/// that landed while it was reading the keyring is newer, and wins. The
|
||||
/// check and the write share the lock, so the two cannot interleave.
|
||||
fn install_enrichment(&self, built: Enrichment, only_if_unsettled: bool) {
|
||||
let mut slot = self.metadata.lock();
|
||||
if only_if_unsettled && *self.enrichment_settled.borrow() {
|
||||
return;
|
||||
}
|
||||
*slot = built;
|
||||
self.enrichment_settled.send_replace(true);
|
||||
}
|
||||
|
||||
/// The provider, once the launch-time build has settled. `None` when
|
||||
/// enrichment is off or has no usable key.
|
||||
async fn metadata_service(&self) -> Option<MetadataService> {
|
||||
let mut settled = self.enrichment_settled.subscribe();
|
||||
let _ = settled.wait_for(|settled| *settled).await;
|
||||
self.metadata.lock().service.clone()
|
||||
}
|
||||
|
||||
/// Why there is no provider, for the viewer who asked for one.
|
||||
fn no_service_reason(&self) -> String {
|
||||
let config = self.metadata_config();
|
||||
if !config.enabled {
|
||||
"turn on metadata enrichment first".into()
|
||||
} else {
|
||||
format!("{} needs an API key", config.provider.label())
|
||||
}
|
||||
}
|
||||
|
||||
/// The enrichment settings as they stand.
|
||||
pub fn metadata_config(&self) -> MetadataConfig {
|
||||
self.metadata.lock().config.clone()
|
||||
@@ -1774,7 +1842,7 @@ impl Engine {
|
||||
tracing::warn!("clear stored metadata: {error}");
|
||||
}
|
||||
|
||||
*engine.metadata.lock() = Enrichment::build(config.clone());
|
||||
engine.install_enrichment(Enrichment::build(config.clone()), false);
|
||||
engine.emit(Event::MetadataConfig(config));
|
||||
engine.load_metadata();
|
||||
});
|
||||
@@ -1788,7 +1856,7 @@ impl Engine {
|
||||
return engine.fail("store the API key", error);
|
||||
}
|
||||
let config = engine.metadata_config();
|
||||
*engine.metadata.lock() = Enrichment::build(config);
|
||||
engine.install_enrichment(Enrichment::build(config), false);
|
||||
engine.emit(Event::Status(if key.trim().is_empty() {
|
||||
format!("cleared the {} key", provider.label())
|
||||
} else {
|
||||
@@ -1837,54 +1905,30 @@ impl Engine {
|
||||
}
|
||||
|
||||
async fn run_match(&self, titles: Vec<Title>, force: bool) {
|
||||
let Some(service) = self.metadata.lock().service.clone() else {
|
||||
let config = self.metadata_config();
|
||||
return self.emit(Event::Error(if !config.enabled {
|
||||
"turn on metadata enrichment first".into()
|
||||
} else {
|
||||
format!("{} needs an API key", config.provider.label())
|
||||
}));
|
||||
let Some(service) = self.metadata_service().await else {
|
||||
return self.emit(Event::Error(self.no_service_reason()));
|
||||
};
|
||||
let provider = service.provider();
|
||||
|
||||
let (stored, listed) = {
|
||||
let (stored, enriched) = {
|
||||
let catalog = self.catalog.lock();
|
||||
match catalog
|
||||
.all_metadata()
|
||||
.and_then(|stored| Ok((stored, catalog.episode_metadata_ages()?)))
|
||||
.and_then(|stored| Ok((stored, catalog.enrichment_ages()?)))
|
||||
{
|
||||
Ok(pair) => pair,
|
||||
Err(error) => return self.fail("read stored metadata", error),
|
||||
}
|
||||
};
|
||||
|
||||
// Two kinds of work, and the difference is a request saved: a title
|
||||
// that already has a good match but no episode list needs the episode
|
||||
// request only — searching for it again would ask the provider
|
||||
// something it has already answered.
|
||||
let mut pending: Vec<Work> = Vec::new();
|
||||
for title in titles {
|
||||
let record = stored.get(&title.key);
|
||||
// A hand-picked entry is never searched for again, not even by
|
||||
// "match again" — that button means "the automatic answers are
|
||||
// wrong", and re-deciding the one title the viewer already fixed by
|
||||
// hand is the opposite of what they asked for. Its episode list is
|
||||
// still fetched below if it is missing.
|
||||
let pinned = record.is_some_and(|record| record.manual && record.provider == provider);
|
||||
if !pinned && (force || !pstr_meta::service::is_usable(record, provider)) {
|
||||
pending.push(Work::Match(title));
|
||||
continue;
|
||||
}
|
||||
let has_episodes = listed
|
||||
.get(&title.key)
|
||||
.is_some_and(|(asked, _)| *asked == provider);
|
||||
if let Some(found) = record.and_then(|record| record.metadata.clone())
|
||||
&& !has_episodes
|
||||
{
|
||||
pending.push(Work::Episodes(title, Box::new(found)));
|
||||
}
|
||||
}
|
||||
|
||||
let pending = pstr_meta::service::plan(
|
||||
titles,
|
||||
&stored,
|
||||
&enriched,
|
||||
provider,
|
||||
service.has_details(),
|
||||
force,
|
||||
);
|
||||
if pending.is_empty() {
|
||||
return self.emit(Event::Status("everything is already matched".into()));
|
||||
}
|
||||
@@ -1903,25 +1947,7 @@ impl Engine {
|
||||
let Ok(_permit) = permits.acquire().await else {
|
||||
return None;
|
||||
};
|
||||
Some(match work {
|
||||
Work::Match(title) => match service.record(title).await {
|
||||
Ok(record) => {
|
||||
// Only for a title that matched: there is no id to
|
||||
// ask about otherwise.
|
||||
let episodes = match &record.metadata {
|
||||
Some(found) => service.title_episodes(title, found).await,
|
||||
None => Vec::new(),
|
||||
};
|
||||
Ok((record.title_key.clone(), Some(record), episodes))
|
||||
}
|
||||
Err(error) => Err(error),
|
||||
},
|
||||
Work::Episodes(title, found) => Ok((
|
||||
title.key.clone(),
|
||||
None,
|
||||
service.title_episodes(title, found).await,
|
||||
)),
|
||||
})
|
||||
Some(service.work(work).await)
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1929,8 +1955,8 @@ impl Engine {
|
||||
let mut episodes_found = 0usize;
|
||||
while let Some(result) = lookups.next().await {
|
||||
match result {
|
||||
Some(Ok((title_key, record, episodes))) => {
|
||||
if let Some(record) = &record {
|
||||
Some(Ok(outcome)) => {
|
||||
if let Some(record) = &outcome.record {
|
||||
if record.metadata.is_some() {
|
||||
matched += 1;
|
||||
} else {
|
||||
@@ -1942,16 +1968,16 @@ impl Engine {
|
||||
tracing::warn!("store metadata for {}: {error}", record.title_key);
|
||||
}
|
||||
}
|
||||
if !episodes.is_empty() {
|
||||
episodes_found += episodes.len();
|
||||
let stored = self.catalog.lock().set_episode_metadata(
|
||||
&title_key,
|
||||
if let Some(enrichment) = &outcome.enrichment {
|
||||
episodes_found += enrichment.episodes.len();
|
||||
let stored = self.catalog.lock().set_enrichment(
|
||||
&outcome.title_key,
|
||||
provider,
|
||||
now(),
|
||||
&episodes,
|
||||
enrichment,
|
||||
);
|
||||
if let Err(error) = stored {
|
||||
tracing::warn!("store episodes for {title_key}: {error}");
|
||||
tracing::warn!("store enrichment for {}: {error}", outcome.title_key);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1979,21 +2005,13 @@ impl Engine {
|
||||
/// Unscored and unfiltered — see [`MetadataService::search`]. Nothing is
|
||||
/// stored: this is a look, and only [`Engine::choose_match`] writes.
|
||||
pub fn search_matches(&self, title_key: String, term: String, kind: TitleKind) {
|
||||
let Some(service) = self.metadata.lock().service.clone() else {
|
||||
let config = self.metadata_config();
|
||||
return self.emit(Event::MatchSearchFailed {
|
||||
title_key,
|
||||
error: if !config.enabled {
|
||||
"turn on metadata enrichment first".into()
|
||||
} else {
|
||||
format!("{} needs an API key", config.provider.label())
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
let engine = self.clone();
|
||||
let permits = Arc::clone(&self.lookups);
|
||||
self.runtime.spawn(async move {
|
||||
let Some(service) = engine.metadata_service().await else {
|
||||
let error = engine.no_service_reason();
|
||||
return engine.emit(Event::MatchSearchFailed { title_key, error });
|
||||
};
|
||||
// The same permit the batch run takes: a viewer typing in the search
|
||||
// box while a match run is going must not be what earns the 429.
|
||||
let Ok(_permit) = permits.acquire().await else {
|
||||
@@ -2019,29 +2037,32 @@ impl Engine {
|
||||
/// to the next match run, because the point of choosing an entry by hand is
|
||||
/// usually that its episode names were wrong too.
|
||||
pub fn choose_match(&self, title: Title, found: pstr_core::metadata::TitleMetadata) {
|
||||
let Some(service) = self.metadata.lock().service.clone() else {
|
||||
return self.emit(Event::Error("turn on metadata enrichment first".into()));
|
||||
};
|
||||
|
||||
let engine = self.clone();
|
||||
self.runtime.spawn(async move {
|
||||
let Some(service) = engine.metadata_service().await else {
|
||||
return engine.emit(Event::Error(engine.no_service_reason()));
|
||||
};
|
||||
let name = found.name.clone();
|
||||
let record = service.chosen(title.key.clone(), found.clone());
|
||||
if let Err(error) = engine.catalog.lock().set_metadata(&record) {
|
||||
return engine.fail("store the match", error);
|
||||
}
|
||||
|
||||
let episodes = service.title_episodes(&title, &found).await;
|
||||
if !episodes.is_empty() {
|
||||
let stored = engine.catalog.lock().set_episode_metadata(
|
||||
&title.key,
|
||||
service.provider(),
|
||||
now(),
|
||||
&episodes,
|
||||
);
|
||||
if let Err(error) = stored {
|
||||
tracing::warn!("store episodes for {}: {error}", title.key);
|
||||
// A failure leaves the title un-enriched, and the next match run
|
||||
// asks again.
|
||||
match service.enrich(&title, &found).await {
|
||||
Ok(enrichment) => {
|
||||
let stored = engine.catalog.lock().set_enrichment(
|
||||
&title.key,
|
||||
service.provider(),
|
||||
now(),
|
||||
&enrichment,
|
||||
);
|
||||
if let Err(error) = stored {
|
||||
tracing::warn!("store enrichment for {}: {error}", title.key);
|
||||
}
|
||||
}
|
||||
Err(error) => tracing::warn!("enrich {}: {error}", title.key),
|
||||
}
|
||||
|
||||
engine.emit(Event::Status(format!("{} is now {name}", title.name)));
|
||||
@@ -2081,15 +2102,26 @@ impl Engine {
|
||||
/// paths invalidates by itself and the same picture shared by two titles is
|
||||
/// fetched once.
|
||||
pub fn request_poster(&self, title_key: String, url: String) {
|
||||
self.request_art(title_key, url, THUMBNAIL_MAX_EDGE);
|
||||
}
|
||||
|
||||
/// [`Engine::request_poster`], for a picture drawn across the window —
|
||||
/// the library's hero, the title page's band — kept at up to `max_edge`
|
||||
/// pixels rather than a tile's 640. A 640 px still stretched to 1600 was
|
||||
/// most of why those looked soft.
|
||||
pub fn request_art(&self, title_key: String, url: String, max_edge: u32) {
|
||||
let engine = self.clone();
|
||||
let path = self
|
||||
.dirs
|
||||
.poster_cache()
|
||||
.join(format!("{}.img", digest(&url)));
|
||||
// A size of its own on disk: the tile-sized copy of the same URL is
|
||||
// already there under the plain name, scaled down.
|
||||
let name = match max_edge {
|
||||
THUMBNAIL_MAX_EDGE => format!("{}.img", digest(&url)),
|
||||
edge => format!("{}-{edge}.img", digest(&url)),
|
||||
};
|
||||
let path = self.dirs.poster_cache().join(name);
|
||||
|
||||
self.runtime.spawn(async move {
|
||||
if let Ok(bytes) = tokio::fs::read(&path).await {
|
||||
match decode_thumbnail(&bytes) {
|
||||
match decode_scaled(&bytes, max_edge) {
|
||||
Ok(decoded) => {
|
||||
if let Some(smaller) = &decoded.smaller {
|
||||
store_image(&path, smaller).await;
|
||||
@@ -2103,7 +2135,7 @@ impl Engine {
|
||||
}
|
||||
}
|
||||
|
||||
let Some(service) = engine.metadata.lock().service.clone() else {
|
||||
let Some(service) = engine.metadata_service().await else {
|
||||
// Enrichment was turned off between the request and now.
|
||||
return engine.emit(Event::PosterMissing { key: title_key });
|
||||
};
|
||||
@@ -2116,7 +2148,7 @@ impl Engine {
|
||||
}
|
||||
};
|
||||
|
||||
match decode_thumbnail(&bytes) {
|
||||
match decode_scaled(&bytes, max_edge) {
|
||||
Ok(decoded) => {
|
||||
store_image(&path, decoded.smaller.as_deref().unwrap_or(&bytes)).await;
|
||||
engine.emit(Event::Poster {
|
||||
@@ -2155,15 +2187,6 @@ fn digest(url: &str) -> String {
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// The cache and texture key for a file's poster.
|
||||
/// One title's worth of work in a match run.
|
||||
enum Work {
|
||||
/// Search for it, and take its episodes if it matches.
|
||||
Match(Title),
|
||||
/// It is already matched; only the episode list is missing.
|
||||
Episodes(Title, Box<pstr_core::metadata::TitleMetadata>),
|
||||
}
|
||||
|
||||
/// Unix seconds, for the "when was this asked" columns.
|
||||
fn now() -> i64 {
|
||||
std::time::SystemTime::now()
|
||||
@@ -2301,9 +2324,14 @@ struct Decoded {
|
||||
/// copy is handed back so the cache holds that instead, and the next launch
|
||||
/// decodes a picture already the size it is drawn at.
|
||||
fn decode_thumbnail(bytes: &[u8]) -> anyhow::Result<Decoded> {
|
||||
decode_scaled(bytes, THUMBNAIL_MAX_EDGE)
|
||||
}
|
||||
|
||||
/// [`decode_thumbnail`], to `max_edge` rather than a tile's size.
|
||||
fn decode_scaled(bytes: &[u8], max_edge: u32) -> anyhow::Result<Decoded> {
|
||||
let decoded = image::load_from_memory(bytes)?;
|
||||
let (decoded, smaller) = if decoded.width().max(decoded.height()) > THUMBNAIL_MAX_EDGE {
|
||||
let scaled = decoded.thumbnail(THUMBNAIL_MAX_EDGE, THUMBNAIL_MAX_EDGE);
|
||||
let (decoded, smaller) = if decoded.width().max(decoded.height()) > max_edge {
|
||||
let scaled = decoded.thumbnail(max_edge, max_edge);
|
||||
let encoded = encode_for_cache(&scaled);
|
||||
(scaled, encoded)
|
||||
} else {
|
||||
|
||||
@@ -0,0 +1,350 @@
|
||||
//! One window at a time.
|
||||
//!
|
||||
//! A second launch hands what it was started with — a share link, or nothing
|
||||
//! — to the window already open, and exits. Without this, a second click on
|
||||
//! the launcher opened a second window on the same catalog: two engines
|
||||
//! writing the same watch state, two crawls of the same shares, and two films
|
||||
//! playing over each other.
|
||||
//!
|
||||
//! The channel between the two is a Unix socket in the user's runtime
|
||||
//! directory, or a named pipe on Windows. Anything that goes wrong setting it
|
||||
//! up is logged and the app runs on without it: a second window is a nuisance,
|
||||
//! and a launch that refuses to start because of this is a bug.
|
||||
|
||||
use std::sync::mpsc::{Receiver, Sender, channel};
|
||||
|
||||
use pstr_core::config::AppDirs;
|
||||
|
||||
/// What a later launch asks of the window already open.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub enum Request {
|
||||
/// Come to the front.
|
||||
Raise,
|
||||
/// Come to the front, with this share link in the Add form.
|
||||
AddShare(String),
|
||||
}
|
||||
|
||||
impl Request {
|
||||
/// What a launch was started with: the first argument that is a share
|
||||
/// link, so `proton-stream 'https://drive.proton.me/urls/…#…'` adds it.
|
||||
pub fn from_args(args: impl IntoIterator<Item = String>) -> Self {
|
||||
args.into_iter()
|
||||
.map(|arg| arg.trim().to_owned())
|
||||
.find(|arg| pstr_core::shares::share_token(arg).is_ok())
|
||||
.map_or(Self::Raise, Self::AddShare)
|
||||
}
|
||||
|
||||
/// One line on the wire.
|
||||
fn encode(&self) -> String {
|
||||
match self {
|
||||
Self::Raise => "raise\n".to_owned(),
|
||||
Self::AddShare(url) => format!("add {url}\n"),
|
||||
}
|
||||
}
|
||||
|
||||
/// The other end of [`Request::encode`]. Anything else is ignored rather
|
||||
/// than guessed at — and a link that is not a share link is not one to
|
||||
/// put in the form.
|
||||
fn decode(line: &str) -> Option<Self> {
|
||||
let line = line.trim();
|
||||
if line == "raise" {
|
||||
return Some(Self::Raise);
|
||||
}
|
||||
let url = line.strip_prefix("add ")?.trim();
|
||||
pstr_core::shares::share_token(url)
|
||||
.is_ok()
|
||||
.then(|| Self::AddShare(url.to_owned()))
|
||||
}
|
||||
}
|
||||
|
||||
/// How long a launch spends handing its request over before giving up on it.
|
||||
const HAND_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(2);
|
||||
/// The most a request may be. A share link is a few hundred bytes.
|
||||
const MOST: u64 = 8 * 1024;
|
||||
|
||||
/// The outcome of [`claim`].
|
||||
pub enum Claim {
|
||||
/// This is the window. The listener answers later launches.
|
||||
First(Listener),
|
||||
/// A window was already open and has the request. This launch is done.
|
||||
Handed,
|
||||
}
|
||||
|
||||
/// Become the one window, or hand `request` to the one there is.
|
||||
pub fn claim(runtime: &tokio::runtime::Runtime, dirs: &AppDirs, request: &Request) -> Claim {
|
||||
platform::claim(runtime, dirs, request)
|
||||
}
|
||||
|
||||
/// Requests from later launches, until the process ends.
|
||||
pub struct Listener {
|
||||
inner: Option<platform::Inner>,
|
||||
}
|
||||
|
||||
impl Listener {
|
||||
/// Start answering. `first` is this launch's own request, which arrives
|
||||
/// through the same channel as the rest so there is one place to act on it.
|
||||
pub fn serve(
|
||||
self,
|
||||
runtime: &tokio::runtime::Runtime,
|
||||
ctx: &egui::Context,
|
||||
first: Request,
|
||||
) -> Receiver<Request> {
|
||||
let (sender, receiver) = channel();
|
||||
if first != Request::Raise {
|
||||
let _ = sender.send(first);
|
||||
}
|
||||
if let Some(inner) = self.inner {
|
||||
platform::serve(
|
||||
inner,
|
||||
runtime,
|
||||
Deliver {
|
||||
sender,
|
||||
ctx: ctx.clone(),
|
||||
},
|
||||
);
|
||||
}
|
||||
receiver
|
||||
}
|
||||
}
|
||||
|
||||
/// Where a received request goes: the app's queue, and a repaint so it is
|
||||
/// acted on now rather than when the pointer next moves.
|
||||
struct Deliver {
|
||||
sender: Sender<Request>,
|
||||
ctx: egui::Context,
|
||||
}
|
||||
|
||||
impl Deliver {
|
||||
fn line(&self, text: &str) {
|
||||
let Some(request) = Request::decode(text) else {
|
||||
tracing::debug!("instance: ignored a request that did not parse");
|
||||
return;
|
||||
};
|
||||
let _ = self.sender.send(request);
|
||||
self.ctx.request_repaint();
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
mod platform {
|
||||
use std::io::{Read, Write};
|
||||
use std::os::unix::fs::PermissionsExt;
|
||||
use std::os::unix::net::{UnixListener, UnixStream};
|
||||
use std::path::PathBuf;
|
||||
|
||||
use super::{AppDirs, Claim, Deliver, HAND_TIMEOUT, Listener, MOST, Request};
|
||||
|
||||
pub struct Inner(UnixListener);
|
||||
|
||||
/// In the runtime directory where there is one: it is the user's alone and
|
||||
/// emptied at logout, which is exactly the life a socket should have.
|
||||
fn socket(dirs: &AppDirs) -> PathBuf {
|
||||
directories::BaseDirs::new()
|
||||
.and_then(|base| base.runtime_dir().map(std::path::Path::to_path_buf))
|
||||
.unwrap_or_else(|| dirs.cache.clone())
|
||||
.join("io.narl.proton-stream.sock")
|
||||
}
|
||||
|
||||
pub fn claim(_: &tokio::runtime::Runtime, dirs: &AppDirs, request: &Request) -> Claim {
|
||||
let path = socket(dirs);
|
||||
if let Ok(mut stream) = UnixStream::connect(&path) {
|
||||
let _ = stream.set_write_timeout(Some(HAND_TIMEOUT));
|
||||
match stream.write_all(request.encode().as_bytes()) {
|
||||
Ok(()) => return Claim::Handed,
|
||||
Err(error) => tracing::warn!("instance: hand over to the open window: {error}"),
|
||||
}
|
||||
}
|
||||
// Nobody answered, so a socket file still there is left over from a
|
||||
// window that did not exit cleanly.
|
||||
let _ = std::fs::remove_file(&path);
|
||||
let listener = match UnixListener::bind(&path) {
|
||||
Ok(listener) => listener,
|
||||
Err(error) => {
|
||||
tracing::warn!("instance: listen at {}: {error}", path.display());
|
||||
return Claim::First(Listener { inner: None });
|
||||
}
|
||||
};
|
||||
// The runtime directory is private already; the cache fallback is
|
||||
// not necessarily, and a share link is a secret.
|
||||
let _ = std::fs::set_permissions(&path, std::fs::Permissions::from_mode(0o600));
|
||||
Claim::First(Listener {
|
||||
inner: Some(Inner(listener)),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn serve(inner: Inner, _: &tokio::runtime::Runtime, deliver: Deliver) {
|
||||
let spawned = std::thread::Builder::new()
|
||||
.name("instance".into())
|
||||
.spawn(move || {
|
||||
for stream in inner.0.incoming() {
|
||||
let Ok(stream) = stream else { continue };
|
||||
let _ = stream.set_read_timeout(Some(HAND_TIMEOUT));
|
||||
let mut text = String::new();
|
||||
if stream.take(MOST).read_to_string(&mut text).is_ok() {
|
||||
deliver.line(&text);
|
||||
}
|
||||
}
|
||||
});
|
||||
if let Err(error) = spawned {
|
||||
tracing::warn!("instance thread: {error}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
mod platform {
|
||||
use std::hash::{BuildHasher, Hasher};
|
||||
use std::io::Write;
|
||||
|
||||
use tokio::io::AsyncReadExt;
|
||||
use tokio::net::windows::named_pipe::{NamedPipeServer, ServerOptions};
|
||||
|
||||
use super::{AppDirs, Claim, Deliver, HAND_TIMEOUT, Listener, MOST, Request};
|
||||
|
||||
pub struct Inner {
|
||||
name: String,
|
||||
first: NamedPipeServer,
|
||||
}
|
||||
|
||||
/// The pipe's name. Pipe names are machine-wide, so a fixed one could be
|
||||
/// taken first by another account on the same machine, which would then
|
||||
/// be handed this user's share links. The name carries a random part kept
|
||||
/// in this user's own config directory, which nobody else can read.
|
||||
fn pipe(dirs: &AppDirs) -> String {
|
||||
let path = dirs.config.join("instance.key");
|
||||
let key = std::fs::read_to_string(&path)
|
||||
.ok()
|
||||
.map(|key| key.trim().to_owned())
|
||||
.filter(|key| key.len() == 32 && key.bytes().all(|b| b.is_ascii_hexdigit()))
|
||||
.unwrap_or_else(|| {
|
||||
// `RandomState` is seeded from the OS's random source, once
|
||||
// per process and stepped per instance after that.
|
||||
let mut key = String::new();
|
||||
for _ in 0..2 {
|
||||
let word = std::collections::hash_map::RandomState::new()
|
||||
.build_hasher()
|
||||
.finish();
|
||||
key.push_str(&format!("{word:016x}"));
|
||||
}
|
||||
if let Err(error) = std::fs::write(&path, &key) {
|
||||
tracing::warn!("instance: store the pipe key: {error}");
|
||||
}
|
||||
key
|
||||
});
|
||||
format!(r"\\.\pipe\io.narl.proton-stream.{key}")
|
||||
}
|
||||
|
||||
fn server(name: &str, first: bool) -> std::io::Result<NamedPipeServer> {
|
||||
ServerOptions::new()
|
||||
.first_pipe_instance(first)
|
||||
.reject_remote_clients(true)
|
||||
.access_outbound(false)
|
||||
.create(name)
|
||||
}
|
||||
|
||||
pub fn claim(runtime: &tokio::runtime::Runtime, dirs: &AppDirs, request: &Request) -> Claim {
|
||||
let name = pipe(dirs);
|
||||
// Registering a pipe with tokio needs its reactor.
|
||||
let _entered = runtime.enter();
|
||||
match server(&name, true) {
|
||||
Ok(first) => Claim::First(Listener {
|
||||
inner: Some(Inner { name, first }),
|
||||
}),
|
||||
// Taken: there is a window. Hand it the request.
|
||||
Err(_) => {
|
||||
let started = std::time::Instant::now();
|
||||
loop {
|
||||
match std::fs::OpenOptions::new().write(true).open(&name) {
|
||||
Ok(mut pipe) => {
|
||||
if let Err(error) = pipe.write_all(request.encode().as_bytes()) {
|
||||
tracing::warn!("instance: hand over to the open window: {error}");
|
||||
}
|
||||
return Claim::Handed;
|
||||
}
|
||||
// Every instance busy with another launch: wait a turn.
|
||||
Err(_) if started.elapsed() < HAND_TIMEOUT => {
|
||||
std::thread::sleep(std::time::Duration::from_millis(50));
|
||||
}
|
||||
Err(error) => {
|
||||
tracing::warn!("instance: reach the open window: {error}");
|
||||
return Claim::First(Listener { inner: None });
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn serve(inner: Inner, runtime: &tokio::runtime::Runtime, deliver: Deliver) {
|
||||
runtime.spawn(async move {
|
||||
let Inner { name, mut first } = inner;
|
||||
loop {
|
||||
if first.connect().await.is_err() {
|
||||
continue;
|
||||
}
|
||||
let connected = first;
|
||||
// The next instance is up before this one is read, so a launch
|
||||
// right behind this one finds a pipe to connect to.
|
||||
first = match server(&name, false) {
|
||||
Ok(next) => next,
|
||||
Err(error) => {
|
||||
tracing::warn!("instance: reopen the pipe: {error}");
|
||||
return;
|
||||
}
|
||||
};
|
||||
let mut text = String::new();
|
||||
let mut limited = connected.take(MOST);
|
||||
let read = limited.read_to_string(&mut text);
|
||||
if let Ok(Ok(_)) = tokio::time::timeout(HAND_TIMEOUT, read).await {
|
||||
deliver.line(&text);
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(not(any(unix, windows)))]
|
||||
mod platform {
|
||||
use super::{AppDirs, Claim, Deliver, Listener, Request};
|
||||
|
||||
pub struct Inner;
|
||||
|
||||
pub fn claim(_: &tokio::runtime::Runtime, _: &AppDirs, _: &Request) -> Claim {
|
||||
Claim::First(Listener { inner: None })
|
||||
}
|
||||
|
||||
pub fn serve(_: Inner, _: &tokio::runtime::Runtime, _: Deliver) {}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
const LINK: &str = "https://drive.proton.me/urls/ABCDEFGHIJ#fragmentsecret";
|
||||
|
||||
#[test]
|
||||
fn a_launch_with_a_share_link_asks_for_it_to_be_added() {
|
||||
let args = ["--verbose".to_owned(), format!(" {LINK} ")];
|
||||
assert_eq!(Request::from_args(args), Request::AddShare(LINK.to_owned()));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_launch_with_no_share_link_only_raises_the_window() {
|
||||
let args = ["https://example.com/".to_owned()];
|
||||
assert_eq!(Request::from_args(args), Request::Raise);
|
||||
assert_eq!(Request::from_args(Vec::new()), Request::Raise);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_request_survives_the_wire() {
|
||||
for request in [Request::Raise, Request::AddShare(LINK.to_owned())] {
|
||||
assert_eq!(Request::decode(&request.encode()), Some(request));
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_line_that_is_not_a_request_is_ignored() {
|
||||
assert_eq!(Request::decode("add https://example.com/"), None);
|
||||
assert_eq!(Request::decode("open the pod bay doors"), None);
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@ pub mod app;
|
||||
pub mod desktop_prefs;
|
||||
pub mod engine;
|
||||
pub mod inhibit;
|
||||
pub mod instance;
|
||||
pub mod media;
|
||||
pub mod notify;
|
||||
pub mod pacing;
|
||||
|
||||
@@ -31,9 +31,27 @@ fn main() -> anyhow::Result<()> {
|
||||
);
|
||||
let dirs = AppDirs::ensure().context("resolve app directories")?;
|
||||
|
||||
// Before the window: a second launch hands its request to the first and
|
||||
// never opens one.
|
||||
let request = pstr_app::instance::Request::from_args(std::env::args().skip(1));
|
||||
let instance = match pstr_app::instance::claim(&runtime, &dirs, &request) {
|
||||
pstr_app::instance::Claim::First(listener) => listener,
|
||||
pstr_app::instance::Claim::Handed => {
|
||||
tracing::info!("handed over to the window already open");
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
|
||||
let window = pstr_app::window::WindowState::load(&dirs.window_file());
|
||||
let mut viewport = egui::ViewportBuilder::default();
|
||||
// X11 and Windows take the icon from the window. Wayland ignores this and
|
||||
// looks the app id up in the installed desktop entry instead.
|
||||
match eframe::icon_data::from_png_bytes(include_bytes!("../assets/icon-256.png")) {
|
||||
Ok(icon) => viewport = viewport.with_icon(icon),
|
||||
Err(error) => tracing::debug!("window icon: {error}"),
|
||||
}
|
||||
let mut options = eframe::NativeOptions {
|
||||
viewport: egui::ViewportBuilder::default()
|
||||
viewport: viewport
|
||||
.with_title("proton-stream")
|
||||
.with_inner_size(window.map_or([1180.0, 780.0], |state| [state.width, state.height]))
|
||||
.with_maximized(window.is_some_and(|state| state.maximized))
|
||||
@@ -50,7 +68,7 @@ fn main() -> anyhow::Result<()> {
|
||||
"proton-stream",
|
||||
options,
|
||||
Box::new(move |cc| {
|
||||
pstr_app::app::App::new(cc, runtime, dirs)
|
||||
pstr_app::app::App::new(cc, runtime, dirs, instance, request)
|
||||
.map(|app| Box::new(app) as Box<dyn eframe::App>)
|
||||
.map_err(|error| error.into())
|
||||
}),
|
||||
|
||||
@@ -4,41 +4,48 @@
|
||||
//! app already has the toast, and a second copy of it from the panel is noise.
|
||||
//! That rule is the caller's — see `App::notify`.
|
||||
//!
|
||||
//! Linux only, over `org.freedesktop.Notifications`. Windows wants an
|
||||
//! application id registered by an installer before a toast will show, and a
|
||||
//! notification that silently never appears is worse than none.
|
||||
//! Linux over `org.freedesktop.Notifications`; Windows as a toast. Nothing on
|
||||
//! macOS yet.
|
||||
//!
|
||||
//! A Windows toast is shown under an application id, and Windows drops a toast
|
||||
//! whose id it does not know without a word. The id is registered for the
|
||||
//! current user under `HKCU\Software\Classes\AppUserModelId` — the same
|
||||
//! registration the Windows App SDK makes for an app with no package — which
|
||||
//! works for the MSI and the portable zip alike. If that write fails, the
|
||||
//! toast goes out under PowerShell's id instead, which Windows always knows: a
|
||||
//! notification that names the wrong program beats one that never appears.
|
||||
|
||||
use std::path::Path;
|
||||
|
||||
/// Sends notifications from a thread of its own, so a notification daemon
|
||||
/// that is slow to answer never costs a frame.
|
||||
pub struct Notifier {
|
||||
#[cfg(target_os = "linux")]
|
||||
#[cfg(any(target_os = "linux", windows))]
|
||||
orders: Option<std::sync::mpsc::Sender<(String, String)>>,
|
||||
}
|
||||
|
||||
impl Notifier {
|
||||
pub fn new() -> Self {
|
||||
/// `cache` is where Windows is pointed for the toast's icon.
|
||||
pub fn new(cache: &Path) -> Self {
|
||||
let _ = cache;
|
||||
Self {
|
||||
#[cfg(target_os = "linux")]
|
||||
orders: linux::spawn(),
|
||||
#[cfg(windows)]
|
||||
orders: windows::spawn(cache.join("notification-icon.png")),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn send(&self, summary: impl Into<String>, body: impl Into<String>) {
|
||||
#[cfg(target_os = "linux")]
|
||||
#[cfg(any(target_os = "linux", windows))]
|
||||
if let Some(orders) = &self.orders {
|
||||
let _ = orders.send((summary.into(), body.into()));
|
||||
}
|
||||
#[cfg(not(target_os = "linux"))]
|
||||
#[cfg(not(any(target_os = "linux", windows)))]
|
||||
let _ = (summary.into(), body.into());
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Notifier {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(target_os = "linux")]
|
||||
mod linux {
|
||||
use std::sync::mpsc::{Sender, channel};
|
||||
@@ -93,3 +100,91 @@ mod linux {
|
||||
Some(orders)
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(windows)]
|
||||
mod windows {
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::sync::mpsc::{Sender, channel};
|
||||
|
||||
use tauri_winrt_notification::Toast;
|
||||
|
||||
/// The id toasts are shown under, and the key it is registered at.
|
||||
const APP_ID: &str = "io.narl.proton-stream";
|
||||
const ICON: &[u8] = include_bytes!("../assets/icon-256.png");
|
||||
|
||||
pub fn spawn(icon: PathBuf) -> Option<Sender<(String, String)>> {
|
||||
let (orders, receiver) = channel::<(String, String)>();
|
||||
std::thread::Builder::new()
|
||||
.name("notify".into())
|
||||
.spawn(move || {
|
||||
// Registered on first use rather than at startup: most
|
||||
// sessions never send one.
|
||||
let mut app_id: Option<&str> = None;
|
||||
for (summary, body) in receiver {
|
||||
let id = *app_id.get_or_insert_with(|| {
|
||||
let _ = std::fs::write(&icon, ICON);
|
||||
if register(&icon) {
|
||||
APP_ID
|
||||
} else {
|
||||
Toast::POWERSHELL_APP_ID
|
||||
}
|
||||
});
|
||||
let shown = Toast::new(id).title(&summary).text1(&body).show();
|
||||
if let Err(error) = shown {
|
||||
tracing::debug!("notification: {error}");
|
||||
}
|
||||
}
|
||||
})
|
||||
.inspect_err(|error| tracing::debug!("notify thread: {error}"))
|
||||
.ok()?;
|
||||
Some(orders)
|
||||
}
|
||||
|
||||
/// Tell Windows the app id's display name and icon. Per user, no rights
|
||||
/// needed, and written again every session so a moved install points at
|
||||
/// a live icon.
|
||||
fn register(icon: &Path) -> bool {
|
||||
use windows_sys::Win32::System::Registry::{
|
||||
HKEY, HKEY_CURRENT_USER, KEY_WRITE, REG_OPTION_NON_VOLATILE, REG_SZ, RegCloseKey,
|
||||
RegCreateKeyExW, RegSetValueExW,
|
||||
};
|
||||
|
||||
fn wide(text: &str) -> Vec<u16> {
|
||||
text.encode_utf16().chain(std::iter::once(0)).collect()
|
||||
}
|
||||
|
||||
let path = wide(&format!(r"Software\Classes\AppUserModelId\{APP_ID}"));
|
||||
let mut key: HKEY = std::ptr::null_mut();
|
||||
// SAFETY: every pointer is to a live, NUL-terminated buffer or an out
|
||||
// parameter on this stack frame, and the key is closed before return.
|
||||
unsafe {
|
||||
let created = RegCreateKeyExW(
|
||||
HKEY_CURRENT_USER,
|
||||
path.as_ptr(),
|
||||
0,
|
||||
std::ptr::null(),
|
||||
REG_OPTION_NON_VOLATILE,
|
||||
KEY_WRITE,
|
||||
std::ptr::null(),
|
||||
&mut key,
|
||||
std::ptr::null_mut(),
|
||||
);
|
||||
if created != 0 {
|
||||
tracing::debug!("register the notification id: error {created}");
|
||||
return false;
|
||||
}
|
||||
let icon = icon.to_string_lossy();
|
||||
let mut written = true;
|
||||
for (name, value) in [("DisplayName", "Proton Stream"), ("IconUri", icon.as_ref())] {
|
||||
let name = wide(name);
|
||||
let value = wide(value);
|
||||
let bytes = u32::try_from(value.len() * 2).unwrap_or(u32::MAX);
|
||||
let set =
|
||||
RegSetValueExW(key, name.as_ptr(), 0, REG_SZ, value.as_ptr().cast(), bytes);
|
||||
written &= set == 0;
|
||||
}
|
||||
RegCloseKey(key);
|
||||
written
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -35,6 +35,12 @@ pub const CARD_WIDTH: f32 = 232.0;
|
||||
/// Video stills are 16:9. A poster shape would letterbox every one of them.
|
||||
pub const CARD_ASPECT: f32 = 9.0 / 16.0;
|
||||
pub const CARD_GAP: f32 = 14.0;
|
||||
/// The poster grid's minimum width: narrower than a still, because a cover is
|
||||
/// read by its art rather than by detail, and six across a laptop screen is
|
||||
/// what makes a wall of covers look like a shelf.
|
||||
pub const POSTER_WIDTH: f32 = 168.0;
|
||||
/// Covers are 2:3.
|
||||
pub const POSTER_ASPECT: f32 = 3.0 / 2.0;
|
||||
|
||||
/// The type ramp, named once.
|
||||
///
|
||||
@@ -84,26 +90,151 @@ impl Role {
|
||||
}
|
||||
}
|
||||
|
||||
/// Headings are set in the semibold cut; everything below them in the
|
||||
/// regular one.
|
||||
pub fn family(self) -> egui::FontFamily {
|
||||
match self {
|
||||
Self::Display | Self::Title | Self::Heading | Self::Section => semibold(),
|
||||
_ => egui::FontFamily::Proportional,
|
||||
}
|
||||
}
|
||||
|
||||
/// For the hand-painted parts, which lay text out through a `Painter` and
|
||||
/// never see a `RichText`.
|
||||
pub fn font(self) -> egui::FontId {
|
||||
egui::FontId::proportional(self.size())
|
||||
egui::FontId::new(self.size(), self.family())
|
||||
}
|
||||
|
||||
/// For the parts that go through egui's widgets.
|
||||
pub fn rich(self, text: impl Into<String>) -> egui::RichText {
|
||||
egui::RichText::new(text).size(self.size())
|
||||
egui::RichText::new(text)
|
||||
.size(self.size())
|
||||
.family(self.family())
|
||||
}
|
||||
}
|
||||
|
||||
/// Install a real CJK fallback before the default egui fonts. egui ships a
|
||||
/// compact Latin font, but it intentionally does not bundle the multi-megabyte
|
||||
/// CJK families. Native desktops already provide one, so use it when present.
|
||||
/// The spacing scale. Gaps between things come from here rather than being
|
||||
/// picked per call site, so two neighbouring groups are 12 apart or 16 apart
|
||||
/// and never 14 in one place and 15 in the next.
|
||||
pub mod space {
|
||||
/// Between lines that belong to one thing: a title and its caption.
|
||||
pub const XXS: f32 = 2.0;
|
||||
pub const XS: f32 = 4.0;
|
||||
/// Between controls in one cluster.
|
||||
pub const S: f32 = 6.0;
|
||||
pub const M: f32 = 8.0;
|
||||
/// Between clusters on one row, and between rows of a form.
|
||||
pub const L: f32 = 12.0;
|
||||
/// Between the groups on a page.
|
||||
pub const XL: f32 = 16.0;
|
||||
/// Between sections.
|
||||
pub const XXL: f32 = 24.0;
|
||||
}
|
||||
|
||||
/// Corner radii, as `egui::CornerRadius::same` takes them.
|
||||
pub mod radius {
|
||||
/// A progress bar, or a strip along an edge.
|
||||
pub const BAR: u8 = 3;
|
||||
/// A badge over artwork. Android's `Shape.kt` has the same number.
|
||||
pub const BADGE: u8 = 4;
|
||||
/// A small control inside something else: a menu entry, a chip.
|
||||
pub const SM: u8 = 6;
|
||||
/// Everything else either client paints: cards, buttons, the tab pill.
|
||||
pub const MD: u8 = 8;
|
||||
/// Something that floats: a row card, a dialog, a toast, the hero.
|
||||
pub const LG: u8 = 12;
|
||||
}
|
||||
|
||||
/// How long things take to change, in seconds, for `Context::animate_*`.
|
||||
pub mod motion {
|
||||
/// A press, which has to answer before the finger is off the button.
|
||||
pub const PRESS: f32 = 0.05;
|
||||
/// A hover arriving and leaving.
|
||||
pub const HOVER: f32 = 0.12;
|
||||
/// A control changing state: a switch flipping, the tab pill travelling,
|
||||
/// one page giving way to the next.
|
||||
pub const STATE: f32 = 0.15;
|
||||
/// Chrome fading in and out: the player's controls, a toast.
|
||||
pub const FADE: f32 = 0.18;
|
||||
/// Artwork arriving over its placeholder. Slower, because it replaces
|
||||
/// something rather than adding to it, and a fast swap reads as a flicker.
|
||||
pub const ARRIVE: f32 = 0.24;
|
||||
|
||||
/// Fast out, slow in: the curve every hand-driven transition uses.
|
||||
pub fn ease_out(t: f32) -> f32 {
|
||||
1.0 - (1.0 - t.clamp(0.0, 1.0)).powi(3)
|
||||
}
|
||||
}
|
||||
|
||||
/// The UI typeface, bundled rather than taken from the system so a title
|
||||
/// sets the same on every desktop. Inter, under the OFL — the licence is
|
||||
/// beside the files.
|
||||
///
|
||||
/// On a thread of its own: `fc-match` and reading a font file of tens of
|
||||
/// megabytes held the first frame back by a visible moment, and every name
|
||||
/// that needs the fallback is still loading from the catalog by then anyway.
|
||||
pub fn install_font_fallbacks(ctx: &egui::Context) {
|
||||
/// Both files have their private use area mappings removed, because the
|
||||
/// Phosphor icons live there. Inter maps 745 codepoints in that area to its
|
||||
/// own alternate glyphs, and as the first font in the family it won: the
|
||||
/// refresh arrow drew as an accented letter. The glyphs themselves are still
|
||||
/// in the files; only the character map entries are gone. Strip them again
|
||||
/// after any Inter update (fontTools: drop every `cmap` subtable entry in
|
||||
/// U+E000..=U+F8FF).
|
||||
const INTER: &[u8] = include_bytes!("../assets/fonts/Inter-Regular.ttf");
|
||||
const INTER_SEMIBOLD: &[u8] = include_bytes!("../assets/fonts/Inter-SemiBold.ttf");
|
||||
|
||||
/// The family the headings are set in. egui has no notion of weight, so the
|
||||
/// semibold cut is a family of its own.
|
||||
pub fn semibold() -> egui::FontFamily {
|
||||
egui::FontFamily::Name("semibold".into())
|
||||
}
|
||||
|
||||
/// Inter, the icon font, and egui's own fonts behind them for the emoji and
|
||||
/// symbols Inter does not carry. `cjk` goes last, when there is one.
|
||||
fn font_definitions(cjk: Option<egui::FontData>) -> egui::FontDefinitions {
|
||||
use egui::FontFamily::{Monospace, Proportional};
|
||||
|
||||
let mut fonts = egui::FontDefinitions::default();
|
||||
fonts
|
||||
.font_data
|
||||
.insert("inter".into(), Arc::new(egui::FontData::from_static(INTER)));
|
||||
fonts.font_data.insert(
|
||||
"inter-semibold".into(),
|
||||
Arc::new(egui::FontData::from_static(INTER_SEMIBOLD)),
|
||||
);
|
||||
fonts
|
||||
.families
|
||||
.entry(Proportional)
|
||||
.or_default()
|
||||
.insert(0, "inter".into());
|
||||
// Right behind Inter. The icons are in the private use area, which the
|
||||
// bundled Inter no longer maps, so neither font shadows the other.
|
||||
egui_phosphor::add_to_fonts(&mut fonts, egui_phosphor::Variant::Regular);
|
||||
if let Some(cjk) = cjk {
|
||||
let name = "system-cjk-fallback".to_owned();
|
||||
fonts.font_data.insert(name.clone(), Arc::new(cjk));
|
||||
for family in [Proportional, Monospace] {
|
||||
fonts.families.entry(family).or_default().push(name.clone());
|
||||
}
|
||||
}
|
||||
let fallbacks = fonts.families[&Proportional]
|
||||
.iter()
|
||||
.filter(|name| *name != "inter")
|
||||
.cloned();
|
||||
let semibold_chain = std::iter::once("inter-semibold".to_owned())
|
||||
.chain(fallbacks)
|
||||
.collect();
|
||||
fonts.families.insert(semibold(), semibold_chain);
|
||||
fonts
|
||||
}
|
||||
|
||||
/// Install the bundled fonts now, and a CJK fallback when the system has one.
|
||||
///
|
||||
/// The bundled ones are compiled in and cost nothing to hand over. The CJK
|
||||
/// fallback is on a thread of its own: `fc-match` and reading a font file of
|
||||
/// tens of megabytes held the first frame back by a visible moment, and every
|
||||
/// name that needs the fallback is still loading from the catalog by then
|
||||
/// anyway. egui deliberately does not bundle the multi-megabyte CJK families,
|
||||
/// and native desktops already provide one.
|
||||
pub fn install_fonts(ctx: &egui::Context) {
|
||||
ctx.set_fonts(font_definitions(None));
|
||||
let ctx = ctx.clone();
|
||||
let spawned = std::thread::Builder::new()
|
||||
.name("fonts".into())
|
||||
@@ -120,16 +251,9 @@ fn install_cjk_fallback(ctx: &egui::Context) {
|
||||
let Ok(bytes) = std::fs::read(path) else {
|
||||
return;
|
||||
};
|
||||
|
||||
let mut fonts = egui::FontDefinitions::default();
|
||||
let mut data = egui::FontData::from_owned(bytes);
|
||||
data.index = index;
|
||||
let name = "system-cjk-fallback".to_owned();
|
||||
fonts.font_data.insert(name.clone(), Arc::new(data));
|
||||
for family in [egui::FontFamily::Proportional, egui::FontFamily::Monospace] {
|
||||
fonts.families.entry(family).or_default().push(name.clone());
|
||||
}
|
||||
ctx.set_fonts(fonts);
|
||||
ctx.set_fonts(font_definitions(Some(data)));
|
||||
ctx.request_repaint();
|
||||
}
|
||||
|
||||
@@ -569,7 +693,7 @@ pub fn apply(ctx: &egui::Context, appearance: Appearance) {
|
||||
visuals.selection.stroke = Stroke::new(1.0, palette.text);
|
||||
visuals.hyperlink_color = palette.accent;
|
||||
|
||||
let radius = CornerRadius::same(8);
|
||||
let radius = CornerRadius::same(radius::MD);
|
||||
visuals.widgets.noninteractive.bg_fill = palette.surface;
|
||||
visuals.widgets.noninteractive.corner_radius = radius;
|
||||
visuals.widgets.noninteractive.bg_stroke = Stroke::new(1.0, palette.border);
|
||||
@@ -731,6 +855,27 @@ const RAMP_STOPS: usize = 64;
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn the_bundled_inter_leaves_the_icon_codepoints_to_phosphor() {
|
||||
use skrifa::MetadataProvider as _;
|
||||
|
||||
for (name, bytes) in [("regular", INTER), ("semibold", INTER_SEMIBOLD)] {
|
||||
let font = skrifa::FontRef::new(bytes).expect("bundled Inter parses");
|
||||
let shadowed: Vec<u32> = font
|
||||
.charmap()
|
||||
.mappings()
|
||||
.map(|(codepoint, _)| codepoint)
|
||||
.filter(|codepoint| (0xE000..=0xF8FF).contains(codepoint))
|
||||
.collect();
|
||||
assert!(
|
||||
shadowed.is_empty(),
|
||||
"Inter {name} maps {} private use codepoints, starting U+{:04X}",
|
||||
shadowed.len(),
|
||||
shadowed[0]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_shipped_default_is_the_palette_that_was_here_before() {
|
||||
let resolved = Palette::resolve(Appearance::default());
|
||||
|
||||
@@ -20,7 +20,7 @@ pub fn show(ui: &mut egui::Ui, downloads: &[DownloadItem], actions: &mut Vec<Act
|
||||
.show(ui, |ui| {
|
||||
ui.set_max_width(960.0);
|
||||
summary(ui, downloads);
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
let mut start = 0;
|
||||
while start < downloads.len() {
|
||||
@@ -30,7 +30,7 @@ pub fn show(ui: &mut egui::Ui, downloads: &[DownloadItem], actions: &mut Vec<Act
|
||||
.position(|item| item.target.title_key != *title_key)
|
||||
.map_or(downloads.len(), |offset| start + offset);
|
||||
group(ui, &downloads[start..end], actions);
|
||||
ui.add_space(14.0);
|
||||
ui.add_space(theme::space::L);
|
||||
start = end;
|
||||
}
|
||||
});
|
||||
@@ -108,7 +108,7 @@ fn group(ui: &mut egui::Ui, group: &[DownloadItem], actions: &mut Vec<Action>) {
|
||||
if totals_known && group.len() > 1 {
|
||||
ui::progress_bar(ui, fraction(downloaded, total), ui.available_width());
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
for item in group {
|
||||
row(ui, item, actions);
|
||||
}
|
||||
@@ -117,7 +117,7 @@ fn group(ui: &mut egui::Ui, group: &[DownloadItem], actions: &mut Vec<Action>) {
|
||||
fn row(ui: &mut egui::Ui, item: &DownloadItem, actions: &mut Vec<Action>) {
|
||||
egui::Frame::new()
|
||||
.fill(theme::card())
|
||||
.corner_radius(egui::CornerRadius::same(6))
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::SM))
|
||||
.inner_margin(egui::Margin::symmetric(12, 8))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
@@ -142,7 +142,7 @@ fn row(ui: &mut egui::Ui, item: &DownloadItem, actions: &mut Vec<Action>) {
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
buttons(ui, item, actions);
|
||||
if item.total > 0 && item.state != DownloadState::Completed {
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
ui.label(ui::muted(format!(
|
||||
"{} / {}",
|
||||
size(item.downloaded),
|
||||
@@ -154,7 +154,7 @@ fn row(ui: &mut egui::Ui, item: &DownloadItem, actions: &mut Vec<Action>) {
|
||||
});
|
||||
});
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
}
|
||||
|
||||
/// What a row says about itself, and in what colour.
|
||||
|
||||
@@ -0,0 +1,238 @@
|
||||
//! Everything that has been played, newest first, under a heading per day.
|
||||
//!
|
||||
//! Continue watching answers "what was I in the middle of"; this answers
|
||||
//! "what was that episode on Tuesday". It is read straight off the watch
|
||||
//! state, so there is nothing to keep in step: an episode is here because it
|
||||
//! has a position or is marked watched, and leaves when it has neither.
|
||||
|
||||
use chrono::{DateTime, Local, NaiveDate, TimeZone};
|
||||
use pstr_core::library::{Episode, Library, Title, TitleKind};
|
||||
|
||||
use crate::app::{Action, Page};
|
||||
use crate::theme;
|
||||
use crate::ui::{self, Art};
|
||||
|
||||
const STILL: egui::Vec2 = egui::vec2(128.0, 72.0);
|
||||
/// How far back the page goes. Further than anyone scrolls; the cap is there
|
||||
/// so a library with years of history does not lay out every row of it.
|
||||
const MOST: usize = 400;
|
||||
|
||||
/// Where one entry lives in [`Library::titles`]: title, season, episode.
|
||||
pub type Entry = (usize, usize, usize);
|
||||
|
||||
/// The entries of `library.history()`, as positions, so they can be kept
|
||||
/// between frames and only rebuilt when the library changes.
|
||||
pub fn entries(library: &Library) -> Vec<Entry> {
|
||||
let mut position = std::collections::HashMap::new();
|
||||
for (t, title) in library.titles.iter().enumerate() {
|
||||
for (s, season) in title.seasons.iter().enumerate() {
|
||||
for (e, episode) in season.episodes.iter().enumerate() {
|
||||
position.insert(std::ptr::from_ref(episode), (t, s, e));
|
||||
}
|
||||
}
|
||||
}
|
||||
library
|
||||
.history()
|
||||
.into_iter()
|
||||
.filter_map(|(_, episode)| position.get(&std::ptr::from_ref(episode)).copied())
|
||||
.collect()
|
||||
}
|
||||
|
||||
pub fn show(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut Art<'_>,
|
||||
library: &Library,
|
||||
entries: &[Entry],
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
if entries.is_empty() {
|
||||
ui::empty_state(
|
||||
ui,
|
||||
"Nothing watched yet",
|
||||
"Episodes and films you play show up here, newest first, so the one from \
|
||||
last week is easy to find again.",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
let today = Local::now().date_naive();
|
||||
egui::ScrollArea::vertical()
|
||||
.auto_shrink([false, false])
|
||||
.show(ui, |ui| {
|
||||
ui.set_max_width(960.0);
|
||||
let mut day = None;
|
||||
for &(t, s, e) in entries.iter().take(MOST) {
|
||||
let Some(title) = library.titles.get(t) else {
|
||||
continue;
|
||||
};
|
||||
let Some(episode) = title
|
||||
.seasons
|
||||
.get(s)
|
||||
.and_then(|season| season.episodes.get(e))
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
let Some(at) = Local.timestamp_opt(episode.last_played(), 0).single() else {
|
||||
continue;
|
||||
};
|
||||
if day != Some(at.date_naive()) {
|
||||
if day.is_some() {
|
||||
ui.add_space(theme::space::L);
|
||||
}
|
||||
day = Some(at.date_naive());
|
||||
ui::section(ui, &day_label(at.date_naive(), today));
|
||||
}
|
||||
row(ui, art, title, episode, at, actions);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
fn row(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut Art<'_>,
|
||||
title: &Title,
|
||||
episode: &Episode,
|
||||
at: DateTime<Local>,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
let row_id = ui.id().with(("history", &episode.node.link_id));
|
||||
let frame = egui::Frame::new()
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::LG))
|
||||
.inner_margin(egui::Margin::same(8));
|
||||
let mut prepared = frame.begin(ui);
|
||||
{
|
||||
let ui = &mut prepared.content_ui;
|
||||
ui.set_width(ui.available_width());
|
||||
ui.horizontal_top(|ui| {
|
||||
ui::title::still(
|
||||
ui,
|
||||
art,
|
||||
title,
|
||||
episode,
|
||||
episode.is_watched(),
|
||||
STILL,
|
||||
actions,
|
||||
);
|
||||
ui.add_space(theme::space::M);
|
||||
|
||||
let remove = 40.0;
|
||||
let text_width = (ui.available_width() - remove).max(120.0);
|
||||
ui.vertical(|ui| {
|
||||
ui.set_width(text_width);
|
||||
ui.spacing_mut().item_spacing.y = theme::space::XXS;
|
||||
ui.add_space(theme::space::XS);
|
||||
let name = ui
|
||||
.add(
|
||||
egui::Label::new(theme::Role::Body.rich(&title.name).color(theme::text()))
|
||||
.sense(egui::Sense::click())
|
||||
.truncate(),
|
||||
)
|
||||
.on_hover_cursor(egui::CursorIcon::PointingHand)
|
||||
.on_hover_text("Show this title");
|
||||
if name.clicked() {
|
||||
actions.push(Action::Goto(Page::Title(title.key.clone())));
|
||||
}
|
||||
// A film's only "episode" is its file, and its filename says
|
||||
// nothing the title above it does not.
|
||||
if title.kind != TitleKind::Film {
|
||||
let episode_name = art
|
||||
.episode(&title.key, episode)
|
||||
.and_then(|found| found.name.clone())
|
||||
.unwrap_or_else(|| episode.detail().to_owned());
|
||||
let line = match episode.numbering() {
|
||||
Some(numbering) => format!("{numbering} · {episode_name}"),
|
||||
None => episode_name,
|
||||
};
|
||||
ui.add(egui::Label::new(ui::muted(line)).truncate())
|
||||
.on_hover_text(&episode.node.name);
|
||||
}
|
||||
ui.label(ui::muted(status(episode, at)));
|
||||
});
|
||||
|
||||
let cluster = egui::vec2(ui.available_width(), STILL.y);
|
||||
let layout = egui::Layout::right_to_left(egui::Align::Center);
|
||||
ui.allocate_ui_with_layout(cluster, layout, |ui| {
|
||||
let remove = ui
|
||||
.add(
|
||||
egui::Button::new(
|
||||
theme::Role::Subhead
|
||||
.rich(egui_phosphor::regular::X)
|
||||
.color(theme::muted()),
|
||||
)
|
||||
.frame(false),
|
||||
)
|
||||
.on_hover_text(if episode.is_watched() {
|
||||
"Remove from history — marks it unwatched"
|
||||
} else {
|
||||
"Remove from history — forgets where you stopped"
|
||||
});
|
||||
if remove.clicked() {
|
||||
actions.push(Action::RemoveFromHistory {
|
||||
share_id: episode.node.share_id.clone(),
|
||||
link_id: episode.node.link_id.clone(),
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
let response = prepared.allocate_space(ui);
|
||||
let lit =
|
||||
ui.ctx()
|
||||
.animate_bool_with_time(row_id, response.contains_pointer(), theme::motion::HOVER);
|
||||
prepared.frame.fill = theme::card().gamma_multiply(0.35 + 0.65 * lit);
|
||||
prepared.paint(ui);
|
||||
ui.add_space(theme::space::XXS);
|
||||
}
|
||||
|
||||
/// The grey line under the names: how far it got, and when.
|
||||
fn status(episode: &Episode, at: DateTime<Local>) -> String {
|
||||
let when = at.format("%H:%M");
|
||||
if episode.is_watched() {
|
||||
return format!("Watched · {when}");
|
||||
}
|
||||
match (
|
||||
episode.resume_at(),
|
||||
episode.watch.and_then(|watch| watch.duration_secs),
|
||||
) {
|
||||
(Some(position), Some(duration)) => format!(
|
||||
"Stopped at {} of {} · {when}",
|
||||
ui::format_time(position),
|
||||
ui::format_time(duration)
|
||||
),
|
||||
(Some(position), None) => format!("Stopped at {} · {when}", ui::format_time(position)),
|
||||
_ => format!("Played · {when}"),
|
||||
}
|
||||
}
|
||||
|
||||
/// The heading over a day's entries: "Today", "Yesterday", a weekday within
|
||||
/// the last week, and a date before that — with the year only when it is not
|
||||
/// this one.
|
||||
fn day_label(day: NaiveDate, today: NaiveDate) -> String {
|
||||
use chrono::Datelike;
|
||||
match (today - day).num_days() {
|
||||
0 => "Today".into(),
|
||||
1 => "Yesterday".into(),
|
||||
2..=6 => day.format("%A").to_string(),
|
||||
_ if day.year() == today.year() => day.format("%-d %B").to_string(),
|
||||
_ => day.format("%-d %B %Y").to_string(),
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn date(year: i32, month: u32, day: u32) -> NaiveDate {
|
||||
NaiveDate::from_ymd_opt(year, month, day).unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_day_is_named_relative_to_today_for_the_last_week_and_dated_before_that() {
|
||||
let today = date(2026, 10, 2);
|
||||
assert_eq!(day_label(today, today), "Today");
|
||||
assert_eq!(day_label(date(2026, 10, 1), today), "Yesterday");
|
||||
assert_eq!(day_label(date(2026, 9, 28), today), "Monday");
|
||||
assert_eq!(day_label(date(2026, 9, 25), today), "25 September");
|
||||
assert_eq!(day_label(date(2025, 12, 24), today), "24 December 2025");
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
//! The library page: what to watch, as a wall of stills.
|
||||
|
||||
use pstr_core::appearance::Tiles;
|
||||
use pstr_core::library::{Library, Title, TitleKind};
|
||||
|
||||
use crate::app::{Action, Filter, LibraryView, Page, Sort};
|
||||
@@ -16,6 +17,8 @@ pub struct Shelves<'a> {
|
||||
/// Whether the catalog has been read yet.
|
||||
pub loaded: bool,
|
||||
pub search: &'a str,
|
||||
/// The grid's shape.
|
||||
pub tiles: Tiles,
|
||||
}
|
||||
|
||||
pub fn show(ui: &mut egui::Ui, art: &mut Art<'_>, shelves: Shelves<'_>, actions: &mut Vec<Action>) {
|
||||
@@ -24,6 +27,7 @@ pub fn show(ui: &mut egui::Ui, art: &mut Art<'_>, shelves: Shelves<'_>, actions:
|
||||
view,
|
||||
loaded,
|
||||
search,
|
||||
tiles,
|
||||
} = shelves;
|
||||
if !loaded {
|
||||
return placeholder(ui);
|
||||
@@ -47,13 +51,23 @@ pub fn show(ui: &mut egui::Ui, art: &mut Art<'_>, shelves: Shelves<'_>, actions:
|
||||
if !searching {
|
||||
if let Some(title) = featured(library, view, art.metadata, today()) {
|
||||
hero(ui, art, title, actions);
|
||||
ui.add_space(18.0);
|
||||
ui.add_space(theme::space::XL);
|
||||
}
|
||||
let resumable = pick(&view.resumable);
|
||||
if !resumable.is_empty() {
|
||||
ui::section(ui, "Continue watching");
|
||||
continue_row(ui, art, &resumable, actions);
|
||||
ui.add_space(16.0);
|
||||
ui.add_space(theme::space::XL);
|
||||
}
|
||||
// Only over the whole library: under a filter, a shelf of
|
||||
// titles the grid below is hiding reads as the filter not
|
||||
// working.
|
||||
if view.filter == Filter::All {
|
||||
for (label, indices) in &view.shelves {
|
||||
ui::section(ui, label);
|
||||
shelf_row(ui, art, label, &pick(indices), tiles, actions);
|
||||
ui.add_space(theme::space::XL);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -74,10 +88,10 @@ pub fn show(ui: &mut egui::Ui, art: &mut Art<'_>, shelves: Shelves<'_>, actions:
|
||||
shelf_controls(ui, view, actions);
|
||||
});
|
||||
});
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
|
||||
if matches.is_empty() {
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
ui.label(ui::muted(if searching {
|
||||
"Nothing here by that name."
|
||||
} else {
|
||||
@@ -86,7 +100,7 @@ pub fn show(ui: &mut egui::Ui, art: &mut Art<'_>, shelves: Shelves<'_>, actions:
|
||||
return;
|
||||
}
|
||||
|
||||
grid(ui, art, &matches, actions);
|
||||
grid(ui, art, &matches, view, tiles, actions);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -121,7 +135,7 @@ fn featured<'a>(
|
||||
metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.is_some_and(|found| found.backdrop_url.is_some())
|
||||
.is_some_and(|found| found.wide_art().is_some())
|
||||
})
|
||||
.collect();
|
||||
if pictured.is_empty() {
|
||||
@@ -143,8 +157,8 @@ fn hero(ui: &mut egui::Ui, art: &mut Art<'_>, title: &Title, actions: &mut Vec<A
|
||||
if !ui.is_rect_visible(rect) {
|
||||
return;
|
||||
}
|
||||
let radius = egui::CornerRadius::same(12);
|
||||
let picture = art.of(title);
|
||||
let radius = egui::CornerRadius::same(theme::radius::LG);
|
||||
let picture = art.wide(title);
|
||||
let found = art
|
||||
.metadata
|
||||
.get(&title.key)
|
||||
@@ -152,9 +166,11 @@ fn hero(ui: &mut egui::Ui, art: &mut Art<'_>, title: &Title, actions: &mut Vec<A
|
||||
|
||||
let painter = ui.painter().with_clip_rect(rect);
|
||||
painter.rect_filled(rect, radius, theme::card());
|
||||
let art_in = ui
|
||||
.ctx()
|
||||
.animate_bool_with_time(response.id.with("art"), picture.is_some(), 0.3);
|
||||
let art_in = ui.ctx().animate_bool_with_time(
|
||||
response.id.with("art"),
|
||||
picture.is_some(),
|
||||
theme::motion::ARRIVE,
|
||||
);
|
||||
if art_in < 1.0 {
|
||||
ui::placeholder(&painter, rect, "", 1.0 - art_in);
|
||||
}
|
||||
@@ -211,20 +227,22 @@ fn hero(ui: &mut egui::Ui, art: &mut Art<'_>, title: &Title, actions: &mut Vec<A
|
||||
ui.horizontal(|ui| {
|
||||
if let Some(episode) = title.next_up() {
|
||||
let label = match (title.resume(), episode.numbering()) {
|
||||
(Some(_), Some(numbering)) => format!("▶ Resume {numbering}"),
|
||||
(Some(_), None) => "▶ Resume".to_owned(),
|
||||
(None, _) => "▶ Play".to_owned(),
|
||||
(Some(_), Some(numbering)) => {
|
||||
format!("{} Resume {numbering}", egui_phosphor::regular::PLAY)
|
||||
}
|
||||
(Some(_), None) => format!("{} Resume", egui_phosphor::regular::PLAY),
|
||||
(None, _) => format!("{} Play", egui_phosphor::regular::PLAY),
|
||||
};
|
||||
if ui::accent_button(ui, &label).clicked() {
|
||||
actions.push(Action::Play(PlaybackTarget::new(title, episode)));
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
}
|
||||
if ui.button("More info").clicked() {
|
||||
actions.push(Action::Goto(Page::Title(title.key.clone())));
|
||||
}
|
||||
});
|
||||
ui.add_space(14.0);
|
||||
ui.add_space(theme::space::L);
|
||||
if let Some(overview) = found.as_ref().and_then(|found| found.overview.as_deref()) {
|
||||
let mut job = egui::text::LayoutJob::simple(
|
||||
overview.to_owned(),
|
||||
@@ -234,21 +252,21 @@ fn hero(ui: &mut egui::Ui, art: &mut Art<'_>, title: &Title, actions: &mut Vec<A
|
||||
);
|
||||
job.wrap.max_rows = 3;
|
||||
ui.label(job);
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
}
|
||||
let mut facts = vec![subtitle(title)];
|
||||
if let Some(found) = &found {
|
||||
if let Some(rating) = found.rating {
|
||||
facts.push(format!("★ {rating:.1}"));
|
||||
facts.push(format!("{} {rating:.1}", egui_phosphor::regular::STAR));
|
||||
}
|
||||
facts.extend(found.genres.iter().take(3).cloned());
|
||||
}
|
||||
ui.label(ui::muted(facts.join(" · ")));
|
||||
ui.add_space(2.0);
|
||||
ui.add_space(theme::space::XXS);
|
||||
ui.add(
|
||||
egui::Label::new(
|
||||
theme::Role::Display
|
||||
.rich(&title.name)
|
||||
.rich(art.name(title))
|
||||
.strong()
|
||||
.color(theme::text()),
|
||||
)
|
||||
@@ -262,24 +280,20 @@ fn hero(ui: &mut egui::Ui, art: &mut Art<'_>, title: &Title, actions: &mut Vec<A
|
||||
}
|
||||
}
|
||||
|
||||
/// The filter pills and the order, at the right of the grid's heading.
|
||||
/// The filter pills, the order and the grouping, at the right of the grid's
|
||||
/// heading.
|
||||
fn shelf_controls(ui: &mut egui::Ui, view: &LibraryView, actions: &mut Vec<Action>) {
|
||||
// Right to left: the order first, so it ends up last.
|
||||
let sort = egui::ComboBox::from_id_salt("library-sort")
|
||||
.selected_text(match view.sort {
|
||||
Sort::Name => "A – Z",
|
||||
Sort::Recent => "Recently watched",
|
||||
Sort::Year => "Newest",
|
||||
})
|
||||
.selected_text(view.sort.label())
|
||||
.width(150.0)
|
||||
.show_ui(ui, |ui| {
|
||||
let mut picked = None;
|
||||
for (sort, label) in [
|
||||
(Sort::Name, "A – Z"),
|
||||
(Sort::Recent, "Recently watched"),
|
||||
(Sort::Year, "Newest"),
|
||||
] {
|
||||
if ui.selectable_label(view.sort == sort, label).clicked() {
|
||||
for sort in Sort::ALL {
|
||||
if ui
|
||||
.selectable_label(view.sort == sort, sort.label())
|
||||
.clicked()
|
||||
{
|
||||
picked = Some(sort);
|
||||
}
|
||||
}
|
||||
@@ -288,7 +302,20 @@ fn shelf_controls(ui: &mut egui::Ui, view: &LibraryView, actions: &mut Vec<Actio
|
||||
if let Some(Some(sort)) = sort.inner {
|
||||
actions.push(Action::SetShelf(view.filter, sort));
|
||||
}
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::S);
|
||||
let mut grouped = view.grouped;
|
||||
if ui
|
||||
.toggle_value(&mut grouped, egui_phosphor::regular::STACK)
|
||||
.on_hover_text(if view.grouped {
|
||||
"One tile per franchise. Click to show every title"
|
||||
} else {
|
||||
"Every title. Click to fold each franchise into one tile"
|
||||
})
|
||||
.changed()
|
||||
{
|
||||
actions.push(Action::SetGrouped(grouped));
|
||||
}
|
||||
ui.add_space(theme::space::L);
|
||||
if let Some(filter) = ui::widgets::segmented(
|
||||
ui,
|
||||
view.filter,
|
||||
@@ -304,6 +331,57 @@ fn shelf_controls(ui: &mut egui::Ui, view: &LibraryView, actions: &mut Vec<Actio
|
||||
}
|
||||
}
|
||||
|
||||
/// One shelf: titles that share something, scrolling sideways, in the grid's
|
||||
/// own shape.
|
||||
fn shelf_row(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut Art<'_>,
|
||||
label: &str,
|
||||
titles: &[&Title],
|
||||
tiles: Tiles,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
let (width, aspect) = tile_shape(tiles);
|
||||
egui::ScrollArea::horizontal()
|
||||
.id_salt(("shelf", label))
|
||||
.auto_shrink([false, true])
|
||||
.show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.spacing_mut().item_spacing.x = theme::CARD_GAP;
|
||||
for title in titles {
|
||||
let picture = match tiles {
|
||||
Tiles::Posters => art.poster(title),
|
||||
Tiles::Stills => art.of(title),
|
||||
};
|
||||
let response = ui::card(
|
||||
ui,
|
||||
Card {
|
||||
art: picture,
|
||||
name: art.name(title),
|
||||
subtitle: subtitle(title),
|
||||
progress: title.resume().and_then(|e| e.progress()).map(|v| v as f32),
|
||||
badge: None,
|
||||
width,
|
||||
aspect,
|
||||
},
|
||||
);
|
||||
tile_menu(&response, title, false, actions);
|
||||
if response.clicked() {
|
||||
actions.push(Action::Goto(Page::Title(title.key.clone())));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/// The minimum width and the picture's shape of a tile.
|
||||
fn tile_shape(tiles: Tiles) -> (f32, f32) {
|
||||
match tiles {
|
||||
Tiles::Posters => (theme::POSTER_WIDTH, theme::POSTER_ASPECT),
|
||||
Tiles::Stills => (theme::CARD_WIDTH, theme::CARD_ASPECT),
|
||||
}
|
||||
}
|
||||
|
||||
/// The top shelf: one card per part-watched title, scrolling sideways.
|
||||
fn continue_row(
|
||||
ui: &mut egui::Ui,
|
||||
@@ -333,17 +411,20 @@ fn continue_row(
|
||||
})
|
||||
.unwrap_or_else(|| episode.label());
|
||||
|
||||
let picture = art.of(title);
|
||||
let response = ui::card(
|
||||
ui,
|
||||
Card {
|
||||
art: art.of(title),
|
||||
name: &title.name,
|
||||
art: picture,
|
||||
name: art.name(title),
|
||||
subtitle: remaining,
|
||||
progress: episode.progress().map(|value| value as f32),
|
||||
badge: episode.numbering(),
|
||||
// A shelf that scrolls sideways has no right edge
|
||||
// to reach, so nothing to flex to.
|
||||
// to reach, so nothing to flex to. Always a
|
||||
// still: it is a frame from where they stopped.
|
||||
width: theme::CARD_WIDTH,
|
||||
aspect: theme::CARD_ASPECT,
|
||||
},
|
||||
);
|
||||
tile_menu(&response, title, true, actions);
|
||||
@@ -357,10 +438,18 @@ fn continue_row(
|
||||
}
|
||||
|
||||
/// Every title, wrapped to the window.
|
||||
fn grid(ui: &mut egui::Ui, art: &mut Art<'_>, titles: &[&Title], actions: &mut Vec<Action>) {
|
||||
let grid = ui::columns(ui.available_width());
|
||||
let row_height = ui::card_height(grid.width);
|
||||
for row in titles.chunks(grid.columns) {
|
||||
fn grid(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut Art<'_>,
|
||||
titles: &[&Title],
|
||||
view: &LibraryView,
|
||||
tiles: Tiles,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
let (minimum, aspect) = tile_shape(tiles);
|
||||
let grid = ui::columns_of(ui.available_width(), minimum);
|
||||
let row_height = ui::card_height(grid.width, aspect);
|
||||
for (row, chunk) in titles.chunks(grid.columns).enumerate() {
|
||||
// A row scrolled out of view is only its height. Laying it out anyway
|
||||
// costs a subtitle and an artwork lookup per card per frame, and while
|
||||
// a film plays under the transport bar a frame is every frame.
|
||||
@@ -381,18 +470,32 @@ fn grid(ui: &mut egui::Ui, art: &mut Art<'_>, titles: &[&Title], actions: &mut V
|
||||
// the difference times the column count is a visible drift towards
|
||||
// the left edge.
|
||||
ui.spacing_mut().item_spacing.x = theme::CARD_GAP;
|
||||
for title in row {
|
||||
for (column, title) in chunk.iter().enumerate() {
|
||||
let picture = match tiles {
|
||||
Tiles::Posters => art.poster(title),
|
||||
Tiles::Stills => art.of(title),
|
||||
};
|
||||
let folded = view
|
||||
.matches
|
||||
.get(row * grid.columns + column)
|
||||
.and_then(|index| view.folded.get(index))
|
||||
.copied();
|
||||
let response = ui::card(
|
||||
ui,
|
||||
Card {
|
||||
art: art.of(title),
|
||||
name: &title.name,
|
||||
subtitle: subtitle(title),
|
||||
art: picture,
|
||||
name: art.name(title),
|
||||
subtitle: match folded {
|
||||
Some(more) => format!("{} · +{more} more", subtitle(title)),
|
||||
None => subtitle(title),
|
||||
},
|
||||
progress: title.resume().and_then(|e| e.progress()).map(|v| v as f32),
|
||||
// What a film is says itself in the subtitle below the
|
||||
// card; a second `Film` over the poster is noise.
|
||||
badge: None,
|
||||
// card; a second `Film` over the poster is noise. A
|
||||
// folded franchise says how much is under it.
|
||||
badge: folded.map(|more| format!("+{more}")),
|
||||
width: grid.width,
|
||||
aspect,
|
||||
},
|
||||
);
|
||||
tile_menu(&response, title, false, actions);
|
||||
@@ -513,7 +616,7 @@ fn subtitle(title: &Title) -> String {
|
||||
/// fraction is a flash of something false.
|
||||
fn placeholder(ui: &mut egui::Ui) {
|
||||
let grid = ui::columns(ui.available_width());
|
||||
let height = ui::card_height(grid.width);
|
||||
let height = ui::card_height(grid.width, theme::CARD_ASPECT);
|
||||
ui::section(ui, "Library");
|
||||
for _ in 0..2 {
|
||||
ui.horizontal(|ui| {
|
||||
@@ -525,8 +628,11 @@ fn placeholder(ui: &mut egui::Ui) {
|
||||
rect.min,
|
||||
egui::vec2(grid.width, (grid.width * theme::CARD_ASPECT).round()),
|
||||
);
|
||||
ui.painter()
|
||||
.rect_filled(image, egui::CornerRadius::same(8), theme::card());
|
||||
ui.painter().rect_filled(
|
||||
image,
|
||||
egui::CornerRadius::same(theme::radius::MD),
|
||||
theme::card(),
|
||||
);
|
||||
}
|
||||
});
|
||||
ui.add_space(theme::CARD_GAP);
|
||||
@@ -541,11 +647,11 @@ fn empty_state(ui: &mut egui::Ui, actions: &mut Vec<Action>) {
|
||||
.rich("Nothing in the library yet")
|
||||
.strong(),
|
||||
);
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.label(ui::muted(
|
||||
"Add a Proton Drive share link, and everything playable behind it shows up here.",
|
||||
));
|
||||
ui.add_space(18.0);
|
||||
ui.add_space(theme::space::XL);
|
||||
if ui::accent_button(ui, "Add a share").clicked() {
|
||||
actions.push(Action::Goto(Page::Shares));
|
||||
}
|
||||
|
||||
@@ -43,7 +43,7 @@ pub fn show(
|
||||
egui::Frame::new()
|
||||
.fill(theme::surface())
|
||||
.inner_margin(egui::Margin::same(18))
|
||||
.corner_radius(egui::CornerRadius::same(10)),
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::LG)),
|
||||
)
|
||||
.show(ctx, |ui| {
|
||||
ui.set_width(620.0);
|
||||
@@ -58,21 +58,21 @@ pub fn show(
|
||||
"Everything {} answers with, in its own order — nothing is scored here.",
|
||||
provider.label()
|
||||
)));
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
search_row(ui, matcher, actions);
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
current_row(ui, matcher, current.as_ref(), actions);
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
if let Some(error) = &matcher.error {
|
||||
ui.label(theme::Role::Caption.rich(error).color(theme::danger()));
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
}
|
||||
|
||||
results(ui, matcher, art, actions);
|
||||
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.horizontal(|ui| {
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui.button("Close").clicked() {
|
||||
@@ -178,7 +178,7 @@ fn results(ui: &mut egui::Ui, matcher: &Matcher, art: &mut Art<'_>, actions: &mu
|
||||
if row(ui, art, found).clicked() {
|
||||
actions.push(Action::ChooseMatch(Box::new(found.clone())));
|
||||
}
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -188,7 +188,7 @@ fn results(ui: &mut egui::Ui, matcher: &Matcher, art: &mut Art<'_>, actions: &mu
|
||||
fn row(ui: &mut egui::Ui, art: &mut Art<'_>, found: &TitleMetadata) -> egui::Response {
|
||||
let response = egui::Frame::new()
|
||||
.fill(theme::card())
|
||||
.corner_radius(egui::CornerRadius::same(6))
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::SM))
|
||||
.inner_margin(egui::Margin::same(8))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
@@ -204,12 +204,12 @@ fn row(ui: &mut egui::Ui, art: &mut Art<'_>, found: &TitleMetadata) -> egui::Res
|
||||
} else {
|
||||
ui.painter().rect_filled(
|
||||
rect,
|
||||
egui::CornerRadius::same(4),
|
||||
egui::CornerRadius::same(theme::radius::BADGE),
|
||||
theme::card_hover(),
|
||||
);
|
||||
}
|
||||
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.vertical(|ui| {
|
||||
ui.label(
|
||||
theme::Role::Body
|
||||
@@ -241,7 +241,7 @@ fn row(ui: &mut egui::Ui, art: &mut Art<'_>, found: &TitleMetadata) -> egui::Res
|
||||
if response.hovered() {
|
||||
ui.painter().rect_stroke(
|
||||
response.rect,
|
||||
egui::CornerRadius::same(6),
|
||||
egui::CornerRadius::same(theme::radius::SM),
|
||||
egui::Stroke::new(1.5, theme::accent()),
|
||||
egui::StrokeKind::Inside,
|
||||
);
|
||||
@@ -279,7 +279,7 @@ fn facts(found: &TitleMetadata) -> String {
|
||||
parts.push(ui::library::plural(episodes as usize, "episode"));
|
||||
}
|
||||
if let Some(rating) = found.rating {
|
||||
parts.push(format!("★ {rating:.1}"));
|
||||
parts.push(format!("{} {rating:.1}", egui_phosphor::regular::STAR));
|
||||
}
|
||||
parts.join(" · ")
|
||||
}
|
||||
@@ -4,6 +4,7 @@
|
||||
//! applies them after the frame is drawn.
|
||||
|
||||
pub mod downloads;
|
||||
pub mod history;
|
||||
pub mod library;
|
||||
pub mod matcher;
|
||||
pub mod player;
|
||||
@@ -19,9 +20,9 @@ use std::collections::HashMap;
|
||||
|
||||
use egui::{Align2, Color32, CornerRadius, Rect, Sense, Stroke, Vec2};
|
||||
use pstr_core::library::{Episode, Title};
|
||||
use pstr_core::metadata::{ArtShape, EpisodeGuide, EpisodeMetadata, MetadataRecord};
|
||||
use pstr_core::metadata::{ArtShape, EpisodeGuide, EpisodeMetadata, MetadataRecord, TitleNames};
|
||||
|
||||
use crate::engine::{Engine, ImageCache, thumbnail_key};
|
||||
use crate::engine::{Engine, ImageCache, WIDE_MAX_EDGE, thumbnail_key};
|
||||
use crate::theme;
|
||||
|
||||
/// Everything the pages need to draw one title's picture.
|
||||
@@ -39,8 +40,12 @@ pub struct Art<'a> {
|
||||
pub metadata: &'a HashMap<String, MetadataRecord>,
|
||||
/// What they said about the episodes under those titles.
|
||||
pub episodes: &'a HashMap<String, EpisodeGuide>,
|
||||
/// Which name a title goes by.
|
||||
pub names: TitleNames,
|
||||
}
|
||||
|
||||
pub use pstr_core::browse::display_name as title_name;
|
||||
|
||||
impl Art<'_> {
|
||||
/// What the provider says about one file of a title, matched on the
|
||||
/// numbering its name states.
|
||||
@@ -73,6 +78,58 @@ impl Art<'_> {
|
||||
.texture(&thumbnail_key(node), || engine.request_thumbnail(node))
|
||||
}
|
||||
|
||||
/// The name to show for `title`. See [`title_name`].
|
||||
pub fn name<'t>(&'t self, title: &'t Title) -> &'t str {
|
||||
title_name(title, self.metadata, self.names)
|
||||
}
|
||||
|
||||
/// A 2:3 cover for `title`, for the poster grid; whatever [`Art::of`]
|
||||
/// has when there is none.
|
||||
pub fn poster(&mut self, title: &Title) -> Option<(egui::TextureHandle, ArtShape)> {
|
||||
let url = self
|
||||
.metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.and_then(|metadata| metadata.poster_url.clone());
|
||||
if let Some(url) = url {
|
||||
let key = poster_key(&title.key);
|
||||
let engine = self.engine;
|
||||
if let Some(texture) = self
|
||||
.posters
|
||||
.texture(&key, || engine.request_poster(key.clone(), url))
|
||||
{
|
||||
return Some((texture, ArtShape::Portrait));
|
||||
}
|
||||
}
|
||||
self.of(title)
|
||||
}
|
||||
|
||||
/// Art for a strip across the whole window, at full size: fanart, else
|
||||
/// AniList's banner, else whatever [`Art::of`] has.
|
||||
///
|
||||
/// Its own texture rather than the tile's: a 640 px tile picture
|
||||
/// stretched to a 1600 px hero is soft, and a 1920 px one in every tile
|
||||
/// would be most of the texture budget.
|
||||
pub fn wide(&mut self, title: &Title) -> Option<(egui::TextureHandle, ArtShape)> {
|
||||
let url = self
|
||||
.metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.and_then(|metadata| metadata.wide_art())
|
||||
.map(str::to_owned);
|
||||
if let Some(url) = url {
|
||||
let key = wide_key(&title.key);
|
||||
let engine = self.engine;
|
||||
if let Some(texture) = self
|
||||
.posters
|
||||
.texture(&key, || engine.request_art(key.clone(), url, WIDE_MAX_EDGE))
|
||||
{
|
||||
return Some((texture, ArtShape::Landscape));
|
||||
}
|
||||
}
|
||||
self.of(title)
|
||||
}
|
||||
|
||||
/// The picture for a title, and how to fit it.
|
||||
///
|
||||
/// Provider artwork first, then Proton's still, then nothing. That order is
|
||||
@@ -103,6 +160,17 @@ impl Art<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
/// The texture key of a title's cover, beside [`Art::of`]'s, which is the
|
||||
/// title key itself.
|
||||
pub fn poster_key(title_key: &str) -> String {
|
||||
format!("poster:{title_key}")
|
||||
}
|
||||
|
||||
/// The texture key of a title's full-size wide art.
|
||||
pub fn wide_key(title_key: &str) -> String {
|
||||
format!("wide:{title_key}")
|
||||
}
|
||||
|
||||
/// `1:03:47`, or `4:12` for anything under an hour.
|
||||
pub fn format_time(seconds: f64) -> String {
|
||||
if !seconds.is_finite() || seconds < 0.0 {
|
||||
@@ -141,14 +209,14 @@ pub fn format_size(bytes: i64) -> String {
|
||||
|
||||
/// A section title with a rule under it.
|
||||
pub fn section(ui: &mut egui::Ui, text: &str) {
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.label(
|
||||
theme::Role::Section
|
||||
.rich(text)
|
||||
.strong()
|
||||
.color(theme::text()),
|
||||
);
|
||||
ui.add_space(2.0);
|
||||
ui.add_space(theme::space::XXS);
|
||||
}
|
||||
|
||||
/// Small grey text, for everything that is context rather than content.
|
||||
@@ -173,7 +241,7 @@ pub fn search_field(ui: &mut egui::Ui, search: &mut String, focus: bool) {
|
||||
let has_focus = ui.memory(|memory| memory.has_focus(id));
|
||||
let lit = ui
|
||||
.ctx()
|
||||
.animate_bool_with_time(id.with("lit"), has_focus, 0.12);
|
||||
.animate_bool_with_time(id.with("lit"), has_focus, theme::motion::HOVER);
|
||||
|
||||
let radius = CornerRadius::same((height / 2.0) as u8);
|
||||
ui.painter().rect_filled(outer, radius, theme::card());
|
||||
@@ -258,7 +326,7 @@ pub fn search_field(ui: &mut egui::Ui, search: &mut String, focus: bool) {
|
||||
pub fn progress_bar(ui: &mut egui::Ui, fraction: f32, width: f32) -> egui::Response {
|
||||
let (rect, response) = ui.allocate_exact_size(Vec2::new(width, 6.0), Sense::hover());
|
||||
if ui.is_rect_visible(rect) {
|
||||
let radius = CornerRadius::same(3);
|
||||
let radius = CornerRadius::same(theme::radius::BAR);
|
||||
ui.painter().rect_filled(rect, radius, theme::card_hover());
|
||||
let mut done = rect;
|
||||
done.set_width(rect.width() * fraction.clamp(0.0, 1.0));
|
||||
@@ -275,7 +343,7 @@ pub fn empty_state(ui: &mut egui::Ui, heading: &str, body: &str) {
|
||||
ui.vertical_centered(|ui| {
|
||||
ui.add_space(96.0);
|
||||
ui.label(theme::Role::Title.rich(heading).strong());
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.label(muted(body));
|
||||
});
|
||||
}
|
||||
@@ -311,7 +379,7 @@ pub fn confirm(ctx: &egui::Context, id: &str, heading: &str, body: &str, verb: &
|
||||
egui::Frame::new()
|
||||
.fill(theme::surface())
|
||||
.inner_margin(egui::Margin::same(18))
|
||||
.corner_radius(CornerRadius::same(10)),
|
||||
.corner_radius(CornerRadius::same(theme::radius::LG)),
|
||||
)
|
||||
.show(ctx, |ui| {
|
||||
ui.set_width(420.0);
|
||||
@@ -321,9 +389,9 @@ pub fn confirm(ctx: &egui::Context, id: &str, heading: &str, body: &str, verb: &
|
||||
.strong()
|
||||
.color(theme::text()),
|
||||
);
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.label(theme::Role::Body.rich(body).color(theme::muted()));
|
||||
ui.add_space(16.0);
|
||||
ui.add_space(theme::space::XL);
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if danger_button(ui, verb).clicked() {
|
||||
answer = Answer::Confirmed;
|
||||
@@ -382,15 +450,17 @@ pub fn tabs(ui: &mut egui::Ui, id: egui::Id, items: &[(&str, bool)]) -> Option<u
|
||||
// the pill from overshooting when it moves between tabs of different
|
||||
// lengths — both edges arrive at the same time.
|
||||
let ctx = ui.ctx();
|
||||
let left = ctx.animate_value_with_time(id.with("left"), target.left(), 0.16);
|
||||
let right = ctx.animate_value_with_time(id.with("right"), target.right(), 0.16);
|
||||
let left =
|
||||
ctx.animate_value_with_time(id.with("left"), target.left(), theme::motion::STATE);
|
||||
let right =
|
||||
ctx.animate_value_with_time(id.with("right"), target.right(), theme::motion::STATE);
|
||||
let rect = Rect::from_min_max(
|
||||
egui::pos2(left, target.top()),
|
||||
egui::pos2(right, target.bottom()),
|
||||
);
|
||||
ui.painter().set(
|
||||
pill,
|
||||
theme::accent_shape(ui.ctx(), rect, CornerRadius::same(8)),
|
||||
theme::accent_shape(ui.ctx(), rect, CornerRadius::same(theme::radius::MD)),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -431,17 +501,21 @@ fn filled(ui: &mut egui::Ui, text: &str, fill: Fill, extra: Vec2) -> egui::Respo
|
||||
return response;
|
||||
}
|
||||
|
||||
let radius = CornerRadius::same(8);
|
||||
let radius = CornerRadius::same(theme::radius::MD);
|
||||
// Eased rather than switched, so the veil arrives over a few frames instead
|
||||
// of appearing whole the moment the pointer crosses the edge. The press is
|
||||
// quicker than the hover: a click should feel like it registered, not like
|
||||
// it was considered.
|
||||
let ctx = ui.ctx().clone();
|
||||
let hover = ctx.animate_bool_with_time(response.id.with("hover"), response.hovered(), 0.10);
|
||||
let hover = ctx.animate_bool_with_time(
|
||||
response.id.with("hover"),
|
||||
response.hovered(),
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
let press = ctx.animate_bool_with_time(
|
||||
response.id.with("press"),
|
||||
response.is_pointer_button_down_on(),
|
||||
0.05,
|
||||
theme::motion::PRESS,
|
||||
);
|
||||
let lift = 0.10 * hover * (1.0 - press) - 0.14 * press;
|
||||
|
||||
@@ -485,6 +559,9 @@ pub struct Card<'a> {
|
||||
/// sideways-scrolling shelf has no edge to reach and passes
|
||||
/// [`theme::CARD_WIDTH`].
|
||||
pub width: f32,
|
||||
/// The picture's height over its width: [`theme::CARD_ASPECT`] for a
|
||||
/// still, [`theme::POSTER_ASPECT`] for a cover.
|
||||
pub aspect: f32,
|
||||
}
|
||||
|
||||
/// Two lines of name plus one of subtitle. Fixed, because the tile is allocated
|
||||
@@ -492,10 +569,10 @@ pub struct Card<'a> {
|
||||
/// different height by title length reads as broken.
|
||||
const CARD_TEXT_HEIGHT: f32 = 54.0;
|
||||
|
||||
/// How tall [`card`] draws a tile of this width, so a grid can step over rows
|
||||
/// it does not draw.
|
||||
pub fn card_height(width: f32) -> f32 {
|
||||
(width * theme::CARD_ASPECT).round() + CARD_TEXT_HEIGHT
|
||||
/// How tall [`card`] draws a tile of this width and shape, so a grid can step
|
||||
/// over rows it does not draw.
|
||||
pub fn card_height(width: f32, aspect: f32) -> f32 {
|
||||
(width * aspect).round() + CARD_TEXT_HEIGHT
|
||||
}
|
||||
|
||||
/// Draw one tile and report whether it was clicked.
|
||||
@@ -508,9 +585,12 @@ pub fn card_height(width: f32) -> f32 {
|
||||
/// reads as deliberate in a way a stretched poster does not.
|
||||
pub fn card(ui: &mut egui::Ui, card: Card<'_>) -> egui::Response {
|
||||
let width = card.width;
|
||||
let image_height = (width * theme::CARD_ASPECT).round();
|
||||
let image_height = (width * card.aspect).round();
|
||||
// A cover fitted into a still-shaped tile is drawn whole; into a tile its
|
||||
// own shape, it fills it like anything else.
|
||||
let fit = card.aspect < 1.0;
|
||||
let text_height = CARD_TEXT_HEIGHT;
|
||||
let radius = CornerRadius::same(8);
|
||||
let radius = CornerRadius::same(theme::radius::MD);
|
||||
|
||||
let (rect, response) =
|
||||
ui.allocate_exact_size(Vec2::new(width, image_height + text_height), Sense::click());
|
||||
@@ -533,14 +613,16 @@ pub fn card(ui: &mut egui::Ui, card: Card<'_>) -> egui::Response {
|
||||
let hover = ui.ctx().animate_bool_with_time(
|
||||
response.id.with("hover"),
|
||||
response.hovered() || response.has_focus(),
|
||||
0.12,
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
// The picture arrives whenever its download finishes, several frames after
|
||||
// the tile first drew. Fading it in over the placeholder turns a wall of
|
||||
// letters popping into stills into one settle.
|
||||
let art_in = ui
|
||||
.ctx()
|
||||
.animate_bool_with_time(response.id.with("art"), card.art.is_some(), 0.22);
|
||||
let art_in = ui.ctx().animate_bool_with_time(
|
||||
response.id.with("art"),
|
||||
card.art.is_some(),
|
||||
theme::motion::ARRIVE,
|
||||
);
|
||||
let painter = ui.painter();
|
||||
|
||||
if hover > 0.0 {
|
||||
@@ -565,7 +647,7 @@ pub fn card(ui: &mut egui::Ui, card: Card<'_>) -> egui::Response {
|
||||
.with_texture(texture.id(), cover_uv(size, image_rect.size())),
|
||||
);
|
||||
}
|
||||
Some((texture, ArtShape::Portrait)) => {
|
||||
Some((texture, ArtShape::Portrait)) if fit => {
|
||||
painter.add(
|
||||
egui::epaint::RectShape::filled(
|
||||
contain_rect(texture.size_vec2(), image_rect),
|
||||
@@ -578,6 +660,14 @@ pub fn card(ui: &mut egui::Ui, card: Card<'_>) -> egui::Response {
|
||||
),
|
||||
);
|
||||
}
|
||||
Some((texture, ArtShape::Portrait)) => {
|
||||
painter.add(
|
||||
egui::epaint::RectShape::filled(image_rect, radius, ink).with_texture(
|
||||
texture.id(),
|
||||
cover_uv(texture.size_vec2(), image_rect.size()),
|
||||
),
|
||||
);
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
|
||||
@@ -591,7 +681,7 @@ pub fn card(ui: &mut egui::Ui, card: Card<'_>) -> egui::Response {
|
||||
);
|
||||
painter.rect_filled(
|
||||
background,
|
||||
CornerRadius::same(4),
|
||||
CornerRadius::same(theme::radius::BADGE),
|
||||
Color32::from_black_alpha(180),
|
||||
);
|
||||
painter.galley(background.min + Vec2::new(5.0, 2.0), galley, Color32::WHITE);
|
||||
@@ -724,7 +814,7 @@ pub(crate) fn placeholder(painter: &egui::Painter, rect: Rect, name: &str, opaci
|
||||
theme::ramp_fill(
|
||||
painter,
|
||||
rect,
|
||||
CornerRadius::same(8),
|
||||
CornerRadius::same(theme::radius::MD),
|
||||
(from, to),
|
||||
theme::Direction::Vertical,
|
||||
opacity,
|
||||
@@ -768,9 +858,13 @@ pub struct Grid {
|
||||
/// dead space at the right of every row, and on a wide window that reads as a
|
||||
/// layout that failed to line up rather than as a margin.
|
||||
pub fn columns(available: f32) -> Grid {
|
||||
let columns = (((available + theme::CARD_GAP) / (theme::CARD_WIDTH + theme::CARD_GAP)).floor()
|
||||
as usize)
|
||||
.max(1);
|
||||
columns_of(available, theme::CARD_WIDTH)
|
||||
}
|
||||
|
||||
/// [`columns`], for cards at least `minimum` wide.
|
||||
pub fn columns_of(available: f32, minimum: f32) -> Grid {
|
||||
let columns =
|
||||
(((available + theme::CARD_GAP) / (minimum + theme::CARD_GAP)).floor() as usize).max(1);
|
||||
// The gaps come out of the width before it is split. Floored, because a
|
||||
// fraction of a point times four columns is enough to push the last card
|
||||
// onto a row of its own. A window too narrow for even one full card gets a
|
||||
|
||||
@@ -66,6 +66,10 @@ const SKIP_PAD_X: f32 = 22.0;
|
||||
/// on the full wash. See [`scrim_bottom`].
|
||||
const SCRIM_ALPHA: f32 = 170.0;
|
||||
const SCRIM_FADE: f32 = 88.0;
|
||||
/// How wide the episode list is, at most. A narrow window gives it less.
|
||||
const DRAWER_WIDTH: f32 = 380.0;
|
||||
/// The stills in the episode list.
|
||||
const DRAWER_STILL: Vec2 = Vec2::new(112.0, 63.0);
|
||||
|
||||
/// State the page keeps between frames.
|
||||
///
|
||||
@@ -109,6 +113,17 @@ pub struct Chrome<'a> {
|
||||
pub up_next: Option<UpNextCard>,
|
||||
/// Whether stepping to another episode is possible in either direction.
|
||||
pub neighbours: Neighbours,
|
||||
/// The title's episodes, when it has more than one — what the list down
|
||||
/// the right of the picture shows.
|
||||
pub episodes: Option<Episodes<'a>>,
|
||||
}
|
||||
|
||||
/// The playing title's episodes, for the list beside the picture.
|
||||
pub struct Episodes<'a> {
|
||||
pub title: &'a pstr_core::library::Title,
|
||||
pub art: ui::Art<'a>,
|
||||
/// Whether the list is out.
|
||||
pub open: bool,
|
||||
}
|
||||
|
||||
/// What the end-of-episode card says, when there is one.
|
||||
@@ -187,6 +202,7 @@ pub fn show(
|
||||
overlay,
|
||||
up_next,
|
||||
neighbours,
|
||||
mut episodes,
|
||||
} = chrome_state;
|
||||
let ctx = ui.ctx().clone();
|
||||
let rect = ui.available_rect_before_wrap();
|
||||
@@ -228,7 +244,10 @@ pub fn show(
|
||||
actions.push(Action::ToggleFullscreen);
|
||||
}
|
||||
|
||||
let visible = overlay.visible(&ctx, playback);
|
||||
let drawer_open = episodes.as_ref().is_some_and(|list| list.open);
|
||||
// The controls stay up while the list is out: it hangs off the button in
|
||||
// the title strip, and is read at leisure.
|
||||
let visible = overlay.visible(&ctx, playback) || drawer_open;
|
||||
// Above the chrome when it is up, at the bottom corner when it is not —
|
||||
// and clear of it either way, which is what the measured height buys.
|
||||
let float_above = if visible {
|
||||
@@ -251,7 +270,7 @@ pub fn show(
|
||||
|
||||
// Faded rather than switched, both ways: controls that blink out under a
|
||||
// reading eye are more distracting than the ones that were there.
|
||||
let fade = ctx.animate_bool_with_time(ui.id().with("chrome"), visible, 0.18);
|
||||
let fade = ctx.animate_bool_with_time(ui.id().with("chrome"), visible, theme::motion::FADE);
|
||||
if fade > 0.0 {
|
||||
overlay.chrome_height = ui
|
||||
.scope(|ui| {
|
||||
@@ -260,6 +279,7 @@ pub fn show(
|
||||
ui,
|
||||
playback,
|
||||
neighbours,
|
||||
episodes.as_ref().map(|list| list.open),
|
||||
rect,
|
||||
overlay.chrome_height,
|
||||
actions,
|
||||
@@ -267,6 +287,11 @@ pub fn show(
|
||||
})
|
||||
.inner;
|
||||
}
|
||||
if let Some(list) = episodes.as_mut().filter(|list| list.open) {
|
||||
episode_drawer(&ctx, list, playback, rect, overlay.chrome_height, actions);
|
||||
} else {
|
||||
ctx.data_mut(|data| data.remove::<String>(egui::Id::new(DRAWER_SCROLLED)));
|
||||
}
|
||||
if !visible {
|
||||
ui.ctx().set_cursor_icon(egui::CursorIcon::None);
|
||||
// The controls have to disappear on their own, and nothing else is
|
||||
@@ -379,7 +404,7 @@ fn between(ui: &mut egui::Ui, opening: Option<&str>, rect: Rect, actions: &mut V
|
||||
if ui.button("Back").clicked() {
|
||||
actions.push(Action::LeavePlayer);
|
||||
}
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
ui.add(egui::Spinner::new().size(14.0));
|
||||
},
|
||||
);
|
||||
@@ -479,7 +504,7 @@ fn up_next_card(
|
||||
egui::Frame::new()
|
||||
.fill(Color32::from_black_alpha(215))
|
||||
.stroke(egui::Stroke::new(1.0, Color32::from_white_alpha(120)))
|
||||
.corner_radius(CornerRadius::same(8))
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD))
|
||||
.inner_margin(egui::Margin::same(12))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(size.x - 24.0);
|
||||
@@ -488,7 +513,7 @@ fn up_next_card(
|
||||
// coming and when, read in one glance.
|
||||
let (frame, response) = ui.allocate_exact_size(STILL, Sense::click());
|
||||
let painter = ui.painter();
|
||||
let radius = CornerRadius::same(6);
|
||||
let radius = CornerRadius::same(theme::radius::SM);
|
||||
match &card.still {
|
||||
Some(texture) => {
|
||||
painter.add(
|
||||
@@ -518,7 +543,7 @@ fn up_next_card(
|
||||
actions.push(Action::PlayAdjacent(Adjacent::Next));
|
||||
}
|
||||
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.vertical(|ui| {
|
||||
ui.label(
|
||||
theme::Role::Caption
|
||||
@@ -535,12 +560,12 @@ fn up_next_card(
|
||||
)
|
||||
.truncate(),
|
||||
);
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.horizontal(|ui| {
|
||||
if ui::accent_button(ui, "Play now").clicked() {
|
||||
actions.push(Action::PlayAdjacent(Adjacent::Next));
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
if ui
|
||||
.button("Watch till the end")
|
||||
.on_hover_text("Play this one out — nothing will be skipped")
|
||||
@@ -618,6 +643,7 @@ fn chrome(
|
||||
ui: &mut egui::Ui,
|
||||
playback: &Playback,
|
||||
neighbours: Neighbours,
|
||||
drawer: Option<bool>,
|
||||
rect: Rect,
|
||||
previous_height: f32,
|
||||
actions: &mut Vec<Action>,
|
||||
@@ -633,7 +659,7 @@ fn chrome(
|
||||
.add(
|
||||
egui::Button::new(theme::Role::Label.rich("Library"))
|
||||
.fill(Color32::from_black_alpha(160))
|
||||
.corner_radius(CornerRadius::same(8))
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD))
|
||||
.min_size(Vec2::new(96.0, 32.0)),
|
||||
)
|
||||
.on_hover_text("Keep playing, and go back to the library (Esc)")
|
||||
@@ -641,7 +667,7 @@ fn chrome(
|
||||
{
|
||||
actions.push(Action::LeavePlayer);
|
||||
}
|
||||
ui.add_space(14.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.vertical(|ui| {
|
||||
ui.label(
|
||||
theme::Role::Heading
|
||||
@@ -657,18 +683,56 @@ fn chrome(
|
||||
});
|
||||
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
let fullscreen = ui.input(|input| input.viewport().fullscreen.unwrap_or(false));
|
||||
if ui
|
||||
.add(
|
||||
egui::Button::new(theme::Role::Subhead.rich("⛶"))
|
||||
.fill(Color32::from_black_alpha(160))
|
||||
.corner_radius(CornerRadius::same(8))
|
||||
.min_size(Vec2::new(38.0, 32.0)),
|
||||
egui::Button::new(theme::Role::Subhead.rich(if fullscreen {
|
||||
egui_phosphor::regular::CORNERS_IN
|
||||
} else {
|
||||
egui_phosphor::regular::CORNERS_OUT
|
||||
}))
|
||||
.fill(Color32::from_black_alpha(160))
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD))
|
||||
.min_size(Vec2::new(38.0, 32.0)),
|
||||
)
|
||||
.on_hover_text("Fullscreen (F)")
|
||||
.on_hover_text(if fullscreen {
|
||||
"Leave fullscreen (F)"
|
||||
} else {
|
||||
"Fullscreen (F)"
|
||||
})
|
||||
.clicked()
|
||||
{
|
||||
actions.push(Action::ToggleFullscreen);
|
||||
}
|
||||
if let Some(open) = drawer {
|
||||
ui.add_space(theme::space::S);
|
||||
let fill = if open {
|
||||
theme::accent()
|
||||
} else {
|
||||
Color32::from_black_alpha(160)
|
||||
};
|
||||
let ink = if open {
|
||||
theme::on_accent()
|
||||
} else {
|
||||
Color32::WHITE
|
||||
};
|
||||
if ui
|
||||
.add(
|
||||
egui::Button::new(
|
||||
theme::Role::Subhead
|
||||
.rich(egui_phosphor::regular::LIST_BULLETS)
|
||||
.color(ink),
|
||||
)
|
||||
.fill(fill)
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD))
|
||||
.min_size(Vec2::new(38.0, 32.0)),
|
||||
)
|
||||
.on_hover_text("Episodes (E)")
|
||||
.clicked()
|
||||
{
|
||||
actions.push(Action::ToggleEpisodes);
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
);
|
||||
@@ -707,6 +771,216 @@ fn chrome(
|
||||
measured + CHROME_PAD_TOP + CHROME_PAD_BOTTOM
|
||||
}
|
||||
|
||||
/// Which file the episode list last scrolled to, in egui's memory, so it
|
||||
/// scrolls to the playing one once when it opens rather than every frame.
|
||||
const DRAWER_SCROLLED: &str = "episode-drawer-scrolled";
|
||||
|
||||
/// The title's episodes, down the right of the picture between the title
|
||||
/// strip and the controls. A season at a time, opened on the playing one.
|
||||
fn episode_drawer(
|
||||
ctx: &egui::Context,
|
||||
list: &mut Episodes<'_>,
|
||||
playback: &Playback,
|
||||
rect: Rect,
|
||||
chrome_height: f32,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
let width = DRAWER_WIDTH.min(rect.width() * 0.45);
|
||||
let area = Rect::from_min_max(
|
||||
egui::pos2(rect.right() - width - 16.0, rect.top() + TITLE_HEIGHT),
|
||||
egui::pos2(rect.right() - 16.0, rect.bottom() - chrome_height - 8.0),
|
||||
);
|
||||
if area.height() < 160.0 {
|
||||
return;
|
||||
}
|
||||
let title = list.title;
|
||||
let target = &playback.target;
|
||||
let is_playing = |episode: &pstr_core::library::Episode| {
|
||||
episode.node.share_id == target.share_id && episode.node.link_id == target.link_id
|
||||
};
|
||||
let playing_season = title
|
||||
.seasons
|
||||
.iter()
|
||||
.position(|season| season.episodes.iter().any(is_playing))
|
||||
.unwrap_or(0);
|
||||
let season_id = egui::Id::new(("episode-drawer-season", &title.key));
|
||||
let mut season = ctx
|
||||
.data(|data| data.get_temp::<usize>(season_id))
|
||||
.unwrap_or(playing_season)
|
||||
.min(title.seasons.len().saturating_sub(1));
|
||||
|
||||
let margin = theme::space::L;
|
||||
egui::Area::new(egui::Id::new("episode-drawer"))
|
||||
.order(egui::Order::Foreground)
|
||||
.fixed_pos(area.min)
|
||||
.show(ctx, |ui| {
|
||||
egui::Frame::new()
|
||||
.fill(theme::surface().gamma_multiply(0.96))
|
||||
.corner_radius(CornerRadius::same(theme::radius::LG))
|
||||
.inner_margin(egui::Margin::same(margin as i8))
|
||||
.shadow(theme::tile_shadow(1.0))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(area.width() - 2.0 * margin);
|
||||
ui.set_height(area.height() - 2.0 * margin);
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(theme::Role::Heading.rich("Episodes").color(theme::text()));
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui
|
||||
.add(
|
||||
egui::Button::new(
|
||||
theme::Role::Subhead
|
||||
.rich(egui_phosphor::regular::X)
|
||||
.color(theme::muted()),
|
||||
)
|
||||
.frame(false),
|
||||
)
|
||||
.on_hover_text("Close (E)")
|
||||
.clicked()
|
||||
{
|
||||
actions.push(Action::ToggleEpisodes);
|
||||
}
|
||||
});
|
||||
});
|
||||
if title.seasons.len() > 1 {
|
||||
ui.add_space(theme::space::XS);
|
||||
let labels: Vec<(usize, String)> = title
|
||||
.seasons
|
||||
.iter()
|
||||
.enumerate()
|
||||
.map(|(index, season)| (index, season.label()))
|
||||
.collect();
|
||||
let choices: Vec<(usize, &str)> = labels
|
||||
.iter()
|
||||
.map(|(index, label)| (*index, label.as_str()))
|
||||
.collect();
|
||||
egui::ScrollArea::horizontal()
|
||||
.id_salt("drawer-seasons")
|
||||
.show(ui, |ui| {
|
||||
if let Some(picked) = ui::widgets::segmented(ui, season, &choices) {
|
||||
season = picked;
|
||||
ctx.data_mut(|data| data.insert_temp(season_id, picked));
|
||||
}
|
||||
});
|
||||
}
|
||||
ui.add_space(theme::space::S);
|
||||
|
||||
let Some(shown) = title.seasons.get(season) else {
|
||||
return;
|
||||
};
|
||||
egui::ScrollArea::vertical()
|
||||
.id_salt("drawer-episodes")
|
||||
.auto_shrink([false, false])
|
||||
.show(ui, |ui| {
|
||||
for episode in &shown.episodes {
|
||||
let row = drawer_row(
|
||||
ui,
|
||||
&mut list.art,
|
||||
title,
|
||||
episode,
|
||||
is_playing(episode),
|
||||
actions,
|
||||
);
|
||||
if is_playing(episode) {
|
||||
let scrolled = ctx.data(|data| {
|
||||
data.get_temp::<String>(egui::Id::new(DRAWER_SCROLLED))
|
||||
});
|
||||
if scrolled.as_deref() != Some(target.link_id.as_str()) {
|
||||
row.scroll_to_me(Some(egui::Align::Center));
|
||||
ctx.data_mut(|data| {
|
||||
data.insert_temp(
|
||||
egui::Id::new(DRAWER_SCROLLED),
|
||||
target.link_id.clone(),
|
||||
)
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
/// One episode in the list: its still, which plays it, and what it is.
|
||||
fn drawer_row(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut ui::Art<'_>,
|
||||
title: &pstr_core::library::Title,
|
||||
episode: &pstr_core::library::Episode,
|
||||
playing: bool,
|
||||
actions: &mut Vec<Action>,
|
||||
) -> egui::Response {
|
||||
let frame = egui::Frame::new()
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD))
|
||||
.inner_margin(egui::Margin::same(6))
|
||||
.fill(if playing {
|
||||
theme::accent_dim()
|
||||
} else {
|
||||
Color32::TRANSPARENT
|
||||
});
|
||||
let response = frame
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
ui.horizontal_top(|ui| {
|
||||
ui::title::still(
|
||||
ui,
|
||||
art,
|
||||
title,
|
||||
episode,
|
||||
episode.is_watched(),
|
||||
DRAWER_STILL,
|
||||
actions,
|
||||
);
|
||||
ui.add_space(theme::space::M);
|
||||
ui.vertical(|ui| {
|
||||
ui.spacing_mut().item_spacing.y = theme::space::XXS;
|
||||
let name = art
|
||||
.episode(&title.key, episode)
|
||||
.and_then(|found| found.name.clone())
|
||||
.unwrap_or_else(|| episode.detail().to_owned());
|
||||
if let Some(numbering) = episode.numbering() {
|
||||
ui.label(
|
||||
egui::RichText::new(numbering)
|
||||
.monospace()
|
||||
.color(theme::muted()),
|
||||
);
|
||||
}
|
||||
let mut job = egui::text::LayoutJob::simple(
|
||||
name,
|
||||
theme::Role::Label.font(),
|
||||
if episode.is_watched() && !playing {
|
||||
theme::muted()
|
||||
} else {
|
||||
theme::text()
|
||||
},
|
||||
ui.available_width(),
|
||||
);
|
||||
job.wrap.max_rows = 2;
|
||||
job.wrap.overflow_character = Some('…');
|
||||
ui.label(job);
|
||||
let state = if playing {
|
||||
Some("Playing".to_owned())
|
||||
} else if episode.is_watched() {
|
||||
Some("Watched".to_owned())
|
||||
} else {
|
||||
episode
|
||||
.resume_at()
|
||||
.map(|at| format!("Stopped at {}", ui::format_time(at)))
|
||||
};
|
||||
if let Some(state) = state {
|
||||
ui.label(theme::Role::Caption.rich(state).color(if playing {
|
||||
theme::accent()
|
||||
} else {
|
||||
theme::muted()
|
||||
}));
|
||||
}
|
||||
});
|
||||
});
|
||||
})
|
||||
.response;
|
||||
ui.add_space(theme::space::XXS);
|
||||
response
|
||||
}
|
||||
|
||||
/// The gradient behind the title strip, fading downwards out of the top edge.
|
||||
fn scrim_top(ui: &egui::Ui, rect: Rect) {
|
||||
// Squared, so the fade is dark where the text is and gone well before the
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
//! that manages Proton Drive links, and a page that is half link management and
|
||||
//! half preferences is two pages.
|
||||
|
||||
use pstr_core::appearance::{Accent, Appearance, Flavor};
|
||||
use pstr_core::metadata::{MetadataConfig, ProviderId};
|
||||
use pstr_core::appearance::{Accent, Appearance, Flavor, Tiles};
|
||||
use pstr_core::metadata::{MetadataConfig, ProviderId, TitleNames};
|
||||
|
||||
use crate::app::Action;
|
||||
use crate::desktop_prefs::{CACHE_CHOICES, DesktopPrefs};
|
||||
@@ -50,7 +50,7 @@ pub fn show(
|
||||
ui.add_space(margin);
|
||||
ui.vertical(|ui| {
|
||||
ui.set_width(width);
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
appearance_form(ui, prefs.appearance, actions);
|
||||
playback_form(ui, prefs, actions);
|
||||
storage_form(ui, prefs, actions);
|
||||
@@ -68,9 +68,9 @@ pub fn show(
|
||||
/// only changed a small square would be asking someone to imagine the result.
|
||||
fn appearance_form(ui: &mut egui::Ui, appearance: Appearance, actions: &mut Vec<Action>) {
|
||||
ui::widgets::settings_group(ui, "Appearance", None, |ui| {
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.label(theme::Role::Body.rich("Palette").color(theme::text()));
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
ui.spacing_mut().item_spacing = egui::vec2(10.0, 10.0);
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
for flavor in Flavor::ALL {
|
||||
@@ -86,7 +86,7 @@ fn appearance_form(ui: &mut egui::Ui, appearance: Appearance, actions: &mut Vec<
|
||||
}
|
||||
}
|
||||
});
|
||||
ui.add_space(14.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.spacing_mut().item_spacing.y = 0.0;
|
||||
|
||||
ui::widgets::settings_row(ui, "Accent", None, |ui| {
|
||||
@@ -102,6 +102,41 @@ fn appearance_form(ui: &mut egui::Ui, appearance: Appearance, actions: &mut Vec<
|
||||
}
|
||||
});
|
||||
|
||||
ui::widgets::settings_row(
|
||||
ui,
|
||||
"Library tiles",
|
||||
Some("Covers, or 16:9 stills. Covers are the art every matched title has."),
|
||||
|ui| {
|
||||
let choices: Vec<(Tiles, &str)> = Tiles::ALL
|
||||
.iter()
|
||||
.map(|tiles| (*tiles, tiles.label()))
|
||||
.collect();
|
||||
if let Some(tiles) = ui::widgets::segmented(ui, appearance.tiles, &choices) {
|
||||
actions.push(Action::SetAppearance(Appearance {
|
||||
tiles,
|
||||
..appearance
|
||||
}));
|
||||
}
|
||||
},
|
||||
);
|
||||
ui::widgets::settings_row(
|
||||
ui,
|
||||
"Title names",
|
||||
Some("The name a matched title goes by. Its other names still find it in search."),
|
||||
|ui| {
|
||||
let choices: Vec<(TitleNames, &str)> = TitleNames::ALL
|
||||
.iter()
|
||||
.map(|names| (*names, names.label()))
|
||||
.collect();
|
||||
if let Some(names) = ui::widgets::segmented(ui, appearance.names, &choices) {
|
||||
actions.push(Action::SetAppearance(Appearance {
|
||||
names,
|
||||
..appearance
|
||||
}));
|
||||
}
|
||||
},
|
||||
);
|
||||
|
||||
let mut gradients = appearance.gradients;
|
||||
ui::widgets::settings_row(
|
||||
ui,
|
||||
@@ -132,11 +167,11 @@ fn palette_card(ui: &mut egui::Ui, appearance: Appearance, flavor: Flavor) -> eg
|
||||
..appearance
|
||||
});
|
||||
let selected = appearance.flavor == flavor;
|
||||
let hover = ui
|
||||
.ctx()
|
||||
.animate_bool_with_time(response.id, response.hovered(), 0.10);
|
||||
let hover =
|
||||
ui.ctx()
|
||||
.animate_bool_with_time(response.id, response.hovered(), theme::motion::HOVER);
|
||||
let painter = ui.painter();
|
||||
let radius = egui::CornerRadius::same(8);
|
||||
let radius = egui::CornerRadius::same(theme::radius::MD);
|
||||
let preview = egui::Rect::from_min_size(rect.min, egui::vec2(size.x, 64.0));
|
||||
|
||||
painter.rect_filled(preview, radius, palette.background);
|
||||
@@ -155,11 +190,20 @@ fn palette_card(ui: &mut egui::Ui, appearance: Appearance, flavor: Flavor) -> eg
|
||||
egui::Rect::from_min_size(preview.min + egui::vec2(x, 20.0), egui::vec2(34.0, 22.0))
|
||||
};
|
||||
for x in [8.0, 49.0, 90.0] {
|
||||
painter.rect_filled(tile(x), egui::CornerRadius::same(3), palette.card);
|
||||
painter.rect_filled(
|
||||
tile(x),
|
||||
egui::CornerRadius::same(theme::radius::BAR),
|
||||
palette.card,
|
||||
);
|
||||
}
|
||||
let pill =
|
||||
egui::Rect::from_min_size(preview.min + egui::vec2(8.0, 3.0), egui::vec2(22.0, 6.0));
|
||||
theme::swatch_fill(painter, pill, egui::CornerRadius::same(3), &palette);
|
||||
theme::swatch_fill(
|
||||
painter,
|
||||
pill,
|
||||
egui::CornerRadius::same(theme::radius::BAR),
|
||||
&palette,
|
||||
);
|
||||
painter.hline(
|
||||
(preview.left() + 8.0)..=(preview.left() + 60.0),
|
||||
preview.top() + 50.0,
|
||||
@@ -354,15 +398,17 @@ fn metadata_form(
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
ui::widgets::settings_group(ui, "Posters and descriptions", None, |ui| {
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.spacing_mut().item_spacing.y = 6.0;
|
||||
ui.label(ui::muted(
|
||||
"A share filled by the Proton Drive desktop client carries no thumbnails, so \
|
||||
without this every tile is a pair of initials. Turning it on sends the titles \
|
||||
in your library — not your files, and nothing about what you have watched — to \
|
||||
the provider you choose, over HTTPS, each time a new one appears.",
|
||||
the provider you choose, over HTTPS, each time a new one appears. With AniList, \
|
||||
the ids it matched — not the titles — then go to ani.zip for episode names and \
|
||||
wide artwork.",
|
||||
));
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
let mut changed = false;
|
||||
let mut enabled = settings.enabled;
|
||||
@@ -372,7 +418,7 @@ fn metadata_form(
|
||||
}
|
||||
|
||||
if settings.enabled {
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.label(ui::muted("Provider"));
|
||||
for provider in ProviderId::ALL {
|
||||
if ui
|
||||
@@ -387,7 +433,7 @@ fn metadata_form(
|
||||
}
|
||||
|
||||
if settings.provider.needs_api_key() {
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.label(ui::muted(format!("{} API key", settings.provider.label())));
|
||||
ui.horizontal(|ui| {
|
||||
ui.add(
|
||||
@@ -409,7 +455,7 @@ fn metadata_form(
|
||||
));
|
||||
}
|
||||
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.horizontal(|ui| {
|
||||
if ui::accent_button(ui, "Match the library").clicked() {
|
||||
actions.push(Action::MatchTitles { force: false });
|
||||
@@ -423,7 +469,7 @@ fn metadata_form(
|
||||
}
|
||||
});
|
||||
} else {
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.label(ui::muted(
|
||||
"Off. Nothing is sent anywhere, and turning it off also deletes the answers \
|
||||
already stored.",
|
||||
@@ -433,6 +479,6 @@ fn metadata_form(
|
||||
if changed {
|
||||
actions.push(Action::SetMetadataConfig(settings.clone()));
|
||||
}
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
});
|
||||
}
|
||||
@@ -38,7 +38,7 @@ pub fn show(
|
||||
share_row(ui, share, titles, actions);
|
||||
}
|
||||
|
||||
ui.add_space(22.0);
|
||||
ui.add_space(theme::space::XXL);
|
||||
add_form(ui, shares, form, actions);
|
||||
});
|
||||
}
|
||||
@@ -46,7 +46,7 @@ pub fn show(
|
||||
fn share_row(ui: &mut egui::Ui, share: &Share, titles: usize, actions: &mut Vec<Action>) {
|
||||
egui::Frame::new()
|
||||
.fill(theme::card())
|
||||
.corner_radius(egui::CornerRadius::same(8))
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::MD))
|
||||
.inner_margin(egui::Margin::symmetric(12, 10))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
@@ -76,7 +76,7 @@ fn share_row(ui: &mut egui::Ui, share: &Share, titles: usize, actions: &mut Vec<
|
||||
});
|
||||
});
|
||||
});
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
}
|
||||
|
||||
fn add_form(ui: &mut egui::Ui, shares: &[Share], form: &mut ShareForm, actions: &mut Vec<Action>) {
|
||||
@@ -85,11 +85,11 @@ fn add_form(ui: &mut egui::Ui, shares: &[Share], form: &mut ShareForm, actions:
|
||||
"Paste the whole link, including everything after the # — that part is the key that \
|
||||
decrypts it, and it is stored in your system keyring rather than on disk.",
|
||||
));
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
egui::Frame::new()
|
||||
.fill(theme::card())
|
||||
.corner_radius(egui::CornerRadius::same(8))
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::MD))
|
||||
.inner_margin(egui::Margin::same(14))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width().min(640.0));
|
||||
@@ -100,7 +100,7 @@ fn add_form(ui: &mut egui::Ui, shares: &[Share], form: &mut ShareForm, actions:
|
||||
.hint_text("Anime")
|
||||
.desired_width(f32::INFINITY),
|
||||
);
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
|
||||
ui.label(ui::muted("Link"));
|
||||
ui.horizontal(|ui| {
|
||||
@@ -134,11 +134,11 @@ fn add_form(ui: &mut egui::Ui, shares: &[Share], form: &mut ShareForm, actions:
|
||||
if let Some(problem) = &problem {
|
||||
ui.label(theme::Role::Caption.rich(problem).color(theme::danger()));
|
||||
}
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
|
||||
ui::widgets::toggle(ui, &mut form.has_password, "The link asks for a password");
|
||||
if form.has_password {
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.add(
|
||||
egui::TextEdit::singleline(&mut form.password)
|
||||
.password(true)
|
||||
@@ -147,7 +147,7 @@ fn add_form(ui: &mut egui::Ui, shares: &[Share], form: &mut ShareForm, actions:
|
||||
);
|
||||
}
|
||||
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
let ready = !form.name.trim().is_empty()
|
||||
&& !form.url.trim().is_empty()
|
||||
&& problem.is_none()
|
||||
@@ -156,7 +156,7 @@ fn add_form(ui: &mut egui::Ui, shares: &[Share], form: &mut ShareForm, actions:
|
||||
|
||||
if let Some(error) = &form.error {
|
||||
ui.label(theme::Role::Caption.rich(error).color(theme::danger()));
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
}
|
||||
ui.horizontal(|ui| {
|
||||
if ui
|
||||
|
||||
@@ -13,7 +13,10 @@ const GROUPS: &[(&str, &[(&str, &str)])] = &[
|
||||
&[
|
||||
("Ctrl F or /", "Search the library"),
|
||||
("F5 or Ctrl R", "Crawl every share again"),
|
||||
("Ctrl 1 – 4", "Library, Shares, Downloads, Settings"),
|
||||
(
|
||||
"Ctrl 1 – 5",
|
||||
"Library, History, Shares, Downloads, Settings",
|
||||
),
|
||||
("Ctrl ,", "Settings"),
|
||||
("Ctrl V", "Paste a share link to add it"),
|
||||
("Tab or arrows", "Move between titles and episodes"),
|
||||
@@ -33,6 +36,7 @@ const GROUPS: &[(&str, &[(&str, &str)])] = &[
|
||||
("N / P", "Next and previous episode"),
|
||||
("[ / ]", "Slower and faster"),
|
||||
("S", "Skip the opening or the credits"),
|
||||
("E", "The list of episodes"),
|
||||
("F or double-click", "Fullscreen"),
|
||||
("Esc", "Leave fullscreen, then the player"),
|
||||
],
|
||||
@@ -47,7 +51,7 @@ pub fn show(ctx: &egui::Context) -> bool {
|
||||
egui::Frame::new()
|
||||
.fill(theme::surface())
|
||||
.inner_margin(egui::Margin::same(20))
|
||||
.corner_radius(egui::CornerRadius::same(12)),
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::LG)),
|
||||
)
|
||||
.show(ctx, |ui| {
|
||||
ui.set_width(460.0);
|
||||
@@ -60,9 +64,9 @@ pub fn show(ctx: &egui::Context) -> bool {
|
||||
});
|
||||
});
|
||||
for (heading, keys) in GROUPS {
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.label(ui::muted(heading.to_uppercase()));
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
egui::Grid::new(*heading)
|
||||
.num_columns(2)
|
||||
.spacing([18.0, 8.0])
|
||||
|
||||
@@ -20,6 +20,7 @@ pub fn show(
|
||||
art: &mut Art<'_>,
|
||||
library: &Library,
|
||||
key: &str,
|
||||
franchise: Option<&[String]>,
|
||||
offline: OfflineView<'_>,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
@@ -33,13 +34,22 @@ pub fn show(
|
||||
if back_link(ui).clicked() {
|
||||
actions.push(Action::Goto(Page::Library));
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
|
||||
egui::ScrollArea::vertical()
|
||||
.auto_shrink([false, false])
|
||||
.show(ui, |ui| {
|
||||
header(ui, art, title, &offline, actions);
|
||||
ui.add_space(18.0);
|
||||
ui.add_space(theme::space::XL);
|
||||
|
||||
if let Some(keys) = franchise {
|
||||
let members: Vec<&Title> = keys.iter().filter_map(|key| library.get(key)).collect();
|
||||
if members.len() > 1 {
|
||||
ui::section(ui, "In this franchise");
|
||||
franchise_row(ui, art, title, &members, actions);
|
||||
ui.add_space(theme::space::XL);
|
||||
}
|
||||
}
|
||||
|
||||
// One season at a time, picked from a row of pills, rather than
|
||||
// every season stacked as a collapsing header: a four-season show
|
||||
@@ -78,7 +88,7 @@ pub fn show(
|
||||
picked = index;
|
||||
ui.data_mut(|data| data.insert_temp(picked_id, index));
|
||||
}
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
}
|
||||
ui.label(ui::muted(ui::library::plural(
|
||||
season.episodes.len(),
|
||||
@@ -88,7 +98,7 @@ pub fn show(
|
||||
season_download(ui, title, season, &offline, actions);
|
||||
});
|
||||
});
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
let Some(season) = title.seasons.get(picked) else {
|
||||
return;
|
||||
@@ -96,7 +106,61 @@ pub fn show(
|
||||
for episode in &season.episodes {
|
||||
episode_row(ui, art, title, season, episode, &offline, actions);
|
||||
}
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
});
|
||||
}
|
||||
|
||||
/// Every title of the franchise, in release order, as covers — this one
|
||||
/// marked rather than left out, so the row says where it sits in the story.
|
||||
fn franchise_row(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut Art<'_>,
|
||||
current: &Title,
|
||||
members: &[&Title],
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
egui::ScrollArea::horizontal()
|
||||
.id_salt(("franchise", ¤t.key))
|
||||
.auto_shrink([false, true])
|
||||
.show(ui, |ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.spacing_mut().item_spacing.x = theme::CARD_GAP;
|
||||
for member in members {
|
||||
let here = member.key == current.key;
|
||||
let picture = art.poster(member);
|
||||
let found = art
|
||||
.metadata
|
||||
.get(&member.key)
|
||||
.and_then(|record| record.metadata.as_ref());
|
||||
let what = found
|
||||
.and_then(|found| found.details.as_ref())
|
||||
.and_then(|details| details.format_label())
|
||||
.unwrap_or(match member.kind {
|
||||
TitleKind::Series => "Series",
|
||||
TitleKind::Film => "Film",
|
||||
});
|
||||
let year = found
|
||||
.and_then(|found| found.year)
|
||||
.or(member.year)
|
||||
.map(|year| format!(" · {year}"))
|
||||
.unwrap_or_default();
|
||||
let response = ui::card(
|
||||
ui,
|
||||
Card {
|
||||
art: picture,
|
||||
name: art.name(member),
|
||||
subtitle: format!("{what}{year}"),
|
||||
progress: member.resume().and_then(|e| e.progress()).map(|v| v as f32),
|
||||
badge: here.then(|| "Here".to_owned()),
|
||||
width: 128.0,
|
||||
aspect: theme::POSTER_ASPECT,
|
||||
},
|
||||
);
|
||||
if !here && response.clicked() {
|
||||
actions.push(Action::Goto(Page::Title(member.key.clone())));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
@@ -105,7 +169,7 @@ pub fn show(
|
||||
fn poster(ui: &mut egui::Ui, texture: &egui::TextureHandle, progress: Option<f64>) {
|
||||
let size = egui::vec2(180.0, 270.0);
|
||||
let (rect, _) = ui.allocate_exact_size(size, egui::Sense::hover());
|
||||
let radius = egui::CornerRadius::same(10);
|
||||
let radius = egui::CornerRadius::same(theme::radius::LG);
|
||||
ui.painter()
|
||||
.add(theme::tile_shadow(1.0).as_shape(rect, radius));
|
||||
ui.painter().add(
|
||||
@@ -128,7 +192,7 @@ fn poster(ui: &mut egui::Ui, texture: &egui::TextureHandle, progress: Option<f64
|
||||
/// "← Library", as a link rather than a button: it is navigation, and a
|
||||
/// filled button beside the page's real actions competed with them.
|
||||
fn back_link(ui: &mut egui::Ui) -> egui::Response {
|
||||
let text = theme::Role::Label.rich("← Library");
|
||||
let text = theme::Role::Label.rich(format!("{} Library", egui_phosphor::regular::ARROW_LEFT));
|
||||
let response = ui.add(egui::Label::new(text.color(theme::muted())).sense(egui::Sense::click()));
|
||||
if response.hovered() {
|
||||
ui.painter().hline(
|
||||
@@ -190,18 +254,21 @@ fn header(
|
||||
let record = art.metadata.get(&title.key);
|
||||
let found = record.and_then(|record| record.metadata.clone());
|
||||
let by_hand = record.is_some_and(|record| record.manual);
|
||||
// Asked for once and used twice: the same picture is the poster beside the
|
||||
// text and the banner behind all of it.
|
||||
let picture = art.of(title);
|
||||
// The cover beside the text, and the widest, largest picture there is
|
||||
// behind all of it — two textures, because the band is drawn across the
|
||||
// whole window and a tile-sized one stretched that far is soft.
|
||||
let picture = art.poster(title);
|
||||
let wide = art.wide(title);
|
||||
|
||||
// Reserved before the header is laid out, because the band is as tall as
|
||||
// whatever the header comes to — a fixed height would clip a long overview
|
||||
// on one title and leave a gap under a short one on the next.
|
||||
let backdrop = picture
|
||||
let backdrop = wide
|
||||
.as_ref()
|
||||
.map(|(texture, _)| (texture.clone(), ui.painter().add(egui::Shape::Noop)));
|
||||
let shown = art.name(title).to_owned();
|
||||
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.horizontal_top(|ui| {
|
||||
match &picture {
|
||||
// A poster is drawn as a poster. Fitted into the 16:9 tile the grid
|
||||
@@ -214,37 +281,46 @@ fn header(
|
||||
ui,
|
||||
Card {
|
||||
art: picture,
|
||||
name: &title.name,
|
||||
name: &shown,
|
||||
subtitle: String::new(),
|
||||
progress: title.resume().and_then(|e| e.progress()).map(|v| v as f32),
|
||||
badge: None,
|
||||
width: theme::CARD_WIDTH,
|
||||
aspect: theme::CARD_ASPECT,
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
ui.add_space(22.0);
|
||||
ui.add_space(theme::space::XXL);
|
||||
ui.vertical(|ui| {
|
||||
// Text in a column a person can read, with the picture to the
|
||||
// right of it rather than under it.
|
||||
ui.set_max_width(ui.available_width().min(820.0));
|
||||
ui.label(theme::Role::Display.rich(&title.name).strong());
|
||||
// The provider's name for it, when it is not the one the files use.
|
||||
// Worth showing rather than replacing the filename's: a viewer
|
||||
// should be able to tell what the match actually matched.
|
||||
if let Some(found) = &found
|
||||
&& found.name != title.name
|
||||
{
|
||||
ui.label(theme::Role::Display.rich(&shown).strong());
|
||||
// Whichever of the share's name and the provider's is not the one
|
||||
// shown. Worth showing rather than only replacing: a viewer should
|
||||
// be able to tell what the match actually matched, and find the
|
||||
// folder it came from.
|
||||
let other = found
|
||||
.as_ref()
|
||||
.map(|found| {
|
||||
if shown == found.name {
|
||||
title.name.clone()
|
||||
} else {
|
||||
found.name.clone()
|
||||
}
|
||||
})
|
||||
.filter(|other| *other != shown);
|
||||
if let Some(other) = other {
|
||||
ui.label(ui::muted(format!(
|
||||
"also known as {}{}",
|
||||
found.name,
|
||||
"also known as {other}{}",
|
||||
if by_hand { " (chosen by hand)" } else { "" }
|
||||
)));
|
||||
}
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
ui.label(ui::muted(meta_line(title, found.as_ref())));
|
||||
ui.add_space(14.0);
|
||||
ui.add_space(theme::space::L);
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
if let Some(episode) = title.next_up() {
|
||||
@@ -342,14 +418,14 @@ fn header(
|
||||
});
|
||||
|
||||
if let Some(found) = &found {
|
||||
ui.add_space(14.0);
|
||||
ui.add_space(theme::space::L);
|
||||
description(ui, found);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
if let Some((texture, index)) = backdrop {
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
band(ui, &texture, index);
|
||||
}
|
||||
}
|
||||
@@ -449,14 +525,24 @@ fn band(ui: &mut egui::Ui, texture: &egui::TextureHandle, index: egui::layers::S
|
||||
|
||||
/// What the provider had to say. Only ever drawn under a match.
|
||||
fn description(ui: &mut egui::Ui, found: &TitleMetadata) {
|
||||
if !found.genres.is_empty() {
|
||||
let tags = found
|
||||
.details
|
||||
.as_ref()
|
||||
.map(|details| details.tags.as_slice())
|
||||
.unwrap_or_default();
|
||||
if !found.genres.is_empty() || !tags.is_empty() {
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.spacing_mut().item_spacing.x = 6.0;
|
||||
for genre in &found.genres {
|
||||
ui::widgets::chip(ui, genre);
|
||||
}
|
||||
// After the genres and quieter than them: a tag is the
|
||||
// provider's community describing it, not what it is filed as.
|
||||
for tag in tags.iter().take(5) {
|
||||
ui.label(ui::muted(tag));
|
||||
}
|
||||
});
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
}
|
||||
if let Some(overview) = &found.overview {
|
||||
// Four lines, then "More". A provider's synopsis runs to three
|
||||
@@ -496,7 +582,7 @@ fn description(ui: &mut egui::Ui, found: &TitleMetadata) {
|
||||
}
|
||||
}
|
||||
if let Some(url) = &found.url {
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
ui.hyperlink_to(
|
||||
ui::muted(format!("More on {}", found.provider.label())),
|
||||
url,
|
||||
@@ -530,9 +616,33 @@ fn meta_line(title: &Title, found: Option<&TitleMetadata>) -> String {
|
||||
parts.push(format!("{watched} watched"));
|
||||
}
|
||||
|
||||
if let Some(details) = found.and_then(|found| found.details.as_ref()) {
|
||||
if let Some(season) = details.season_label() {
|
||||
parts.push(season);
|
||||
}
|
||||
parts.extend(details.studios.iter().take(2).cloned());
|
||||
if let Some(director) = details.directors.first() {
|
||||
parts.push(format!("dir. {director}"));
|
||||
}
|
||||
let now = std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.map_or(0, |since| since.as_secs() as i64);
|
||||
if let Some((episode, at)) = details.next_airing(now) {
|
||||
let when = chrono::DateTime::from_timestamp(at, 0)
|
||||
.map(|at| {
|
||||
at.with_timezone(&chrono::Local)
|
||||
.format("%a %-d %b, %H:%M")
|
||||
.to_string()
|
||||
})
|
||||
.unwrap_or_default();
|
||||
parts.push(format!("episode {episode} airs {when}"));
|
||||
} else if details.is_airing() {
|
||||
parts.push("airing".to_owned());
|
||||
}
|
||||
}
|
||||
if let Some(found) = found {
|
||||
if let Some(rating) = found.rating {
|
||||
parts.push(format!("★ {rating:.1}"));
|
||||
parts.push(format!("{} {rating:.1}", egui_phosphor::regular::STAR));
|
||||
}
|
||||
// Only when it disagrees with what is on disk: "25 episodes · 25
|
||||
// episodes" tells nobody anything, but "12 episodes · 25 on AniList"
|
||||
@@ -573,15 +683,15 @@ fn episode_row(
|
||||
let row_id = ui.id().with(("episode", &episode.node.link_id));
|
||||
|
||||
let frame = egui::Frame::new()
|
||||
.corner_radius(egui::CornerRadius::same(10))
|
||||
.corner_radius(egui::CornerRadius::same(theme::radius::LG))
|
||||
.inner_margin(egui::Margin::same(8));
|
||||
let mut prepared = frame.begin(ui);
|
||||
{
|
||||
let ui = &mut prepared.content_ui;
|
||||
ui.set_width(ui.available_width());
|
||||
ui.horizontal_top(|ui| {
|
||||
still(ui, art, title, episode, watched, actions);
|
||||
ui.add_space(6.0);
|
||||
still(ui, art, title, episode, watched, STILL, actions);
|
||||
ui.add_space(theme::space::S);
|
||||
|
||||
let controls = 96.0;
|
||||
let text_width = (ui.available_width() - controls).max(120.0);
|
||||
@@ -643,8 +753,13 @@ fn episode_row(
|
||||
}
|
||||
});
|
||||
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
ui.set_min_height(STILL.y);
|
||||
// A fixed height, the still's. `with_layout` would hand the
|
||||
// buttons all the height left in the scroll area's viewport and
|
||||
// centre them in it, so whichever row sat highest on screen
|
||||
// stretched down to the bottom of the window.
|
||||
let cluster = egui::vec2(ui.available_width(), STILL.y);
|
||||
let layout = egui::Layout::right_to_left(egui::Align::Center);
|
||||
ui.allocate_ui_with_layout(cluster, layout, |ui| {
|
||||
if ui::widgets::watched_mark(ui, watched)
|
||||
.on_hover_text(if watched {
|
||||
"Mark unwatched"
|
||||
@@ -660,7 +775,7 @@ fn episode_row(
|
||||
duration: episode.watch.and_then(|watch| watch.duration_secs),
|
||||
});
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
download(ui, title, episode, offline, actions);
|
||||
});
|
||||
});
|
||||
@@ -671,11 +786,11 @@ fn episode_row(
|
||||
let lit = ui.ctx().animate_bool_with_time(
|
||||
row_id,
|
||||
response.hovered() || response.contains_pointer(),
|
||||
0.10,
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
prepared.frame.fill = theme::card().gamma_multiply(0.35 + 0.65 * lit);
|
||||
prepared.paint(ui);
|
||||
ui.add_space(2.0);
|
||||
ui.add_space(theme::space::XXS);
|
||||
}
|
||||
|
||||
/// The grey line under an episode's name: when it aired, how big it is, and
|
||||
@@ -711,19 +826,20 @@ fn details(episode: &Episode, air_date: Option<&str>) -> String {
|
||||
/// An explicit target rather than a clickable row: the row also carries the
|
||||
/// watched mark and the download button, and a click that meant either of
|
||||
/// those must never be one that starts a 1.4 GiB stream instead.
|
||||
fn still(
|
||||
pub(crate) fn still(
|
||||
ui: &mut egui::Ui,
|
||||
art: &mut Art<'_>,
|
||||
title: &Title,
|
||||
episode: &Episode,
|
||||
watched: bool,
|
||||
size: egui::Vec2,
|
||||
actions: &mut Vec<Action>,
|
||||
) {
|
||||
let (rect, response) = ui.allocate_exact_size(STILL, egui::Sense::click());
|
||||
let (rect, response) = ui.allocate_exact_size(size, egui::Sense::click());
|
||||
if !ui.is_rect_visible(rect) {
|
||||
return;
|
||||
}
|
||||
let radius = egui::CornerRadius::same(8);
|
||||
let radius = egui::CornerRadius::same(theme::radius::MD);
|
||||
let painter = ui.painter();
|
||||
painter.rect_filled(rect, radius, theme::card_hover());
|
||||
// Asked for only once the row is on screen: a season of twenty-five is
|
||||
@@ -746,7 +862,7 @@ fn still(
|
||||
let hover = ui.ctx().animate_bool_with_time(
|
||||
response.id,
|
||||
response.hovered() || response.has_focus(),
|
||||
0.12,
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
if hover > 0.0 {
|
||||
painter.rect_filled(
|
||||
|
||||
@@ -17,7 +17,7 @@ const ERROR_SECONDS: f64 = 9.0;
|
||||
/// How many fit at once. A burst beyond that drops the oldest.
|
||||
const MOST: usize = 4;
|
||||
/// How long one takes to arrive and to leave.
|
||||
const FADE: f64 = 0.18;
|
||||
const FADE: f64 = theme::motion::FADE as f64;
|
||||
const WIDTH: f32 = 340.0;
|
||||
|
||||
pub struct Toast {
|
||||
@@ -98,7 +98,7 @@ impl Toasts {
|
||||
let age = now - toast.at;
|
||||
let arriving = (age / FADE).clamp(0.0, 1.0) as f32;
|
||||
let leaving = ((life - age) / FADE).clamp(0.0, 1.0) as f32;
|
||||
let opacity = ease(arriving.min(leaving));
|
||||
let opacity = theme::motion::ease_out(arriving.min(leaving));
|
||||
|
||||
let area = egui::Area::new(egui::Id::new(("toast", toast.id)))
|
||||
.order(egui::Order::Foreground)
|
||||
@@ -150,10 +150,6 @@ fn lifetime(error: bool) -> f64 {
|
||||
if error { ERROR_SECONDS } else { SECONDS }
|
||||
}
|
||||
|
||||
fn ease(t: f32) -> f32 {
|
||||
1.0 - (1.0 - t).powi(3)
|
||||
}
|
||||
|
||||
/// Which of a toast's buttons was pressed.
|
||||
enum Pressed {
|
||||
Nothing,
|
||||
@@ -172,7 +168,7 @@ fn card(ui: &mut egui::Ui, toast: &Toast) -> Pressed {
|
||||
egui::Frame::new()
|
||||
.fill(theme::surface())
|
||||
.stroke(Stroke::new(1.0, theme::card_hover()))
|
||||
.corner_radius(CornerRadius::same(10))
|
||||
.corner_radius(CornerRadius::same(theme::radius::LG))
|
||||
.inner_margin(egui::Margin {
|
||||
left: 16,
|
||||
right: 10,
|
||||
@@ -211,7 +207,7 @@ fn card(ui: &mut egui::Ui, toast: &Toast) -> Pressed {
|
||||
pressed = Pressed::Close;
|
||||
}
|
||||
if let Some((label, _)) = &toast.action {
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
if ui
|
||||
.add(
|
||||
egui::Button::new(
|
||||
@@ -240,7 +236,8 @@ fn card(ui: &mut egui::Ui, toast: &Toast) -> Pressed {
|
||||
egui::pos2(frame.left() - 10.0, frame.top() - 4.0),
|
||||
egui::pos2(frame.left() - 7.0, frame.bottom() + 4.0),
|
||||
);
|
||||
ui.painter().rect_filled(strip, CornerRadius::same(2), edge);
|
||||
ui.painter()
|
||||
.rect_filled(strip, CornerRadius::same(theme::radius::BAR), edge);
|
||||
});
|
||||
pressed
|
||||
}
|
||||
|
||||
@@ -56,7 +56,7 @@ pub fn full(
|
||||
) {
|
||||
seek_bar(ui, playback, actions, 6.0);
|
||||
times(ui, playback, true);
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
ui.set_min_height(ROW_HEIGHT_FULL);
|
||||
@@ -65,7 +65,7 @@ pub fn full(
|
||||
// hand reaches for it.
|
||||
step_button(
|
||||
ui,
|
||||
"⏮",
|
||||
egui_phosphor::regular::SKIP_BACK,
|
||||
"Previous (P)",
|
||||
neighbours.previous,
|
||||
actions,
|
||||
@@ -76,11 +76,18 @@ pub fn full(
|
||||
skip_button(ui, "−10s", "Back ten seconds (←)", -10.0, actions);
|
||||
play_pause(ui, playback, actions, 44.0);
|
||||
skip_button(ui, "+30s", "Forward thirty seconds (→)", 30.0, actions);
|
||||
step_button(ui, "⏭", "Next (N)", neighbours.next, actions, |a| {
|
||||
a.push(Action::PlayAdjacent(Adjacent::Next));
|
||||
});
|
||||
step_button(
|
||||
ui,
|
||||
egui_phosphor::regular::SKIP_FORWARD,
|
||||
"Next (N)",
|
||||
neighbours.next,
|
||||
actions,
|
||||
|a| {
|
||||
a.push(Action::PlayAdjacent(Adjacent::Next));
|
||||
},
|
||||
);
|
||||
|
||||
ui.add_space(12.0);
|
||||
ui.add_space(theme::space::L);
|
||||
if playback.seeking || playback.buffering || !playback.loaded {
|
||||
ui.add(egui::Spinner::new().size(16.0));
|
||||
ui.label(ui::muted(if playback.loaded && playback.seeking {
|
||||
@@ -93,11 +100,11 @@ pub fn full(
|
||||
// Right cluster: everything that is a choice rather than a move.
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
track_menus(ui, playback, actions);
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
speed_menu(ui, playback, actions);
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
chapter_menu(ui, playback, actions);
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
volume(ui, playback, actions);
|
||||
});
|
||||
});
|
||||
@@ -123,7 +130,7 @@ pub fn mini(
|
||||
Some(texture) => {
|
||||
let (rect, response) = ui.allocate_exact_size(MINI_PICTURE, Sense::click());
|
||||
let painter = ui.painter();
|
||||
let radius = CornerRadius::same(6);
|
||||
let radius = CornerRadius::same(theme::radius::SM);
|
||||
painter.rect_filled(rect, radius, Color32::BLACK);
|
||||
painter.add(
|
||||
egui::epaint::RectShape::filled(rect, radius, Color32::WHITE).with_texture(
|
||||
@@ -134,7 +141,7 @@ pub fn mini(
|
||||
let hover = ui.ctx().animate_bool_with_time(
|
||||
response.id.with("hover"),
|
||||
response.hovered(),
|
||||
0.12,
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
if hover > 0.0 {
|
||||
painter.rect_filled(
|
||||
@@ -165,7 +172,7 @@ pub fn mini(
|
||||
.add(
|
||||
egui::Button::new(theme::Role::Label.rich("Back to video"))
|
||||
.fill(theme::card_hover())
|
||||
.corner_radius(CornerRadius::same(8)),
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD)),
|
||||
)
|
||||
.on_hover_text("Show the picture again")
|
||||
.clicked()
|
||||
@@ -174,7 +181,7 @@ pub fn mini(
|
||||
}
|
||||
}
|
||||
}
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
ui.vertical(|ui| {
|
||||
ui.horizontal(|ui| {
|
||||
ui.set_min_height(ROW_HEIGHT_MINI);
|
||||
@@ -201,14 +208,21 @@ pub fn mini(
|
||||
if ui.button("Stop").clicked() {
|
||||
actions.push(Action::Player(Command::Stop));
|
||||
}
|
||||
ui.add_space(6.0);
|
||||
step_button(ui, "⏭", "Next (N)", neighbours.next, actions, |a| {
|
||||
a.push(Action::PlayAdjacent(Adjacent::Next));
|
||||
});
|
||||
ui.add_space(theme::space::S);
|
||||
step_button(
|
||||
ui,
|
||||
egui_phosphor::regular::SKIP_FORWARD,
|
||||
"Next (N)",
|
||||
neighbours.next,
|
||||
actions,
|
||||
|a| {
|
||||
a.push(Action::PlayAdjacent(Adjacent::Next));
|
||||
},
|
||||
);
|
||||
play_pause(ui, playback, actions, 34.0);
|
||||
step_button(
|
||||
ui,
|
||||
"⏮",
|
||||
egui_phosphor::regular::SKIP_BACK,
|
||||
"Previous (P)",
|
||||
neighbours.previous,
|
||||
actions,
|
||||
@@ -217,18 +231,18 @@ pub fn mini(
|
||||
},
|
||||
);
|
||||
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
track_menus(ui, playback, actions);
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
volume(ui, playback, actions);
|
||||
|
||||
if playback.seeking || playback.buffering || !playback.loaded {
|
||||
ui.add_space(6.0);
|
||||
ui.add_space(theme::space::S);
|
||||
ui.add(egui::Spinner::new().size(14.0));
|
||||
}
|
||||
});
|
||||
});
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
seek_bar(ui, playback, actions, 5.0);
|
||||
times(ui, playback, false);
|
||||
});
|
||||
@@ -414,12 +428,14 @@ fn volume(ui: &mut egui::Ui, playback: &Playback, actions: &mut Vec<Action>) {
|
||||
}
|
||||
|
||||
let icon = if playback.muted || playback.volume <= 0.0 {
|
||||
"🔇"
|
||||
egui_phosphor::regular::SPEAKER_SLASH
|
||||
} else if playback.volume < 50.0 {
|
||||
egui_phosphor::regular::SPEAKER_LOW
|
||||
} else {
|
||||
"🔊"
|
||||
egui_phosphor::regular::SPEAKER_HIGH
|
||||
};
|
||||
if ui
|
||||
.button(icon)
|
||||
.button(theme::Role::Subhead.rich(icon))
|
||||
.on_hover_text(format!("Mute (M) — {:.0}%", playback.volume))
|
||||
.clicked()
|
||||
{
|
||||
@@ -553,11 +569,11 @@ fn seek_bar(ui: &mut egui::Ui, playback: &Playback, actions: &mut Vec<Action>, t
|
||||
|
||||
let active = response.hovered() || response.dragged();
|
||||
// Grows rather than jumps when the pointer arrives.
|
||||
let grow = ui
|
||||
.ctx()
|
||||
.animate_bool_with_time(response.id.with("grow"), active, 0.12);
|
||||
let grow =
|
||||
ui.ctx()
|
||||
.animate_bool_with_time(response.id.with("grow"), active, theme::motion::HOVER);
|
||||
let track = Rect::from_center_size(rect.center(), Vec2::new(width, thickness + 3.0 * grow));
|
||||
let radius = CornerRadius::same(3);
|
||||
let radius = CornerRadius::same(theme::radius::BAR);
|
||||
let painter = ui.painter();
|
||||
// From the palette rather than a fixed grey: the same bar sits on the
|
||||
// video's dark scrim and on a light theme's transport strip.
|
||||
@@ -676,6 +692,10 @@ fn bubble(ui: &egui::Ui, anchor: egui::Pos2, text: &str) {
|
||||
let screen = ui.ctx().content_rect();
|
||||
let left = (anchor.x - size.x / 2.0).clamp(screen.left() + 4.0, screen.right() - size.x - 4.0);
|
||||
let frame = Rect::from_min_size(egui::pos2(left, anchor.y - size.y), size);
|
||||
painter.rect_filled(frame, CornerRadius::same(6), Color32::from_black_alpha(215));
|
||||
painter.rect_filled(
|
||||
frame,
|
||||
CornerRadius::same(theme::radius::SM),
|
||||
Color32::from_black_alpha(215),
|
||||
);
|
||||
painter.galley(frame.min + Vec2::new(8.0, 4.0), galley, Color32::WHITE);
|
||||
}
|
||||
@@ -40,8 +40,12 @@ pub fn toggle(ui: &mut egui::Ui, on: &mut bool, text: &str) -> egui::Response {
|
||||
|
||||
if ui.is_rect_visible(rect) {
|
||||
let ctx = ui.ctx();
|
||||
let t = ctx.animate_bool_with_time(response.id, *on, 0.14);
|
||||
let hover = ctx.animate_bool_with_time(response.id.with("hover"), response.hovered(), 0.10);
|
||||
let t = ctx.animate_bool_with_time(response.id, *on, theme::motion::STATE);
|
||||
let hover = ctx.animate_bool_with_time(
|
||||
response.id.with("hover"),
|
||||
response.hovered(),
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
let track = egui::Rect::from_min_size(
|
||||
egui::pos2(rect.left(), rect.center().y - TRACK.y / 2.0),
|
||||
TRACK,
|
||||
@@ -96,8 +100,12 @@ pub fn watched_mark(ui: &mut egui::Ui, watched: bool) -> egui::Response {
|
||||
let (rect, response) = ui.allocate_exact_size(Vec2::splat(SIZE), Sense::click());
|
||||
if ui.is_rect_visible(rect) {
|
||||
let ctx = ui.ctx();
|
||||
let t = ctx.animate_bool_with_time(response.id, watched, 0.14);
|
||||
let hover = ctx.animate_bool_with_time(response.id.with("hover"), response.hovered(), 0.10);
|
||||
let t = ctx.animate_bool_with_time(response.id, watched, theme::motion::STATE);
|
||||
let hover = ctx.animate_bool_with_time(
|
||||
response.id.with("hover"),
|
||||
response.hovered(),
|
||||
theme::motion::HOVER,
|
||||
);
|
||||
let painter = ui.painter();
|
||||
let center = rect.center();
|
||||
let radius = SIZE / 2.0 - 1.0;
|
||||
@@ -147,7 +155,7 @@ pub fn settings_group<R>(
|
||||
description: Option<&str>,
|
||||
add: impl FnOnce(&mut egui::Ui) -> R,
|
||||
) -> R {
|
||||
ui.add_space(4.0);
|
||||
ui.add_space(theme::space::XS);
|
||||
ui.label(
|
||||
theme::Role::Subhead
|
||||
.rich(heading)
|
||||
@@ -155,13 +163,13 @@ pub fn settings_group<R>(
|
||||
.color(theme::text()),
|
||||
);
|
||||
if let Some(description) = description {
|
||||
ui.add_space(2.0);
|
||||
ui.add_space(theme::space::XXS);
|
||||
ui.label(crate::ui::muted(description));
|
||||
}
|
||||
ui.add_space(8.0);
|
||||
ui.add_space(theme::space::M);
|
||||
let inner = egui::Frame::new()
|
||||
.fill(theme::card())
|
||||
.corner_radius(CornerRadius::same(10))
|
||||
.corner_radius(CornerRadius::same(theme::radius::LG))
|
||||
.inner_margin(egui::Margin::symmetric(16, 6))
|
||||
.show(ui, |ui| {
|
||||
ui.set_width(ui.available_width());
|
||||
@@ -169,7 +177,7 @@ pub fn settings_group<R>(
|
||||
add(ui)
|
||||
})
|
||||
.inner;
|
||||
ui.add_space(26.0);
|
||||
ui.add_space(theme::space::XXL);
|
||||
inner
|
||||
}
|
||||
|
||||
@@ -192,7 +200,7 @@ pub fn settings_row<R>(
|
||||
Stroke::new(1.0, theme::card_hover()),
|
||||
);
|
||||
}
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
let inner = ui
|
||||
.horizontal(|ui| {
|
||||
ui.set_min_height(28.0);
|
||||
@@ -209,7 +217,7 @@ pub fn settings_row<R>(
|
||||
.inner
|
||||
})
|
||||
.inner;
|
||||
ui.add_space(10.0);
|
||||
ui.add_space(theme::space::L);
|
||||
inner
|
||||
}
|
||||
|
||||
@@ -224,7 +232,7 @@ pub fn segmented<T: Copy + PartialEq>(
|
||||
let mut picked = None;
|
||||
egui::Frame::new()
|
||||
.fill(theme::card_hover())
|
||||
.corner_radius(CornerRadius::same(8))
|
||||
.corner_radius(CornerRadius::same(theme::radius::MD))
|
||||
.inner_margin(egui::Margin::same(3))
|
||||
.show(ui, |ui| {
|
||||
ui.spacing_mut().item_spacing.x = 2.0;
|
||||
@@ -237,7 +245,7 @@ pub fn segmented<T: Copy + PartialEq>(
|
||||
theme::text()
|
||||
});
|
||||
let button = egui::Button::new(text)
|
||||
.corner_radius(CornerRadius::same(6))
|
||||
.corner_radius(CornerRadius::same(theme::radius::SM))
|
||||
.fill(if selected {
|
||||
theme::accent()
|
||||
} else {
|
||||
@@ -273,9 +281,9 @@ pub fn download_button(ui: &mut egui::Ui, glyph: DownloadGlyph) -> egui::Respons
|
||||
if !ui.is_rect_visible(rect) {
|
||||
return response;
|
||||
}
|
||||
let hover = ui
|
||||
.ctx()
|
||||
.animate_bool_with_time(response.id, response.hovered(), 0.10);
|
||||
let hover =
|
||||
ui.ctx()
|
||||
.animate_bool_with_time(response.id, response.hovered(), theme::motion::HOVER);
|
||||
let painter = ui.painter();
|
||||
let c = rect.center();
|
||||
if hover > 0.0 {
|
||||
@@ -352,7 +360,7 @@ pub fn download_button(ui: &mut egui::Ui, glyph: DownloadGlyph) -> egui::Respons
|
||||
pub fn chip(ui: &mut egui::Ui, text: &str) -> egui::Response {
|
||||
egui::Frame::new()
|
||||
.fill(theme::card_hover().gamma_multiply(0.8))
|
||||
.corner_radius(CornerRadius::same(10))
|
||||
.corner_radius(CornerRadius::same(theme::radius::LG))
|
||||
.inner_margin(egui::Margin::symmetric(9, 3))
|
||||
.show(ui, |ui| {
|
||||
ui.label(theme::Role::Caption.rich(text).color(theme::text()));
|
||||
|
||||
@@ -483,18 +483,19 @@ async fn metadata(dirs: &AppDirs, command: MetadataCommand) -> Result<()> {
|
||||
)
|
||||
.context("build the metadata provider")?;
|
||||
|
||||
let catalog = Catalog::open(&dirs.catalog_db()).context("open catalog")?;
|
||||
let mut catalog = Catalog::open(&dirs.catalog_db()).context("open catalog")?;
|
||||
let library = Library::build(catalog.all_files()?, &catalog.all_watch_states()?);
|
||||
let stored = catalog.all_metadata()?;
|
||||
let enriched = catalog.enrichment_ages()?;
|
||||
|
||||
let mut pending: Vec<_> = library
|
||||
.titles
|
||||
.iter()
|
||||
.filter(|title| {
|
||||
force
|
||||
|| !pstr_meta::service::is_usable(stored.get(&title.key), settings.provider)
|
||||
})
|
||||
.collect();
|
||||
let mut pending = pstr_meta::service::plan(
|
||||
library.titles,
|
||||
&stored,
|
||||
&enriched,
|
||||
settings.provider,
|
||||
service.has_details(),
|
||||
force,
|
||||
);
|
||||
if let Some(limit) = limit {
|
||||
pending.truncate(limit);
|
||||
}
|
||||
@@ -504,7 +505,7 @@ async fn metadata(dirs: &AppDirs, command: MetadataCommand) -> Result<()> {
|
||||
return Ok(());
|
||||
}
|
||||
println!(
|
||||
"matching {} titles against {}…",
|
||||
"looking up {} titles against {}…",
|
||||
pending.len(),
|
||||
settings.provider.label()
|
||||
);
|
||||
@@ -513,32 +514,71 @@ async fn metadata(dirs: &AppDirs, command: MetadataCommand) -> Result<()> {
|
||||
// and the GUI already has the parallel path. What this command is
|
||||
// for is reading the output.
|
||||
let (mut matched, mut failed) = (0usize, 0usize);
|
||||
for title in pending {
|
||||
match service.record(title).await {
|
||||
Ok(record) => {
|
||||
match &record.metadata {
|
||||
Some(found) => {
|
||||
matched += 1;
|
||||
println!(
|
||||
" {:<40} → {} ({})",
|
||||
title.name,
|
||||
found.name,
|
||||
found
|
||||
.year
|
||||
.map(|year| year.to_string())
|
||||
.unwrap_or_else(|| "-".into())
|
||||
);
|
||||
}
|
||||
None => println!(" {:<40} → no match", title.name),
|
||||
}
|
||||
catalog.set_metadata(&record)?;
|
||||
}
|
||||
for work in pending {
|
||||
use pstr_meta::service::Work;
|
||||
let name = &work.title().name;
|
||||
// Whether this work asks for episodes at all — a refresh of an
|
||||
// already-enriched title does not, and saying they were "not
|
||||
// fetched" there reads as a failure.
|
||||
let enriches = matches!(work, Work::Match(_) | Work::Refresh { enrich: true, .. });
|
||||
let outcome = match service.work(&work).await {
|
||||
Ok(outcome) => outcome,
|
||||
Err(error) => {
|
||||
failed += 1;
|
||||
// Not stored: a failure to ask is not an answer, and the
|
||||
// title has to stay askable. See `pstr_meta::service`.
|
||||
println!(" {:<40} ! {error}", title.name);
|
||||
println!(" {name:<40} ! {error}");
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
if let Some(record) = &outcome.record {
|
||||
match &record.metadata {
|
||||
Some(found) => {
|
||||
matched += 1;
|
||||
println!(
|
||||
" {name:<40} → {} ({})",
|
||||
found.name,
|
||||
found
|
||||
.year
|
||||
.map(|year| year.to_string())
|
||||
.unwrap_or_else(|| "-".into())
|
||||
);
|
||||
}
|
||||
None => println!(" {name:<40} → no match"),
|
||||
}
|
||||
catalog.set_metadata(record)?;
|
||||
}
|
||||
match &outcome.enrichment {
|
||||
Some(enrichment) => {
|
||||
println!(
|
||||
" {:<40} {} episodes{}",
|
||||
"",
|
||||
enrichment.episodes.len(),
|
||||
if enrichment.backdrop_url.is_some() {
|
||||
", fanart"
|
||||
} else {
|
||||
""
|
||||
}
|
||||
);
|
||||
catalog.set_enrichment(
|
||||
&outcome.title_key,
|
||||
settings.provider,
|
||||
unix_now(),
|
||||
enrichment,
|
||||
)?;
|
||||
}
|
||||
// Matched, but the episodes could not be asked for; the
|
||||
// next run asks again.
|
||||
None if enriches
|
||||
&& outcome
|
||||
.record
|
||||
.as_ref()
|
||||
.is_some_and(|r| r.metadata.is_some()) =>
|
||||
{
|
||||
println!(" {:<40} ! episodes not fetched", "");
|
||||
}
|
||||
None => {}
|
||||
}
|
||||
}
|
||||
println!("{matched} matched, {failed} could not be looked up");
|
||||
@@ -926,3 +966,10 @@ async fn play(
|
||||
drop(opened.library);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Unix seconds, for the "when was this asked" columns.
|
||||
fn unix_now() -> i64 {
|
||||
std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.map_or(0, |since| since.as_secs() as i64)
|
||||
}
|
||||
@@ -123,6 +123,30 @@ impl Accent {
|
||||
}
|
||||
}
|
||||
|
||||
/// What shape the library's grid is.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize)]
|
||||
#[serde(rename_all = "kebab-case")]
|
||||
pub enum Tiles {
|
||||
/// 2:3 covers. The default, because the art a provider has for every
|
||||
/// title is a cover; a 16:9 still exists for fewer of them, and a grid of
|
||||
/// letterboxed covers was the desktop's weakest page.
|
||||
#[default]
|
||||
Posters,
|
||||
/// 16:9 stills: the provider's fanart, else a frame from the file.
|
||||
Stills,
|
||||
}
|
||||
|
||||
impl Tiles {
|
||||
pub const ALL: [Self; 2] = [Self::Posters, Self::Stills];
|
||||
|
||||
pub fn label(self) -> &'static str {
|
||||
match self {
|
||||
Self::Posters => "Posters",
|
||||
Self::Stills => "Stills",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The whole of the choice.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
|
||||
// An older or hand-edited file is missing fields rather than invalid.
|
||||
@@ -138,6 +162,10 @@ pub struct Appearance {
|
||||
/// slow ramp across a wide bar bands visibly, and flat is better than
|
||||
/// striped.
|
||||
pub gradients: bool,
|
||||
/// The library grid's shape.
|
||||
pub tiles: Tiles,
|
||||
/// Which name a title goes by.
|
||||
pub names: crate::metadata::TitleNames,
|
||||
}
|
||||
|
||||
impl Default for Appearance {
|
||||
@@ -146,6 +174,8 @@ impl Default for Appearance {
|
||||
flavor: Flavor::default(),
|
||||
accent: Accent::default(),
|
||||
gradients: true,
|
||||
tiles: Tiles::default(),
|
||||
names: crate::metadata::TitleNames::default(),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -615,6 +645,7 @@ mod tests {
|
||||
flavor: Flavor::Mocha,
|
||||
accent: Accent::PinkSky,
|
||||
gradients: false,
|
||||
..Appearance::default()
|
||||
};
|
||||
save(&dirs, &appearance).unwrap();
|
||||
assert_eq!(load(&dirs).unwrap(), appearance);
|
||||
@@ -652,6 +683,7 @@ mod tests {
|
||||
flavor,
|
||||
accent,
|
||||
gradients: true,
|
||||
..Appearance::default()
|
||||
});
|
||||
let ratio = worst_contrast(palette.accent, palette.accent_alt, palette.on_accent);
|
||||
assert!(
|
||||
@@ -681,6 +713,7 @@ mod tests {
|
||||
flavor: Flavor::Persona5,
|
||||
accent: Accent::Red,
|
||||
gradients: false,
|
||||
..Appearance::default()
|
||||
});
|
||||
assert_eq!(palette.accent, PERSONA5.red);
|
||||
assert!(!palette.light);
|
||||
@@ -697,6 +730,7 @@ mod tests {
|
||||
flavor,
|
||||
accent: Accent::Red,
|
||||
gradients: true,
|
||||
..Appearance::default()
|
||||
});
|
||||
// The accent is the flavour's red — deepened on the light flavour,
|
||||
// where it would otherwise be too bright to put a label on.
|
||||
|
||||
@@ -0,0 +1,395 @@
|
||||
//! Finding and ordering titles: what both library grids show, and in what
|
||||
//! order.
|
||||
//!
|
||||
//! Here rather than in a front end so the desktop and Android agree: the same
|
||||
//! search finds the same titles, a franchise folds into the same tile, and
|
||||
//! "Newest" means the same thing on both.
|
||||
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use crate::library::{Library, Title, sort_name};
|
||||
use crate::metadata::{MetadataRecord, TitleNames};
|
||||
|
||||
/// What order a grid is in.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
|
||||
pub enum Sort {
|
||||
/// By the name shown, ignoring a leading article.
|
||||
#[default]
|
||||
Name,
|
||||
/// Most recently played first.
|
||||
Recent,
|
||||
/// Most recently given a new file first.
|
||||
Added,
|
||||
/// Newest first by when it aired, undated last.
|
||||
Release,
|
||||
/// Best rated first, unrated last.
|
||||
Rating,
|
||||
/// Most followed at the provider first.
|
||||
Popularity,
|
||||
}
|
||||
|
||||
impl Sort {
|
||||
pub const ALL: [Self; 6] = [
|
||||
Self::Name,
|
||||
Self::Recent,
|
||||
Self::Added,
|
||||
Self::Release,
|
||||
Self::Rating,
|
||||
Self::Popularity,
|
||||
];
|
||||
|
||||
pub fn label(self) -> &'static str {
|
||||
match self {
|
||||
Self::Name => "A – Z",
|
||||
Self::Recent => "Recently watched",
|
||||
Self::Added => "Recently added",
|
||||
Self::Release => "Newest",
|
||||
Self::Rating => "Highest rated",
|
||||
Self::Popularity => "Most popular",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// The name to show for `title`: the provider's, in the form the viewer
|
||||
/// picked, else the share's.
|
||||
pub fn display_name<'a>(
|
||||
title: &'a Title,
|
||||
metadata: &'a HashMap<String, MetadataRecord>,
|
||||
names: TitleNames,
|
||||
) -> &'a str {
|
||||
metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.and_then(|found| found.display_name(names))
|
||||
.unwrap_or(&title.name)
|
||||
}
|
||||
|
||||
/// The titles `query` finds, in library order.
|
||||
///
|
||||
/// By the share's name and every filename under it — a release group, an
|
||||
/// episode name — and by every name the provider gave: a folder called
|
||||
/// `Sousou no Frieren` is found by typing "Frieren: Beyond".
|
||||
pub fn search<'a>(
|
||||
library: &'a Library,
|
||||
metadata: &HashMap<String, MetadataRecord>,
|
||||
query: &str,
|
||||
) -> Vec<&'a Title> {
|
||||
let needle = query.trim().to_lowercase();
|
||||
let by_files: HashSet<*const Title> = library
|
||||
.search(query)
|
||||
.into_iter()
|
||||
.map(|title| title as *const Title)
|
||||
.collect();
|
||||
library
|
||||
.titles
|
||||
.iter()
|
||||
.filter(|title| {
|
||||
by_files.contains(&(*title as *const Title))
|
||||
|| metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
.is_some_and(|found| {
|
||||
std::iter::once(found.name.as_str())
|
||||
.chain(found.original_name.as_deref())
|
||||
.chain(
|
||||
found
|
||||
.details
|
||||
.as_ref()
|
||||
.and_then(|details| details.romaji.as_deref()),
|
||||
)
|
||||
.any(|name| name.to_lowercase().contains(&needle))
|
||||
})
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// How to order a grid.
|
||||
#[derive(Debug, Clone, Copy)]
|
||||
pub struct Order<'a> {
|
||||
pub sort: Sort,
|
||||
/// One tile per franchise rather than one per title.
|
||||
pub grouped: bool,
|
||||
pub names: TitleNames,
|
||||
pub metadata: &'a HashMap<String, MetadataRecord>,
|
||||
/// When each title last gained a file, by key — see
|
||||
/// [`Library::added_at`].
|
||||
pub added: &'a HashMap<String, i64>,
|
||||
}
|
||||
|
||||
/// One tile: the title drawn, and every title it stands for — itself
|
||||
/// included, in release order — as indices into what was arranged.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct Tile {
|
||||
pub lead: usize,
|
||||
pub members: Vec<usize>,
|
||||
}
|
||||
|
||||
/// `titles` as tiles, in `order`.
|
||||
///
|
||||
/// Every sort is stable over the name order, so ties — and the undated,
|
||||
/// unrated and unplayed — keep their alphabetical order.
|
||||
pub fn arrange<'t>(titles: &[&'t Title], order: Order<'_>) -> Vec<Tile> {
|
||||
let metadata = order.metadata;
|
||||
let found = |title: &Title| {
|
||||
metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
};
|
||||
|
||||
let mut by_name: Vec<usize> = (0..titles.len()).collect();
|
||||
by_name
|
||||
.sort_by_cached_key(|&index| sort_name(display_name(titles[index], metadata, order.names)));
|
||||
let sorted: Vec<&Title> = by_name.iter().map(|&index| titles[index]).collect();
|
||||
|
||||
let mut tiles: Vec<Tile> = if order.grouped {
|
||||
crate::franchise::group(&sorted, metadata)
|
||||
.into_iter()
|
||||
.map(|franchise| Tile {
|
||||
lead: by_name[franchise.lead(&sorted)],
|
||||
members: franchise
|
||||
.members
|
||||
.iter()
|
||||
.map(|&member| by_name[member])
|
||||
.collect(),
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
by_name
|
||||
.iter()
|
||||
.map(|&index| Tile {
|
||||
lead: index,
|
||||
members: vec![index],
|
||||
})
|
||||
.collect()
|
||||
};
|
||||
|
||||
// A folded franchise files under the name on its tile — the lead's — and
|
||||
// not under whichever member sorted first: "Made in Abyss" belongs at M
|
||||
// even when its film is called "Dawn of the Deep Soul".
|
||||
tiles.sort_by_cached_key(|tile| {
|
||||
sort_name(display_name(titles[tile.lead], metadata, order.names))
|
||||
});
|
||||
|
||||
let members = |tile: &Tile| -> Vec<&'t Title> {
|
||||
tile.members.iter().map(|&index| titles[index]).collect()
|
||||
};
|
||||
match order.sort {
|
||||
Sort::Name => {}
|
||||
Sort::Recent => tiles.sort_by_key(|tile| {
|
||||
std::cmp::Reverse(members(tile).iter().map(|title| title.last_played()).max())
|
||||
}),
|
||||
Sort::Added => tiles.sort_by_key(|tile| {
|
||||
std::cmp::Reverse(
|
||||
members(tile)
|
||||
.iter()
|
||||
.filter_map(|title| order.added.get(&title.key))
|
||||
.max()
|
||||
.copied(),
|
||||
)
|
||||
}),
|
||||
Sort::Release => tiles.sort_by_cached_key(|tile| {
|
||||
std::cmp::Reverse(
|
||||
members(tile)
|
||||
.iter()
|
||||
.map(|title| crate::franchise::release_key(title, metadata))
|
||||
// `~` is how the key says "undated"; it sorts last here
|
||||
// rather than first.
|
||||
.filter(|key| key != "~")
|
||||
.max(),
|
||||
)
|
||||
}),
|
||||
Sort::Rating => tiles.sort_by_key(|tile| {
|
||||
std::cmp::Reverse(
|
||||
found(titles[tile.lead])
|
||||
.and_then(|found| found.rating)
|
||||
.map(|rating| (rating * 100.0) as i64),
|
||||
)
|
||||
}),
|
||||
Sort::Popularity => tiles.sort_by_key(|tile| {
|
||||
std::cmp::Reverse(
|
||||
found(titles[tile.lead])
|
||||
.and_then(|found| found.details.as_ref())
|
||||
.and_then(|details| details.popularity),
|
||||
)
|
||||
}),
|
||||
}
|
||||
tiles
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::library::TitleKind;
|
||||
use crate::metadata::{ProviderId, TitleDetails, TitleMetadata};
|
||||
|
||||
fn title(key: &str, name: &str, kind: TitleKind) -> Title {
|
||||
Title {
|
||||
key: key.into(),
|
||||
name: name.into(),
|
||||
year: None,
|
||||
kind,
|
||||
seasons: Vec::new(),
|
||||
share_ids: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn matched(
|
||||
key: &str,
|
||||
id: &str,
|
||||
english: &str,
|
||||
start: &str,
|
||||
rating: f32,
|
||||
related: &[&str],
|
||||
) -> (String, MetadataRecord) {
|
||||
(
|
||||
key.into(),
|
||||
MetadataRecord {
|
||||
title_key: key.into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(TitleMetadata {
|
||||
provider: ProviderId::AniList,
|
||||
remote_id: id.into(),
|
||||
name: english.into(),
|
||||
original_name: None,
|
||||
overview: None,
|
||||
year: None,
|
||||
kind: TitleKind::Series,
|
||||
poster_url: None,
|
||||
backdrop_url: None,
|
||||
rating: Some(rating),
|
||||
genres: Vec::new(),
|
||||
episodes: None,
|
||||
url: None,
|
||||
details: Some(TitleDetails {
|
||||
romaji: Some(key.into()),
|
||||
start_date: Some(start.into()),
|
||||
related: related.iter().map(|id| id.to_string()).collect(),
|
||||
..TitleDetails::default()
|
||||
}),
|
||||
}),
|
||||
fetched_at: 0,
|
||||
manual: false,
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
fn fixture() -> (Vec<Title>, HashMap<String, MetadataRecord>) {
|
||||
let titles = vec![
|
||||
title("abyss film", "Made in Abyss Dawn", TitleKind::Film),
|
||||
title("made in abyss", "Made in Abyss", TitleKind::Series),
|
||||
title("sousou no frieren", "Sousou no Frieren", TitleKind::Series),
|
||||
];
|
||||
let metadata = HashMap::from([
|
||||
matched(
|
||||
"abyss film",
|
||||
"2",
|
||||
"Dawn of the Deep Soul",
|
||||
"2020-01-17",
|
||||
8.5,
|
||||
&["1"],
|
||||
),
|
||||
matched(
|
||||
"made in abyss",
|
||||
"1",
|
||||
"Made in Abyss",
|
||||
"2017-07-07",
|
||||
8.4,
|
||||
&["2"],
|
||||
),
|
||||
matched(
|
||||
"sousou no frieren",
|
||||
"3",
|
||||
"Frieren: Beyond Journey's End",
|
||||
"2023-09-29",
|
||||
9.1,
|
||||
&[],
|
||||
),
|
||||
]);
|
||||
(titles, metadata)
|
||||
}
|
||||
|
||||
fn keys(tiles: &[Tile], titles: &[&Title]) -> Vec<String> {
|
||||
tiles
|
||||
.iter()
|
||||
.map(|tile| titles[tile.lead].key.clone())
|
||||
.collect()
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_franchise_folds_into_its_series_and_sorts_by_the_name_shown() {
|
||||
let (owned, metadata) = fixture();
|
||||
let titles: Vec<&Title> = owned.iter().collect();
|
||||
let added = HashMap::new();
|
||||
let order = Order {
|
||||
sort: Sort::Name,
|
||||
grouped: true,
|
||||
names: TitleNames::English,
|
||||
metadata: &metadata,
|
||||
added: &added,
|
||||
};
|
||||
let tiles = arrange(&titles, order);
|
||||
// "Frieren" before "Made in Abyss" in English; the film is folded.
|
||||
assert_eq!(
|
||||
keys(&tiles, &titles),
|
||||
vec!["sousou no frieren", "made in abyss"]
|
||||
);
|
||||
assert_eq!(tiles[1].members, vec![1, 0]);
|
||||
|
||||
let tiles = arrange(
|
||||
&titles,
|
||||
Order {
|
||||
names: TitleNames::Library,
|
||||
grouped: false,
|
||||
..order
|
||||
},
|
||||
);
|
||||
assert_eq!(
|
||||
keys(&tiles, &titles),
|
||||
vec!["made in abyss", "abyss film", "sousou no frieren"]
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn newest_and_best_rated_read_the_provider_and_put_the_unknown_last() {
|
||||
let (mut owned, metadata) = fixture();
|
||||
owned.push(title(
|
||||
"game of thrones",
|
||||
"Game of Thrones",
|
||||
TitleKind::Series,
|
||||
));
|
||||
let titles: Vec<&Title> = owned.iter().collect();
|
||||
let added = HashMap::new();
|
||||
let order = Order {
|
||||
sort: Sort::Release,
|
||||
grouped: true,
|
||||
names: TitleNames::Library,
|
||||
metadata: &metadata,
|
||||
added: &added,
|
||||
};
|
||||
// The Made in Abyss franchise dates from its newest part, 2020.
|
||||
assert_eq!(
|
||||
keys(&arrange(&titles, order), &titles),
|
||||
vec!["sousou no frieren", "made in abyss", "game of thrones"]
|
||||
);
|
||||
let order = Order {
|
||||
sort: Sort::Rating,
|
||||
..order
|
||||
};
|
||||
assert_eq!(
|
||||
keys(&arrange(&titles, order), &titles)
|
||||
.last()
|
||||
.map(String::as_str),
|
||||
Some("game of thrones")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn search_finds_a_title_by_any_name_the_provider_gave_it() {
|
||||
let (owned, metadata) = fixture();
|
||||
let library = Library { titles: owned };
|
||||
let found = search(&library, &metadata, "beyond journey");
|
||||
assert_eq!(found.len(), 1);
|
||||
assert_eq!(found[0].key, "sousou no frieren");
|
||||
assert_eq!(search(&library, &metadata, "").len(), 3);
|
||||
}
|
||||
}
|
||||
@@ -17,11 +17,14 @@ use rusqlite::{Connection, OptionalExtension, params};
|
||||
|
||||
use crate::error::Result;
|
||||
use crate::library::TitleKind;
|
||||
use crate::metadata::{EpisodeGuide, EpisodeMetadata, MetadataRecord, ProviderId, TitleMetadata};
|
||||
use crate::metadata::{
|
||||
Enrichment, EpisodeGuide, EpisodeMetadata, MetadataRecord, ProviderId, TitleDetails,
|
||||
TitleMetadata,
|
||||
};
|
||||
use crate::naming::{self, ParsedName};
|
||||
|
||||
/// Bump when adding a migration.
|
||||
pub const SCHEMA_VERSION: i64 = 8;
|
||||
pub const SCHEMA_VERSION: i64 = 10;
|
||||
|
||||
const MIGRATION_V1: &str = r#"
|
||||
CREATE TABLE nodes (
|
||||
@@ -153,6 +156,57 @@ ALTER TABLE title_track_prefs ADD COLUMN audio_title TEXT;
|
||||
ALTER TABLE title_track_prefs ADD COLUMN subtitle_title TEXT;
|
||||
"#;
|
||||
|
||||
/// Episodes numbered three ways, and a record of which titles were enriched.
|
||||
///
|
||||
/// A release numbers its files by TVDB season, by absolute number inside a
|
||||
/// season folder, or by AniList entry; an episode row now carries all three so
|
||||
/// `EpisodeGuide::get` can meet whichever the filename used. `enriched_at` is
|
||||
/// set once a matched title's episodes and art were asked for — empty answers
|
||||
/// included, which is what stops a film being re-asked on every run.
|
||||
///
|
||||
/// The deletes are a repair, not a reset. Every AniList episode row came from
|
||||
/// `streamingEpisodes` — partial, numbered however a streaming site numbered
|
||||
/// it, and in places a later season captioned with season one's names — and
|
||||
/// every AniList backdrop was a 4.75:1 banner drawn into a 16:9 tile. Both are
|
||||
/// wrong rather than stale, so they go; the matches stay, hand-picked ones
|
||||
/// included, and the next match run enriches them again. See
|
||||
/// `docs/METADATA.md`.
|
||||
const MIGRATION_V9: &str = r#"
|
||||
ALTER TABLE episode_metadata ADD COLUMN absolute INTEGER;
|
||||
ALTER TABLE episode_metadata ADD COLUMN entry_season INTEGER;
|
||||
ALTER TABLE episode_metadata ADD COLUMN entry_number INTEGER;
|
||||
ALTER TABLE title_metadata ADD COLUMN enriched_at INTEGER;
|
||||
DELETE FROM episode_metadata WHERE provider = 'anilist';
|
||||
UPDATE title_metadata SET backdrop_url = NULL WHERE provider = 'anilist';
|
||||
"#;
|
||||
|
||||
/// What the library is sorted, grouped and shelved by, and when each file
|
||||
/// first appeared.
|
||||
///
|
||||
/// `details` is [`TitleDetails`] as JSON — see there for why one column.
|
||||
/// `NULL` means it was never fetched, which a match run reads as "fetch it"
|
||||
/// rather than as "there is none"; every existing match starts that way.
|
||||
/// `chain` is the provider ids enrichment walked, newline-separated; every
|
||||
/// title is marked un-enriched so the next run records it.
|
||||
///
|
||||
/// `node_first_seen` is kept apart from `nodes` because a recrawl replaces
|
||||
/// every node row and "recently added" has to survive that. Files already in
|
||||
/// the catalog are recorded as seen at 0 — when they arrived is not known, and
|
||||
/// pretending it was today would put the whole library at the top.
|
||||
const MIGRATION_V10: &str = r#"
|
||||
ALTER TABLE title_metadata ADD COLUMN details TEXT;
|
||||
ALTER TABLE title_metadata ADD COLUMN chain TEXT;
|
||||
CREATE TABLE node_first_seen (
|
||||
share_id TEXT NOT NULL,
|
||||
link_id TEXT NOT NULL,
|
||||
seen_at INTEGER NOT NULL,
|
||||
PRIMARY KEY (share_id, link_id)
|
||||
);
|
||||
INSERT OR IGNORE INTO node_first_seen (share_id, link_id, seen_at)
|
||||
SELECT share_id, link_id, 0 FROM nodes WHERE is_folder = 0;
|
||||
UPDATE title_metadata SET enriched_at = NULL;
|
||||
"#;
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct OfflineFile {
|
||||
pub revision_id: String,
|
||||
@@ -332,6 +386,18 @@ impl Catalog {
|
||||
tx.pragma_update(None, "user_version", 8)?;
|
||||
tx.commit()?;
|
||||
}
|
||||
if version < 9 {
|
||||
let tx = self.conn.transaction()?;
|
||||
tx.execute_batch(MIGRATION_V9)?;
|
||||
tx.pragma_update(None, "user_version", 9)?;
|
||||
tx.commit()?;
|
||||
}
|
||||
if version < 10 {
|
||||
let tx = self.conn.transaction()?;
|
||||
tx.execute_batch(MIGRATION_V10)?;
|
||||
tx.pragma_update(None, "user_version", 10)?;
|
||||
tx.commit()?;
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -392,6 +458,13 @@ impl Catalog {
|
||||
}
|
||||
}
|
||||
|
||||
// Only files: a folder appearing is not something anyone watches.
|
||||
tx.execute(
|
||||
"INSERT OR IGNORE INTO node_first_seen (share_id, link_id, seen_at)
|
||||
SELECT share_id, link_id, ?2 FROM nodes WHERE share_id = ?1 AND is_folder = 0",
|
||||
params![share_id, unix_now()],
|
||||
)?;
|
||||
|
||||
if !retain_offline {
|
||||
tx.execute("DELETE FROM offline_files WHERE share_id = ?1 AND NOT EXISTS (SELECT 1 FROM nodes WHERE nodes.share_id = offline_files.share_id AND nodes.link_id = offline_files.link_id AND nodes.active_revision_id = offline_files.revision_id)", params![share_id])?;
|
||||
}
|
||||
@@ -428,6 +501,18 @@ impl Catalog {
|
||||
Ok(rows.collect::<std::result::Result<Vec<_>, _>>()?)
|
||||
}
|
||||
|
||||
/// When each file first appeared in a crawl, keyed `(share_id, link_id)`.
|
||||
/// `0` for a file that was already there before this was recorded.
|
||||
pub fn first_seen(&self) -> Result<HashMap<(String, String), i64>> {
|
||||
let mut statement = self
|
||||
.conn
|
||||
.prepare("SELECT share_id, link_id, seen_at FROM node_first_seen")?;
|
||||
let rows = statement.query_map([], |row| {
|
||||
Ok(((row.get(0)?, row.get(1)?), row.get::<_, i64>(2)?))
|
||||
})?;
|
||||
Ok(rows.collect::<std::result::Result<_, _>>()?)
|
||||
}
|
||||
|
||||
/// Drop everything a share contributed, watch positions included.
|
||||
///
|
||||
/// Unlike a recrawl — which replaces rows and deliberately leaves watch
|
||||
@@ -445,6 +530,10 @@ impl Catalog {
|
||||
"DELETE FROM offline_files WHERE share_id = ?1",
|
||||
params![share_id],
|
||||
)?;
|
||||
tx.execute(
|
||||
"DELETE FROM node_first_seen WHERE share_id = ?1",
|
||||
params![share_id],
|
||||
)?;
|
||||
tx.commit()?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -665,7 +754,7 @@ impl Catalog {
|
||||
let mut statement = self.conn.prepare(
|
||||
"SELECT title_key, provider, matched, fetched_at, remote_id, name, original_name,
|
||||
overview, year, kind, poster_url, backdrop_url, rating, genres, episodes, url,
|
||||
manual
|
||||
manual, details, chain
|
||||
FROM title_metadata",
|
||||
)?;
|
||||
let rows = statement.query_map([], row_to_metadata)?;
|
||||
@@ -686,7 +775,7 @@ impl Catalog {
|
||||
.query_row(
|
||||
"SELECT title_key, provider, matched, fetched_at, remote_id, name, original_name,
|
||||
overview, year, kind, poster_url, backdrop_url, rating, genres, episodes,
|
||||
url, manual
|
||||
url, manual, details, chain
|
||||
FROM title_metadata WHERE title_key = ?1",
|
||||
params![title_key],
|
||||
row_to_metadata,
|
||||
@@ -699,14 +788,41 @@ impl Catalog {
|
||||
///
|
||||
/// A miss is stored too — see [`MetadataRecord::metadata`]. Storing only
|
||||
/// matches would leave every unmatched title asking again on every render.
|
||||
///
|
||||
/// Clears the title's enrichment record, so the answer is enriched again;
|
||||
/// see [`Catalog::set_enrichment`]. And when the answer is a different
|
||||
/// entry from the one stored — or none — the old entry's episode rows go
|
||||
/// at once: they are not about this one, and a front end that pins a match
|
||||
/// without enriching it must not show them in the meantime.
|
||||
pub fn set_metadata(&self, record: &MetadataRecord) -> Result<()> {
|
||||
let data = record.metadata.as_ref();
|
||||
self.conn.execute(
|
||||
"INSERT INTO title_metadata (
|
||||
"DELETE FROM episode_metadata WHERE title_key = ?1 AND NOT EXISTS (
|
||||
SELECT 1 FROM title_metadata
|
||||
WHERE title_key = ?1 AND provider = ?2 AND remote_id IS ?3
|
||||
)",
|
||||
params![
|
||||
record.title_key,
|
||||
record.provider.as_str(),
|
||||
data.map(|data| data.remote_id.as_str()),
|
||||
],
|
||||
)?;
|
||||
let details = data
|
||||
.and_then(|data| data.details.as_ref())
|
||||
.map(serde_json::to_string)
|
||||
.transpose()
|
||||
.map_err(|error| crate::error::Error::Config(error.to_string()))?;
|
||||
// `same` below is whether the row already describes this entry. When
|
||||
// it does, what enrichment added — the fanart, the chain, the record
|
||||
// that it was asked — still describes it and is kept: refreshing a
|
||||
// match's details must not cost the library its episode lists.
|
||||
self.conn.execute(
|
||||
&"INSERT INTO title_metadata (
|
||||
title_key, provider, matched, fetched_at, remote_id, name, original_name,
|
||||
overview, year, kind, poster_url, backdrop_url, rating, genres, episodes, url,
|
||||
manual
|
||||
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16, ?17)
|
||||
manual, details
|
||||
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13, ?14, ?15, ?16,
|
||||
?17, ?18)
|
||||
ON CONFLICT (title_key) DO UPDATE SET
|
||||
provider = excluded.provider,
|
||||
matched = excluded.matched,
|
||||
@@ -718,12 +834,23 @@ impl Catalog {
|
||||
year = excluded.year,
|
||||
kind = excluded.kind,
|
||||
poster_url = excluded.poster_url,
|
||||
backdrop_url = excluded.backdrop_url,
|
||||
backdrop_url = CASE WHEN same THEN COALESCE(excluded.backdrop_url,
|
||||
title_metadata.backdrop_url)
|
||||
ELSE excluded.backdrop_url END,
|
||||
rating = excluded.rating,
|
||||
genres = excluded.genres,
|
||||
episodes = excluded.episodes,
|
||||
url = excluded.url,
|
||||
manual = excluded.manual",
|
||||
manual = excluded.manual,
|
||||
details = excluded.details,
|
||||
chain = CASE WHEN same THEN title_metadata.chain END,
|
||||
enriched_at = CASE WHEN same THEN title_metadata.enriched_at END"
|
||||
.replace(
|
||||
"same",
|
||||
"(title_metadata.provider = excluded.provider
|
||||
AND title_metadata.remote_id IS excluded.remote_id
|
||||
AND excluded.matched = 1)",
|
||||
),
|
||||
params![
|
||||
record.title_key,
|
||||
record.provider.as_str(),
|
||||
@@ -742,6 +869,7 @@ impl Catalog {
|
||||
data.and_then(|data| data.episodes),
|
||||
data.and_then(|data| data.url.as_deref()),
|
||||
record.manual as i64,
|
||||
details,
|
||||
],
|
||||
)?;
|
||||
Ok(())
|
||||
@@ -776,12 +904,7 @@ impl Catalog {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Replace everything stored about one title's episodes.
|
||||
///
|
||||
/// A replace rather than an upsert per row: a provider that has *dropped*
|
||||
/// an episode — a special that was recounted, a season renumbered — should
|
||||
/// leave nothing behind, and an episode list is small enough that the
|
||||
/// difference is a few hundred microseconds.
|
||||
/// Replace everything stored about one title's episodes, and nothing else.
|
||||
pub fn set_episode_metadata(
|
||||
&mut self,
|
||||
title_key: &str,
|
||||
@@ -790,31 +913,40 @@ impl Catalog {
|
||||
episodes: &[EpisodeMetadata],
|
||||
) -> Result<()> {
|
||||
let tx = self.conn.transaction()?;
|
||||
replace_episodes(&tx, title_key, provider, fetched_at, episodes)?;
|
||||
tx.commit()?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Store what enriching a matched title found, and that it was asked.
|
||||
///
|
||||
/// The episode list is replaced even when the new one is empty — a title
|
||||
/// re-pinned from a series to its film must not keep the series' episode
|
||||
/// names. The backdrop only changes when one was found. And the title is
|
||||
/// marked enriched either way, so a film with no episodes is not asked
|
||||
/// about again on every run; [`Catalog::set_metadata`] clears the mark when
|
||||
/// the match itself changes.
|
||||
pub fn set_enrichment(
|
||||
&mut self,
|
||||
title_key: &str,
|
||||
provider: ProviderId,
|
||||
fetched_at: i64,
|
||||
enrichment: &Enrichment,
|
||||
) -> Result<()> {
|
||||
let tx = self.conn.transaction()?;
|
||||
replace_episodes(&tx, title_key, provider, fetched_at, &enrichment.episodes)?;
|
||||
tx.execute(
|
||||
"DELETE FROM episode_metadata WHERE title_key = ?1",
|
||||
params![title_key],
|
||||
"UPDATE title_metadata
|
||||
SET enriched_at = ?3, backdrop_url = COALESCE(?4, backdrop_url), chain = ?5
|
||||
WHERE title_key = ?1 AND provider = ?2",
|
||||
params![
|
||||
title_key,
|
||||
provider.as_str(),
|
||||
fetched_at,
|
||||
enrichment.backdrop_url.as_deref(),
|
||||
enrichment.chain.join("\n"),
|
||||
],
|
||||
)?;
|
||||
{
|
||||
let mut insert = tx.prepare(
|
||||
"INSERT INTO episode_metadata (
|
||||
title_key, season, number, provider, fetched_at,
|
||||
name, overview, still_url, air_date
|
||||
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9)",
|
||||
)?;
|
||||
for episode in episodes {
|
||||
insert.execute(params![
|
||||
title_key,
|
||||
episode.season.map_or(ABSOLUTE_SEASON, i64::from),
|
||||
episode.number,
|
||||
provider.as_str(),
|
||||
fetched_at,
|
||||
episode.name.as_deref(),
|
||||
episode.overview.as_deref(),
|
||||
episode.still_url.as_deref(),
|
||||
episode.air_date.as_deref(),
|
||||
])?;
|
||||
}
|
||||
}
|
||||
tx.commit()?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -825,7 +957,8 @@ impl Catalog {
|
||||
/// season drawn a row at a time must not be a SQLite round-trip per row.
|
||||
pub fn all_episode_metadata(&self) -> Result<HashMap<String, EpisodeGuide>> {
|
||||
let mut statement = self.conn.prepare(
|
||||
"SELECT title_key, season, number, name, overview, still_url, air_date
|
||||
"SELECT title_key, season, number, name, overview, still_url, air_date,
|
||||
absolute, entry_season, entry_number
|
||||
FROM episode_metadata",
|
||||
)?;
|
||||
let rows = statement.query_map([], |row| {
|
||||
@@ -836,6 +969,9 @@ impl Catalog {
|
||||
EpisodeMetadata {
|
||||
season: (season != ABSOLUTE_SEASON).then_some(season as u32),
|
||||
number: row.get::<_, i64>(2)? as u32,
|
||||
absolute: row.get(7)?,
|
||||
entry_season: row.get(8)?,
|
||||
entry_number: row.get(9)?,
|
||||
name: row.get(3)?,
|
||||
overview: row.get(4)?,
|
||||
still_url: row.get(5)?,
|
||||
@@ -855,13 +991,13 @@ impl Catalog {
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// Which titles already have an episode list stored, and how fresh.
|
||||
///
|
||||
/// Enough to decide whether to ask again without reading every row: the
|
||||
/// answer is only ever compared against a TTL.
|
||||
pub fn episode_metadata_ages(&self) -> Result<HashMap<String, (ProviderId, i64)>> {
|
||||
/// When each matched title was last enriched, for the provider it is
|
||||
/// matched against. A title missing here has never been, or its match has
|
||||
/// changed since.
|
||||
pub fn enrichment_ages(&self) -> Result<HashMap<String, (ProviderId, i64)>> {
|
||||
let mut statement = self.conn.prepare(
|
||||
"SELECT title_key, provider, MIN(fetched_at) FROM episode_metadata GROUP BY title_key",
|
||||
"SELECT title_key, provider, enriched_at FROM title_metadata
|
||||
WHERE enriched_at IS NOT NULL",
|
||||
)?;
|
||||
let rows = statement.query_map([], |row| {
|
||||
Ok((
|
||||
@@ -873,15 +1009,80 @@ impl Catalog {
|
||||
|
||||
let mut ages = HashMap::new();
|
||||
for row in rows {
|
||||
let (title_key, provider, fetched_at) = row?;
|
||||
let (title_key, provider, enriched_at) = row?;
|
||||
if let Some(provider) = ProviderId::parse(&provider) {
|
||||
ages.insert(title_key, (provider, fetched_at));
|
||||
ages.insert(title_key, (provider, enriched_at));
|
||||
}
|
||||
}
|
||||
Ok(ages)
|
||||
}
|
||||
}
|
||||
|
||||
/// Replace every episode row of one title with `episodes`, inside `tx`.
|
||||
///
|
||||
/// A replace rather than an upsert per row: a provider that has *dropped* an
|
||||
/// episode — a special that was recounted, a season renumbered — should leave
|
||||
/// nothing behind, and an episode list is small enough that the difference is a
|
||||
/// few hundred microseconds.
|
||||
fn replace_episodes(
|
||||
tx: &rusqlite::Transaction<'_>,
|
||||
title_key: &str,
|
||||
provider: ProviderId,
|
||||
fetched_at: i64,
|
||||
episodes: &[EpisodeMetadata],
|
||||
) -> Result<()> {
|
||||
tx.execute(
|
||||
"DELETE FROM episode_metadata WHERE title_key = ?1",
|
||||
params![title_key],
|
||||
)?;
|
||||
let mut insert = tx.prepare(
|
||||
"INSERT OR REPLACE INTO episode_metadata (
|
||||
title_key, season, number, provider, fetched_at,
|
||||
name, overview, still_url, air_date,
|
||||
absolute, entry_season, entry_number
|
||||
) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)",
|
||||
)?;
|
||||
for episode in episodes {
|
||||
insert.execute(params![
|
||||
title_key,
|
||||
episode.season.map_or(ABSOLUTE_SEASON, i64::from),
|
||||
episode.number,
|
||||
provider.as_str(),
|
||||
fetched_at,
|
||||
episode.name.as_deref(),
|
||||
episode.overview.as_deref(),
|
||||
episode.still_url.as_deref(),
|
||||
episode.air_date.as_deref(),
|
||||
episode.absolute,
|
||||
episode.entry_season,
|
||||
episode.entry_number,
|
||||
])?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// The `details` and `chain` columns, read back.
|
||||
///
|
||||
/// JSON that will not parse is treated as never fetched rather than failing
|
||||
/// the read: the next match run fetches it again, where an error here would
|
||||
/// take the whole grid down over one row.
|
||||
fn details_column(details: Option<String>, chain: Option<String>) -> Option<TitleDetails> {
|
||||
let mut details: TitleDetails = serde_json::from_str(&details?).ok()?;
|
||||
details.chain = chain
|
||||
.unwrap_or_default()
|
||||
.lines()
|
||||
.filter(|id| !id.is_empty())
|
||||
.map(str::to_string)
|
||||
.collect();
|
||||
Some(details)
|
||||
}
|
||||
|
||||
fn unix_now() -> i64 {
|
||||
std::time::SystemTime::now()
|
||||
.duration_since(std::time::UNIX_EPOCH)
|
||||
.map_or(0, |since| since.as_secs() as i64)
|
||||
}
|
||||
|
||||
/// `None` for a row whose provider column this build does not recognise.
|
||||
fn row_to_metadata(row: &rusqlite::Row<'_>) -> rusqlite::Result<Option<MetadataRecord>> {
|
||||
let title_key: String = row.get(0)?;
|
||||
@@ -914,6 +1115,7 @@ fn row_to_metadata(row: &rusqlite::Row<'_>) -> rusqlite::Result<Option<MetadataR
|
||||
.collect(),
|
||||
episodes: row.get(14)?,
|
||||
url: row.get(15)?,
|
||||
details: details_column(row.get(17)?, row.get(18)?),
|
||||
})
|
||||
};
|
||||
|
||||
@@ -1198,6 +1400,7 @@ mod tests {
|
||||
genres: vec!["Action".into(), "Drama".into()],
|
||||
episodes: Some(25),
|
||||
url: Some("https://anilist.co/anime/16498".into()),
|
||||
details: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1281,6 +1484,9 @@ mod tests {
|
||||
&[EpisodeMetadata {
|
||||
season: None,
|
||||
number: 1,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some("To You, in 2000 Years".into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
@@ -1370,6 +1576,9 @@ mod tests {
|
||||
EpisodeMetadata {
|
||||
season: None,
|
||||
number: 57,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some("The Immortal Legion".into()),
|
||||
overview: Some("Ed and Al…".into()),
|
||||
still_url: None,
|
||||
@@ -1378,6 +1587,9 @@ mod tests {
|
||||
EpisodeMetadata {
|
||||
season: Some(1),
|
||||
number: 1,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some("Fullmetal Alchemist".into()),
|
||||
overview: None,
|
||||
still_url: Some("still.jpg".into()),
|
||||
@@ -1407,9 +1619,347 @@ mod tests {
|
||||
.expect("store again");
|
||||
let stored = catalog.all_episode_metadata().expect("read");
|
||||
assert_eq!(stored["fma"].len(), 1);
|
||||
}
|
||||
|
||||
let ages = catalog.episode_metadata_ages().expect("ages");
|
||||
assert_eq!(ages["fma"], (ProviderId::AniList, 200));
|
||||
/// The three numberings a release might use have to survive a restart, or
|
||||
/// an absolutely-numbered season folder stops finding its names.
|
||||
#[test]
|
||||
fn every_numbering_of_an_episode_round_trips() {
|
||||
let mut catalog = Catalog::in_memory().expect("open");
|
||||
let episode = EpisodeMetadata {
|
||||
season: Some(2),
|
||||
number: 11,
|
||||
absolute: Some(39),
|
||||
entry_season: Some(3),
|
||||
entry_number: Some(1),
|
||||
name: Some("Lightning's End".into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
air_date: None,
|
||||
};
|
||||
catalog
|
||||
.set_episode_metadata(
|
||||
"mushishi",
|
||||
ProviderId::AniList,
|
||||
1,
|
||||
std::slice::from_ref(&episode),
|
||||
)
|
||||
.expect("store");
|
||||
let stored = catalog.all_episode_metadata().expect("read");
|
||||
assert_eq!(stored["mushishi"].get(Some(2), 11), Some(&episode));
|
||||
assert_eq!(stored["mushishi"].get(Some(3), 1), Some(&episode));
|
||||
}
|
||||
|
||||
/// **What left Jujutsu Kaisen 0 with the TV series' episode names.** The
|
||||
/// title was re-pinned to the film, the film had no episodes, and an empty
|
||||
/// list was never written — so the series' list stayed.
|
||||
#[test]
|
||||
fn an_empty_enrichment_clears_the_episodes_the_last_match_left() {
|
||||
let mut catalog = Catalog::in_memory().expect("open");
|
||||
let record = MetadataRecord {
|
||||
title_key: "jujutsu kaisen 0 movie".into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(found()),
|
||||
fetched_at: 1,
|
||||
manual: true,
|
||||
};
|
||||
catalog.set_metadata(&record).expect("store");
|
||||
catalog
|
||||
.set_episode_metadata(
|
||||
&record.title_key,
|
||||
ProviderId::AniList,
|
||||
1,
|
||||
&[EpisodeMetadata {
|
||||
season: Some(1),
|
||||
number: 1,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some("Ryomen Sukuna".into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
air_date: None,
|
||||
}],
|
||||
)
|
||||
.expect("store episodes");
|
||||
|
||||
// Storing the same entry again keeps them; it is the same entry.
|
||||
catalog.set_metadata(&record).expect("store again");
|
||||
assert_eq!(catalog.all_episode_metadata().expect("read").len(), 1);
|
||||
|
||||
catalog
|
||||
.set_enrichment(
|
||||
&record.title_key,
|
||||
ProviderId::AniList,
|
||||
5,
|
||||
&Enrichment::default(),
|
||||
)
|
||||
.expect("enrich");
|
||||
assert!(catalog.all_episode_metadata().expect("read").is_empty());
|
||||
// Asked, and the answer was nothing: that is recorded, or a film is
|
||||
// asked again on every run.
|
||||
assert_eq!(
|
||||
catalog
|
||||
.enrichment_ages()
|
||||
.expect("ages")
|
||||
.get(&record.title_key),
|
||||
Some(&(ProviderId::AniList, 5))
|
||||
);
|
||||
}
|
||||
|
||||
/// Android pins a match without enriching it; until the next match run,
|
||||
/// the title must show no episode names rather than the old entry's.
|
||||
#[test]
|
||||
fn pinning_a_different_entry_drops_the_old_entrys_episodes_at_once() {
|
||||
let mut catalog = Catalog::in_memory().expect("open");
|
||||
let series = MetadataRecord {
|
||||
title_key: "jujutsu kaisen 0 movie".into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(found()),
|
||||
fetched_at: 1,
|
||||
manual: false,
|
||||
};
|
||||
catalog.set_metadata(&series).expect("store");
|
||||
catalog
|
||||
.set_episode_metadata(
|
||||
&series.title_key,
|
||||
ProviderId::AniList,
|
||||
1,
|
||||
&[EpisodeMetadata {
|
||||
season: Some(1),
|
||||
number: 1,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some("Ryomen Sukuna".into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
air_date: None,
|
||||
}],
|
||||
)
|
||||
.expect("store episodes");
|
||||
|
||||
let film = MetadataRecord {
|
||||
metadata: Some(TitleMetadata {
|
||||
remote_id: "131573".into(),
|
||||
..found()
|
||||
}),
|
||||
manual: true,
|
||||
..series
|
||||
};
|
||||
catalog.set_metadata(&film).expect("pin");
|
||||
assert!(catalog.all_episode_metadata().expect("read").is_empty());
|
||||
}
|
||||
|
||||
/// Enrichment adds a backdrop when it found one and otherwise leaves the
|
||||
/// match's own alone; a new match makes the title un-enriched again.
|
||||
#[test]
|
||||
fn enrichment_keeps_the_backdrop_it_did_not_replace_and_a_different_match_resets_it() {
|
||||
let mut catalog = Catalog::in_memory().expect("open");
|
||||
let record = MetadataRecord {
|
||||
title_key: "attack on titan".into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(TitleMetadata {
|
||||
backdrop_url: Some("old.jpg".into()),
|
||||
..found()
|
||||
}),
|
||||
fetched_at: 1,
|
||||
manual: false,
|
||||
};
|
||||
catalog.set_metadata(&record).expect("store");
|
||||
let backdrop = |catalog: &Catalog| {
|
||||
catalog
|
||||
.metadata("attack on titan")
|
||||
.expect("read")
|
||||
.and_then(|record| record.metadata)
|
||||
.and_then(|found| found.backdrop_url)
|
||||
};
|
||||
|
||||
catalog
|
||||
.set_enrichment(
|
||||
"attack on titan",
|
||||
ProviderId::AniList,
|
||||
2,
|
||||
&Enrichment::default(),
|
||||
)
|
||||
.expect("enrich");
|
||||
assert_eq!(backdrop(&catalog).as_deref(), Some("old.jpg"));
|
||||
|
||||
let enrichment = Enrichment {
|
||||
backdrop_url: Some("fanart.jpg".into()),
|
||||
..Enrichment::default()
|
||||
};
|
||||
catalog
|
||||
.set_enrichment("attack on titan", ProviderId::AniList, 3, &enrichment)
|
||||
.expect("enrich again");
|
||||
assert_eq!(backdrop(&catalog).as_deref(), Some("fanart.jpg"));
|
||||
|
||||
catalog
|
||||
.set_metadata(&MetadataRecord {
|
||||
metadata: Some(TitleMetadata {
|
||||
remote_id: "99147".into(),
|
||||
..found()
|
||||
}),
|
||||
..record
|
||||
})
|
||||
.expect("match something else");
|
||||
assert!(catalog.enrichment_ages().expect("ages").is_empty());
|
||||
}
|
||||
|
||||
/// Details round-trip, and refreshing a match's details — the same entry
|
||||
/// stored again — keeps what enrichment found for it.
|
||||
#[test]
|
||||
fn refreshing_the_same_match_keeps_its_enrichment_and_a_new_one_does_not() {
|
||||
let mut catalog = Catalog::in_memory().expect("open");
|
||||
let record = MetadataRecord {
|
||||
title_key: "mushishi".into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(found()),
|
||||
fetched_at: 1,
|
||||
manual: true,
|
||||
};
|
||||
catalog.set_metadata(&record).expect("store");
|
||||
let enrichment = Enrichment {
|
||||
episodes: vec![EpisodeMetadata {
|
||||
season: Some(1),
|
||||
number: 1,
|
||||
absolute: Some(1),
|
||||
entry_season: Some(1),
|
||||
entry_number: Some(1),
|
||||
name: Some("The Green Seat".into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
air_date: None,
|
||||
}],
|
||||
backdrop_url: Some("fanart.jpg".into()),
|
||||
chain: vec!["457".into(), "20595".into()],
|
||||
};
|
||||
catalog
|
||||
.set_enrichment("mushishi", ProviderId::AniList, 2, &enrichment)
|
||||
.expect("enrich");
|
||||
|
||||
let refreshed = MetadataRecord {
|
||||
metadata: Some(TitleMetadata {
|
||||
details: Some(TitleDetails {
|
||||
studios: vec!["Artland".into()],
|
||||
..TitleDetails::default()
|
||||
}),
|
||||
..found()
|
||||
}),
|
||||
fetched_at: 3,
|
||||
..record.clone()
|
||||
};
|
||||
catalog.set_metadata(&refreshed).expect("refresh");
|
||||
let read = catalog.metadata("mushishi").expect("read").expect("a row");
|
||||
let data = read.metadata.expect("matched");
|
||||
assert_eq!(data.backdrop_url.as_deref(), Some("fanart.jpg"));
|
||||
let details = data.details.expect("details");
|
||||
assert_eq!(details.studios, vec!["Artland"]);
|
||||
assert_eq!(details.chain, vec!["457", "20595"]);
|
||||
assert!(
|
||||
catalog
|
||||
.enrichment_ages()
|
||||
.expect("ages")
|
||||
.contains_key("mushishi")
|
||||
);
|
||||
assert_eq!(
|
||||
catalog.all_episode_metadata().expect("read")["mushishi"].len(),
|
||||
1
|
||||
);
|
||||
|
||||
// A different entry is a different answer: nothing carries over.
|
||||
catalog
|
||||
.set_metadata(&MetadataRecord {
|
||||
metadata: Some(TitleMetadata {
|
||||
remote_id: "20526".into(),
|
||||
..found()
|
||||
}),
|
||||
..record
|
||||
})
|
||||
.expect("repin");
|
||||
let read = catalog.metadata("mushishi").expect("read").expect("a row");
|
||||
assert_eq!(read.metadata.and_then(|data| data.backdrop_url), None);
|
||||
assert!(catalog.enrichment_ages().expect("ages").is_empty());
|
||||
}
|
||||
|
||||
/// A file keeps the moment it first appeared across recrawls, and one
|
||||
/// that was there before this was recorded reads as 0.
|
||||
#[test]
|
||||
fn a_file_remembers_when_it_first_appeared() {
|
||||
let mut catalog = Catalog::in_memory().expect("open");
|
||||
catalog
|
||||
.replace_share("s", &[file("s", "a", "Show S01E01.mkv")])
|
||||
.expect("crawl");
|
||||
let first = catalog.first_seen().expect("read")[&("s".to_string(), "a".to_string())];
|
||||
assert!(first > 0);
|
||||
catalog
|
||||
.conn
|
||||
.execute("UPDATE node_first_seen SET seen_at = 5", [])
|
||||
.expect("age it");
|
||||
catalog
|
||||
.replace_share(
|
||||
"s",
|
||||
&[
|
||||
file("s", "a", "Show S01E01.mkv"),
|
||||
file("s", "b", "Show S01E02.mkv"),
|
||||
],
|
||||
)
|
||||
.expect("recrawl");
|
||||
let seen = catalog.first_seen().expect("read");
|
||||
assert_eq!(seen[&("s".to_string(), "a".to_string())], 5);
|
||||
assert!(seen[&("s".to_string(), "b".to_string())] > 5);
|
||||
}
|
||||
|
||||
/// Schema v9 repairs what AniList's first episode source wrote: its
|
||||
/// episode rows and its banners go, and the matches — hand-picked ones
|
||||
/// included — stay.
|
||||
#[test]
|
||||
fn upgrading_drops_anilists_episode_rows_and_banners_but_keeps_its_matches() {
|
||||
let conn = Connection::open_in_memory().expect("open");
|
||||
for migration in [
|
||||
MIGRATION_V1,
|
||||
MIGRATION_V2,
|
||||
MIGRATION_V3,
|
||||
MIGRATION_V4,
|
||||
MIGRATION_V5,
|
||||
MIGRATION_V6,
|
||||
MIGRATION_V7,
|
||||
MIGRATION_V8,
|
||||
] {
|
||||
conn.execute_batch(migration).expect("migrate");
|
||||
}
|
||||
conn.pragma_update(None, "user_version", 8)
|
||||
.expect("set version");
|
||||
conn.execute_batch(
|
||||
"INSERT INTO title_metadata (title_key, provider, matched, fetched_at, remote_id,
|
||||
name, kind, backdrop_url, manual)
|
||||
VALUES ('aot', 'anilist', 1, 1, '16498', 'Attack on Titan', 'series',
|
||||
'banner.jpg', 1),
|
||||
('got', 'tmdb', 1, 1, '1399', 'Game of Thrones', 'series',
|
||||
'backdrop.jpg', 0);
|
||||
INSERT INTO episode_metadata (title_key, season, number, provider, fetched_at, name)
|
||||
VALUES ('aot', 2, 1, 'anilist', 1, 'Season one''s first, wrongly'),
|
||||
('got', 1, 1, 'tmdb', 1, 'Winter Is Coming');",
|
||||
)
|
||||
.expect("seed");
|
||||
|
||||
let catalog = Catalog::from_connection(conn).expect("upgrade");
|
||||
let records = catalog.all_metadata().expect("read");
|
||||
let aot = records["aot"].metadata.as_ref().expect("still matched");
|
||||
assert!(records["aot"].manual);
|
||||
assert_eq!(aot.backdrop_url, None);
|
||||
assert_eq!(
|
||||
records["got"]
|
||||
.metadata
|
||||
.as_ref()
|
||||
.and_then(|got| got.backdrop_url.as_deref()),
|
||||
Some("backdrop.jpg")
|
||||
);
|
||||
|
||||
let episodes = catalog.all_episode_metadata().expect("read");
|
||||
assert!(!episodes.contains_key("aot"));
|
||||
assert_eq!(episodes["got"].len(), 1);
|
||||
assert!(catalog.enrichment_ages().expect("ages").is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -1423,6 +1973,9 @@ mod tests {
|
||||
&[EpisodeMetadata {
|
||||
season: None,
|
||||
number: 1,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some("Fullmetal Alchemist".into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
|
||||
@@ -0,0 +1,290 @@
|
||||
//! Which titles in a library are one story.
|
||||
//!
|
||||
//! A share files a franchise however its uploader did: Made in Abyss as a
|
||||
//! series folder and three film folders, Evangelion as a series, two films and
|
||||
//! a folder of four more. The provider knows they belong together — AniList
|
||||
//! records prequels, sequels, side stories, recaps and retellings as relations
|
||||
//! — so the library can show one tile for the lot and the parts on its page.
|
||||
//!
|
||||
//! Grouping is by shared provider id, not by name. Two titles are one
|
||||
//! franchise when one names the other as related, or when both name the same
|
||||
//! entry: Mushishi's *Suzu no Shizuku* film relates to *Zoku Shou 2*, which the
|
||||
//! library does not hold as a title of its own but which the series' episode
|
||||
//! walk passed through (see [`crate::metadata::TitleDetails::chain`]).
|
||||
|
||||
use std::collections::HashMap;
|
||||
|
||||
use crate::library::{Title, TitleKind};
|
||||
use crate::metadata::MetadataRecord;
|
||||
|
||||
/// One franchise: indices into the titles it was built from, in release order.
|
||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||
pub struct Franchise {
|
||||
pub members: Vec<usize>,
|
||||
}
|
||||
|
||||
impl Franchise {
|
||||
/// The member that stands for the rest: the first series to air, or the
|
||||
/// first film when there is no series. What a viewer means by "Made in
|
||||
/// Abyss" is the show, not the recap film that came out after it.
|
||||
pub fn lead(&self, titles: &[&Title]) -> usize {
|
||||
self.members
|
||||
.iter()
|
||||
.copied()
|
||||
.find(|&index| titles[index].kind == TitleKind::Series)
|
||||
.unwrap_or(self.members[0])
|
||||
}
|
||||
}
|
||||
|
||||
/// Group `titles` into franchises, every title in exactly one.
|
||||
///
|
||||
/// Titles with no match are franchises of one. The groups come back in the
|
||||
/// order of their first member in `titles`, so a sorted list stays sorted.
|
||||
pub fn group(titles: &[&Title], metadata: &HashMap<String, MetadataRecord>) -> Vec<Franchise> {
|
||||
let mut sets = DisjointSets::new(titles.len());
|
||||
// The first title to name each provider id, for later titles naming it too.
|
||||
let mut named: HashMap<(crate::metadata::ProviderId, &str), usize> = HashMap::new();
|
||||
for (index, title) in titles.iter().enumerate() {
|
||||
let Some(found) = metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref())
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
let details = found.details.as_ref();
|
||||
let ids = std::iter::once(found.remote_id.as_str())
|
||||
.chain(details.into_iter().flat_map(|details| {
|
||||
details
|
||||
.related
|
||||
.iter()
|
||||
.chain(&details.chain)
|
||||
.map(String::as_str)
|
||||
}))
|
||||
.filter(|id| !id.is_empty());
|
||||
for id in ids {
|
||||
match named.get(&(found.provider, id)) {
|
||||
Some(&other) => sets.union(index, other),
|
||||
None => {
|
||||
named.insert((found.provider, id), index);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
let mut groups: Vec<Franchise> = Vec::new();
|
||||
let mut slot: HashMap<usize, usize> = HashMap::new();
|
||||
for index in 0..titles.len() {
|
||||
let root = sets.find(index);
|
||||
match slot.get(&root) {
|
||||
Some(&at) => groups[at].members.push(index),
|
||||
None => {
|
||||
slot.insert(root, groups.len());
|
||||
groups.push(Franchise {
|
||||
members: vec![index],
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
for franchise in &mut groups {
|
||||
franchise
|
||||
.members
|
||||
.sort_by_cached_key(|&index| release_key(titles[index], metadata));
|
||||
}
|
||||
groups
|
||||
}
|
||||
|
||||
/// What release order sorts on: the provider's start date, else the year the
|
||||
/// files state, else last.
|
||||
pub fn release_key(title: &Title, metadata: &HashMap<String, MetadataRecord>) -> String {
|
||||
let found = metadata
|
||||
.get(&title.key)
|
||||
.and_then(|record| record.metadata.as_ref());
|
||||
found
|
||||
.and_then(|found| found.details.as_ref())
|
||||
.and_then(|details| details.start_date.clone())
|
||||
.or_else(|| {
|
||||
found
|
||||
.and_then(|found| found.year)
|
||||
.map(|year| year.to_string())
|
||||
})
|
||||
.or_else(|| title.year.map(|year| year.to_string()))
|
||||
// `~` sorts after every digit: undated goes last.
|
||||
.unwrap_or_else(|| "~".to_string())
|
||||
}
|
||||
|
||||
struct DisjointSets {
|
||||
parent: Vec<usize>,
|
||||
}
|
||||
|
||||
impl DisjointSets {
|
||||
fn new(size: usize) -> Self {
|
||||
Self {
|
||||
parent: (0..size).collect(),
|
||||
}
|
||||
}
|
||||
|
||||
fn find(&mut self, mut index: usize) -> usize {
|
||||
while self.parent[index] != index {
|
||||
self.parent[index] = self.parent[self.parent[index]];
|
||||
index = self.parent[index];
|
||||
}
|
||||
index
|
||||
}
|
||||
|
||||
fn union(&mut self, left: usize, right: usize) {
|
||||
let (left, right) = (self.find(left), self.find(right));
|
||||
if left != right {
|
||||
// The earlier title stays the root, which keeps `group` stable.
|
||||
let (root, child) = (left.min(right), left.max(right));
|
||||
self.parent[child] = root;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::metadata::{ProviderId, TitleDetails, TitleMetadata};
|
||||
|
||||
fn title(key: &str, kind: TitleKind) -> Title {
|
||||
Title {
|
||||
key: key.into(),
|
||||
name: key.into(),
|
||||
year: None,
|
||||
kind,
|
||||
seasons: Vec::new(),
|
||||
share_ids: Vec::new(),
|
||||
}
|
||||
}
|
||||
|
||||
fn matched(
|
||||
key: &str,
|
||||
id: &str,
|
||||
start: &str,
|
||||
related: &[&str],
|
||||
chain: &[&str],
|
||||
) -> MetadataRecord {
|
||||
MetadataRecord {
|
||||
title_key: key.into(),
|
||||
provider: ProviderId::AniList,
|
||||
metadata: Some(TitleMetadata {
|
||||
provider: ProviderId::AniList,
|
||||
remote_id: id.into(),
|
||||
name: key.into(),
|
||||
original_name: None,
|
||||
overview: None,
|
||||
year: None,
|
||||
kind: TitleKind::Series,
|
||||
poster_url: None,
|
||||
backdrop_url: None,
|
||||
rating: None,
|
||||
genres: Vec::new(),
|
||||
episodes: None,
|
||||
url: None,
|
||||
details: Some(TitleDetails {
|
||||
start_date: Some(start.into()),
|
||||
related: related.iter().map(|id| id.to_string()).collect(),
|
||||
chain: chain.iter().map(|id| id.to_string()).collect(),
|
||||
..TitleDetails::default()
|
||||
}),
|
||||
}),
|
||||
fetched_at: 0,
|
||||
manual: false,
|
||||
}
|
||||
}
|
||||
|
||||
fn keys(groups: &[Franchise], titles: &[&Title]) -> Vec<Vec<String>> {
|
||||
groups
|
||||
.iter()
|
||||
.map(|group| {
|
||||
group
|
||||
.members
|
||||
.iter()
|
||||
.map(|&index| titles[index].key.clone())
|
||||
.collect()
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Made in Abyss: the films name the series, the series names the films.
|
||||
/// Paprika names nothing in the library and stays alone.
|
||||
#[test]
|
||||
fn titles_that_name_each_other_are_one_franchise_in_release_order() {
|
||||
let owned = [
|
||||
title("dawn of the deep soul", TitleKind::Film),
|
||||
title("made in abyss", TitleKind::Series),
|
||||
title("paprika", TitleKind::Film),
|
||||
];
|
||||
let titles: Vec<&Title> = owned.iter().collect();
|
||||
let metadata = HashMap::from([
|
||||
(
|
||||
"dawn of the deep soul".to_string(),
|
||||
matched(
|
||||
"dawn of the deep soul",
|
||||
"100643",
|
||||
"2020-01-17",
|
||||
&["97986"],
|
||||
&[],
|
||||
),
|
||||
),
|
||||
(
|
||||
"made in abyss".to_string(),
|
||||
matched("made in abyss", "97986", "2017-07-07", &["100643"], &[]),
|
||||
),
|
||||
(
|
||||
"paprika".to_string(),
|
||||
matched("paprika", "1943", "2006-11-25", &[], &[]),
|
||||
),
|
||||
]);
|
||||
|
||||
let groups = group(&titles, &metadata);
|
||||
assert_eq!(
|
||||
keys(&groups, &titles),
|
||||
vec![
|
||||
vec!["made in abyss", "dawn of the deep soul"],
|
||||
vec!["paprika"]
|
||||
]
|
||||
);
|
||||
assert_eq!(titles[groups[0].lead(&titles)].key, "made in abyss");
|
||||
}
|
||||
|
||||
/// Mushishi: the special names an entry the series only reached by
|
||||
/// walking its sequels for episodes. That is still the same story.
|
||||
#[test]
|
||||
fn an_entry_the_series_walked_through_joins_what_names_it() {
|
||||
let owned = [
|
||||
title("mushishi", TitleKind::Series),
|
||||
title("suzu no shizuku", TitleKind::Film),
|
||||
];
|
||||
let titles: Vec<&Title> = owned.iter().collect();
|
||||
let metadata = HashMap::from([
|
||||
(
|
||||
"mushishi".to_string(),
|
||||
matched(
|
||||
"mushishi",
|
||||
"457",
|
||||
"2005-10-23",
|
||||
&["20526"],
|
||||
&["457", "20595", "20751"],
|
||||
),
|
||||
),
|
||||
(
|
||||
"suzu no shizuku".to_string(),
|
||||
matched("suzu no shizuku", "21008", "2015-05-16", &["20751"], &[]),
|
||||
),
|
||||
]);
|
||||
assert_eq!(group(&titles, &metadata).len(), 1);
|
||||
}
|
||||
|
||||
/// Nothing matched, nothing to group by — and two unmatched titles are
|
||||
/// not one franchise because they share an empty id.
|
||||
#[test]
|
||||
fn unmatched_titles_stand_alone() {
|
||||
let owned = [
|
||||
title("game of thrones", TitleKind::Series),
|
||||
title("something else", TitleKind::Series),
|
||||
];
|
||||
let titles: Vec<&Title> = owned.iter().collect();
|
||||
assert_eq!(group(&titles, &HashMap::new()).len(), 2);
|
||||
}
|
||||
}
|
||||
@@ -6,15 +6,18 @@
|
||||
#![forbid(unsafe_code)]
|
||||
|
||||
pub mod appearance;
|
||||
pub mod browse;
|
||||
pub mod catalog;
|
||||
pub mod chapters;
|
||||
pub mod config;
|
||||
pub mod error;
|
||||
pub mod franchise;
|
||||
pub mod library;
|
||||
pub mod metadata;
|
||||
pub mod naming;
|
||||
pub mod prefs;
|
||||
pub mod shares;
|
||||
pub mod shelves;
|
||||
|
||||
pub use error::{Error, Result};
|
||||
#[cfg(not(target_os = "android"))]
|
||||
|
||||
@@ -369,6 +369,47 @@ impl Library {
|
||||
titles
|
||||
}
|
||||
|
||||
/// Every episode that has been started or finished, most recently
|
||||
/// touched first. The history page.
|
||||
///
|
||||
/// An episode marked unwatched keeps a row with position zero, which is
|
||||
/// "never played" for every purpose here, so it is left out.
|
||||
pub fn history(&self) -> Vec<(&Title, &Episode)> {
|
||||
let mut played: Vec<(&Title, &Episode)> = self
|
||||
.titles
|
||||
.iter()
|
||||
.flat_map(|title| title.episodes().map(move |episode| (title, episode)))
|
||||
.filter(|(_, episode)| {
|
||||
episode
|
||||
.watch
|
||||
.is_some_and(|watch| watch.watched || watch.position_secs > 0.0)
|
||||
})
|
||||
.collect();
|
||||
played.sort_by_key(|(_, episode)| std::cmp::Reverse(episode.last_played()));
|
||||
played
|
||||
}
|
||||
|
||||
/// When each title last gained a file, Unix seconds — the newest
|
||||
/// [`crate::catalog::Catalog::first_seen`] among its episodes. `0` for a
|
||||
/// title whose files were all there before that was recorded.
|
||||
pub fn added_at(&self, first_seen: &HashMap<(String, String), i64>) -> HashMap<String, i64> {
|
||||
self.titles
|
||||
.iter()
|
||||
.map(|title| {
|
||||
let newest = title
|
||||
.episodes()
|
||||
.filter_map(|episode| {
|
||||
first_seen
|
||||
.get(&(episode.node.share_id.clone(), episode.node.link_id.clone()))
|
||||
})
|
||||
.copied()
|
||||
.max()
|
||||
.unwrap_or(0);
|
||||
(title.key.clone(), newest)
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// Substring match over the display name and every filename under it, so
|
||||
/// searching for a release group or an episode name finds its title.
|
||||
pub fn search(&self, query: &str) -> Vec<&Title> {
|
||||
@@ -418,7 +459,7 @@ pub fn title_key(title: &str) -> String {
|
||||
|
||||
/// Sort key for the shelf: case-insensitive, and a leading article ignored, so
|
||||
/// `The Expanse` files under E where a viewer looks for it.
|
||||
fn sort_name(name: &str) -> String {
|
||||
pub fn sort_name(name: &str) -> String {
|
||||
let lower = name.to_lowercase();
|
||||
for article in ["the ", "a ", "an "] {
|
||||
if let Some(rest) = lower.strip_prefix(article) {
|
||||
@@ -517,6 +558,41 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn history_is_every_played_episode_newest_first_across_titles() {
|
||||
let watch_state = HashMap::from([
|
||||
(
|
||||
("s".to_string(), "a".to_string()),
|
||||
watch(600.0, 1400.0, false, 10),
|
||||
),
|
||||
(
|
||||
("s".to_string(), "c".to_string()),
|
||||
watch(1400.0, 1400.0, true, 30),
|
||||
),
|
||||
// Marked unwatched again: a row at zero, which is not a play.
|
||||
(
|
||||
("s".to_string(), "b".to_string()),
|
||||
watch(0.0, 1400.0, false, 40),
|
||||
),
|
||||
]);
|
||||
let library = Library::build(
|
||||
vec![
|
||||
node("s", "a", "Show - S01E01", Some(1), Some(1)),
|
||||
node("s", "b", "Show - S01E02", Some(1), Some(2)),
|
||||
node("s", "c", "Film", None, None),
|
||||
node("s", "d", "Other - S01E01", Some(1), Some(1)),
|
||||
],
|
||||
&watch_state,
|
||||
);
|
||||
|
||||
let order: Vec<&str> = library
|
||||
.history()
|
||||
.iter()
|
||||
.map(|(_, episode)| episode.node.link_id.as_str())
|
||||
.collect();
|
||||
assert_eq!(order, ["c", "a"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn groups_episodes_into_seasons() {
|
||||
let nodes = vec![
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
//! thumbnails at upload time and that client attaches none. See
|
||||
//! `docs/DEVELOPMENT.md`.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::collections::{HashMap, HashSet};
|
||||
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
@@ -31,7 +31,7 @@ use crate::library::TitleKind;
|
||||
/// Stored as a string in the catalog rather than an integer: a row whose
|
||||
/// provider this build does not recognise should read as "some other provider",
|
||||
/// which is a re-match, not a parse failure.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, Default)]
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Serialize, Deserialize, Default)]
|
||||
#[serde(rename_all = "lowercase")]
|
||||
pub enum ProviderId {
|
||||
/// AniList. Anime only, no API key, no account.
|
||||
@@ -62,7 +62,10 @@ impl ProviderId {
|
||||
/// One line on what it covers and what it costs to use.
|
||||
pub fn description(self) -> &'static str {
|
||||
match self {
|
||||
Self::AniList => "Anime, with no API key and no account.",
|
||||
Self::AniList => {
|
||||
"Anime, with no API key and no account. Episode names and wide art come from \
|
||||
ani.zip, which is sent the matched ids."
|
||||
}
|
||||
Self::Tmdb => "Film and television. Needs a free API key from themoviedb.org.",
|
||||
}
|
||||
}
|
||||
@@ -109,6 +112,156 @@ pub struct TitleMetadata {
|
||||
pub episodes: Option<u32>,
|
||||
/// The title's page, for a viewer who wants the rest of it.
|
||||
pub url: Option<String>,
|
||||
/// Everything else the provider said: what the library is sorted, grouped
|
||||
/// and shelved by. `None` on a record stored before there was any of it,
|
||||
/// which is what tells a match run to fetch it — see
|
||||
/// `pstr_meta::service::plan`.
|
||||
pub details: Option<TitleDetails>,
|
||||
}
|
||||
|
||||
/// What a provider says about a title beyond what a tile draws.
|
||||
///
|
||||
/// Stored whole as one JSON column rather than a column each: nothing here is
|
||||
/// ever queried by SQLite, every field is optional at every provider, and a
|
||||
/// field added later has to read as absent from a row written before it, not
|
||||
/// fail the row. TMDB fills none of it yet.
|
||||
#[derive(Debug, Clone, Default, PartialEq, Serialize, Deserialize)]
|
||||
#[serde(default)]
|
||||
pub struct TitleDetails {
|
||||
/// The title in romaji — `Sousou no Frieren` — for a viewer who would
|
||||
/// rather see that than the English one.
|
||||
pub romaji: Option<String>,
|
||||
/// AniList's ultra-wide banner, around 4.75:1. Never drawn into a 16:9
|
||||
/// tile — it is what a strip that shape falls back to when there is no
|
||||
/// fanart.
|
||||
pub banner_url: Option<String>,
|
||||
/// As the provider writes it: `TV`, `TV_SHORT`, `MOVIE`, `SPECIAL`, `OVA`,
|
||||
/// `ONA`, `MUSIC`. [`TitleDetails::format_label`] is what is shown.
|
||||
pub format: Option<String>,
|
||||
/// The broadcast season: `WINTER`, `SPRING`, `SUMMER` or `FALL`.
|
||||
pub season: Option<String>,
|
||||
/// When it first aired, `YYYY-MM-DD` with whatever parts are known —
|
||||
/// `2013-04`, `2013`. Sorts as text, which is why it is kept that way.
|
||||
pub start_date: Option<String>,
|
||||
/// The main animation studios.
|
||||
pub studios: Vec<String>,
|
||||
pub directors: Vec<String>,
|
||||
/// The provider's descriptive tags, most relevant first, spoilers left out.
|
||||
pub tags: Vec<String>,
|
||||
/// How many people follow it at the provider. Only ever compared with
|
||||
/// other titles from the same provider.
|
||||
pub popularity: Option<u32>,
|
||||
/// `FINISHED`, `RELEASING`, `NOT_YET_RELEASED`, `CANCELLED` or `HIATUS`.
|
||||
pub status: Option<String>,
|
||||
/// The next episode to air, and when — Unix seconds. As of when the
|
||||
/// answer was fetched, so a time in the past means nothing.
|
||||
pub next_episode: Option<u32>,
|
||||
pub next_airing_at: Option<i64>,
|
||||
/// The provider ids of entries in the same story — prequels, sequels,
|
||||
/// side stories, recaps, retellings. What the library groups a franchise
|
||||
/// by; see `crate::franchise`.
|
||||
pub related: Vec<String>,
|
||||
/// The entries enrichment walked through to find the title's episodes —
|
||||
/// its own sequels, by provider id. Stored apart from the rest, because
|
||||
/// it is enrichment's answer rather than the match's.
|
||||
#[serde(skip)]
|
||||
pub chain: Vec<String>,
|
||||
}
|
||||
|
||||
impl TitleDetails {
|
||||
/// `TV` → `TV`, `MOVIE` → `Film`, `TV_SHORT` → `TV short`.
|
||||
pub fn format_label(&self) -> Option<&'static str> {
|
||||
Some(match self.format.as_deref()? {
|
||||
"TV" => "TV",
|
||||
"TV_SHORT" => "TV short",
|
||||
"MOVIE" => "Film",
|
||||
"SPECIAL" => "Special",
|
||||
"OVA" => "OVA",
|
||||
"ONA" => "ONA",
|
||||
"MUSIC" => "Music video",
|
||||
_ => return None,
|
||||
})
|
||||
}
|
||||
|
||||
/// `Spring 2013`, or just the year.
|
||||
pub fn season_label(&self) -> Option<String> {
|
||||
let year = self.start_date.as_deref()?.get(..4)?;
|
||||
let season = match self.season.as_deref() {
|
||||
Some("WINTER") => "Winter",
|
||||
Some("SPRING") => "Spring",
|
||||
Some("SUMMER") => "Summer",
|
||||
Some("FALL") => "Fall",
|
||||
_ => return Some(year.to_string()),
|
||||
};
|
||||
Some(format!("{season} {year}"))
|
||||
}
|
||||
|
||||
/// Whether it is still airing.
|
||||
pub fn is_airing(&self) -> bool {
|
||||
self.status.as_deref() == Some("RELEASING")
|
||||
}
|
||||
|
||||
/// The next episode and when it airs, when that is still after `now`.
|
||||
pub fn next_airing(&self, now: i64) -> Option<(u32, i64)> {
|
||||
let at = self.next_airing_at.filter(|at| *at > now)?;
|
||||
Some((self.next_episode?, at))
|
||||
}
|
||||
}
|
||||
|
||||
impl TitleMetadata {
|
||||
/// Ultra-wide art: the backdrop where there is one, else the banner.
|
||||
///
|
||||
/// For the library's hero and the title page's band, which are much wider
|
||||
/// than 16:9 — a backdrop cropped to them loses some sky, a banner fits
|
||||
/// them as drawn.
|
||||
pub fn wide_art(&self) -> Option<&str> {
|
||||
self.backdrop_url.as_deref().or_else(|| {
|
||||
self.details
|
||||
.as_ref()
|
||||
.and_then(|details| details.banner_url.as_deref())
|
||||
})
|
||||
}
|
||||
|
||||
/// The name to show, as the viewer asked for it.
|
||||
pub fn display_name(&self, names: TitleNames) -> Option<&str> {
|
||||
match names {
|
||||
TitleNames::Library => None,
|
||||
TitleNames::English => Some(&self.name),
|
||||
TitleNames::Romaji => self
|
||||
.details
|
||||
.as_ref()
|
||||
.and_then(|details| details.romaji.as_deref())
|
||||
.or(Some(&self.name)),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Which name a title goes by in the library.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
|
||||
#[serde(rename_all = "kebab-case")]
|
||||
pub enum TitleNames {
|
||||
/// The folder's — what the share calls it.
|
||||
Library,
|
||||
/// The provider's English title, where it has one. The default, because
|
||||
/// it is what Android always showed, and a folder name is whatever an
|
||||
/// uploader typed — `Kaijuu 8-gou`, `Fate Stay Night - Heaven s Feel -
|
||||
/// THE MOVIE I presage flower`.
|
||||
#[default]
|
||||
English,
|
||||
/// The provider's romaji title.
|
||||
Romaji,
|
||||
}
|
||||
|
||||
impl TitleNames {
|
||||
pub const ALL: [Self; 3] = [Self::Library, Self::English, Self::Romaji];
|
||||
|
||||
pub fn label(self) -> &'static str {
|
||||
match self {
|
||||
Self::Library => "As in the share",
|
||||
Self::English => "English",
|
||||
Self::Romaji => "Romaji",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TitleMetadata {
|
||||
@@ -139,6 +292,23 @@ pub struct EpisodeMetadata {
|
||||
/// anime releases name their files.
|
||||
pub season: Option<u32>,
|
||||
pub number: u32,
|
||||
/// Its place counting straight through every season, when the provider
|
||||
/// knows it. What an absolutely-numbered file inside a season folder —
|
||||
/// `Attack on Titan/Season 2/… - 26.mkv` — is matched on.
|
||||
#[serde(default)]
|
||||
pub absolute: Option<u32>,
|
||||
/// Its season and number counting each provider *entry* as a season: the
|
||||
/// position of the entry it belongs to among the franchise's series
|
||||
/// entries, and its number within that entry.
|
||||
///
|
||||
/// Not TVDB's season. A release that follows AniList rather than TVDB
|
||||
/// names Mushishi's *Zoku Shou 2* `S03`, where TVDB files it as the second
|
||||
/// half of season two; this is what that file is answered from. See
|
||||
/// [`EpisodeGuide::get`] for when it is allowed to be.
|
||||
#[serde(default)]
|
||||
pub entry_season: Option<u32>,
|
||||
#[serde(default)]
|
||||
pub entry_number: Option<u32>,
|
||||
pub name: Option<String>,
|
||||
pub overview: Option<String>,
|
||||
/// A frame from the episode, around 16:9.
|
||||
@@ -149,6 +319,23 @@ pub struct EpisodeMetadata {
|
||||
pub air_date: Option<String>,
|
||||
}
|
||||
|
||||
/// What enriching a matched title found: its episodes, and art the search
|
||||
/// answer did not carry.
|
||||
///
|
||||
/// Stored as one unit by `Catalog::set_enrichment`, and recorded as asked even
|
||||
/// when both are empty — a film has no episode list, and without the record it
|
||||
/// would be asked again on every match run.
|
||||
#[derive(Debug, Clone, Default, PartialEq)]
|
||||
pub struct Enrichment {
|
||||
pub episodes: Vec<EpisodeMetadata>,
|
||||
/// A 16:9 picture of the whole title, when one was found. `None` leaves
|
||||
/// whatever backdrop the match already had.
|
||||
pub backdrop_url: Option<String>,
|
||||
/// Every provider entry the episodes were taken from, the match's own
|
||||
/// included. See [`TitleDetails::chain`].
|
||||
pub chain: Vec<String>,
|
||||
}
|
||||
|
||||
/// Every episode a provider listed for one title, ready to look up.
|
||||
///
|
||||
/// The lookup is the whole reason this is a type rather than a `Vec`: a file
|
||||
@@ -160,16 +347,33 @@ pub struct EpisodeGuide {
|
||||
/// Keyed `(season, number)`, where `None` is the provider's own absolute
|
||||
/// numbering.
|
||||
entries: HashMap<(Option<u32>, u32), EpisodeMetadata>,
|
||||
/// [`EpisodeMetadata::absolute`] to the key of the entry holding it.
|
||||
absolute: HashMap<u32, (Option<u32>, u32)>,
|
||||
/// [`EpisodeMetadata::entry_season`] and `entry_number` to the key of the
|
||||
/// entry holding them.
|
||||
by_entry: HashMap<(u32, u32), (Option<u32>, u32)>,
|
||||
/// Every season some entry is filed under, for deciding when the entry
|
||||
/// numbering may answer.
|
||||
stated: HashSet<u32>,
|
||||
}
|
||||
|
||||
impl EpisodeGuide {
|
||||
pub fn new(episodes: Vec<EpisodeMetadata>) -> Self {
|
||||
Self {
|
||||
entries: episodes
|
||||
.into_iter()
|
||||
.map(|episode| ((episode.season, episode.number), episode))
|
||||
.collect(),
|
||||
let mut guide = Self::default();
|
||||
for episode in episodes {
|
||||
let key = (episode.season, episode.number);
|
||||
if let Some(absolute) = episode.absolute {
|
||||
guide.absolute.insert(absolute, key);
|
||||
}
|
||||
if let (Some(season), Some(number)) = (episode.entry_season, episode.entry_number) {
|
||||
guide.by_entry.insert((season, number), key);
|
||||
}
|
||||
if let Some(season) = episode.season {
|
||||
guide.stated.insert(season);
|
||||
}
|
||||
guide.entries.insert(key, episode);
|
||||
}
|
||||
guide
|
||||
}
|
||||
|
||||
pub fn is_empty(&self) -> bool {
|
||||
@@ -182,20 +386,25 @@ impl EpisodeGuide {
|
||||
|
||||
/// What the provider says about the file numbered like this.
|
||||
///
|
||||
/// Tried in order: the season and number the filename states; the
|
||||
/// provider's absolute numbering; and, for a file with no season at all,
|
||||
/// season one. That second fallback is what makes an absolutely-numbered
|
||||
/// release line up with a provider that files everything under a single
|
||||
/// season — the common case for anime on TMDB.
|
||||
/// Tried in order:
|
||||
///
|
||||
/// **The absolute fallback stops at season one.** A provider that numbers
|
||||
/// straight through is one that split nothing, so its episode seven is the
|
||||
/// seventh of the show — which is season one's, not season two's. Answering
|
||||
/// `S02E07` with it captions every episode of every later season with the
|
||||
/// wrong name, and a wrong caption does not look like a bug: it looks like
|
||||
/// the library is wrong. Season two upwards is answered from an entry that
|
||||
/// states that season or not at all — see
|
||||
/// `Provider::seasons_are_separate_entries`.
|
||||
/// 1. the season and number the filename states;
|
||||
/// 2. for a file in no season or in season one, the provider's own absolute
|
||||
/// list, and for a file in no season, season one — what makes `#057`
|
||||
/// line up with TMDB filing a 64-episode anime under one season;
|
||||
/// 3. the absolute number, into the season the file states — what makes
|
||||
/// `Season 2/… - 26.mkv` the second season's first episode;
|
||||
/// 4. the entry numbering, for a season the provider files nothing under.
|
||||
///
|
||||
/// **No fallback crosses into another season.** Step 2 stops at season one
|
||||
/// and step 3 only answers inside the season the file named, because
|
||||
/// answering `S02E07` with season one's seventh episode captions every
|
||||
/// episode of every later season with the wrong name — and a wrong caption
|
||||
/// does not look like a bug, it looks like the library is wrong. Step 4
|
||||
/// only answers a season the provider has nothing filed under, so a release
|
||||
/// numbered the provider's way is never re-read the other way: Mushoku
|
||||
/// Tensei's second *entry* is the second half of season one, and its
|
||||
/// `S02E01` is season two's.
|
||||
pub fn get(&self, season: Option<u32>, number: u32) -> Option<&EpisodeMetadata> {
|
||||
if let Some(found) = self.entries.get(&(season, number)) {
|
||||
return Some(found);
|
||||
@@ -205,14 +414,31 @@ impl EpisodeGuide {
|
||||
{
|
||||
return Some(found);
|
||||
}
|
||||
season
|
||||
.is_none()
|
||||
.then(|| self.entries.get(&(Some(1), number)))?
|
||||
if season.is_none()
|
||||
&& let Some(found) = self.entries.get(&(Some(1), number))
|
||||
{
|
||||
return Some(found);
|
||||
}
|
||||
if let Some(found) = self
|
||||
.absolute
|
||||
.get(&number)
|
||||
.and_then(|key| self.entries.get(key))
|
||||
&& (season.is_none() || found.season == season)
|
||||
{
|
||||
return Some(found);
|
||||
}
|
||||
let season = season?;
|
||||
if self.stated.contains(&season) {
|
||||
return None;
|
||||
}
|
||||
self.by_entry
|
||||
.get(&(season, number))
|
||||
.and_then(|key| self.entries.get(key))
|
||||
}
|
||||
|
||||
/// Which seasons this guide actually has answers for. `None` is the
|
||||
/// provider's own absolute numbering.
|
||||
pub fn seasons(&self) -> std::collections::HashSet<Option<u32>> {
|
||||
pub fn seasons(&self) -> HashSet<Option<u32>> {
|
||||
self.entries
|
||||
.values()
|
||||
.map(|episode| episode.season)
|
||||
@@ -328,6 +554,7 @@ mod tests {
|
||||
genres: Vec::new(),
|
||||
episodes: Some(26),
|
||||
url: None,
|
||||
details: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -335,6 +562,9 @@ mod tests {
|
||||
EpisodeMetadata {
|
||||
season,
|
||||
number,
|
||||
absolute: None,
|
||||
entry_season: None,
|
||||
entry_number: None,
|
||||
name: Some(name.into()),
|
||||
overview: None,
|
||||
still_url: None,
|
||||
@@ -342,6 +572,89 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
/// An episode as ani.zip describes one: TVDB's season and number, TVDB's
|
||||
/// absolute number, and its place in the AniList entry it came from.
|
||||
fn numbered(
|
||||
(season, number): (u32, u32),
|
||||
absolute: u32,
|
||||
(entry_season, entry_number): (u32, u32),
|
||||
name: &str,
|
||||
) -> EpisodeMetadata {
|
||||
EpisodeMetadata {
|
||||
absolute: Some(absolute),
|
||||
entry_season: Some(entry_season),
|
||||
entry_number: Some(entry_number),
|
||||
..episode(Some(season), number, name)
|
||||
}
|
||||
}
|
||||
|
||||
fn name_of(guide: &EpisodeGuide, season: Option<u32>, number: u32) -> Option<String> {
|
||||
guide.get(season, number).and_then(|e| e.name.clone())
|
||||
}
|
||||
|
||||
/// `Attack on Titan/Season 2/[Anime Time] Attack On Titan - 26.mkv`: a
|
||||
/// season folder full of absolutely-numbered files.
|
||||
#[test]
|
||||
fn an_absolute_number_in_a_season_folder_finds_that_seasons_episode() {
|
||||
let guide = EpisodeGuide::new(vec![
|
||||
numbered((1, 1), 1, (1, 1), "To You, in 2000 Years"),
|
||||
numbered((2, 1), 26, (2, 1), "Beast Titan"),
|
||||
]);
|
||||
assert_eq!(name_of(&guide, Some(2), 26).as_deref(), Some("Beast Titan"));
|
||||
// And with no season at all, the absolute number is the whole answer.
|
||||
assert_eq!(name_of(&guide, None, 26).as_deref(), Some("Beast Titan"));
|
||||
}
|
||||
|
||||
/// The absolute fallback must not carry a file into a season it did not
|
||||
/// name: `S03E13` of a show whose 13th episode is in season one is not that
|
||||
/// episode.
|
||||
#[test]
|
||||
fn an_absolute_number_never_answers_for_another_season() {
|
||||
let guide = EpisodeGuide::new(vec![
|
||||
numbered((1, 13), 13, (1, 13), "Season one's thirteenth"),
|
||||
numbered((3, 1), 38, (3, 1), "Smoke Signal"),
|
||||
]);
|
||||
assert_eq!(guide.get(Some(3), 13), None);
|
||||
}
|
||||
|
||||
/// Mushishi: TVDB files both halves of *Zoku Shou* as season two, and the
|
||||
/// release calls the second half `S03`. Season three exists nowhere at the
|
||||
/// provider, so the entry numbering answers it.
|
||||
#[test]
|
||||
fn a_season_the_provider_does_not_have_is_answered_by_entry() {
|
||||
let guide = EpisodeGuide::new(vec![
|
||||
numbered((1, 1), 1, (1, 1), "The Green Seat"),
|
||||
numbered((2, 1), 28, (2, 1), "The Hand That Caresses the Night"),
|
||||
numbered((2, 11), 39, (3, 1), "Lightning's End"),
|
||||
]);
|
||||
assert_eq!(
|
||||
name_of(&guide, Some(3), 1).as_deref(),
|
||||
Some("Lightning's End")
|
||||
);
|
||||
assert_eq!(
|
||||
name_of(&guide, Some(2), 1).as_deref(),
|
||||
Some("The Hand That Caresses the Night")
|
||||
);
|
||||
}
|
||||
|
||||
/// Mushoku Tensei: AniList's second entry is the second half of TVDB's
|
||||
/// season one. A release numbered TVDB's way names season two `S02`, and
|
||||
/// the entry numbering must not answer it with that second half.
|
||||
#[test]
|
||||
fn the_entry_numbering_never_overrides_a_season_the_provider_has() {
|
||||
let guide = EpisodeGuide::new(vec![
|
||||
numbered((1, 12), 12, (2, 1), "Cour two's first"),
|
||||
numbered((2, 1), 26, (3, 1), "Season two's first"),
|
||||
]);
|
||||
assert_eq!(
|
||||
name_of(&guide, Some(2), 1).as_deref(),
|
||||
Some("Season two's first")
|
||||
);
|
||||
// A second-season episode the provider does not list is unanswered,
|
||||
// not answered from the entry numbering.
|
||||
assert_eq!(guide.get(Some(2), 2), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_file_that_states_its_season_is_answered_from_that_season() {
|
||||
let guide = EpisodeGuide::new(vec![
|
||||
|
||||