Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bcc6d4bac8 | ||
|
|
4526fe86d9 | ||
|
|
8e82a1f7be | ||
|
|
4d74cee67d | ||
|
|
d4952db497 | ||
|
|
50b2b000a4 | ||
|
|
197fe113a1 | ||
|
|
7487b4deb1 | ||
|
|
4ab37c55cf | ||
|
|
572104f49e | ||
|
|
a407d3cbb0 | ||
|
|
1ec4fc8b13 | ||
|
|
9572e8457d | ||
|
|
d8585fb78e | ||
|
|
e52a7633a0 | ||
|
|
c3fe8b682d | ||
|
|
1508d2f804 | ||
|
|
86eb30f498 | ||
|
|
ddd7a21195 | ||
|
|
4275abe470 | ||
|
|
cf2805d3bd | ||
|
|
52f1c481a6 | ||
|
|
771b961b32 | ||
|
|
6b10cae4e6 | ||
|
|
95cd668cfb | ||
|
|
2a7b553597 | ||
|
|
27b4ec2c96 | ||
|
|
ab133dd82f | ||
|
|
1b0a3db439 | ||
|
|
6d388483ef | ||
|
|
bbecdcc4d8 | ||
|
|
f1ccf88b06 | ||
|
|
d3be13ecda | ||
|
|
1b04e002c2 | ||
|
|
f23cc7b311 | ||
|
|
473c82ec0a | ||
|
|
e621b392af | ||
|
|
884f208330 | ||
|
|
cc45b86271 | ||
|
|
84c5cda668 | ||
|
|
bc96cb13d9 | ||
|
|
f7f2f0cddd | ||
|
|
05b06b1fc1 | ||
|
|
748d58f036 | ||
|
|
1fd4081461 | ||
|
|
2d39018a73 | ||
|
|
059b7dd306 | ||
|
|
0115d54ab8 | ||
|
|
fe5d6c3b3f | ||
|
|
05f9e794a9 | ||
|
|
75065f90cd | ||
|
|
e0db5cc655 | ||
|
|
8186fbb5d3 | ||
|
|
8b81da4069 | ||
|
|
dbfd351ee4 | ||
|
|
a4be24a2a5 | ||
|
|
b038706dff | ||
|
|
b2b77a6b3f | ||
|
|
d002ff6941 | ||
|
|
151ec95289 | ||
|
|
745717a4a0 | ||
|
|
9ddd85de90 | ||
|
|
24fc137e4f | ||
|
|
9a4b04672b | ||
|
|
ff51d52fbb | ||
|
|
f2272d7980 | ||
|
|
cf80bb2167 | ||
|
|
8effa573a0 | ||
|
|
5f22be6c20 | ||
|
|
740273745b | ||
|
|
27b4e1dc0c | ||
|
|
fce392e425 | ||
|
|
d8fd464e33 | ||
|
|
0c38528520 | ||
|
|
b534c8c7ea | ||
|
|
d092ea371a | ||
|
|
99cda7ed04 | ||
|
|
d29c12e4f0 | ||
|
|
f790470935 | ||
|
|
2eb6840ec4 | ||
|
|
677ece81c4 | ||
|
|
caa0765890 | ||
|
|
c76fee70dc | ||
|
|
6f136bfc4d | ||
|
|
e7f33b5dc3 | ||
|
|
9c5733719b | ||
|
|
50bcc2e1a2 | ||
|
|
2c21cfde11 |
No files matched your search
@@ -1,6 +1,9 @@
|
|||||||
name: ci
|
name: ci
|
||||||
on:
|
on:
|
||||||
|
# Branches only: a release tag points at a commit CI already checked on
|
||||||
|
# main, and release.yml builds it.
|
||||||
push:
|
push:
|
||||||
|
branches: ['**']
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -36,3 +39,32 @@ jobs:
|
|||||||
working-directory: packages/server
|
working-directory: packages/server
|
||||||
- run: build/watch-together-server --help
|
- run: build/watch-together-server --help
|
||||||
working-directory: packages/server
|
working-directory: packages/server
|
||||||
|
|
||||||
|
# The updater's Windows apply path (running exe parked as .old) only
|
||||||
|
# means something on real NTFS. Runner notes: see release.yml.
|
||||||
|
updater-windows:
|
||||||
|
runs-on: windows-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
shell: powershell
|
||||||
|
run: |
|
||||||
|
git init -q .
|
||||||
|
git remote add origin "$env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY.git"
|
||||||
|
git fetch -q origin "$env:GITHUB_SHA"
|
||||||
|
if ($LASTEXITCODE) { exit 1 }
|
||||||
|
git checkout -q --force FETCH_HEAD
|
||||||
|
- name: Setup Flutter
|
||||||
|
shell: powershell
|
||||||
|
run: powershell -NoProfile -ExecutionPolicy Bypass -File tool/setup_flutter_windows.ps1
|
||||||
|
- name: Updater tests
|
||||||
|
shell: powershell
|
||||||
|
working-directory: packages/core
|
||||||
|
run: |
|
||||||
|
dart pub get
|
||||||
|
if ($LASTEXITCODE) { exit 1 }
|
||||||
|
dart test test/updater_test.dart
|
||||||
|
# The release build, without publishing: a broken Windows build shows
|
||||||
|
# here, not only on a tag.
|
||||||
|
- name: Windows build
|
||||||
|
shell: powershell
|
||||||
|
run: powershell -NoProfile -ExecutionPolicy Bypass -File tool/package_windows.ps1
|
||||||
@@ -36,4 +36,42 @@ jobs:
|
|||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||||
run: tool/release_publish.sh "${{ github.ref_name }}"
|
run: |
|
||||||
|
VER="${GITHUB_REF_NAME#v}"
|
||||||
|
dart tool/release_publish.dart "$GITHUB_REF_NAME" "dist/watch-together-$VER-linux-x64.tar.gz"
|
||||||
|
|
||||||
|
windows:
|
||||||
|
# yuuka-windows: host-mode runner (no containers), runs as SYSTEM, has
|
||||||
|
# git + VS 2022 Build Tools but no bash/python — PowerShell and Dart
|
||||||
|
# only. Checkout is plain git: that host's cached actions/checkout
|
||||||
|
# clone was corrupt, and no `uses:` means no action cache to rot.
|
||||||
|
runs-on: windows-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
shell: powershell
|
||||||
|
run: |
|
||||||
|
git init -q .
|
||||||
|
git remote add origin "$env:GITHUB_SERVER_URL/$env:GITHUB_REPOSITORY.git"
|
||||||
|
git fetch -q --tags origin "$env:GITHUB_SHA"
|
||||||
|
if ($LASTEXITCODE) { exit 1 }
|
||||||
|
git checkout -q --force FETCH_HEAD
|
||||||
|
|
||||||
|
- name: Setup Flutter
|
||||||
|
shell: powershell
|
||||||
|
run: powershell -NoProfile -ExecutionPolicy Bypass -File tool/setup_flutter_windows.ps1
|
||||||
|
|
||||||
|
- name: Build zip
|
||||||
|
shell: powershell
|
||||||
|
run: powershell -NoProfile -ExecutionPolicy Bypass -File tool/package_windows.ps1
|
||||||
|
|
||||||
|
- name: Publish release
|
||||||
|
if: startsWith(github.ref, 'refs/tags/v')
|
||||||
|
shell: powershell
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
|
RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
|
||||||
|
run: |
|
||||||
|
$Ver = $env:GITHUB_REF_NAME.TrimStart('v')
|
||||||
|
dart tool/release_publish.dart $env:GITHUB_REF_NAME "dist/watch-together-$Ver-windows-x64.zip"
|
||||||
|
if ($LASTEXITCODE) { exit 1 }
|
||||||
@@ -17,6 +17,7 @@ coverage/
|
|||||||
# Build artifacts that should never be committed
|
# Build artifacts that should never be committed
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
*.zip
|
*.zip
|
||||||
|
/dist/
|
||||||
app.*.symbols
|
app.*.symbols
|
||||||
app.*.map.json
|
app.*.map.json
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,8 @@
|
|||||||
# watch-together
|
<p align="center">
|
||||||
|
<img src="apps/desktop/assets/icon/icon_256.png" width="128" height="128" alt="Starsync icon">
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<h1 align="center">Starsync</h1>
|
||||||
|
|
||||||
Watch a video with friends, in sync, with the quality of a real mpv player.
|
Watch a video with friends, in sync, with the quality of a real mpv player.
|
||||||
Pick from your Jellyfin library, paste any direct video link, or pick a file on your own disk;
|
Pick from your Jellyfin library, paste any direct video link, or pick a file on your own disk;
|
||||||
@@ -11,7 +15,7 @@ Name: `watch-together` is a placeholder and the final name is undecided
|
|||||||
(`sync-relay` is the working name). It appears in file names and the
|
(`sync-relay` is the working name). It appears in file names and the
|
||||||
update manifest until that is settled.
|
update manifest until that is settled.
|
||||||
|
|
||||||
- Desktop only (Linux now, Windows planned), always mpv. No web clients.
|
- Desktop only (Linux and Windows), always mpv. No web clients.
|
||||||
- No transcoding. Everyone plays the original file.
|
- No transcoding. Everyone plays the original file.
|
||||||
- Friends trust model: no accounts, no roles. A blank password means an open server.
|
- Friends trust model: no accounts, no roles. A blank password means an open server.
|
||||||
|
|
||||||
@@ -19,31 +23,198 @@ How it fits together: [docs/HOW-IT-WORKS.md](docs/HOW-IT-WORKS.md).
|
|||||||
|
|
||||||
## Install and update
|
## Install and update
|
||||||
|
|
||||||
Download the latest `watch-together-<version>-linux-x64.tar.gz` from the
|
From the Releases page of this repo:
|
||||||
Releases page of this repo, extract it, run `watch_together`.
|
|
||||||
|
- Linux: `watch-together-<version>-linux-x64.tar.gz`. Extract, run
|
||||||
|
`watch_together`. On start it adds itself to your app launcher (and its
|
||||||
|
icon), so the window shows its own icon on Wayland. Needs mpv's library installed (`mpv` or `libmpv2`).
|
||||||
|
- Windows: `watch-together-<version>-windows-x64.zip`. Extract, run
|
||||||
|
`watch_together.exe`. mpv is bundled. New and not yet tried on a real
|
||||||
|
Windows desktop; reports welcome.
|
||||||
|
|
||||||
Update from the app: when a newer version exists, an update indicator
|
Update from the app: when a newer version exists, an update indicator
|
||||||
appears in Home's top bar and opens the update card. "Update and restart" downloads,
|
appears in the strip at the top of the window and opens the update card. "Update and restart" downloads,
|
||||||
verifies, applies in place and restarts; the install folder must be writable
|
verifies, applies in place and restarts; the install folder must be writable
|
||||||
by you. Settings has Check now and an auto-check toggle. From a terminal:
|
by you. Settings has Check now and an auto-check toggle. From a terminal:
|
||||||
`watch_together --upgrade` or `update.sh` (shipped in the tarball). A
|
`./watch-together-server --upgrade` (no display needed, so it works on a
|
||||||
|
server box too), `watch_together --upgrade`, or the shipped `update.sh` /
|
||||||
|
`update.bat` (which run the first). Each updates the whole folder, app and
|
||||||
|
server; restart whichever is running to use the new version. A
|
||||||
release with a newer protocol is a required update: everyone on a server
|
release with a newer protocol is a required update: everyone on a server
|
||||||
must run the same protocol version, and a mismatch is refused with a message
|
must run the same protocol version, and a mismatch is refused with a message
|
||||||
telling you to update.
|
telling you to update.
|
||||||
|
|
||||||
|
## Getting started
|
||||||
|
|
||||||
|
Three ways in, all at the top of the Library when you are not in a server.
|
||||||
|
None of them needs Jellyfin or an account.
|
||||||
|
|
||||||
|
- **Join a friend** (most people): your friend sends you an address and,
|
||||||
|
maybe, a password. See [Join](#join).
|
||||||
|
- **Host**: you have the video and friends watch it with you. See
|
||||||
|
[Host from the app](#host-from-the-app).
|
||||||
|
- **Watch solo**: just play something from the Library. It plays for you
|
||||||
|
alone, with everything a server has (Jellyfin progress, next episode,
|
||||||
|
skip buttons); nothing is reachable from outside this computer. Invite
|
||||||
|
friends in the strip turns it into a hosted server (the Host card's port
|
||||||
|
and password) and the video carries on from where it was; Stop ends it.
|
||||||
|
|
||||||
|
## The window
|
||||||
|
|
||||||
|
One window. Along the top, the strip: your avatar (click it for your
|
||||||
|
profile: name, picture with a crop editor, colour, and links to the
|
||||||
|
settings), the Library / Schedule / Settings tabs, and the party. Offline
|
||||||
|
the party side has Join a friend and Host; watching solo it says Solo,
|
||||||
|
with Invite friends and Stop; in a server it shows everyone's avatar
|
||||||
|
with a ring for their state (green ready, amber buffering, grey not ready,
|
||||||
|
dimmed reconnecting, dimmed with a moon sitting out; a crown on whoever
|
||||||
|
hosts, a tower on whoever passes the video on). Click the avatars for the
|
||||||
|
member list (force ready, Nudge, Sit out, "Copy invite address"; when you host it lists this computer's
|
||||||
|
network addresses with the port, and friends outside your network need
|
||||||
|
that port forwarded or a server they can all reach, like a VPS). Beside them the server and "ready n/m", the chat button with unread
|
||||||
|
count, and Leave. Empty strip space drags the window.
|
||||||
|
|
||||||
|
The player fills the window under the strip. Pick a tab and it shrinks to
|
||||||
|
a mini player in a corner: drag it anywhere and it snaps to the nearest
|
||||||
|
corner; double-click or ⤢ makes it big again, × sits you out (below) and
|
||||||
|
× again closes it; the strip's screen button brings it back. F or
|
||||||
|
double-click on the picture goes fullscreen (the strip hides, the party
|
||||||
|
shows in a corner while paused, the window buttons sit in the player's top
|
||||||
|
bar while its controls are up), Esc leaves it. The controls show the
|
||||||
|
show's cover, title and episode top left (a web video: its thumbnail and
|
||||||
|
name; guests get the art too; right-click to copy the title, or the link
|
||||||
|
when you have it, or open it in the browser or Jellyfin); before
|
||||||
|
a video first plays, its banner fills the picture until playback starts.
|
||||||
|
One pill bottom centre, just above the controls, says what playback waits for ("Press Space
|
||||||
|
when you're ready", "Waiting for Bob and Mika · 2/3 ready", "Bob is
|
||||||
|
loading…") or what went wrong, with Retry or Cancel when it helps. Chat and activity open in a panel on the right (chat button or
|
||||||
|
Tab), ready to type; it shows messages (select text to copy it, or
|
||||||
|
right-click for Copy message and, with a link in it, Copy link / Open in
|
||||||
|
browser), and its "Activity" toggle adds
|
||||||
|
joins, ready, seeks and the like between them. Joins, leaves, chat and
|
||||||
|
other news also pop up bottom left with the person's avatar; click a message to open the chat
|
||||||
|
(Settings → Notifications → Chat messages: Only when paused by default,
|
||||||
|
or All, or Off; messages always reach the chat). Unread chat shows as a count on the chat
|
||||||
|
buttons and, in fullscreen with the controls hidden and the video paused,
|
||||||
|
as a small chip top right.
|
||||||
|
|
||||||
|
Your name and picture change for everyone in the server right away; the
|
||||||
|
colour is yours only.
|
||||||
|
|
||||||
|
**Sitting out.** Step away without leaving: Sit out (your profile, your
|
||||||
|
row in the member list, or × on the mini player) unloads the video on your
|
||||||
|
end, and nobody waits for you any more; you stay in chat. Anyone can sit
|
||||||
|
anyone out, the host too ("Alice sat you out" tells you who). The player
|
||||||
|
then shows the cover, title and where the others are; Join back (or Space)
|
||||||
|
loads the video there and readies you. Settings → Party & network → "When idle,
|
||||||
|
sit out instead of just unready" does it after 10 idle minutes.
|
||||||
|
|
||||||
|
**Nudge.** Nudge in the member list pokes someone, sitting out or not:
|
||||||
|
only they hear it (a sound, a pop-up, and the taskbar entry asks for
|
||||||
|
attention when the window is in the background).
|
||||||
|
|
||||||
## Host from the app
|
## Host from the app
|
||||||
|
|
||||||
Home, Host tab. Pick what to watch (optional): Jellyfin (browse your linked
|
Host in the strip: set a port and an optional password (blank = anyone can
|
||||||
servers, see below), Link (paste an http(s) URL; Ctrl+V outside a field
|
join), then Host. The app starts a server inside itself and joins it; you
|
||||||
pastes it in) or File (path or Browse). In the column beside it set a port and an optional password (blank =
|
are the host (the crown). Nothing is up yet: pick what to
|
||||||
anyone can join), then Host. Your name and avatar come from your profile
|
watch in the Library tab (below) and put it up. Leaving or
|
||||||
(the chip at the top left). The app starts a
|
closing the app stops the server. Friends need to reach your machine: open
|
||||||
server inside itself and joins it; you are the host and nobody can kick you.
|
the TCP port on your router (or use a LAN or VPN address). Friends open
|
||||||
Leaving or closing the app stops the server. Friends need to reach your machine: open
|
nothing. Ports you hosted on before are one click away in the Host card.
|
||||||
the TCP port on your router (or use a LAN or VPN address). Friends open nothing.
|
|
||||||
|
|
||||||
If you pick a local file, the server streams it to everyone from your disk.
|
If you put up a local file, the server streams it to everyone from your
|
||||||
Nothing is uploaded or stored anywhere.
|
disk. Nothing is uploaded or stored anywhere.
|
||||||
|
|
||||||
|
## Library
|
||||||
|
|
||||||
|
What to watch, from three sources (the switch at the top). Drop a video,
|
||||||
|
a folder or a link anywhere on the window, or press Ctrl+V outside a
|
||||||
|
text field, and a small card asks how to open it (put it up, add it to
|
||||||
|
Up next, add the folder to Files, or fill Link).
|
||||||
|
|
||||||
|
- **Jellyfin**: your linked servers (see below); with none linked it
|
||||||
|
points to Files and Link and offers Jellyfin as optional. Library chips beside the
|
||||||
|
switch, then one **Continue** row (what you were watching and what comes
|
||||||
|
next, one card per series, the one you watched most recently first;
|
||||||
|
series not touched for two months drop out) and **Latest in** each
|
||||||
|
library (one card per series: "S1E1" or "3 new"; Show all opens the
|
||||||
|
library newest first). Re-uploads (added long after they aired) are
|
||||||
|
hidden from Latest; the row's ⋮ menu turns that off. Search (/), library
|
||||||
|
grids (sort, unwatched, favourites) and series pages sit behind them.
|
||||||
|
Click a card to select it: its
|
||||||
|
details open on the right with "Put it up · S1E3", mark watched /
|
||||||
|
unwatched, remove from Continue and the episode list (click an episode
|
||||||
|
to choose it). Double-click a card or an episode to put it up at once.
|
||||||
|
Right-click a card or an episode to copy its title or open it in
|
||||||
|
Jellyfin's web page (the details panel has that button too).
|
||||||
|
- **Link**: paste an http(s) link: a video file, or a web page with a
|
||||||
|
video (YouTube, X, and whatever else yt-dlp knows). The preview shows
|
||||||
|
what it is (a page's title, uploader, length and thumbnail, else the
|
||||||
|
file name); in a server, pick how the
|
||||||
|
others get it (everyone fetches it, the server fetches it, or through
|
||||||
|
you). Your last 12 links are listed under it (right-click one to copy
|
||||||
|
or open it). A link seen before shows its preview at once, without
|
||||||
|
asking the site again. A link that does not
|
||||||
|
open here (needs cookies, 403, 404, not a video) says why and goes up
|
||||||
|
only with "Put it up anyway"; in the player, whoever cannot play it is
|
||||||
|
named ("Bob can't play this: Not allowed (403)") and nobody waits for them.
|
||||||
|
- **Files**: video folders you add on this computer, grouped by series
|
||||||
|
(click a series to list its episodes), or any file through Browse. The others stream it from you.
|
||||||
|
|
||||||
|
Put it up and the player opens. Not in a server, the buttons say Play
|
||||||
|
and it plays for you alone ([Watch solo](#getting-started)).
|
||||||
|
|
||||||
|
### Up next (the queue)
|
||||||
|
|
||||||
|
In a server (solo too), anything can wait its turn instead of going up
|
||||||
|
now: **Add to queue** on the Link page (in the way you picked), or
|
||||||
|
right-click a Jellyfin card or episode, a video in Files, a recent link
|
||||||
|
or an episode on the Schedule for **Add to queue** / **Play next**; the
|
||||||
|
Jellyfin details panel has a queue button (right-click it to play next),
|
||||||
|
and the card for a dropped or pasted video or link has both. A link is
|
||||||
|
checked first, like Put it up. Every app keeps the next item ready,
|
||||||
|
its first seconds already loaded, so skipping to it starts at once.
|
||||||
|
For a link passed on, a member's file or a link the server fetches,
|
||||||
|
the server starts getting the next item while the current one plays
|
||||||
|
(from the app of whoever added it, or by fetching the link itself), so
|
||||||
|
everyone has its start before it goes up; whoever added it keeps the
|
||||||
|
app open for that. Everyone shares one Up next and anyone can change it; what
|
||||||
|
you added stays when you leave.
|
||||||
|
|
||||||
|
In the player, Up next sits in the top bar next to the chat button: the
|
||||||
|
next item's picture and title (or the next episode's). Rest the mouse on
|
||||||
|
it for a larger preview (who added it, its length, whether it is ready
|
||||||
|
to start); ⏭ plays it now, a click opens the queue: drag rows to reorder, hover a
|
||||||
|
row to play it now (▶) or remove it (×), right-click it for more (copy its
|
||||||
|
title or link, open it in the browser or in Jellyfin). To add, press
|
||||||
|
Ctrl+V with the queue open (a copied link or video file goes in at once,
|
||||||
|
its title and picture showing while it is checked), type one after
|
||||||
|
**+ Add link**, or drop a link or a video on it. When a video ends, a card shows
|
||||||
|
what is up next with a 10 s countdown (Cancel stops it on your screen)
|
||||||
|
and it plays; `>` or Shift+N plays it at once. Under the queue,
|
||||||
|
**Continues with** shows the next episodes of the Jellyfin series
|
||||||
|
playing (greyed: they play only once Up next is empty); **+** adds one,
|
||||||
|
**Clear** drops them for this episode.
|
||||||
|
|
||||||
|
A link you pass on ("through me") or a file of yours can only be played
|
||||||
|
by your app: if you left when its turn comes, it is skipped ("Skipped …:
|
||||||
|
Foxyz left"). A Jellyfin item needs someone with an account on that
|
||||||
|
server. Up next is kept by the server while it runs; restarting the
|
||||||
|
server empties it.
|
||||||
|
|
||||||
|
## Schedule
|
||||||
|
|
||||||
|
The week's airing anime, one column per day (AniList), each episode
|
||||||
|
marked with what the Jellyfin server has of it when AnimeFlow is
|
||||||
|
connected (Settings, Jellyfin & integrations): **on Jellyfin** (Put it
|
||||||
|
up, right-click to queue), **downloading**, **waiting for release**
|
||||||
|
(aired in Japan, AnimeFlow downloads it by itself once a release
|
||||||
|
appears; with when AnimeFlow last searched, or **release rejected** when
|
||||||
|
it found releases it won't take, the reason on hover), **failed**, **not monitored** (Request asks AnimeFlow for it),
|
||||||
|
or the time left until it airs. A show AnimeFlow does not follow can be asked for with **Request
|
||||||
|
series**. Episodes you already watched on Jellyfin carry a check on the
|
||||||
|
cover; one you started shows how far you got.
|
||||||
|
|
||||||
## Dedicated server
|
## Dedicated server
|
||||||
|
|
||||||
@@ -62,64 +233,112 @@ then everyone (you included) uses Join.
|
|||||||
| `--name` | `server` | name reported by `/health` |
|
| `--name` | `server` | name reported by `/health` |
|
||||||
| `--media` | none | local file to serve as the starting video |
|
| `--media` | none | local file to serve as the starting video |
|
||||||
| `--advertise-host` | none | host put in file URLs instead of the one each viewer dialled |
|
| `--advertise-host` | none | host put in file URLs instead of the one each viewer dialled |
|
||||||
| `--config` | none | YAML or JSON file with the same settings (`port`, `secret`, `name`, `mediaPath`, `advertiseHost`); replaces the flags |
|
| `--[no-]yt-dlp` | on | read web pages (YouTube, X, …) with yt-dlp when the server fetches a link |
|
||||||
|
| `--yt-dlp-dir` | next to the binary | writable folder for the server's yt-dlp (systemd: the unit's `StateDirectory`) |
|
||||||
|
| `--yt-dlp-cookies` | none | cookies.txt or cookie-extension JSON export for that yt-dlp (sites that refuse guests); copied into the yt-dlp folder at start, removed from it when not given. **An account login**: keep it private, use a throwaway account for YouTube |
|
||||||
|
| `--log-dir` | `logs` next to `--config`, else next to the binary (systemd: the unit's `StateDirectory`) | folder for the log files (`server-YYYY-MM-DD.log` and the session log `session-YYYY-MM-DD.log`, kept 7 days; passwords, tokens and cookies left out) |
|
||||||
|
| `--config` | none | YAML or JSON file with the same settings (`port`, `secret`, `name`, `mediaPath`, `advertiseHost`, `ytDlp`, `ytDlpDir`, `ytDlpCookies`); replaces the flags |
|
||||||
|
| `--upgrade` | | update the install folder to the latest release ([Install and update](#install-and-update)), then exit |
|
||||||
|
| `--check-update` | | print whether a newer release exists, then exit |
|
||||||
|
|
||||||
It prints `READY port=... name=...` once listening and stops cleanly on
|
It prints `READY port=... name=...` once listening and stops cleanly on
|
||||||
Ctrl+C or SIGTERM. A dedicated server has no host: anyone can kick anyone.
|
Ctrl+C or SIGTERM. A dedicated server has no host.
|
||||||
To run it as a service, unpack the tarball to `/opt/watch-together` and use
|
To run it as a service, unpack the tarball to `/opt/watch-together` and use
|
||||||
[deploy/watch-together.service](deploy/watch-together.service) (copy it to
|
[deploy/watch-together.service](deploy/watch-together.service) (copy it to
|
||||||
`/etc/systemd/system/`, edit the flags, `systemctl enable --now watch-together`).
|
`/etc/systemd/system/`, edit the flags, `systemctl enable --now watch-together`).
|
||||||
|
|
||||||
|
Something not playing? Settings → About → **Copy diagnostics** puts the
|
||||||
|
app's recent log (passwords, tokens and cookies left out) on the
|
||||||
|
clipboard: paste it to whoever helps you, from both sides if you can.
|
||||||
|
|
||||||
|
While you are in a server, the app also sends its log to that server, which
|
||||||
|
merges everyone's lines and its own into one session log
|
||||||
|
(`session-YYYY-MM-DD.log` next to the server's logs; the hosting app keeps
|
||||||
|
it in its own logs folder), so a problem can be read afterwards from every
|
||||||
|
side. Chat is never logged anywhere, nor passwords, tokens and cookies.
|
||||||
|
When something goes wrong, press **Mark a problem** (Ctrl+Shift+B, also in
|
||||||
|
the player's ⚙ and Settings → About) and add a few words if you like: a
|
||||||
|
marker with your name goes in the session log at that moment. In a server,
|
||||||
|
Copy diagnostics can add the session log of the last 6 hours (any member
|
||||||
|
may read it). Don't want to share? Settings → About → **Share diagnostics
|
||||||
|
with the server** off: your log stays on your machine (the server only
|
||||||
|
notes that you don't share; a problem you mark still goes in).
|
||||||
|
|
||||||
## Join
|
## Join
|
||||||
|
|
||||||
Home, Join tab. Enter the host's address, port, and the password if there
|
Join in the strip. Servers you got into are listed first (up to 6), with
|
||||||
is one, then Enter or Join. Your name and avatar come from your profile (top
|
live status (online and how many are watching, or offline, plus "needs
|
||||||
bar chip or Settings). Servers you got into appear as up to 6 Recent server
|
update" when the server runs another protocol): click one to rejoin, x to
|
||||||
tiles with live status (online and how many are watching, or offline, plus
|
forget it. Or enter the host's address, port, and the password if there
|
||||||
"needs update" when the server runs another protocol): click one to rejoin,
|
is one, then Enter or Join. Your name and picture come from your profile
|
||||||
x to forget it. Ctrl+1 / Ctrl+2 switch between Join and Host.
|
(your avatar at the top left).
|
||||||
|
|
||||||
## Settings
|
## Settings
|
||||||
|
|
||||||
Profile, hardware decoding (auto, off or custom; the env var
|
The Settings tab (Ctrl+,) has a page per topic, each setting with a line
|
||||||
`SYNC_RELAY_HWDEC` overrides it; applies on the next join or Reload video),
|
of help: Profile; Party & network (the Host card's default port and
|
||||||
"Experimental: mpv-style controls" (below), updates, playing the next
|
password, recent servers with remove); Player (below); Jellyfin &
|
||||||
Jellyfin episode automatically, video shaders (see below), and the
|
integrations (linked Jellyfin servers, below, the AnimeFlow connection:
|
||||||
keyboard shortcuts (read-only).
|
"connected as <name>" with what you may do, or why not, and playing the
|
||||||
Integrations links Jellyfin servers (below). About shows the version.
|
next episode automatically); Notifications & sounds (what pops up; the sound
|
||||||
|
volume and sound set, and every sound with a preview, its own set and a switch); Updates; Keyboard shortcuts (read-only); About
|
||||||
|
(the version; resting the mouse on the Settings tab shows it too).
|
||||||
|
|
||||||
Keys in a session: Space = ready / unready, Tab = side panel (people, log,
|
Player settings live in the player: ⚙ at the right end of its controls
|
||||||
chat, change video), Left/Right = seek 10 s, Shift+Right = skip 1:30,
|
(both designs) opens them, and Settings → Player has the same ones (plus
|
||||||
|
the custom shader files). Player design: Standard or uosc (below);
|
||||||
|
progress line when hidden (on by default: a 2 px line at the bottom of
|
||||||
|
the video while the controls are hidden); upscaling shader (see below);
|
||||||
|
hardware decoding (auto, off or custom; the env var `SYNC_RELAY_HWDEC`
|
||||||
|
overrides it); in the player also the subtitle and audio track. Every
|
||||||
|
change applies right away.
|
||||||
|
|
||||||
|
Anywhere in a server (unless you are typing): Space = ready / unready,
|
||||||
|
Tab = chat & activity (Tab never moves between buttons). Anywhere:
|
||||||
|
Ctrl+Shift+B = mark a problem in the session log. Keys while the
|
||||||
|
player fills the window: Left/Right = seek 10 s, Up/Down = volume, Shift+Right = skip 1:30,
|
||||||
PgUp/PgDn = previous / next chapter (as in mpv), F = fullscreen, Esc =
|
PgUp/PgDn = previous / next chapter (as in mpv), F = fullscreen, Esc =
|
||||||
close panel or ask to leave, Ctrl+R = reload video, `<` / `>` or Shift+P /
|
close the chat, then fullscreen, then shrink the player to mini; from the
|
||||||
Shift+N = previous / next Jellyfin episode, Ctrl+1..6 = Anime4K mode A, B,
|
mini it asks to leave, Ctrl+R = reload video,
|
||||||
C, A+A, B+B, C+A, Ctrl+0 = shaders off. Every seek, skip and chapter jump
|
`<` / `>` or Shift+P / Shift+N = previous / next Jellyfin episode,
|
||||||
moves everyone.
|
Ctrl+1..6 = Anime4K mode A, B, C, A+A, B+B, C+A, Ctrl+0 = shaders off.
|
||||||
|
Every seek, skip and chapter jump moves everyone.
|
||||||
|
|
||||||
Controls: the seek bar marks chapter starts with a diamond; hovering it
|
Controls: the seek bar marks chapter starts with a diamond; hovering it
|
||||||
shows the time and the chapter title. The chapters button lists them
|
shows the time and the chapter title. The chapters button lists them
|
||||||
(current one checked; click to jump). "1:30" skips ahead 1:30. Audio and
|
(current one checked; click to jump). "1:30" skips ahead 1:30. Audio and
|
||||||
Subtitles buttons (with the track count) list tracks as "Japanese · E-AC3
|
Subtitles buttons (with the track count) list tracks as "Japanese · E-AC3
|
||||||
2.0 · title"; subtitles have Off.
|
2.0 · title"; subtitles have Off. Volume (scroll anywhere on the video,
|
||||||
|
hover the speaker, or Up/Down) goes to 150 % like mpv: past the tick at
|
||||||
|
100 % the bar turns amber and mpv amplifies; a scroll or key shows the
|
||||||
|
volume for a moment. Lists and menus under the mouse scroll as usual.
|
||||||
|
|
||||||
Experimental mpv-style controls (Settings → Player, off by default,
|
The uosc player design (⚙ → Player design, Standard by default,
|
||||||
switches right away): video controls modeled on mpv's uosc theme. A thick
|
switches right away): video controls modeled on mpv's uosc theme. A
|
||||||
timeline across the bottom shows the played part, the cached part ahead
|
translucent timeline across the bottom marks the position with a thin
|
||||||
(hatched), chapter starts as diamonds and the time; hovering it shows the
|
line, hatches the part not downloaded yet, shows chapter starts as
|
||||||
chapter title and the time there. With the controls hidden it stays as a
|
diamonds (click one to jump), the elapsed time left, the time remaining
|
||||||
thin line. Above it flat buttons: ≡ menu, Subtitles and Audio (with the
|
right and, while less than a minute is buffered, the buffered seconds
|
||||||
|
next to the position; hovering it shows the time there and the chapter
|
||||||
|
title. With the controls hidden it stays as a thin line (unless
|
||||||
|
"Progress line when hidden" is off). Above it flat buttons: ≡ menu, Subtitles and Audio (with the
|
||||||
track count), the shader badge (the active Anime4K mode, e.g. "A HQ"),
|
track count), the shader badge (the active Anime4K mode, e.g. "A HQ"),
|
||||||
ready, chapters, 1:30, previous / next episode, change video, people,
|
ready, chapters, 1:30, previous / next episode, change video, volume, ⚙
|
||||||
volume and fullscreen. Keys and skip buttons work the same.
|
and fullscreen; the title top left, Up next, chat and back-to-library top right. Keys and skip buttons work
|
||||||
|
the same.
|
||||||
|
|
||||||
Skipping: during the opening a "Skip OP" button floats in the corner (it
|
Skipping: during the opening a "Skip OP" button shows bottom right, just
|
||||||
|
above the controls (it
|
||||||
jumps to the end of the opening), during the ending "Skip ED" (to the end
|
jumps to the end of the opening), during the ending "Skip ED" (to the end
|
||||||
of the ending only; what comes after is yours to skip). The opening and
|
of the ending only; what comes after is yours to skip). "Skip OP" and
|
||||||
|
"Skip 1:30" show for 5 seconds when they come up, then only while the
|
||||||
|
controls are up (move the mouse); "Skip ED" and "Next episode" show only
|
||||||
|
while the controls are up. The opening and
|
||||||
ending come from Jellyfin's intro / outro segments when your Jellyfin has
|
ending come from Jellyfin's intro / outro segments when your Jellyfin has
|
||||||
them (needs a segment plugin, e.g. Intro Skipper), else from chapter names
|
them (needs a segment plugin, e.g. Intro Skipper), else from chapter names
|
||||||
(OP, Opening, Intro / ED, Ending, Credits, Outro). Without an opening, on
|
(OP, Opening, Intro / ED, Ending, Credits, Outro). Without an opening or
|
||||||
anything longer than 20 minutes, "Skip 1:30" floats there during the first
|
any chapters, on anything longer than 20 minutes, "Skip 1:30" floats there
|
||||||
6 minutes.
|
during the first 6 minutes.
|
||||||
|
|
||||||
## Ports
|
## Ports
|
||||||
|
|
||||||
@@ -132,29 +351,27 @@ Only the host needs the port reachable.
|
|||||||
|
|
||||||
## Jellyfin
|
## Jellyfin
|
||||||
|
|
||||||
Integrations > Jellyfin > Add server: type the address, then sign in with
|
Settings > Jellyfin & integrations > Add server: type the address, then sign in with
|
||||||
Quick Connect (the app shows a code; approve it in Jellyfin under Profile >
|
Quick Connect (the app shows a code; approve it in Jellyfin under Profile >
|
||||||
Quick Connect) or your username and password. Several servers can be
|
Quick Connect) or your username and password. Several servers can be
|
||||||
linked; each shows its status, and a star picks the default. Sign out
|
linked; each shows its status, and a star picks the default. Sign out
|
||||||
revokes the app's sign-in on the server. If a sign-in expires the server
|
revokes the app's sign-in on the server. If a sign-in expires the server
|
||||||
shows "Reconnect" instead of disappearing.
|
shows "Reconnect" instead of disappearing.
|
||||||
|
|
||||||
The Host tab's Jellyfin source is a library browser: Continue watching (with
|
The Library's Jellyfin source is a library browser: Continue watching (with
|
||||||
time left), Next up and the latest per library on the start page; library
|
time left), Next up and the latest per library on the start page; library
|
||||||
grids with sort (name, date added, release date, rating, random) and
|
grids with sort (name, date added, release date, rating, random) and
|
||||||
Unwatched / Favorites filters; series pages with seasons, episode progress
|
Unwatched / Favorites filters; series pages with seasons, episode progress
|
||||||
and a "Next up" button; details with the file's tracks; search. Clicking a
|
and a "Next up" button; details with the file's tracks; search. Clicking a
|
||||||
movie or episode picks it; the button in the top right enlarges the browser
|
movie or episode picks it. On wide windows a side pane shows details of
|
||||||
and moves port, password and Host into a bar below it. On wide windows a
|
whatever is under the mouse.
|
||||||
side pane shows details of whatever is under the mouse.
|
|
||||||
|
|
||||||
Keys in the browser: arrows move, Enter picks or opens, I = details,
|
Keys in the browser: arrows move, Enter picks or opens, I = details,
|
||||||
Esc / Backspace / Alt+Left = back (Esc first clears a search), / or Ctrl+F =
|
Esc / Backspace / Alt+Left = back (Esc first clears a search), / or Ctrl+F =
|
||||||
search.
|
search.
|
||||||
|
|
||||||
Host from the library: pick a movie or episode and Host. Only the item
|
Putting up a movie or episode sends only the item to the server (which
|
||||||
goes to the server (which Jellyfin server and which item), never a link or
|
Jellyfin server and which item), never a link or your sign-in. Pasting a Jellyfin link (web page or stream link) does the
|
||||||
your sign-in. Pasting a Jellyfin link (web page or stream link) does the
|
|
||||||
same when the app can reach that Jellyfin; otherwise it is shared as a
|
same when the app can reach that Jellyfin; otherwise it is shared as a
|
||||||
plain link.
|
plain link.
|
||||||
|
|
||||||
@@ -163,19 +380,26 @@ Watching:
|
|||||||
directly with their own sign-in. Jellyfin tracks progress per account:
|
directly with their own sign-in. Jellyfin tracks progress per account:
|
||||||
your watched state, Continue watching and resume point follow what you
|
your watched state, Continue watching and resume point follow what you
|
||||||
saw (reported on start, every 10 s, on pause, resume, seek and track
|
saw (reported on start, every 10 s, on pause, resume, seek and track
|
||||||
change, and when it stops).
|
change, and when it stops). Watched means you actually played most of
|
||||||
- Friends without an account watch through the host: the server fetches
|
it (or reached the ending after half), not where you stopped: opening
|
||||||
the file with the host's sign-in and passes it on (only the current item,
|
a watched episode to check a moment keeps it watched, and a quick peek
|
||||||
only to people in the session). They show "via host" in the member list.
|
leaves no resume point.
|
||||||
A dedicated server relays when started with `--jellyfin <file>` (see
|
- Friends without an account watch through the server: whoever put the
|
||||||
[docs/ARCHITECTURE.md](docs/ARCHITECTURE.md), Jellyfin relay).
|
item up passes it on automatically, with their own sign-in, which never
|
||||||
- Without either, the app says "This needs a Jellyfin account on ..." with
|
leaves their computer (only the current item, only to people in the
|
||||||
a button to link one; it plays as soon as you are signed in.
|
session). They show "via server" in the member list (click the avatars). When the app hosts,
|
||||||
|
or a dedicated server has its own login (`--jellyfin <file>`, see
|
||||||
|
[docs/ARCHITECTURE.md](docs/ARCHITECTURE.md), Jellyfin relay), the server
|
||||||
|
fetches it itself instead.
|
||||||
|
- If nobody can pass it on (the person who put it up left), the app says
|
||||||
|
"No Jellyfin account here for ..." with a button to link one; it plays as
|
||||||
|
soon as you are signed in.
|
||||||
|
|
||||||
Episodes: the ⏮ / ⏭ buttons next to the controls (or `<` / `>`,
|
Episodes: the ⏮ / ⏭ buttons next to the controls (or `<` / `>`,
|
||||||
Shift+P / Shift+N) put up the previous or next episode for everyone. From
|
Shift+P / Shift+N) put up the previous or next episode for everyone. From
|
||||||
the ending (when it is known, see Skipping above; else in the last two
|
the ending (when it is known, see Skipping above; else in the last two
|
||||||
minutes) a "Next episode" button floats in the corner. When an
|
minutes) a "Next episode" button floats in the corner while the controls
|
||||||
|
are up. When an
|
||||||
episode ends, a card shows what is next with Play next; with "Play the
|
episode ends, a card shows what is next with Play next; with "Play the
|
||||||
next episode automatically" (Settings, on by default) it counts down 10 s
|
next episode automatically" (Settings, on by default) it counts down 10 s
|
||||||
first, and Cancel stops it on your screen (seeking back stops it for
|
first, and Cancel stops it on your screen (seeking back stops it for
|
||||||
@@ -187,9 +411,53 @@ Your choice is remembered per series (and as a default) and the closest
|
|||||||
match (language, then title, then codec and channels) is selected on the
|
match (language, then title, then codec and channels) is selected on the
|
||||||
next episode. This is per person; nobody else is affected.
|
next episode. This is per person; nobody else is affected.
|
||||||
|
|
||||||
"Change video" in the session panel (Tab) opens the same picker as the Host
|
"Change video" in the player's controls opens the Library tab (the player
|
||||||
tab: the library starts on the series you are watching with the current
|
goes mini): the library starts on the series you are watching with the
|
||||||
season, else where you left it. File is offered to the host only.
|
current season, else where you left it.
|
||||||
|
|
||||||
|
Anyone can put up a file from their own computer, also on a dedicated
|
||||||
|
server: it streams from your computer through the server to everyone (the
|
||||||
|
server keeps a few minutes in memory, so seeks and skipping the opening
|
||||||
|
are quick). Keep the app open while it plays. A link goes up "Through
|
||||||
|
me": your computer opens it and passes it on, so it plays for everyone
|
||||||
|
whenever it plays for you (you can't tell ahead which sites want cookies,
|
||||||
|
and YouTube may start asking any day). Under "Other ways" there are two more:
|
||||||
|
- Everyone fetches it: each app plays the link itself.
|
||||||
|
- Server fetches it: the server downloads it once for everyone, for links
|
||||||
|
that are slow or blocked for some. The server must be able to reach it,
|
||||||
|
and it must have a password (an open server refuses: anyone could make
|
||||||
|
it fetch addresses only it can reach).
|
||||||
|
|
||||||
|
Web pages work in all three: the app and the dedicated server each
|
||||||
|
download [yt-dlp](https://github.com/yt-dlp/yt-dlp) by themselves (checked
|
||||||
|
against the release's checksums, updated once a day; Settings → Player
|
||||||
|
shows its version and has "Update now"), so there is nothing to install.
|
||||||
|
Sites that refuse guests (Bilibili answers "HTTP Error 412", YouTube may
|
||||||
|
ask to sign in) need cookies: Settings → Player → yt-dlp → Cookies reads
|
||||||
|
them from a browser, or from a cookies.txt or a cookie extension's JSON
|
||||||
|
export (picked or dropped; every site in it is kept). They stay on this
|
||||||
|
computer and are used by its yt-dlp only (your own playback, "through
|
||||||
|
me", and a server you host). Cookies log yt-dlp in as you on those
|
||||||
|
sites: keep the file private, and for YouTube consider a throwaway
|
||||||
|
account (Google may flag accounts used with yt-dlp).
|
||||||
|
YouTube works in all three too, and so do pages and links that only
|
||||||
|
offer streaming playlists (HLS `.m3u8`, DASH `.mpd`, the HLS of X videos).
|
||||||
|
Through me and Server fetches it never show the link to anyone; they can't pass on live
|
||||||
|
streams or DRM-protected video (use "Everyone fetches it" for live).
|
||||||
|
Your upload has to beat the video's bitrate: a 25-minute 2 GB episode is
|
||||||
|
about 11 Mbit/s.
|
||||||
|
|
||||||
|
The member list (click the avatars) shows where the video comes from on
|
||||||
|
top: who passes it on, or that the server fetches it, everyone plays the
|
||||||
|
link, or everyone streams it from Jellyfin, with how many watch through
|
||||||
|
the server and, for a relay, how fast it arrives against what the video
|
||||||
|
needs (the bar's mark; past it is keeping up). It turns amber when the
|
||||||
|
source is too slow or reconnecting, red when it left (the others play
|
||||||
|
out what the server already has), and whoever passes it on is told once
|
||||||
|
when their upload is too slow. Each member's line says how they get it
|
||||||
|
("via server" with their speed, or "direct") after a dot for their
|
||||||
|
buffer: green enough to play on, amber low, red empty. A red dot on one
|
||||||
|
member while the source keeps up is their own connection.
|
||||||
|
|
||||||
## Video quality and shaders
|
## Video quality and shaders
|
||||||
|
|
||||||
@@ -201,8 +469,9 @@ C (480p), A+A, B+B, C+A, each as HQ (strong GPUs, GTX 1080 and up) or Fast
|
|||||||
|
|
||||||
Pick one with the ✨ button in the player's control bar (also in
|
Pick one with the ✨ button in the player's control bar (also in
|
||||||
fullscreen) or Ctrl+0..6; the change applies live and is saved, so the next
|
fullscreen) or Ctrl+0..6; the change applies live and is saved, so the next
|
||||||
session starts with it. Settings → Video quality & shaders sets the default,
|
session starts with it. The player's ⚙ and Settings → Player set it too,
|
||||||
HQ or Fast (used by Ctrl+1..6) and the custom files. Shaders cost GPU time
|
with HQ or Fast (used by Ctrl+1..6); Settings → Player holds the custom
|
||||||
|
files. Shaders cost GPU time
|
||||||
every frame and need hardware video rendering: on media_kit's software
|
every frame and need hardware video rendering: on media_kit's software
|
||||||
fallback they do nothing, and the app says so. A shader that is missing or
|
fallback they do nothing, and the app says so. A shader that is missing or
|
||||||
fails to load shows a toast and switches shaders off.
|
fails to load shows a toast and switches shaders off.
|
||||||
@@ -212,9 +481,9 @@ fails to load shows a toast and switches shaders off.
|
|||||||
- "host offline - check address and port": wrong address, or the port is not open.
|
- "host offline - check address and port": wrong address, or the port is not open.
|
||||||
- "wrong server password": password mismatch.
|
- "wrong server password": password mismatch.
|
||||||
- "host runs a different version": update the app on both sides.
|
- "host runs a different version": update the app on both sides.
|
||||||
- Picture frozen but sound fine: Ctrl+R reloads the video; the app also does it automatically.
|
- Picture frozen but sound fine: Ctrl+R reloads the video.
|
||||||
- Everyone waits at "waiting for X": X has not buffered 4 seconds yet or has not pressed Space.
|
- Everyone waits at "waiting for X": X has not buffered 4 seconds yet or has not pressed Space.
|
||||||
- No Windows build yet.
|
- Windows: the build is new; if something is off there, say so.
|
||||||
|
|
||||||
For contributors: [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md),
|
For contributors: [docs/DEVELOPMENT.md](docs/DEVELOPMENT.md),
|
||||||
[docs/ARCHITECTURE.md](docs/ARCHITECTURE.md), [docs/PROTOCOL.md](docs/PROTOCOL.md).
|
[docs/ARCHITECTURE.md](docs/ARCHITECTURE.md), [docs/PROTOCOL.md](docs/PROTOCOL.md).
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256">
|
||||||
|
<defs><linearGradient id="bg" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#2d2547"/><stop offset="1" stop-color="#14111d"/></linearGradient><linearGradient id="t1" gradientUnits="userSpaceOnUse" x1="50.7" y1="148.7" x2="184.6" y2="71.4"><stop offset="0" stop-color="#f0795a" stop-opacity="0"/><stop offset="0.45" stop-color="#f0795a" stop-opacity="0.85"/><stop offset="1" stop-color="#ffc56b"/></linearGradient><linearGradient id="t2" gradientUnits="userSpaceOnUse" x1="205.3" y1="107.3" x2="71.4" y2="184.6"><stop offset="0" stop-color="#ffc56b" stop-opacity="0"/><stop offset="0.45" stop-color="#ffc56b" stop-opacity="0.85"/><stop offset="1" stop-color="#f0795a"/></linearGradient></defs>
|
||||||
|
<rect x="8" y="8" width="240" height="240" rx="56" fill="url(#bg)"/>
|
||||||
|
<circle cx="128" cy="128" r="80" fill="none" stroke="#ffffff" stroke-opacity="0.10" stroke-width="6"/>
|
||||||
|
<path d="M205.27 107.29 A80 80 0 0 1 71.43 184.57" fill="none" stroke="url(#t2)" stroke-width="7" stroke-linecap="butt"/><path d="M50.73 148.71 A80 80 0 0 1 184.57 71.43" fill="none" stroke="url(#t1)" stroke-width="7" stroke-linecap="butt"/>
|
||||||
|
<path d="M110 96 L110 160 L162 128 Z" fill="#fff1d6" stroke="#fff1d6" stroke-width="16" stroke-linejoin="round"/>
|
||||||
|
<path d="M71.4 161.6 Q74.7 181.3 94.4 184.6 Q74.7 187.8 71.4 207.6 Q68.2 187.8 48.4 184.6 Q68.2 181.3 71.4 161.6 Z" fill="#f0795a"/>
|
||||||
|
<path d="M184.6 40.4 Q188.9 67.1 215.6 71.4 Q188.9 75.8 184.6 102.4 Q180.2 75.8 153.6 71.4 Q180.2 67.1 184.6 40.4 Z" fill="#ffc56b"/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
|
After Width: | Height: | Size: 7.3 KiB |
|
After Width: | Height: | Size: 732 B |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 1.4 KiB |
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
@@ -1,28 +1,22 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:signals/signals_flutter.dart';
|
|
||||||
|
|
||||||
import 'src/screens/home/home_screen.dart';
|
|
||||||
import 'src/screens/home/ui.dart';
|
import 'src/screens/home/ui.dart';
|
||||||
import 'src/screens/session_screen.dart';
|
import 'src/shell/app_shell.dart';
|
||||||
import 'src/state/session_state.dart';
|
import 'src/widgets/app_keys.dart';
|
||||||
|
import 'src/widgets/app_menu.dart';
|
||||||
|
|
||||||
class WatchTogetherApp extends StatelessWidget {
|
class WatchTogetherApp extends StatelessWidget {
|
||||||
const WatchTogetherApp({super.key});
|
const WatchTogetherApp({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final session = SessionState.instance;
|
|
||||||
return MaterialApp(
|
return MaterialApp(
|
||||||
title: appName,
|
title: appName,
|
||||||
theme: ThemeData.dark(),
|
// Material's own menus (the player's track menus, sort) wear the
|
||||||
home: SignalBuilder(
|
// app menu's surface.
|
||||||
builder: (context) {
|
theme: AppMenuStyle.theme(ThemeData.dark()),
|
||||||
return switch (session.route.value) {
|
shortcuts: appShortcuts,
|
||||||
AppRoute.home => const HomeScreen(),
|
home: const AppKeys(child: AppShell()),
|
||||||
AppRoute.session => const SessionScreen(),
|
|
||||||
};
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'dart:async';
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -7,10 +8,14 @@ import 'package:sync_relay_core/core.dart';
|
|||||||
import 'package:window_manager/window_manager.dart';
|
import 'package:window_manager/window_manager.dart';
|
||||||
|
|
||||||
import 'app.dart';
|
import 'app.dart';
|
||||||
|
import 'src/playback/yt_dlp_app.dart';
|
||||||
|
import 'src/platform/app_log.dart';
|
||||||
|
import 'src/platform/desktop_entry.dart';
|
||||||
|
import 'src/platform/window_memory.dart';
|
||||||
import 'src/screens/home/ui.dart';
|
import 'src/screens/home/ui.dart';
|
||||||
import 'src/state/session_state.dart';
|
import 'src/state/session_state.dart';
|
||||||
import 'src/state/settings.dart';
|
import 'src/state/settings.dart';
|
||||||
import 'src/update/updater.dart';
|
import 'src/update/update_controller.dart' show launchArgs;
|
||||||
|
|
||||||
Future<void> main(List<String> args) async {
|
Future<void> main(List<String> args) async {
|
||||||
launchArgs = List.unmodifiable(args);
|
launchArgs = List.unmodifiable(args);
|
||||||
@@ -37,29 +42,36 @@ Future<void> main(List<String> args) async {
|
|||||||
),
|
),
|
||||||
);
|
);
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
|
await startAppLogging();
|
||||||
|
await Hive.initFlutter();
|
||||||
|
await AppSettings.instance.ensureLoaded();
|
||||||
await windowManager.ensureInitialized();
|
await windowManager.ensureInitialized();
|
||||||
await windowManager.setPreventClose(true);
|
await windowManager.setPreventClose(true);
|
||||||
windowManager.addListener(_CloseGuard());
|
final memory = WindowMemory(Hive.isBoxOpen(settingsBoxName) ? Hive.box(settingsBoxName) : null);
|
||||||
const windowOptions = WindowOptions(
|
windowManager.addListener(_CloseGuard(memory));
|
||||||
size: Size(1280, 720),
|
final windowOptions = WindowOptions(
|
||||||
minimumSize: Size(160, 90),
|
size: memory.size,
|
||||||
center: true,
|
minimumSize: const Size(160, 90),
|
||||||
backgroundColor: Color(0xFF000000),
|
center: !memory.hasPosition,
|
||||||
|
backgroundColor: const Color(0xFF000000),
|
||||||
titleBarStyle: TitleBarStyle.hidden,
|
titleBarStyle: TitleBarStyle.hidden,
|
||||||
title: appName,
|
title: appName,
|
||||||
);
|
);
|
||||||
windowManager.waitUntilReadyToShow(windowOptions, () async {
|
windowManager.waitUntilReadyToShow(windowOptions, () async {
|
||||||
|
await memory.restore();
|
||||||
await windowManager.show();
|
await windowManager.show();
|
||||||
await windowManager.focus();
|
await windowManager.focus();
|
||||||
});
|
});
|
||||||
await Hive.initFlutter();
|
|
||||||
await AppSettings.instance.ensureLoaded();
|
|
||||||
try {
|
try {
|
||||||
await SessionState.instance.loadForm();
|
await SessionState.instance.loadForm();
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
debugPrint('load connect form failed: $e\n$st');
|
debugPrint('load connect form failed: $e\n$st');
|
||||||
}
|
}
|
||||||
MediaKit.ensureInitialized();
|
MediaKit.ensureInitialized();
|
||||||
|
// yt-dlp for web page links: downloaded on first run, kept current.
|
||||||
|
AppYtDlp.instance.warmUp();
|
||||||
|
// Linux: the launcher entry and icon Wayland needs (release installs).
|
||||||
|
unawaited(installDesktopEntry());
|
||||||
runApp(const WatchTogetherApp());
|
runApp(const WatchTogetherApp());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,12 +79,15 @@ Future<void> main(List<String> args) async {
|
|||||||
/// hosted server shuts down), bounded so a hung socket can't keep the
|
/// hosted server shuts down), bounded so a hung socket can't keep the
|
||||||
/// window open.
|
/// window open.
|
||||||
class _CloseGuard with WindowListener {
|
class _CloseGuard with WindowListener {
|
||||||
|
final WindowMemory memory;
|
||||||
bool _closing = false;
|
bool _closing = false;
|
||||||
|
_CloseGuard(this.memory);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<void> onWindowClose() async {
|
Future<void> onWindowClose() async {
|
||||||
if (_closing) return;
|
if (_closing) return;
|
||||||
_closing = true;
|
_closing = true;
|
||||||
|
await memory.save();
|
||||||
try {
|
try {
|
||||||
await SessionState.instance.leave().timeout(const Duration(seconds: 2));
|
await SessionState.instance.leave().timeout(const Duration(seconds: 2));
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
@@ -0,0 +1,182 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
/// What keeps the player's controls up besides the mouse on them: the
|
||||||
|
/// mouse on a floating element over the picture (a pill, a card, the
|
||||||
|
/// status pill: [ControlsHoldRegion]) or an open popover. While anything
|
||||||
|
/// holds, the controls stay up; on release they hide on their usual
|
||||||
|
/// countdown. Both designs follow it ([ControlsHoverProbe] with
|
||||||
|
/// media_kit's controls, `UoscControls`).
|
||||||
|
class ControlsHold extends ChangeNotifier {
|
||||||
|
final _by = <Object>{};
|
||||||
|
bool _told = false;
|
||||||
|
bool _queued = false;
|
||||||
|
bool _disposed = false;
|
||||||
|
|
||||||
|
bool get held => _told;
|
||||||
|
|
||||||
|
/// [who] holds ([on]) or lets go. Listeners hear it in a microtask, never
|
||||||
|
/// during a build or a dispose.
|
||||||
|
void set(Object who, bool on) {
|
||||||
|
if (on ? !_by.add(who) : !_by.remove(who)) return;
|
||||||
|
if (_queued) return;
|
||||||
|
_queued = true;
|
||||||
|
scheduleMicrotask(() {
|
||||||
|
_queued = false;
|
||||||
|
if (_disposed) return;
|
||||||
|
final now = _by.isNotEmpty;
|
||||||
|
if (now == _told) return;
|
||||||
|
_told = now;
|
||||||
|
notifyListeners();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_disposed = true;
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The mouse on [child] counts as the mouse on the controls: it holds
|
||||||
|
/// [hold] while it is there.
|
||||||
|
class ControlsHoldRegion extends StatefulWidget {
|
||||||
|
final ControlsHold? hold;
|
||||||
|
final Widget child;
|
||||||
|
const ControlsHoldRegion({super.key, required this.hold, required this.child});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ControlsHoldRegion> createState() => _ControlsHoldRegionState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ControlsHoldRegionState extends State<ControlsHoldRegion> {
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(ControlsHoldRegion oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.hold != widget.hold) oldWidget.hold?.set(this, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
widget.hold?.set(this, false);
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final hold = widget.hold;
|
||||||
|
if (hold == null) return widget.child;
|
||||||
|
return MouseRegion(
|
||||||
|
onEnter: (_) => hold.set(this, true),
|
||||||
|
onExit: (_) => hold.set(this, false),
|
||||||
|
child: widget.child,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Follows whether media_kit's desktop controls around [child] are up,
|
||||||
|
/// by the same rule they use: up on mount and on any mouse movement,
|
||||||
|
/// down [hideAfter] later or when the mouse leaves. media_kit does not
|
||||||
|
/// expose its visibility; this lets the player draw a progress line while
|
||||||
|
/// they are down. With [hold] held it keeps them (and itself) up. Never
|
||||||
|
/// takes input.
|
||||||
|
class ControlsHoverProbe extends StatefulWidget {
|
||||||
|
final ValueNotifier<bool> shown;
|
||||||
|
final Duration hideAfter;
|
||||||
|
final ControlsHold? hold;
|
||||||
|
final Widget child;
|
||||||
|
const ControlsHoverProbe(
|
||||||
|
{super.key, required this.shown, required this.hideAfter, this.hold, required this.child});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ControlsHoverProbe> createState() => _ControlsHoverProbeState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ControlsHoverProbeState extends State<ControlsHoverProbe> {
|
||||||
|
Timer? _timer;
|
||||||
|
// While held: media_kit's own countdown is restarted before it ends.
|
||||||
|
Timer? _keep;
|
||||||
|
|
||||||
|
bool get _held => widget.hold?.held ?? false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
widget.hold?.addListener(_holdChanged);
|
||||||
|
// Not during this build: the line listening to [shown] may be built.
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (mounted) _wake();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(ControlsHoverProbe oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.hold != widget.hold) {
|
||||||
|
oldWidget.hold?.removeListener(_holdChanged);
|
||||||
|
widget.hold?.addListener(_holdChanged);
|
||||||
|
_holdChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
widget.hold?.removeListener(_holdChanged);
|
||||||
|
_timer?.cancel();
|
||||||
|
_keep?.cancel();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _holdChanged() {
|
||||||
|
if (!mounted) return;
|
||||||
|
_keep?.cancel();
|
||||||
|
_keep = null;
|
||||||
|
if (_held) {
|
||||||
|
_keep = Timer.periodic(widget.hideAfter * 0.5, (_) => _pokeControls());
|
||||||
|
}
|
||||||
|
_pokeControls();
|
||||||
|
_wake();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// media_kit's controls state is private: a guarded dynamic call to its
|
||||||
|
/// hover handler, as a mouse movement on it would make.
|
||||||
|
void _pokeControls() {
|
||||||
|
if (!mounted) return;
|
||||||
|
void visit(Element e) {
|
||||||
|
if (e is StatefulElement && e.state.runtimeType.toString() == '_MaterialDesktopVideoControlsState') {
|
||||||
|
try {
|
||||||
|
(e.state as dynamic).onHover();
|
||||||
|
} catch (_) {}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
e.visitChildElements(visit);
|
||||||
|
}
|
||||||
|
|
||||||
|
context.visitChildElements(visit);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _wake() {
|
||||||
|
widget.shown.value = true;
|
||||||
|
_timer?.cancel();
|
||||||
|
_timer = Timer(widget.hideAfter, _hide);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _hide() {
|
||||||
|
_timer?.cancel();
|
||||||
|
if (!mounted || _held) return;
|
||||||
|
widget.shown.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => MouseRegion(
|
||||||
|
opaque: false,
|
||||||
|
hitTestBehavior: HitTestBehavior.translucent,
|
||||||
|
onEnter: (_) => _wake(),
|
||||||
|
onHover: (_) => _wake(),
|
||||||
|
// Held (the mouse went onto a pill or the popover): media_kit's
|
||||||
|
// controls just hid on their own exit; bring them straight back.
|
||||||
|
onExit: (_) => _held ? _pokeControls() : _hide(),
|
||||||
|
child: widget.child,
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -0,0 +1,402 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart' show JellyfinStreamType;
|
||||||
|
|
||||||
|
import '../jellyfin/track_prefs.dart' show MpvTrack;
|
||||||
|
import '../playback/playback_controller.dart' show PlaybackController, RenderMode;
|
||||||
|
import '../shaders/shader_presets.dart';
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import '../shell/mark_problem.dart';
|
||||||
|
import '../shell/motion.dart';
|
||||||
|
import '../state/settings.dart';
|
||||||
|
import '../widgets/app_menu.dart';
|
||||||
|
import 'uosc/buttons.dart';
|
||||||
|
import 'uosc/controls.dart';
|
||||||
|
|
||||||
|
// Everything about the player, defined once: the rows of the ⚙ card in
|
||||||
|
// both control designs and of Settings → Player. Each row reads and
|
||||||
|
// writes [AppSettings] and applies to a running player right away.
|
||||||
|
|
||||||
|
/// One setting: a label, one line of help under it, the control at the
|
||||||
|
/// right ([below]: an extra line under the row, e.g. a text field).
|
||||||
|
class SettingRow extends StatelessWidget {
|
||||||
|
final String label;
|
||||||
|
final String? help;
|
||||||
|
final Widget control;
|
||||||
|
final Widget? below;
|
||||||
|
const SettingRow({super.key, required this.label, this.help, required this.control, this.below});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final muted = Theme.of(context).colorScheme.onSurfaceVariant;
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 6),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(label),
|
||||||
|
if (help != null) Text(help!, style: TextStyle(color: muted, fontSize: 12)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
control,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
?below,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AppSelect<T> _dropdown<T>({
|
||||||
|
required Key key,
|
||||||
|
required T value,
|
||||||
|
required List<(T, String)> items,
|
||||||
|
required ValueChanged<T> onChanged,
|
||||||
|
bool expanded = false,
|
||||||
|
}) =>
|
||||||
|
AppSelect<T>(key: key, value: value, items: items, onChanged: onChanged, expanded: expanded);
|
||||||
|
|
||||||
|
/// Standard (our bars over media_kit's controls) or uosc. Live.
|
||||||
|
class PlayerDesignSetting extends StatelessWidget {
|
||||||
|
const PlayerDesignSetting({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final s = AppSettings.instance;
|
||||||
|
return SignalBuilder(
|
||||||
|
builder: (context) => SettingRow(
|
||||||
|
label: 'Player design',
|
||||||
|
help: 'uosc is modeled on mpv: a thick timeline with chapters and what is cached',
|
||||||
|
control: _dropdown<bool>(
|
||||||
|
key: const ValueKey('player-design'),
|
||||||
|
value: s.mpvControls.value,
|
||||||
|
items: const [(false, 'Standard'), (true, 'uosc')],
|
||||||
|
onChanged: s.setMpvControls,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The 2 px line at the bottom while the controls are hidden. Live.
|
||||||
|
class ProgressLineSetting extends StatelessWidget {
|
||||||
|
const ProgressLineSetting({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final s = AppSettings.instance;
|
||||||
|
return SignalBuilder(
|
||||||
|
builder: (context) => SettingRow(
|
||||||
|
label: 'Progress line when hidden',
|
||||||
|
help: 'A thin bar at the bottom of the video while the controls are hidden',
|
||||||
|
control: Switch(
|
||||||
|
key: const ValueKey('progress-line'),
|
||||||
|
value: s.progressLine.value,
|
||||||
|
onChanged: s.setProgressLine,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Saves a shader choice (also used on the next join) and puts it on the
|
||||||
|
/// running player, if any; the player announces the result.
|
||||||
|
void applyShaderChoice(ShaderPreset preset, ShaderQuality? quality) {
|
||||||
|
final s = AppSettings.instance;
|
||||||
|
if (quality != null) s.setShaderQuality(quality);
|
||||||
|
s.setShaderPreset(preset);
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
coord.markInput();
|
||||||
|
coord.playback.applyShaders(announce: true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Anime4K preset (or custom files) and HQ / Fast. Live.
|
||||||
|
class ShaderPresetSetting extends StatelessWidget {
|
||||||
|
/// The running player's render mode (in the player); else the last one.
|
||||||
|
final ReadonlySignal<RenderMode>? renderMode;
|
||||||
|
const ShaderPresetSetting({super.key, this.renderMode});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final s = AppSettings.instance;
|
||||||
|
return SignalBuilder(builder: (context) {
|
||||||
|
final preset = s.shaderPreset.value;
|
||||||
|
final quality = s.shaderQuality.value;
|
||||||
|
final hasCustom = s.customShaders.value.isNotEmpty;
|
||||||
|
final mode = (renderMode ?? PlaybackController.lastRenderMode).value;
|
||||||
|
final warning = switch (mode) {
|
||||||
|
RenderMode.software => 'Software rendering: shaders have no effect',
|
||||||
|
RenderMode.softwareGl => 'OpenGL on the CPU: shaders will be slow',
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
return SettingRow(
|
||||||
|
label: 'Upscaling shader',
|
||||||
|
help: 'Anime4K sharpens anime on your GPU, only you see it. '
|
||||||
|
'A for 1080p, B for 720p, C for 480p · Ctrl+1…6, Ctrl+0 off',
|
||||||
|
control: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
_dropdown<ShaderPreset>(
|
||||||
|
key: const ValueKey('shader-preset'),
|
||||||
|
value: preset,
|
||||||
|
items: [
|
||||||
|
for (final p in ShaderPreset.values)
|
||||||
|
if (p != ShaderPreset.custom || hasCustom || preset == p) (p, p.label),
|
||||||
|
],
|
||||||
|
onChanged: (p) => applyShaderChoice(p, null),
|
||||||
|
),
|
||||||
|
if (preset.isAnime4k) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
_dropdown<ShaderQuality>(
|
||||||
|
key: const ValueKey('shader-quality'),
|
||||||
|
value: quality,
|
||||||
|
items: [for (final q in ShaderQuality.values) (q, q.label)],
|
||||||
|
onChanged: (q) => applyShaderChoice(preset, q),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
below: warning == null
|
||||||
|
? null
|
||||||
|
: Text(warning, style: const TextStyle(fontSize: 12, color: Colors.orange)),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Puts the hwdec setting on the running player (mpv switches decoders
|
||||||
|
/// on the fly). `SYNC_RELAY_HWDEC` wins, as at player start.
|
||||||
|
Future<void> applyHwdecLive() async {
|
||||||
|
if ((Platform.environment['SYNC_RELAY_HWDEC'] ?? '').isNotEmpty) return;
|
||||||
|
final playback = SessionState.instance.coordinator.playback;
|
||||||
|
if (!playback.alive.peek()) return;
|
||||||
|
try {
|
||||||
|
final dynamic platform = playback.player.platform;
|
||||||
|
await platform?.setProperty('hwdec', AppSettings.instance.hwdec.peek());
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('live hwdec failed: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// mpv's `hwdec`: auto, off, or a custom value. Live.
|
||||||
|
class HwdecSetting extends StatefulWidget {
|
||||||
|
const HwdecSetting({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<HwdecSetting> createState() => _HwdecSettingState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _HwdecSettingState extends State<HwdecSetting> {
|
||||||
|
final _s = AppSettings.instance;
|
||||||
|
late final _custom = TextEditingController(text: _s.hwdecCustom.peek());
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_custom.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return SignalBuilder(builder: (context) {
|
||||||
|
final mode = _s.hwdecMode.value;
|
||||||
|
return SettingRow(
|
||||||
|
label: 'Hardware decoding',
|
||||||
|
help: 'Decodes video on the GPU. Turn it off if the picture glitches or stays black',
|
||||||
|
control: _dropdown<HwdecMode>(
|
||||||
|
key: const ValueKey('hwdec'),
|
||||||
|
value: mode,
|
||||||
|
items: const [(HwdecMode.auto, 'Auto'), (HwdecMode.off, 'Off'), (HwdecMode.custom, 'Custom')],
|
||||||
|
onChanged: (m) {
|
||||||
|
_s.setHwdecMode(m);
|
||||||
|
applyHwdecLive();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
below: mode != HwdecMode.custom
|
||||||
|
? null
|
||||||
|
: Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 8),
|
||||||
|
child: TextField(
|
||||||
|
controller: _custom,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
isDense: true,
|
||||||
|
labelText: 'mpv hwdec value (Enter applies)',
|
||||||
|
hintText: 'e.g. vaapi, nvdec, d3d11va, auto-safe',
|
||||||
|
border: OutlineInputBorder(),
|
||||||
|
),
|
||||||
|
onChanged: _s.setHwdecCustom,
|
||||||
|
onSubmitted: (_) => applyHwdecLive(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Audio or subtitle track of the running player (in the player only).
|
||||||
|
/// The pick is remembered for the next Jellyfin item.
|
||||||
|
class TrackSetting extends StatelessWidget {
|
||||||
|
final JellyfinStreamType type;
|
||||||
|
const TrackSetting({super.key, required this.type});
|
||||||
|
|
||||||
|
bool get _audio => type == JellyfinStreamType.audio;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
return SignalBuilder(builder: (context) {
|
||||||
|
final list = [
|
||||||
|
for (final t in coord.playback.tracks.value)
|
||||||
|
if (t.type == type) t,
|
||||||
|
];
|
||||||
|
// -1: subtitles off.
|
||||||
|
final selected = list.where((t) => t.selected).firstOrNull?.id ?? (_audio ? null : -1);
|
||||||
|
final items = <(int, String)>[
|
||||||
|
if (!_audio) (-1, 'Off'),
|
||||||
|
for (final MpvTrack t in list) (t.id, t.label),
|
||||||
|
];
|
||||||
|
return SettingRow(
|
||||||
|
label: _audio ? 'Audio' : 'Subtitles',
|
||||||
|
help: 'Remembered for the next episode',
|
||||||
|
control: SizedBox(
|
||||||
|
width: 190,
|
||||||
|
child: items.isEmpty || selected == null
|
||||||
|
? Text(items.isEmpty ? 'None' : 'Pick one…',
|
||||||
|
key: ValueKey(_audio ? 'audio-track' : 'subtitle-track'), textAlign: TextAlign.end)
|
||||||
|
: _dropdown<int>(
|
||||||
|
key: ValueKey(_audio ? 'audio-track' : 'subtitle-track'),
|
||||||
|
value: selected,
|
||||||
|
expanded: true,
|
||||||
|
items: items,
|
||||||
|
onChanged: (id) {
|
||||||
|
coord.markInput();
|
||||||
|
if (id == -1) {
|
||||||
|
coord.selectTrack(subtitlesOff: true);
|
||||||
|
} else if (_audio) {
|
||||||
|
coord.selectTrack(aid: id);
|
||||||
|
} else {
|
||||||
|
coord.selectTrack(sid: id);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The player rows of Settings → Player and the ⚙ card, in order.
|
||||||
|
List<Widget> playerSettingRows({ReadonlySignal<RenderMode>? renderMode}) => [
|
||||||
|
const PlayerDesignSetting(),
|
||||||
|
const ProgressLineSetting(),
|
||||||
|
ShaderPresetSetting(renderMode: renderMode),
|
||||||
|
const HwdecSetting(),
|
||||||
|
];
|
||||||
|
|
||||||
|
/// The ⚙ card: every player setting, plus the running player's tracks.
|
||||||
|
class PlayerSettingsCard extends StatelessWidget {
|
||||||
|
final ReadonlySignal<RenderMode>? renderMode;
|
||||||
|
/// Show the audio / subtitle pickers (a player is running).
|
||||||
|
final bool tracks;
|
||||||
|
const PlayerSettingsCard({super.key, this.renderMode, this.tracks = true});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
// The app's glass, like the Up next popover and the menus.
|
||||||
|
return AppGlass(
|
||||||
|
key: const ValueKey('player-settings-card'),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 420,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 12, 16, 10),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
const Text('Player', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 14)),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
...playerSettingRows(renderMode: renderMode),
|
||||||
|
if (tracks) ...[
|
||||||
|
const Divider(),
|
||||||
|
const TrackSetting(type: JellyfinStreamType.subtitle),
|
||||||
|
const TrackSetting(type: JellyfinStreamType.audio),
|
||||||
|
],
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
'Custom shader files: Settings → Player',
|
||||||
|
style: TextStyle(color: Theme.of(context).colorScheme.onSurfaceVariant, fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const MarkProblemButton(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Opens the ⚙ card over the player, near the controls' right end. The
|
||||||
|
/// uosc controls stay up while it is open.
|
||||||
|
Future<void> showPlayerSettings(BuildContext context, {ReadonlySignal<RenderMode>? renderMode}) {
|
||||||
|
Future<void> open() => showPopover<void>(
|
||||||
|
context,
|
||||||
|
at: const Alignment(0.96, 0.5),
|
||||||
|
child: PlayerSettingsCard(renderMode: renderMode),
|
||||||
|
);
|
||||||
|
final controls = UoscControls.maybeOf(context);
|
||||||
|
return controls == null ? open() : controls.holdDuring(open);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ⚙ in the standard controls' bottom bar.
|
||||||
|
class PlayerSettingsButton extends StatelessWidget {
|
||||||
|
final FocusNode? focusNode;
|
||||||
|
final ReadonlySignal<RenderMode>? renderMode;
|
||||||
|
const PlayerSettingsButton({super.key, this.focusNode, this.renderMode});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return IconButton(
|
||||||
|
key: const ValueKey('player-settings'),
|
||||||
|
focusNode: focusNode,
|
||||||
|
tooltip: 'Player settings',
|
||||||
|
color: Colors.white,
|
||||||
|
iconSize: 20,
|
||||||
|
visualDensity: VisualDensity.compact,
|
||||||
|
icon: const Icon(Icons.tune),
|
||||||
|
onPressed: () => showPlayerSettings(context, renderMode: renderMode),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ⚙ in the uosc controls' button row.
|
||||||
|
class UoscPlayerSettingsButton extends StatelessWidget {
|
||||||
|
final ReadonlySignal<RenderMode>? renderMode;
|
||||||
|
const UoscPlayerSettingsButton({super.key, this.renderMode});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return UoscButton(
|
||||||
|
key: const ValueKey('uosc-player-settings'),
|
||||||
|
icon: Icons.tune_rounded,
|
||||||
|
tooltip: 'Player settings',
|
||||||
|
onPressed: () => showPlayerSettings(context, renderMode: renderMode),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,3 @@
|
|||||||
import 'package:flutter/gestures.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:signals/signals_flutter.dart';
|
import 'package:signals/signals_flutter.dart';
|
||||||
import 'package:sync_relay_core/core.dart' show JellyfinStreamType;
|
import 'package:sync_relay_core/core.dart' show JellyfinStreamType;
|
||||||
@@ -10,6 +9,7 @@ import '../../screens/session/player_controls.dart' show TrackPick;
|
|||||||
import '../../shaders/shader_menu.dart';
|
import '../../shaders/shader_menu.dart';
|
||||||
import '../../shaders/shader_presets.dart';
|
import '../../shaders/shader_presets.dart';
|
||||||
import '../../state/settings.dart';
|
import '../../state/settings.dart';
|
||||||
|
import '../volume.dart';
|
||||||
import 'controls.dart';
|
import 'controls.dart';
|
||||||
import 'menu.dart';
|
import 'menu.dart';
|
||||||
import 'style.dart';
|
import 'style.dart';
|
||||||
@@ -166,9 +166,10 @@ class _UoscBadgeButtonState extends State<UoscBadgeButton> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Volume: click mutes / unmutes, the wheel steps 5 %.
|
/// Volume: click mutes / unmutes, hovering shows a [VolumeBar] up to
|
||||||
|
/// [maxVolume], the wheel steps [volumeStep].
|
||||||
class UoscVolumeButton extends StatefulWidget {
|
class UoscVolumeButton extends StatefulWidget {
|
||||||
/// 0..100.
|
/// 0..[maxVolume].
|
||||||
final double volume;
|
final double volume;
|
||||||
final ValueChanged<double> onChanged;
|
final ValueChanged<double> onChanged;
|
||||||
const UoscVolumeButton({super.key, required this.volume, required this.onChanged});
|
const UoscVolumeButton({super.key, required this.volume, required this.onChanged});
|
||||||
@@ -178,30 +179,54 @@ class UoscVolumeButton extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _UoscVolumeButtonState extends State<UoscVolumeButton> {
|
class _UoscVolumeButtonState extends State<UoscVolumeButton> {
|
||||||
|
final _steps = WheelSteps();
|
||||||
double _beforeMute = 100;
|
double _beforeMute = 100;
|
||||||
|
bool _hover = false;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final v = widget.volume;
|
final v = widget.volume;
|
||||||
final icon = v <= 0 ? Icons.volume_off_rounded : (v < 50 ? Icons.volume_down_rounded : Icons.volume_up_rounded);
|
final icon = v <= 0 ? Icons.volume_off_rounded : (v < 50 ? Icons.volume_down_rounded : Icons.volume_up_rounded);
|
||||||
return Listener(
|
return MouseRegion(
|
||||||
onPointerSignal: (e) {
|
onEnter: (_) => setState(() => _hover = true),
|
||||||
if (e is PointerScrollEvent && e.scrollDelta.dy != 0) {
|
onExit: (_) => setState(() => _hover = false),
|
||||||
widget.onChanged((v + (e.scrollDelta.dy < 0 ? 5 : -5)).clamp(0.0, 100.0));
|
child: Listener(
|
||||||
}
|
// Claimed here, so the player's own wheel handler skips it.
|
||||||
},
|
onPointerSignal: (e) => _steps.handle(e, (step) => widget.onChanged(stepVolume(v, step * volumeStep))),
|
||||||
child: UoscButton(
|
child: Row(
|
||||||
key: const ValueKey('uosc-volume'),
|
mainAxisSize: MainAxisSize.min,
|
||||||
icon: icon,
|
children: [
|
||||||
tooltip: 'Volume ${v.round()} % (scroll to change)',
|
AnimatedSize(
|
||||||
onPressed: () {
|
duration: const Duration(milliseconds: 150),
|
||||||
if (v > 0) {
|
child: _hover
|
||||||
_beforeMute = v;
|
? Padding(
|
||||||
widget.onChanged(0);
|
padding: const EdgeInsets.only(left: 6, right: 2),
|
||||||
} else {
|
child: VolumeBar(
|
||||||
widget.onChanged(_beforeMute <= 0 ? 100 : _beforeMute);
|
key: const ValueKey('uosc-volume-bar'),
|
||||||
}
|
volume: v,
|
||||||
},
|
onChanged: widget.onChanged,
|
||||||
|
color: UoscStyle.text,
|
||||||
|
trackColor: UoscStyle.dim.withValues(alpha: 0.5),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: const SizedBox.shrink(),
|
||||||
|
),
|
||||||
|
UoscButton(
|
||||||
|
key: const ValueKey('uosc-volume'),
|
||||||
|
icon: icon,
|
||||||
|
color: v > 100 ? boostColor : null,
|
||||||
|
tooltip: 'Volume ${v.round()} % (scroll to change)',
|
||||||
|
onPressed: () {
|
||||||
|
if (v > 0) {
|
||||||
|
_beforeMute = v;
|
||||||
|
widget.onChanged(0);
|
||||||
|
} else {
|
||||||
|
widget.onChanged(_beforeMute <= 0 ? 100 : _beforeMute);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,15 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:signals/signals_flutter.dart';
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
|
||||||
import '../../state/settings.dart';
|
import '../../state/settings.dart';
|
||||||
|
import '../controls_probe.dart' show ControlsHold;
|
||||||
|
|
||||||
// The experimental mpv-style (uosc) controls frame: a full-width timeline
|
// The mpv-style (uosc) controls frame: a full-width timeline at the
|
||||||
// at the bottom with a row of flat buttons above it, window buttons top
|
// bottom with a row of flat buttons above it, the title top left and a
|
||||||
// right. Mouse movement shows them; after [UoscControls.hideAfter] without
|
// corner widget top right.
|
||||||
// any they fade out, the timeline shrinks to a thin line and the cursor
|
// Mouse movement shows them; after [UoscControls.hideAfter] without any
|
||||||
// hides. Everything lives here because media_kit's fullscreen route
|
// they fade out, the timeline shrinks to uosc's progress line (gone when
|
||||||
// renders only the video and its controls.
|
// "Progress line when hidden" is off) and the cursor hides. Our own frame: no
|
||||||
|
// media_kit controls state to reach into.
|
||||||
|
|
||||||
class UoscControls extends StatefulWidget {
|
class UoscControls extends StatefulWidget {
|
||||||
/// The timeline; [expanded] is false while the controls are hidden.
|
/// The timeline; [expanded] is false while the controls are hidden.
|
||||||
@@ -18,21 +20,33 @@ class UoscControls extends StatefulWidget {
|
|||||||
/// Buttons left and right of the row above the timeline.
|
/// Buttons left and right of the row above the timeline.
|
||||||
final List<Widget> left;
|
final List<Widget> left;
|
||||||
final List<Widget> right;
|
final List<Widget> right;
|
||||||
/// Top-right corner (window buttons), shown with the controls.
|
/// Top-right corner (chat, back to the library), shown with the controls.
|
||||||
final Widget? top;
|
final Widget? top;
|
||||||
|
/// Top left (what is playing), shown with the controls; gets the width
|
||||||
|
/// [top] leaves.
|
||||||
|
final Widget? topLeft;
|
||||||
final VoidCallback? onDoubleTap;
|
final VoidCallback? onDoubleTap;
|
||||||
final Duration hideAfter;
|
final Duration hideAfter;
|
||||||
|
/// Follows whether the controls are up (for overlays outside them).
|
||||||
|
final ValueNotifier<bool>? shown;
|
||||||
|
/// Keeps them up while held (the mouse on an overlay, an open popover).
|
||||||
|
final ControlsHold? holdBy;
|
||||||
const UoscControls({
|
const UoscControls({
|
||||||
super.key,
|
super.key,
|
||||||
required this.timeline,
|
required this.timeline,
|
||||||
this.left = const [],
|
this.left = const [],
|
||||||
this.right = const [],
|
this.right = const [],
|
||||||
this.top,
|
this.top,
|
||||||
|
this.topLeft,
|
||||||
this.onDoubleTap,
|
this.onDoubleTap,
|
||||||
this.hideAfter = const Duration(seconds: 3),
|
this.hideAfter = const Duration(seconds: 3),
|
||||||
|
this.shown,
|
||||||
|
this.holdBy,
|
||||||
});
|
});
|
||||||
|
|
||||||
static const buttonRowHeight = 40.0;
|
static const buttonRowHeight = 40.0;
|
||||||
|
/// Under the button row, above the timeline.
|
||||||
|
static const rowBottomPadding = 4.0;
|
||||||
|
|
||||||
/// The controls around [context], for widgets that need them kept up
|
/// The controls around [context], for widgets that need them kept up
|
||||||
/// (a timeline drag, an open menu).
|
/// (a timeline drag, an open menu).
|
||||||
@@ -46,6 +60,7 @@ class UoscControls extends StatefulWidget {
|
|||||||
class UoscControlsState extends State<UoscControls> {
|
class UoscControlsState extends State<UoscControls> {
|
||||||
bool _visible = true;
|
bool _visible = true;
|
||||||
int _holds = 0;
|
int _holds = 0;
|
||||||
|
bool _heldBy = false;
|
||||||
Timer? _timer;
|
Timer? _timer;
|
||||||
|
|
||||||
bool get visible => _visible;
|
bool get visible => _visible;
|
||||||
@@ -53,18 +68,44 @@ class UoscControlsState extends State<UoscControls> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
widget.holdBy?.addListener(_holdByChanged);
|
||||||
|
// Not during this build: an overlay listening to [shown] may be built.
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (mounted) widget.shown?.value = true;
|
||||||
|
});
|
||||||
_hideLater();
|
_hideLater();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(UoscControls oldWidget) {
|
||||||
|
super.didUpdateWidget(oldWidget);
|
||||||
|
if (oldWidget.holdBy != widget.holdBy) {
|
||||||
|
oldWidget.holdBy?.removeListener(_holdByChanged);
|
||||||
|
widget.holdBy?.addListener(_holdByChanged);
|
||||||
|
_holdByChanged();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
|
widget.holdBy?.removeListener(_holdByChanged);
|
||||||
_timer?.cancel();
|
_timer?.cancel();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _holdByChanged() {
|
||||||
|
final on = widget.holdBy?.held ?? false;
|
||||||
|
if (on == _heldBy || !mounted) return;
|
||||||
|
_heldBy = on;
|
||||||
|
hold(on);
|
||||||
|
}
|
||||||
|
|
||||||
/// Show the controls and restart the hide countdown.
|
/// Show the controls and restart the hide countdown.
|
||||||
void wake() {
|
void wake() {
|
||||||
if (!_visible && mounted) setState(() => _visible = true);
|
if (!_visible && mounted) {
|
||||||
|
setState(() => _visible = true);
|
||||||
|
widget.shown?.value = true;
|
||||||
|
}
|
||||||
_hideLater();
|
_hideLater();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,6 +134,7 @@ class UoscControlsState extends State<UoscControls> {
|
|||||||
void _hide() {
|
void _hide() {
|
||||||
if (!mounted || _holds > 0 || !_visible) return;
|
if (!mounted || _holds > 0 || !_visible) return;
|
||||||
setState(() => _visible = false);
|
setState(() => _visible = false);
|
||||||
|
widget.shown?.value = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -136,13 +178,56 @@ class UoscControlsState extends State<UoscControls> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (widget.top != null)
|
if (widget.topLeft != null)
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
top: 0,
|
||||||
|
height: 120,
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: AnimatedOpacity(
|
||||||
|
duration: fade,
|
||||||
|
opacity: visible ? 1 : 0,
|
||||||
|
child: const DecoratedBox(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.topCenter,
|
||||||
|
end: Alignment.bottomCenter,
|
||||||
|
colors: [Color(0x8C000000), Color(0x00000000)],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (widget.top != null || widget.topLeft != null)
|
||||||
Positioned(
|
Positioned(
|
||||||
top: 0,
|
top: 0,
|
||||||
|
left: 0,
|
||||||
right: 0,
|
right: 0,
|
||||||
child: IgnorePointer(
|
child: IgnorePointer(
|
||||||
|
key: const ValueKey('uosc-top'),
|
||||||
ignoring: !visible,
|
ignoring: !visible,
|
||||||
child: AnimatedOpacity(duration: fade, opacity: visible ? 1 : 0, child: widget.top),
|
child: AnimatedOpacity(
|
||||||
|
duration: fade,
|
||||||
|
opacity: visible ? 1 : 0,
|
||||||
|
// The buttons centred on the title, like the standard
|
||||||
|
// design's top bar.
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 12, 16, 0),
|
||||||
|
child: widget.topLeft == null
|
||||||
|
? const SizedBox.shrink()
|
||||||
|
: Align(alignment: AlignmentDirectional.centerStart, child: widget.topLeft),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (widget.top != null)
|
||||||
|
Padding(padding: const EdgeInsets.fromLTRB(0, 12, 6, 0), child: widget.top),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Positioned(
|
Positioned(
|
||||||
@@ -160,7 +245,7 @@ class UoscControlsState extends State<UoscControls> {
|
|||||||
duration: fade,
|
duration: fade,
|
||||||
opacity: visible ? 1 : 0,
|
opacity: visible ? 1 : 0,
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.fromLTRB(6, 0, 6, 4),
|
padding: const EdgeInsets.fromLTRB(6, 0, 6, UoscControls.rowBottomPadding),
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: UoscControls.buttonRowHeight,
|
height: UoscControls.buttonRowHeight,
|
||||||
child: Row(children: [...widget.left, const Spacer(), ...widget.right]),
|
child: Row(children: [...widget.left, const Spacer(), ...widget.right]),
|
||||||
@@ -168,7 +253,19 @@ class UoscControlsState extends State<UoscControls> {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
widget.timeline(context, visible),
|
// Hidden: the collapsed timeline is the progress line,
|
||||||
|
// unless the player settings turn it off.
|
||||||
|
SignalBuilder(
|
||||||
|
builder: (context) {
|
||||||
|
final line = AppSettings.instance.progressLine.value;
|
||||||
|
return AnimatedOpacity(
|
||||||
|
key: const ValueKey('uosc-timeline-wrap'),
|
||||||
|
duration: fade,
|
||||||
|
opacity: visible || line ? 1 : 0,
|
||||||
|
child: widget.timeline(context, visible),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -178,9 +275,9 @@ class UoscControlsState extends State<UoscControls> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The session's controls: media_kit's ([material]) or, with Settings →
|
/// The session's controls: the standard ones ([material]) or, with the
|
||||||
/// "Experimental: mpv-style controls", the uosc ones ([mpv]). Switches
|
/// "Player design" setting on uosc, the uosc ones ([mpv]). Switches live
|
||||||
/// live when the setting changes.
|
/// when the setting changes.
|
||||||
class SessionControlsSwitch extends StatelessWidget {
|
class SessionControlsSwitch extends StatelessWidget {
|
||||||
final WidgetBuilder material;
|
final WidgetBuilder material;
|
||||||
final WidgetBuilder mpv;
|
final WidgetBuilder mpv;
|
||||||
|
|||||||
@@ -4,9 +4,7 @@ import 'package:flutter/material.dart';
|
|||||||
// owner runs it: flat black panels, white icons, a muted blue fill.
|
// owner runs it: flat black panels, white icons, a muted blue fill.
|
||||||
|
|
||||||
abstract final class UoscStyle {
|
abstract final class UoscStyle {
|
||||||
/// Timeline background and the boxes on it.
|
/// The active menu row.
|
||||||
static const bar = Color(0xCC000000);
|
|
||||||
/// Played part of the timeline; also the active menu row.
|
|
||||||
static const fill = Color(0xFF4C6A8E);
|
static const fill = Color(0xFF4C6A8E);
|
||||||
/// Menus and tooltips.
|
/// Menus and tooltips.
|
||||||
static const panel = Color(0xF0101010);
|
static const panel = Color(0xF0101010);
|
||||||
@@ -51,8 +49,8 @@ class UoscTooltip extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A small dark box with one line of text (the timeline's times, the
|
/// A small dark box with one line of text (the timeline's hover time and
|
||||||
/// hover chapter title).
|
/// chapter title).
|
||||||
class UoscBox extends StatelessWidget {
|
class UoscBox extends StatelessWidget {
|
||||||
final String text;
|
final String text;
|
||||||
final Color color;
|
final Color color;
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'dart:async';
|
||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
@@ -6,6 +7,66 @@ import '../../playback/media_marks.dart';
|
|||||||
import 'controls.dart';
|
import 'controls.dart';
|
||||||
import 'style.dart';
|
import 'style.dart';
|
||||||
|
|
||||||
|
// A port of uosc's timeline (`elements/Timeline.lua`, defaults from
|
||||||
|
// `uosc.conf` / `main.lua`), style `line`, scale 1: a translucent black
|
||||||
|
// band, the position a thin white line (no filled progress), the
|
||||||
|
// uncached part hatched, chapter diamonds on the top edge, elapsed time
|
||||||
|
// left and the time remaining right, the buffered seconds next to the
|
||||||
|
// position while under the threshold, and a tooltip with the time (and
|
||||||
|
// the chapter title) under the mouse.
|
||||||
|
|
||||||
|
/// uosc's defaults at scale 1.
|
||||||
|
abstract final class UoscTimelineSpec {
|
||||||
|
/// `timeline_size`: the band's height when expanded.
|
||||||
|
static const size = 40.0;
|
||||||
|
|
||||||
|
/// `timeline_border`: band above the line, also the diamonds' border.
|
||||||
|
static const border = 1.0;
|
||||||
|
|
||||||
|
/// `timeline_line_width`: the position line.
|
||||||
|
static const lineWidth = 2.0;
|
||||||
|
|
||||||
|
/// `progress_size`: what is left when the controls hide.
|
||||||
|
static const progressSize = 2.0;
|
||||||
|
|
||||||
|
/// `progress_line_width`: the position line once minimized.
|
||||||
|
static const progressLineWidth = 20.0;
|
||||||
|
|
||||||
|
/// floor(min((size + 60) * 0.2, size * 0.96)).
|
||||||
|
static const fontSize = 20.0;
|
||||||
|
|
||||||
|
/// max(floor((size - fontSize) / 2.5), 4): the times' inset.
|
||||||
|
static const spacing = 8.0;
|
||||||
|
|
||||||
|
/// `text_border`: the outline of text drawn on the band.
|
||||||
|
static const textBorder = 1.2;
|
||||||
|
|
||||||
|
/// `opacity.timeline` (the band) and `opacity.chapters` (diamond fill).
|
||||||
|
static const opacity = 0.9;
|
||||||
|
static const chaptersOpacity = 0.8;
|
||||||
|
|
||||||
|
/// Gap between the band and its tooltips, and between tooltips.
|
||||||
|
static const tooltipGap = 2.0;
|
||||||
|
|
||||||
|
/// `buffered_time_threshold`: the cache label shows below this.
|
||||||
|
static const bufferedThreshold = Duration(seconds: 60);
|
||||||
|
|
||||||
|
/// max((size + border) / 10, 3): diamond radius cap.
|
||||||
|
static const chapterSize = (size + border) / 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// uosc's `format_time(seconds, duration)`: mpv's "HH:MM:SS", trimmed to
|
||||||
|
/// "MM:SS" for media under an hour and "SS" under a minute; negative
|
||||||
|
/// values keep their minus ("-01:47:30").
|
||||||
|
String uoscClock(Duration d, Duration max) {
|
||||||
|
final neg = d.isNegative && d.inSeconds != 0;
|
||||||
|
final t = d.abs();
|
||||||
|
String two(int n) => n.toString().padLeft(2, '0');
|
||||||
|
final full = '${two(t.inHours)}:${two(t.inMinutes % 60)}:${two(t.inSeconds % 60)}';
|
||||||
|
final trim = max < const Duration(minutes: 1) ? 6 : (max < const Duration(hours: 1) ? 3 : 0);
|
||||||
|
return '${neg ? '-' : ''}${full.substring(trim)}';
|
||||||
|
}
|
||||||
|
|
||||||
/// Fraction of [total] at [d], 0..1 (0 without a duration).
|
/// Fraction of [total] at [d], 0..1 (0 without a duration).
|
||||||
double timelineFraction(Duration d, Duration total) {
|
double timelineFraction(Duration d, Duration total) {
|
||||||
final t = total.inMicroseconds;
|
final t = total.inMicroseconds;
|
||||||
@@ -13,36 +74,104 @@ double timelineFraction(Duration d, Duration total) {
|
|||||||
return (d.inMicroseconds / t).clamp(0.0, 1.0);
|
return (d.inMicroseconds / t).clamp(0.0, 1.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The cached-ahead part of a timeline of [size]: from the playing
|
/// Where the uncached part starts (it runs to the end), as a fraction;
|
||||||
/// position to the end of mpv's cache. Null when nothing is cached ahead.
|
/// null when nothing known is uncached. We know only the end of mpv's
|
||||||
Rect? cacheRect(Size size, {required Duration position, required Duration buffered, required Duration duration}) {
|
/// cache ahead ([buffered]); without it (0) uosc draws no ranges either,
|
||||||
final from = timelineFraction(position, duration) * size.width;
|
/// and a cache that reaches the end (within uosc's 0.5 s) leaves none.
|
||||||
final to = timelineFraction(buffered, duration) * size.width;
|
double? uncachedFrom({required Duration position, required Duration buffered, required Duration duration}) {
|
||||||
if (to - from < 0.5) return null;
|
if (duration <= Duration.zero || buffered <= Duration.zero) return null;
|
||||||
return Rect.fromLTRB(from, 0, to, size.height);
|
final from = buffered > position ? buffered : position;
|
||||||
|
if (duration - from <= const Duration(milliseconds: 500)) return null;
|
||||||
|
return timelineFraction(from, duration);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The hatching of [r]: 45° strokes from bottom-left to top-right,
|
/// The cache label next to the position ("12s"): the seconds buffered
|
||||||
/// [spacing] apart along x, across all of [r] (the painter clips them).
|
/// ahead, shown while under [UoscTimelineSpec.bufferedThreshold] and the
|
||||||
/// The first starts half a step in, so none just grazes the corner.
|
/// cache does not reach the end (uosc drops it at eof-cached).
|
||||||
List<(Offset, Offset)> hatchLines(Rect r, {double spacing = 6}) {
|
String? cacheLabel({required Duration position, required Duration buffered, required Duration duration}) {
|
||||||
if (r.isEmpty || spacing <= 0) return const [];
|
if (duration <= Duration.zero || buffered <= Duration.zero) return null;
|
||||||
final h = r.height;
|
if (duration - buffered <= const Duration(milliseconds: 500)) return null;
|
||||||
return [
|
final ahead = buffered > position ? buffered - position : Duration.zero;
|
||||||
for (var x = r.left - h + spacing / 2; x < r.right; x += spacing) (Offset(x, r.bottom), Offset(x + h, r.top)),
|
if (ahead >= UoscTimelineSpec.bufferedThreshold) return null;
|
||||||
];
|
return '${(ahead.inMilliseconds / 1000).round()}s';
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The uosc timeline: full width, elapsed part filled, the cached range
|
/// The band's geometry at one size, as uosc lays it out: the position
|
||||||
/// ahead hatched, chapter starts as white diamonds on the top edge, the
|
/// line takes [lineWidth] pixels, and times map around it (`t2x`) so no
|
||||||
/// current time in a box at the left and the duration at the right.
|
/// time lies inside the line.
|
||||||
/// Hover shows the chapter title over the hover time. When the controls
|
class UoscTimelineGeometry {
|
||||||
/// hide ([expanded] false) it shrinks to a thin line with chapter ticks.
|
final double width;
|
||||||
/// Like the media_kit bar it reports a seek on every drag move and on
|
|
||||||
/// release ([onSeek]); the session sends those through the user-seek path.
|
/// The foreground height (without the top border).
|
||||||
|
final double size;
|
||||||
|
|
||||||
|
/// The playing position, 0..1.
|
||||||
|
final double progress;
|
||||||
|
final double lineWidth;
|
||||||
|
const UoscTimelineGeometry({
|
||||||
|
required this.width,
|
||||||
|
required this.size,
|
||||||
|
required this.progress,
|
||||||
|
this.lineWidth = UoscTimelineSpec.lineWidth,
|
||||||
|
});
|
||||||
|
|
||||||
|
/// [size] while the band animates between hidden (0) and shown (1)
|
||||||
|
/// (`get_effective_size`).
|
||||||
|
static double sizeAt(double visibility) =>
|
||||||
|
UoscTimelineSpec.progressSize +
|
||||||
|
((UoscTimelineSpec.size - UoscTimelineSpec.progressSize) * visibility).ceilToDouble();
|
||||||
|
|
||||||
|
/// The position line's width at [size]: it grows to
|
||||||
|
/// [UoscTimelineSpec.progressLineWidth] over the last eighth of the
|
||||||
|
/// collapse.
|
||||||
|
static double lineWidthAt(double size) {
|
||||||
|
const p = UoscTimelineSpec.progressSize;
|
||||||
|
final minimized = 1 - math.min((size - p) / ((UoscTimelineSpec.size - p) / 8), 1.0);
|
||||||
|
return UoscTimelineSpec.lineWidth + (UoscTimelineSpec.progressLineWidth - UoscTimelineSpec.lineWidth) * minimized;
|
||||||
|
}
|
||||||
|
|
||||||
|
double get height => size + UoscTimelineSpec.border;
|
||||||
|
|
||||||
|
/// Top of the foreground (below the border).
|
||||||
|
double get top => UoscTimelineSpec.border;
|
||||||
|
double get lineLeft => ((width - lineWidth) * progress).roundToDouble();
|
||||||
|
double get lineRight => ((width - lineWidth) * progress + lineWidth).roundToDouble();
|
||||||
|
|
||||||
|
/// x of [fraction] (uosc's `t2x`): past the position, shifted over the line.
|
||||||
|
double x(double fraction) {
|
||||||
|
final lw = lineWidth - 1;
|
||||||
|
final at = 0.5 + (width - lw - 1) * fraction;
|
||||||
|
return fraction <= progress ? at : at + lw;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The fraction at [x] (uosc's `get_time_at_x`): x on the line is the
|
||||||
|
/// position.
|
||||||
|
double fractionAt(double x) {
|
||||||
|
const lw = UoscTimelineSpec.lineWidth - 1;
|
||||||
|
final timeWidth = width - lw - 1;
|
||||||
|
if (timeWidth <= 0) return 0;
|
||||||
|
final a = timeWidth * progress, b = a + lw;
|
||||||
|
var at = x - 0.5;
|
||||||
|
if (at > b) {
|
||||||
|
at -= lw;
|
||||||
|
} else if (at > a) {
|
||||||
|
at = a;
|
||||||
|
}
|
||||||
|
return (at / timeWidth).clamp(0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Chapter diamond radius at this size; doubled while hovered.
|
||||||
|
double get diamondRadius => math.min(math.max(1.0, size * 0.8), UoscTimelineSpec.chapterSize);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The uosc timeline. [expanded] false (the controls hidden) shrinks it,
|
||||||
|
/// animated, to the progress line. Seeks ([onSeek]) on press, on every
|
||||||
|
/// drag move and on release; a press on a hovered chapter diamond jumps
|
||||||
|
/// to that chapter. The session sends those through the user-seek path.
|
||||||
class UoscTimeline extends StatefulWidget {
|
class UoscTimeline extends StatefulWidget {
|
||||||
final Duration position;
|
final Duration position;
|
||||||
final Duration duration;
|
final Duration duration;
|
||||||
|
|
||||||
/// End of the cached range ([PlaybackController.buffered]).
|
/// End of the cached range ([PlaybackController.buffered]).
|
||||||
final Duration buffered;
|
final Duration buffered;
|
||||||
final List<MediaChapter> chapters;
|
final List<MediaChapter> chapters;
|
||||||
@@ -58,24 +187,32 @@ class UoscTimeline extends StatefulWidget {
|
|||||||
required this.onSeek,
|
required this.onSeek,
|
||||||
});
|
});
|
||||||
|
|
||||||
static const height = 30.0;
|
static const height = UoscTimelineSpec.size + UoscTimelineSpec.border;
|
||||||
static const collapsedHeight = 3.0;
|
static const collapsedHeight = UoscTimelineSpec.progressSize + UoscTimelineSpec.border;
|
||||||
|
|
||||||
|
/// uosc's `animation_duration`.
|
||||||
|
static const animation = Duration(milliseconds: 100);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<UoscTimeline> createState() => _UoscTimelineState();
|
State<UoscTimeline> createState() => _UoscTimelineState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _UoscTimelineState extends State<UoscTimeline> {
|
class _UoscTimelineState extends State<UoscTimeline> {
|
||||||
double? _hoverX;
|
Offset? _hover;
|
||||||
bool _dragging = false;
|
bool _dragging = false;
|
||||||
double _dragFraction = 0;
|
double _dragFraction = 0;
|
||||||
|
Duration? _lastSent;
|
||||||
|
// A released seek, shown until the position catches up (else the line
|
||||||
|
// jumps back to the old position for a moment).
|
||||||
|
double? _pending;
|
||||||
|
Timer? _pendingTimer;
|
||||||
|
|
||||||
Duration _at(double fraction) => widget.duration * fraction.clamp(0.0, 1.0);
|
Duration _at(double fraction) => widget.duration * fraction.clamp(0.0, 1.0);
|
||||||
|
|
||||||
void _seekTo(double x, double width) {
|
void _send(Duration d) {
|
||||||
if (widget.duration <= Duration.zero || width <= 0) return;
|
if (d == _lastSent) return;
|
||||||
_dragFraction = (x / width).clamp(0.0, 1.0);
|
_lastSent = d;
|
||||||
widget.onSeek(_at(_dragFraction));
|
widget.onSeek(d);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _drag(bool on) {
|
void _drag(bool on) {
|
||||||
@@ -84,204 +221,425 @@ class _UoscTimelineState extends State<UoscTimeline> {
|
|||||||
UoscControls.maybeOf(context)?.hold(on);
|
UoscControls.maybeOf(context)?.hold(on);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _settle(double fraction) {
|
||||||
|
_pending = fraction;
|
||||||
|
_pendingTimer?.cancel();
|
||||||
|
_pendingTimer = Timer(const Duration(seconds: 2), () {
|
||||||
|
if (mounted) setState(() => _pending = null);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void didUpdateWidget(UoscTimeline old) {
|
void didUpdateWidget(UoscTimeline old) {
|
||||||
super.didUpdateWidget(old);
|
super.didUpdateWidget(old);
|
||||||
if (!widget.expanded && old.expanded) _hoverX = null;
|
if (!widget.expanded && old.expanded) _hover = null;
|
||||||
|
final p = _pending;
|
||||||
|
if (p != null && widget.duration > Duration.zero) {
|
||||||
|
final off = (widget.position - _at(p)).abs();
|
||||||
|
if (off < const Duration(milliseconds: 1500)) {
|
||||||
|
_pending = null;
|
||||||
|
_pendingTimer?.cancel();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
|
_pendingTimer?.cancel();
|
||||||
// A drag cut short by a rebuild must not keep the controls up.
|
// A drag cut short by a rebuild must not keep the controls up.
|
||||||
if (_dragging) UoscControls.maybeOf(context)?.hold(false);
|
if (_dragging) UoscControls.maybeOf(context)?.hold(false);
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The chapter whose diamond is within twice its radius of [at].
|
||||||
|
int? _hoveredChapter(UoscTimelineGeometry geo, List<MediaChapter> marks, Offset? at) {
|
||||||
|
if (at == null || _dragging) return null;
|
||||||
|
final reach = geo.diamondRadius * 2;
|
||||||
|
int? best;
|
||||||
|
var bestD = double.infinity;
|
||||||
|
for (var i = 0; i < marks.length; i++) {
|
||||||
|
final cx = geo.x(timelineFraction(marks[i].start, widget.duration));
|
||||||
|
final d = (Offset(cx, 0) - at).distance;
|
||||||
|
if (d <= reach && d < bestD) {
|
||||||
|
best = i;
|
||||||
|
bestD = d;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return best;
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return LayoutBuilder(builder: (context, constraints) {
|
final font = DefaultTextStyle.of(context).style.fontFamily ?? Theme.of(context).textTheme.bodyMedium?.fontFamily;
|
||||||
final width = constraints.maxWidth;
|
return LayoutBuilder(
|
||||||
final expanded = widget.expanded;
|
builder: (context, constraints) {
|
||||||
final h = expanded ? UoscTimeline.height : UoscTimeline.collapsedHeight;
|
final width = constraints.maxWidth;
|
||||||
final played = _dragging ? _dragFraction : timelineFraction(widget.position, widget.duration);
|
return TweenAnimationBuilder<double>(
|
||||||
final hoverX = expanded ? _hoverX : null;
|
tween: Tween(end: widget.expanded ? 1 : 0),
|
||||||
final hoverAt = hoverX == null || width <= 0 ? null : _at(hoverX / width);
|
duration: UoscTimeline.animation,
|
||||||
final hoverChapter = hoverAt == null ? null : chapterIndexAt(widget.chapters, hoverAt);
|
builder: (context, visibility, _) => _band(width, visibility, font),
|
||||||
final hoverTitle = hoverChapter == null ? '' : widget.chapters[hoverChapter].title;
|
);
|
||||||
final withHours = widget.duration >= const Duration(hours: 1);
|
},
|
||||||
final marks = [
|
);
|
||||||
for (final c in widget.chapters)
|
}
|
||||||
if (c.start > Duration.zero && widget.duration > Duration.zero) c,
|
|
||||||
];
|
Widget _band(double width, double visibility, String? font) {
|
||||||
final bar = SizedBox(
|
final expanded = widget.expanded;
|
||||||
key: const ValueKey('uosc-timeline'),
|
final duration = widget.duration;
|
||||||
width: width,
|
final size = UoscTimelineGeometry.sizeAt(visibility);
|
||||||
height: h,
|
final progress = _dragging ? _dragFraction : (_pending ?? timelineFraction(widget.position, duration));
|
||||||
child: Stack(
|
final shown = _at(progress);
|
||||||
clipBehavior: Clip.none,
|
final geo = UoscTimelineGeometry(
|
||||||
children: [
|
width: width,
|
||||||
Positioned.fill(
|
size: size,
|
||||||
child: CustomPaint(
|
progress: progress,
|
||||||
painter: UoscTimelinePainter(
|
lineWidth: UoscTimelineGeometry.lineWidthAt(size),
|
||||||
played: played,
|
);
|
||||||
cache: (size) => cacheRect(size,
|
final marks = duration > Duration.zero ? widget.chapters : const <MediaChapter>[];
|
||||||
position: widget.position, buffered: widget.buffered, duration: widget.duration),
|
final hover = expanded ? _hover : null;
|
||||||
cacheKey: (widget.position, widget.buffered, widget.duration),
|
final hovered = _hoveredChapter(geo, marks, hover);
|
||||||
hoverX: _dragging ? null : hoverX,
|
final hoverFraction = hovered != null
|
||||||
hatched: expanded,
|
? timelineFraction(marks[hovered].start, duration)
|
||||||
|
: (hover == null || duration <= Duration.zero ? null : geo.fractionAt(hover.dx));
|
||||||
|
final hoverAt = hoverFraction == null ? null : _at(hoverFraction);
|
||||||
|
final cursorX = hovered != null ? geo.x(hoverFraction!) : hover?.dx;
|
||||||
|
final hoverChapter = hoverAt == null ? null : chapterIndexAt(widget.chapters, hoverAt);
|
||||||
|
final hoverTitle = hoverChapter == null ? '' : widget.chapters[hoverChapter].title;
|
||||||
|
// Text fades out just before it would overflow the shrinking band.
|
||||||
|
const hideBelow = UoscTimelineSpec.fontSize * 0.8;
|
||||||
|
final textOpacity = (size - hideBelow).clamp(0.0, hideBelow / 2) / (hideBelow / 2);
|
||||||
|
final radius = geo.diamondRadius;
|
||||||
|
final timestampGap = UoscTimelineSpec.tooltipGap + (hovered != null ? radius * 2 : radius).roundToDouble();
|
||||||
|
final painter = UoscTimelinePainter(
|
||||||
|
geometry: geo,
|
||||||
|
visibility: visibility,
|
||||||
|
uncached: uncachedFrom(position: widget.position, buffered: widget.buffered, duration: duration),
|
||||||
|
chapters: [for (final c in marks) timelineFraction(c.start, duration)],
|
||||||
|
hoveredChapter: hovered,
|
||||||
|
hoverX: cursorX,
|
||||||
|
textOpacity: textOpacity,
|
||||||
|
elapsed: duration > Duration.zero ? uoscClock(shown, duration) : null,
|
||||||
|
remaining: duration > Duration.zero ? uoscClock(shown - duration, duration) : null,
|
||||||
|
cache: cacheLabel(position: widget.position, buffered: widget.buffered, duration: duration),
|
||||||
|
fontFamily: font,
|
||||||
|
);
|
||||||
|
final bar = SizedBox(
|
||||||
|
key: const ValueKey('uosc-timeline'),
|
||||||
|
width: width,
|
||||||
|
height: geo.height,
|
||||||
|
child: Stack(
|
||||||
|
clipBehavior: Clip.none,
|
||||||
|
children: [
|
||||||
|
Positioned.fill(
|
||||||
|
child: RepaintBoundary(child: CustomPaint(painter: painter)),
|
||||||
|
),
|
||||||
|
if (hoverAt != null && cursorX != null)
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: geo.height + timestampGap,
|
||||||
|
height: 160,
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: CustomMultiChildLayout(
|
||||||
|
delegate: _TooltipLayout(x: cursorX),
|
||||||
|
children: [
|
||||||
|
LayoutId(
|
||||||
|
id: #time,
|
||||||
|
child: UoscBox(
|
||||||
|
uoscClock(hoverAt, duration),
|
||||||
|
key: const ValueKey('uosc-hover-time'),
|
||||||
|
color: Colors.black,
|
||||||
|
style: _tipStyle,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (hoverTitle.isNotEmpty)
|
||||||
|
LayoutId(
|
||||||
|
id: #chapter,
|
||||||
|
child: UoscBox(
|
||||||
|
hoverTitle,
|
||||||
|
key: const ValueKey('uosc-hover-chapter'),
|
||||||
|
color: Colors.black,
|
||||||
|
style: _tipStyle.copyWith(fontWeight: FontWeight.bold),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
for (final c in marks)
|
],
|
||||||
if (expanded)
|
),
|
||||||
Positioned(
|
);
|
||||||
key: ValueKey('uosc-chapter-${c.index}'),
|
if (!expanded) return IgnorePointer(child: bar);
|
||||||
left: width * timelineFraction(c.start, widget.duration) - 4,
|
Offset clampTo(Offset p) => Offset(p.dx.clamp(0.0, width), p.dy);
|
||||||
top: -4,
|
return MouseRegion(
|
||||||
width: 8,
|
cursor: SystemMouseCursors.click,
|
||||||
height: 8,
|
onEnter: (e) => setState(() => _hover = clampTo(e.localPosition)),
|
||||||
child: IgnorePointer(
|
onHover: (e) => setState(() => _hover = clampTo(e.localPosition)),
|
||||||
child: Transform.rotate(
|
onExit: (_) {
|
||||||
angle: math.pi / 4,
|
if (!_dragging) setState(() => _hover = null);
|
||||||
child: Container(
|
},
|
||||||
margin: const EdgeInsets.all(1.2),
|
child: Listener(
|
||||||
decoration: BoxDecoration(
|
behavior: HitTestBehavior.opaque,
|
||||||
color: Colors.white,
|
onPointerDown: (e) {
|
||||||
border: Border.all(color: Colors.black54, width: 0.6),
|
if (duration <= Duration.zero || width <= 0) return;
|
||||||
),
|
final at = clampTo(e.localPosition);
|
||||||
),
|
final chapter = _hoveredChapter(geo, marks, at);
|
||||||
),
|
_lastSent = null;
|
||||||
),
|
if (chapter != null) {
|
||||||
)
|
final f = timelineFraction(marks[chapter].start, duration);
|
||||||
else
|
_settle(f);
|
||||||
Positioned(
|
_send(marks[chapter].start);
|
||||||
key: ValueKey('uosc-chapter-tick-${c.index}'),
|
setState(() {});
|
||||||
left: width * timelineFraction(c.start, widget.duration) - 1,
|
return;
|
||||||
top: -2,
|
}
|
||||||
width: 2,
|
_pending = null;
|
||||||
height: h + 2,
|
_dragFraction = geo.fractionAt(at.dx);
|
||||||
child: const IgnorePointer(child: ColoredBox(color: Colors.white70)),
|
_drag(true);
|
||||||
),
|
_send(_at(_dragFraction));
|
||||||
if (expanded) ...[
|
},
|
||||||
Positioned(
|
onPointerMove: (e) {
|
||||||
left: 4,
|
if (!_dragging) return;
|
||||||
top: 0,
|
final at = clampTo(e.localPosition);
|
||||||
bottom: 0,
|
setState(() {
|
||||||
child: IgnorePointer(
|
_hover = at;
|
||||||
child: Center(
|
_dragFraction = geo.fractionAt(at.dx);
|
||||||
child: UoscBox(formatUoscTime(_at(played), withHours: withHours),
|
});
|
||||||
key: const ValueKey('uosc-time'), color: UoscStyle.bar),
|
_send(_at(_dragFraction));
|
||||||
),
|
},
|
||||||
),
|
onPointerUp: (e) {
|
||||||
),
|
if (!_dragging) return;
|
||||||
Positioned(
|
_send(_at(_dragFraction));
|
||||||
right: 4,
|
_settle(_dragFraction);
|
||||||
top: 0,
|
final p = e.localPosition;
|
||||||
bottom: 0,
|
if (p.dx < 0 || p.dx > width || p.dy < 0 || p.dy > geo.height) _hover = null;
|
||||||
child: IgnorePointer(
|
_drag(false);
|
||||||
child: Center(
|
},
|
||||||
child: UoscBox(formatUoscTime(widget.duration, withHours: withHours),
|
onPointerCancel: (_) => _drag(false),
|
||||||
key: const ValueKey('uosc-duration'), color: UoscStyle.bar),
|
child: bar,
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
),
|
|
||||||
],
|
|
||||||
if (hoverAt != null)
|
|
||||||
Positioned(
|
|
||||||
// Kept clear of the window edges (the tip is centred).
|
|
||||||
left: hoverX!.clamp(math.min(60.0, width / 2), math.max(width - 60, width / 2)),
|
|
||||||
bottom: h + 8,
|
|
||||||
child: IgnorePointer(
|
|
||||||
child: FractionalTranslation(
|
|
||||||
translation: const Offset(-0.5, 0),
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
spacing: 4,
|
|
||||||
children: [
|
|
||||||
if (hoverTitle.isNotEmpty) UoscBox(hoverTitle, key: const ValueKey('uosc-hover-chapter')),
|
|
||||||
UoscBox(formatUoscTime(hoverAt, withHours: withHours),
|
|
||||||
key: const ValueKey('uosc-hover-time')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
if (!expanded) return IgnorePointer(child: bar);
|
|
||||||
return MouseRegion(
|
|
||||||
cursor: SystemMouseCursors.click,
|
|
||||||
onEnter: (e) => setState(() => _hoverX = e.localPosition.dx.clamp(0, width)),
|
|
||||||
onHover: (e) => setState(() => _hoverX = e.localPosition.dx.clamp(0, width)),
|
|
||||||
onExit: (_) => setState(() => _hoverX = null),
|
|
||||||
child: Listener(
|
|
||||||
behavior: HitTestBehavior.opaque,
|
|
||||||
onPointerDown: (e) {
|
|
||||||
_dragFraction = width <= 0 ? 0 : (e.localPosition.dx / width).clamp(0.0, 1.0);
|
|
||||||
_drag(true);
|
|
||||||
},
|
|
||||||
onPointerMove: (e) {
|
|
||||||
setState(() => _hoverX = e.localPosition.dx.clamp(0, width));
|
|
||||||
_seekTo(e.localPosition.dx, width);
|
|
||||||
},
|
|
||||||
onPointerUp: (e) {
|
|
||||||
_seekTo(e.localPosition.dx, width);
|
|
||||||
_drag(false);
|
|
||||||
},
|
|
||||||
onPointerCancel: (_) => _drag(false),
|
|
||||||
child: bar,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const _tipStyle = TextStyle(color: UoscStyle.text, fontSize: UoscTimelineSpec.fontSize, height: 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Background, cached range (hatched, or a faint band when collapsed),
|
/// The hover tooltips: the time centred on [x], the chapter title over
|
||||||
/// the played part and the hover line.
|
/// it; each kept [UoscTimelineSpec.tooltipGap] inside the band's ends.
|
||||||
|
class _TooltipLayout extends MultiChildLayoutDelegate {
|
||||||
|
final double x;
|
||||||
|
_TooltipLayout({required this.x});
|
||||||
|
|
||||||
|
@override
|
||||||
|
void performLayout(Size size) {
|
||||||
|
const gap = UoscTimelineSpec.tooltipGap;
|
||||||
|
double left(double w) => (x - w / 2).clamp(gap, math.max(gap, size.width - gap - w));
|
||||||
|
final loose = BoxConstraints.loose(size);
|
||||||
|
final time = layoutChild(#time, loose);
|
||||||
|
final timeTop = size.height - time.height;
|
||||||
|
positionChild(#time, Offset(left(time.width), timeTop));
|
||||||
|
if (hasChild(#chapter)) {
|
||||||
|
final chapter = layoutChild(#chapter, loose);
|
||||||
|
positionChild(#chapter, Offset(left(chapter.width), timeTop - gap - chapter.height));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool shouldRelayout(_TooltipLayout old) => old.x != x;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Paints the band as uosc does: background, the position line, the
|
||||||
|
/// uncached hatching, chapter diamonds, the times, the hover line.
|
||||||
class UoscTimelinePainter extends CustomPainter {
|
class UoscTimelinePainter extends CustomPainter {
|
||||||
final double played;
|
final UoscTimelineGeometry geometry;
|
||||||
final Rect? Function(Size size) cache;
|
|
||||||
/// What [cache] depends on (repaint when it changes).
|
/// 0 hidden .. 1 shown (picks the hatching texture and its strength).
|
||||||
final Object cacheKey;
|
final double visibility;
|
||||||
|
|
||||||
|
/// Start of the uncached part (to the end), as a fraction.
|
||||||
|
final double? uncached;
|
||||||
|
|
||||||
|
/// Chapter starts, as fractions.
|
||||||
|
final List<double> chapters;
|
||||||
|
final int? hoveredChapter;
|
||||||
|
|
||||||
|
/// The hover line (the mouse, or the hovered chapter).
|
||||||
final double? hoverX;
|
final double? hoverX;
|
||||||
final bool hatched;
|
final double textOpacity;
|
||||||
|
final String? elapsed;
|
||||||
|
final String? remaining;
|
||||||
|
final String? cache;
|
||||||
|
final String? fontFamily;
|
||||||
const UoscTimelinePainter({
|
const UoscTimelinePainter({
|
||||||
required this.played,
|
required this.geometry,
|
||||||
required this.cache,
|
this.visibility = 1,
|
||||||
required this.cacheKey,
|
this.uncached,
|
||||||
|
this.chapters = const [],
|
||||||
|
this.hoveredChapter,
|
||||||
this.hoverX,
|
this.hoverX,
|
||||||
this.hatched = true,
|
this.textOpacity = 1,
|
||||||
|
this.elapsed,
|
||||||
|
this.remaining,
|
||||||
|
this.cache,
|
||||||
|
this.fontFamily,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
double get played => geometry.progress;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void paint(Canvas canvas, Size size) {
|
void paint(Canvas canvas, Size size) {
|
||||||
final all = Offset.zero & size;
|
final g = geometry;
|
||||||
canvas.drawRect(all, Paint()..color = UoscStyle.bar);
|
final w = size.width, bottom = size.height, top = g.top;
|
||||||
final c = cache(size);
|
final line = Rect.fromLTRB(g.lineLeft, top, g.lineRight, bottom);
|
||||||
if (c != null) {
|
// Background (`opacity.timeline`) around the position line.
|
||||||
if (hatched) {
|
final bg = Path()
|
||||||
canvas.save();
|
..fillType = PathFillType.evenOdd
|
||||||
canvas.clipRect(c);
|
..addRect(Offset.zero & size)
|
||||||
final stroke = Paint()
|
..addRect(line);
|
||||||
..color = const Color(0x40FFFFFF)
|
canvas.drawPath(bg, Paint()..color = Colors.black.withValues(alpha: UoscTimelineSpec.opacity));
|
||||||
..strokeWidth = 1.5;
|
canvas.drawRect(line, Paint()..color = Colors.white);
|
||||||
for (final (a, b) in hatchLines(c)) {
|
_hatch(canvas, w, top, bottom);
|
||||||
canvas.drawLine(a, b, stroke);
|
_chapters(canvas);
|
||||||
}
|
if (textOpacity > 0) _times(canvas, w, top, bottom, line);
|
||||||
canvas.restore();
|
|
||||||
} else {
|
|
||||||
canvas.drawRect(c, Paint()..color = const Color(0x40FFFFFF));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
canvas.drawRect(Rect.fromLTWH(0, 0, size.width * played, size.height), Paint()..color = UoscStyle.fill);
|
|
||||||
final x = hoverX;
|
final x = hoverX;
|
||||||
if (x != null) {
|
if (x != null) {
|
||||||
canvas.drawRect(Rect.fromLTWH(x - 0.5, 0, 1, size.height), Paint()..color = Colors.white70);
|
final onLine = line.left - 0.5 < x && x < line.right + 0.5;
|
||||||
|
canvas.drawRect(
|
||||||
|
Rect.fromLTRB(x - 0.5, top, x + 0.5, bottom),
|
||||||
|
Paint()..color = (onLine ? Colors.black : Colors.white).withValues(alpha: 0.33),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// uosc's texture "b" (shown) or "a" (hidden) at 80 px: "/" stripes
|
||||||
|
/// 1.6 px thick, white then black shifted by size / 24 (or / 28).
|
||||||
|
void _hatch(Canvas canvas, double w, double top, double bottom) {
|
||||||
|
final from = uncached;
|
||||||
|
if (from == null) return;
|
||||||
|
final ax = from * (geometry.width) < 0.5 ? 0.0 : geometry.x(from).floorToDouble();
|
||||||
|
if (ax >= w) return;
|
||||||
|
final shown = visibility > 0;
|
||||||
|
const tile = 80.0, unit = tile / 100;
|
||||||
|
final period = (shown ? 100 / 12 : 100 / 14) * unit;
|
||||||
|
final phase = shown ? 0.0 : 5.727 * unit;
|
||||||
|
final offset = tile / (shown ? 24 : 28);
|
||||||
|
final h = bottom - top;
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipRect(Rect.fromLTRB(ax, top, w, bottom));
|
||||||
|
void stripes(Color color, double opacity, double anchor) {
|
||||||
|
final paint = Paint()
|
||||||
|
..color = color.withValues(alpha: opacity)
|
||||||
|
..strokeWidth = 2 * unit;
|
||||||
|
// x + (y - bottom) = anchor + phase + k * period.
|
||||||
|
final base = anchor + phase;
|
||||||
|
final k0 = ((ax - h - base) / period).floor() - 1;
|
||||||
|
for (var k = k0; base + k * period <= w + 1; k++) {
|
||||||
|
final c = base + k * period;
|
||||||
|
canvas.drawLine(Offset(c, bottom), Offset(c + h, top), paint);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stripes(Colors.white, 0.4 - 0.2 * visibility, 0);
|
||||||
|
stripes(Colors.black, 0.6 - 0.2 * visibility, offset);
|
||||||
|
canvas.restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _chapters(Canvas canvas) {
|
||||||
|
final g = geometry;
|
||||||
|
final r = g.diamondRadius;
|
||||||
|
if (r <= 0) return;
|
||||||
|
void diamond(double fraction, double radius) {
|
||||||
|
final c = Offset(g.x(fraction), 0);
|
||||||
|
Path shape(double r) => Path()
|
||||||
|
..moveTo(c.dx - r, c.dy)
|
||||||
|
..lineTo(c.dx, c.dy - r)
|
||||||
|
..lineTo(c.dx + r, c.dy)
|
||||||
|
..lineTo(c.dx, c.dy + r)
|
||||||
|
..close();
|
||||||
|
final inner = shape(radius);
|
||||||
|
// A 1 px border outside the fill (`\bord`), the fill translucent.
|
||||||
|
final outer = shape(radius + UoscTimelineSpec.border * math.sqrt2);
|
||||||
|
canvas.drawPath(Path.combine(PathOperation.difference, outer, inner), Paint()..color = Colors.black);
|
||||||
|
canvas.drawPath(inner, Paint()..color = Colors.white.withValues(alpha: UoscTimelineSpec.chaptersOpacity));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < chapters.length; i++) {
|
||||||
|
if (i != hoveredChapter) diamond(chapters[i], r);
|
||||||
|
}
|
||||||
|
final h = hoveredChapter;
|
||||||
|
if (h != null && h < chapters.length) diamond(chapters[h], r * 2);
|
||||||
|
}
|
||||||
|
|
||||||
|
TextPainter _text(String s, double fontSize, Color color, {Paint? foreground}) => TextPainter(
|
||||||
|
text: TextSpan(
|
||||||
|
text: s,
|
||||||
|
style: TextStyle(
|
||||||
|
fontFamily: fontFamily,
|
||||||
|
fontSize: fontSize,
|
||||||
|
height: 1,
|
||||||
|
color: foreground == null ? color : null,
|
||||||
|
foreground: foreground,
|
||||||
|
fontFeatures: const [FontFeature.tabularFigures()],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
textDirection: TextDirection.ltr,
|
||||||
|
)..layout();
|
||||||
|
|
||||||
|
/// Text on the band: white with a black outline, inverted where it
|
||||||
|
/// crosses the position line (uosc clips one copy to each).
|
||||||
|
void _label(Canvas canvas, String s, double fontSize, double opacity, Offset at, Rect line, Size size) {
|
||||||
|
void copy(Color fill, Color outline) {
|
||||||
|
_text(
|
||||||
|
s,
|
||||||
|
fontSize,
|
||||||
|
fill,
|
||||||
|
foreground: Paint()
|
||||||
|
..style = PaintingStyle.stroke
|
||||||
|
..strokeWidth = UoscTimelineSpec.textBorder * 2
|
||||||
|
..strokeJoin = StrokeJoin.round
|
||||||
|
..color = outline.withValues(alpha: opacity),
|
||||||
|
).paint(canvas, at);
|
||||||
|
_text(s, fontSize, fill.withValues(alpha: opacity)).paint(canvas, at);
|
||||||
|
}
|
||||||
|
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipPath(
|
||||||
|
Path()
|
||||||
|
..fillType = PathFillType.evenOdd
|
||||||
|
..addRect(Rect.fromLTWH(-20, -20, size.width + 40, size.height + 40))
|
||||||
|
..addRect(line),
|
||||||
|
);
|
||||||
|
copy(Colors.white, Colors.black);
|
||||||
|
canvas.restore();
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipRect(line);
|
||||||
|
copy(Colors.black, Colors.white);
|
||||||
|
canvas.restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _times(Canvas canvas, double w, double top, double bottom, Rect line) {
|
||||||
|
const fs = UoscTimelineSpec.fontSize, spacing = UoscTimelineSpec.spacing;
|
||||||
|
final size = Size(w, bottom);
|
||||||
|
final cy = top + (bottom - top) / 2;
|
||||||
|
final e = elapsed, r = remaining;
|
||||||
|
final ew = e == null ? 0.0 : _text(e, fs, Colors.white).width;
|
||||||
|
final rw = r == null ? 0.0 : _text(r, fs, Colors.white).width;
|
||||||
|
final c = cache;
|
||||||
|
if (c != null) {
|
||||||
|
const cfs = fs * 0.8, margin = 5.0;
|
||||||
|
final cw = _text(c, cfs, Colors.white).width;
|
||||||
|
var x = line.right + margin;
|
||||||
|
final minX = spacing + margin + ew, maxX = w - spacing - margin - rw;
|
||||||
|
if (x < minX) {
|
||||||
|
x = minX;
|
||||||
|
} else if (x + cw > maxX) {
|
||||||
|
x = maxX - cw;
|
||||||
|
}
|
||||||
|
_label(canvas, c, cfs, textOpacity * 0.6, Offset(x, cy - cfs / 2), line, size);
|
||||||
|
}
|
||||||
|
if (e != null) _label(canvas, e, fs, textOpacity, Offset(spacing, cy - fs / 2), line, size);
|
||||||
|
if (r != null) _label(canvas, r, fs, textOpacity, Offset(w - spacing - rw, cy - fs / 2), line, size);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool shouldRepaint(UoscTimelinePainter old) =>
|
bool shouldRepaint(UoscTimelinePainter old) => true;
|
||||||
old.played != played || old.cacheKey != cacheKey || old.hoverX != hoverX || old.hatched != hatched;
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
import 'dart:math' as math;
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../volume.dart' show maxVolume;
|
||||||
|
|
||||||
|
// uosc's volume slider (`elements/Volume.lua`) as it flashes on a volume
|
||||||
|
// change: a vertical band at the right edge, black at `opacity.slider`
|
||||||
|
// with a white gauge from the bottom, notches at 100 %, the value at the
|
||||||
|
// bottom (black on the gauge, white off it).
|
||||||
|
|
||||||
|
/// The flashed uosc volume slider; size it with [UoscVolumeSlider.width]
|
||||||
|
/// and the height uosc gives it (see [UoscVolumeSlider.heightFor]).
|
||||||
|
class UoscVolumeSlider extends StatelessWidget {
|
||||||
|
/// 0..[maxVolume].
|
||||||
|
final double volume;
|
||||||
|
const UoscVolumeSlider({super.key, required this.volume});
|
||||||
|
|
||||||
|
/// `volume_size`.
|
||||||
|
static const width = 40.0;
|
||||||
|
|
||||||
|
/// uosc: min(size * 8, 80 % of the room between the bars), less the
|
||||||
|
/// mute button (one [width]) below it.
|
||||||
|
static double heightFor(double room) => math.min(width * 8, room * 0.8) - width;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => CustomPaint(
|
||||||
|
key: const ValueKey('uosc-volume-flash'),
|
||||||
|
painter: UoscVolumePainter(
|
||||||
|
volume: volume,
|
||||||
|
fontFamily: DefaultTextStyle.of(context).style.fontFamily ?? Theme.of(context).textTheme.bodyMedium?.fontFamily,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class UoscVolumePainter extends CustomPainter {
|
||||||
|
final double volume;
|
||||||
|
final String? fontFamily;
|
||||||
|
const UoscVolumePainter({required this.volume, this.fontFamily});
|
||||||
|
|
||||||
|
/// `volume_border`, `border_radius`.
|
||||||
|
static const border = 1.0;
|
||||||
|
static const radius = 4.0;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void paint(Canvas canvas, Size size) {
|
||||||
|
final w = size.width, h = size.height;
|
||||||
|
if (w <= 0 || h <= w) return;
|
||||||
|
final v = volume.clamp(0.0, maxVolume);
|
||||||
|
final nudgeY = h - (h * (100 / maxVolume)).roundToDouble();
|
||||||
|
final nudge = (w * 0.18).roundToDouble();
|
||||||
|
final spacing = (w * 0.2).roundToDouble();
|
||||||
|
Path notches(double inset) {
|
||||||
|
final n = nudge - inset;
|
||||||
|
return Path()
|
||||||
|
..moveTo(0, nudgeY - nudge)
|
||||||
|
..lineTo(inset + n, nudgeY)
|
||||||
|
..lineTo(0, nudgeY + nudge)
|
||||||
|
..close()
|
||||||
|
..moveTo(w, nudgeY - nudge)
|
||||||
|
..lineTo(w - inset - n, nudgeY)
|
||||||
|
..lineTo(w, nudgeY + nudge)
|
||||||
|
..close();
|
||||||
|
}
|
||||||
|
|
||||||
|
final bg = RRect.fromRectAndRadius(Offset.zero & size, const Radius.circular(radius + border));
|
||||||
|
final volumeY = border + (h - border * 2) * (1 - math.min(v / maxVolume, 1));
|
||||||
|
final gauge = RRect.fromRectAndRadius(
|
||||||
|
Rect.fromLTRB(border, math.min(volumeY, h - border), w - border, h - border),
|
||||||
|
const Radius.circular(radius),
|
||||||
|
);
|
||||||
|
// The notches cut into both.
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipPath(
|
||||||
|
Path()
|
||||||
|
..fillType = PathFillType.evenOdd
|
||||||
|
..addRect(Offset.zero & size)
|
||||||
|
..addPath(notches(0), Offset.zero),
|
||||||
|
);
|
||||||
|
canvas.drawPath(
|
||||||
|
Path()
|
||||||
|
..fillType = PathFillType.evenOdd
|
||||||
|
..addRRect(bg)
|
||||||
|
..addRRect(gauge),
|
||||||
|
Paint()..color = Colors.black.withValues(alpha: 0.9),
|
||||||
|
);
|
||||||
|
canvas.restore();
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipPath(
|
||||||
|
Path()
|
||||||
|
..fillType = PathFillType.evenOdd
|
||||||
|
..addRect(Offset.zero & size)
|
||||||
|
..addPath(notches(border), Offset.zero),
|
||||||
|
);
|
||||||
|
canvas.drawRRect(gauge, Paint()..color = Colors.white);
|
||||||
|
canvas.restore();
|
||||||
|
|
||||||
|
// round(volume * 10) / 10, as Lua prints it ("85", "85.5").
|
||||||
|
final tenths = (v * 10).round();
|
||||||
|
final text = tenths % 10 == 0 ? '${tenths ~/ 10}' : (tenths / 10).toString();
|
||||||
|
final fontSize = (w * 0.6 - text.length * (w / 20)).roundToDouble();
|
||||||
|
TextPainter label(Color color) => TextPainter(
|
||||||
|
text: TextSpan(
|
||||||
|
text: text,
|
||||||
|
style: TextStyle(fontFamily: fontFamily, fontSize: fontSize, height: 1, color: color),
|
||||||
|
),
|
||||||
|
textDirection: TextDirection.ltr,
|
||||||
|
)..layout();
|
||||||
|
final dark = label(Colors.black), light = label(Colors.white);
|
||||||
|
final at = Offset((w - dark.width) / 2, h - spacing - dark.height);
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipRRect(gauge);
|
||||||
|
dark.paint(canvas, at);
|
||||||
|
canvas.restore();
|
||||||
|
canvas.save();
|
||||||
|
canvas.clipPath(
|
||||||
|
Path()
|
||||||
|
..fillType = PathFillType.evenOdd
|
||||||
|
..addRect(Offset.zero & size)
|
||||||
|
..addRRect(gauge),
|
||||||
|
);
|
||||||
|
light.paint(canvas, at);
|
||||||
|
canvas.restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool shouldRepaint(UoscVolumePainter old) => old.volume != volume || old.fontFamily != fontFamily;
|
||||||
|
}
|
||||||
@@ -0,0 +1,317 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart' show ValueListenable;
|
||||||
|
import 'package:flutter/gestures.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:media_kit/media_kit.dart';
|
||||||
|
|
||||||
|
import '../playback/playback_controller.dart' show PlaybackController;
|
||||||
|
import '../widgets/app_menu.dart' show AppGlass;
|
||||||
|
|
||||||
|
/// The player's top volume (mpv's `volume-max`): past 100 % mpv amplifies.
|
||||||
|
const maxVolume = PlaybackController.maxVolume * 1.0;
|
||||||
|
|
||||||
|
/// The part of the volume bar above 100 %.
|
||||||
|
const boostColor = Color(0xFFFFB74D);
|
||||||
|
|
||||||
|
/// One wheel notch or arrow key.
|
||||||
|
const volumeStep = 5.0;
|
||||||
|
|
||||||
|
/// [volume] moved by [delta] (wheel, keys), kept within 0..[maxVolume].
|
||||||
|
double stepVolume(double volume, double delta) => (volume + delta).clamp(0.0, maxVolume);
|
||||||
|
|
||||||
|
/// Turns wheel deltas into volume steps: a mouse notch (a big delta) is
|
||||||
|
/// one step, small smooth-scroll deltas add up to one. Mostly horizontal
|
||||||
|
/// scrolls (Shift+wheel, sideways pans) are no steps.
|
||||||
|
class WheelSteps {
|
||||||
|
// Flutter makes a notch 53 px on Linux, 60 on Windows (3 lines).
|
||||||
|
static const _notch = 50.0;
|
||||||
|
double _sum = 0;
|
||||||
|
|
||||||
|
/// Whether [e] is a vertical scroll (the only kind that steps).
|
||||||
|
static bool vertical(PointerSignalEvent e) =>
|
||||||
|
e is PointerScrollEvent && e.scrollDelta.dy != 0 && e.scrollDelta.dy.abs() > e.scrollDelta.dx.abs();
|
||||||
|
|
||||||
|
/// +1 louder (wheel up), -1 quieter, 0 not a step yet.
|
||||||
|
int take(PointerScrollEvent e) {
|
||||||
|
final dy = e.scrollDelta.dy;
|
||||||
|
if (dy.abs() >= _notch) {
|
||||||
|
_sum = 0;
|
||||||
|
return dy < 0 ? 1 : -1;
|
||||||
|
}
|
||||||
|
if (_sum != 0 && _sum.sign != dy.sign) _sum = 0;
|
||||||
|
_sum += dy;
|
||||||
|
if (_sum.abs() < _notch) return 0;
|
||||||
|
final step = _sum < 0 ? 1 : -1;
|
||||||
|
_sum = 0;
|
||||||
|
return step;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Claims [e] if it is a vertical scroll that nothing under the mouse
|
||||||
|
/// claimed first (a list, a menu), then calls [onStep] per step.
|
||||||
|
void handle(PointerSignalEvent e, ValueChanged<int> onStep) {
|
||||||
|
if (!vertical(e)) return;
|
||||||
|
GestureBinding.instance.pointerSignalResolver.register(e, (event) {
|
||||||
|
final step = take(event as PointerScrollEvent);
|
||||||
|
if (step != 0) onStep(step);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The wheel anywhere over [child] steps the volume ([onStep]: +1 / -1),
|
||||||
|
/// unless something under the mouse scrolls (it claims the event first)
|
||||||
|
/// or [enabled] is off.
|
||||||
|
class VolumeWheel extends StatefulWidget {
|
||||||
|
final ValueChanged<int> onStep;
|
||||||
|
final bool enabled;
|
||||||
|
final Widget child;
|
||||||
|
const VolumeWheel({super.key, required this.onStep, this.enabled = true, required this.child});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<VolumeWheel> createState() => _VolumeWheelState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _VolumeWheelState extends State<VolumeWheel> {
|
||||||
|
final _steps = WheelSteps();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => Listener(
|
||||||
|
onPointerSignal: (e) {
|
||||||
|
if (widget.enabled) _steps.handle(e, widget.onStep);
|
||||||
|
},
|
||||||
|
child: widget.child,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Shows [builder] for a second after each [trigger] tick (a wheel or
|
||||||
|
/// key volume step), fading in and out; ignores the mouse.
|
||||||
|
class VolumeFlash extends StatefulWidget {
|
||||||
|
final ValueListenable<int> trigger;
|
||||||
|
final WidgetBuilder builder;
|
||||||
|
const VolumeFlash({super.key, required this.trigger, required this.builder});
|
||||||
|
|
||||||
|
/// uosc's `flash_duration`.
|
||||||
|
static const hold = Duration(seconds: 1);
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<VolumeFlash> createState() => _VolumeFlashState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _VolumeFlashState extends State<VolumeFlash> {
|
||||||
|
bool _on = false;
|
||||||
|
Timer? _timer;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
widget.trigger.addListener(_flash);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(VolumeFlash old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
if (old.trigger != widget.trigger) {
|
||||||
|
old.trigger.removeListener(_flash);
|
||||||
|
widget.trigger.addListener(_flash);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
widget.trigger.removeListener(_flash);
|
||||||
|
_timer?.cancel();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _flash() {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() => _on = true);
|
||||||
|
_timer?.cancel();
|
||||||
|
_timer = Timer(VolumeFlash.hold, () {
|
||||||
|
if (mounted) setState(() => _on = false);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => IgnorePointer(
|
||||||
|
child: AnimatedOpacity(
|
||||||
|
duration: const Duration(milliseconds: 150),
|
||||||
|
opacity: _on ? 1 : 0,
|
||||||
|
child: _on || _timer != null ? widget.builder(context) : const SizedBox.shrink(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The standard design's volume readout for [VolumeFlash]: a glass pill
|
||||||
|
/// (the player's pill look) with the icon, a [VolumeBar] and the
|
||||||
|
/// percentage.
|
||||||
|
class VolumeReadout extends StatelessWidget {
|
||||||
|
final double volume;
|
||||||
|
const VolumeReadout({super.key, required this.volume});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final v = volume.clamp(0.0, maxVolume);
|
||||||
|
return AppGlass.pill(
|
||||||
|
key: const ValueKey('volume-readout'),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(12, 4, 14, 4),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(
|
||||||
|
v <= 0 ? Icons.volume_off : (v < 50 ? Icons.volume_down : Icons.volume_up),
|
||||||
|
size: 20,
|
||||||
|
color: v > 100 ? boostColor : Colors.white,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
VolumeBar(volume: v, onChanged: (_) {}, width: 96),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
SizedBox(
|
||||||
|
width: 44,
|
||||||
|
child: Text(
|
||||||
|
'${v.round()} %',
|
||||||
|
textAlign: TextAlign.right,
|
||||||
|
style: const TextStyle(color: Colors.white, fontSize: 13, fontFeatures: [FontFeature.tabularFigures()]),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A thin volume track over 0..[maxVolume]: filled up to the volume, the
|
||||||
|
/// part above 100 % in [boostColor], a tick at 100 %. Click or drag sets
|
||||||
|
/// it.
|
||||||
|
class VolumeBar extends StatelessWidget {
|
||||||
|
final double volume;
|
||||||
|
final ValueChanged<double> onChanged;
|
||||||
|
final double width;
|
||||||
|
final Color color;
|
||||||
|
final Color trackColor;
|
||||||
|
const VolumeBar({
|
||||||
|
super.key,
|
||||||
|
required this.volume,
|
||||||
|
required this.onChanged,
|
||||||
|
this.width = 64,
|
||||||
|
this.color = Colors.white,
|
||||||
|
this.trackColor = Colors.white30,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
void at(double x) => onChanged((x / width * maxVolume).clamp(0.0, maxVolume).roundToDouble());
|
||||||
|
return GestureDetector(
|
||||||
|
behavior: HitTestBehavior.opaque,
|
||||||
|
onTapDown: (e) => at(e.localPosition.dx),
|
||||||
|
onHorizontalDragUpdate: (e) => at(e.localPosition.dx),
|
||||||
|
child: SizedBox(
|
||||||
|
width: width,
|
||||||
|
height: 24,
|
||||||
|
child: CustomPaint(painter: _VolumePainter(volume.clamp(0.0, maxVolume), color, trackColor)),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _VolumePainter extends CustomPainter {
|
||||||
|
final double volume;
|
||||||
|
final Color color, trackColor;
|
||||||
|
_VolumePainter(this.volume, this.color, this.trackColor);
|
||||||
|
|
||||||
|
@override
|
||||||
|
void paint(Canvas canvas, Size size) {
|
||||||
|
final y = size.height / 2;
|
||||||
|
double x(double v) => size.width * v / maxVolume;
|
||||||
|
final line = Paint()
|
||||||
|
..strokeWidth = 3
|
||||||
|
..strokeCap = StrokeCap.round;
|
||||||
|
canvas.drawLine(Offset(0, y), Offset(size.width, y), line..color = trackColor);
|
||||||
|
final full = x(100);
|
||||||
|
canvas.drawLine(
|
||||||
|
Offset(full, y - 5),
|
||||||
|
Offset(full, y + 5),
|
||||||
|
Paint()
|
||||||
|
..color = trackColor
|
||||||
|
..strokeWidth = 1.5,
|
||||||
|
);
|
||||||
|
if (volume > 0) canvas.drawLine(Offset(0, y), Offset(x(volume.clamp(0, 100)), y), line..color = color);
|
||||||
|
if (volume > 100) canvas.drawLine(Offset(full, y), Offset(x(volume), y), line..color = boostColor);
|
||||||
|
canvas.drawCircle(Offset(x(volume), y), 5, Paint()..color = volume > 100 ? boostColor : color);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool shouldRepaint(_VolumePainter old) => old.volume != volume || old.color != color || old.trackColor != trackColor;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Volume for the standard bar (instead of media_kit's, which stops at
|
||||||
|
/// 100): the icon mutes / unmutes, hovering shows a [VolumeBar], the
|
||||||
|
/// wheel steps [volumeStep].
|
||||||
|
class VolumeButton extends StatefulWidget {
|
||||||
|
final Player player;
|
||||||
|
final FocusNode? focusNode;
|
||||||
|
const VolumeButton({super.key, required this.player, this.focusNode});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<VolumeButton> createState() => _VolumeButtonState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _VolumeButtonState extends State<VolumeButton> {
|
||||||
|
final _steps = WheelSteps();
|
||||||
|
bool _hover = false;
|
||||||
|
double _beforeMute = 100;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final player = widget.player;
|
||||||
|
return StreamBuilder<double>(
|
||||||
|
stream: player.stream.volume,
|
||||||
|
initialData: player.state.volume,
|
||||||
|
builder: (context, snap) {
|
||||||
|
final v = snap.data ?? 100;
|
||||||
|
return MouseRegion(
|
||||||
|
onEnter: (_) => setState(() => _hover = true),
|
||||||
|
onExit: (_) => setState(() => _hover = false),
|
||||||
|
child: Listener(
|
||||||
|
// Claimed here, so the player's own wheel handler skips it.
|
||||||
|
onPointerSignal: (e) =>
|
||||||
|
_steps.handle(e, (step) => player.setVolume(stepVolume(player.state.volume, step * volumeStep))),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('volume-button'),
|
||||||
|
focusNode: widget.focusNode,
|
||||||
|
tooltip: 'Volume ${v.round()} %',
|
||||||
|
iconSize: 22,
|
||||||
|
color: Colors.white,
|
||||||
|
onPressed: () {
|
||||||
|
if (v > 0) {
|
||||||
|
_beforeMute = v;
|
||||||
|
player.setVolume(0);
|
||||||
|
} else {
|
||||||
|
player.setVolume(_beforeMute <= 0 ? 100 : _beforeMute);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
icon: Icon(v <= 0 ? Icons.volume_off : (v < 50 ? Icons.volume_down : Icons.volume_up)),
|
||||||
|
),
|
||||||
|
AnimatedSize(
|
||||||
|
duration: const Duration(milliseconds: 150),
|
||||||
|
child: _hover
|
||||||
|
? Padding(
|
||||||
|
padding: const EdgeInsets.only(left: 4, right: 12),
|
||||||
|
child: VolumeBar(volume: v, onChanged: player.setVolume),
|
||||||
|
)
|
||||||
|
: const SizedBox.shrink(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:hive_ce/hive.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
|
||||||
|
// Files source state, one Hive box: the folders the user added and the
|
||||||
|
// local files played last. Same shape as AppSettings: signals start empty,
|
||||||
|
// take the stored values once [FolderStore.ensureLoaded] finishes, and
|
||||||
|
// mutators write through.
|
||||||
|
|
||||||
|
const filesBoxName = 'files';
|
||||||
|
|
||||||
|
const _keyFolders = 'folders';
|
||||||
|
const _keyRecent = 'recent';
|
||||||
|
|
||||||
|
/// Recent files kept, most recent first.
|
||||||
|
const maxRecentFiles = 30;
|
||||||
|
|
||||||
|
class FolderStore {
|
||||||
|
static final FolderStore instance = FolderStore();
|
||||||
|
|
||||||
|
/// Watched folders, in the order they were added.
|
||||||
|
final folders = signal<List<String>>(const []);
|
||||||
|
/// Local files played, most recent first, no duplicates.
|
||||||
|
final recent = signal<List<String>>(const []);
|
||||||
|
|
||||||
|
Future<void>? _load;
|
||||||
|
Box? _box;
|
||||||
|
|
||||||
|
Future<void> ensureLoaded() => _load ??= _loadNow();
|
||||||
|
|
||||||
|
Future<void> _loadNow() async {
|
||||||
|
try {
|
||||||
|
final box = _box = await Hive.openBox(filesBoxName);
|
||||||
|
final f = box.get(_keyFolders);
|
||||||
|
if (f is List) folders.value = List.unmodifiable(f.whereType<String>());
|
||||||
|
final r = box.get(_keyRecent);
|
||||||
|
if (r is List) {
|
||||||
|
recent.value = List.unmodifiable(
|
||||||
|
r.whereType<String>().toSet().take(maxRecentFiles));
|
||||||
|
}
|
||||||
|
} catch (e, st) {
|
||||||
|
debugPrint('load files store failed: $e\n$st');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// False when [dir] is already watched.
|
||||||
|
bool addFolder(String dir) {
|
||||||
|
if (folders.value.contains(dir)) return false;
|
||||||
|
_setFolders([...folders.value, dir]);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void removeFolder(String dir) =>
|
||||||
|
_setFolders([...folders.value.where((d) => d != dir)]);
|
||||||
|
|
||||||
|
/// Moves [path] to the top of [recent].
|
||||||
|
void addRecent(String path) => _setRecent(
|
||||||
|
[path, ...recent.value.where((p) => p != path)].take(maxRecentFiles));
|
||||||
|
|
||||||
|
void removeRecent(String path) =>
|
||||||
|
_setRecent(recent.value.where((p) => p != path));
|
||||||
|
|
||||||
|
void clearRecent() => _setRecent(const []);
|
||||||
|
|
||||||
|
void _setFolders(List<String> list) {
|
||||||
|
folders.value = List.unmodifiable(list);
|
||||||
|
_put(_keyFolders, [...list]);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _setRecent(Iterable<String> list) {
|
||||||
|
recent.value = List.unmodifiable(list);
|
||||||
|
_put(_keyRecent, [...recent.value]);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _put(String key, Object value) async {
|
||||||
|
try {
|
||||||
|
final box = _box ??
|
||||||
|
(Hive.isBoxOpen(filesBoxName) ? Hive.box(filesBoxName) : null);
|
||||||
|
await box?.put(key, value);
|
||||||
|
} catch (e, st) {
|
||||||
|
debugPrint('save files store $key failed: $e\n$st');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
// Release file names -> series / season / episode, anitomy-style but small:
|
||||||
|
// enough to group a downloads folder into shows. Unknown shapes fall back to
|
||||||
|
// the cleaned name with no episode, never to a wrong number.
|
||||||
|
|
||||||
|
/// What a release file name says.
|
||||||
|
class ParsedName {
|
||||||
|
/// Title without group, season marker, episode, year or release tags.
|
||||||
|
final String series;
|
||||||
|
final int? season;
|
||||||
|
final int? episode;
|
||||||
|
/// Release group: leading `[Group]` or scene-style trailing `-GRP`.
|
||||||
|
final String? group;
|
||||||
|
/// Release year, taken out of [series] (movies, `Title (2019)`).
|
||||||
|
final int? year;
|
||||||
|
/// Non-episode marker (`NCOP1`, `NCED`, `OVA 2`, `Special`): such files
|
||||||
|
/// carry no [episode] so they never sort among the real ones.
|
||||||
|
final String? extra;
|
||||||
|
|
||||||
|
const ParsedName(
|
||||||
|
this.series, {
|
||||||
|
this.season,
|
||||||
|
this.episode,
|
||||||
|
this.group,
|
||||||
|
this.year,
|
||||||
|
this.extra,
|
||||||
|
});
|
||||||
|
|
||||||
|
/// `S01E03`, `E25`, the [extra] marker, `S02` for a season pack, else ''.
|
||||||
|
String get label {
|
||||||
|
final s = season == null ? '' : 'S${season.toString().padLeft(2, '0')}';
|
||||||
|
if (episode != null) return '${s}E${episode.toString().padLeft(2, '0')}';
|
||||||
|
return extra ?? s;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Grouping key: case, punctuation and spacing do not split a series.
|
||||||
|
String get seriesKey => normalizeSeries(series);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => 'ParsedName($series, s=$season, e=$episode, '
|
||||||
|
'group=$group, year=$year, extra=$extra)';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Lowercase letters and digits of [s], single spaces between words.
|
||||||
|
String normalizeSeries(String s) => s
|
||||||
|
.toLowerCase()
|
||||||
|
.replaceAll(RegExp(r"['’`]"), '')
|
||||||
|
.replaceAll(RegExp(r'[^\p{L}\p{N}]+', unicode: true), ' ')
|
||||||
|
.trim();
|
||||||
|
|
||||||
|
// Release tags: the title ends where the first of these starts.
|
||||||
|
final _junk = RegExp(
|
||||||
|
r'\b(?:2160p|1440p|1080[pi]|720p|576p|480p|4K|UHD|[xh]\.?26[45]|HEVC|AVC|'
|
||||||
|
r'AV1|VP9|WEB(?:-?DL|-?Rip)?|BD(?:Rip|Remux)?|Blu-?Ray|BRRip|DVD(?:Rip)?|'
|
||||||
|
r'HDTV|HDR(?:10)?|DV|REMUX|AAC(?:\d\.\d)?|FLAC|Opus|DTS(?:-HD)?|E?-?AC-?3|'
|
||||||
|
r'DDP?\d?|TrueHD|Atmos|10-?bit|8-?bit|Hi10P?|PROPER|REPACK|Dual[ -]Audio|'
|
||||||
|
r'Multi(?:ple)?[ -]Subs?(?:titles?)?|AMZN|NF|CR|DSNP|HMAX|ATVP|'
|
||||||
|
r'Batch|Complete)\b',
|
||||||
|
caseSensitive: false,
|
||||||
|
);
|
||||||
|
final _ext = RegExp(r'\.(?=[a-z0-9]*[a-z])[a-z0-9]{2,4}$', caseSensitive: false);
|
||||||
|
final _leadingGroup = RegExp(r'^\s*\[([^\]]+)\]');
|
||||||
|
final _sceneGroup = RegExp(r'-([A-Za-z0-9]+)$');
|
||||||
|
final _bracketYear = RegExp(r'[(\[]((?:19|20)\d{2})[)\]]');
|
||||||
|
final _brackets = RegExp(r'\[[^\]]*\]|\([^)]*\)|\{[^}]*\}|【[^】]*】');
|
||||||
|
// S01E02, S01.E02, S1 E2; a batch `S01E01-E02` / `S01E01E02` keeps the first.
|
||||||
|
final _sxe = RegExp(r'\bS(\d{1,2})[ .]?E(\d{1,4})(?:v\d)?(?!\d)',
|
||||||
|
caseSensitive: false);
|
||||||
|
final _nxn = RegExp(r'\b(\d{1,2})x(\d{2,3})\b');
|
||||||
|
// Anime: `Title - 25`, `- 03v2`, `- 01-02` (batch keeps the first).
|
||||||
|
final _dashNumber = RegExp(r'\s[-–]\s(\d{1,4})(?:v\d)?(?=$|[\s\-~.])');
|
||||||
|
final _episodeWord = RegExp(
|
||||||
|
r'\b(?:Episode|Ep\.?|E)\s?(\d{1,4})(?:v\d)?\b',
|
||||||
|
caseSensitive: false,
|
||||||
|
);
|
||||||
|
// Extras: unambiguous words anywhere, short ones only right after the dash.
|
||||||
|
final _extraAnywhere = RegExp(
|
||||||
|
r'(?:^|\s)(NCOP|NCED|OVA|OAD|ONA)\s?(\d{1,2})?(?:v\d)?(?=$|\s)',
|
||||||
|
caseSensitive: false,
|
||||||
|
);
|
||||||
|
final _extraAfterDash = RegExp(
|
||||||
|
r'\s[-–]\s(OP|ED|SP|Specials?|Extras?|Recap|Preview|PV|Menu)\s?(\d{1,2})?'
|
||||||
|
r'(?:v\d)?(?=$|\s)',
|
||||||
|
caseSensitive: false,
|
||||||
|
);
|
||||||
|
final _seasonInTitle = RegExp(
|
||||||
|
r'\s(?:S(\d{1,2})|Season\s?(\d{1,2})|(\d{1,2})(?:st|nd|rd|th)\s+Season)\s*$',
|
||||||
|
caseSensitive: false,
|
||||||
|
);
|
||||||
|
final _trailingYear = RegExp(r'\s((?:19|20)\d{2})$');
|
||||||
|
|
||||||
|
/// Parses a file name (with or without the extension, no directories).
|
||||||
|
ParsedName parseReleaseName(String fileName) {
|
||||||
|
var s = fileName.replaceFirst(_ext, '').trim();
|
||||||
|
final original = s;
|
||||||
|
String? group = _leadingGroup.firstMatch(s)?.group(1)?.trim();
|
||||||
|
int? year;
|
||||||
|
final by = _bracketYear.firstMatch(s);
|
||||||
|
if (by != null) year = int.parse(by.group(1)!);
|
||||||
|
s = s.replaceAll(_brackets, ' ');
|
||||||
|
|
||||||
|
// Dots and underscores as separators (scene style), unless the name
|
||||||
|
// already has spaces and only the odd `Dr. Stone` dot.
|
||||||
|
final dotted = !s.contains(' ') || RegExp(r'\w\.\w').allMatches(s).length > 2;
|
||||||
|
if (dotted) {
|
||||||
|
// `...H264-GRP`, but not `...WEB-DL`.
|
||||||
|
final tags = _junk.allMatches(s);
|
||||||
|
if (group == null && tags.isNotEmpty && tags.last.end < s.length) {
|
||||||
|
final g = _sceneGroup.firstMatch(s);
|
||||||
|
if (g != null) {
|
||||||
|
group = g.group(1);
|
||||||
|
s = s.substring(0, g.start);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s = s.replaceAll('.', ' ');
|
||||||
|
}
|
||||||
|
s = s.replaceAll('_', ' ').replaceAll(RegExp(r'\s+'), ' ').trim();
|
||||||
|
|
||||||
|
// Release tags end the interesting part.
|
||||||
|
final junk = _junk.firstMatch(s);
|
||||||
|
if (junk != null && junk.start > 0) s = s.substring(0, junk.start).trim();
|
||||||
|
|
||||||
|
int? season, episode;
|
||||||
|
String? extra;
|
||||||
|
var cut = s.length;
|
||||||
|
final extraMatch =
|
||||||
|
_extraAfterDash.firstMatch(s) ?? _extraAnywhere.firstMatch(s);
|
||||||
|
final sxe = _sxe.firstMatch(s);
|
||||||
|
if (extraMatch != null) {
|
||||||
|
final word = extraMatch.group(1)!;
|
||||||
|
final upper = word.length <= 4 ? word.toUpperCase() : _title(word);
|
||||||
|
// `OVA - 02`: the number may follow the dash instead.
|
||||||
|
final n = extraMatch.group(2) ??
|
||||||
|
_dashNumber.firstMatch(s.substring(extraMatch.end))?.group(1);
|
||||||
|
extra = n == null
|
||||||
|
? upper
|
||||||
|
: (upper.startsWith('NC') || upper.length <= 2)
|
||||||
|
? '$upper${int.parse(n)}'
|
||||||
|
: '$upper ${int.parse(n)}';
|
||||||
|
cut = extraMatch.start;
|
||||||
|
if (sxe != null && sxe.start < cut) {
|
||||||
|
season = int.parse(sxe.group(1)!);
|
||||||
|
cut = sxe.start;
|
||||||
|
}
|
||||||
|
} else if (sxe != null) {
|
||||||
|
season = int.parse(sxe.group(1)!);
|
||||||
|
episode = int.parse(sxe.group(2)!);
|
||||||
|
cut = sxe.start;
|
||||||
|
} else {
|
||||||
|
final nxn = _nxn.firstMatch(s);
|
||||||
|
if (nxn != null) {
|
||||||
|
season = int.parse(nxn.group(1)!);
|
||||||
|
episode = int.parse(nxn.group(2)!);
|
||||||
|
cut = nxn.start;
|
||||||
|
} else {
|
||||||
|
final m = _dashNumber.firstMatch(s) ?? _episodeWord.firstMatch(s);
|
||||||
|
if (m != null) {
|
||||||
|
episode = int.parse(m.group(1)!);
|
||||||
|
cut = m.start;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var series = s.substring(0, cut);
|
||||||
|
// Season pack or season marker kept in the title: `Title S2`,
|
||||||
|
// `Title Season 2`, `Title 2nd Season`, `Title.S01.1080p`.
|
||||||
|
final sIn = _seasonInTitle.firstMatch(series);
|
||||||
|
if (sIn != null) {
|
||||||
|
season ??= int.parse(sIn.group(1) ?? sIn.group(2) ?? sIn.group(3)!);
|
||||||
|
series = series.substring(0, sIn.start);
|
||||||
|
}
|
||||||
|
series = series.replaceAll(RegExp(r'[\s\-–:,~]+$'), '').trim();
|
||||||
|
// A trailing year is the release year, unless it is the whole title or
|
||||||
|
// too far ahead to be one (`Blade Runner 2049`).
|
||||||
|
final ty = _trailingYear.firstMatch(series);
|
||||||
|
if (ty != null) {
|
||||||
|
final y = int.parse(ty.group(1)!);
|
||||||
|
if (y <= DateTime.now().year + 1) {
|
||||||
|
year ??= y;
|
||||||
|
series = series.substring(0, ty.start).trim();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
series = series.replaceAll(RegExp(r'[\s\-–:,~]+$'), '').trim();
|
||||||
|
if (series.isEmpty) {
|
||||||
|
series = original.replaceAll(RegExp(r'[._]+'), ' ').trim();
|
||||||
|
}
|
||||||
|
return ParsedName(
|
||||||
|
series,
|
||||||
|
season: season,
|
||||||
|
episode: episode,
|
||||||
|
group: group,
|
||||||
|
year: year,
|
||||||
|
extra: extra,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _title(String w) => w[0].toUpperCase() + w.substring(1).toLowerCase();
|
||||||
@@ -0,0 +1,257 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
import 'dart:isolate';
|
||||||
|
|
||||||
|
import 'name_parser.dart';
|
||||||
|
|
||||||
|
// Folder scan for the Files source: videos with their parsed names,
|
||||||
|
// sidecar subtitles, everything else counted and hidden. The walk is
|
||||||
|
// synchronous I/O, so it runs in its own isolate.
|
||||||
|
|
||||||
|
const videoExtensions = {
|
||||||
|
'mkv', 'mp4', 'webm', 'avi', 'mov', 'm4v', 'ts', 'm2ts', 'wmv', 'flv', //
|
||||||
|
};
|
||||||
|
const subtitleExtensions = {'ass', 'ssa', 'srt', 'vtt', 'sup'};
|
||||||
|
|
||||||
|
/// Files looked at per scan; past this the result is [FolderScan.truncated].
|
||||||
|
const maxScannedFiles = 20000;
|
||||||
|
|
||||||
|
/// Samples and trailers under this size are hidden next to the real thing.
|
||||||
|
const _sampleMaxBytes = 300 << 20;
|
||||||
|
|
||||||
|
enum FileKind { video, subtitle, other }
|
||||||
|
|
||||||
|
FileKind kindOf(String path) {
|
||||||
|
final ext = _extension(_baseName(path));
|
||||||
|
if (videoExtensions.contains(ext)) return FileKind.video;
|
||||||
|
if (subtitleExtensions.contains(ext)) return FileKind.subtitle;
|
||||||
|
return FileKind.other;
|
||||||
|
}
|
||||||
|
|
||||||
|
class VideoFile {
|
||||||
|
final String path;
|
||||||
|
final int size;
|
||||||
|
final ParsedName parsed;
|
||||||
|
final DateTime modified;
|
||||||
|
const VideoFile(this.path, this.size, this.parsed, this.modified);
|
||||||
|
|
||||||
|
String get name => _baseName(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
class FolderScan {
|
||||||
|
final List<VideoFile> videos;
|
||||||
|
/// Non-video files and samples (subtitles and dot-entries not counted).
|
||||||
|
final int hiddenCount;
|
||||||
|
/// Up to 6 of the hidden file names, for "and N other files" hints.
|
||||||
|
final List<String> hiddenExamples;
|
||||||
|
/// Video path -> subtitle files next to it with the same base name
|
||||||
|
/// (`Ep 01.mkv` -> `Ep 01.srt`, `Ep 01.en.ass`).
|
||||||
|
final Map<String, List<String>> subtitles;
|
||||||
|
/// Stopped after [maxScannedFiles] files.
|
||||||
|
final bool truncated;
|
||||||
|
|
||||||
|
const FolderScan({
|
||||||
|
required this.videos,
|
||||||
|
required this.hiddenCount,
|
||||||
|
required this.hiddenExamples,
|
||||||
|
required this.subtitles,
|
||||||
|
required this.truncated,
|
||||||
|
});
|
||||||
|
|
||||||
|
static const empty = FolderScan(
|
||||||
|
videos: [],
|
||||||
|
hiddenCount: 0,
|
||||||
|
hiddenExamples: [],
|
||||||
|
subtitles: {},
|
||||||
|
truncated: false,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Scans [dir] recursively off the UI isolate. Symlinks are not followed,
|
||||||
|
/// hidden (dot) files and folders are skipped, unreadable subfolders are
|
||||||
|
/// left out; never throws (a missing folder is [FolderScan.empty]).
|
||||||
|
Future<FolderScan> scanFolder(String dir, {int maxFiles = maxScannedFiles}) =>
|
||||||
|
Isolate.run(() => scanFolderSync(dir, maxFiles: maxFiles))
|
||||||
|
.catchError((Object _) => FolderScan.empty);
|
||||||
|
|
||||||
|
/// The walk behind [scanFolder]; blocks, so call it from an isolate.
|
||||||
|
FolderScan scanFolderSync(String dir, {int maxFiles = maxScannedFiles}) {
|
||||||
|
final videos = <VideoFile>[];
|
||||||
|
final subs = <String>[];
|
||||||
|
final examples = <String>[];
|
||||||
|
var hidden = 0, seen = 0;
|
||||||
|
var truncated = false;
|
||||||
|
final pending = [Directory(dir)];
|
||||||
|
walk:
|
||||||
|
while (pending.isNotEmpty) {
|
||||||
|
final List<FileSystemEntity> entries;
|
||||||
|
try {
|
||||||
|
entries = pending.removeLast().listSync(followLinks: false);
|
||||||
|
} catch (_) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
entries.sort((a, b) => a.path.compareTo(b.path));
|
||||||
|
for (final e in entries) {
|
||||||
|
final name = _baseName(e.path);
|
||||||
|
if (name.startsWith('.')) continue;
|
||||||
|
if (e is Directory) {
|
||||||
|
pending.add(e);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (e is! File) continue; // links
|
||||||
|
if (++seen > maxFiles) {
|
||||||
|
truncated = true;
|
||||||
|
break walk;
|
||||||
|
}
|
||||||
|
final kind = kindOf(name);
|
||||||
|
if (kind == FileKind.subtitle) {
|
||||||
|
subs.add(e.path);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
FileStat? stat;
|
||||||
|
if (kind == FileKind.video) {
|
||||||
|
try {
|
||||||
|
stat = e.statSync();
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
final size = stat?.size ?? 0;
|
||||||
|
final lower = name.toLowerCase();
|
||||||
|
final sample = kind == FileKind.video &&
|
||||||
|
(lower.contains('sample') || lower.contains('trailer')) &&
|
||||||
|
size < _sampleMaxBytes;
|
||||||
|
if (kind != FileKind.video || sample) {
|
||||||
|
hidden++;
|
||||||
|
if (examples.length < 6) examples.add(name);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
videos.add(VideoFile(e.path, size, parseReleaseName(name),
|
||||||
|
stat?.modified ?? DateTime.fromMillisecondsSinceEpoch(0)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return FolderScan(
|
||||||
|
videos: videos,
|
||||||
|
hiddenCount: hidden,
|
||||||
|
hiddenExamples: examples,
|
||||||
|
subtitles: _sidecars(videos, subs),
|
||||||
|
truncated: truncated,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Subtitles in the same folder whose name is the video's base name,
|
||||||
|
/// optionally followed by `.lang` / `.forced` style suffixes.
|
||||||
|
Map<String, List<String>> _sidecars(List<VideoFile> videos, List<String> subs) {
|
||||||
|
final byStem = <String, List<String>>{};
|
||||||
|
for (final s in subs) {
|
||||||
|
final stem = _stripExtension(s);
|
||||||
|
byStem.putIfAbsent(stem, () => []).add(s);
|
||||||
|
// `Ep 01.en.ass`, `Ep 01.en.forced.ass`: also index the shorter stems.
|
||||||
|
var shorter = stem;
|
||||||
|
for (var i = 0; i < 2; i++) {
|
||||||
|
final dot = shorter.lastIndexOf('.');
|
||||||
|
if (dot <= shorter.lastIndexOf(RegExp(r'[/\\]')) + 1) break;
|
||||||
|
final suffix = shorter.substring(dot + 1);
|
||||||
|
// Language / flag tags only (en, eng, pt-BR, forced, sdh): a suffix
|
||||||
|
// with digits is part of the name (`Show.S01E01.srt` is not `Show`'s).
|
||||||
|
if (!RegExp(r'^[A-Za-z]{2,8}(-[A-Za-z]{2,4})?$').hasMatch(suffix)) break;
|
||||||
|
shorter = shorter.substring(0, dot);
|
||||||
|
byStem.putIfAbsent(shorter, () => []).add(s);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
for (final v in videos)
|
||||||
|
if (byStem[_stripExtension(v.path)] case final list?)
|
||||||
|
v.path: (list.toSet().toList()..sort()),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One show: its episodes in season/episode order plus its extras
|
||||||
|
/// (NCOP, OVA...) in name order.
|
||||||
|
class SeriesGroup {
|
||||||
|
/// Display title: the most common spelling among the files.
|
||||||
|
final String title;
|
||||||
|
final String key;
|
||||||
|
final List<VideoFile> episodes;
|
||||||
|
final List<VideoFile> extras;
|
||||||
|
const SeriesGroup(this.title, this.key, this.episodes, this.extras);
|
||||||
|
|
||||||
|
/// Distinct seasons, ascending; files without one count as season 1.
|
||||||
|
List<int> get seasons =>
|
||||||
|
({for (final e in episodes) e.parsed.season ?? 1}.toList()..sort());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [groupBySeries] result: shows, and videos that are not episodes.
|
||||||
|
class GroupedVideos {
|
||||||
|
final List<SeriesGroup> series;
|
||||||
|
final List<VideoFile> loose;
|
||||||
|
const GroupedVideos(this.series, this.loose);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Groups videos with an episode number (or an extra marker) by
|
||||||
|
/// [ParsedName.seriesKey]; the rest (movies, clips) stay loose, by name.
|
||||||
|
/// An extra whose series has no episodes in the list is loose too.
|
||||||
|
GroupedVideos groupBySeries(Iterable<VideoFile> videos) {
|
||||||
|
final episodes = <String, List<VideoFile>>{};
|
||||||
|
final extras = <String, List<VideoFile>>{};
|
||||||
|
final loose = <VideoFile>[];
|
||||||
|
for (final v in videos) {
|
||||||
|
final p = v.parsed;
|
||||||
|
final key = p.seriesKey;
|
||||||
|
if (p.episode != null && key.isNotEmpty) {
|
||||||
|
episodes.putIfAbsent(key, () => []).add(v);
|
||||||
|
} else if (p.extra != null && key.isNotEmpty) {
|
||||||
|
extras.putIfAbsent(key, () => []).add(v);
|
||||||
|
} else {
|
||||||
|
loose.add(v);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (final e in extras.entries) {
|
||||||
|
if (!episodes.containsKey(e.key)) loose.addAll(e.value);
|
||||||
|
}
|
||||||
|
int byName(VideoFile a, VideoFile b) =>
|
||||||
|
a.name.toLowerCase().compareTo(b.name.toLowerCase());
|
||||||
|
final groups = [
|
||||||
|
for (final e in episodes.entries)
|
||||||
|
SeriesGroup(
|
||||||
|
_commonTitle(e.value),
|
||||||
|
e.key,
|
||||||
|
e.value..sort(_byEpisode),
|
||||||
|
(extras[e.key] ?? [])..sort(byName),
|
||||||
|
),
|
||||||
|
]..sort((a, b) => a.title.toLowerCase().compareTo(b.title.toLowerCase()));
|
||||||
|
return GroupedVideos(groups, loose..sort(byName));
|
||||||
|
}
|
||||||
|
|
||||||
|
int _byEpisode(VideoFile a, VideoFile b) {
|
||||||
|
final pa = a.parsed, pb = b.parsed;
|
||||||
|
final s = (pa.season ?? 1).compareTo(pb.season ?? 1);
|
||||||
|
if (s != 0) return s;
|
||||||
|
final e = pa.episode!.compareTo(pb.episode!);
|
||||||
|
if (e != 0) return e;
|
||||||
|
// Same episode twice (v2, another group): newest release first.
|
||||||
|
return b.name.compareTo(a.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _commonTitle(List<VideoFile> files) {
|
||||||
|
final counts = <String, int>{};
|
||||||
|
for (final f in files) {
|
||||||
|
counts.update(f.parsed.series, (n) => n + 1, ifAbsent: () => 1);
|
||||||
|
}
|
||||||
|
return counts.entries
|
||||||
|
.reduce((a, b) => b.value > a.value ? b : a)
|
||||||
|
.key;
|
||||||
|
}
|
||||||
|
|
||||||
|
String _baseName(String path) {
|
||||||
|
final i = path.lastIndexOf(RegExp(r'[/\\]'));
|
||||||
|
return i < 0 ? path : path.substring(i + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _extension(String name) {
|
||||||
|
final dot = name.lastIndexOf('.');
|
||||||
|
return dot <= 0 ? '' : name.substring(dot + 1).toLowerCase();
|
||||||
|
}
|
||||||
|
|
||||||
|
String _stripExtension(String path) {
|
||||||
|
final dot = path.lastIndexOf('.');
|
||||||
|
final sep = path.lastIndexOf(RegExp(r'[/\\]'));
|
||||||
|
return dot > sep + 1 ? path.substring(0, dot) : path;
|
||||||
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:crypto/crypto.dart';
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:media_kit/media_kit.dart';
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
|
||||||
|
// Poster frames for the Files source, made by mpv itself (no ffmpeg on
|
||||||
|
// users' machines; Windows ships only libmpv). A hidden player per file
|
||||||
|
// with `vo=null`: mpv still keeps the last decoded frame, so
|
||||||
|
// `screenshot-to-file` encodes it with mpv's own JPEG writer. `start=25%`
|
||||||
|
// makes the first decoded frame the one we want, `vf=scale` keeps it
|
||||||
|
// small. Results (and failures) are cached on disk by path+size+mtime.
|
||||||
|
|
||||||
|
class Thumbnail {
|
||||||
|
/// JPEG on disk, at most [thumbnailWidth] wide.
|
||||||
|
final String imagePath;
|
||||||
|
final Duration duration;
|
||||||
|
const Thumbnail(this.imagePath, this.duration);
|
||||||
|
}
|
||||||
|
|
||||||
|
const thumbnailWidth = 480;
|
||||||
|
|
||||||
|
/// Where thumbnails are cached; swapped in tests.
|
||||||
|
Future<Directory> Function() thumbnailCacheRoot = getApplicationCacheDirectory;
|
||||||
|
|
||||||
|
/// Generations running at once: each is a full decoder.
|
||||||
|
const _maxConcurrent = 2;
|
||||||
|
const _timeout = Duration(seconds: 20);
|
||||||
|
|
||||||
|
int _running = 0;
|
||||||
|
final _waiting = <Completer<void>>[];
|
||||||
|
final _inFlight = <String, Future<Thumbnail?>>{};
|
||||||
|
|
||||||
|
/// The cached or freshly made thumbnail of the video at [path], or null
|
||||||
|
/// when it can't be made (not a video, unreadable, timed out, cancelled).
|
||||||
|
/// Never throws. [cancelled] is checked while queued and before the
|
||||||
|
/// expensive steps: a scrolled-away tile returns null without decoding.
|
||||||
|
Future<Thumbnail?> thumbnailFor(String path, {bool Function()? cancelled}) {
|
||||||
|
final existing = _inFlight[path];
|
||||||
|
if (existing != null) return existing;
|
||||||
|
final f = _thumbnailFor(path, cancelled ?? () => false).catchError((
|
||||||
|
Object e,
|
||||||
|
StackTrace st,
|
||||||
|
) {
|
||||||
|
debugPrint('thumbnail $path failed: $e\n$st');
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
_inFlight[path] = f;
|
||||||
|
f.whenComplete(() => _inFlight.remove(path));
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Cache key: the same file at the same size and mtime reuses its frame.
|
||||||
|
String thumbnailKey(String path, int size, DateTime modified) => sha1
|
||||||
|
.convert(utf8.encode('$path|$size|${modified.millisecondsSinceEpoch}'))
|
||||||
|
.toString();
|
||||||
|
|
||||||
|
Future<Thumbnail?> _thumbnailFor(String path, bool Function() cancelled) async {
|
||||||
|
final stat = await File(path).stat();
|
||||||
|
if (stat.type != FileSystemEntityType.file) return null;
|
||||||
|
final dir = Directory(
|
||||||
|
'${(await thumbnailCacheRoot()).path}${Platform.pathSeparator}thumbnails');
|
||||||
|
await dir.create(recursive: true);
|
||||||
|
final base =
|
||||||
|
'${dir.path}${Platform.pathSeparator}${thumbnailKey(path, stat.size, stat.modified)}';
|
||||||
|
final cached = await _readCache(base);
|
||||||
|
if (cached != null) return cached.$1;
|
||||||
|
|
||||||
|
if (cancelled()) return null;
|
||||||
|
await _acquire();
|
||||||
|
try {
|
||||||
|
if (cancelled()) return null;
|
||||||
|
final made = await _generate(path, '$base.jpg', cancelled)
|
||||||
|
.timeout(_timeout, onTimeout: () => null);
|
||||||
|
if (made == null) {
|
||||||
|
// Remember broken files, not cancellations.
|
||||||
|
if (!cancelled()) await File('$base.json').writeAsString('{}');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
await File('$base.json')
|
||||||
|
.writeAsString(jsonEncode({'ms': made.duration.inMilliseconds}));
|
||||||
|
return made;
|
||||||
|
} finally {
|
||||||
|
_release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// (thumbnail or null for a remembered failure), or null when not cached.
|
||||||
|
Future<(Thumbnail?,)?> _readCache(String base) async {
|
||||||
|
try {
|
||||||
|
final meta = File('$base.json');
|
||||||
|
if (!await meta.exists()) return null;
|
||||||
|
final ms = (jsonDecode(await meta.readAsString()) as Map)['ms'];
|
||||||
|
if (ms is! int) return (null,);
|
||||||
|
final jpg = File('$base.jpg');
|
||||||
|
if (!await jpg.exists()) return null;
|
||||||
|
return (Thumbnail(jpg.path, Duration(milliseconds: ms)),);
|
||||||
|
} catch (_) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _acquire() async {
|
||||||
|
if (_running < _maxConcurrent) {
|
||||||
|
_running++;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final c = Completer<void>();
|
||||||
|
_waiting.add(c);
|
||||||
|
await c.future; // the releaser hands its slot over
|
||||||
|
}
|
||||||
|
|
||||||
|
void _release() {
|
||||||
|
if (_waiting.isNotEmpty) {
|
||||||
|
_waiting.removeAt(0).complete();
|
||||||
|
} else {
|
||||||
|
_running--;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Thumbnail?> _generate(
|
||||||
|
String path,
|
||||||
|
String out,
|
||||||
|
bool Function() cancelled,
|
||||||
|
) async {
|
||||||
|
final player = Player(
|
||||||
|
configuration: const PlayerConfiguration(
|
||||||
|
vo: 'null',
|
||||||
|
muted: true,
|
||||||
|
osc: false,
|
||||||
|
libass: false,
|
||||||
|
title: 'thumbnail',
|
||||||
|
bufferSize: 4 << 20,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
try {
|
||||||
|
final mpv = player.platform as NativePlayer;
|
||||||
|
for (final (k, v) in [
|
||||||
|
('ao', 'null'),
|
||||||
|
('aid', 'no'),
|
||||||
|
('sid', 'no'),
|
||||||
|
('vid', 'auto'), // media_kit starts with vid=no
|
||||||
|
('hwdec', 'no'),
|
||||||
|
('cache', 'no'),
|
||||||
|
('hr-seek', 'no'), // nearest keyframe is fine for a poster
|
||||||
|
('start', '25%'),
|
||||||
|
('vf', 'scale=w=$thumbnailWidth:h=-2'),
|
||||||
|
('screenshot-format', 'jpg'),
|
||||||
|
('screenshot-jpeg-quality', '85'),
|
||||||
|
('screenshot-tag-colorspace', 'no'),
|
||||||
|
]) {
|
||||||
|
await mpv.setProperty(k, v);
|
||||||
|
}
|
||||||
|
await player.open(Media(path), play: false);
|
||||||
|
final target = File(out);
|
||||||
|
final deadline = DateTime.now().add(_timeout);
|
||||||
|
while (DateTime.now().isBefore(deadline)) {
|
||||||
|
if (cancelled()) return null;
|
||||||
|
// Unreadable or no video (with aid=no, audio-only stops too): mpv
|
||||||
|
// drops the file and goes idle at once.
|
||||||
|
if (await mpv.getProperty('idle-active') == 'yes') return null;
|
||||||
|
// A frame is up once the video has a size and the seek is done.
|
||||||
|
final w = await mpv.getProperty('video-params/w');
|
||||||
|
final seeking = await mpv.getProperty('seeking');
|
||||||
|
if (w.isNotEmpty && w != '0' && seeking != 'yes') {
|
||||||
|
await mpv.command(['screenshot-to-file', out, 'video']);
|
||||||
|
if (await target.exists() && await target.length() > 0) {
|
||||||
|
final d = double.tryParse(await mpv.getProperty('duration')) ?? 0;
|
||||||
|
return Thumbnail(out, Duration(milliseconds: (d * 1000).round()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await Future.delayed(const Duration(milliseconds: 50));
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
} finally {
|
||||||
|
await player.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,330 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../../shell/avatar.dart';
|
||||||
|
import '../name_parser.dart';
|
||||||
|
import '../scanner.dart';
|
||||||
|
import 'thumb.dart';
|
||||||
|
|
||||||
|
// The Files page's rows and cards: a series header, an episode row (also
|
||||||
|
// used for Recent), a loose-video card, and the empty states.
|
||||||
|
|
||||||
|
/// What a play control is doing right now.
|
||||||
|
enum PlayState { idle, starting, playing }
|
||||||
|
|
||||||
|
/// Last path segment, ignoring trailing separators (`/media/anime/`).
|
||||||
|
String baseName(String path) {
|
||||||
|
final parts = path.split(RegExp(r'[/\\]')).where((p) => p.isNotEmpty).toList();
|
||||||
|
return parts.isEmpty ? path : parts.last;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Name of the folder [path] is in.
|
||||||
|
String parentName(String path) => baseName(File(path).parent.path);
|
||||||
|
|
||||||
|
/// Cleaned title of a loose video: `Title (2019)`.
|
||||||
|
String cleanTitle(ParsedName p) => p.year == null ? p.series : '${p.series} (${p.year})';
|
||||||
|
|
||||||
|
class SeriesHeader extends StatelessWidget {
|
||||||
|
final SeriesGroup group;
|
||||||
|
final ThumbCache thumbs;
|
||||||
|
/// Its episodes are listed below; [onTap] opens or closes them.
|
||||||
|
final bool expanded;
|
||||||
|
final VoidCallback? onTap;
|
||||||
|
const SeriesHeader(
|
||||||
|
{super.key, required this.group, required this.thumbs, this.expanded = true, this.onTap});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final first = group.episodes.first;
|
||||||
|
final n = group.episodes.length;
|
||||||
|
final extras = group.extras.length;
|
||||||
|
final detail = [
|
||||||
|
'$n ${n == 1 ? 'episode' : 'episodes'}',
|
||||||
|
if (extras > 0) '$extras ${extras == 1 ? 'extra' : 'extras'}',
|
||||||
|
?first.parsed.group,
|
||||||
|
].join(' · ');
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 14),
|
||||||
|
child: InkWell(
|
||||||
|
onTap: onTap,
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 4),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
child: ThumbBuilder(
|
||||||
|
cache: thumbs,
|
||||||
|
path: first.path,
|
||||||
|
builder: (context, t, _) => ThumbImage(t, width: 96, height: 54),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(group.title,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: Theme.of(context).textTheme.titleMedium),
|
||||||
|
Text(detail,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (onTap != null)
|
||||||
|
AnimatedRotation(
|
||||||
|
turns: expanded ? 0.5 : 0,
|
||||||
|
duration: const Duration(milliseconds: 200),
|
||||||
|
child: Icon(Icons.expand_more, color: scheme.onSurfaceVariant),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One file as a row: an episode under its series header, or a Recent
|
||||||
|
/// entry ([title] given, [indent] off).
|
||||||
|
class FileRow extends StatelessWidget {
|
||||||
|
final String path;
|
||||||
|
final String title;
|
||||||
|
final String subtitle;
|
||||||
|
/// Size text; null while unknown.
|
||||||
|
final String? size;
|
||||||
|
final PlayState state;
|
||||||
|
final ThumbCache thumbs;
|
||||||
|
/// Null disables the row.
|
||||||
|
final VoidCallback? onTap;
|
||||||
|
final bool indent;
|
||||||
|
final Widget? trailing;
|
||||||
|
const FileRow({
|
||||||
|
super.key,
|
||||||
|
required this.path,
|
||||||
|
required this.title,
|
||||||
|
required this.subtitle,
|
||||||
|
required this.size,
|
||||||
|
required this.state,
|
||||||
|
required this.thumbs,
|
||||||
|
required this.onTap,
|
||||||
|
this.indent = true,
|
||||||
|
this.trailing,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final playing = state == PlayState.playing;
|
||||||
|
final enabled = onTap != null;
|
||||||
|
final muted = scheme.onSurfaceVariant;
|
||||||
|
final icon = switch (state) {
|
||||||
|
PlayState.starting => const SizedBox.square(
|
||||||
|
dimension: 16, child: CircularProgressIndicator(strokeWidth: 2)),
|
||||||
|
PlayState.playing => Icon(Icons.graphic_eq, size: 20, color: scheme.primary),
|
||||||
|
PlayState.idle => Icon(Icons.play_circle_outline,
|
||||||
|
size: 20, color: enabled ? scheme.primary : scheme.onSurface.withValues(alpha: 0.38)),
|
||||||
|
};
|
||||||
|
return ThumbBuilder(
|
||||||
|
cache: thumbs,
|
||||||
|
path: path,
|
||||||
|
builder: (context, t, _) {
|
||||||
|
final duration = durationText(t);
|
||||||
|
final meta = [?duration, ?size].join(' · ');
|
||||||
|
return Material(
|
||||||
|
color: playing ? scheme.primary.withValues(alpha: 0.08) : Colors.transparent,
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
child: InkWell(
|
||||||
|
onTap: onTap,
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.fromLTRB(indent ? 20 : 4, 5, 8, 5),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: ThumbImage(t, width: 80, height: 45),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
SizedBox(width: 20, child: Center(child: icon)),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Flexible(
|
||||||
|
child: Text(
|
||||||
|
title,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
color: playing ? scheme.primary : null,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (playing) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Pill('now playing', scheme.primary),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Text(subtitle,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: muted, fontSize: 12)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (meta.isNotEmpty) ...[
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Text(meta, style: TextStyle(color: muted, fontSize: 12)),
|
||||||
|
],
|
||||||
|
?trailing,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Text under a [VideoCard]'s 16:9 frame (title up to two lines, size).
|
||||||
|
const videoCardTextHeight = 66.0;
|
||||||
|
|
||||||
|
/// A loose video (movie, clip): 16:9 frame with its duration, then the
|
||||||
|
/// cleaned title and size.
|
||||||
|
class VideoCard extends StatelessWidget {
|
||||||
|
final VideoFile video;
|
||||||
|
final PlayState state;
|
||||||
|
final ThumbCache thumbs;
|
||||||
|
final VoidCallback? onTap;
|
||||||
|
const VideoCard({
|
||||||
|
super.key,
|
||||||
|
required this.video,
|
||||||
|
required this.state,
|
||||||
|
required this.thumbs,
|
||||||
|
required this.onTap,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final playing = state == PlayState.playing;
|
||||||
|
return ThumbBuilder(
|
||||||
|
cache: thumbs,
|
||||||
|
path: video.path,
|
||||||
|
builder: (context, t, _) {
|
||||||
|
final duration = durationText(t);
|
||||||
|
return InkWell(
|
||||||
|
onTap: onTap,
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
AspectRatio(
|
||||||
|
aspectRatio: 16 / 9,
|
||||||
|
child: Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
border: Border.all(
|
||||||
|
color: playing ? scheme.primary : Colors.transparent,
|
||||||
|
width: 2,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
child: Stack(
|
||||||
|
fit: StackFit.expand,
|
||||||
|
children: [
|
||||||
|
ThumbImage(t),
|
||||||
|
if (duration != null)
|
||||||
|
Positioned(right: 6, bottom: 6, child: _Badge(duration)),
|
||||||
|
if (state != PlayState.idle)
|
||||||
|
Container(
|
||||||
|
color: Colors.black38,
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: state == PlayState.playing
|
||||||
|
? const Icon(Icons.graphic_eq, color: Colors.white, size: 32)
|
||||||
|
: const SizedBox.square(
|
||||||
|
dimension: 28,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
strokeWidth: 3, color: Colors.white)),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Flexible(
|
||||||
|
child: Text(
|
||||||
|
cleanTitle(video.parsed),
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(
|
||||||
|
fontWeight: FontWeight.w600,
|
||||||
|
fontSize: 13,
|
||||||
|
color: playing ? scheme.primary : null,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Text(formatSize(video.size),
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _Badge extends StatelessWidget {
|
||||||
|
final String text;
|
||||||
|
const _Badge(this.text);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1),
|
||||||
|
decoration: BoxDecoration(color: Colors.black87, borderRadius: BorderRadius.circular(4)),
|
||||||
|
child: Text(text, style: const TextStyle(color: Colors.white, fontSize: 11)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class FilesEmpty extends StatelessWidget {
|
||||||
|
final IconData icon;
|
||||||
|
final String title;
|
||||||
|
final String detail;
|
||||||
|
final Widget? action;
|
||||||
|
const FilesEmpty(this.icon, this.title, this.detail, {super.key, this.action});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 60, bottom: 20),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Icon(icon, size: 44, color: scheme.onSurfaceVariant),
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Text(title, style: Theme.of(context).textTheme.titleMedium, textAlign: TextAlign.center),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(detail, style: TextStyle(color: scheme.onSurfaceVariant), textAlign: TextAlign.center),
|
||||||
|
if (action != null) ...[const SizedBox(height: 14), action!],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,788 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:file_picker/file_picker.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
|
||||||
|
import '../../shell/motion.dart';
|
||||||
|
import '../../widgets/app_menu.dart';
|
||||||
|
import '../folder_store.dart';
|
||||||
|
import '../name_parser.dart';
|
||||||
|
import '../scanner.dart';
|
||||||
|
import 'file_tiles.dart';
|
||||||
|
import 'thumb.dart';
|
||||||
|
|
||||||
|
export 'thumb.dart' show ThumbnailLoader;
|
||||||
|
|
||||||
|
// The Files source: watched folders on the left (chips on top when
|
||||||
|
// narrow), the open one on the right grouped into series and loose
|
||||||
|
// videos, or Recent. A folder is scanned when first opened and on Rescan;
|
||||||
|
// scans are kept for the app session. Series start collapsed; the ones
|
||||||
|
// opened stay open for the app session. Playing goes through [onPlay].
|
||||||
|
|
||||||
|
/// Below this width the sidebar turns into chips above the list.
|
||||||
|
const filesNarrowWidth = 700.0;
|
||||||
|
|
||||||
|
/// Scans kept for the app session, by folder.
|
||||||
|
final _scans = <String, FolderScan>{};
|
||||||
|
final _running = <String, Future<FolderScan>>{};
|
||||||
|
String? _lastOpen;
|
||||||
|
/// Series opened this session, by `folder\nseries key`.
|
||||||
|
final _expanded = <String>{};
|
||||||
|
final _showRequests = ValueNotifier(0);
|
||||||
|
|
||||||
|
/// Opens [dir] (null: Recent) in the Files page: now if one is showing,
|
||||||
|
/// else when it next opens.
|
||||||
|
void showFilesFolder(String? dir) {
|
||||||
|
_lastOpen = dir;
|
||||||
|
_showRequests.value++;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Forgets the session's scans, open series and the open folder.
|
||||||
|
@visibleForTesting
|
||||||
|
void resetFilesPageSession() {
|
||||||
|
_scans.clear();
|
||||||
|
_running.clear();
|
||||||
|
_expanded.clear();
|
||||||
|
_lastOpen = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
class FilesPage extends StatefulWidget {
|
||||||
|
/// Nobody else watches (offline or solo): no relay notice.
|
||||||
|
final bool solo;
|
||||||
|
/// The file will stream from this computer through the server.
|
||||||
|
final bool relayed;
|
||||||
|
/// Plays [path] in the session; returns an error text, or null.
|
||||||
|
final Future<String?> Function(String path) onPlay;
|
||||||
|
/// Adds [path] to Up next (right-click on a video); null: no server.
|
||||||
|
final Future<String?> Function(String path, {bool next})? onAddToQueue;
|
||||||
|
final String? nowPlayingPath;
|
||||||
|
/// Defaults to [thumbnailFor].
|
||||||
|
final ThumbnailLoader? thumbnails;
|
||||||
|
/// Defaults to [scanFolder].
|
||||||
|
final Future<FolderScan> Function(String dir)? scan;
|
||||||
|
/// Defaults to [FolderStore.instance].
|
||||||
|
final FolderStore? store;
|
||||||
|
/// Default: the system folder / file dialogs.
|
||||||
|
final Future<String?> Function()? pickFolder;
|
||||||
|
final Future<String?> Function()? pickVideo;
|
||||||
|
|
||||||
|
const FilesPage({
|
||||||
|
super.key,
|
||||||
|
this.solo = false,
|
||||||
|
required this.relayed,
|
||||||
|
required this.onPlay,
|
||||||
|
this.onAddToQueue,
|
||||||
|
this.nowPlayingPath,
|
||||||
|
this.thumbnails,
|
||||||
|
this.scan,
|
||||||
|
this.store,
|
||||||
|
this.pickFolder,
|
||||||
|
this.pickVideo,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<FilesPage> createState() => _FilesPageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A scan grouped for display, made once per scan.
|
||||||
|
class _Library {
|
||||||
|
final GroupedVideos grouped;
|
||||||
|
final int subtitleFiles;
|
||||||
|
|
||||||
|
_Library(FolderScan scan)
|
||||||
|
: grouped = groupBySeries(scan.videos),
|
||||||
|
subtitleFiles = {for (final l in scan.subtitles.values) ...l}.length;
|
||||||
|
|
||||||
|
/// Series rows in order: a header (video null), then, for the series
|
||||||
|
/// [open] says, its episodes and extras.
|
||||||
|
List<(SeriesGroup, VideoFile?)> rows(bool Function(SeriesGroup g) open) => [
|
||||||
|
for (final g in grouped.series) ...[
|
||||||
|
(g, null),
|
||||||
|
if (open(g))
|
||||||
|
for (final v in [...g.episodes, ...g.extras]) (g, v),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
final _libraries = Expando<_Library>();
|
||||||
|
|
||||||
|
class _FilesPageState extends State<FilesPage> {
|
||||||
|
late final ThumbCache _thumbs =
|
||||||
|
widget.thumbnails == null ? ThumbCache.shared : ThumbCache(widget.thumbnails!);
|
||||||
|
FolderStore get _store => widget.store ?? FolderStore.instance;
|
||||||
|
|
||||||
|
/// Null: Recent.
|
||||||
|
String? _open = _lastOpen;
|
||||||
|
bool _showHidden = false;
|
||||||
|
String? _starting;
|
||||||
|
String? _error;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_showRequests.addListener(_shown);
|
||||||
|
_store.ensureLoaded().then((_) {
|
||||||
|
if (!mounted) return;
|
||||||
|
final open = _open;
|
||||||
|
if (open != null && !_store.folders.value.contains(open)) {
|
||||||
|
_select(null);
|
||||||
|
} else if (open != null) {
|
||||||
|
_scan(open);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_showRequests.removeListener(_shown);
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _shown() => _select(_lastOpen);
|
||||||
|
|
||||||
|
Future<FolderScan> _runScan(String dir) => (widget.scan ?? scanFolder)(dir);
|
||||||
|
|
||||||
|
void _select(String? dir) {
|
||||||
|
setState(() {
|
||||||
|
_open = _lastOpen = dir;
|
||||||
|
_showHidden = false;
|
||||||
|
});
|
||||||
|
if (dir != null && !_scans.containsKey(dir)) _scan(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _scan(String dir, {bool rescan = false}) async {
|
||||||
|
var f = _running[dir];
|
||||||
|
if (f == null || rescan) {
|
||||||
|
f = _running[dir] = _runScan(dir);
|
||||||
|
if (rescan) _thumbs.forget([for (final v in _scans[dir]?.videos ?? const <VideoFile>[]) v.path]);
|
||||||
|
}
|
||||||
|
if (mounted) setState(() {});
|
||||||
|
FolderScan result;
|
||||||
|
try {
|
||||||
|
result = await f;
|
||||||
|
} catch (_) {
|
||||||
|
result = FolderScan.empty;
|
||||||
|
}
|
||||||
|
if (_running[dir] == f) {
|
||||||
|
_running.remove(dir);
|
||||||
|
_scans[dir] = result;
|
||||||
|
}
|
||||||
|
if (mounted) setState(() {});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _addFolder() async {
|
||||||
|
String? dir;
|
||||||
|
try {
|
||||||
|
dir = await (widget.pickFolder ??
|
||||||
|
() => FilePicker.getDirectoryPath(dialogTitle: 'Add a folder with videos'))();
|
||||||
|
} catch (e) {
|
||||||
|
_showError('Folder dialog unavailable (${e.runtimeType})');
|
||||||
|
}
|
||||||
|
if (dir == null || !mounted) return;
|
||||||
|
_store.addFolder(dir);
|
||||||
|
_select(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _browse() async {
|
||||||
|
String? path;
|
||||||
|
try {
|
||||||
|
path = await (widget.pickVideo ?? _pickVideo)();
|
||||||
|
} catch (e) {
|
||||||
|
_showError('File dialog unavailable (${e.runtimeType})');
|
||||||
|
}
|
||||||
|
if (path != null && mounted) await _play(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<String?> _pickVideo() async {
|
||||||
|
final files = await FilePicker.pickFiles(
|
||||||
|
dialogTitle: 'Pick a video',
|
||||||
|
type: FileType.custom,
|
||||||
|
allowedExtensions: videoExtensions.toList(),
|
||||||
|
);
|
||||||
|
return files.isEmpty ? null : files.first.path;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _removeFolder(String dir) {
|
||||||
|
_store.removeFolder(dir);
|
||||||
|
_scans.remove(dir);
|
||||||
|
if (_open == dir) _select(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _play(String path) async {
|
||||||
|
if (_starting != null) return;
|
||||||
|
setState(() {
|
||||||
|
_starting = path;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
error = await widget.onPlay(path);
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
if (error == null) _store.addRecent(path);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_starting = null;
|
||||||
|
_error = error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _showError(String text) {
|
||||||
|
if (mounted) setState(() => _error = text);
|
||||||
|
}
|
||||||
|
|
||||||
|
PlayState _stateOf(String path) => path == _starting
|
||||||
|
? PlayState.starting
|
||||||
|
: path == widget.nowPlayingPath
|
||||||
|
? PlayState.playing
|
||||||
|
: PlayState.idle;
|
||||||
|
|
||||||
|
VoidCallback _tapOf(String path) => () => _play(path);
|
||||||
|
|
||||||
|
/// Right-click on a video ([context]: its tile): Put it up, Add to
|
||||||
|
/// queue, Play next.
|
||||||
|
Future<void> _menu(BuildContext context, String path) async {
|
||||||
|
final add = widget.onAddToQueue;
|
||||||
|
if (add == null) return;
|
||||||
|
final pick = await showAppMenu<int>(context, items: [
|
||||||
|
AppMenuItem(value: 0, label: widget.solo ? 'Play' : 'Put it up'),
|
||||||
|
const AppMenuItem(value: 1, label: 'Add to queue'),
|
||||||
|
const AppMenuItem(value: 2, label: 'Play next'),
|
||||||
|
]);
|
||||||
|
if (pick == null || !mounted) return;
|
||||||
|
if (pick == 0) return _play(path);
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
error = await add(path, next: pick == 2);
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
if (error != null) _showError(error);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [child] with the right-click menu (when there is a server).
|
||||||
|
Widget _menuable(String path, Widget child) => widget.onAddToQueue == null
|
||||||
|
? child
|
||||||
|
: KeyedSubtree(
|
||||||
|
key: ValueKey('menu:$path'),
|
||||||
|
child: Builder(
|
||||||
|
builder: (context) => GestureDetector(onSecondaryTap: () => _menu(context, path), child: child)));
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => LayoutBuilder(
|
||||||
|
builder: (context, box) {
|
||||||
|
final narrow = box.maxWidth < filesNarrowWidth;
|
||||||
|
return SignalBuilder(builder: (context) {
|
||||||
|
final folders = _store.folders.value;
|
||||||
|
final recent = _store.recent.value;
|
||||||
|
final open = _open != null && folders.contains(_open) ? _open : null;
|
||||||
|
final main = fadeThrough(
|
||||||
|
KeyedSubtree(
|
||||||
|
key: ValueKey(open ?? ''),
|
||||||
|
child: _main(context, narrow, folders, recent, open),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (narrow) return main;
|
||||||
|
return Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SizedBox(width: 260, child: _sidebar(context, folders, open)),
|
||||||
|
Expanded(child: main),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
Widget _browseButton(Widget Function(VoidCallback? onPressed) build) => build(_browse);
|
||||||
|
|
||||||
|
Widget _sidebar(BuildContext context, List<String> folders, String? open) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final shape = RoundedRectangleBorder(borderRadius: BorderRadius.circular(10));
|
||||||
|
return ListView(
|
||||||
|
padding: const EdgeInsets.fromLTRB(20, 20, 8, 20),
|
||||||
|
children: [
|
||||||
|
const Text('Folders', style: TextStyle(fontWeight: FontWeight.w600)),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
ListTile(
|
||||||
|
dense: true,
|
||||||
|
selected: open == null,
|
||||||
|
shape: shape,
|
||||||
|
leading: const Icon(Icons.history, size: 18),
|
||||||
|
title: const Text('Recent'),
|
||||||
|
onTap: () => _select(null),
|
||||||
|
),
|
||||||
|
for (final f in folders)
|
||||||
|
ListTile(
|
||||||
|
key: ValueKey('folder:$f'),
|
||||||
|
dense: true,
|
||||||
|
selected: open == f,
|
||||||
|
shape: shape,
|
||||||
|
leading: const Icon(Icons.folder_outlined, size: 18),
|
||||||
|
title: Text(baseName(f), maxLines: 1, overflow: TextOverflow.ellipsis),
|
||||||
|
subtitle: switch (_folderStatus(f)) {
|
||||||
|
final s? => Text(s, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 11)),
|
||||||
|
null => null,
|
||||||
|
},
|
||||||
|
trailing: IconButton(
|
||||||
|
tooltip: 'Remove folder',
|
||||||
|
icon: const Icon(Icons.close, size: 16),
|
||||||
|
onPressed: () => _removeFolder(f),
|
||||||
|
),
|
||||||
|
onTap: () => _select(f),
|
||||||
|
),
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: TextButton.icon(
|
||||||
|
onPressed: _addFolder,
|
||||||
|
icon: const Icon(Icons.add, size: 18),
|
||||||
|
label: const Text('Add folder'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const Divider(),
|
||||||
|
_browseButton((onPressed) => OutlinedButton.icon(
|
||||||
|
onPressed: onPressed,
|
||||||
|
icon: const Icon(Icons.folder_open, size: 18),
|
||||||
|
label: const Text('Browse…'),
|
||||||
|
)),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
'The system file picker, for anything outside your folders.',
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 11),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "scanning…", "N videos", or null before the first scan.
|
||||||
|
String? _folderStatus(String dir) {
|
||||||
|
if (_running.containsKey(dir)) return 'scanning…';
|
||||||
|
final n = _scans[dir]?.videos.length;
|
||||||
|
return n == null ? null : '$n ${n == 1 ? 'video' : 'videos'}';
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _main(
|
||||||
|
BuildContext context,
|
||||||
|
bool narrow,
|
||||||
|
List<String> folders,
|
||||||
|
List<String> recent,
|
||||||
|
String? open,
|
||||||
|
) {
|
||||||
|
final scan = open == null ? null : _scans[open];
|
||||||
|
final scanning = open != null && _running.containsKey(open);
|
||||||
|
final top = <Widget>[
|
||||||
|
_header(context, open),
|
||||||
|
if (narrow) _chips(folders, open),
|
||||||
|
if (!widget.solo && widget.relayed) const _RelayNotice(),
|
||||||
|
AnimatedSize(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
alignment: Alignment.topLeft,
|
||||||
|
child: _error == null
|
||||||
|
? const SizedBox(width: double.infinity)
|
||||||
|
: _ErrorBanner(_error!, onClose: () => setState(() => _error = null)),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
final slivers = <Widget>[
|
||||||
|
SliverList.list(children: top),
|
||||||
|
if (open == null)
|
||||||
|
..._recent(context, recent)
|
||||||
|
else if (scan == null)
|
||||||
|
const SliverToBoxAdapter(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.only(top: 60),
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
..._folder(context, open, scan, scanning),
|
||||||
|
];
|
||||||
|
return CustomScrollView(
|
||||||
|
slivers: [
|
||||||
|
SliverPadding(
|
||||||
|
padding: EdgeInsets.fromLTRB(narrow ? 20 : 12, 20, 20, 20),
|
||||||
|
sliver: SliverMainAxisGroup(slivers: slivers),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _header(BuildContext context, String? open) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: 14),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Icon(open == null ? Icons.history : Icons.folder, color: scheme.primary),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
open == null ? 'Recent' : baseName(open),
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
|
),
|
||||||
|
if (open != null)
|
||||||
|
Text(
|
||||||
|
open,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _chips(List<String> folders, String? open) => Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: 14),
|
||||||
|
child: Wrap(
|
||||||
|
spacing: 8,
|
||||||
|
runSpacing: 8,
|
||||||
|
children: [
|
||||||
|
ChoiceChip(
|
||||||
|
label: const Text('Recent'),
|
||||||
|
selected: open == null,
|
||||||
|
onSelected: (_) => _select(null),
|
||||||
|
),
|
||||||
|
for (final f in folders)
|
||||||
|
// InputChip: selectable like the others, plus the remove x
|
||||||
|
// the sidebar has.
|
||||||
|
InputChip(
|
||||||
|
key: ValueKey('chip:$f'),
|
||||||
|
label: Text(baseName(f)),
|
||||||
|
selected: open == f,
|
||||||
|
onSelected: (_) => _select(f),
|
||||||
|
onDeleted: () => _removeFolder(f),
|
||||||
|
deleteButtonTooltipMessage: 'Remove folder',
|
||||||
|
),
|
||||||
|
ActionChip(
|
||||||
|
avatar: const Icon(Icons.add, size: 16),
|
||||||
|
label: const Text('Folder'),
|
||||||
|
onPressed: _addFolder,
|
||||||
|
),
|
||||||
|
_browseButton((onPressed) => ActionChip(
|
||||||
|
avatar: const Icon(Icons.folder_open, size: 16),
|
||||||
|
label: const Text('Browse…'),
|
||||||
|
onPressed: onPressed,
|
||||||
|
)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
List<Widget> _recent(BuildContext context, List<String> recent) {
|
||||||
|
if (recent.isEmpty) {
|
||||||
|
return [
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: FilesEmpty(
|
||||||
|
Icons.video_library_outlined,
|
||||||
|
'Nothing played yet',
|
||||||
|
'Add a folder with your videos, or Browse for a single file.',
|
||||||
|
action: FilledButton.icon(
|
||||||
|
onPressed: _addFolder,
|
||||||
|
icon: const Icon(Icons.create_new_folder_outlined),
|
||||||
|
label: const Text('Add folder'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
SliverList.builder(
|
||||||
|
itemCount: recent.length,
|
||||||
|
itemBuilder: (context, i) {
|
||||||
|
final path = recent[i];
|
||||||
|
return _menuable(
|
||||||
|
path,
|
||||||
|
_RecentRow(
|
||||||
|
key: ValueKey(path),
|
||||||
|
path: path,
|
||||||
|
state: _stateOf(path),
|
||||||
|
thumbs: _thumbs,
|
||||||
|
onTap: _tapOf(path),
|
||||||
|
onRemove: () => _store.removeRecent(path),
|
||||||
|
));
|
||||||
|
},
|
||||||
|
),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
List<Widget> _folder(BuildContext context, String dir, FolderScan scan, bool scanning) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final lib = _libraries[scan] ??= _Library(scan);
|
||||||
|
final series = lib.grouped.series.length;
|
||||||
|
String count(int n, String one, String many) => '$n ${n == 1 ? one : many}';
|
||||||
|
final summary = [
|
||||||
|
count(scan.videos.length, 'video', 'videos') + (series > 0 ? ' in $series series' : ''),
|
||||||
|
if (scan.hiddenCount > 0)
|
||||||
|
'${count(scan.hiddenCount, 'other file', 'other files')} hidden',
|
||||||
|
if (lib.subtitleFiles > 0) count(lib.subtitleFiles, 'subtitle file', 'subtitle files'),
|
||||||
|
if (scan.truncated) 'stopped after $maxScannedFiles files',
|
||||||
|
].join(' · ');
|
||||||
|
final loose = lib.grouped.loose;
|
||||||
|
String seriesId(SeriesGroup g) => '$dir\n${g.key}';
|
||||||
|
final rows = lib.rows((g) => _expanded.contains(seriesId(g)));
|
||||||
|
return [
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Wrap(
|
||||||
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
|
children: [
|
||||||
|
Icon(Icons.filter_alt_outlined, size: 16, color: scheme.onSurfaceVariant),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Text(summary, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
if (scan.hiddenCount > 0) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => setState(() => _showHidden = !_showHidden),
|
||||||
|
child: Text(_showHidden ? 'Hide them' : 'Show some'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
TextButton.icon(
|
||||||
|
onPressed: scanning ? null : () => _scan(dir, rescan: true),
|
||||||
|
icon: scanning
|
||||||
|
? const SizedBox.square(
|
||||||
|
dimension: 14, child: CircularProgressIndicator(strokeWidth: 2))
|
||||||
|
: const Icon(Icons.refresh, size: 16),
|
||||||
|
label: Text(scanning ? 'Scanning…' : 'Rescan'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: AnimatedSize(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
alignment: Alignment.topLeft,
|
||||||
|
child: !_showHidden
|
||||||
|
? const SizedBox(width: double.infinity)
|
||||||
|
: Column(
|
||||||
|
children: [
|
||||||
|
for (final f in scan.hiddenExamples)
|
||||||
|
ListTile(
|
||||||
|
dense: true,
|
||||||
|
enabled: false,
|
||||||
|
leading: const Icon(Icons.insert_drive_file_outlined, size: 18),
|
||||||
|
title: Text(f, maxLines: 1, overflow: TextOverflow.ellipsis),
|
||||||
|
trailing: Text(
|
||||||
|
kindOf(f) == FileKind.video ? 'sample' : 'not a video',
|
||||||
|
style: const TextStyle(fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (scan.hiddenCount > scan.hiddenExamples.length)
|
||||||
|
ListTile(
|
||||||
|
dense: true,
|
||||||
|
enabled: false,
|
||||||
|
title: Text('and ${scan.hiddenCount - scan.hiddenExamples.length} more'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (scan.videos.isEmpty)
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Directory(dir).existsSync()
|
||||||
|
? const FilesEmpty(
|
||||||
|
Icons.search_off,
|
||||||
|
'No videos here',
|
||||||
|
'Only video files are listed (mkv, mp4, webm…).',
|
||||||
|
)
|
||||||
|
: const FilesEmpty(
|
||||||
|
Icons.folder_off_outlined,
|
||||||
|
'Folder not found',
|
||||||
|
'It may have been moved, renamed or be on a drive that is not connected.',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Series: files whose names carry an episode number; a header
|
||||||
|
// click opens or closes its episodes.
|
||||||
|
SliverList.builder(
|
||||||
|
itemCount: rows.length,
|
||||||
|
itemBuilder: (context, i) {
|
||||||
|
final (group, v) = rows[i];
|
||||||
|
if (v == null) {
|
||||||
|
final id = seriesId(group);
|
||||||
|
return SeriesHeader(
|
||||||
|
key: ValueKey('series:${group.key}'),
|
||||||
|
group: group,
|
||||||
|
thumbs: _thumbs,
|
||||||
|
expanded: _expanded.contains(id),
|
||||||
|
onTap: () => setState(() => _expanded.contains(id) ? _expanded.remove(id) : _expanded.add(id)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return _menuable(
|
||||||
|
v.path,
|
||||||
|
FileRow(
|
||||||
|
key: ValueKey(v.path),
|
||||||
|
path: v.path,
|
||||||
|
title: v.parsed.label.isEmpty ? v.parsed.series : v.parsed.label,
|
||||||
|
subtitle: v.name,
|
||||||
|
size: formatSize(v.size),
|
||||||
|
state: _stateOf(v.path),
|
||||||
|
thumbs: _thumbs,
|
||||||
|
onTap: _tapOf(v.path),
|
||||||
|
));
|
||||||
|
},
|
||||||
|
),
|
||||||
|
// Everything else (movies, clips) as a thumbnail grid.
|
||||||
|
if (loose.isNotEmpty) ...[
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 22, bottom: 10),
|
||||||
|
child: Text(
|
||||||
|
series == 0 ? 'Videos' : 'Other videos',
|
||||||
|
style: Theme.of(context).textTheme.titleMedium,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SliverLayoutBuilder(builder: (context, c) {
|
||||||
|
const gap = 12.0;
|
||||||
|
final w = c.crossAxisExtent;
|
||||||
|
final cols = (w / 240).floor().clamp(2, 8);
|
||||||
|
final cardW = (w - gap * (cols - 1)) / cols;
|
||||||
|
return SliverGrid.builder(
|
||||||
|
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: cols,
|
||||||
|
mainAxisSpacing: gap,
|
||||||
|
crossAxisSpacing: gap,
|
||||||
|
mainAxisExtent: cardW * 9 / 16 + videoCardTextHeight,
|
||||||
|
),
|
||||||
|
itemCount: loose.length,
|
||||||
|
itemBuilder: (context, i) {
|
||||||
|
final v = loose[i];
|
||||||
|
return _menuable(
|
||||||
|
v.path,
|
||||||
|
VideoCard(
|
||||||
|
key: ValueKey(v.path),
|
||||||
|
video: v,
|
||||||
|
state: _stateOf(v.path),
|
||||||
|
thumbs: _thumbs,
|
||||||
|
onTap: _tapOf(v.path),
|
||||||
|
));
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A Recent entry: `Series · S01E03` over the file name, or the cleaned
|
||||||
|
/// title over its folder; greyed when the file is gone.
|
||||||
|
class _RecentRow extends StatefulWidget {
|
||||||
|
final String path;
|
||||||
|
final PlayState state;
|
||||||
|
final ThumbCache thumbs;
|
||||||
|
final VoidCallback? onTap;
|
||||||
|
final VoidCallback onRemove;
|
||||||
|
const _RecentRow({
|
||||||
|
super.key,
|
||||||
|
required this.path,
|
||||||
|
required this.state,
|
||||||
|
required this.thumbs,
|
||||||
|
required this.onTap,
|
||||||
|
required this.onRemove,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<_RecentRow> createState() => _RecentRowState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _RecentRowState extends State<_RecentRow> {
|
||||||
|
FileStat? _stat;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
File(widget.path).stat().then((s) {
|
||||||
|
if (mounted) setState(() => _stat = s);
|
||||||
|
}, onError: (Object _) {});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final path = widget.path;
|
||||||
|
final p = parseReleaseName(baseName(path));
|
||||||
|
final missing = _stat?.type == FileSystemEntityType.notFound;
|
||||||
|
final episode = p.episode != null || p.extra != null;
|
||||||
|
return FileRow(
|
||||||
|
path: path,
|
||||||
|
title: episode ? '${p.series} · ${p.label}' : cleanTitle(p),
|
||||||
|
subtitle: missing ? 'File not found' : (episode ? baseName(path) : parentName(path)),
|
||||||
|
size: _stat == null || missing ? null : formatSize(_stat!.size),
|
||||||
|
state: widget.state,
|
||||||
|
thumbs: widget.thumbs,
|
||||||
|
onTap: missing ? null : widget.onTap,
|
||||||
|
indent: false,
|
||||||
|
trailing: IconButton(
|
||||||
|
tooltip: 'Remove from recent',
|
||||||
|
icon: const Icon(Icons.close, size: 16),
|
||||||
|
onPressed: widget.onRemove,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _RelayNotice extends StatelessWidget {
|
||||||
|
const _RelayNotice();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => Container(
|
||||||
|
padding: const EdgeInsets.all(10),
|
||||||
|
margin: const EdgeInsets.only(bottom: 16),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.lightBlueAccent.withValues(alpha: 0.08),
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
),
|
||||||
|
child: const Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.cell_tower, size: 18, color: Colors.lightBlueAccent),
|
||||||
|
SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
'Files stream from this computer through the server. '
|
||||||
|
'Keep the app open while it plays.',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ErrorBanner extends StatelessWidget {
|
||||||
|
final String text;
|
||||||
|
final VoidCallback onClose;
|
||||||
|
const _ErrorBanner(this.text, {required this.onClose});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Container(
|
||||||
|
padding: const EdgeInsets.fromLTRB(10, 4, 4, 4),
|
||||||
|
margin: const EdgeInsets.only(bottom: 16),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: scheme.errorContainer,
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Icon(Icons.error_outline, size: 18, color: scheme.onErrorContainer),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(child: Text(text, style: TextStyle(color: scheme.onErrorContainer))),
|
||||||
|
IconButton(
|
||||||
|
tooltip: 'Dismiss',
|
||||||
|
icon: Icon(Icons.close, size: 16, color: scheme.onErrorContainer),
|
||||||
|
onPressed: onClose,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,213 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../../shell/motion.dart';
|
||||||
|
import '../thumbnails.dart';
|
||||||
|
|
||||||
|
// Lazy poster frames for the Files page. A tile asks for its frame only
|
||||||
|
// after it has stayed on screen for a moment, so a fast scroll requests
|
||||||
|
// nothing; tiles sharing a file share one request, and the request is
|
||||||
|
// cancelled once no tile on screen wants it any more.
|
||||||
|
|
||||||
|
/// [thumbnailFor]'s shape; swapped in tests.
|
||||||
|
typedef ThumbnailLoader = Future<Thumbnail?> Function(String path, {bool Function()? cancelled});
|
||||||
|
|
||||||
|
/// A tile waits this long on screen before asking for its frame.
|
||||||
|
const thumbRequestDelay = Duration(milliseconds: 120);
|
||||||
|
|
||||||
|
/// Results of a [ThumbnailLoader] and who is waiting for them.
|
||||||
|
class ThumbCache {
|
||||||
|
final ThumbnailLoader load;
|
||||||
|
ThumbCache(this.load);
|
||||||
|
|
||||||
|
final _done = <String, Thumbnail?>{};
|
||||||
|
final _pending = <String, Future<Thumbnail?>>{};
|
||||||
|
final _waiting = <String, int>{};
|
||||||
|
|
||||||
|
/// Shared by every page using [thumbnailFor].
|
||||||
|
static final shared = ThumbCache(thumbnailFor);
|
||||||
|
|
||||||
|
bool has(String path) => _done.containsKey(path);
|
||||||
|
Thumbnail? cached(String path) => _done[path];
|
||||||
|
|
||||||
|
/// Pair every call with one [release].
|
||||||
|
Future<Thumbnail?> request(String path) {
|
||||||
|
_waiting.update(path, (n) => n + 1, ifAbsent: () => 1);
|
||||||
|
if (_done.containsKey(path)) return Future.value(_done[path]);
|
||||||
|
return _pending[path] ??= _start(path);
|
||||||
|
}
|
||||||
|
|
||||||
|
void release(String path) {
|
||||||
|
final n = (_waiting[path] ?? 0) - 1;
|
||||||
|
if (n > 0) {
|
||||||
|
_waiting[path] = n;
|
||||||
|
} else {
|
||||||
|
_waiting.remove(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Drops results, so the next request asks the loader again (rescan).
|
||||||
|
void forget(Iterable<String> paths) {
|
||||||
|
for (final p in paths) {
|
||||||
|
_done.remove(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Thumbnail?> _start(String path) {
|
||||||
|
var gaveUp = false;
|
||||||
|
return load(path, cancelled: () => gaveUp = !_waiting.containsKey(path))
|
||||||
|
.catchError((Object _) => null)
|
||||||
|
.then((t) {
|
||||||
|
if (t == null && gaveUp) {
|
||||||
|
// Cancelled: not a result. Someone may have come back meanwhile.
|
||||||
|
if (_waiting.containsKey(path)) return _start(path);
|
||||||
|
_pending.remove(path);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
_pending.remove(path);
|
||||||
|
_done[path] = t;
|
||||||
|
return t;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Builds with the frame of [path] (null while loading or when there is
|
||||||
|
/// none); [loaded] is false until the request finished.
|
||||||
|
class ThumbBuilder extends StatefulWidget {
|
||||||
|
final ThumbCache cache;
|
||||||
|
final String path;
|
||||||
|
final Widget Function(BuildContext context, Thumbnail? thumb, bool loaded) builder;
|
||||||
|
const ThumbBuilder({super.key, required this.cache, required this.path, required this.builder});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ThumbBuilder> createState() => _ThumbBuilderState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ThumbBuilderState extends State<ThumbBuilder> {
|
||||||
|
Thumbnail? _thumb;
|
||||||
|
bool _loaded = false;
|
||||||
|
Timer? _delay;
|
||||||
|
// The request held right now: its path, and a token so a late answer to
|
||||||
|
// an older request is ignored.
|
||||||
|
String? _holding;
|
||||||
|
Object? _token;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_begin();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(ThumbBuilder old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
if (old.path != widget.path || old.cache != widget.cache) {
|
||||||
|
_end(old.cache);
|
||||||
|
_begin();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_end(widget.cache);
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _begin() {
|
||||||
|
final cache = widget.cache, path = widget.path;
|
||||||
|
_loaded = cache.has(path);
|
||||||
|
_thumb = cache.cached(path);
|
||||||
|
if (_loaded) return;
|
||||||
|
_delay = Timer(thumbRequestDelay, () {
|
||||||
|
_delay = null;
|
||||||
|
_holding = path;
|
||||||
|
final token = _token = Object();
|
||||||
|
cache.request(path).then((t) {
|
||||||
|
if (_token != token) return;
|
||||||
|
_holding = _token = null;
|
||||||
|
cache.release(path);
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_thumb = t;
|
||||||
|
_loaded = true;
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _end(ThumbCache cache) {
|
||||||
|
_delay?.cancel();
|
||||||
|
_delay = null;
|
||||||
|
final held = _holding;
|
||||||
|
_holding = _token = null;
|
||||||
|
if (held != null) cache.release(held);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => widget.builder(context, _thumb, _loaded);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The frame, fading in over a placeholder.
|
||||||
|
class ThumbImage extends StatelessWidget {
|
||||||
|
final Thumbnail? thumb;
|
||||||
|
final double? width, height;
|
||||||
|
const ThumbImage(this.thumb, {super.key, this.width, this.height});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final placeholder = Container(
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
color: scheme.surfaceContainerHighest,
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Icon(Icons.movie_outlined, color: scheme.onSurfaceVariant, size: 20),
|
||||||
|
);
|
||||||
|
final t = thumb;
|
||||||
|
if (t == null) return placeholder;
|
||||||
|
final dpr = MediaQuery.devicePixelRatioOf(context);
|
||||||
|
return Stack(
|
||||||
|
fit: width == null ? StackFit.expand : StackFit.loose,
|
||||||
|
children: [
|
||||||
|
placeholder,
|
||||||
|
Image.file(
|
||||||
|
File(t.imagePath),
|
||||||
|
width: width,
|
||||||
|
height: height,
|
||||||
|
fit: BoxFit.cover,
|
||||||
|
cacheWidth: width == null ? null : (width! * dpr).round(),
|
||||||
|
gaplessPlayback: true,
|
||||||
|
errorBuilder: (_, _, _) => const SizedBox.shrink(),
|
||||||
|
frameBuilder: (context, child, frame, sync) => sync
|
||||||
|
? child
|
||||||
|
: AnimatedOpacity(
|
||||||
|
opacity: frame == null ? 0 : 1,
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
child: child,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `1:02:03` / `24:05`.
|
||||||
|
String formatDuration(Duration d) {
|
||||||
|
final h = d.inHours, m = d.inMinutes % 60, s = d.inSeconds % 60;
|
||||||
|
String two(int n) => n.toString().padLeft(2, '0');
|
||||||
|
return h > 0 ? '$h:${two(m)}:${two(s)}' : '${two(m)}:${two(s)}';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// `1.4 GB` / `350 MB` / `12 KB`.
|
||||||
|
String formatSize(int bytes) {
|
||||||
|
if (bytes >= 1 << 30) return '${(bytes / (1 << 30)).toStringAsFixed(1)} GB';
|
||||||
|
if (bytes >= 1 << 20) return '${(bytes / (1 << 20)).toStringAsFixed(0)} MB';
|
||||||
|
return '${(bytes / 1024).ceil()} KB';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The frame's duration, or null when unknown (no frame, 0 length).
|
||||||
|
String? durationText(Thumbnail? t) =>
|
||||||
|
t == null || t.duration <= Duration.zero ? null : formatDuration(t.duration);
|
||||||
@@ -8,8 +8,6 @@ import 'package:hive_ce/hive.dart';
|
|||||||
import 'package:sync_relay_core/core.dart';
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
import '../screens/home/picked_media.dart';
|
import '../screens/home/picked_media.dart';
|
||||||
import '../screens/home/ui.dart' show appName;
|
|
||||||
import '../update/updater.dart' show appVersion;
|
|
||||||
|
|
||||||
// Linked Jellyfin servers, one account per ServerId, in their own Hive box.
|
// Linked Jellyfin servers, one account per ServerId, in their own Hive box.
|
||||||
//
|
//
|
||||||
@@ -24,6 +22,7 @@ const _keyAccounts = 'accounts';
|
|||||||
const _keyDefault = 'defaultServer';
|
const _keyDefault = 'defaultServer';
|
||||||
const _keyLastPick = 'lastPick';
|
const _keyLastPick = 'lastPick';
|
||||||
const _keyBrowsePrefix = 'browse:';
|
const _keyBrowsePrefix = 'browse:';
|
||||||
|
const _keyDismissedPrefix = 'dismissed:';
|
||||||
|
|
||||||
/// One signed-in user on one server.
|
/// One signed-in user on one server.
|
||||||
class JellyfinAccount {
|
class JellyfinAccount {
|
||||||
@@ -195,6 +194,13 @@ class JellyfinAccounts extends ChangeNotifier {
|
|||||||
JellyfinAccount? account(String serverId) =>
|
JellyfinAccount? account(String serverId) =>
|
||||||
_accounts.where((a) => a.serverId == serverId).firstOrNull;
|
_accounts.where((a) => a.serverId == serverId).firstOrNull;
|
||||||
|
|
||||||
|
/// [itemId]'s page in the web UI of linked server [serverId] ("Open in
|
||||||
|
/// Jellyfin"); null when that server is not linked here.
|
||||||
|
String? webUrlOf(String serverId, String itemId) {
|
||||||
|
final a = account(serverId);
|
||||||
|
return a == null ? null : jellyfinWebUrl(a.baseUrl, itemId, serverId: serverId);
|
||||||
|
}
|
||||||
|
|
||||||
/// The chosen default, else the first linked server.
|
/// The chosen default, else the first linked server.
|
||||||
JellyfinAccount? get defaultAccount =>
|
JellyfinAccount? get defaultAccount =>
|
||||||
(_defaultServerId == null ? null : account(_defaultServerId!)) ?? _accounts.firstOrNull;
|
(_defaultServerId == null ? null : account(_defaultServerId!)) ?? _accounts.firstOrNull;
|
||||||
@@ -207,14 +213,15 @@ class JellyfinAccounts extends ChangeNotifier {
|
|||||||
/// Last failure text for an offline account.
|
/// Last failure text for an offline account.
|
||||||
String? errorOf(String serverId) => _errors[serverId];
|
String? errorOf(String serverId) => _errors[serverId];
|
||||||
|
|
||||||
/// The Host tab's last Jellyfin pick, restored on the next start.
|
/// The last Jellyfin pick put up, restored in the Library on the next start.
|
||||||
JellyfinMedia? get lastPick => _lastPick;
|
JellyfinMedia? get lastPick => _lastPick;
|
||||||
|
|
||||||
/// Stable per install: Jellyfin keys devices and tokens by it.
|
/// Stable per install: Jellyfin keys devices and tokens by it.
|
||||||
String get deviceId => _deviceId;
|
String get deviceId => _deviceId;
|
||||||
|
|
||||||
JellyfinClientInfo get clientInfo => JellyfinClientInfo(
|
JellyfinClientInfo get clientInfo => JellyfinClientInfo(
|
||||||
client: appName,
|
// The old name on purpose: Jellyfin lists devices under it.
|
||||||
|
client: 'Watch Together',
|
||||||
device: deviceName ?? _hostname(),
|
device: deviceName ?? _hostname(),
|
||||||
deviceId: _deviceId.isEmpty ? 'unknown' : _deviceId,
|
deviceId: _deviceId.isEmpty ? 'unknown' : _deviceId,
|
||||||
version: appVersion,
|
version: appVersion,
|
||||||
@@ -484,6 +491,38 @@ class JellyfinAccounts extends ChangeNotifier {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Continue-row entries removed by hand on [serverId] (key -> when), so a
|
||||||
|
/// next-up series (which Jellyfin cannot drop) stays out until it is
|
||||||
|
/// played again. Keys are `continueKey`s.
|
||||||
|
Map<String, DateTime> continueDismissed(String serverId) {
|
||||||
|
try {
|
||||||
|
final v = _store.get('$_keyDismissedPrefix$serverId');
|
||||||
|
final j = v is String ? _tryJson(v) : null;
|
||||||
|
if (j is! Map) return const {};
|
||||||
|
return {
|
||||||
|
for (final e in j.entries)
|
||||||
|
if (e.key is String && e.value is int)
|
||||||
|
e.key as String: DateTime.fromMillisecondsSinceEpoch(e.value as int, isUtc: true),
|
||||||
|
};
|
||||||
|
} catch (_) {
|
||||||
|
return const {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps [key] out of the Continue row on [serverId] until it is played
|
||||||
|
/// after [at] (default now). The newest 200 are kept.
|
||||||
|
Future<void> dismissContinue(String serverId, String key, {DateTime? at}) async {
|
||||||
|
final all = {...continueDismissed(serverId), key: (at ?? DateTime.now()).toUtc()};
|
||||||
|
final newest = all.entries.toList()..sort((a, b) => b.value.compareTo(a.value));
|
||||||
|
try {
|
||||||
|
await _store.put('$_keyDismissedPrefix$serverId', jsonEncode({
|
||||||
|
for (final e in newest.take(200)) e.key: e.value.millisecondsSinceEpoch,
|
||||||
|
}));
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('save dismissed continue failed: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------- cache
|
// --------------------------------------------------------------- cache
|
||||||
|
|
||||||
/// Short-lived memo for browse calls, so going back does not refetch.
|
/// Short-lived memo for browse calls, so going back does not refetch.
|
||||||
@@ -511,6 +550,17 @@ class JellyfinAccounts extends ChangeNotifier {
|
|||||||
/// Drops cached browse results (refresh button, after a pick).
|
/// Drops cached browse results (refresh button, after a pick).
|
||||||
void invalidate(String serverId) => _clearMemo(serverId);
|
void invalidate(String serverId) => _clearMemo(serverId);
|
||||||
|
|
||||||
|
final _watched = StreamController<String>.broadcast();
|
||||||
|
|
||||||
|
/// Server ids whose watched state this app just changed (a stop report):
|
||||||
|
/// their cached lists are gone, and browse views reload.
|
||||||
|
Stream<String> get watched => _watched.stream;
|
||||||
|
|
||||||
|
void watchedChanged(String serverId) {
|
||||||
|
_clearMemo(serverId);
|
||||||
|
_watched.add(serverId);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class _JellyfinAccountsPanelState extends State<JellyfinAccountsPanel> {
|
|||||||
Text('Jellyfin', style: t.titleMedium),
|
Text('Jellyfin', style: t.titleMedium),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
const Text(
|
const Text(
|
||||||
'Browse your libraries in the Host tab and put up movies and episodes. '
|
'Browse your libraries in the Library tab and put up movies and episodes. '
|
||||||
'Sign in with Quick Connect or your password; several servers are fine.',
|
'Sign in with Quick Connect or your password; several servers are fine.',
|
||||||
style: TextStyle(color: Colors.grey),
|
style: TextStyle(color: Colors.grey),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:sync_relay_core/core.dart';
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
import 'accounts.dart';
|
import 'accounts.dart';
|
||||||
import 'format.dart';
|
import 'format.dart';
|
||||||
|
import '../widgets/app_menu.dart';
|
||||||
|
import '../widgets/copy_open.dart';
|
||||||
|
|
||||||
/// One level of the library browser's back stack.
|
/// One level of the library browser's back stack.
|
||||||
sealed class BrowseRoute {
|
sealed class BrowseRoute {
|
||||||
@@ -20,14 +25,17 @@ final class HomeRoute extends BrowseRoute {
|
|||||||
String get key => 'home';
|
String get key => 'home';
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A library or folder grid.
|
/// A library or folder grid, optionally opened with a sort ("Show all"
|
||||||
|
/// next to Latest opens it newest first).
|
||||||
final class LibraryRoute extends BrowseRoute {
|
final class LibraryRoute extends BrowseRoute {
|
||||||
final JellyfinItem folder;
|
final JellyfinItem folder;
|
||||||
const LibraryRoute(this.folder);
|
/// A `LibrarySort` name; null = by name.
|
||||||
|
final String? sort;
|
||||||
|
const LibraryRoute(this.folder, {this.sort});
|
||||||
@override
|
@override
|
||||||
String get label => folder.name;
|
String get label => folder.name;
|
||||||
@override
|
@override
|
||||||
String get key => 'lib:${folder.id}';
|
String get key => sort == null ? 'lib:${folder.id}' : 'lib:${folder.id}:$sort';
|
||||||
}
|
}
|
||||||
|
|
||||||
final class SeriesRoute extends BrowseRoute {
|
final class SeriesRoute extends BrowseRoute {
|
||||||
@@ -41,18 +49,6 @@ final class SeriesRoute extends BrowseRoute {
|
|||||||
String get key => 'series:${series.id}';
|
String get key => 'series:${series.id}';
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Movie / episode / video detail.
|
|
||||||
final class DetailRoute extends BrowseRoute {
|
|
||||||
final JellyfinItem item;
|
|
||||||
const DetailRoute(this.item);
|
|
||||||
@override
|
|
||||||
String get label => item.kind == JellyfinItemKind.episode
|
|
||||||
? (item.episodeLabel ?? item.name)
|
|
||||||
: item.name;
|
|
||||||
@override
|
|
||||||
String get key => 'item:${item.id}';
|
|
||||||
}
|
|
||||||
|
|
||||||
/// A route stack as JSON for [JellyfinAccounts.saveBrowseLocation]: only
|
/// A route stack as JSON for [JellyfinAccounts.saveBrowseLocation]: only
|
||||||
/// ids, names and the fields the pages start from (each page loads the
|
/// ids, names and the fields the pages start from (each page loads the
|
||||||
/// full item itself).
|
/// full item itself).
|
||||||
@@ -60,18 +56,17 @@ List<Map<String, Object?>> encodeBrowseStack(List<BrowseRoute> stack) => [
|
|||||||
for (final r in stack)
|
for (final r in stack)
|
||||||
switch (r) {
|
switch (r) {
|
||||||
HomeRoute() => {'r': 'home'},
|
HomeRoute() => {'r': 'home'},
|
||||||
LibraryRoute(:final folder) => {'r': 'lib', ..._itemJson(folder)},
|
LibraryRoute(:final folder, :final sort) => {'r': 'lib', ..._itemJson(folder), 'sort': ?sort},
|
||||||
SeriesRoute(:final series, :final seasonId) => {
|
SeriesRoute(:final series, :final seasonId) => {
|
||||||
'r': 'series',
|
'r': 'series',
|
||||||
..._itemJson(series),
|
..._itemJson(series),
|
||||||
'seasonId': ?seasonId,
|
'seasonId': ?seasonId,
|
||||||
},
|
},
|
||||||
DetailRoute(:final item) => {'r': 'item', ..._itemJson(item)},
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
/// Inverse of [encodeBrowseStack]; always starts with Home. Null when
|
/// Inverse of [encodeBrowseStack]; always starts with Home. Null when
|
||||||
/// [raw] is not a stack.
|
/// [raw] is not a stack. Entries it no longer knows are skipped.
|
||||||
List<BrowseRoute>? decodeBrowseStack(Object? raw) {
|
List<BrowseRoute>? decodeBrowseStack(Object? raw) {
|
||||||
if (raw is! List) return null;
|
if (raw is! List) return null;
|
||||||
final out = <BrowseRoute>[const HomeRoute()];
|
final out = <BrowseRoute>[const HomeRoute()];
|
||||||
@@ -79,11 +74,10 @@ List<BrowseRoute>? decodeBrowseStack(Object? raw) {
|
|||||||
if (e is! Map) return null;
|
if (e is! Map) return null;
|
||||||
final item = _itemFrom(e);
|
final item = _itemFrom(e);
|
||||||
final route = switch (e['r']) {
|
final route = switch (e['r']) {
|
||||||
'home' => null,
|
'lib' when item != null =>
|
||||||
'lib' when item != null => LibraryRoute(item),
|
LibraryRoute(item, sort: e['sort'] is String ? e['sort'] as String : null),
|
||||||
'series' when item != null =>
|
'series' when item != null =>
|
||||||
SeriesRoute(item, seasonId: e['seasonId'] is String ? e['seasonId'] as String : null),
|
SeriesRoute(item, seasonId: e['seasonId'] is String ? e['seasonId'] as String : null),
|
||||||
'item' when item != null => DetailRoute(item),
|
|
||||||
_ => null,
|
_ => null,
|
||||||
};
|
};
|
||||||
if (route != null && out.every((r) => r.key != route.key)) out.add(route);
|
if (route != null && out.every((r) => r.key != route.key)) out.add(route);
|
||||||
@@ -141,46 +135,228 @@ class BrowseStart {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The card selected in the library (details panel): an item on a server.
|
||||||
|
/// [item] is what the card had, when known (the panel loads it in full).
|
||||||
|
class JellyfinSelection {
|
||||||
|
final String serverId;
|
||||||
|
final String itemId;
|
||||||
|
final JellyfinItem? item;
|
||||||
|
const JellyfinSelection(this.serverId, this.itemId, [this.item]);
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) =>
|
||||||
|
other is JellyfinSelection && other.serverId == serverId && other.itemId == itemId;
|
||||||
|
@override
|
||||||
|
int get hashCode => Object.hash(serverId, itemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Browser location shared by the browser, the library chips in the
|
||||||
|
/// Library header and the details panel: the server shown, its route
|
||||||
|
/// stack (saved per server on every move), a data version that bumps after
|
||||||
|
/// watched-state changes (rows reload), and the keys in the Continue row.
|
||||||
|
class BrowseController extends ChangeNotifier {
|
||||||
|
final JellyfinAccounts accounts;
|
||||||
|
/// Clock for the Continue row's age cut-off (tests pin it).
|
||||||
|
final DateTime Function() now;
|
||||||
|
BrowseController(this.accounts, {this.now = DateTime.now}) {
|
||||||
|
// Back from watching: the rows show what was just watched.
|
||||||
|
_watchedSub = accounts.watched.listen((id) {
|
||||||
|
if (!_disposed && id == serverId) dataChanged();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
late final StreamSubscription<String> _watchedSub;
|
||||||
|
|
||||||
|
String? _serverId;
|
||||||
|
List<BrowseRoute> _stack = const [HomeRoute()];
|
||||||
|
bool _started = false;
|
||||||
|
int _version = 0;
|
||||||
|
Set<String> _continueKeys = const {};
|
||||||
|
|
||||||
|
List<BrowseRoute> get stack => _stack;
|
||||||
|
int get version => _version;
|
||||||
|
/// [continueKey]s of the cards in the Continue row now.
|
||||||
|
Set<String> get continueKeys => _continueKeys;
|
||||||
|
|
||||||
|
JellyfinAccount? get account =>
|
||||||
|
(_serverId == null ? null : accounts.account(_serverId!)) ?? accounts.defaultAccount;
|
||||||
|
String? get serverId => account?.serverId;
|
||||||
|
|
||||||
|
/// First use (accounts loaded): [start], else the server of [serverHint]
|
||||||
|
/// at its remembered location, else the default server's.
|
||||||
|
void start({BrowseStart? start, String? serverHint}) {
|
||||||
|
if (_started) return;
|
||||||
|
_started = true;
|
||||||
|
if (start != null && accounts.account(start.serverId) != null) {
|
||||||
|
_serverId = start.serverId;
|
||||||
|
_stack = start.stack.isEmpty ? const [HomeRoute()] : start.stack;
|
||||||
|
_remember();
|
||||||
|
} else {
|
||||||
|
_serverId = serverHint != null && accounts.account(serverHint) != null
|
||||||
|
? serverHint
|
||||||
|
: accounts.defaultServerId;
|
||||||
|
_stack = _restored(_serverId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
List<BrowseRoute> _restored(String? serverId) =>
|
||||||
|
(serverId == null ? null : decodeBrowseStack(accounts.browseLocation(serverId))) ??
|
||||||
|
const [HomeRoute()];
|
||||||
|
|
||||||
|
void _remember() {
|
||||||
|
final id = serverId;
|
||||||
|
if (id != null) unawaited(accounts.saveBrowseLocation(id, encodeBrowseStack(_stack)));
|
||||||
|
}
|
||||||
|
|
||||||
|
void switchServer(String serverId) {
|
||||||
|
if (serverId == this.serverId) return;
|
||||||
|
_serverId = serverId;
|
||||||
|
_stack = _restored(serverId);
|
||||||
|
_continueKeys = const {};
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
void open(BrowseRoute route) {
|
||||||
|
if (_stack.last.key == route.key) return;
|
||||||
|
_stack = [..._stack, route];
|
||||||
|
_remember();
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Home, then [route] (library chips: a library is a top-level place).
|
||||||
|
void openTop(BrowseRoute route) {
|
||||||
|
_stack = [const HomeRoute(), route];
|
||||||
|
_remember();
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool back() {
|
||||||
|
if (_stack.length <= 1) return false;
|
||||||
|
_stack = _stack.sublist(0, _stack.length - 1);
|
||||||
|
_remember();
|
||||||
|
notifyListeners();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void popTo(int index) {
|
||||||
|
_stack = _stack.sublist(0, index + 1);
|
||||||
|
_remember();
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Watched state changed on the server: drop its cached lists and let
|
||||||
|
/// the rows reload.
|
||||||
|
void dataChanged() {
|
||||||
|
final id = serverId;
|
||||||
|
if (id != null) accounts.invalidate(id);
|
||||||
|
_version++;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
set continueKeys(Set<String> keys) {
|
||||||
|
if (setEquals(keys, _continueKeys)) return;
|
||||||
|
_continueKeys = keys;
|
||||||
|
// Set while building a row: tell listeners after the frame.
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (!_disposed) notifyListeners();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
bool _disposed = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_disposed = true;
|
||||||
|
unawaited(_watchedSub.cancel());
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An item's title to copy: an episode with its series ("Show · Name").
|
||||||
|
String jellyfinCopyTitle(JellyfinItem item) {
|
||||||
|
final series = item.seriesName;
|
||||||
|
return item.kind == JellyfinItemKind.episode && series != null && series.isNotEmpty
|
||||||
|
? '$series · ${item.name}'
|
||||||
|
: item.name;
|
||||||
|
}
|
||||||
|
|
||||||
/// What every browser page needs, provided by [JellyfinBrowser].
|
/// What every browser page needs, provided by [JellyfinBrowser].
|
||||||
class BrowseScope extends InheritedWidget {
|
class BrowseScope extends InheritedWidget {
|
||||||
final JellyfinAccounts accounts;
|
final JellyfinAccounts accounts;
|
||||||
final JellyfinAccount account;
|
final JellyfinAccount account;
|
||||||
final JellyfinClient client;
|
final JellyfinClient client;
|
||||||
/// Item id of the current pick on this server, highlighted everywhere.
|
final BrowseController controller;
|
||||||
|
/// Item id of the selected card on this server, highlighted everywhere.
|
||||||
final String? selectedItemId;
|
final String? selectedItemId;
|
||||||
final ValueChanged<JellyfinItem> onPick;
|
/// Click: select (details panel).
|
||||||
final ValueChanged<BrowseRoute> onOpen;
|
final ValueChanged<JellyfinItem> onSelect;
|
||||||
/// Hover / focus: the inspector pane follows it.
|
/// Double-click: put it up (a series: its next episode).
|
||||||
final ValueChanged<JellyfinItem> onPeek;
|
final ValueChanged<JellyfinItem> onPutUp;
|
||||||
|
/// Adds it to Up next (with next: right after what plays); null: no
|
||||||
|
/// server (the cards' menu then only copies and opens).
|
||||||
|
final void Function(JellyfinItem item, {bool next})? onAddToQueue;
|
||||||
|
/// Home shows the library chips itself (the Library tab has them in its
|
||||||
|
/// header instead).
|
||||||
|
final bool libraryStrip;
|
||||||
|
|
||||||
const BrowseScope({
|
const BrowseScope({
|
||||||
super.key,
|
super.key,
|
||||||
required this.accounts,
|
required this.accounts,
|
||||||
required this.account,
|
required this.account,
|
||||||
required this.client,
|
required this.client,
|
||||||
|
required this.controller,
|
||||||
required this.selectedItemId,
|
required this.selectedItemId,
|
||||||
required this.onPick,
|
required this.onSelect,
|
||||||
required this.onOpen,
|
required this.onPutUp,
|
||||||
required this.onPeek,
|
this.onAddToQueue,
|
||||||
|
this.libraryStrip = true,
|
||||||
required super.child,
|
required super.child,
|
||||||
});
|
});
|
||||||
|
|
||||||
static BrowseScope of(BuildContext context) =>
|
static BrowseScope of(BuildContext context) =>
|
||||||
context.dependOnInheritedWidgetOfExactType<BrowseScope>()!;
|
context.dependOnInheritedWidgetOfExactType<BrowseScope>()!;
|
||||||
|
|
||||||
|
void onOpen(BrowseRoute route) => controller.open(route);
|
||||||
|
|
||||||
|
/// Right-click on a card ([context]: the card): Put it up, Add to queue,
|
||||||
|
/// Play next (playable, in a server), Copy title, Open in Jellyfin.
|
||||||
|
Future<void> cardMenu(BuildContext context, JellyfinItem item) async {
|
||||||
|
final queue = isSelectable(item) ? onAddToQueue : null;
|
||||||
|
final pick = await showAppMenu<int>(context, items: [
|
||||||
|
if (queue != null) ...const [
|
||||||
|
AppMenuItem(value: 0, label: 'Put it up'),
|
||||||
|
AppMenuItem(value: 1, label: 'Add to queue'),
|
||||||
|
AppMenuItem(value: 2, label: 'Play next'),
|
||||||
|
],
|
||||||
|
const AppMenuItem(value: 3, label: ReuseText.copyTitle),
|
||||||
|
const AppMenuItem(value: 4, label: ReuseText.openInJellyfin),
|
||||||
|
]);
|
||||||
|
switch (pick) {
|
||||||
|
case 0:
|
||||||
|
onPutUp(item);
|
||||||
|
case 1:
|
||||||
|
queue!(item);
|
||||||
|
case 2:
|
||||||
|
queue!(item, next: true);
|
||||||
|
case 3:
|
||||||
|
await copyToClipboard(jellyfinCopyTitle(item), done: 'Title copied');
|
||||||
|
case 4:
|
||||||
|
await openLink(jellyfinWebUrl(client.baseUrl, item.id, serverId: account.serverId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Cached browse call on this server.
|
/// Cached browse call on this server.
|
||||||
Future<T> load<T>(String key, Future<T> Function(JellyfinClient c) fn) =>
|
Future<T> load<T>(String key, Future<T> Function(JellyfinClient c) fn) =>
|
||||||
accounts.cached(account.serverId, key, () => fn(client));
|
accounts.cached(account.serverId, key, () => fn(client));
|
||||||
|
|
||||||
/// Click / Enter on a card: playable items are picked, containers open.
|
/// Click / Enter on a card: series, movies and episodes are selected,
|
||||||
|
/// seasons open their series, libraries and folders open.
|
||||||
void activate(JellyfinItem item) {
|
void activate(JellyfinItem item) {
|
||||||
if (isPlayable(item)) {
|
if (isSelectable(item)) {
|
||||||
onPick(item);
|
onSelect(item);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
switch (item.kind) {
|
switch (item.kind) {
|
||||||
case JellyfinItemKind.series:
|
|
||||||
onOpen(SeriesRoute(item));
|
|
||||||
case JellyfinItemKind.season:
|
case JellyfinItemKind.season:
|
||||||
final sid = item.seriesId;
|
final sid = item.seriesId;
|
||||||
if (sid != null) {
|
if (sid != null) {
|
||||||
@@ -193,7 +369,7 @@ class BrowseScope extends InheritedWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Opens the series of an episode (or the item itself if it has none).
|
/// Opens the series of an episode.
|
||||||
void openSeriesOf(JellyfinItem episode) {
|
void openSeriesOf(JellyfinItem episode) {
|
||||||
final sid = episode.seriesId;
|
final sid = episode.seriesId;
|
||||||
if (sid == null) return;
|
if (sid == null) return;
|
||||||
@@ -206,23 +382,28 @@ class BrowseScope extends InheritedWidget {
|
|||||||
bool updateShouldNotify(BrowseScope old) =>
|
bool updateShouldNotify(BrowseScope old) =>
|
||||||
old.selectedItemId != selectedItemId ||
|
old.selectedItemId != selectedItemId ||
|
||||||
old.account != account ||
|
old.account != account ||
|
||||||
old.client != client;
|
old.client != client ||
|
||||||
|
old.libraryStrip != libraryStrip;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Runs [load] once (again on [retry]) and shows [builder] with the result,
|
/// Runs [load] once (again on [retry] and when [version] changes) and
|
||||||
/// a spinner meanwhile, and a compact error with Retry on failure.
|
/// shows [builder] with the result, a spinner meanwhile, and a compact
|
||||||
|
/// error with Retry on failure. A reload for a new [version] keeps the old
|
||||||
|
/// result on screen until the new one arrives.
|
||||||
class Loader<T> extends StatefulWidget {
|
class Loader<T> extends StatefulWidget {
|
||||||
final Future<T> Function() load;
|
final Future<T> Function() load;
|
||||||
final Widget Function(BuildContext context, T data) builder;
|
final Widget Function(BuildContext context, T data) builder;
|
||||||
final Widget? loading;
|
final Widget? loading;
|
||||||
/// When false the error collapses to nothing (optional sections).
|
/// When false the error collapses to nothing (optional sections).
|
||||||
final bool showError;
|
final bool showError;
|
||||||
|
final Object? version;
|
||||||
const Loader({
|
const Loader({
|
||||||
super.key,
|
super.key,
|
||||||
required this.load,
|
required this.load,
|
||||||
required this.builder,
|
required this.builder,
|
||||||
this.loading,
|
this.loading,
|
||||||
this.showError = true,
|
this.showError = true,
|
||||||
|
this.version,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -231,22 +412,31 @@ class Loader<T> extends StatefulWidget {
|
|||||||
|
|
||||||
class _LoaderState<T> extends State<Loader<T>> {
|
class _LoaderState<T> extends State<Loader<T>> {
|
||||||
late Future<T> _future = widget.load();
|
late Future<T> _future = widget.load();
|
||||||
|
(T,)? _last;
|
||||||
|
|
||||||
void _retry() => setState(() => _future = widget.load());
|
void _retry() => setState(() => _future = widget.load());
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(Loader<T> old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
if (old.version != widget.version) _future = widget.load();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return FutureBuilder<T>(
|
return FutureBuilder<T>(
|
||||||
future: _future,
|
future: _future,
|
||||||
builder: (context, snap) {
|
builder: (context, snap) {
|
||||||
if (snap.hasData) return widget.builder(context, snap.data as T);
|
if (snap.hasData || (snap.connectionState == ConnectionState.done && !snap.hasError)) {
|
||||||
|
_last = (snap.data as T,);
|
||||||
|
return widget.builder(context, snap.data as T);
|
||||||
|
}
|
||||||
if (snap.hasError) {
|
if (snap.hasError) {
|
||||||
if (!widget.showError) return const SizedBox.shrink();
|
if (!widget.showError) return const SizedBox.shrink();
|
||||||
return LoadError(error: snap.error!, onRetry: _retry);
|
return LoadError(error: snap.error!, onRetry: _retry);
|
||||||
}
|
}
|
||||||
if (snap.connectionState == ConnectionState.done) {
|
final last = _last;
|
||||||
return widget.builder(context, snap.data as T);
|
if (last != null) return widget.builder(context, last.$1);
|
||||||
}
|
|
||||||
return widget.loading ??
|
return widget.loading ??
|
||||||
const Padding(
|
const Padding(
|
||||||
padding: EdgeInsets.all(32),
|
padding: EdgeInsets.all(32),
|
||||||
|
|||||||
@@ -2,52 +2,54 @@ import 'dart:async';
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
import 'package:sync_relay_core/core.dart';
|
|
||||||
|
|
||||||
import '../screens/home/picked_media.dart';
|
|
||||||
import 'accounts.dart';
|
import 'accounts.dart';
|
||||||
import 'browse_scope.dart';
|
import 'browse_scope.dart';
|
||||||
import 'detail_page.dart';
|
|
||||||
import 'format.dart';
|
|
||||||
import 'home_page.dart';
|
import 'home_page.dart';
|
||||||
import 'inspector.dart';
|
|
||||||
import 'library_page.dart';
|
import 'library_page.dart';
|
||||||
import 'search_results.dart';
|
import 'search_results.dart';
|
||||||
import 'series_page.dart';
|
import 'series_page.dart';
|
||||||
import 'sign_in_panel.dart';
|
import 'sign_in_panel.dart';
|
||||||
|
|
||||||
/// Browser width from which the inspector pane shows on the right.
|
|
||||||
const inspectorFrom = 1400.0;
|
|
||||||
const inspectorWidth = 340.0;
|
|
||||||
|
|
||||||
/// Library browser for the linked Jellyfin servers: server switcher,
|
/// Library browser for the linked Jellyfin servers: server switcher,
|
||||||
/// breadcrumbs, search, and a back stack of pages (Home rows, library
|
/// breadcrumbs, search, and a back stack of pages (Home rows, library
|
||||||
/// grids, series, details). Pages below the top stay alive, so going back
|
/// grids, series). Pages below the top stay alive, so going back keeps
|
||||||
/// keeps scroll position and loaded pages.
|
/// scroll position and loaded pages. Where it is lives in a
|
||||||
|
/// [BrowseController] (shared with the Library header's library chips and
|
||||||
|
/// the details panel; one of its own when none is given).
|
||||||
///
|
///
|
||||||
/// Keyboard: arrows move between cards, Enter picks / opens, I opens
|
/// A click on a card selects it ([onSelect]; libraries and folders open),
|
||||||
/// details, Esc / Backspace / Alt+Left go back, / or Ctrl+F searches.
|
/// a double-click puts it up ([onPutUp]).
|
||||||
|
///
|
||||||
|
/// Keyboard: arrows move between cards, Enter selects / opens, Esc /
|
||||||
|
/// Backspace / Alt+Left go back, / or Ctrl+F searches.
|
||||||
class JellyfinBrowser extends StatefulWidget {
|
class JellyfinBrowser extends StatefulWidget {
|
||||||
final JellyfinAccounts accounts;
|
final JellyfinAccounts accounts;
|
||||||
final JellyfinMedia? selected;
|
final BrowseController? controller;
|
||||||
final ValueChanged<JellyfinMedia> onPick;
|
/// Highlighted card.
|
||||||
/// Shown when given: toggles a bigger browser (the host hides its form).
|
final JellyfinSelection? selected;
|
||||||
final VoidCallback? onToggleExpanded;
|
final ValueChanged<JellyfinSelection> onSelect;
|
||||||
final bool expanded;
|
final ValueChanged<JellyfinSelection> onPutUp;
|
||||||
|
/// Right-click on a card: Add to queue / Play next; null: no server.
|
||||||
|
final void Function(JellyfinSelection item, {bool next})? onAddToQueue;
|
||||||
final VoidCallback? onOpenIntegrations;
|
final VoidCallback? onOpenIntegrations;
|
||||||
final Duration searchDebounce;
|
final Duration searchDebounce;
|
||||||
/// Opens here instead of the remembered location (the series of the
|
/// Opens here instead of the remembered location (the series of the
|
||||||
/// episode playing, in the session's swap panel).
|
/// episode playing, after "Change video").
|
||||||
final BrowseStart? start;
|
final BrowseStart? start;
|
||||||
|
/// Library chips on Home (off when the Library header shows them).
|
||||||
|
final bool libraryStrip;
|
||||||
const JellyfinBrowser({
|
const JellyfinBrowser({
|
||||||
this.start,
|
this.start,
|
||||||
super.key,
|
super.key,
|
||||||
required this.accounts,
|
required this.accounts,
|
||||||
required this.onPick,
|
required this.onSelect,
|
||||||
|
required this.onPutUp,
|
||||||
|
this.onAddToQueue,
|
||||||
|
this.controller,
|
||||||
this.selected,
|
this.selected,
|
||||||
this.onToggleExpanded,
|
|
||||||
this.expanded = false,
|
|
||||||
this.onOpenIntegrations,
|
this.onOpenIntegrations,
|
||||||
|
this.libraryStrip = true,
|
||||||
this.searchDebounce = const Duration(milliseconds: 300),
|
this.searchDebounce = const Duration(milliseconds: 300),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -56,45 +58,23 @@ class JellyfinBrowser extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
||||||
String? _serverId;
|
BrowseController? _own;
|
||||||
List<BrowseRoute> _stack = const [HomeRoute()];
|
|
||||||
final _search = TextEditingController();
|
final _search = TextEditingController();
|
||||||
final _searchFocus = FocusNode(debugLabel: 'jf-search');
|
final _searchFocus = FocusNode(debugLabel: 'jf-search');
|
||||||
final _body = FocusScopeNode(debugLabel: 'jf-body');
|
final _body = FocusScopeNode(debugLabel: 'jf-body');
|
||||||
final _peek = ValueNotifier<JellyfinItem?>(null);
|
|
||||||
String _term = '';
|
String _term = '';
|
||||||
Timer? _debounce;
|
Timer? _debounce;
|
||||||
int _refresh = 0;
|
int _refresh = 0;
|
||||||
|
|
||||||
JellyfinAccounts get _accounts => widget.accounts;
|
JellyfinAccounts get _accounts => widget.accounts;
|
||||||
|
BrowseController get _c => widget.controller ?? (_own ??= BrowseController(widget.accounts));
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
final start = widget.start;
|
_c.start(start: widget.start, serverHint: widget.selected?.serverId);
|
||||||
if (start != null && _accounts.account(start.serverId) != null) {
|
|
||||||
_serverId = start.serverId;
|
|
||||||
_stack = start.stack.isEmpty ? const [HomeRoute()] : start.stack;
|
|
||||||
_remember();
|
|
||||||
} else {
|
|
||||||
_serverId = widget.selected != null && _accounts.account(widget.selected!.serverId) != null
|
|
||||||
? widget.selected!.serverId
|
|
||||||
: _accounts.defaultServerId;
|
|
||||||
_stack = _restored(_serverId);
|
|
||||||
}
|
|
||||||
_accounts.addListener(_changed);
|
_accounts.addListener(_changed);
|
||||||
}
|
_c.addListener(_moved);
|
||||||
|
|
||||||
/// The remembered location on [serverId], else Home.
|
|
||||||
List<BrowseRoute> _restored(String? serverId) =>
|
|
||||||
(serverId == null ? null : decodeBrowseStack(_accounts.browseLocation(serverId))) ??
|
|
||||||
const [HomeRoute()];
|
|
||||||
|
|
||||||
/// Every navigation is saved per server (Hive), so the next browser
|
|
||||||
/// (Host tab, swap panel, next start) opens where this one was.
|
|
||||||
void _remember() {
|
|
||||||
final id = _account?.serverId;
|
|
||||||
if (id != null) unawaited(_accounts.saveBrowseLocation(id, encodeBrowseStack(_stack)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -104,16 +84,22 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
old.accounts.removeListener(_changed);
|
old.accounts.removeListener(_changed);
|
||||||
widget.accounts.addListener(_changed);
|
widget.accounts.addListener(_changed);
|
||||||
}
|
}
|
||||||
|
final was = old.controller ?? _own;
|
||||||
|
if (was != _c) {
|
||||||
|
was?.removeListener(_moved);
|
||||||
|
_c.addListener(_moved);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_accounts.removeListener(_changed);
|
_accounts.removeListener(_changed);
|
||||||
|
_c.removeListener(_moved);
|
||||||
|
_own?.dispose();
|
||||||
_debounce?.cancel();
|
_debounce?.cancel();
|
||||||
_search.dispose();
|
_search.dispose();
|
||||||
_searchFocus.dispose();
|
_searchFocus.dispose();
|
||||||
_body.dispose();
|
_body.dispose();
|
||||||
_peek.dispose();
|
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -121,44 +107,33 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
if (mounted) setState(() {});
|
if (mounted) setState(() {});
|
||||||
}
|
}
|
||||||
|
|
||||||
JellyfinAccount? get _account =>
|
/// Any move (here, from the library chips or a server switch) ends a
|
||||||
(_serverId == null ? null : _accounts.account(_serverId!)) ?? _accounts.defaultAccount;
|
/// search.
|
||||||
|
int _depth = 0;
|
||||||
void _switchServer(String serverId) {
|
String? _server;
|
||||||
if (serverId == _account?.serverId) return;
|
void _moved() {
|
||||||
|
if (!mounted) return;
|
||||||
|
final moved = _c.stack.length != _depth || _c.serverId != _server;
|
||||||
|
_depth = _c.stack.length;
|
||||||
|
_server = _c.serverId;
|
||||||
setState(() {
|
setState(() {
|
||||||
_serverId = serverId;
|
if (moved) _clearSearch();
|
||||||
_stack = _restored(serverId);
|
|
||||||
_peek.value = null;
|
|
||||||
_clearSearch();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
JellyfinAccount? get _account => _c.account;
|
||||||
|
|
||||||
// ------------------------------------------------------------- navigation
|
// ------------------------------------------------------------- navigation
|
||||||
|
|
||||||
void _open(BrowseRoute route) {
|
|
||||||
setState(() {
|
|
||||||
_clearSearch();
|
|
||||||
if (_stack.last.key != route.key) _stack = [..._stack, route];
|
|
||||||
});
|
|
||||||
_remember();
|
|
||||||
_body.requestFocus();
|
|
||||||
}
|
|
||||||
|
|
||||||
bool _back() {
|
bool _back() {
|
||||||
if (_stack.length <= 1) return false;
|
final ok = _c.back();
|
||||||
setState(() => _stack = _stack.sublist(0, _stack.length - 1));
|
if (ok) _body.requestFocus();
|
||||||
_remember();
|
return ok;
|
||||||
_body.requestFocus();
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _popTo(int index) {
|
void _popTo(int index) {
|
||||||
setState(() {
|
setState(_clearSearch);
|
||||||
_clearSearch();
|
_c.popTo(index);
|
||||||
_stack = _stack.sublist(0, index + 1);
|
|
||||||
});
|
|
||||||
_remember();
|
|
||||||
_body.requestFocus();
|
_body.requestFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -175,12 +150,6 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
_term = '';
|
_term = '';
|
||||||
}
|
}
|
||||||
|
|
||||||
void _pick(JellyfinItem item) {
|
|
||||||
final account = _account;
|
|
||||||
if (account == null) return;
|
|
||||||
widget.onPick(pickFor(account, item));
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyEventResult _onKey(FocusNode node, KeyEvent e) {
|
KeyEventResult _onKey(FocusNode node, KeyEvent e) {
|
||||||
if (e is! KeyDownEvent && e is! KeyRepeatEvent) return KeyEventResult.ignored;
|
if (e is! KeyDownEvent && e is! KeyRepeatEvent) return KeyEventResult.ignored;
|
||||||
final keys = HardwareKeyboard.instance;
|
final keys = HardwareKeyboard.instance;
|
||||||
@@ -217,10 +186,9 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
|
|
||||||
Widget _page(BrowseRoute r) => switch (r) {
|
Widget _page(BrowseRoute r) => switch (r) {
|
||||||
HomeRoute() => const JellyfinHomePage(),
|
HomeRoute() => const JellyfinHomePage(),
|
||||||
LibraryRoute(:final folder) => JellyfinLibraryPage(folder: folder),
|
LibraryRoute(:final folder, :final sort) => JellyfinLibraryPage(folder: folder, sort: sort),
|
||||||
SeriesRoute(:final series, :final seasonId) =>
|
SeriesRoute(:final series, :final seasonId) =>
|
||||||
JellyfinSeriesPage(series: series, seasonId: seasonId),
|
JellyfinSeriesPage(series: series, seasonId: seasonId),
|
||||||
DetailRoute(:final item) => JellyfinDetailPage(item: item),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -233,15 +201,16 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
final status = _accounts.statusOf(account.serverId);
|
final status = _accounts.statusOf(account.serverId);
|
||||||
final sel = widget.selected;
|
final sel = widget.selected;
|
||||||
final searching = _term.isNotEmpty;
|
final searching = _term.isNotEmpty;
|
||||||
|
final stack = _c.stack;
|
||||||
|
|
||||||
final pages = Stack(
|
final pages = Stack(
|
||||||
children: [
|
children: [
|
||||||
for (var i = 0; i < _stack.length; i++)
|
for (var i = 0; i < stack.length; i++)
|
||||||
Visibility(
|
Visibility(
|
||||||
key: ValueKey('$_refresh:${account.serverId}:$i:${_stack[i].key}'),
|
key: ValueKey('$_refresh:${account.serverId}:$i:${stack[i].key}'),
|
||||||
visible: !searching && i == _stack.length - 1,
|
visible: !searching && i == stack.length - 1,
|
||||||
maintainState: true,
|
maintainState: true,
|
||||||
child: _page(_stack[i]),
|
child: _page(stack[i]),
|
||||||
),
|
),
|
||||||
if (searching) JellyfinSearchResults(key: ValueKey('$_refresh:$_term'), term: _term),
|
if (searching) JellyfinSearchResults(key: ValueKey('$_refresh:$_term'), term: _term),
|
||||||
],
|
],
|
||||||
@@ -251,10 +220,15 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
accounts: _accounts,
|
accounts: _accounts,
|
||||||
account: account,
|
account: account,
|
||||||
client: client,
|
client: client,
|
||||||
|
controller: _c,
|
||||||
selectedItemId: sel != null && sel.serverId == account.serverId ? sel.itemId : null,
|
selectedItemId: sel != null && sel.serverId == account.serverId ? sel.itemId : null,
|
||||||
onPick: _pick,
|
onSelect: (item) => widget.onSelect(JellyfinSelection(account.serverId, item.id, item)),
|
||||||
onOpen: _open,
|
onPutUp: (item) => widget.onPutUp(JellyfinSelection(account.serverId, item.id, item)),
|
||||||
onPeek: (item) => _peek.value = item,
|
onAddToQueue: widget.onAddToQueue == null
|
||||||
|
? null
|
||||||
|
: (item, {next = false}) =>
|
||||||
|
widget.onAddToQueue!(JellyfinSelection(account.serverId, item.id, item), next: next),
|
||||||
|
libraryStrip: widget.libraryStrip,
|
||||||
child: Focus(
|
child: Focus(
|
||||||
onKeyEvent: _onKey,
|
onKeyEvent: _onKey,
|
||||||
child: Column(
|
child: Column(
|
||||||
@@ -265,21 +239,7 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
if (status == JellyfinAccountStatus.expired || status == JellyfinAccountStatus.offline)
|
if (status == JellyfinAccountStatus.expired || status == JellyfinAccountStatus.offline)
|
||||||
_StatusBanner(accounts: _accounts, account: account, status: status),
|
_StatusBanner(accounts: _accounts, account: account, status: status),
|
||||||
const SizedBox(height: 12),
|
const SizedBox(height: 12),
|
||||||
Expanded(
|
Expanded(child: FocusScope(node: _body, child: pages)),
|
||||||
child: LayoutBuilder(builder: (context, box) {
|
|
||||||
final inspector = box.maxWidth >= inspectorFrom;
|
|
||||||
final body = FocusScope(node: _body, child: pages);
|
|
||||||
if (!inspector) return body;
|
|
||||||
return Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Expanded(child: body),
|
|
||||||
const SizedBox(width: 16),
|
|
||||||
SizedBox(width: inspectorWidth, child: JellyfinInspector(item: _peek)),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -289,9 +249,10 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
Widget _header(BuildContext context, JellyfinAccount account) {
|
Widget _header(BuildContext context, JellyfinAccount account) {
|
||||||
final theme = Theme.of(context);
|
final theme = Theme.of(context);
|
||||||
final t = theme.textTheme;
|
final t = theme.textTheme;
|
||||||
|
final stack = _c.stack;
|
||||||
final crumbs = <Widget>[];
|
final crumbs = <Widget>[];
|
||||||
for (var i = 0; i < _stack.length; i++) {
|
for (var i = 0; i < stack.length; i++) {
|
||||||
final last = i == _stack.length - 1 && _term.isEmpty;
|
final last = i == stack.length - 1 && _term.isEmpty;
|
||||||
if (i > 0) {
|
if (i > 0) {
|
||||||
crumbs.add(const Padding(
|
crumbs.add(const Padding(
|
||||||
padding: EdgeInsets.symmetric(horizontal: 2),
|
padding: EdgeInsets.symmetric(horizontal: 2),
|
||||||
@@ -299,7 +260,7 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
));
|
));
|
||||||
}
|
}
|
||||||
final label = Text(
|
final label = Text(
|
||||||
_stack[i].label,
|
stack[i].label,
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: t.titleSmall?.copyWith(
|
style: t.titleSmall?.copyWith(
|
||||||
@@ -328,73 +289,68 @@ class _JellyfinBrowserState extends State<JellyfinBrowser> {
|
|||||||
style: t.titleSmall?.copyWith(fontWeight: FontWeight.w600))));
|
style: t.titleSmall?.copyWith(fontWeight: FontWeight.w600))));
|
||||||
}
|
}
|
||||||
|
|
||||||
return Row(
|
return LayoutBuilder(builder: (context, box) {
|
||||||
children: [
|
final narrow = box.maxWidth < 640;
|
||||||
_ServerSwitcher(
|
return Row(
|
||||||
accounts: _accounts,
|
children: [
|
||||||
current: account,
|
_ServerSwitcher(
|
||||||
onSelect: _switchServer,
|
accounts: _accounts,
|
||||||
onOpenIntegrations: widget.onOpenIntegrations,
|
current: account,
|
||||||
),
|
compact: narrow,
|
||||||
const SizedBox(width: 4),
|
onSelect: _c.switchServer,
|
||||||
IconButton(
|
onOpenIntegrations: widget.onOpenIntegrations,
|
||||||
tooltip: 'Back (Esc)',
|
),
|
||||||
visualDensity: VisualDensity.compact,
|
IconButton(
|
||||||
onPressed: _stack.length > 1 ? _back : null,
|
tooltip: 'Back (Esc)',
|
||||||
icon: const Icon(Icons.arrow_back, size: 20),
|
visualDensity: VisualDensity.compact,
|
||||||
),
|
onPressed: stack.length > 1 ? _back : null,
|
||||||
const SizedBox(width: 4),
|
icon: const Icon(Icons.arrow_back, size: 20),
|
||||||
Expanded(child: Row(children: crumbs)),
|
),
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 4),
|
||||||
SizedBox(
|
Expanded(child: Row(children: crumbs)),
|
||||||
width: 260,
|
const SizedBox(width: 8),
|
||||||
child: TextField(
|
SizedBox(
|
||||||
key: const ValueKey('jf-search'),
|
width: narrow ? 170 : 260,
|
||||||
controller: _search,
|
child: TextField(
|
||||||
focusNode: _searchFocus,
|
key: const ValueKey('jf-search'),
|
||||||
onChanged: _onSearchChanged,
|
controller: _search,
|
||||||
onSubmitted: (v) {
|
focusNode: _searchFocus,
|
||||||
_debounce?.cancel();
|
onChanged: _onSearchChanged,
|
||||||
setState(() => _term = v.trim());
|
onSubmitted: (v) {
|
||||||
},
|
_debounce?.cancel();
|
||||||
decoration: InputDecoration(
|
setState(() => _term = v.trim());
|
||||||
isDense: true,
|
},
|
||||||
hintText: 'Search ( / )',
|
decoration: InputDecoration(
|
||||||
prefixIcon: const Icon(Icons.search, size: 18),
|
isDense: true,
|
||||||
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
|
hintText: 'Search ( / )',
|
||||||
suffixIcon: ListenableBuilder(
|
prefixIcon: const Icon(Icons.search, size: 18),
|
||||||
listenable: _search,
|
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
|
||||||
builder: (context, _) => _search.text.isEmpty
|
suffixIcon: ListenableBuilder(
|
||||||
? const SizedBox.shrink()
|
listenable: _search,
|
||||||
: IconButton(
|
builder: (context, _) => _search.text.isEmpty
|
||||||
tooltip: 'Clear (Esc)',
|
? const SizedBox.shrink()
|
||||||
iconSize: 16,
|
: IconButton(
|
||||||
onPressed: () => setState(_clearSearch),
|
tooltip: 'Clear (Esc)',
|
||||||
icon: const Icon(Icons.close),
|
iconSize: 16,
|
||||||
),
|
onPressed: () => setState(_clearSearch),
|
||||||
|
icon: const Icon(Icons.close),
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
|
||||||
IconButton(
|
|
||||||
tooltip: 'Refresh',
|
|
||||||
visualDensity: VisualDensity.compact,
|
|
||||||
onPressed: () {
|
|
||||||
_accounts.invalidate(account.serverId);
|
|
||||||
setState(() => _refresh++);
|
|
||||||
},
|
|
||||||
icon: const Icon(Icons.refresh, size: 20),
|
|
||||||
),
|
|
||||||
if (widget.onToggleExpanded != null)
|
|
||||||
IconButton(
|
IconButton(
|
||||||
key: const ValueKey('jf-expand'),
|
tooltip: 'Refresh',
|
||||||
tooltip: widget.expanded ? 'Show the host form' : 'Bigger browser',
|
|
||||||
visualDensity: VisualDensity.compact,
|
visualDensity: VisualDensity.compact,
|
||||||
onPressed: widget.onToggleExpanded,
|
onPressed: () {
|
||||||
icon: Icon(widget.expanded ? Icons.close_fullscreen : Icons.open_in_full, size: 18),
|
_accounts.invalidate(account.serverId);
|
||||||
|
setState(() => _refresh++);
|
||||||
|
},
|
||||||
|
icon: const Icon(Icons.refresh, size: 20),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -404,11 +360,14 @@ class _ServerSwitcher extends StatelessWidget {
|
|||||||
final JellyfinAccount current;
|
final JellyfinAccount current;
|
||||||
final ValueChanged<String> onSelect;
|
final ValueChanged<String> onSelect;
|
||||||
final VoidCallback? onOpenIntegrations;
|
final VoidCallback? onOpenIntegrations;
|
||||||
|
/// Narrow: the name is shorter.
|
||||||
|
final bool compact;
|
||||||
const _ServerSwitcher({
|
const _ServerSwitcher({
|
||||||
required this.accounts,
|
required this.accounts,
|
||||||
required this.current,
|
required this.current,
|
||||||
required this.onSelect,
|
required this.onSelect,
|
||||||
this.onOpenIntegrations,
|
this.onOpenIntegrations,
|
||||||
|
this.compact = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -420,7 +379,7 @@ class _ServerSwitcher extends StatelessWidget {
|
|||||||
StatusDot(status: accounts.statusOf(current.serverId)),
|
StatusDot(status: accounts.statusOf(current.serverId)),
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
ConstrainedBox(
|
ConstrainedBox(
|
||||||
constraints: const BoxConstraints(maxWidth: 200),
|
constraints: BoxConstraints(maxWidth: compact ? 110 : 200),
|
||||||
child: Text(current.displayName,
|
child: Text(current.displayName,
|
||||||
maxLines: 1, overflow: TextOverflow.ellipsis, style: t.titleSmall),
|
maxLines: 1, overflow: TextOverflow.ellipsis, style: t.titleSmall),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ import 'dart:math' as math;
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/rendering.dart';
|
import 'package:flutter/rendering.dart';
|
||||||
import 'package:flutter/services.dart';
|
|
||||||
import 'package:sync_relay_core/core.dart';
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
import 'browse_scope.dart';
|
import 'browse_scope.dart';
|
||||||
import 'format.dart';
|
import 'format.dart';
|
||||||
import 'images.dart';
|
import 'images.dart';
|
||||||
|
import '../shell/motion.dart' show HScroll;
|
||||||
|
|
||||||
enum CardShape {
|
enum CardShape {
|
||||||
/// 2:3 poster (movies, series, latest).
|
/// 2:3 poster (movies, series, latest).
|
||||||
@@ -49,20 +49,29 @@ IconData kindIcon(JellyfinItem item) => switch (item.kind) {
|
|||||||
_ => Icons.movie_outlined,
|
_ => Icons.movie_outlined,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// Two clicks on the same card within this time put it up.
|
||||||
|
const doubleClickTime = Duration(milliseconds: 350);
|
||||||
|
|
||||||
/// Poster or thumb card: image with progress bar and state badges, title
|
/// Poster or thumb card: image with progress bar and state badges, title
|
||||||
/// and one meta line. Click / Enter activates (pick or open), hover and
|
/// and one meta line. Click / Enter selects it (details panel; libraries
|
||||||
/// focus feed the inspector, "i" or the hover button opens the details.
|
/// and folders open), a second click soon after puts it up. [display]
|
||||||
|
/// gives the picture and title when they are not [item]'s own (a series
|
||||||
|
/// card for a new episode), [subtitle] replaces the meta line.
|
||||||
class MediaCard extends StatefulWidget {
|
class MediaCard extends StatefulWidget {
|
||||||
final JellyfinItem item;
|
final JellyfinItem item;
|
||||||
|
final JellyfinItem? display;
|
||||||
|
final String? subtitle;
|
||||||
final CardShape shape;
|
final CardShape shape;
|
||||||
/// Rows mixing series (Continue watching, Next up): series name on top,
|
/// Rows mixing series (Continue): series name on top, "S2E3 · 12 min
|
||||||
/// "S2E3 · 12 min left" below.
|
/// left" below.
|
||||||
final bool seriesFirst;
|
final bool seriesFirst;
|
||||||
final bool autofocus;
|
final bool autofocus;
|
||||||
const MediaCard({
|
const MediaCard({
|
||||||
super.key,
|
super.key,
|
||||||
required this.item,
|
required this.item,
|
||||||
required this.shape,
|
required this.shape,
|
||||||
|
this.display,
|
||||||
|
this.subtitle,
|
||||||
this.seriesFirst = false,
|
this.seriesFirst = false,
|
||||||
this.autofocus = false,
|
this.autofocus = false,
|
||||||
});
|
});
|
||||||
@@ -74,18 +83,20 @@ class MediaCard extends StatefulWidget {
|
|||||||
class _MediaCardState extends State<MediaCard> {
|
class _MediaCardState extends State<MediaCard> {
|
||||||
bool _hover = false;
|
bool _hover = false;
|
||||||
bool _focus = false;
|
bool _focus = false;
|
||||||
|
DateTime? _lastTap;
|
||||||
|
|
||||||
JellyfinItem get item => widget.item;
|
JellyfinItem get item => widget.item;
|
||||||
|
|
||||||
void _details(BrowseScope scope) => scope.onOpen(DetailRoute(item));
|
void _tap(BrowseScope scope) {
|
||||||
|
final now = DateTime.now();
|
||||||
KeyEventResult _onKey(BrowseScope scope, KeyEvent e) {
|
final last = _lastTap;
|
||||||
if (e is! KeyDownEvent) return KeyEventResult.ignored;
|
_lastTap = now;
|
||||||
if (e.logicalKey == LogicalKeyboardKey.keyI && isPlayable(item)) {
|
if (last != null && now.difference(last) < doubleClickTime && isSelectable(item)) {
|
||||||
_details(scope);
|
_lastTap = null;
|
||||||
return KeyEventResult.handled;
|
scope.onPutUp(item);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
return KeyEventResult.ignored;
|
scope.activate(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -93,10 +104,11 @@ class _MediaCardState extends State<MediaCard> {
|
|||||||
final scope = BrowseScope.of(context);
|
final scope = BrowseScope.of(context);
|
||||||
final theme = Theme.of(context);
|
final theme = Theme.of(context);
|
||||||
final scheme = theme.colorScheme;
|
final scheme = theme.colorScheme;
|
||||||
|
final shown = widget.display ?? item;
|
||||||
final selected = scope.selectedItemId == item.id;
|
final selected = scope.selectedItemId == item.id;
|
||||||
final played = item.userData.played;
|
final played = item.userData.played;
|
||||||
final progress = progressOf(item);
|
final progress = progressOf(item);
|
||||||
final unplayed = item.userData.unplayedItemCount;
|
final unplayed = shown.userData.unplayedItemCount;
|
||||||
final ring = selected
|
final ring = selected
|
||||||
? scheme.primary
|
? scheme.primary
|
||||||
: _focus
|
: _focus
|
||||||
@@ -106,20 +118,21 @@ class _MediaCardState extends State<MediaCard> {
|
|||||||
final image = AspectRatio(
|
final image = AspectRatio(
|
||||||
aspectRatio: widget.shape.aspect,
|
aspectRatio: widget.shape.aspect,
|
||||||
child: AnimatedContainer(
|
child: AnimatedContainer(
|
||||||
duration: const Duration(milliseconds: 120),
|
duration: const Duration(milliseconds: 160),
|
||||||
|
curve: Curves.fastEaseInToSlowEaseOut,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
borderRadius: BorderRadius.circular(8),
|
borderRadius: BorderRadius.circular(10),
|
||||||
border: Border.all(color: ring, width: 2),
|
border: Border.all(color: ring, width: 3),
|
||||||
),
|
),
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
borderRadius: BorderRadius.circular(6),
|
borderRadius: BorderRadius.circular(7),
|
||||||
child: Stack(
|
child: Stack(
|
||||||
fit: StackFit.expand,
|
fit: StackFit.expand,
|
||||||
children: [
|
children: [
|
||||||
JellyfinImage(
|
JellyfinImage(
|
||||||
client: scope.client,
|
client: scope.client,
|
||||||
image: cardImage(item, widget.shape),
|
image: cardImage(shown, widget.shape),
|
||||||
icon: kindIcon(item),
|
icon: kindIcon(shown),
|
||||||
),
|
),
|
||||||
if (_hover || _focus)
|
if (_hover || _focus)
|
||||||
const ColoredBox(color: Color(0x22FFFFFF)),
|
const ColoredBox(color: Color(0x22FFFFFF)),
|
||||||
@@ -141,7 +154,7 @@ class _MediaCardState extends State<MediaCard> {
|
|||||||
? _Badge(color: scheme.primary, child: Icon(Icons.check, size: 14, color: scheme.onPrimary))
|
? _Badge(color: scheme.primary, child: Icon(Icons.check, size: 14, color: scheme.onPrimary))
|
||||||
: played
|
: played
|
||||||
? const _Badge(color: Color(0xCC1B5E20), child: Icon(Icons.check, size: 14, color: Colors.white))
|
? const _Badge(color: Color(0xCC1B5E20), child: Icon(Icons.check, size: 14, color: Colors.white))
|
||||||
: unplayed != null && unplayed > 0 && !isPlayable(item)
|
: unplayed != null && unplayed > 0 && !isPlayable(shown) && widget.subtitle == null
|
||||||
? _Badge(
|
? _Badge(
|
||||||
color: scheme.primaryContainer,
|
color: scheme.primaryContainer,
|
||||||
child: Text('$unplayed',
|
child: Text('$unplayed',
|
||||||
@@ -151,78 +164,56 @@ class _MediaCardState extends State<MediaCard> {
|
|||||||
color: scheme.onPrimaryContainer)))
|
color: scheme.onPrimaryContainer)))
|
||||||
: const SizedBox.shrink(),
|
: const SizedBox.shrink(),
|
||||||
),
|
),
|
||||||
if (_hover && isPlayable(item))
|
|
||||||
Positioned(
|
|
||||||
top: 4,
|
|
||||||
left: 4,
|
|
||||||
child: IconButton.filledTonal(
|
|
||||||
key: ValueKey('card-info-${item.id}'),
|
|
||||||
tooltip: 'Details (I)',
|
|
||||||
visualDensity: VisualDensity.compact,
|
|
||||||
iconSize: 16,
|
|
||||||
onPressed: () => _details(scope),
|
|
||||||
icon: const Icon(Icons.info_outline),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
||||||
final title = cardTitle(item, seriesFirst: widget.seriesFirst);
|
final title = widget.display != null ? shown.name : cardTitle(item, seriesFirst: widget.seriesFirst);
|
||||||
final sub = widget.seriesFirst && item.kind == JellyfinItemKind.episode
|
final sub = widget.subtitle ??
|
||||||
? [cardSubtitle(item), item.name].where((s) => s.isNotEmpty).join(' · ')
|
(widget.seriesFirst && item.kind == JellyfinItemKind.episode
|
||||||
: cardSubtitle(item);
|
? [cardSubtitle(item), item.name].where((s) => s.isNotEmpty).join(' · ')
|
||||||
return Focus(
|
: cardSubtitle(item));
|
||||||
canRequestFocus: false,
|
return Semantics(
|
||||||
skipTraversal: true,
|
button: true,
|
||||||
onKeyEvent: (_, e) => _onKey(scope, e),
|
selected: selected,
|
||||||
child: Semantics(
|
label: title,
|
||||||
button: true,
|
child: InkWell(
|
||||||
selected: selected,
|
key: ValueKey('card-${item.id}'),
|
||||||
label: title,
|
autofocus: widget.autofocus,
|
||||||
child: InkWell(
|
borderRadius: BorderRadius.circular(10),
|
||||||
key: ValueKey('card-${item.id}'),
|
focusColor: Colors.transparent,
|
||||||
autofocus: widget.autofocus,
|
hoverColor: Colors.transparent,
|
||||||
borderRadius: BorderRadius.circular(8),
|
onTap: () => _tap(scope),
|
||||||
focusColor: Colors.transparent,
|
onSecondaryTap: () => scope.cardMenu(context, item),
|
||||||
hoverColor: Colors.transparent,
|
onHover: (h) => setState(() => _hover = h),
|
||||||
onTap: () => scope.activate(item),
|
onFocusChange: (f) => setState(() => _focus = f),
|
||||||
onHover: (h) {
|
child: Column(
|
||||||
setState(() => _hover = h);
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
if (h) scope.onPeek(item);
|
mainAxisSize: MainAxisSize.min,
|
||||||
},
|
children: [
|
||||||
onFocusChange: (f) {
|
image,
|
||||||
setState(() => _focus = f);
|
const SizedBox(height: 6),
|
||||||
if (f) scope.onPeek(item);
|
SizedBox(
|
||||||
},
|
height: cardTextHeight - 6,
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
mainAxisSize: MainAxisSize.min,
|
children: [
|
||||||
children: [
|
Text(title,
|
||||||
image,
|
maxLines: 1,
|
||||||
const SizedBox(height: 6),
|
overflow: TextOverflow.ellipsis,
|
||||||
SizedBox(
|
style: theme.textTheme.bodyMedium?.copyWith(
|
||||||
height: cardTextHeight - 6,
|
fontWeight: FontWeight.w600,
|
||||||
child: Column(
|
color: selected ? scheme.primary : null)),
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
Text(sub,
|
||||||
children: [
|
maxLines: 1,
|
||||||
Text(title,
|
overflow: TextOverflow.ellipsis,
|
||||||
maxLines: 1,
|
style: theme.textTheme.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
overflow: TextOverflow.ellipsis,
|
],
|
||||||
style: theme.textTheme.bodyMedium?.copyWith(
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
color: selected ? scheme.primary : null)),
|
|
||||||
Text(sub,
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: theme.textTheme.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -275,18 +266,25 @@ class CardGridDelegate extends SliverGridDelegate {
|
|||||||
bool shouldRelayout(CardGridDelegate old) => old.shape != shape || old.minWidth != minWidth;
|
bool shouldRelayout(CardGridDelegate old) => old.shape != shape || old.minWidth != minWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A titled horizontal row of cards sized to fill the width; arrows (on
|
/// One card of a [MediaRow]: see [MediaCard].
|
||||||
/// hover) page through it. Lazy: only visible cards are built.
|
typedef CardEntry = ({JellyfinItem item, JellyfinItem? display, String? subtitle});
|
||||||
|
|
||||||
|
List<CardEntry> cardEntries(Iterable<JellyfinItem> items) =>
|
||||||
|
[for (final i in items) (item: i, display: null, subtitle: null)];
|
||||||
|
|
||||||
|
/// A titled horizontal row of cards sized to fill the width; mouse drag
|
||||||
|
/// and the wheel move it ([HScroll]), arrows (on hover) page through it.
|
||||||
|
/// Lazy: only visible cards are built.
|
||||||
class MediaRow extends StatefulWidget {
|
class MediaRow extends StatefulWidget {
|
||||||
final String title;
|
final String title;
|
||||||
final List<JellyfinItem> items;
|
final List<CardEntry> entries;
|
||||||
final CardShape shape;
|
final CardShape shape;
|
||||||
final bool seriesFirst;
|
final bool seriesFirst;
|
||||||
final Widget? trailing;
|
final Widget? trailing;
|
||||||
const MediaRow({
|
const MediaRow({
|
||||||
super.key,
|
super.key,
|
||||||
required this.title,
|
required this.title,
|
||||||
required this.items,
|
required this.entries,
|
||||||
required this.shape,
|
required this.shape,
|
||||||
this.seriesFirst = false,
|
this.seriesFirst = false,
|
||||||
this.trailing,
|
this.trailing,
|
||||||
@@ -315,44 +313,38 @@ class _MediaRowState extends State<MediaRow> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final t = Theme.of(context).textTheme;
|
final entries = widget.entries;
|
||||||
return MouseRegion(
|
return MouseRegion(
|
||||||
onEnter: (_) => setState(() => _hover = true),
|
onEnter: (_) => setState(() => _hover = true),
|
||||||
onExit: (_) => setState(() => _hover = false),
|
onExit: (_) => setState(() => _hover = false),
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
children: [
|
children: [
|
||||||
Padding(
|
SectionHeader(widget.title, count: '${entries.length}', trailing: widget.trailing),
|
||||||
padding: const EdgeInsets.only(bottom: 8),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
Text(widget.title, style: t.titleMedium),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
Text('${widget.items.length}', style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
const Spacer(),
|
|
||||||
?widget.trailing,
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
LayoutBuilder(builder: (context, box) {
|
LayoutBuilder(builder: (context, box) {
|
||||||
final fit = fitColumns(box.maxWidth, widget.shape.minWidth);
|
final fit = fitColumns(box.maxWidth, widget.shape.minWidth);
|
||||||
final h = fit.itemWidth / widget.shape.aspect + cardTextHeight;
|
final h = fit.itemWidth / widget.shape.aspect + cardTextHeight;
|
||||||
final overflow = widget.items.length > fit.cols;
|
final overflow = entries.length > fit.cols;
|
||||||
return SizedBox(
|
return SizedBox(
|
||||||
height: h,
|
height: h,
|
||||||
child: Stack(
|
child: Stack(
|
||||||
children: [
|
children: [
|
||||||
ListView.separated(
|
HScroll(
|
||||||
controller: _scroll,
|
controller: _scroll,
|
||||||
scrollDirection: Axis.horizontal,
|
builder: (c) => ListView.separated(
|
||||||
itemCount: widget.items.length,
|
controller: c,
|
||||||
separatorBuilder: (_, _) => const SizedBox(width: cardGap),
|
scrollDirection: Axis.horizontal,
|
||||||
itemBuilder: (context, i) => SizedBox(
|
itemCount: entries.length,
|
||||||
width: fit.itemWidth,
|
separatorBuilder: (_, _) => const SizedBox(width: cardGap),
|
||||||
child: MediaCard(
|
itemBuilder: (context, i) => SizedBox(
|
||||||
item: widget.items[i],
|
width: fit.itemWidth,
|
||||||
shape: widget.shape,
|
child: MediaCard(
|
||||||
seriesFirst: widget.seriesFirst,
|
item: entries[i].item,
|
||||||
|
display: entries[i].display,
|
||||||
|
subtitle: entries[i].subtitle,
|
||||||
|
shape: widget.shape,
|
||||||
|
seriesFirst: widget.seriesFirst,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -410,12 +402,19 @@ class SectionHeader extends StatelessWidget {
|
|||||||
padding: const EdgeInsets.only(bottom: 8, top: 4),
|
padding: const EdgeInsets.only(bottom: 8, top: 4),
|
||||||
child: Row(
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
Text(title, style: t.titleMedium),
|
Expanded(
|
||||||
if (count != null) ...[
|
child: Row(
|
||||||
const SizedBox(width: 8),
|
children: [
|
||||||
Text(count!, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
Flexible(
|
||||||
],
|
child: Text(title, maxLines: 1, overflow: TextOverflow.ellipsis, style: t.titleMedium),
|
||||||
const Spacer(),
|
),
|
||||||
|
if (count != null) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(count!, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
?trailing,
|
?trailing,
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,180 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:sync_relay_core/core.dart';
|
|
||||||
|
|
||||||
import 'browse_scope.dart';
|
|
||||||
import 'format.dart';
|
|
||||||
import 'images.dart';
|
|
||||||
|
|
||||||
/// Movie / episode detail: art, title, meta, overview, the pick button and
|
|
||||||
/// what is in the file (video, audio and subtitle tracks).
|
|
||||||
class JellyfinDetailPage extends StatelessWidget {
|
|
||||||
final JellyfinItem item;
|
|
||||||
const JellyfinDetailPage({super.key, required this.item});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final scope = BrowseScope.of(context);
|
|
||||||
return Loader<JellyfinItem>(
|
|
||||||
key: ValueKey('detail-${item.id}-${scope.account.serverId}'),
|
|
||||||
load: () => scope.load('item:${item.id}', (c) => c.item(item.id)),
|
|
||||||
builder: (context, full) => _Detail(item: full),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _Detail extends StatelessWidget {
|
|
||||||
final JellyfinItem item;
|
|
||||||
const _Detail({required this.item});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final scope = BrowseScope.of(context);
|
|
||||||
final theme = Theme.of(context);
|
|
||||||
final t = theme.textTheme;
|
|
||||||
final episode = item.kind == JellyfinItemKind.episode;
|
|
||||||
final selected = scope.selectedItemId == item.id;
|
|
||||||
final meta = [
|
|
||||||
?item.episodeLabel,
|
|
||||||
if (item.productionYear != null) '${item.productionYear}',
|
|
||||||
if (item.runTime != null) formatRuntime(item.runTime!),
|
|
||||||
?timeLeft(item),
|
|
||||||
if (item.officialRating != null) item.officialRating!,
|
|
||||||
if (item.communityRating != null) '★ ${item.communityRating!.toStringAsFixed(1)}',
|
|
||||||
if (item.userData.played) 'Watched',
|
|
||||||
].join(' · ');
|
|
||||||
|
|
||||||
final art = episode
|
|
||||||
? AspectRatio(
|
|
||||||
aspectRatio: 16 / 9,
|
|
||||||
child: ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(10),
|
|
||||||
child: JellyfinImage(
|
|
||||||
client: scope.client,
|
|
||||||
image: item.ownImage(JellyfinImageType.primary) ??
|
|
||||||
item.image(JellyfinImageType.backdrop),
|
|
||||||
icon: Icons.tv_outlined),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: AspectRatio(
|
|
||||||
aspectRatio: 2 / 3,
|
|
||||||
child: ClipRRect(
|
|
||||||
borderRadius: BorderRadius.circular(10),
|
|
||||||
child: JellyfinImage(
|
|
||||||
client: scope.client, image: item.image(JellyfinImageType.primary)),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
final info = Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
if (episode && item.seriesName != null)
|
|
||||||
TextButton.icon(
|
|
||||||
key: const ValueKey('detail-series'),
|
|
||||||
style: TextButton.styleFrom(padding: EdgeInsets.zero),
|
|
||||||
onPressed: () => scope.openSeriesOf(item),
|
|
||||||
icon: const Icon(Icons.live_tv_outlined, size: 18),
|
|
||||||
label: Text(item.seriesName!, style: t.titleMedium),
|
|
||||||
),
|
|
||||||
SelectableText(item.name, style: t.headlineSmall),
|
|
||||||
const SizedBox(height: 6),
|
|
||||||
Text(meta, style: t.bodyMedium?.copyWith(color: Colors.grey)),
|
|
||||||
if (progressOf(item) > 0) ...[
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
SizedBox(
|
|
||||||
width: 240,
|
|
||||||
child: LinearProgressIndicator(value: progressOf(item), minHeight: 4)),
|
|
||||||
],
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
FilledButton.icon(
|
|
||||||
key: const ValueKey('detail-pick'),
|
|
||||||
onPressed: () => scope.onPick(item),
|
|
||||||
icon: Icon(selected ? Icons.check : Icons.play_arrow),
|
|
||||||
label: Text(selected ? 'Picked' : 'Pick to watch'),
|
|
||||||
),
|
|
||||||
if (item.overview != null) ...[
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: 760),
|
|
||||||
child: SelectableText(item.overview!, style: t.bodyMedium),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
_Tracks(item: item),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
|
|
||||||
return SingleChildScrollView(
|
|
||||||
padding: const EdgeInsets.only(bottom: 24),
|
|
||||||
child: LayoutBuilder(builder: (context, box) {
|
|
||||||
final wide = box.maxWidth >= 760;
|
|
||||||
final artWidth = episode ? (box.maxWidth * 0.32).clamp(280.0, 480.0) : 240.0;
|
|
||||||
if (!wide) {
|
|
||||||
return Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.topLeft,
|
|
||||||
child: SizedBox(width: episode ? 320 : 180, child: art)),
|
|
||||||
const SizedBox(height: 16),
|
|
||||||
info,
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
SizedBox(width: artWidth, child: art),
|
|
||||||
const SizedBox(width: 24),
|
|
||||||
Expanded(child: info),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// What the file holds, one line per track kind.
|
|
||||||
class _Tracks extends StatelessWidget {
|
|
||||||
final JellyfinItem item;
|
|
||||||
const _Tracks({required this.item});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
final source = item.mediaSources.firstOrNull;
|
|
||||||
final streams = source?.mediaStreams.isNotEmpty == true ? source!.mediaStreams : item.mediaStreams;
|
|
||||||
if (streams.isEmpty) return const SizedBox.shrink();
|
|
||||||
String names(JellyfinStreamType type) => streams
|
|
||||||
.where((s) => s.type == type)
|
|
||||||
.map((s) => s.displayTitle ?? [s.language, s.codec].whereType<String>().join(' '))
|
|
||||||
.join(' · ');
|
|
||||||
final rows = [
|
|
||||||
('Video', names(JellyfinStreamType.video)),
|
|
||||||
('Audio', names(JellyfinStreamType.audio)),
|
|
||||||
('Subtitles', names(JellyfinStreamType.subtitle)),
|
|
||||||
if (source?.container != null || source?.size != null)
|
|
||||||
('File', [
|
|
||||||
?source?.container,
|
|
||||||
if (source?.size != null) '${(source!.size! / (1 << 30)).toStringAsFixed(2)} GB',
|
|
||||||
].join(' · ')),
|
|
||||||
].where((r) => r.$2.isNotEmpty);
|
|
||||||
return Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
for (final (label, value) in rows)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(bottom: 6),
|
|
||||||
child: Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
SizedBox(
|
|
||||||
width: 84,
|
|
||||||
child: Text(label, style: t.bodySmall?.copyWith(color: Colors.grey))),
|
|
||||||
Expanded(child: Text(value, style: t.bodySmall)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,584 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../shell/motion.dart';
|
||||||
|
import '../widgets/app_menu.dart';
|
||||||
|
import '../widgets/copy_open.dart';
|
||||||
|
import 'accounts.dart';
|
||||||
|
import 'browse_scope.dart';
|
||||||
|
import 'cards.dart' show doubleClickTime, kindIcon;
|
||||||
|
import 'format.dart';
|
||||||
|
import 'home_rows.dart' show continueKey;
|
||||||
|
import 'images.dart';
|
||||||
|
|
||||||
|
/// Width of the details panel (docked or floating).
|
||||||
|
const detailsPanelWidth = 400.0;
|
||||||
|
|
||||||
|
/// What putting up [item] plays: itself when playable; for a series its
|
||||||
|
/// next episode (resume point or next up), else its first unwatched, else
|
||||||
|
/// its first episode. Null when there is nothing to play.
|
||||||
|
Future<JellyfinItem?> playableFor(JellyfinClient c, JellyfinItem item) async {
|
||||||
|
if (isPlayable(item)) return item;
|
||||||
|
if (item.kind != JellyfinItemKind.series) return null;
|
||||||
|
final next = await c.nextUp(seriesId: item.id, limit: 1, enableResumable: true);
|
||||||
|
if (next.isNotEmpty) return next.first;
|
||||||
|
final eps = await c.episodes(item.id);
|
||||||
|
return eps.where((e) => !e.userData.played).firstOrNull ?? eps.firstOrNull;
|
||||||
|
}
|
||||||
|
|
||||||
|
typedef _Data = ({
|
||||||
|
JellyfinItem item,
|
||||||
|
JellyfinItem? series,
|
||||||
|
List<JellyfinItem> seasons,
|
||||||
|
JellyfinItem? next,
|
||||||
|
});
|
||||||
|
|
||||||
|
/// The selected card's details, at the right of the library: banner,
|
||||||
|
/// title, meta, "Put it up · S1E3" ("Play · S1E3" when watching
|
||||||
|
/// [solo]), mark watched / unwatched, remove from Continue, overview and,
|
||||||
|
/// for a series or an episode, the episode list (click picks which
|
||||||
|
/// episode goes up, double-click puts it up). Reloads when the
|
||||||
|
/// [controller]'s data version moves.
|
||||||
|
class JellyfinDetailsPanel extends StatefulWidget {
|
||||||
|
final BrowseController controller;
|
||||||
|
final JellyfinSelection selection;
|
||||||
|
/// Nobody else watches (offline or solo): the button says Play.
|
||||||
|
final bool solo;
|
||||||
|
/// Puts [item] (playable) up; returns an error text, or null when sent.
|
||||||
|
final Future<String?> Function(JellyfinSelection item) onPutUp;
|
||||||
|
/// Adds [item] to Up next (with next: right after what plays); null: no
|
||||||
|
/// server, no queue actions.
|
||||||
|
final Future<String?> Function(JellyfinSelection item, {bool next})? onAddToQueue;
|
||||||
|
final VoidCallback onClose;
|
||||||
|
const JellyfinDetailsPanel({
|
||||||
|
super.key,
|
||||||
|
required this.controller,
|
||||||
|
required this.selection,
|
||||||
|
required this.onPutUp,
|
||||||
|
this.onAddToQueue,
|
||||||
|
required this.onClose,
|
||||||
|
this.solo = false,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<JellyfinDetailsPanel> createState() => _JellyfinDetailsPanelState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _JellyfinDetailsPanelState extends State<JellyfinDetailsPanel> {
|
||||||
|
String? _seasonId;
|
||||||
|
String? _targetId;
|
||||||
|
bool _busy = false;
|
||||||
|
String? _error;
|
||||||
|
DateTime? _lastTap;
|
||||||
|
String? _lastTapId;
|
||||||
|
|
||||||
|
BrowseController get _c => widget.controller;
|
||||||
|
JellyfinAccounts get _accounts => _c.accounts;
|
||||||
|
String get _serverId => widget.selection.serverId;
|
||||||
|
JellyfinClient? get _client => _accounts.clientFor(_serverId);
|
||||||
|
|
||||||
|
Future<T> _cached<T>(String key, Future<T> Function(JellyfinClient c) fn) {
|
||||||
|
final c = _client;
|
||||||
|
if (c == null) return Future.error(const JellyfinException('that Jellyfin server is not linked any more'));
|
||||||
|
return _accounts.cached(_serverId, key, () => fn(c));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<_Data> _load() async {
|
||||||
|
await _accounts.ensureLoaded();
|
||||||
|
final id = widget.selection.itemId;
|
||||||
|
final item = await _cached('item:$id', (c) => c.item(id));
|
||||||
|
final sid = item.kind == JellyfinItemKind.series ? item.id : item.seriesId;
|
||||||
|
if (sid == null || (item.kind != JellyfinItemKind.series && item.kind != JellyfinItemKind.episode)) {
|
||||||
|
return (item: item, series: null, seasons: const <JellyfinItem>[], next: null);
|
||||||
|
}
|
||||||
|
final r = await Future.wait<Object?>([
|
||||||
|
item.kind == JellyfinItemKind.series ? Future.value(item) : _cached('item:$sid', (c) => c.item(sid)),
|
||||||
|
_cached('seasons:$sid', (c) => c.seasons(sid)),
|
||||||
|
_cached('next:$sid', (c) => c.nextUp(seriesId: sid, limit: 1, enableResumable: true))
|
||||||
|
.then<List<JellyfinItem>?>((v) => v, onError: (_) => null),
|
||||||
|
]);
|
||||||
|
final next = r[2] as List<JellyfinItem>?;
|
||||||
|
return (
|
||||||
|
item: item,
|
||||||
|
series: r[0] as JellyfinItem,
|
||||||
|
seasons: r[1] as List<JellyfinItem>,
|
||||||
|
next: next == null || next.isEmpty ? null : next.first,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<JellyfinItem>> _episodes(String seriesId, String seasonId) =>
|
||||||
|
_cached('episodes:$seriesId:$seasonId', (c) => c.episodes(seriesId, seasonId: seasonId));
|
||||||
|
|
||||||
|
Future<void> _putUp(JellyfinItem target) async {
|
||||||
|
if (_busy) return;
|
||||||
|
setState(() {
|
||||||
|
_busy = true;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
error = await widget.onPutUp(JellyfinSelection(_serverId, target.id, target));
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_busy = false;
|
||||||
|
_error = error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _queue(JellyfinItem target, {bool next = false}) async {
|
||||||
|
final add = widget.onAddToQueue;
|
||||||
|
if (add == null || _busy) return;
|
||||||
|
setState(() {
|
||||||
|
_busy = true;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
error = await add(JellyfinSelection(_serverId, target.id, target), next: next);
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_busy = false;
|
||||||
|
_error = error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Right-click on an episode ([context]: its row): Put it up, Add to
|
||||||
|
/// queue, Play next (in a server), Copy title, Open in Jellyfin.
|
||||||
|
Future<void> _episodeMenu(BuildContext context, JellyfinItem e) async {
|
||||||
|
final queue = widget.onAddToQueue != null;
|
||||||
|
if (queue) setState(() => _targetId = e.id);
|
||||||
|
final client = _client;
|
||||||
|
final pick = await showAppMenu<int>(context, items: [
|
||||||
|
if (queue) ...[
|
||||||
|
AppMenuItem(value: 0, label: widget.solo ? 'Play' : 'Put it up'),
|
||||||
|
const AppMenuItem(value: 1, label: 'Add to queue'),
|
||||||
|
const AppMenuItem(value: 2, label: 'Play next'),
|
||||||
|
],
|
||||||
|
const AppMenuItem(value: 3, label: ReuseText.copyTitle),
|
||||||
|
if (client != null) const AppMenuItem(value: 4, label: ReuseText.openInJellyfin),
|
||||||
|
]);
|
||||||
|
switch (pick) {
|
||||||
|
case 0:
|
||||||
|
await _putUp(e);
|
||||||
|
case 1:
|
||||||
|
await _queue(e);
|
||||||
|
case 2:
|
||||||
|
await _queue(e, next: true);
|
||||||
|
case 3:
|
||||||
|
await copyToClipboard(jellyfinCopyTitle(e), done: 'Title copied');
|
||||||
|
case 4:
|
||||||
|
await openLink(jellyfinWebUrl(client!.baseUrl, e.id, serverId: _serverId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs a watched-state change, then lets every row reload.
|
||||||
|
Future<void> _change(Future<void> Function(JellyfinClient c) action) async {
|
||||||
|
final c = _client;
|
||||||
|
if (c == null || _busy) return;
|
||||||
|
setState(() {
|
||||||
|
_busy = true;
|
||||||
|
_error = null;
|
||||||
|
});
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
await action(c);
|
||||||
|
} on JellyfinException catch (e) {
|
||||||
|
if (e.isUnauthorized) _accounts.markExpired(_serverId);
|
||||||
|
error = e.isUnauthorized ? 'Jellyfin sign-in expired' : e.message;
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
_c.dataChanged();
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
_busy = false;
|
||||||
|
_error = error;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _toggleWatched(JellyfinItem t) =>
|
||||||
|
_change((c) => t.userData.played ? c.markUnplayed(t.id) : c.markPlayed(t.id));
|
||||||
|
|
||||||
|
void _removeFromContinue(JellyfinItem t) => _change((c) async {
|
||||||
|
if (t.userData.isResumable) await c.clearResumePosition(t.id);
|
||||||
|
await _accounts.dismissContinue(_serverId, continueKey(t));
|
||||||
|
});
|
||||||
|
|
||||||
|
void _tapEpisode(JellyfinItem e) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
final again = _lastTapId == e.id && _lastTap != null && now.difference(_lastTap!) < doubleClickTime;
|
||||||
|
_lastTap = again ? null : now;
|
||||||
|
_lastTapId = e.id;
|
||||||
|
setState(() => _targetId = e.id);
|
||||||
|
if (again) _putUp(e);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Material(
|
||||||
|
key: const ValueKey('jf-details'),
|
||||||
|
color: scheme.surfaceContainerLow,
|
||||||
|
child: SizedBox(
|
||||||
|
width: detailsPanelWidth,
|
||||||
|
child: ListenableBuilder(
|
||||||
|
listenable: _c,
|
||||||
|
builder: (context, _) => Loader<_Data>(
|
||||||
|
key: ValueKey('details-${widget.selection.serverId}-${widget.selection.itemId}'),
|
||||||
|
version: _c.version,
|
||||||
|
load: _load,
|
||||||
|
loading: Stack(children: [
|
||||||
|
const Center(child: CircularProgressIndicator(strokeWidth: 2)),
|
||||||
|
Positioned(right: 4, top: 4, child: _closeButton()),
|
||||||
|
]),
|
||||||
|
builder: (context, d) => _body(context, d),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _closeButton() => IconButton(
|
||||||
|
key: const ValueKey('details-close'),
|
||||||
|
tooltip: 'Close',
|
||||||
|
onPressed: widget.onClose,
|
||||||
|
icon: const Icon(Icons.close),
|
||||||
|
);
|
||||||
|
|
||||||
|
Widget _body(BuildContext context, _Data d) {
|
||||||
|
final series = d.series;
|
||||||
|
if (series == null) return _view(context, d, null, null);
|
||||||
|
final preferred = d.item.kind == JellyfinItemKind.episode ? d.item : null;
|
||||||
|
final baseTarget = preferred ?? d.next;
|
||||||
|
final seasons = d.seasons;
|
||||||
|
final seasonId = (_seasonId != null && seasons.any((s) => s.id == _seasonId))
|
||||||
|
? _seasonId
|
||||||
|
: seasons.any((s) => s.id == baseTarget?.seasonId)
|
||||||
|
? baseTarget!.seasonId
|
||||||
|
: (seasons.where((s) => !s.userData.played).firstOrNull ?? seasons.firstOrNull)?.id;
|
||||||
|
if (seasonId == null) return _view(context, d, baseTarget, const []);
|
||||||
|
return Loader<List<JellyfinItem>>(
|
||||||
|
key: ValueKey('details-episodes-$seasonId'),
|
||||||
|
version: _c.version,
|
||||||
|
load: () => _episodes(series.id, seasonId),
|
||||||
|
loading: _view(context, d, baseTarget, null),
|
||||||
|
builder: (context, eps) {
|
||||||
|
final chosen = _targetId == null
|
||||||
|
? null
|
||||||
|
: eps.where((e) => e.id == _targetId).firstOrNull ??
|
||||||
|
(baseTarget?.id == _targetId ? baseTarget : null);
|
||||||
|
final fresh = baseTarget == null ? null : eps.where((e) => e.id == baseTarget.id).firstOrNull;
|
||||||
|
final target = chosen ??
|
||||||
|
fresh ??
|
||||||
|
baseTarget ??
|
||||||
|
eps.where((e) => !e.userData.played).firstOrNull ??
|
||||||
|
eps.firstOrNull;
|
||||||
|
return _view(context, d, target, eps, seasonId: seasonId);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [episodes] null = loading, empty = none (or not a series).
|
||||||
|
Widget _view(BuildContext context, _Data d, JellyfinItem? target, List<JellyfinItem>? episodes,
|
||||||
|
{String? seasonId}) {
|
||||||
|
final theme = Theme.of(context);
|
||||||
|
final t = theme.textTheme;
|
||||||
|
final scheme = theme.colorScheme;
|
||||||
|
final client = _client;
|
||||||
|
final shown = d.series ?? d.item;
|
||||||
|
final isSeries = d.series != null;
|
||||||
|
final playable = isSeries ? target : (isPlayable(d.item) ? d.item : null);
|
||||||
|
final banner = shown.image(JellyfinImageType.backdrop) ??
|
||||||
|
shown.image(JellyfinImageType.thumb) ??
|
||||||
|
(d.item.kind == JellyfinItemKind.episode ? d.item.ownImage(JellyfinImageType.primary) : null) ??
|
||||||
|
shown.image(JellyfinImageType.primary);
|
||||||
|
final eps = shown.recursiveItemCount;
|
||||||
|
final meta = [
|
||||||
|
if (shown.productionYear != null) '${shown.productionYear}',
|
||||||
|
if (isSeries && d.seasons.length > 1) '${d.seasons.length} seasons',
|
||||||
|
if (isSeries && eps != null && eps > 0) '$eps episodes',
|
||||||
|
if (!isSeries && shown.runTime != null) formatRuntime(shown.runTime!),
|
||||||
|
?shown.officialRating,
|
||||||
|
if (shown.communityRating != null) '★ ${shown.communityRating!.toStringAsFixed(1)}',
|
||||||
|
if (!isSeries && shown.userData.played) 'Watched',
|
||||||
|
].join(' · ');
|
||||||
|
final verb = widget.solo ? 'Play' : 'Put it up';
|
||||||
|
final label = playable != null && isSeries ? '$verb · ${playable.episodeLabel ?? playable.name}' : verb;
|
||||||
|
final inContinue = playable != null &&
|
||||||
|
(playable.userData.isResumable || _c.continueKeys.contains(continueKey(playable)));
|
||||||
|
final left = playable == null ? null : timeLeft(playable);
|
||||||
|
|
||||||
|
return ListView(
|
||||||
|
key: const ValueKey('details-list'),
|
||||||
|
padding: EdgeInsets.zero,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 180,
|
||||||
|
child: Stack(
|
||||||
|
fit: StackFit.expand,
|
||||||
|
children: [
|
||||||
|
if (client != null)
|
||||||
|
JellyfinImage(client: client, image: banner, alignment: Alignment.topCenter, icon: kindIcon(shown))
|
||||||
|
else
|
||||||
|
ColoredBox(color: scheme.surfaceContainerHighest),
|
||||||
|
DecoratedBox(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.topCenter,
|
||||||
|
end: Alignment.bottomCenter,
|
||||||
|
colors: [Colors.transparent, scheme.surfaceContainerLow],
|
||||||
|
stops: const [0.55, 1],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Positioned(right: 4, top: 4, child: _closeButton()),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 4, 16, 16),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SelectableText(shown.name, style: t.titleLarge),
|
||||||
|
if (meta.isNotEmpty) Text(meta, style: t.bodyMedium?.copyWith(color: Colors.grey)),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
Wrap(
|
||||||
|
spacing: 4,
|
||||||
|
runSpacing: 4,
|
||||||
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
|
children: [
|
||||||
|
FilledButton.icon(
|
||||||
|
key: const ValueKey('details-put-up'),
|
||||||
|
onPressed: playable == null || _busy ? null : () => _putUp(playable),
|
||||||
|
icon: _busy
|
||||||
|
? const SizedBox.square(dimension: 16, child: CircularProgressIndicator(strokeWidth: 2))
|
||||||
|
: const Icon(Icons.play_arrow),
|
||||||
|
label: Text(label, overflow: TextOverflow.ellipsis),
|
||||||
|
),
|
||||||
|
if (playable != null && widget.onAddToQueue != null)
|
||||||
|
GestureDetector(
|
||||||
|
onSecondaryTap: _busy ? null : () => _queue(playable, next: true),
|
||||||
|
child: IconButton(
|
||||||
|
key: const ValueKey('details-add-queue'),
|
||||||
|
onPressed: _busy ? null : () => _queue(playable),
|
||||||
|
tooltip: 'Add to queue (right-click: play next)',
|
||||||
|
icon: const Icon(Icons.playlist_add_rounded),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (playable != null)
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('details-watched'),
|
||||||
|
onPressed: _busy ? null : () => _toggleWatched(playable),
|
||||||
|
tooltip: playable.userData.played ? 'Mark unwatched' : 'Mark watched',
|
||||||
|
icon: Icon(playable.userData.played ? Icons.check_circle : Icons.check_circle_outline),
|
||||||
|
),
|
||||||
|
if (inContinue)
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('details-remove-continue'),
|
||||||
|
onPressed: _busy ? null : () => _removeFromContinue(playable),
|
||||||
|
tooltip: 'Remove from Continue',
|
||||||
|
icon: const Icon(Icons.remove_circle_outline),
|
||||||
|
),
|
||||||
|
if (isSeries)
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('details-open-series'),
|
||||||
|
tooltip: 'Open the series page',
|
||||||
|
onPressed: () => _c.open(SeriesRoute(d.series!, seasonId: seasonId)),
|
||||||
|
icon: const Icon(Icons.open_in_new),
|
||||||
|
),
|
||||||
|
if (client != null)
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('details-open-jellyfin'),
|
||||||
|
tooltip: ReuseText.openInJellyfin,
|
||||||
|
onPressed: () => openLink(jellyfinWebUrl(client.baseUrl, shown.id, serverId: _serverId)),
|
||||||
|
icon: const Icon(Icons.open_in_browser_rounded),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (_error != null) ...[
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Text(
|
||||||
|
_error!,
|
||||||
|
key: const ValueKey('details-hint'),
|
||||||
|
style: t.bodySmall?.copyWith(color: scheme.error),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
if (isSeries && playable != null) ...[
|
||||||
|
const SizedBox(height: 10),
|
||||||
|
Text(
|
||||||
|
[playable.episodeLabel ?? '', playable.name].where((s) => s.isNotEmpty).join(' · '),
|
||||||
|
style: t.titleSmall,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
if (left != null) ...[
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
Row(children: [
|
||||||
|
SizedBox(width: 160, child: LinearProgressIndicator(value: progressOf(playable!), minHeight: 3)),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(left, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
|
]),
|
||||||
|
],
|
||||||
|
if (shown.overview != null) ...[
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
Text(shown.overview!, style: t.bodyMedium),
|
||||||
|
],
|
||||||
|
if (!isSeries) ...[
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
_Tracks(item: d.item),
|
||||||
|
],
|
||||||
|
if (isSeries) ...[
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
_episodesHeader(context, d, seasonId),
|
||||||
|
if (episodes == null)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.all(24),
|
||||||
|
child: Center(child: CircularProgressIndicator(strokeWidth: 2)),
|
||||||
|
)
|
||||||
|
else if (episodes.isEmpty)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.symmetric(vertical: 12),
|
||||||
|
child: Text('No episodes', style: TextStyle(color: Colors.grey)),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
for (final e in episodes) _episodeRow(context, e, target?.id == e.id),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _episodesHeader(BuildContext context, _Data d, String? seasonId) {
|
||||||
|
final seasons = d.seasons;
|
||||||
|
return Row(
|
||||||
|
children: [
|
||||||
|
const Expanded(child: Text('Episodes', style: TextStyle(fontWeight: FontWeight.w600))),
|
||||||
|
if (seasons.length > 1)
|
||||||
|
Flexible(
|
||||||
|
child: AppSelect<String?>(
|
||||||
|
key: const ValueKey('details-season'),
|
||||||
|
value: seasonId,
|
||||||
|
items: [for (final s in seasons) (s.id, s.name)],
|
||||||
|
onChanged: (id) => setState(() => _seasonId = id),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _episodeRow(BuildContext context, JellyfinItem e, bool isTarget) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final t = Theme.of(context).textTheme;
|
||||||
|
final client = _client;
|
||||||
|
final sub = e.userData.played ? 'watched' : timeLeft(e) ?? (e.runTime == null ? '' : formatRuntime(e.runTime!));
|
||||||
|
return Material(
|
||||||
|
color: isTarget ? scheme.primary.withValues(alpha: 0.10) : Colors.transparent,
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
// The row's own context: its menu opens at the row.
|
||||||
|
child: Builder(builder: (context) => InkWell(
|
||||||
|
key: ValueKey('details-episode-${e.id}'),
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
onTap: () => _tapEpisode(e),
|
||||||
|
onSecondaryTap: () => _episodeMenu(context, e),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 5, horizontal: 4),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(4),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 64,
|
||||||
|
height: 36,
|
||||||
|
child: client == null
|
||||||
|
? ColoredBox(color: scheme.surfaceContainerHighest)
|
||||||
|
: JellyfinImage(
|
||||||
|
client: client,
|
||||||
|
image: e.ownImage(JellyfinImageType.primary) ?? e.image(JellyfinImageType.thumb),
|
||||||
|
icon: Icons.tv_outlined,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
e.indexNumber == null ? e.name : 'E${e.indexNumber} · ${e.name}',
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: t.bodyMedium?.copyWith(
|
||||||
|
color: isTarget ? scheme.primary : e.userData.played ? Colors.grey : null,
|
||||||
|
fontWeight: isTarget ? FontWeight.w600 : null,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (sub.isNotEmpty) Text(sub, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
AnimatedOpacity(
|
||||||
|
opacity: isTarget ? 1 : 0,
|
||||||
|
duration: easeTime,
|
||||||
|
child: Icon(Icons.play_circle, color: scheme.primary),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the file holds, one line per track kind.
|
||||||
|
class _Tracks extends StatelessWidget {
|
||||||
|
final JellyfinItem item;
|
||||||
|
const _Tracks({required this.item});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final t = Theme.of(context).textTheme;
|
||||||
|
final source = item.mediaSources.firstOrNull;
|
||||||
|
final streams = source?.mediaStreams.isNotEmpty == true ? source!.mediaStreams : item.mediaStreams;
|
||||||
|
if (streams.isEmpty) return const SizedBox.shrink();
|
||||||
|
String names(JellyfinStreamType type) => streams
|
||||||
|
.where((s) => s.type == type)
|
||||||
|
.map((s) => s.displayTitle ?? [s.language, s.codec].whereType<String>().join(' '))
|
||||||
|
.join(' · ');
|
||||||
|
final rows = [
|
||||||
|
('Video', names(JellyfinStreamType.video)),
|
||||||
|
('Audio', names(JellyfinStreamType.audio)),
|
||||||
|
('Subtitles', names(JellyfinStreamType.subtitle)),
|
||||||
|
if (source?.container != null || source?.size != null)
|
||||||
|
('File', [
|
||||||
|
?source?.container,
|
||||||
|
if (source?.size != null) '${(source!.size! / (1 << 30)).toStringAsFixed(2)} GB',
|
||||||
|
].join(' · ')),
|
||||||
|
].where((r) => r.$2.isNotEmpty);
|
||||||
|
return Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
for (final (label, value) in rows)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: 6),
|
||||||
|
child: Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
SizedBox(width: 76, child: Text(label, style: t.bodySmall?.copyWith(color: Colors.grey))),
|
||||||
|
Expanded(child: Text(value, style: t.bodySmall)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,6 +33,9 @@ bool isPlayable(JellyfinItem item) => switch (item.kind) {
|
|||||||
_ => !item.isFolder && item.mediaType == 'Video',
|
_ => !item.isFolder && item.mediaType == 'Video',
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// Cards that select (details panel) on click: playable items and series.
|
||||||
|
bool isSelectable(JellyfinItem item) => isPlayable(item) || item.kind == JellyfinItemKind.series;
|
||||||
|
|
||||||
/// Line under a card title: "S2E3 · 12 min left", "2019 · 24 eps", ...
|
/// Line under a card title: "S2E3 · 12 min left", "2019 · 24 eps", ...
|
||||||
String cardSubtitle(JellyfinItem item, {bool withSeries = false}) {
|
String cardSubtitle(JellyfinItem item, {bool withSeries = false}) {
|
||||||
final parts = <String>[];
|
final parts = <String>[];
|
||||||
|
|||||||
@@ -1,8 +1,12 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
import 'package:sync_relay_core/core.dart';
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../state/settings.dart';
|
||||||
|
import '../widgets/app_menu.dart';
|
||||||
import 'browse_scope.dart';
|
import 'browse_scope.dart';
|
||||||
import 'cards.dart';
|
import 'cards.dart';
|
||||||
|
import 'home_rows.dart';
|
||||||
|
|
||||||
/// Libraries that hold videos; music, books, photos and playlists are left
|
/// Libraries that hold videos; music, books, photos and playlists are left
|
||||||
/// out of the browser.
|
/// out of the browser.
|
||||||
@@ -19,9 +23,15 @@ IconData libraryIcon(JellyfinItem view) => switch (view.collectionType) {
|
|||||||
_ => Icons.folder_outlined,
|
_ => Icons.folder_outlined,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Start page: library shortcuts, then Continue watching, Next up and the
|
/// The video libraries of the scope's server (cached).
|
||||||
/// latest additions of each library. Each row loads on its own, so a slow
|
Future<List<JellyfinItem>> videoLibraries(BrowseScope scope) =>
|
||||||
/// library does not hold up the rest.
|
scope.load('views', (c) => c.userViews()).then((all) => all.where(isVideoLibrary).toList());
|
||||||
|
|
||||||
|
/// Start page: (library shortcuts,) one Continue row (resume points and
|
||||||
|
/// next up merged per series, see [mergeContinue]), then the newest
|
||||||
|
/// additions of each library as series cards ([latestCards]). Each row
|
||||||
|
/// loads on its own, so a slow library does not hold up the rest; rows
|
||||||
|
/// reload when watched state changes ([BrowseController.dataChanged]).
|
||||||
class JellyfinHomePage extends StatelessWidget {
|
class JellyfinHomePage extends StatelessWidget {
|
||||||
const JellyfinHomePage({super.key});
|
const JellyfinHomePage({super.key});
|
||||||
|
|
||||||
@@ -30,58 +40,49 @@ class JellyfinHomePage extends StatelessWidget {
|
|||||||
final scope = BrowseScope.of(context);
|
final scope = BrowseScope.of(context);
|
||||||
return Loader<List<JellyfinItem>>(
|
return Loader<List<JellyfinItem>>(
|
||||||
key: ValueKey('views-${scope.account.serverId}'),
|
key: ValueKey('views-${scope.account.serverId}'),
|
||||||
load: () => scope.load('views', (c) => c.userViews()),
|
load: () => videoLibraries(scope),
|
||||||
builder: (context, all) {
|
builder: (context, views) => ListenableBuilder(
|
||||||
final views = all.where(isVideoLibrary).toList();
|
listenable: scope.controller,
|
||||||
return ListView(
|
builder: (context, _) {
|
||||||
key: const PageStorageKey('jf-home'),
|
final v = scope.controller.version;
|
||||||
padding: const EdgeInsets.fromLTRB(0, 4, 0, 24),
|
return ListView(
|
||||||
children: [
|
key: const PageStorageKey('jf-home'),
|
||||||
_LibraryStrip(views: views),
|
padding: const EdgeInsets.fromLTRB(0, 4, 0, 24),
|
||||||
const SizedBox(height: 20),
|
children: [
|
||||||
_Section(
|
if (scope.libraryStrip) ...[
|
||||||
key: const ValueKey('row-resume'),
|
LibraryStrip(views: views),
|
||||||
title: 'Continue watching',
|
const SizedBox(height: 20),
|
||||||
shape: CardShape.thumb,
|
] else if (views.isEmpty)
|
||||||
seriesFirst: true,
|
const _NoLibraries(),
|
||||||
load: () => scope.load('resume', (c) => c.resume(limit: 30)),
|
_ContinueRow(version: v),
|
||||||
),
|
for (final view in views) _LatestRow(key: ValueKey('row-latest-${view.id}'), view: view, version: v),
|
||||||
_Section(
|
],
|
||||||
key: const ValueKey('row-nextup'),
|
);
|
||||||
title: 'Next up',
|
},
|
||||||
shape: CardShape.thumb,
|
),
|
||||||
seriesFirst: true,
|
|
||||||
load: () => scope.load('nextup', (c) => c.nextUp(limit: 30)),
|
|
||||||
),
|
|
||||||
for (final v in views)
|
|
||||||
_Section(
|
|
||||||
key: ValueKey('row-latest-${v.id}'),
|
|
||||||
title: 'Latest in ${v.name}',
|
|
||||||
shape: v.collectionType == 'homevideos' ? CardShape.thumb : CardShape.poster,
|
|
||||||
load: () => scope.load('latest:${v.id}', (c) => c.latest(v.id, limit: 30)),
|
|
||||||
trailing: TextButton(
|
|
||||||
onPressed: () => scope.onOpen(LibraryRoute(v)),
|
|
||||||
child: const Text('Show all'),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
},
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _LibraryStrip extends StatelessWidget {
|
class _NoLibraries extends StatelessWidget {
|
||||||
|
const _NoLibraries();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => const Padding(
|
||||||
|
padding: EdgeInsets.only(bottom: 20),
|
||||||
|
child: Text('No video libraries on this server for your user.', style: TextStyle(color: Colors.grey)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The libraries as chips; a click opens one.
|
||||||
|
class LibraryStrip extends StatelessWidget {
|
||||||
final List<JellyfinItem> views;
|
final List<JellyfinItem> views;
|
||||||
const _LibraryStrip({required this.views});
|
const LibraryStrip({super.key, required this.views});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final scope = BrowseScope.of(context);
|
final scope = BrowseScope.of(context);
|
||||||
if (views.isEmpty) {
|
if (views.isEmpty) return const _NoLibraries();
|
||||||
return const Text('No video libraries on this server for your user.',
|
|
||||||
style: TextStyle(color: Colors.grey));
|
|
||||||
}
|
|
||||||
return Wrap(
|
return Wrap(
|
||||||
spacing: 8,
|
spacing: 8,
|
||||||
runSpacing: 8,
|
runSpacing: 8,
|
||||||
@@ -92,46 +93,116 @@ class _LibraryStrip extends StatelessWidget {
|
|||||||
avatar: Icon(libraryIcon(v), size: 18),
|
avatar: Icon(libraryIcon(v), size: 18),
|
||||||
label: Text(v.name),
|
label: Text(v.name),
|
||||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
||||||
onPressed: () => scope.onOpen(LibraryRoute(v)),
|
onPressed: () => scope.controller.openTop(LibraryRoute(v)),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _Section extends StatelessWidget {
|
class _ContinueRow extends StatelessWidget {
|
||||||
final String title;
|
final int version;
|
||||||
final CardShape shape;
|
const _ContinueRow({required this.version});
|
||||||
final bool seriesFirst;
|
|
||||||
final Future<List<JellyfinItem>> Function() load;
|
static const title = 'Continue';
|
||||||
final Widget? trailing;
|
|
||||||
const _Section({
|
Future<List<JellyfinItem>> _load(BrowseScope scope) async {
|
||||||
super.key,
|
final lists = await Future.wait([
|
||||||
required this.title,
|
scope.load('resume', (c) => c.resume(limit: 40)),
|
||||||
required this.shape,
|
scope.load('nextup', (c) => c.nextUp(limit: 40)),
|
||||||
required this.load,
|
// Only for ordering: a failure leaves the row as it is.
|
||||||
this.seriesFirst = false,
|
scope
|
||||||
this.trailing,
|
.load('played', (c) => c.recentlyPlayed(limit: 150))
|
||||||
});
|
.catchError((Object _) => const <JellyfinItem>[]),
|
||||||
|
]);
|
||||||
|
return mergeContinue(
|
||||||
|
resume: lists[0],
|
||||||
|
nextUp: lists[1],
|
||||||
|
recentlyPlayed: lists[2],
|
||||||
|
dismissed: scope.accounts.continueDismissed(scope.account.serverId),
|
||||||
|
now: scope.controller.now(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
final scope = BrowseScope.of(context);
|
||||||
return Loader<List<JellyfinItem>>(
|
return Loader<List<JellyfinItem>>(
|
||||||
load: load,
|
version: version,
|
||||||
|
load: () => _load(scope),
|
||||||
|
showError: false,
|
||||||
|
loading: const _RowSkeleton(title: title, shape: CardShape.thumb),
|
||||||
|
builder: (context, items) {
|
||||||
|
scope.controller.continueKeys = {for (final i in items) continueKey(i)};
|
||||||
|
if (items.isEmpty) return const SizedBox.shrink();
|
||||||
|
return Padding(
|
||||||
|
key: const ValueKey('row-continue'),
|
||||||
|
padding: const EdgeInsets.only(bottom: 24),
|
||||||
|
child: MediaRow(
|
||||||
|
title: title,
|
||||||
|
entries: cardEntries(items),
|
||||||
|
shape: CardShape.thumb,
|
||||||
|
seriesFirst: true,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _LatestRow extends StatelessWidget {
|
||||||
|
final JellyfinItem view;
|
||||||
|
final int version;
|
||||||
|
const _LatestRow({super.key, required this.view, required this.version});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scope = BrowseScope.of(context);
|
||||||
|
final title = 'Latest in ${view.name}';
|
||||||
|
final shape = view.collectionType == 'homevideos' ? CardShape.thumb : CardShape.poster;
|
||||||
|
return Loader<List<JellyfinItem>>(
|
||||||
|
version: version,
|
||||||
|
load: () => scope.load('latest:${view.id}', (c) => c.latest(view.id, limit: 100, groupItems: false)),
|
||||||
showError: false,
|
showError: false,
|
||||||
loading: _RowSkeleton(title: title, shape: shape),
|
loading: _RowSkeleton(title: title, shape: shape),
|
||||||
builder: (context, items) => items.isEmpty
|
builder: (context, items) => SignalBuilder(builder: (context) {
|
||||||
? const SizedBox.shrink()
|
final hide = AppSettings.instance.hideReReleases.value;
|
||||||
: Padding(
|
final cards = latestCards(items, hideReReleases: hide);
|
||||||
padding: const EdgeInsets.only(bottom: 24),
|
if (cards.isEmpty) return const SizedBox.shrink();
|
||||||
child: MediaRow(
|
return Padding(
|
||||||
title: title,
|
padding: const EdgeInsets.only(bottom: 24),
|
||||||
items: items,
|
child: MediaRow(
|
||||||
shape: shape,
|
key: ValueKey('latest-${view.id}'),
|
||||||
seriesFirst: seriesFirst,
|
title: title,
|
||||||
trailing: trailing,
|
entries: [for (final c in cards) (item: c.item, display: c.display, subtitle: c.subtitle)],
|
||||||
),
|
shape: shape,
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
TextButton(
|
||||||
|
key: ValueKey('show-all-${view.id}'),
|
||||||
|
// Newest first, like the row.
|
||||||
|
onPressed: () => scope.onOpen(LibraryRoute(view, sort: 'added')),
|
||||||
|
child: const Text('Show all'),
|
||||||
|
),
|
||||||
|
AppMenuButton<bool>(
|
||||||
|
key: ValueKey('latest-menu-${view.id}'),
|
||||||
|
tooltip: 'Row options',
|
||||||
|
items: () => [
|
||||||
|
AppMenuItem(
|
||||||
|
key: const ValueKey('hide-rereleases'),
|
||||||
|
value: !hide,
|
||||||
|
checked: hide,
|
||||||
|
label: 'Hide re-releases in Latest',
|
||||||
|
),
|
||||||
|
],
|
||||||
|
onSelected: AppSettings.instance.setHideReReleases,
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,163 @@
|
|||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import 'format.dart';
|
||||||
|
|
||||||
|
// What the Jellyfin home rows show, as pure functions over the API lists
|
||||||
|
// (tested without widgets).
|
||||||
|
|
||||||
|
/// Series not watched for longer than this leave the Continue row, unless
|
||||||
|
/// nothing newer is left.
|
||||||
|
const continueMaxAge = Duration(days: 60);
|
||||||
|
|
||||||
|
/// Added this long after it first aired: a re-release ([isReRelease]).
|
||||||
|
const reReleaseAge = Duration(days: 30);
|
||||||
|
|
||||||
|
/// One Continue card per series: an episode's series, else the item itself.
|
||||||
|
String continueKey(JellyfinItem item) => item.seriesId ?? item.id;
|
||||||
|
|
||||||
|
DateTime? _later(DateTime? a, DateTime? b) =>
|
||||||
|
a == null ? b : b == null || !b.isAfter(a) ? a : b;
|
||||||
|
|
||||||
|
/// The Continue row: Continue watching ([resume]) and Next up ([nextUp])
|
||||||
|
/// merged into one card per series, the series watched most recently first.
|
||||||
|
/// A series shows its resume item when that was the last thing played in
|
||||||
|
/// it, else its next-up episode. When a series was last played comes from
|
||||||
|
/// the resume points and from [recentlyPlayed] (finished episodes, which
|
||||||
|
/// next-up items do not carry). Series untouched for [maxAge] are left out
|
||||||
|
/// unless nothing else is left; [dismissed] (key -> when) hides a series
|
||||||
|
/// until it is played again after that.
|
||||||
|
List<JellyfinItem> mergeContinue({
|
||||||
|
required List<JellyfinItem> resume,
|
||||||
|
required List<JellyfinItem> nextUp,
|
||||||
|
List<JellyfinItem> recentlyPlayed = const [],
|
||||||
|
Map<String, DateTime> dismissed = const {},
|
||||||
|
required DateTime now,
|
||||||
|
Duration maxAge = continueMaxAge,
|
||||||
|
}) {
|
||||||
|
final finished = <String, DateTime>{};
|
||||||
|
for (final p in recentlyPlayed) {
|
||||||
|
final at = p.userData.lastPlayedDate;
|
||||||
|
if (at != null) finished[continueKey(p)] = _later(finished[continueKey(p)], at)!;
|
||||||
|
}
|
||||||
|
final resumeBy = <String, JellyfinItem>{};
|
||||||
|
final nextBy = <String, JellyfinItem>{};
|
||||||
|
final order = <String>[];
|
||||||
|
for (final r in resume) {
|
||||||
|
final k = continueKey(r);
|
||||||
|
final had = resumeBy[k];
|
||||||
|
if (had == null) order.add(k);
|
||||||
|
final at = r.userData.lastPlayedDate;
|
||||||
|
if (had == null || (at != null && at.isAfter(had.userData.lastPlayedDate ?? DateTime(0)))) {
|
||||||
|
resumeBy[k] = r;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (final n in nextUp) {
|
||||||
|
final k = continueKey(n);
|
||||||
|
if (nextBy.containsKey(k)) continue;
|
||||||
|
nextBy[k] = n;
|
||||||
|
if (!resumeBy.containsKey(k)) order.add(k);
|
||||||
|
}
|
||||||
|
|
||||||
|
final cards = <({JellyfinItem item, DateTime? at, int index})>[];
|
||||||
|
for (final (i, k) in order.indexed) {
|
||||||
|
final r = resumeBy[k], n = nextBy[k], done = finished[k];
|
||||||
|
final resumedAt = r?.userData.lastPlayedDate;
|
||||||
|
final JellyfinItem item;
|
||||||
|
if (r != null && (n == null || (resumedAt != null && (done == null || !resumedAt.isBefore(done))))) {
|
||||||
|
item = r;
|
||||||
|
} else {
|
||||||
|
item = n!;
|
||||||
|
}
|
||||||
|
final at = _later(resumedAt, done);
|
||||||
|
final hiddenAt = dismissed[k];
|
||||||
|
if (hiddenAt != null && (at == null || !at.isAfter(hiddenAt))) continue;
|
||||||
|
cards.add((item: item, at: at, index: i));
|
||||||
|
}
|
||||||
|
cards.sort((a, b) {
|
||||||
|
if (a.at == null || b.at == null) {
|
||||||
|
return a.at == b.at ? a.index.compareTo(b.index) : (a.at == null ? 1 : -1);
|
||||||
|
}
|
||||||
|
final c = b.at!.compareTo(a.at!);
|
||||||
|
return c != 0 ? c : a.index.compareTo(b.index);
|
||||||
|
});
|
||||||
|
final fresh = [for (final c in cards) if (c.at != null && now.difference(c.at!) <= maxAge) c.item];
|
||||||
|
return fresh.isNotEmpty ? fresh : [for (final c in cards) c.item];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Added to the library long ([age]) after it first aired: a re-upload or
|
||||||
|
/// an old season added late, not news. Unknown dates are never re-releases.
|
||||||
|
bool isReRelease(JellyfinItem item, {Duration age = reReleaseAge}) {
|
||||||
|
final aired = item.premiereDate, added = item.dateCreated;
|
||||||
|
return aired != null && added != null && added.difference(aired) > age;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One card of a "Latest in X" row: [item] is what selecting or putting it
|
||||||
|
/// up acts on, [display] gives the picture and title, [subtitle] the line
|
||||||
|
/// under it.
|
||||||
|
class LatestCard {
|
||||||
|
final JellyfinItem item;
|
||||||
|
final JellyfinItem display;
|
||||||
|
final String subtitle;
|
||||||
|
const LatestCard(this.item, this.display, this.subtitle);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A series to show for [episode]: its id, name and poster.
|
||||||
|
JellyfinItem seriesOf(JellyfinItem episode) => JellyfinItem(
|
||||||
|
id: episode.seriesId!,
|
||||||
|
name: episode.seriesName ?? episode.name,
|
||||||
|
type: JellyfinItemType.series,
|
||||||
|
isFolder: true,
|
||||||
|
imageTags: {
|
||||||
|
if (episode.seriesPrimaryImageTag != null)
|
||||||
|
JellyfinImageType.primary.apiName: episode.seriesPrimaryImageTag!,
|
||||||
|
},
|
||||||
|
parentBackdropItemId: episode.parentBackdropItemId,
|
||||||
|
parentBackdropImageTags: episode.parentBackdropImageTags,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// "Latest in X" from the library's newest items (ungrouped, newest
|
||||||
|
/// first): episodes become one card per series (its poster and name,
|
||||||
|
/// "S1E1" for a single new episode, else "N new"), in order of the newest
|
||||||
|
/// episode; movies and other items stay as they are. With [hideReReleases]
|
||||||
|
/// items that [isReRelease] are left out first.
|
||||||
|
List<LatestCard> latestCards(List<JellyfinItem> items, {bool hideReReleases = true}) {
|
||||||
|
final kept = hideReReleases ? items.where((i) => !isReRelease(i)) : items;
|
||||||
|
final groups = <String, List<JellyfinItem>>{};
|
||||||
|
final out = <Object>[]; // a JellyfinItem, or a series id (group)
|
||||||
|
for (final i in kept) {
|
||||||
|
final sid = i.seriesId;
|
||||||
|
if (i.kind == JellyfinItemKind.episode && sid != null) {
|
||||||
|
final g = groups[sid];
|
||||||
|
if (g == null) {
|
||||||
|
groups[sid] = [i];
|
||||||
|
out.add(sid);
|
||||||
|
} else {
|
||||||
|
g.add(i);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
out.add(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
for (final o in out)
|
||||||
|
if (o is JellyfinItem)
|
||||||
|
LatestCard(
|
||||||
|
o,
|
||||||
|
o,
|
||||||
|
o.kind == JellyfinItemKind.series && (o.childCount ?? 0) > 1
|
||||||
|
? '${o.childCount} new'
|
||||||
|
: cardSubtitle(o),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
_seriesCard(groups[o]!),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
LatestCard _seriesCard(List<JellyfinItem> eps) {
|
||||||
|
final series = seriesOf(eps.first);
|
||||||
|
if (eps.length == 1) {
|
||||||
|
final e = eps.single;
|
||||||
|
return LatestCard(e, series, e.episodeLabel ?? e.name);
|
||||||
|
}
|
||||||
|
return LatestCard(series, series, '${eps.length} new');
|
||||||
|
}
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
import 'package:flutter/foundation.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:sync_relay_core/core.dart';
|
|
||||||
|
|
||||||
import 'browse_scope.dart';
|
|
||||||
import 'format.dart';
|
|
||||||
import 'images.dart';
|
|
||||||
|
|
||||||
/// Side pane on wide windows: details of whatever card is hovered or
|
|
||||||
/// focused, so browsing needs no extra clicks. Pick / Open act on it.
|
|
||||||
class JellyfinInspector extends StatelessWidget {
|
|
||||||
final ValueListenable<JellyfinItem?> item;
|
|
||||||
const JellyfinInspector({super.key, required this.item});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final scheme = Theme.of(context).colorScheme;
|
|
||||||
return DecoratedBox(
|
|
||||||
key: const ValueKey('jf-inspector'),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: scheme.surfaceContainerLow,
|
|
||||||
borderRadius: BorderRadius.circular(12),
|
|
||||||
border: Border.all(color: scheme.outlineVariant.withValues(alpha: 0.4)),
|
|
||||||
),
|
|
||||||
child: ValueListenableBuilder<JellyfinItem?>(
|
|
||||||
valueListenable: item,
|
|
||||||
builder: (context, it, _) => it == null
|
|
||||||
? const Center(
|
|
||||||
child: Padding(
|
|
||||||
padding: EdgeInsets.all(24),
|
|
||||||
child: Text('Hover or focus a title to see its details here.',
|
|
||||||
textAlign: TextAlign.center, style: TextStyle(color: Colors.grey)),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: _Body(item: it),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _Body extends StatelessWidget {
|
|
||||||
final JellyfinItem item;
|
|
||||||
const _Body({required this.item});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final scope = BrowseScope.of(context);
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
final playable = isPlayable(item);
|
|
||||||
final selected = scope.selectedItemId == item.id;
|
|
||||||
final episode = item.kind == JellyfinItemKind.episode;
|
|
||||||
final art = episode
|
|
||||||
? item.ownImage(JellyfinImageType.primary) ?? item.image(JellyfinImageType.backdrop)
|
|
||||||
: item.image(JellyfinImageType.backdrop) ?? item.image(JellyfinImageType.thumb);
|
|
||||||
final meta = [
|
|
||||||
if (item.productionYear != null) '${item.productionYear}',
|
|
||||||
if (playable && item.runTime != null) formatRuntime(item.runTime!),
|
|
||||||
if (item.officialRating != null) item.officialRating!,
|
|
||||||
if (item.communityRating != null) '★ ${item.communityRating!.toStringAsFixed(1)}',
|
|
||||||
if (!playable && (item.userData.unplayedItemCount ?? 0) > 0)
|
|
||||||
'${item.userData.unplayedItemCount} unwatched',
|
|
||||||
if (item.userData.played) 'Watched',
|
|
||||||
].join(' · ');
|
|
||||||
return ListView(
|
|
||||||
padding: EdgeInsets.zero,
|
|
||||||
children: [
|
|
||||||
ClipRRect(
|
|
||||||
borderRadius: const BorderRadius.vertical(top: Radius.circular(12)),
|
|
||||||
child: AspectRatio(
|
|
||||||
aspectRatio: 16 / 9,
|
|
||||||
child: JellyfinImage(client: scope.client, image: art),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.all(16),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
if (episode && item.seriesName != null)
|
|
||||||
Text(item.seriesName!, style: t.labelLarge?.copyWith(color: Colors.grey)),
|
|
||||||
Text(
|
|
||||||
episode && item.episodeLabel != null ? '${item.episodeLabel} ${item.name}' : item.name,
|
|
||||||
style: t.titleMedium,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Text(meta, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
if (timeLeft(item) != null) ...[
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
LinearProgressIndicator(value: progressOf(item), minHeight: 3),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Text(timeLeft(item)!, style: t.bodySmall),
|
|
||||||
],
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
Wrap(spacing: 8, runSpacing: 8, children: [
|
|
||||||
if (playable)
|
|
||||||
FilledButton.icon(
|
|
||||||
onPressed: () => scope.onPick(item),
|
|
||||||
icon: Icon(selected ? Icons.check : Icons.play_arrow, size: 18),
|
|
||||||
label: Text(selected ? 'Picked' : 'Pick'),
|
|
||||||
)
|
|
||||||
else
|
|
||||||
FilledButton.tonalIcon(
|
|
||||||
onPressed: () => scope.activate(item),
|
|
||||||
icon: const Icon(Icons.arrow_forward, size: 18),
|
|
||||||
label: const Text('Open'),
|
|
||||||
),
|
|
||||||
if (playable)
|
|
||||||
OutlinedButton(
|
|
||||||
onPressed: () => scope.onOpen(DetailRoute(item)),
|
|
||||||
child: const Text('Details'),
|
|
||||||
),
|
|
||||||
if (episode && item.seriesId != null)
|
|
||||||
OutlinedButton(
|
|
||||||
onPressed: () => scope.openSeriesOf(item),
|
|
||||||
child: const Text('Series'),
|
|
||||||
),
|
|
||||||
]),
|
|
||||||
if (item.overview != null) ...[
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
Text(item.overview!, style: t.bodyMedium),
|
|
||||||
],
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -39,15 +39,18 @@ const libraryPageSize = 100;
|
|||||||
/// pages load as they come near the viewport.
|
/// pages load as they come near the viewport.
|
||||||
class JellyfinLibraryPage extends StatefulWidget {
|
class JellyfinLibraryPage extends StatefulWidget {
|
||||||
final JellyfinItem folder;
|
final JellyfinItem folder;
|
||||||
const JellyfinLibraryPage({super.key, required this.folder});
|
/// A [LibrarySort] name to start with (in its natural direction).
|
||||||
|
final String? sort;
|
||||||
|
const JellyfinLibraryPage({super.key, required this.folder, this.sort});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<JellyfinLibraryPage> createState() => _JellyfinLibraryPageState();
|
State<JellyfinLibraryPage> createState() => _JellyfinLibraryPageState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _JellyfinLibraryPageState extends State<JellyfinLibraryPage> {
|
class _JellyfinLibraryPageState extends State<JellyfinLibraryPage> {
|
||||||
LibrarySort _sort = LibrarySort.name;
|
late LibrarySort _sort =
|
||||||
bool _descending = false;
|
LibrarySort.values.where((s) => s.name == widget.sort).firstOrNull ?? LibrarySort.name;
|
||||||
|
late bool _descending = _sort.descending;
|
||||||
bool _unplayed = false;
|
bool _unplayed = false;
|
||||||
bool _favorites = false;
|
bool _favorites = false;
|
||||||
|
|
||||||
|
|||||||
@@ -1,31 +1,37 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import '../screens/home/picked_media.dart';
|
|
||||||
import '../screens/home/ui.dart';
|
import '../screens/home/ui.dart';
|
||||||
import 'accounts.dart';
|
import 'accounts.dart';
|
||||||
import 'browse_scope.dart';
|
import 'browse_scope.dart';
|
||||||
import 'browser.dart';
|
import 'browser.dart';
|
||||||
import 'sign_in_panel.dart';
|
import 'sign_in_panel.dart';
|
||||||
|
|
||||||
/// The media picker's Jellyfin source: the library browser once a server
|
/// The Library's Jellyfin source: the library browser once a server is
|
||||||
/// is linked, else an inline add-server panel.
|
/// linked, else [empty] (default: an inline add-server panel).
|
||||||
class JellyfinPickerSource extends StatefulWidget {
|
class JellyfinPickerSource extends StatefulWidget {
|
||||||
final JellyfinAccounts accounts;
|
final JellyfinAccounts accounts;
|
||||||
final JellyfinMedia? selected;
|
final BrowseController? controller;
|
||||||
final ValueChanged<JellyfinMedia> onPick;
|
final JellyfinSelection? selected;
|
||||||
|
final ValueChanged<JellyfinSelection> onSelect;
|
||||||
|
final ValueChanged<JellyfinSelection> onPutUp;
|
||||||
|
final void Function(JellyfinSelection item, {bool next})? onAddToQueue;
|
||||||
final VoidCallback? onOpenIntegrations;
|
final VoidCallback? onOpenIntegrations;
|
||||||
final VoidCallback? onToggleExpanded;
|
|
||||||
final bool expanded;
|
|
||||||
final BrowseStart? start;
|
final BrowseStart? start;
|
||||||
|
final bool libraryStrip;
|
||||||
|
/// Shown while no server is linked.
|
||||||
|
final WidgetBuilder? empty;
|
||||||
const JellyfinPickerSource({
|
const JellyfinPickerSource({
|
||||||
super.key,
|
super.key,
|
||||||
this.start,
|
this.start,
|
||||||
required this.accounts,
|
required this.accounts,
|
||||||
required this.onPick,
|
required this.onSelect,
|
||||||
|
required this.onPutUp,
|
||||||
|
this.onAddToQueue,
|
||||||
|
this.controller,
|
||||||
this.selected,
|
this.selected,
|
||||||
this.onOpenIntegrations,
|
this.onOpenIntegrations,
|
||||||
this.onToggleExpanded,
|
this.libraryStrip = true,
|
||||||
this.expanded = false,
|
this.empty,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -48,16 +54,19 @@ class _JellyfinPickerSourceState extends State<JellyfinPickerSource> {
|
|||||||
if (!a.loaded) {
|
if (!a.loaded) {
|
||||||
return const Center(child: CircularProgressIndicator(strokeWidth: 2));
|
return const Center(child: CircularProgressIndicator(strokeWidth: 2));
|
||||||
}
|
}
|
||||||
|
if (a.isEmpty && widget.empty != null) return widget.empty!(context);
|
||||||
if (a.isEmpty) return _LinkFirst(accounts: a, onOpenIntegrations: widget.onOpenIntegrations);
|
if (a.isEmpty) return _LinkFirst(accounts: a, onOpenIntegrations: widget.onOpenIntegrations);
|
||||||
return JellyfinBrowser(
|
return JellyfinBrowser(
|
||||||
key: const ValueKey('media-jellyfin'),
|
key: const ValueKey('media-jellyfin'),
|
||||||
accounts: a,
|
accounts: a,
|
||||||
|
controller: widget.controller,
|
||||||
selected: widget.selected,
|
selected: widget.selected,
|
||||||
onPick: widget.onPick,
|
onSelect: widget.onSelect,
|
||||||
|
onPutUp: widget.onPutUp,
|
||||||
|
onAddToQueue: widget.onAddToQueue,
|
||||||
onOpenIntegrations: widget.onOpenIntegrations,
|
onOpenIntegrations: widget.onOpenIntegrations,
|
||||||
onToggleExpanded: widget.onToggleExpanded,
|
|
||||||
expanded: widget.expanded,
|
|
||||||
start: widget.start,
|
start: widget.start,
|
||||||
|
libraryStrip: widget.libraryStrip,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'dart:math' as math;
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:sync_relay_core/core.dart';
|
import 'package:sync_relay_core/core.dart';
|
||||||
@@ -24,6 +25,14 @@ class PlayerSnapshot {
|
|||||||
/// go out one after another; a failure is logged and handed to [onError]
|
/// go out one after another; a failure is logged and handed to [onError]
|
||||||
/// (the session shows one quiet toast) and never touches playback. A 401
|
/// (the session shows one quiet toast) and never touches playback. A 401
|
||||||
/// calls [onUnauthorized] and ends reporting.
|
/// calls [onUnauthorized] and ends reporting.
|
||||||
|
///
|
||||||
|
/// Watched or not is [WatchSession]'s rule, not Jellyfin's position
|
||||||
|
/// percentages (see ARCHITECTURE.md "Jellyfin in a session"): an item
|
||||||
|
/// played before ([playedBefore]) stays played (re-marked after Playing,
|
||||||
|
/// Progress without a position, Stopped without one, then marked played
|
||||||
|
/// again); otherwise Progress leaves the position out past
|
||||||
|
/// [_noPositionFrom] of the runtime so Jellyfin cannot mark it played on
|
||||||
|
/// its own, and Stopped carries what the rule says.
|
||||||
class JellyfinProgressReporter {
|
class JellyfinProgressReporter {
|
||||||
final JellyfinClient client;
|
final JellyfinClient client;
|
||||||
final String itemId;
|
final String itemId;
|
||||||
@@ -34,20 +43,41 @@ class JellyfinProgressReporter {
|
|||||||
final void Function(Object error)? onError;
|
final void Function(Object error)? onError;
|
||||||
final VoidCallback? onUnauthorized;
|
final VoidCallback? onUnauthorized;
|
||||||
|
|
||||||
|
/// What this viewer watched of the item while it was open here.
|
||||||
|
final WatchSession watch;
|
||||||
|
|
||||||
JellyfinProgressReporter({
|
JellyfinProgressReporter({
|
||||||
required this.client,
|
required this.client,
|
||||||
required this.itemId,
|
required this.itemId,
|
||||||
required this.source,
|
required this.source,
|
||||||
required this.playSessionId,
|
required this.playSessionId,
|
||||||
|
bool playedBefore = false,
|
||||||
|
int resumeTicksBefore = 0,
|
||||||
this.interval = const Duration(seconds: 10),
|
this.interval = const Duration(seconds: 10),
|
||||||
this.onError,
|
this.onError,
|
||||||
this.onUnauthorized,
|
this.onUnauthorized,
|
||||||
|
this.onStopped,
|
||||||
DateTime Function()? clock,
|
DateTime Function()? clock,
|
||||||
}) : _clock = clock ?? DateTime.now;
|
}) : _clock = clock ?? DateTime.now,
|
||||||
|
_keepPlayed = playedBefore,
|
||||||
|
_runtime = (source.runTimeTicks ?? 0) / jellyfinTicksPerSecond,
|
||||||
|
watch = WatchSession(
|
||||||
|
playedBefore: playedBefore, resumeBefore: resumeTicksBefore / jellyfinTicksPerSecond);
|
||||||
|
|
||||||
|
/// Past this share of the runtime Progress carries no position: Jellyfin
|
||||||
|
/// marks an item played past its "max resume" share (90 % by default).
|
||||||
|
static const _noPositionFrom = 0.85;
|
||||||
|
|
||||||
|
/// After Stopped (and a mark played) went out: the item's watched
|
||||||
|
/// state on the server may differ from what lists show.
|
||||||
|
final void Function()? onStopped;
|
||||||
|
|
||||||
Future<void> _chain = Future.value();
|
Future<void> _chain = Future.value();
|
||||||
bool _playing = false;
|
bool _playing = false;
|
||||||
bool _dead = false;
|
bool _dead = false;
|
||||||
|
bool _keepPlayed;
|
||||||
|
double _runtime;
|
||||||
|
double? _endingStart;
|
||||||
PlayerSnapshot? _last;
|
PlayerSnapshot? _last;
|
||||||
DateTime? _lastAt;
|
DateTime? _lastAt;
|
||||||
DateTime? _lastSentAt;
|
DateTime? _lastSentAt;
|
||||||
@@ -55,13 +85,23 @@ class JellyfinProgressReporter {
|
|||||||
/// Between [start] and [stop].
|
/// Between [start] and [stop].
|
||||||
bool get active => _playing && !_dead;
|
bool get active => _playing && !_dead;
|
||||||
|
|
||||||
|
/// The item counts as played here (before, or by the rule at a stop).
|
||||||
|
bool get keepsPlayed => _keepPlayed;
|
||||||
|
|
||||||
|
/// The player's duration (used when Jellyfin gave no runtime) and where
|
||||||
|
/// the ending starts (Outro segment / ED chapter), seconds.
|
||||||
|
void timeline({double duration = 0, double? endingStart}) {
|
||||||
|
if ((source.runTimeTicks ?? 0) <= 0 && duration > 0) _runtime = duration;
|
||||||
|
_endingStart = endingStart;
|
||||||
|
}
|
||||||
|
|
||||||
/// The report body for [s]: ticks, pause, and mpv's aid/sid mapped to
|
/// The report body for [s]: ticks, pause, and mpv's aid/sid mapped to
|
||||||
/// Jellyfin stream indices (-1 = subtitles off).
|
/// Jellyfin stream indices (-1 = subtitles off).
|
||||||
JellyfinPlaybackReport reportFor(PlayerSnapshot s) => JellyfinPlaybackReport(
|
JellyfinPlaybackReport reportFor(PlayerSnapshot s, {bool withPosition = true}) => JellyfinPlaybackReport(
|
||||||
itemId: itemId,
|
itemId: itemId,
|
||||||
mediaSourceId: source.id,
|
mediaSourceId: source.id,
|
||||||
playSessionId: playSessionId,
|
playSessionId: playSessionId,
|
||||||
positionTicks: (s.position * jellyfinTicksPerSecond).round(),
|
positionTicks: withPosition ? _ticks(s.position) : null,
|
||||||
isPaused: s.paused,
|
isPaused: s.paused,
|
||||||
audioStreamIndex: s.aid == null
|
audioStreamIndex: s.aid == null
|
||||||
? null
|
? null
|
||||||
@@ -71,13 +111,24 @@ class JellyfinProgressReporter {
|
|||||||
: source.jellyfinIndexForMpvTrack(JellyfinStreamType.subtitle, s.sid!),
|
: source.jellyfinIndexForMpvTrack(JellyfinStreamType.subtitle, s.sid!),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
static int _ticks(double secs) => (secs * jellyfinTicksPerSecond).round();
|
||||||
|
|
||||||
|
/// Progress may carry the position: not for a played item, not without
|
||||||
|
/// a runtime and not near the end (either would let Jellyfin decide).
|
||||||
|
bool _progressPosition(double position) =>
|
||||||
|
!_keepPlayed && _runtime > 0 && position < _noPositionFrom * _runtime;
|
||||||
|
|
||||||
/// Playing: once the media is open. Again after [stop] (played to the
|
/// Playing: once the media is open. Again after [stop] (played to the
|
||||||
/// end, then someone seeked back) starts reporting anew.
|
/// end, then someone seeked back) starts reporting anew. A played item
|
||||||
|
/// is marked played again right after (Jellyfin up to 10.11 clears it
|
||||||
|
/// on Playing).
|
||||||
void start(PlayerSnapshot s) {
|
void start(PlayerSnapshot s) {
|
||||||
if (_playing || _dead) return;
|
if (_playing || _dead) return;
|
||||||
_playing = true;
|
_playing = true;
|
||||||
_mark(s);
|
_mark(s);
|
||||||
|
watch.sample(s.position, playing: !s.paused, at: _clock());
|
||||||
_send('Playing', () => client.reportPlaybackStart(reportFor(s)));
|
_send('Playing', () => client.reportPlaybackStart(reportFor(s)));
|
||||||
|
if (_keepPlayed) _send('played', () => client.markPlayed(itemId));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Progress when due (see the class doc).
|
/// Progress when due (see the class doc).
|
||||||
@@ -85,6 +136,7 @@ class JellyfinProgressReporter {
|
|||||||
if (!_playing || _dead) return;
|
if (!_playing || _dead) return;
|
||||||
final last = _last, lastAt = _lastAt, sentAt = _lastSentAt;
|
final last = _last, lastAt = _lastAt, sentAt = _lastSentAt;
|
||||||
final now = _clock();
|
final now = _clock();
|
||||||
|
watch.sample(s.position, playing: !s.paused, at: now);
|
||||||
var due = force || last == null || lastAt == null || sentAt == null;
|
var due = force || last == null || lastAt == null || sentAt == null;
|
||||||
if (!due) {
|
if (!due) {
|
||||||
final elapsed = now.difference(lastAt).inMilliseconds / 1000;
|
final elapsed = now.difference(lastAt).inMilliseconds / 1000;
|
||||||
@@ -99,16 +151,44 @@ class JellyfinProgressReporter {
|
|||||||
_lastAt = now;
|
_lastAt = now;
|
||||||
if (!due) return;
|
if (!due) return;
|
||||||
_lastSentAt = now;
|
_lastSentAt = now;
|
||||||
_send('Progress', () => client.reportPlaybackProgress(reportFor(s)));
|
final report = reportFor(s, withPosition: _progressPosition(s.position));
|
||||||
|
_send('Progress', () => client.reportPlaybackProgress(report));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Stopped (swap, leave, kick, window close, played to the end).
|
/// Stopped (swap, leave, kick, window close, played to the end), as
|
||||||
|
/// [WatchSession.verdict] says: played (or kept played) -> no position,
|
||||||
|
/// then marked played; a peek -> the resume point from before; part way
|
||||||
|
/// -> the position, held under [_noPositionFrom] of the runtime.
|
||||||
/// Completes when it and everything before it went out.
|
/// Completes when it and everything before it went out.
|
||||||
Future<void> stop(PlayerSnapshot s) {
|
Future<void> stop(PlayerSnapshot s) {
|
||||||
if (!_playing || _dead) return _chain;
|
if (!_playing || _dead) return _chain;
|
||||||
_playing = false;
|
_playing = false;
|
||||||
_send('Stopped', () => client.reportPlaybackStopped(reportFor(s)));
|
watch.sample(s.position, playing: !s.paused, at: _clock());
|
||||||
return _chain;
|
final v = _keepPlayed
|
||||||
|
? const WatchVerdict(WatchOutcome.keepPlayed)
|
||||||
|
: watch.verdict(runtime: _runtime, endingStart: _endingStart);
|
||||||
|
debugPrint('jellyfin $itemId: $v (covered ${watch.covered.round()} s of ${_runtime.round()} s)');
|
||||||
|
final int? ticks;
|
||||||
|
switch (v.outcome) {
|
||||||
|
case WatchOutcome.played || WatchOutcome.keepPlayed:
|
||||||
|
_keepPlayed = true;
|
||||||
|
ticks = null;
|
||||||
|
case WatchOutcome.peek:
|
||||||
|
ticks = _ticks(watch.resumeBefore);
|
||||||
|
case WatchOutcome.partial:
|
||||||
|
final at = v.resumeAt ?? s.position;
|
||||||
|
ticks = _ticks(_runtime > 0 ? math.min(at, _noPositionFrom * _runtime) : at);
|
||||||
|
}
|
||||||
|
final report = JellyfinPlaybackReport(
|
||||||
|
itemId: itemId, mediaSourceId: source.id, playSessionId: playSessionId, positionTicks: ticks);
|
||||||
|
_send('Stopped', () => client.reportPlaybackStopped(report));
|
||||||
|
if (ticks == null) {
|
||||||
|
_send('played', () => client.markPlayed(itemId));
|
||||||
|
// Marking played keeps a resume point Progress left (Continue would
|
||||||
|
// still list it, "3 min left"): clear it.
|
||||||
|
_send('resume cleared', () => client.clearResumePosition(itemId));
|
||||||
|
}
|
||||||
|
return _chain = _chain.then((_) => onStopped?.call());
|
||||||
}
|
}
|
||||||
|
|
||||||
void _mark(PlayerSnapshot s) {
|
void _mark(PlayerSnapshot s) {
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
|
||||||
import 'package:sync_relay_core/core.dart';
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
import 'browse_scope.dart';
|
import 'browse_scope.dart';
|
||||||
|
import 'cards.dart' show doubleClickTime;
|
||||||
import 'format.dart';
|
import 'format.dart';
|
||||||
import 'images.dart';
|
import 'images.dart';
|
||||||
|
|
||||||
@@ -60,6 +60,7 @@ class _JellyfinSeriesPageState extends State<JellyfinSeriesPage> {
|
|||||||
final scope = BrowseScope.of(context);
|
final scope = BrowseScope.of(context);
|
||||||
return Loader<_SeriesData>(
|
return Loader<_SeriesData>(
|
||||||
key: ValueKey('series-${widget.series.id}-${scope.account.serverId}'),
|
key: ValueKey('series-${widget.series.id}-${scope.account.serverId}'),
|
||||||
|
version: scope.controller.version,
|
||||||
load: () => _load(scope),
|
load: () => _load(scope),
|
||||||
builder: (context, d) {
|
builder: (context, d) {
|
||||||
final seasonId = (_seasonId != null && d.seasons.any((s) => s.id == _seasonId))
|
final seasonId = (_seasonId != null && d.seasons.any((s) => s.id == _seasonId))
|
||||||
@@ -99,6 +100,7 @@ class _JellyfinSeriesPageState extends State<JellyfinSeriesPage> {
|
|||||||
key: ValueKey('episodes-$seasonId'),
|
key: ValueKey('episodes-$seasonId'),
|
||||||
seriesId: widget.series.id,
|
seriesId: widget.series.id,
|
||||||
seasonId: seasonId,
|
seasonId: seasonId,
|
||||||
|
version: scope.controller.version,
|
||||||
),
|
),
|
||||||
const SliverToBoxAdapter(child: SizedBox(height: 24)),
|
const SliverToBoxAdapter(child: SizedBox(height: 24)),
|
||||||
],
|
],
|
||||||
@@ -218,7 +220,7 @@ class _SeriesHeaderState extends State<_SeriesHeader> {
|
|||||||
Wrap(spacing: 8, runSpacing: 8, children: [
|
Wrap(spacing: 8, runSpacing: 8, children: [
|
||||||
FilledButton.icon(
|
FilledButton.icon(
|
||||||
key: const ValueKey('series-next'),
|
key: const ValueKey('series-next'),
|
||||||
onPressed: next == null ? null : () => scope.onPick(next),
|
onPressed: next == null ? null : () => scope.onSelect(next),
|
||||||
icon: Icon(selectedNext ? Icons.check : Icons.play_arrow),
|
icon: Icon(selectedNext ? Icons.check : Icons.play_arrow),
|
||||||
label: Text(nextLabel, overflow: TextOverflow.ellipsis),
|
label: Text(nextLabel, overflow: TextOverflow.ellipsis),
|
||||||
),
|
),
|
||||||
@@ -242,7 +244,9 @@ class _SeriesHeaderState extends State<_SeriesHeader> {
|
|||||||
class _EpisodeList extends StatefulWidget {
|
class _EpisodeList extends StatefulWidget {
|
||||||
final String seriesId;
|
final String seriesId;
|
||||||
final String seasonId;
|
final String seasonId;
|
||||||
const _EpisodeList({super.key, required this.seriesId, required this.seasonId});
|
final int version;
|
||||||
|
const _EpisodeList(
|
||||||
|
{super.key, required this.seriesId, required this.seasonId, required this.version});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<_EpisodeList> createState() => _EpisodeListState();
|
State<_EpisodeList> createState() => _EpisodeListState();
|
||||||
@@ -250,6 +254,13 @@ class _EpisodeList extends StatefulWidget {
|
|||||||
|
|
||||||
class _EpisodeListState extends State<_EpisodeList> {
|
class _EpisodeListState extends State<_EpisodeList> {
|
||||||
Future<List<JellyfinItem>>? _future;
|
Future<List<JellyfinItem>>? _future;
|
||||||
|
List<JellyfinItem>? _last;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(_EpisodeList old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
if (old.version != widget.version) _future = null;
|
||||||
|
}
|
||||||
|
|
||||||
void _load(BrowseScope scope) => _future = scope.load('episodes:${widget.seriesId}:${widget.seasonId}',
|
void _load(BrowseScope scope) => _future = scope.load('episodes:${widget.seriesId}:${widget.seasonId}',
|
||||||
(c) => c.episodes(widget.seriesId, seasonId: widget.seasonId));
|
(c) => c.episodes(widget.seriesId, seasonId: widget.seasonId));
|
||||||
@@ -265,7 +276,8 @@ class _EpisodeListState extends State<_EpisodeList> {
|
|||||||
return SliverToBoxAdapter(
|
return SliverToBoxAdapter(
|
||||||
child: LoadError(error: snap.error!, onRetry: () => setState(() => _load(scope))));
|
child: LoadError(error: snap.error!, onRetry: () => setState(() => _load(scope))));
|
||||||
}
|
}
|
||||||
final eps = snap.data;
|
final eps = snap.data ?? _last;
|
||||||
|
if (snap.data != null) _last = snap.data;
|
||||||
if (eps == null) {
|
if (eps == null) {
|
||||||
return const SliverToBoxAdapter(
|
return const SliverToBoxAdapter(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
@@ -302,7 +314,8 @@ class _EpisodeListState extends State<_EpisodeList> {
|
|||||||
const episodeTileHeight = 6 + 176 * 9 / 16 + 6 + 2;
|
const episodeTileHeight = 6 + 176 * 9 / 16 + 6 + 2;
|
||||||
|
|
||||||
/// One episode: thumbnail with progress, number + title, runtime / air
|
/// One episode: thumbnail with progress, number + title, runtime / air
|
||||||
/// date, two lines of overview. Click picks it; I opens details.
|
/// date, two lines of overview. Click selects it (details panel), a second
|
||||||
|
/// click soon after puts it up.
|
||||||
class EpisodeTile extends StatefulWidget {
|
class EpisodeTile extends StatefulWidget {
|
||||||
final JellyfinItem episode;
|
final JellyfinItem episode;
|
||||||
const EpisodeTile({super.key, required this.episode});
|
const EpisodeTile({super.key, required this.episode});
|
||||||
@@ -314,6 +327,19 @@ class EpisodeTile extends StatefulWidget {
|
|||||||
class _EpisodeTileState extends State<EpisodeTile> {
|
class _EpisodeTileState extends State<EpisodeTile> {
|
||||||
bool _focus = false;
|
bool _focus = false;
|
||||||
bool _hover = false;
|
bool _hover = false;
|
||||||
|
DateTime? _lastTap;
|
||||||
|
|
||||||
|
void _tap(BrowseScope scope) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
final last = _lastTap;
|
||||||
|
_lastTap = now;
|
||||||
|
if (last != null && now.difference(last) < doubleClickTime) {
|
||||||
|
_lastTap = null;
|
||||||
|
scope.onPutUp(widget.episode);
|
||||||
|
} else {
|
||||||
|
scope.onSelect(widget.episode);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
@@ -332,122 +358,93 @@ class _EpisodeTileState extends State<EpisodeTile> {
|
|||||||
if (e.premiereDate != null)
|
if (e.premiereDate != null)
|
||||||
'${e.premiereDate!.year}-${e.premiereDate!.month.toString().padLeft(2, '0')}-${e.premiereDate!.day.toString().padLeft(2, '0')}',
|
'${e.premiereDate!.year}-${e.premiereDate!.month.toString().padLeft(2, '0')}-${e.premiereDate!.day.toString().padLeft(2, '0')}',
|
||||||
].join(' · ');
|
].join(' · ');
|
||||||
return Focus(
|
return Material(
|
||||||
canRequestFocus: false,
|
color: selected
|
||||||
skipTraversal: true,
|
? scheme.primaryContainer.withValues(alpha: 0.35)
|
||||||
onKeyEvent: (_, k) {
|
: _hover || _focus
|
||||||
if (k is KeyDownEvent && k.logicalKey == LogicalKeyboardKey.keyI) {
|
? scheme.surfaceContainerHigh
|
||||||
scope.onOpen(DetailRoute(e));
|
: Colors.transparent,
|
||||||
return KeyEventResult.handled;
|
shape: RoundedRectangleBorder(
|
||||||
}
|
borderRadius: BorderRadius.circular(10),
|
||||||
return KeyEventResult.ignored;
|
side: BorderSide(
|
||||||
},
|
color: selected ? scheme.primary : _focus ? scheme.onSurface : Colors.transparent,
|
||||||
child: Material(
|
width: 1.5),
|
||||||
color: selected
|
),
|
||||||
? scheme.primaryContainer.withValues(alpha: 0.35)
|
clipBehavior: Clip.antiAlias,
|
||||||
: _hover || _focus
|
child: InkWell(
|
||||||
? scheme.surfaceContainerHigh
|
key: ValueKey('episode-${e.id}'),
|
||||||
: Colors.transparent,
|
focusColor: Colors.transparent,
|
||||||
shape: RoundedRectangleBorder(
|
onTap: () => _tap(scope),
|
||||||
borderRadius: BorderRadius.circular(10),
|
onSecondaryTap: () => scope.cardMenu(context, widget.episode),
|
||||||
side: BorderSide(
|
onHover: (h) => setState(() => _hover = h),
|
||||||
color: selected ? scheme.primary : _focus ? scheme.onSurface : Colors.transparent,
|
onFocusChange: (f) => setState(() => _focus = f),
|
||||||
width: 1.5),
|
child: Padding(
|
||||||
),
|
padding: const EdgeInsets.all(6),
|
||||||
clipBehavior: Clip.antiAlias,
|
child: Row(
|
||||||
child: InkWell(
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
key: ValueKey('episode-${e.id}'),
|
children: [
|
||||||
focusColor: Colors.transparent,
|
SizedBox(
|
||||||
onTap: () => scope.onPick(e),
|
width: 176,
|
||||||
onHover: (h) {
|
child: AspectRatio(
|
||||||
setState(() => _hover = h);
|
aspectRatio: 16 / 9,
|
||||||
if (h) scope.onPeek(e);
|
child: ClipRRect(
|
||||||
},
|
borderRadius: BorderRadius.circular(6),
|
||||||
onFocusChange: (f) {
|
child: Stack(fit: StackFit.expand, children: [
|
||||||
setState(() => _focus = f);
|
JellyfinImage(
|
||||||
if (f) scope.onPeek(e);
|
client: scope.client,
|
||||||
},
|
image: e.ownImage(JellyfinImageType.primary) ??
|
||||||
child: Padding(
|
e.image(JellyfinImageType.thumb) ??
|
||||||
padding: const EdgeInsets.all(6),
|
e.image(JellyfinImageType.backdrop),
|
||||||
child: Row(
|
icon: Icons.tv_outlined,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
),
|
||||||
children: [
|
if (progress > 0)
|
||||||
SizedBox(
|
Positioned(
|
||||||
width: 176,
|
left: 0,
|
||||||
child: AspectRatio(
|
right: 0,
|
||||||
aspectRatio: 16 / 9,
|
bottom: 0,
|
||||||
child: ClipRRect(
|
child: LinearProgressIndicator(
|
||||||
borderRadius: BorderRadius.circular(6),
|
value: progress, minHeight: 3, backgroundColor: Colors.black54),
|
||||||
child: Stack(fit: StackFit.expand, children: [
|
|
||||||
JellyfinImage(
|
|
||||||
client: scope.client,
|
|
||||||
image: e.ownImage(JellyfinImageType.primary) ??
|
|
||||||
e.image(JellyfinImageType.thumb) ??
|
|
||||||
e.image(JellyfinImageType.backdrop),
|
|
||||||
icon: Icons.tv_outlined,
|
|
||||||
),
|
),
|
||||||
if (progress > 0)
|
if (played || selected)
|
||||||
Positioned(
|
Positioned(
|
||||||
left: 0,
|
top: 4,
|
||||||
right: 0,
|
right: 4,
|
||||||
bottom: 0,
|
child: CircleAvatar(
|
||||||
child: LinearProgressIndicator(
|
radius: 10,
|
||||||
value: progress, minHeight: 3, backgroundColor: Colors.black54),
|
backgroundColor: selected ? scheme.primary : const Color(0xCC1B5E20),
|
||||||
|
child: Icon(Icons.check,
|
||||||
|
size: 13, color: selected ? scheme.onPrimary : Colors.white),
|
||||||
),
|
),
|
||||||
if (played || selected)
|
),
|
||||||
Positioned(
|
]),
|
||||||
top: 4,
|
),
|
||||||
right: 4,
|
),
|
||||||
child: CircleAvatar(
|
),
|
||||||
radius: 10,
|
const SizedBox(width: 12),
|
||||||
backgroundColor: selected ? scheme.primary : const Color(0xCC1B5E20),
|
Expanded(
|
||||||
child: Icon(Icons.check,
|
child: Column(
|
||||||
size: 13, color: selected ? scheme.onPrimary : Colors.white),
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
),
|
children: [
|
||||||
),
|
Text(
|
||||||
]),
|
e.indexNumber == null ? e.name : '${e.indexNumber}. ${e.name}',
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: t.titleSmall?.copyWith(
|
||||||
|
color: selected ? scheme.primary : played ? Colors.grey : null,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
Text(meta, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
),
|
if (e.overview != null) ...[
|
||||||
const SizedBox(width: 12),
|
const SizedBox(height: 4),
|
||||||
Expanded(
|
Text(e.overview!,
|
||||||
child: Column(
|
maxLines: 2,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
overflow: TextOverflow.ellipsis,
|
||||||
children: [
|
style: t.bodySmall?.copyWith(color: scheme.onSurfaceVariant)),
|
||||||
Row(children: [
|
|
||||||
Expanded(
|
|
||||||
child: Text(
|
|
||||||
e.indexNumber == null ? e.name : '${e.indexNumber}. ${e.name}',
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: t.titleSmall?.copyWith(
|
|
||||||
color: selected ? scheme.primary : played ? Colors.grey : null,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (_hover)
|
|
||||||
IconButton(
|
|
||||||
tooltip: 'Details (I)',
|
|
||||||
padding: EdgeInsets.zero,
|
|
||||||
constraints: const BoxConstraints.tightFor(width: 24, height: 22),
|
|
||||||
iconSize: 18,
|
|
||||||
onPressed: () => scope.onOpen(DetailRoute(e)),
|
|
||||||
icon: const Icon(Icons.info_outline),
|
|
||||||
),
|
|
||||||
]),
|
|
||||||
Text(meta, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
if (e.overview != null) ...[
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Text(e.overview!,
|
|
||||||
maxLines: 2,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: t.bodySmall?.copyWith(color: scheme.onSurfaceVariant)),
|
|
||||||
],
|
|
||||||
],
|
],
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -201,7 +201,8 @@ final class OwnPlay extends JellyfinPlan {
|
|||||||
bool get jfAccess => true;
|
bool get jfAccess => true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Through the sync server's relay (`/j/...`).
|
/// Through the server: its own Jellyfin login (`/j/...`) or the member
|
||||||
|
/// who put it up (`/r/...`).
|
||||||
final class RelayPlay extends JellyfinPlan {
|
final class RelayPlay extends JellyfinPlan {
|
||||||
final String url;
|
final String url;
|
||||||
const RelayPlay(this.url);
|
const RelayPlay(this.url);
|
||||||
@@ -210,7 +211,7 @@ final class RelayPlay extends JellyfinPlan {
|
|||||||
bool get jfAccess => false;
|
bool get jfAccess => false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Neither: no (usable) account here and the server cannot relay.
|
/// Neither: no (usable) account here and nothing relays it.
|
||||||
final class BlockedPlay extends JellyfinPlan {
|
final class BlockedPlay extends JellyfinPlan {
|
||||||
final String serverId;
|
final String serverId;
|
||||||
/// Known only when this install has (had) an account there.
|
/// Known only when this install has (had) an account there.
|
||||||
@@ -224,20 +225,22 @@ final class BlockedPlay extends JellyfinPlan {
|
|||||||
|
|
||||||
String get message {
|
String get message {
|
||||||
final where = serverName == null || serverName!.isEmpty ? 'that Jellyfin server' : serverName!;
|
final where = serverName == null || serverName!.isEmpty ? 'that Jellyfin server' : serverName!;
|
||||||
final base = 'This needs a Jellyfin account on $where (or the host can relay)';
|
final base = 'No Jellyfin account here for $where, and nobody is passing it on';
|
||||||
return problem == null ? base : '$base — $problem';
|
return problem == null ? base : '$base ($problem)';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Picks how to play [ref]: this install's account first (PlaybackInfo
|
/// Picks how to play [ref]: this install's account first (PlaybackInfo
|
||||||
/// with its own user; a 401 marks the account expired), else the relay
|
/// with its own user; a 401 marks the account expired), else the server's
|
||||||
/// when the server offers it ([relay] = `state.relay`, [relayUrl] this
|
/// own Jellyfin login ([relay] = `state.relay`, [relayUrl] this member's
|
||||||
/// member's `/j/...` URL), else [BlockedPlay].
|
/// `/j/...` URL), else the member who put it up ([memberRelayUrl], the
|
||||||
|
/// `/r/...` URL when `media.relay` is set), else [BlockedPlay].
|
||||||
Future<JellyfinPlan> resolveJellyfinRef(
|
Future<JellyfinPlan> resolveJellyfinRef(
|
||||||
JellyfinAccounts accounts,
|
JellyfinAccounts accounts,
|
||||||
JellyfinRef ref, {
|
JellyfinRef ref, {
|
||||||
required bool relay,
|
required bool relay,
|
||||||
required String? relayUrl,
|
required String? relayUrl,
|
||||||
|
String? memberRelayUrl,
|
||||||
Duration timeout = const Duration(seconds: 15),
|
Duration timeout = const Duration(seconds: 15),
|
||||||
}) async {
|
}) async {
|
||||||
await accounts.ensureLoaded();
|
await accounts.ensureLoaded();
|
||||||
@@ -282,6 +285,7 @@ Future<JellyfinPlan> resolveJellyfinRef(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (relay && relayUrl != null && relayUrl.isNotEmpty) return RelayPlay(relayUrl);
|
if (relay && relayUrl != null && relayUrl.isNotEmpty) return RelayPlay(relayUrl);
|
||||||
|
if (memberRelayUrl != null && memberRelayUrl.isNotEmpty) return RelayPlay(memberRelayUrl);
|
||||||
return BlockedPlay(serverId: ref.serverId, serverName: account?.displayName, problem: problem);
|
return BlockedPlay(serverId: ref.serverId, serverName: account?.displayName, problem: problem);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -314,10 +318,11 @@ Future<({EpisodeLink? previous, EpisodeLink? next})> findAdjacentEpisodes(OwnPla
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// When the floating "Next episode" pill appears: at [endingStart] (the
|
/// Where the "Next episode" pill's window starts: at [endingStart] (the
|
||||||
/// ED: Jellyfin Outro segment or ED-titled chapter, see `endingRange`)
|
/// ED: Jellyfin Outro segment or ED-titled chapter, see `endingRange`)
|
||||||
/// when one is known inside [runtime], else the last two minutes of
|
/// when one is known inside [runtime], else the last two minutes of
|
||||||
/// [runtime] (all of it for shorter media).
|
/// [runtime] (all of it for shorter media). The pill shows only while the
|
||||||
|
/// controls are up (`PillGate`), so a guessed window costs nothing.
|
||||||
Duration nextPromptStart(JellyfinItem? item, Duration runtime, {Duration? endingStart}) {
|
Duration nextPromptStart(JellyfinItem? item, Duration runtime, {Duration? endingStart}) {
|
||||||
if (endingStart != null && endingStart > Duration.zero && endingStart < runtime) {
|
if (endingStart != null && endingStart > Duration.zero && endingStart < runtime) {
|
||||||
return endingStart;
|
return endingStart;
|
||||||
@@ -328,13 +333,13 @@ Duration nextPromptStart(JellyfinItem? item, Duration runtime, {Duration? ending
|
|||||||
|
|
||||||
/// Who performs the auto-advance swap, so several counting clients do not
|
/// Who performs the auto-advance swap, so several counting clients do not
|
||||||
/// swap twice: the lowest member id among members that play the item with
|
/// swap twice: the lowest member id among members that play the item with
|
||||||
/// their own account (`jf[serverId] == true`, not stale). Only what every
|
/// their own account (`jf[serverId] == true`, not stale, not out). Only what every
|
||||||
/// client sees in `state` decides (who put the item up is not in it: a
|
/// client sees in `state` decides (who put the item up is not in it: a
|
||||||
/// late joiner never saw that swap), so all clients agree.
|
/// late joiner never saw that swap), so all clients agree.
|
||||||
String? autoAdvanceSwapper(List<MemberView> members, String serverId) {
|
String? autoAdvanceSwapper(List<MemberView> members, String serverId) {
|
||||||
final eligible = [
|
final eligible = [
|
||||||
for (final m in members)
|
for (final m in members)
|
||||||
if (!m.stale && m.jf[serverId] == true) m
|
if (!m.stale && !m.out && m.jf[serverId] == true) m
|
||||||
];
|
];
|
||||||
if (eligible.isEmpty) return null;
|
if (eligible.isEmpty) return null;
|
||||||
eligible.sort((a, b) => compareMemberIds(a.id, b.id));
|
eligible.sort((a, b) => compareMemberIds(a.id, b.id));
|
||||||
|
|||||||
@@ -0,0 +1,107 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../playback/yt_dlp_app.dart';
|
||||||
|
import '../screens/home/ui.dart' show appName, displayVersion;
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
|
||||||
|
// The app's log on disk (<app support>/logs/app-YYYY-MM-DD.log; core's
|
||||||
|
// logging.dart writes, rotates and redacts it), debugPrint routed into it,
|
||||||
|
// and the "Copy diagnostics" text of Settings → About.
|
||||||
|
|
||||||
|
final _appLog = createLogger('app');
|
||||||
|
|
||||||
|
/// The logs folder, once [startAppLogging] ran.
|
||||||
|
String? appLogDir;
|
||||||
|
|
||||||
|
/// Opens the log files and routes `debugPrint` and uncaught errors into
|
||||||
|
/// the log. Needs Flutter's binding (path_provider).
|
||||||
|
Future<void> startAppLogging() async {
|
||||||
|
try {
|
||||||
|
final base = await getApplicationSupportDirectory();
|
||||||
|
final dir = '${base.path}${Platform.pathSeparator}logs';
|
||||||
|
if (startLogFiles(dir) != null) appLogDir = dir;
|
||||||
|
} catch (e) {
|
||||||
|
_appLog.warning('no log files: $e');
|
||||||
|
}
|
||||||
|
// Everything the app prints for diagnosis lands in the file too (the
|
||||||
|
// log's console output replaces the print).
|
||||||
|
debugPrint = (String? message, {int? wrapWidth}) {
|
||||||
|
if (message == null || message.isEmpty) return;
|
||||||
|
final bad = RegExp(r'fail|error|crash|exception', caseSensitive: false).hasMatch(message);
|
||||||
|
bad ? _appLog.warning(message) : _appLog.info(message);
|
||||||
|
};
|
||||||
|
PlatformDispatcher.instance.onError = (error, stack) {
|
||||||
|
_appLog.severe('uncaught: $error', error, stack);
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
_appLog.info('$appName ${displayVersion()} on ${Platform.operatingSystem} '
|
||||||
|
'${Platform.operatingSystemVersion}, pid $pid, Dart ${Platform.version.split(' ').first}');
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The text "Copy diagnostics" gives: versions, then the last [since] of
|
||||||
|
/// the app log (its hosted server's records included), already redacted;
|
||||||
|
/// with [sessionLog], the server's session log of the same hours after it
|
||||||
|
/// (every member's shared lines and the server's, merged).
|
||||||
|
Future<String> diagnosticsText({Duration since = const Duration(hours: 6), bool sessionLog = false}) async {
|
||||||
|
final b = StringBuffer()
|
||||||
|
..writeln('$appName ${displayVersion()}')
|
||||||
|
..writeln('OS: ${Platform.operatingSystem} ${Platform.operatingSystemVersion}')
|
||||||
|
..writeln('Dart: ${Platform.version.split(' ').first}');
|
||||||
|
try {
|
||||||
|
final mpv = await SessionState.instance.coordinator.playback.mpvVersion().timeout(const Duration(seconds: 2));
|
||||||
|
b.writeln('mpv: ${mpv ?? 'no player yet'}');
|
||||||
|
} catch (_) {
|
||||||
|
b.writeln('mpv: unknown');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
final y = await AppYtDlp.instance.ytDlp.timeout(const Duration(seconds: 2));
|
||||||
|
final cookies = y.cookies.read(count: false);
|
||||||
|
b.writeln('yt-dlp: ${y.version ?? 'not ready'}${y.lastError == null ? '' : ' (${y.lastError})'}, '
|
||||||
|
'cookies: ${cookies == null ? 'none' : 'set'}');
|
||||||
|
} catch (_) {
|
||||||
|
b.writeln('yt-dlp: unknown');
|
||||||
|
}
|
||||||
|
final files = logFiles;
|
||||||
|
b.writeln('Log: ${files?.currentPath ?? 'none (console only)'}');
|
||||||
|
b.writeln('--- last ${since.inHours} h of the log ---');
|
||||||
|
b.write(files?.recent(since) ?? '');
|
||||||
|
if (sessionLog) {
|
||||||
|
final server = await SessionState.instance.coordinator.sessionLog(hours: since.inHours);
|
||||||
|
b
|
||||||
|
..writeln()
|
||||||
|
..writeln("--- last ${since.inHours} h of the server's session log ---")
|
||||||
|
..write(server ?? "(none: the server keeps no session log, or it couldn't be reached)");
|
||||||
|
}
|
||||||
|
return redactLog(b.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Saves [text] next to the logs as `diagnostics-<time>.txt`; its path,
|
||||||
|
/// or null when it could not be written.
|
||||||
|
Future<String?> saveDiagnostics(String text) async {
|
||||||
|
final dir = appLogDir;
|
||||||
|
if (dir == null) return null;
|
||||||
|
final t = DateTime.now();
|
||||||
|
String two(int n) => n.toString().padLeft(2, '0');
|
||||||
|
final path = '$dir${Platform.pathSeparator}diagnostics-${t.year}${two(t.month)}${two(t.day)}-'
|
||||||
|
'${two(t.hour)}${two(t.minute)}${two(t.second)}.txt';
|
||||||
|
try {
|
||||||
|
// Older ones go after the log files' week.
|
||||||
|
for (final e in Directory(dir).listSync()) {
|
||||||
|
if (e is File &&
|
||||||
|
e.uri.pathSegments.last.startsWith('diagnostics-') &&
|
||||||
|
t.difference(e.statSync().modified) > const Duration(days: 7)) {
|
||||||
|
e.deleteSync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await File(path).writeAsString(text);
|
||||||
|
return path;
|
||||||
|
} catch (e) {
|
||||||
|
_appLog.warning('cannot save diagnostics: $e');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
|
/// The runner's window channel (linux/runner/my_application.cc,
|
||||||
|
/// windows/runner/flutter_window.cpp).
|
||||||
|
const _window = MethodChannel('starsync/window');
|
||||||
|
|
||||||
|
/// Asks the desktop to point at the app's window (taskbar flash, urgency
|
||||||
|
/// hint) when it is not focused; nothing when it is. The runner clears it
|
||||||
|
/// once the window gets focus. Quietly nothing where the runner lacks it.
|
||||||
|
Future<void> requestWindowAttention() async {
|
||||||
|
try {
|
||||||
|
await _window.invokeMethod<void>('attention');
|
||||||
|
} on MissingPluginException {
|
||||||
|
// Tests, other platforms.
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('window attention: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart' show findInstallRoot;
|
||||||
|
|
||||||
|
/// The app's id: GTK's application id, so the Wayland `app_id` the
|
||||||
|
/// compositor matches to [desktopFileName] for the window's icon.
|
||||||
|
const appId = 'moe.senkochan.watch_together';
|
||||||
|
const desktopFileName = '$appId.desktop';
|
||||||
|
|
||||||
|
/// Linux release installs (an unpacked tarball) carry no launcher entry, so
|
||||||
|
/// Wayland shows a generic icon. On start: write the `.desktop` file into
|
||||||
|
/// `~/.local/share/applications` (Exec = this binary) and the icon into
|
||||||
|
/// the hicolor theme, only when something changed (a moved install, a new
|
||||||
|
/// icon). Never in debug runs; failures only log.
|
||||||
|
Future<void> installDesktopEntry({String? executable, String? dataHome, String? home}) async {
|
||||||
|
if (!Platform.isLinux || kDebugMode) return;
|
||||||
|
try {
|
||||||
|
final exe = executable ?? Platform.resolvedExecutable;
|
||||||
|
final root = findInstallRoot(exe, windows: false);
|
||||||
|
if (root == null) return;
|
||||||
|
final share = dataHome ?? Platform.environment['XDG_DATA_HOME'] ??
|
||||||
|
'${home ?? Platform.environment['HOME']}/.local/share';
|
||||||
|
final icons = '${root.path}/data/flutter_assets/assets/icon';
|
||||||
|
for (final size in const [16, 32, 48, 64, 128, 256, 512]) {
|
||||||
|
final src = File('$icons/icon_$size.png');
|
||||||
|
if (!src.existsSync()) continue;
|
||||||
|
final dst = File('$share/icons/hicolor/${size}x$size/apps/$appId.png');
|
||||||
|
if (dst.existsSync() && dst.lengthSync() == src.lengthSync()) continue;
|
||||||
|
await dst.parent.create(recursive: true);
|
||||||
|
await src.copy(dst.path);
|
||||||
|
}
|
||||||
|
final entry = desktopEntryText(exe);
|
||||||
|
final file = File('$share/applications/$desktopFileName');
|
||||||
|
if (file.existsSync() && file.readAsStringSync() == entry) return;
|
||||||
|
await file.parent.create(recursive: true);
|
||||||
|
await file.writeAsString(entry);
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('desktop entry: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@visibleForTesting
|
||||||
|
String desktopEntryText(String exe) => '''[Desktop Entry]
|
||||||
|
Type=Application
|
||||||
|
Name=Starsync
|
||||||
|
Comment=Watch videos in sync with friends
|
||||||
|
Exec="$exe"
|
||||||
|
Icon=$appId
|
||||||
|
StartupWMClass=$appId
|
||||||
|
Categories=AudioVideo;Video;Player;Network;
|
||||||
|
Terminal=false
|
||||||
|
''';
|
||||||
@@ -0,0 +1,106 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
import 'dart:ui';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:hive_ce_flutter/hive_flutter.dart';
|
||||||
|
import 'package:screen_retriever/screen_retriever.dart';
|
||||||
|
import 'package:window_manager/window_manager.dart';
|
||||||
|
|
||||||
|
/// The window's size, position and maximized state across restarts (and
|
||||||
|
/// hot restarts), in the settings box. The size and position kept are
|
||||||
|
/// the normal (unmaximized) ones; fullscreen is never saved or restored.
|
||||||
|
/// Wayland lets no app place its own window, so there only the size and
|
||||||
|
/// maximized state come back (the compositor decides the position).
|
||||||
|
class WindowMemory with WindowListener {
|
||||||
|
static const _key = 'windowBounds';
|
||||||
|
static const defaultSize = Size(1280, 720);
|
||||||
|
|
||||||
|
// Null when the settings box failed to open: defaults, nothing saved.
|
||||||
|
final Box? _box;
|
||||||
|
Timer? _save;
|
||||||
|
WindowMemory(this._box);
|
||||||
|
|
||||||
|
static bool get _canPlace => !(Platform.isLinux && Platform.environment['WAYLAND_DISPLAY'] != null);
|
||||||
|
|
||||||
|
Map? get _saved => _box?.get(_key) is Map ? _box!.get(_key) as Map : null;
|
||||||
|
|
||||||
|
/// The size to open at: the last normal size, else [defaultSize].
|
||||||
|
Size get size {
|
||||||
|
final s = _saved;
|
||||||
|
final w = s?['w'], h = s?['h'];
|
||||||
|
return w is num && h is num && w >= 160 && h >= 90 ? Size(w.toDouble(), h.toDouble()) : defaultSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Whether a saved position exists to place the window at (else center).
|
||||||
|
bool get hasPosition => _canPlace && _saved?['x'] is num && _saved?['y'] is num;
|
||||||
|
|
||||||
|
/// After the window shows: back to the saved position when it still
|
||||||
|
/// lands on a connected display, maximized when it was; then listens.
|
||||||
|
Future<void> restore() async {
|
||||||
|
final s = _saved;
|
||||||
|
try {
|
||||||
|
if (s != null && hasPosition) {
|
||||||
|
final rect = Offset((s['x'] as num).toDouble(), (s['y'] as num).toDouble()) & size;
|
||||||
|
if (await _onSomeDisplay(rect)) {
|
||||||
|
await windowManager.setPosition(rect.topLeft);
|
||||||
|
} else {
|
||||||
|
await windowManager.center();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (s?['max'] == true) await windowManager.maximize();
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('window restore failed: $e');
|
||||||
|
}
|
||||||
|
windowManager.addListener(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
// At least a 100×50 corner of the title area on a display's visible area.
|
||||||
|
static Future<bool> _onSomeDisplay(Rect r) async {
|
||||||
|
final grip = Rect.fromLTWH(r.left, r.top, r.width.clamp(0, 100).toDouble(), 50);
|
||||||
|
for (final d in await screenRetriever.getAllDisplays()) {
|
||||||
|
final area = (d.visiblePosition ?? Offset.zero) & (d.visibleSize ?? d.size);
|
||||||
|
if (area.overlaps(grip)) return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _later() {
|
||||||
|
_save?.cancel();
|
||||||
|
_save = Timer(const Duration(milliseconds: 400), () => unawaited(save()));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Writes the current state now (also on close).
|
||||||
|
Future<void> save() async {
|
||||||
|
_save?.cancel();
|
||||||
|
final box = _box;
|
||||||
|
if (box == null) return;
|
||||||
|
try {
|
||||||
|
if (await windowManager.isFullScreen() || await windowManager.isMinimized()) return;
|
||||||
|
final max = await windowManager.isMaximized();
|
||||||
|
final s = Map<String, Object?>.of((_saved ?? const {}).cast<String, Object?>());
|
||||||
|
s['max'] = max;
|
||||||
|
if (!max) {
|
||||||
|
final b = await windowManager.getBounds();
|
||||||
|
s['w'] = b.width;
|
||||||
|
s['h'] = b.height;
|
||||||
|
if (_canPlace) {
|
||||||
|
s['x'] = b.left;
|
||||||
|
s['y'] = b.top;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
await box.put(_key, s);
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('window save failed: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void onWindowResized() => _later();
|
||||||
|
@override
|
||||||
|
void onWindowMoved() => _later();
|
||||||
|
@override
|
||||||
|
void onWindowMaximize() => _later();
|
||||||
|
@override
|
||||||
|
void onWindowUnmaximize() => _later();
|
||||||
|
}
|
||||||
@@ -1,120 +0,0 @@
|
|||||||
import 'dart:typed_data';
|
|
||||||
|
|
||||||
/// FNV-1a over a 15x15 grid of RGB(A) pixels in the central half of an
|
|
||||||
/// image. Used on a small capture of what the compositor shows: the
|
|
||||||
/// centre is video, the edges carry the (changing) control overlays.
|
|
||||||
int hashCenterPixels(ByteData rgba, int width, int height) {
|
|
||||||
var x = 0x811c9dc5;
|
|
||||||
if (width <= 0 || height <= 0) return x;
|
|
||||||
for (var gy = 1; gy < 16; gy++) {
|
|
||||||
for (var gx = 1; gx < 16; gx++) {
|
|
||||||
final px = (width * (0.25 + 0.5 * gx / 16)).floor();
|
|
||||||
final py = (height * (0.25 + 0.5 * gy / 16)).floor();
|
|
||||||
final o = (py * width + px) * 4;
|
|
||||||
if (o + 3 > rgba.lengthInBytes) continue;
|
|
||||||
for (var c = 0; c < 3; c++) {
|
|
||||||
x = ((x ^ rgba.getUint8(o + c)) * 0x01000193) & 0xffffffff;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// FNV-1a over ~4k bytes spread evenly across a raw frame (mpv
|
|
||||||
/// `screenshot-raw`); dimension-agnostic, enough to tell frames apart.
|
|
||||||
int hashSpread(Uint8List bytes) {
|
|
||||||
var x = 0x811c9dc5;
|
|
||||||
if (bytes.isEmpty) return x;
|
|
||||||
final step = bytes.length <= 4096 ? 1 : bytes.length ~/ 4096;
|
|
||||||
for (var i = 0; i < bytes.length; i += step) {
|
|
||||||
x = ((x ^ bytes[i]) * 0x01000193) & 0xffffffff;
|
|
||||||
}
|
|
||||||
return x;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// One sample of player state, taken about once a second.
|
|
||||||
class FrameSample {
|
|
||||||
final DateTime at;
|
|
||||||
final double position;
|
|
||||||
|
|
||||||
/// Fingerprint of the picture currently shown on screen; null when it
|
|
||||||
/// cannot be captured (no view, hidden window, headless).
|
|
||||||
final int? frames;
|
|
||||||
|
|
||||||
/// Playing, not buffering, rate > 0, video track present, window
|
|
||||||
/// visible. Anything else disarms the watchdog.
|
|
||||||
final bool eligible;
|
|
||||||
const FrameSample({
|
|
||||||
required this.at,
|
|
||||||
required this.position,
|
|
||||||
required this.frames,
|
|
||||||
required this.eligible,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Detects a frozen picture: position advances normally but the shown
|
|
||||||
/// picture stands still for [stallAfter]. Seeks (position jumps), pauses,
|
|
||||||
/// buffering and missing captures all reset the stall clock. A hit is a
|
|
||||||
/// suspicion only — a still scene looks the same — so the caller confirms
|
|
||||||
/// it against the decoder and calls [dismiss] when it was a still scene.
|
|
||||||
/// Fires at most once until the picture is seen moving again for
|
|
||||||
/// [rearmAfter], so a player that stays (or soon gets) frozen after a
|
|
||||||
/// reload does not reload in a loop. [reset] keeps that latch.
|
|
||||||
class FrameWatchdog {
|
|
||||||
static const stallAfter = Duration(seconds: 3);
|
|
||||||
static const rearmAfter = Duration(seconds: 10);
|
|
||||||
|
|
||||||
FrameSample? _last;
|
|
||||||
DateTime? _stallSince;
|
|
||||||
DateTime? _healthySince;
|
|
||||||
bool _fired = false;
|
|
||||||
|
|
||||||
void reset() {
|
|
||||||
_last = null;
|
|
||||||
_stallSince = null;
|
|
||||||
_healthySince = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// The last hit was a still scene: re-arm, but wait a full
|
|
||||||
/// [stallAfter] before suspecting again.
|
|
||||||
void dismiss() {
|
|
||||||
_fired = false;
|
|
||||||
_stallSince = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns true exactly when a freeze is suspected.
|
|
||||||
bool feed(FrameSample s) {
|
|
||||||
final last = _last;
|
|
||||||
_last = s;
|
|
||||||
if (!s.eligible || s.frames == null || last == null ||
|
|
||||||
!last.eligible || last.frames == null) {
|
|
||||||
_stallSince = null;
|
|
||||||
_healthySince = null;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (s.frames != last.frames) {
|
|
||||||
_stallSince = null;
|
|
||||||
_healthySince ??= last.at;
|
|
||||||
if (s.at.difference(_healthySince!) >= rearmAfter) _fired = false;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
_healthySince = null;
|
|
||||||
final wall = s.at.difference(last.at).inMilliseconds / 1000.0;
|
|
||||||
final moved = s.position - last.position;
|
|
||||||
// Normal playback only: a jump (seek) or a standstill (stall, the
|
|
||||||
// position itself stuck) is not a frozen picture.
|
|
||||||
final normal = wall > 0 && moved > wall * 0.5 && moved < wall * 2 + 0.5;
|
|
||||||
if (!normal) {
|
|
||||||
_stallSince = null;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
_stallSince ??= last.at;
|
|
||||||
if (_fired) return false;
|
|
||||||
if (s.at.difference(_stallSince!) >= stallAfter) {
|
|
||||||
_fired = true;
|
|
||||||
_stallSince = null;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -243,18 +243,20 @@ const _skipTail = Duration(seconds: 1);
|
|||||||
/// The skip pill at [position]: inside the opening "Skip OP" (to its end),
|
/// The skip pill at [position]: inside the opening "Skip OP" (to its end),
|
||||||
/// inside the ending "Skip ED" (to its end only: what follows, preview or
|
/// inside the ending "Skip ED" (to its end only: what follows, preview or
|
||||||
/// more episode, is the viewer's call). Without any opening info on media
|
/// more episode, is the viewer's call). Without any opening info on media
|
||||||
/// longer than [fallbackMinDuration], "Skip 1:30" during the first
|
/// longer than [fallbackMinDuration] and without chapters ([chaptered]: a
|
||||||
/// [fallbackWindow]. Null otherwise.
|
/// chaptered file without an OP chapter has none on purpose), "Skip 1:30"
|
||||||
|
/// during the first [fallbackWindow]. Null otherwise.
|
||||||
SkipOffer? skipOfferAt({
|
SkipOffer? skipOfferAt({
|
||||||
required Duration position,
|
required Duration position,
|
||||||
required Duration duration,
|
required Duration duration,
|
||||||
required SkipRange? opening,
|
required SkipRange? opening,
|
||||||
required SkipRange? ending,
|
required SkipRange? ending,
|
||||||
|
bool chaptered = false,
|
||||||
}) {
|
}) {
|
||||||
bool inside(SkipRange r) => position >= r.start && position < r.end - _skipTail;
|
bool inside(SkipRange r) => position >= r.start && position < r.end - _skipTail;
|
||||||
if (opening != null && inside(opening)) return SkipOffer(SkipKind.opening, opening.end);
|
if (opening != null && inside(opening)) return SkipOffer(SkipKind.opening, opening.end);
|
||||||
if (ending != null && inside(ending)) return SkipOffer(SkipKind.ending, ending.end);
|
if (ending != null && inside(ending)) return SkipOffer(SkipKind.ending, ending.end);
|
||||||
if (opening == null && duration > fallbackMinDuration && position < fallbackWindow) {
|
if (opening == null && !chaptered && duration > fallbackMinDuration && position < fallbackWindow) {
|
||||||
final to = position + fallbackSkip;
|
final to = position + fallbackSkip;
|
||||||
return SkipOffer(SkipKind.fixed, to < duration ? to : duration);
|
return SkipOffer(SkipKind.fixed, to < duration ? to : duration);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
|
import 'dart:ffi' show Int8;
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart' show listEquals;
|
import 'package:ffi/ffi.dart' show StringUtf8Pointer, malloc;
|
||||||
|
import 'package:flutter/foundation.dart' show listEquals, mapEquals;
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
import 'package:media_kit/media_kit.dart';
|
import 'package:media_kit/media_kit.dart';
|
||||||
import 'package:media_kit_video/media_kit_video.dart';
|
import 'package:media_kit_video/media_kit_video.dart';
|
||||||
import 'package:signals/signals_flutter.dart';
|
import 'package:signals/signals_flutter.dart';
|
||||||
import 'package:sync_relay_core/core.dart' show JellyfinStreamType;
|
import 'package:sync_relay_core/core.dart' show JellyfinStreamType, LogThrottle, createLogger;
|
||||||
|
|
||||||
import '../jellyfin/track_prefs.dart' show MpvTrack;
|
import '../jellyfin/track_prefs.dart' show MpvTrack;
|
||||||
import '../shaders/shader_assets.dart';
|
import '../shaders/shader_assets.dart';
|
||||||
@@ -14,13 +16,14 @@ import '../shaders/shader_presets.dart';
|
|||||||
import '../state/settings.dart';
|
import '../state/settings.dart';
|
||||||
import '../sync/state_diff.dart';
|
import '../sync/state_diff.dart';
|
||||||
import '../sync/user_seek.dart';
|
import '../sync/user_seek.dart';
|
||||||
import 'frame_watchdog.dart';
|
|
||||||
import 'media_marks.dart';
|
import 'media_marks.dart';
|
||||||
|
import 'yt_dlp_app.dart' show AppYtDlp, ytdlFormat;
|
||||||
|
|
||||||
/// Owns one mpv [Player] (and its [VideoController]) per session: created
|
/// Owns the session's mpv [Player] (and its [VideoController]): created
|
||||||
/// by [init] on join, released by [dispose] on leave, swapped by
|
/// by [init] on join, released by [dispose] on leave, swapped by
|
||||||
/// [recreate] for "Reload video". Never reuse a player across sessions —
|
/// [recreate] for "Reload video" and by [openUrl] for every new media (a
|
||||||
/// a GPU-side freeze sticks to the player, not to the widget.
|
/// promoted preload or a fresh player). Never reuse a player for other
|
||||||
|
/// media — a GPU-side freeze sticks to the player, not to the widget.
|
||||||
class PlaybackController {
|
class PlaybackController {
|
||||||
/// Read-ahead target: about two minutes rides out short outages and
|
/// Read-ahead target: about two minutes rides out short outages and
|
||||||
/// makes skipping an intro instant.
|
/// makes skipping an intro instant.
|
||||||
@@ -32,14 +35,14 @@ class PlaybackController {
|
|||||||
/// Back buffer (media_kit sets it to bufferSize too): enough for a short
|
/// Back buffer (media_kit sets it to bufferSize too): enough for a short
|
||||||
/// seek back without holding another 256 MiB.
|
/// seek back without holding another 256 MiB.
|
||||||
static const maxBackBytes = 64 * 1024 * 1024;
|
static const maxBackBytes = 64 * 1024 * 1024;
|
||||||
|
/// mpv's `volume-max` (its default is 130): the volume controls go
|
||||||
|
/// this far, past 100 % amplified.
|
||||||
|
static const maxVolume = 150;
|
||||||
|
|
||||||
SyncPlayer? _player;
|
SyncPlayer? _player;
|
||||||
VideoController? _video;
|
VideoController? _video;
|
||||||
Timer? _watchTimer;
|
|
||||||
bool _probing = false;
|
|
||||||
final FrameWatchdog _watchdog = FrameWatchdog();
|
|
||||||
StreamSubscription<PlayerLog>? _logSub;
|
StreamSubscription<PlayerLog>? _logSub;
|
||||||
final List<StreamSubscription<Duration>> _timeSubs = [];
|
final List<StreamSubscription<Object?>> _timeSubs = [];
|
||||||
String _chapterJson = '';
|
String _chapterJson = '';
|
||||||
// `glsl-shaders` as last set on the current player ('' = none).
|
// `glsl-shaders` as last set on the current player ('' = none).
|
||||||
String _shaders = '';
|
String _shaders = '';
|
||||||
@@ -54,19 +57,60 @@ class PlaybackController {
|
|||||||
/// otherwise, so no texture outlives its player.
|
/// otherwise, so no texture outlives its player.
|
||||||
final alive = signal(false);
|
final alive = signal(false);
|
||||||
|
|
||||||
/// Called once when the watchdog sees a frozen picture.
|
/// mpv's yt-dlp hook could not open the current link (its error text).
|
||||||
void Function()? onFrozen;
|
void Function(String error)? onYtdlError;
|
||||||
|
|
||||||
/// Fingerprint of the picture on screen, installed by the video view
|
/// The current media failed to load (the HTTP error when there was one,
|
||||||
/// (`ShownFrameProbe.sample`). Without it the watchdog stays idle.
|
/// e.g. a CDN's 403), at most once per [openUrl].
|
||||||
Future<int?> Function()? shownFrame;
|
void Function(String error)? onLoadError;
|
||||||
|
|
||||||
|
// Per opened media: the last HTTP error ffmpeg logged, and whether a
|
||||||
|
// load error was reported.
|
||||||
|
String? _httpError;
|
||||||
|
bool _loadErrorSent = false;
|
||||||
|
|
||||||
|
/// mpv's log level for this app. media_kit drains mpv's log on the UI
|
||||||
|
/// thread one line at a time, so a chatty level (ffmpeg retrying a
|
||||||
|
/// refused request logs every attempt) can starve the UI: warnings and
|
||||||
|
/// errors only, except while the video output starts ([video]), when
|
||||||
|
/// the render-mode probe needs mpv's verbose GL init lines.
|
||||||
|
static const logLevel = 'warn';
|
||||||
|
|
||||||
|
/// Points mpv's yt-dlp hook at [path] (the app's managed copy) for web
|
||||||
|
/// page links, at most 1080p, once per player; its cookies
|
||||||
|
/// (`ytdl-raw-options`) whenever they changed.
|
||||||
|
Future<void> useYtDlp(String path) async {
|
||||||
|
final p = _player;
|
||||||
|
if (p == null) return;
|
||||||
|
try {
|
||||||
|
_ytdlPath = path;
|
||||||
|
final dynamic platform = p.platform;
|
||||||
|
if (!identical(p, _ytdlSetOn)) {
|
||||||
|
await platform?.setProperty('script-opts', 'ytdl_hook-ytdl_path=$path');
|
||||||
|
await platform?.setProperty('ytdl-format', ytdlFormat);
|
||||||
|
_ytdlSetOn = p;
|
||||||
|
_ytdlRaw = '';
|
||||||
|
}
|
||||||
|
final raw = await AppYtDlp.instance.mpvRawOptions();
|
||||||
|
if (raw != _ytdlRaw && identical(p, _player)) {
|
||||||
|
await platform?.setProperty('ytdl-raw-options', raw);
|
||||||
|
_ytdlRaw = raw;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('yt-dlp path not set: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Player? _ytdlSetOn;
|
||||||
|
String _ytdlRaw = '';
|
||||||
|
String? _ytdlPath;
|
||||||
|
|
||||||
Player get player => _player!;
|
Player get player => _player!;
|
||||||
|
|
||||||
/// Seeks from the video controls (seek bar) go here instead of to mpv.
|
/// Seeks from the video controls (seek bar) go here instead of to mpv.
|
||||||
void Function(Duration position)? onUserSeek;
|
void Function(Duration position)? onUserSeek;
|
||||||
|
|
||||||
/// Latest shader message for the user (the session screen toasts it).
|
/// Latest shader message for the user (the session player toasts it).
|
||||||
final shaderNotice = signal<ShaderNotice?>(null);
|
final shaderNotice = signal<ShaderNotice?>(null);
|
||||||
|
|
||||||
/// How media_kit renders the current player's video (shaders need
|
/// How media_kit renders the current player's video (shaders need
|
||||||
@@ -128,6 +172,7 @@ class PlaybackController {
|
|||||||
final existing = _video;
|
final existing = _video;
|
||||||
if (existing != null) return existing;
|
if (existing != null) return existing;
|
||||||
final hwdec = _hwdecOverride;
|
final hwdec = _hwdecOverride;
|
||||||
|
_requestLog(player, 'v'); // back to [logLevel] by _detectRenderMode
|
||||||
// media_kit's video output sets hwdec itself on attach ('auto' unless
|
// media_kit's video output sets hwdec itself on attach ('auto' unless
|
||||||
// configured), which used to override SYNC_RELAY_HWDEC.
|
// configured), which used to override SYNC_RELAY_HWDEC.
|
||||||
final video = _video = VideoController(
|
final video = _video = VideoController(
|
||||||
@@ -146,26 +191,27 @@ class PlaybackController {
|
|||||||
return AppSettings.instance.hwdec.peek();
|
return AppSettings.instance.hwdec.peek();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SyncPlayer _newPlayer({required int bufferSize, required MPVLogLevel logLevel}) => SyncPlayer(
|
||||||
|
configuration: PlayerConfiguration(
|
||||||
|
bufferSize: bufferSize,
|
||||||
|
libass: true,
|
||||||
|
vo: Platform.environment['SYNC_RELAY_VO'],
|
||||||
|
logLevel: logLevel,
|
||||||
|
))
|
||||||
|
..onUserSeek = (d) => onUserSeek?.call(d);
|
||||||
|
|
||||||
Future<void> init() async {
|
Future<void> init() async {
|
||||||
if (_player != null) return;
|
if (_player != null) return;
|
||||||
_player = SyncPlayer(
|
_player = _newPlayer(bufferSize: maxBytes, logLevel: MPVLogLevel.warn); // see [logLevel]
|
||||||
configuration: PlayerConfiguration(
|
_held = false;
|
||||||
bufferSize: maxBytes,
|
|
||||||
libass: true,
|
|
||||||
vo: Platform.environment['SYNC_RELAY_VO'],
|
|
||||||
// Verbose: the render-mode probe needs mpv's GL init lines.
|
|
||||||
logLevel: MPVLogLevel.v,
|
|
||||||
))
|
|
||||||
..onUserSeek = (d) => onUserSeek?.call(d);
|
|
||||||
_shaders = '';
|
_shaders = '';
|
||||||
renderMode.value = RenderMode.unknown;
|
renderMode.value = RenderMode.unknown;
|
||||||
shaderNotice.value = null;
|
shaderNotice.value = null;
|
||||||
_logSub = _player!.stream.log.listen(_onLog);
|
_logSub = _player!.stream.log.listen(_onLog);
|
||||||
_watchMarks(_player!);
|
_watchMarks(_player!);
|
||||||
await _pinBufferProps();
|
await _pinBufferProps();
|
||||||
|
await _pin('volume-max', '$maxVolume');
|
||||||
await applyShaders();
|
await applyShaders();
|
||||||
_watchdog.reset();
|
|
||||||
_watchTimer = Timer.periodic(const Duration(seconds: 1), (_) => _watch());
|
|
||||||
generation.value++;
|
generation.value++;
|
||||||
alive.value = true;
|
alive.value = true;
|
||||||
}
|
}
|
||||||
@@ -183,9 +229,9 @@ class PlaybackController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _pin(String property, String value) async {
|
Future<void> _pin(String property, String value, [Player? on]) async {
|
||||||
try {
|
try {
|
||||||
final dynamic platform = player.platform;
|
final dynamic platform = (on ?? player).platform;
|
||||||
await platform?.setProperty(property, value);
|
await platform?.setProperty(property, value);
|
||||||
final got = '${await platform?.getProperty(property)}';
|
final got = '${await platform?.getProperty(property)}';
|
||||||
if (!pinMatches(value, got)) {
|
if (!pinMatches(value, got)) {
|
||||||
@@ -198,18 +244,39 @@ class PlaybackController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _pinBufferProps() async {
|
Future<void> _pinBufferProps([Player? on, int ahead = maxBytes, int back = maxBackBytes]) async {
|
||||||
pinMismatches.clear();
|
if (on == null) pinMismatches.clear();
|
||||||
await _pin('demuxer-readahead-secs', '$readAheadSecs');
|
await _pin('demuxer-readahead-secs', '$readAheadSecs', on);
|
||||||
await _pin('cache-secs', '$readAheadSecs');
|
await _pin('cache-secs', '$readAheadSecs', on);
|
||||||
await _pin('demuxer-max-bytes', '$maxBytes');
|
await _pin('demuxer-max-bytes', '$ahead', on);
|
||||||
await _pin('demuxer-max-back-bytes', '$maxBackBytes');
|
await _pin('demuxer-max-back-bytes', '$back', on);
|
||||||
final hwdec = _hwdecOverride;
|
final hwdec = _hwdecOverride;
|
||||||
if (hwdec != null) {
|
if (hwdec != null) {
|
||||||
await _pin('hwdec', hwdec);
|
await _pin('hwdec', hwdec, on);
|
||||||
|
}
|
||||||
|
await _pin('stream-lavf-o', streamLavfOptions, on);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// ffmpeg's HTTP options (mpv `stream-lavf-o`, comma form): reconnect
|
||||||
|
/// after a dropped connection, also on a streamed (growing) relay
|
||||||
|
/// response, and a server error (5xx) while connecting; a refused request
|
||||||
|
/// (4xx) fails at once. At most 3 tries per read, 4 s apart at most.
|
||||||
|
static const streamLavfOptions = 'reconnect_streamed=1,reconnect_on_http_error=5xx,'
|
||||||
|
'reconnect_delay_max=4,reconnect_max_retries=3';
|
||||||
|
|
||||||
|
// mpv_request_log_messages on [p]'s handle (media_kit has no API for it).
|
||||||
|
static void _requestLog(Player p, String level) {
|
||||||
|
try {
|
||||||
|
final dynamic platform = p.platform;
|
||||||
|
final name = level.toNativeUtf8();
|
||||||
|
try {
|
||||||
|
platform.mpv.mpv_request_log_messages(platform.ctx, name.cast<Int8>());
|
||||||
|
} finally {
|
||||||
|
malloc.free(name);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('mpv log level $level not set: $e');
|
||||||
}
|
}
|
||||||
await _pin('stream-lavf-o',
|
|
||||||
'reconnect_streamed=1,reconnect_on_http_error=1,reconnect_delay_max=4');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Puts the saved shader choice (Settings, Ctrl+0..6, shader button) on
|
/// Puts the saved shader choice (Settings, Ctrl+0..6, shader button) on
|
||||||
@@ -294,6 +361,31 @@ class PlaybackController {
|
|||||||
// an error there while shaders are on is a shader that failed to load
|
// an error there while shaders are on is a shader that failed to load
|
||||||
// or compile (mpv then renders without it).
|
// or compile (mpv then renders without it).
|
||||||
void _onLog(PlayerLog log) {
|
void _onLog(PlayerLog log) {
|
||||||
|
_toAppLog(log);
|
||||||
|
if (log.prefix == 'ytdl_hook' && (log.level == 'error' || log.level == 'fatal')) {
|
||||||
|
final text = log.text.trim().replaceFirst(RegExp(r'^ERROR:\s*'), '');
|
||||||
|
if (text.isNotEmpty) {
|
||||||
|
_loadErrorSent = true;
|
||||||
|
onYtdlError?.call(text);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// ffmpeg logs through one mpv instance per process (the first one
|
||||||
|
// alive), so the HTTP status is a bonus, not a given.
|
||||||
|
if (log.prefix == 'ffmpeg') {
|
||||||
|
final http = RegExp(r'HTTP error \d{3}.*').firstMatch(log.text);
|
||||||
|
if (http != null) _httpError = http[0]!.trim();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Nothing playable opened (a track of mpv's yt-dlp EDL refused, ...).
|
||||||
|
if (!_loadErrorSent && _loadFailed(log, duration.peek())) {
|
||||||
|
_loadErrorSent = true;
|
||||||
|
final http = _httpError;
|
||||||
|
_mpvLog.warning('cannot open the media: [${log.prefix}] ${log.text.trim()}'
|
||||||
|
'${http == null ? ' (no HTTP error logged; a request that timed out after 5 s looks like this)' : ' ($http)'}');
|
||||||
|
onLoadError?.call(http == null ? 'the video stream could not be opened' : 'the video server answered $http');
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (log.prefix != 'libmpv_render') return;
|
if (log.prefix != 'libmpv_render') return;
|
||||||
if (log.text.contains('suspected software renderer')) {
|
if (log.text.contains('suspected software renderer')) {
|
||||||
_setRenderMode(RenderMode.softwareGl);
|
_setRenderMode(RenderMode.softwareGl);
|
||||||
@@ -313,6 +405,32 @@ class PlaybackController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// mpv's warnings and errors (the session player's; ffmpeg's through
|
||||||
|
// whichever player logs them) go to the app log, a few per kind at a
|
||||||
|
// time: a refused request makes ffmpeg retry and warn on every try.
|
||||||
|
static final _mpvLog = createLogger('mpv');
|
||||||
|
static final _mpvThrottle = LogThrottle(burst: 5);
|
||||||
|
|
||||||
|
static void _toAppLog(PlayerLog log, {String player = ''}) {
|
||||||
|
final level = log.level;
|
||||||
|
if (level != 'warn' && level != 'error' && level != 'fatal') return;
|
||||||
|
final text = log.text.trim();
|
||||||
|
if (text.isEmpty) return;
|
||||||
|
final pass = _mpvThrottle.allow('$player${log.prefix} $level ${text.length > 40 ? text.substring(0, 40) : text}');
|
||||||
|
if (pass == null) return;
|
||||||
|
final line = '$pass$player[${log.prefix}] $text';
|
||||||
|
level == 'warn' ? _mpvLog.info(line) : _mpvLog.warning(line);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [log] says the media could not be opened: before a [duration] is
|
||||||
|
/// known, mpv's fatal "nothing to play" or a demuxer error, or a yt-dlp
|
||||||
|
/// hook error.
|
||||||
|
static bool _loadFailed(PlayerLog log, Duration duration) {
|
||||||
|
if (log.prefix == 'ytdl_hook') return log.level == 'error' || log.level == 'fatal';
|
||||||
|
return duration == Duration.zero &&
|
||||||
|
((log.prefix == 'cplayer' && log.level == 'fatal') || (log.prefix == 'demux' && log.level == 'error'));
|
||||||
|
}
|
||||||
|
|
||||||
void _setRenderMode(RenderMode mode) {
|
void _setRenderMode(RenderMode mode) {
|
||||||
renderMode.value = mode;
|
renderMode.value = mode;
|
||||||
lastRenderMode.value = mode;
|
lastRenderMode.value = mode;
|
||||||
@@ -324,10 +442,12 @@ class PlaybackController {
|
|||||||
Future<void> _detectRenderMode(Player p, VideoController video) async {
|
Future<void> _detectRenderMode(Player p, VideoController video) async {
|
||||||
try {
|
try {
|
||||||
await video.platform.future;
|
await video.platform.future;
|
||||||
|
await Future.delayed(const Duration(milliseconds: 1500));
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
return;
|
return;
|
||||||
|
} finally {
|
||||||
|
if (identical(p, _player)) _requestLog(p, logLevel);
|
||||||
}
|
}
|
||||||
await Future.delayed(const Duration(milliseconds: 1500));
|
|
||||||
if (!identical(p, _player) || renderMode.peek() != RenderMode.unknown) {
|
if (!identical(p, _player) || renderMode.peek() != RenderMode.unknown) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -338,84 +458,46 @@ class PlaybackController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Fingerprint of the decoder's current frame (mpv `screenshot-raw`,
|
/// `mpv-version` and `ffmpeg-version` of the session player, for
|
||||||
/// off-thread); null without video.
|
/// diagnostics; null when there is no player.
|
||||||
Future<int?> _sourceFrame(Player p) async {
|
Future<String?> mpvVersion() async {
|
||||||
|
final p = _player;
|
||||||
|
if (p == null) return null;
|
||||||
try {
|
try {
|
||||||
final raw = await p.screenshot(format: null);
|
final dynamic platform = p.platform;
|
||||||
return raw == null || raw.isEmpty ? null : hashSpread(raw);
|
return '${await platform?.getProperty('mpv-version')}, ffmpeg ${await platform?.getProperty('ffmpeg-version')}';
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A suspected freeze is real only if mpv's own frames still move: a
|
|
||||||
/// still scene looks frozen on screen too.
|
|
||||||
Future<bool> _sourceMoving(Player p) async {
|
|
||||||
final a = await _sourceFrame(p);
|
|
||||||
await Future.delayed(const Duration(milliseconds: 500));
|
|
||||||
if (!identical(p, _player) || !p.state.playing) return false;
|
|
||||||
final b = await _sourceFrame(p);
|
|
||||||
return a != null && b != null && a != b;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool get _windowVisible {
|
|
||||||
try {
|
|
||||||
final s = WidgetsBinding.instance.lifecycleState;
|
|
||||||
return s == null ||
|
|
||||||
s == AppLifecycleState.resumed ||
|
|
||||||
s == AppLifecycleState.inactive;
|
|
||||||
} catch (_) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _watch() async {
|
|
||||||
final p = _player;
|
|
||||||
final probe = shownFrame;
|
|
||||||
// Only meaningful once the video view is up.
|
|
||||||
if (p == null || _video == null || probe == null || _probing) return;
|
|
||||||
_probing = true;
|
|
||||||
try {
|
|
||||||
final frames = await probe();
|
|
||||||
if (!identical(p, _player)) return;
|
|
||||||
final s = p.state;
|
|
||||||
final eligible = s.playing &&
|
|
||||||
!s.buffering &&
|
|
||||||
!s.completed &&
|
|
||||||
s.rate > 0 &&
|
|
||||||
(s.width ?? 0) > 0 &&
|
|
||||||
_windowVisible;
|
|
||||||
final fired = _watchdog.feed(FrameSample(
|
|
||||||
at: DateTime.now(),
|
|
||||||
position: positionSecs,
|
|
||||||
frames: frames,
|
|
||||||
eligible: eligible,
|
|
||||||
));
|
|
||||||
if (fired) {
|
|
||||||
if (await _sourceMoving(p) && identical(p, _player)) {
|
|
||||||
debugPrint('video watchdog: picture stuck while mpv frames move');
|
|
||||||
onFrozen?.call();
|
|
||||||
} else {
|
|
||||||
_watchdog.dismiss();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
_probing = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Opens [url] paused. [headers] go with every request for it (mpv
|
/// Opens [url] paused. [headers] go with every request for it (mpv
|
||||||
/// `http-header-fields`): a Jellyfin token travels there, not in the URL.
|
/// `http-header-fields`): a Jellyfin token travels there, not in the URL.
|
||||||
Future<void> openUrl(String url, {Map<String, String>? headers}) async {
|
/// Each media gets its own player: when [preload] holds the same [url]
|
||||||
if (!_ready) return;
|
/// and [headers], that player becomes this one (true: promoted, its
|
||||||
|
/// buffer comes along); else a player that already held media is
|
||||||
|
/// replaced by a fresh one first ([onFreshPlayer] once it is up), unless
|
||||||
|
/// [keepPlayer] (the same media again, e.g. after a reconnect).
|
||||||
|
Future<bool> openUrl(String url,
|
||||||
|
{Map<String, String>? headers, bool keepPlayer = false, void Function()? onFreshPlayer}) async {
|
||||||
|
if (!_ready) return false;
|
||||||
|
final pre = _pre;
|
||||||
|
if (pre != null && pre.matches(url, headers)) {
|
||||||
|
if (await _promote(pre)) return true;
|
||||||
|
}
|
||||||
|
if (_held && !keepPlayer && await _freshPlayer()) onFreshPlayer?.call();
|
||||||
|
if (!_ready) return false;
|
||||||
try {
|
try {
|
||||||
|
_held = true;
|
||||||
_chapterJson = '';
|
_chapterJson = '';
|
||||||
|
_httpError = null;
|
||||||
|
_loadErrorSent = false;
|
||||||
chapters.value = const [];
|
chapters.value = const [];
|
||||||
tracks.value = const [];
|
tracks.value = const [];
|
||||||
buffered.value = Duration.zero;
|
buffered.value = Duration.zero;
|
||||||
// An empty map, not null: media_kit caches headers per URI.
|
// An empty map, not null: media_kit caches headers per URI.
|
||||||
await player.open(Media(url, httpHeaders: headers ?? const {}), play: false);
|
await player.open(Media(url, httpHeaders: headers ?? const {}), play: false);
|
||||||
|
return false;
|
||||||
} catch (e, st) {
|
} catch (e, st) {
|
||||||
debugPrint('open ${Uri.tryParse(url)?.replace(query: '') ?? 'media'} failed: $e\n$st');
|
debugPrint('open ${Uri.tryParse(url)?.replace(query: '') ?? 'media'} failed: $e\n$st');
|
||||||
rethrow;
|
rethrow;
|
||||||
@@ -426,9 +508,18 @@ class PlaybackController {
|
|||||||
// track-list observed in mpv (read back as JSON).
|
// track-list observed in mpv (read back as JSON).
|
||||||
void _watchMarks(SyncPlayer p) {
|
void _watchMarks(SyncPlayer p) {
|
||||||
_timeSubs.add(p.stream.position.listen((d) {
|
_timeSubs.add(p.stream.position.listen((d) {
|
||||||
|
// At the end the bar shows full: mpv's last position is the last
|
||||||
|
// frame's start (and the 250 ms steps round down), short of duration.
|
||||||
|
if (p.state.completed && duration.value > Duration.zero) {
|
||||||
|
position.value = duration.value;
|
||||||
|
return;
|
||||||
|
}
|
||||||
final ms = d.inMilliseconds;
|
final ms = d.inMilliseconds;
|
||||||
position.value = Duration(milliseconds: ms - ms % 250);
|
position.value = Duration(milliseconds: ms - ms % 250);
|
||||||
}));
|
}));
|
||||||
|
_timeSubs.add(p.stream.completed.listen((done) {
|
||||||
|
if (done && duration.value > Duration.zero) position.value = duration.value;
|
||||||
|
}));
|
||||||
_timeSubs.add(p.stream.buffer.listen((d) {
|
_timeSubs.add(p.stream.buffer.listen((d) {
|
||||||
final ms = d.inMilliseconds;
|
final ms = d.inMilliseconds;
|
||||||
buffered.value = Duration(milliseconds: ms - ms % 250);
|
buffered.value = Duration(milliseconds: ms - ms % 250);
|
||||||
@@ -575,10 +666,9 @@ class PlaybackController {
|
|||||||
/// Release the player. The view drops its texture first ([alive] goes
|
/// Release the player. The view drops its texture first ([alive] goes
|
||||||
/// false, one frame passes), then mpv is torn down.
|
/// false, one frame passes), then mpv is torn down.
|
||||||
Future<void> dispose() async {
|
Future<void> dispose() async {
|
||||||
|
await dropPreload();
|
||||||
final p = _player;
|
final p = _player;
|
||||||
if (p == null) return;
|
if (p == null) return;
|
||||||
_watchTimer?.cancel();
|
|
||||||
_watchTimer = null;
|
|
||||||
await _logSub?.cancel();
|
await _logSub?.cancel();
|
||||||
_logSub = null;
|
_logSub = null;
|
||||||
for (final sub in _timeSubs) {
|
for (final sub in _timeSubs) {
|
||||||
@@ -587,6 +677,7 @@ class PlaybackController {
|
|||||||
_timeSubs.clear();
|
_timeSubs.clear();
|
||||||
_player = null;
|
_player = null;
|
||||||
_video = null;
|
_video = null;
|
||||||
|
_held = false;
|
||||||
alive.value = false;
|
alive.value = false;
|
||||||
_clearMarks();
|
_clearMarks();
|
||||||
await _settleUi();
|
await _settleUi();
|
||||||
@@ -609,6 +700,246 @@ class PlaybackController {
|
|||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------ preload
|
||||||
|
//
|
||||||
|
// A second, hidden player holding what plays next (Up next's first
|
||||||
|
// item), open paused at its start and muted, with a small cache: its
|
||||||
|
// first seconds are in before anyone asks. [openUrl] for the same URL
|
||||||
|
// promotes it to the session player (see ARCHITECTURE.md "Getting
|
||||||
|
// ready"). One at a time.
|
||||||
|
|
||||||
|
/// Preloading on (env `SYNC_RELAY_PRELOAD=0` turns it off; tests set it).
|
||||||
|
bool preloadEnabled = Platform.environment['SYNC_RELAY_PRELOAD'] != '0';
|
||||||
|
|
||||||
|
/// The preload's forward cache: its first seconds and the container's
|
||||||
|
/// index, at little memory. Raised to [maxBytes] when promoted.
|
||||||
|
static const preloadBytes = 48 * 1024 * 1024;
|
||||||
|
static const _preloadBackBytes = 8 * 1024 * 1024;
|
||||||
|
|
||||||
|
_Preload? _pre;
|
||||||
|
|
||||||
|
/// The URL preloaded now (null: none).
|
||||||
|
String? get preloadUrl => _pre?.url;
|
||||||
|
|
||||||
|
/// Opens [url] in the hidden preload player (replacing any other), and
|
||||||
|
/// completes once [need] seconds are buffered or the whole media is:
|
||||||
|
/// true, false when it failed (or was dropped or replaced meanwhile).
|
||||||
|
/// The same [url] and [headers] again is the same preload unless
|
||||||
|
/// [fresh]. [ytdlPath]: mpv's yt-dlp hook for web pages.
|
||||||
|
Future<bool> preload(String url,
|
||||||
|
{Map<String, String>? headers, String? ytdlPath, double need = 4, bool fresh = false}) async {
|
||||||
|
if (!preloadEnabled || !_ready) return false;
|
||||||
|
final had = _pre;
|
||||||
|
if (had != null && had.matches(url, headers) && !had.failed && !fresh) return had.ready.future;
|
||||||
|
// Set before any await: a second call for the same URL finds it.
|
||||||
|
_pre = null;
|
||||||
|
if (had != null) unawaited(_disposePreload(had));
|
||||||
|
final p = _newPlayer(bufferSize: preloadBytes, logLevel: MPVLogLevel.error);
|
||||||
|
final pre = _pre = _Preload(p, url, headers ?? const {});
|
||||||
|
pre.logSub = p.stream.log.listen((log) {
|
||||||
|
// ffmpeg logs through one mpv per process: the first one, and once
|
||||||
|
// that is gone (a promotion disposes it) the next one created, which
|
||||||
|
// can be this preload. Its HTTP errors still name the session's.
|
||||||
|
if (log.prefix == 'ffmpeg') return _onLog(log);
|
||||||
|
_toAppLog(log, player: 'preload ');
|
||||||
|
if (_loadFailed(log, p.state.duration)) pre.fail();
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await _pinBufferProps(p, preloadBytes, _preloadBackBytes);
|
||||||
|
await _pin('volume-max', '$maxVolume', p);
|
||||||
|
await _pin('mute', 'yes', p);
|
||||||
|
final path = ytdlPath ?? _ytdlPath;
|
||||||
|
if (path != null) {
|
||||||
|
pre.ytdlRaw = await _setYtdl(p, path);
|
||||||
|
pre.ytdl = true;
|
||||||
|
}
|
||||||
|
// With a view up, its own video output: mpv decodes (media_kit
|
||||||
|
// starts players with vid=no) and the first frame is there.
|
||||||
|
if (_video != null) {
|
||||||
|
pre.video = VideoController(p, configuration: VideoControllerConfiguration(hwdec: _hwdecOverride));
|
||||||
|
await pre.video!.platform.future;
|
||||||
|
}
|
||||||
|
if (!identical(_pre, pre)) {
|
||||||
|
pre.fail();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
await p.open(Media(url, httpHeaders: headers ?? const {}), play: false);
|
||||||
|
if (!pre.opened.isCompleted) pre.opened.complete();
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('preload failed: $e');
|
||||||
|
pre.fail();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
unawaited(_watchPreload(pre, need));
|
||||||
|
return pre.ready.future;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _watchPreload(_Preload pre, double need) async {
|
||||||
|
final end = DateTime.now().add(const Duration(seconds: 60));
|
||||||
|
while (identical(_pre, pre) && !pre.failed && DateTime.now().isBefore(end)) {
|
||||||
|
final st = pre.player.state;
|
||||||
|
final secs = st.duration.inMilliseconds / 1000;
|
||||||
|
final buffered = (st.buffer - st.position).inMilliseconds / 1000;
|
||||||
|
if (secs > 0 && (buffered >= need || st.buffer.inMilliseconds / 1000 >= secs - 0.5)) {
|
||||||
|
if (!pre.ready.isCompleted) pre.ready.complete(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
await Future.delayed(const Duration(milliseconds: 200));
|
||||||
|
}
|
||||||
|
if (!pre.ready.isCompleted) pre.ready.complete(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Drops the preload (nothing to get ready, or something else is).
|
||||||
|
Future<void> dropPreload() async {
|
||||||
|
final pre = _pre;
|
||||||
|
if (pre == null) return;
|
||||||
|
_pre = null;
|
||||||
|
await _disposePreload(pre);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _disposePreload(_Preload pre) async {
|
||||||
|
pre.fail();
|
||||||
|
await pre.logSub?.cancel();
|
||||||
|
try {
|
||||||
|
await pre.player.dispose();
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [pre] becomes the session player ([_adopt]); the full cache pins
|
||||||
|
/// replace its small ones.
|
||||||
|
Future<bool> _promote(_Preload pre) async {
|
||||||
|
await pre.opened.future;
|
||||||
|
final old = _player;
|
||||||
|
if (!identical(_pre, pre) || old == null) return false;
|
||||||
|
_pre = null;
|
||||||
|
if (pre.failed) {
|
||||||
|
unawaited(_disposePreload(pre));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
await pre.logSub?.cancel();
|
||||||
|
if (!pre.ready.isCompleted) pre.ready.complete(true);
|
||||||
|
final p = pre.player;
|
||||||
|
await _adopt(p, pre.video, ytdl: pre.ytdl, ytdlRaw: pre.ytdlRaw);
|
||||||
|
try {
|
||||||
|
await _pin('mute', 'no', p);
|
||||||
|
await _pinBufferProps(p);
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('promoted player settings: $e');
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The current player has had media opened in it (one fresh from [init]
|
||||||
|
// has not, so the first open after join or Reload video uses it).
|
||||||
|
bool _held = false;
|
||||||
|
|
||||||
|
// The last replaced player until it is disposed: a fresh player waits
|
||||||
|
// for it, so at most one old player lingers.
|
||||||
|
Future<void> _retiring = Future.value();
|
||||||
|
|
||||||
|
/// Replaces the current player with a fresh one set up like [init]'s
|
||||||
|
/// (pins, hwdec, volume, yt-dlp hook, shaders, observers), its video
|
||||||
|
/// output ready before the view swaps to it when the view is up. True
|
||||||
|
/// once it is the session player.
|
||||||
|
Future<bool> _freshPlayer() async {
|
||||||
|
await _retiring;
|
||||||
|
final old = _player;
|
||||||
|
if (old == null) return false;
|
||||||
|
final p = _newPlayer(bufferSize: maxBytes, logLevel: MPVLogLevel.warn); // see [logLevel]
|
||||||
|
VideoController? video;
|
||||||
|
var ytdl = false, ytdlRaw = '';
|
||||||
|
try {
|
||||||
|
pinMismatches.clear();
|
||||||
|
await _pinBufferProps(p);
|
||||||
|
await _pin('volume-max', '$maxVolume', p);
|
||||||
|
final path = _ytdlPath;
|
||||||
|
if (path != null) {
|
||||||
|
ytdlRaw = await _setYtdl(p, path);
|
||||||
|
ytdl = true;
|
||||||
|
}
|
||||||
|
// The view is up: the new output is created (and its texture
|
||||||
|
// registered) before the view swaps, so the old picture stays until
|
||||||
|
// then. Created by the view instead while the render mode is not
|
||||||
|
// known yet, so the probe hears its GL init ([video]).
|
||||||
|
if (_video != null && renderMode.peek() != RenderMode.unknown) {
|
||||||
|
video = VideoController(p, configuration: VideoControllerConfiguration(hwdec: _hwdecOverride));
|
||||||
|
await video.platform.future;
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('fresh player setup: $e');
|
||||||
|
}
|
||||||
|
// Disposed or reloaded meanwhile: that player stays.
|
||||||
|
if (!identical(old, _player)) {
|
||||||
|
try {
|
||||||
|
await p.dispose();
|
||||||
|
} catch (_) {}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
await _adopt(p, video, ytdl: ytdl, ytdlRaw: ytdlRaw);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// mpv's yt-dlp hook on [p] (see [useYtDlp]); returns the raw options set.
|
||||||
|
static Future<String> _setYtdl(Player p, String path) async {
|
||||||
|
final dynamic platform = p.platform;
|
||||||
|
await platform?.setProperty('script-opts', 'ytdl_hook-ytdl_path=$path');
|
||||||
|
await platform?.setProperty('ytdl-format', ytdlFormat);
|
||||||
|
final raw = await AppYtDlp.instance.mpvRawOptions();
|
||||||
|
await platform?.setProperty('ytdl-raw-options', raw);
|
||||||
|
return raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [p] becomes the session player (a promoted preload or a fresh
|
||||||
|
/// player): log, marks and track observers move over, the view swaps to
|
||||||
|
/// its video output ([generation]), volume and shaders carry over, and
|
||||||
|
/// the old player is paused and disposed once the view let go of its
|
||||||
|
/// texture (as in [dispose]).
|
||||||
|
Future<void> _adopt(SyncPlayer p, VideoController? video, {required bool ytdl, String ytdlRaw = ''}) async {
|
||||||
|
final old = _player!;
|
||||||
|
final volume = old.state.volume;
|
||||||
|
await _logSub?.cancel();
|
||||||
|
for (final sub in _timeSubs) {
|
||||||
|
await sub.cancel();
|
||||||
|
}
|
||||||
|
_timeSubs.clear();
|
||||||
|
_player = p;
|
||||||
|
_video = video;
|
||||||
|
_held = true;
|
||||||
|
_ytdlSetOn = ytdl ? p : null;
|
||||||
|
_ytdlRaw = ytdlRaw;
|
||||||
|
_chapterJson = '';
|
||||||
|
_httpError = null;
|
||||||
|
_loadErrorSent = false;
|
||||||
|
_shaders = '';
|
||||||
|
final at = p.state.position.inMilliseconds;
|
||||||
|
position.value = Duration(milliseconds: at - at % 250);
|
||||||
|
duration.value = p.state.duration;
|
||||||
|
final ms = p.state.buffer.inMilliseconds;
|
||||||
|
buffered.value = Duration(milliseconds: ms - ms % 250);
|
||||||
|
chapters.value = const [];
|
||||||
|
tracks.value = const [];
|
||||||
|
_logSub = p.stream.log.listen(_onLog);
|
||||||
|
_requestLog(p, logLevel);
|
||||||
|
_watchMarks(p);
|
||||||
|
generation.value++;
|
||||||
|
// Normally stopped already (the coordinator leaves the previous
|
||||||
|
// media first): never two sounds at once.
|
||||||
|
unawaited(old.pause().catchError((_) {}));
|
||||||
|
try {
|
||||||
|
await p.setVolume(volume);
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('new player volume: $e');
|
||||||
|
}
|
||||||
|
unawaited(applyShaders());
|
||||||
|
unawaited(_refreshTracks());
|
||||||
|
_retiring = () async {
|
||||||
|
await _settleUi();
|
||||||
|
try {
|
||||||
|
await old.dispose();
|
||||||
|
} catch (_) {}
|
||||||
|
}();
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> stop() async {
|
Future<void> stop() async {
|
||||||
if (!_ready) return;
|
if (!_ready) return;
|
||||||
try {
|
try {
|
||||||
@@ -641,3 +972,27 @@ bool pinMatches(String wanted, String got) {
|
|||||||
final a = double.tryParse(wanted), b = double.tryParse(got);
|
final a = double.tryParse(wanted), b = double.tryParse(got);
|
||||||
return a != null && b != null && a == b;
|
return a != null && b != null && a == b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class _Preload {
|
||||||
|
final SyncPlayer player;
|
||||||
|
final String url;
|
||||||
|
final Map<String, String> headers;
|
||||||
|
VideoController? video;
|
||||||
|
StreamSubscription<PlayerLog>? logSub;
|
||||||
|
/// Completes once the media is handed to mpv (or the preload failed).
|
||||||
|
final opened = Completer<void>();
|
||||||
|
bool ytdl = false;
|
||||||
|
String ytdlRaw = '';
|
||||||
|
bool failed = false;
|
||||||
|
final ready = Completer<bool>();
|
||||||
|
_Preload(this.player, this.url, this.headers);
|
||||||
|
|
||||||
|
bool matches(String url, Map<String, String>? headers) =>
|
||||||
|
url == this.url && mapEquals(headers ?? const {}, this.headers);
|
||||||
|
|
||||||
|
void fail() {
|
||||||
|
failed = true;
|
||||||
|
if (!ready.isCompleted) ready.complete(false);
|
||||||
|
if (!opened.isCompleted) opened.complete();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,89 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
/// mpv's `ytdl-format` for links every player opens itself.
|
||||||
|
const ytdlFormat = 'bv*[height<=1080]+ba/b';
|
||||||
|
|
||||||
|
/// yt-dlp's `--sub-langs` for mpv's hook (its default is `all`), without
|
||||||
|
/// Bilibili's danmaku: an XML comment feed served raw-deflate, which
|
||||||
|
/// ffmpeg fails to inflate on every read (a warning each time) while the
|
||||||
|
/// video waits on it.
|
||||||
|
const ytdlSubLangs = 'all,-danmaku';
|
||||||
|
|
||||||
|
/// The app's yt-dlp (see [YtDlp]): in the app-support folder, shared with
|
||||||
|
/// the hosted server. [probe] remembers what pasted links are for a while,
|
||||||
|
/// so the Link preview and the swap ask once.
|
||||||
|
class AppYtDlp {
|
||||||
|
static final instance = AppYtDlp();
|
||||||
|
|
||||||
|
/// [ytDlp]: a given one (tests); default in the app-support folder.
|
||||||
|
AppYtDlp([YtDlp? ytDlp]) : _ytDlp = ytDlp == null ? null : Future.value(ytDlp);
|
||||||
|
|
||||||
|
Future<YtDlp>? _ytDlp;
|
||||||
|
Future<YtDlp> get ytDlp => _ytDlp ??= () async {
|
||||||
|
final base = await getApplicationSupportDirectory();
|
||||||
|
return YtDlp(dir(base.path));
|
||||||
|
}();
|
||||||
|
|
||||||
|
static String dir(String appSupport) => '$appSupport${Platform.pathSeparator}yt-dlp';
|
||||||
|
|
||||||
|
/// Gets yt-dlp ready in the background (download on first run, a daily
|
||||||
|
/// update check afterwards).
|
||||||
|
void warmUp() => unawaited(ytDlp.then((y) => y.ensure()).catchError((_) => null));
|
||||||
|
|
||||||
|
/// mpv's `ytdl-raw-options`: [ytdlSubLangs] and the cookies in the
|
||||||
|
/// yt-dlp folder (see [YtDlpCookies]).
|
||||||
|
Future<String> mpvRawOptions() async {
|
||||||
|
const subs = 'sub-langs=%${ytdlSubLangs.length}%$ytdlSubLangs';
|
||||||
|
try {
|
||||||
|
final cookies = (await ytDlp).cookies.mpvRawOptions();
|
||||||
|
return cookies.isEmpty ? subs : '$subs,$cookies';
|
||||||
|
} catch (_) {
|
||||||
|
return subs;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final _probes = <String, ({DateTime at, DateTime until, Future<LinkProbe> f})>{};
|
||||||
|
static const _probeTtl = Duration(minutes: 10);
|
||||||
|
|
||||||
|
/// What [url] is, from memory while it is kept (10 minutes from when it
|
||||||
|
/// was probed; [keep] keeps it longer, for Up next's first item, which
|
||||||
|
/// is probed again before that runs out). [fresh] probes again: the
|
||||||
|
/// remembered result stays until the new one is in, and stays when the
|
||||||
|
/// new one fails.
|
||||||
|
Future<LinkProbe> probe(String url, {Duration keep = _probeTtl, bool fresh = false}) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
_probes.removeWhere((_, v) => now.isAfter(v.until));
|
||||||
|
final hit = _probes[url];
|
||||||
|
if (hit != null && !fresh) {
|
||||||
|
final longer = hit.at.add(keep);
|
||||||
|
if (longer.isAfter(hit.until)) _probes[url] = (at: hit.at, until: longer, f: hit.f);
|
||||||
|
return hit.f;
|
||||||
|
}
|
||||||
|
final f = ytDlp.then((y) => probeLink(Uri.parse(url), ytDlp: y));
|
||||||
|
final until = now.add(keep);
|
||||||
|
if (hit == null) {
|
||||||
|
_probes[url] = (at: now, until: until, f: f);
|
||||||
|
f.catchError((Object _) {
|
||||||
|
if (_probes[url]?.f == f) _probes.remove(url);
|
||||||
|
return LinkProbe.file(Uri(), -1);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
f.then<void>((_) {
|
||||||
|
_probes[url] = (at: now, until: until, f: f);
|
||||||
|
}, onError: (Object _) {});
|
||||||
|
}
|
||||||
|
return f;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [url] no longer needs keeping longer: back to the usual 10 minutes.
|
||||||
|
void release(String url) {
|
||||||
|
final hit = _probes[url];
|
||||||
|
if (hit == null) return;
|
||||||
|
final usual = hit.at.add(_probeTtl);
|
||||||
|
if (usual.isBefore(hit.until)) _probes[url] = (at: hit.at, until: usual, f: hit.f);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,808 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
import 'dart:math';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../files/name_parser.dart';
|
||||||
|
import '../files/thumbnails.dart';
|
||||||
|
import '../jellyfin/accounts.dart';
|
||||||
|
import '../jellyfin/format.dart' show pickFor;
|
||||||
|
import '../jellyfin/session_media.dart';
|
||||||
|
import '../screens/home/picked_media.dart';
|
||||||
|
import '../session/media_art.dart';
|
||||||
|
import '../session/session_coordinator.dart';
|
||||||
|
import '../state/settings.dart';
|
||||||
|
import '../sync/avatar_cache.dart';
|
||||||
|
import 'queue_logic.dart';
|
||||||
|
|
||||||
|
// Up next on this client (see ARCHITECTURE.md "Up next"): the server's
|
||||||
|
// queue as signals, adding to it (probed, with a picture), the end-of-media
|
||||||
|
// countdown for its first item, putting an item up when this app is the
|
||||||
|
// one that can, and keeping that item ready.
|
||||||
|
|
||||||
|
/// The end-of-media card for the first Up next item. [secondsLeft] null:
|
||||||
|
/// no countdown here (auto-advance off, cancelled, or another app puts
|
||||||
|
/// it up), the card offers Play now only.
|
||||||
|
class UpNextCountdown {
|
||||||
|
final int mediaId;
|
||||||
|
final QueueItem item;
|
||||||
|
final int? secondsLeft;
|
||||||
|
const UpNextCountdown({required this.mediaId, required this.item, this.secondsLeft});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The first item's readiness on this app.
|
||||||
|
enum WarmState { idle, warming, ready, failed }
|
||||||
|
|
||||||
|
class QueueController {
|
||||||
|
final SessionCoordinator coord;
|
||||||
|
QueueController(this.coord);
|
||||||
|
|
||||||
|
/// Queued items' pictures by hash, from `/i/`.
|
||||||
|
late final PictureCache thumbs = PictureCache(coord.sync,
|
||||||
|
route: 'i', keep: RelayConstants.maxQueueItems + 8, live: (s) => [for (final q in s.queue) q.thumb]);
|
||||||
|
|
||||||
|
/// Up next, in order (empty when nothing is queued or not in a server).
|
||||||
|
late final Computed<List<QueueItem>> items =
|
||||||
|
computed(() => coord.serverState.value?.queue ?? const <QueueItem>[]);
|
||||||
|
|
||||||
|
final countdown = signal<UpNextCountdown?>(null);
|
||||||
|
|
||||||
|
/// The first item's id and how ready it is here (null: nothing to get
|
||||||
|
/// ready on this app).
|
||||||
|
final warm = signal<({String id, WarmState state})?>(null);
|
||||||
|
|
||||||
|
/// The natural continuation of what plays: the next episodes of the
|
||||||
|
/// Jellyfin series (not queued; shown greyed under Up next).
|
||||||
|
final continuation = signal<List<EpisodeLink>>(const []);
|
||||||
|
|
||||||
|
/// The mediaId whose continuation was cleared here.
|
||||||
|
final _hiddenFor = signal(-1);
|
||||||
|
|
||||||
|
/// The queue popover is open: the Up next button holds the controls up.
|
||||||
|
final popoverOpen = signal(false);
|
||||||
|
|
||||||
|
// What adder-only items stand for, by their key (a link passed on from
|
||||||
|
// here, a file here). Never leaves this app.
|
||||||
|
final Map<String, ({PickedMedia pick, DateTime at})> _local = {};
|
||||||
|
final Map<String, DateTime> _performing = {};
|
||||||
|
final Set<String> _skipped = {};
|
||||||
|
int _cancelledFor = -1;
|
||||||
|
Timer? _timer;
|
||||||
|
bool _attached = false;
|
||||||
|
String _continuationFor = '';
|
||||||
|
final _random = Random.secure();
|
||||||
|
|
||||||
|
String get _me => coord.sync.memberId;
|
||||||
|
|
||||||
|
void attach() {
|
||||||
|
if (_attached) return;
|
||||||
|
_attached = true;
|
||||||
|
coord.sync.states.listen(_onState);
|
||||||
|
coord.sync.feeds.listen(_onFeed);
|
||||||
|
effect(() {
|
||||||
|
final next = coord.nextEpisode.value;
|
||||||
|
final plan = coord.jellyfinPlan.value;
|
||||||
|
unawaited(_loadContinuation(next, plan));
|
||||||
|
});
|
||||||
|
// The continuation and the state decide what to get ready; the media
|
||||||
|
// playing having started (or sitting out) lets the preload go.
|
||||||
|
effect(() {
|
||||||
|
shownContinuation.value;
|
||||||
|
coord.settledMediaId.value;
|
||||||
|
coord.selfOut.value;
|
||||||
|
final r = coord.serverState.value;
|
||||||
|
untracked(() => _warm(r));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------- adding
|
||||||
|
|
||||||
|
/// Adds [pick] to Up next (at the end, or with [next] right after what
|
||||||
|
/// plays). A link is probed first and refused like Put it up when it
|
||||||
|
/// will not play. Returns an error text, or null when sent.
|
||||||
|
Future<String?> add(PickedMedia pick, {bool next = false}) async {
|
||||||
|
coord.markInput();
|
||||||
|
if (coord.serverState.peek() == null) return 'not in a server';
|
||||||
|
if (items.peek().length >= RelayConstants.maxQueueItems) {
|
||||||
|
return 'Up next is full (${RelayConstants.maxQueueItems} items)';
|
||||||
|
}
|
||||||
|
final ({QueueItem item, Uint8List? thumb}) built;
|
||||||
|
try {
|
||||||
|
final b = await _build(pick);
|
||||||
|
if (b is String) return b;
|
||||||
|
built = b as ({QueueItem item, Uint8List? thumb});
|
||||||
|
} catch (e) {
|
||||||
|
return "couldn't add it: $e";
|
||||||
|
}
|
||||||
|
final item = built.item;
|
||||||
|
if (item.key.isNotEmpty) _local[item.key] = (pick: pick, at: DateTime.now());
|
||||||
|
final thumb = built.thumb;
|
||||||
|
coord.sync.sendQueue(QueueIntent.add(item, next: next, thumb: thumb == null ? '' : base64Encode(thumb)));
|
||||||
|
coord.showToast('Added ${item.title} to Up next');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A continuation episode becomes an Up next item.
|
||||||
|
Future<String?> promote(EpisodeLink e) => add(e.pick);
|
||||||
|
|
||||||
|
/// The item, or an error text.
|
||||||
|
Future<Object> _build(PickedMedia pick) async {
|
||||||
|
switch (pick) {
|
||||||
|
case JellyfinMedia():
|
||||||
|
final accounts = coord.jellyfin;
|
||||||
|
if (accounts.account(pick.serverId) == null) return 'that Jellyfin server is not linked any more';
|
||||||
|
if (accounts.statusOf(pick.serverId) == JellyfinAccountStatus.expired) {
|
||||||
|
return 'Jellyfin sign-in expired — reconnect it in Settings → Jellyfin & integrations';
|
||||||
|
}
|
||||||
|
final client = accounts.clientFor(pick.serverId);
|
||||||
|
final thumb = client == null ? null : await _jellyfinThumb(client, pick.itemId);
|
||||||
|
return (
|
||||||
|
item: QueueItem(
|
||||||
|
media: mediaForPick(pick),
|
||||||
|
how: QueueHow.jellyfin,
|
||||||
|
title: pick.title,
|
||||||
|
sub: pick.subtitle,
|
||||||
|
duration: (pick.runtime?.inMilliseconds ?? 0) / 1000,
|
||||||
|
),
|
||||||
|
thumb: thumb,
|
||||||
|
);
|
||||||
|
case FileMedia(:final path):
|
||||||
|
final file = File(path);
|
||||||
|
if (!await file.exists()) return 'file not found — check the path';
|
||||||
|
final name = pick.label;
|
||||||
|
final parsed = parseReleaseName(name);
|
||||||
|
final shot = await thumbnailFor(path);
|
||||||
|
Uint8List? thumb;
|
||||||
|
if (shot != null) {
|
||||||
|
try {
|
||||||
|
final bytes = await File(shot.imagePath).readAsBytes();
|
||||||
|
if (bytes.length <= RelayConstants.maxPosterBytes) thumb = bytes;
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
final ep = [
|
||||||
|
if (parsed.season != null) 'S${parsed.season}',
|
||||||
|
if (parsed.episode != null) 'E${parsed.episode}',
|
||||||
|
].join();
|
||||||
|
return (
|
||||||
|
item: QueueItem(
|
||||||
|
media: HelloMedia(name: name, size: await file.length(), duration: 0),
|
||||||
|
how: QueueHow.file,
|
||||||
|
title: parsed.series.trim().isEmpty ? name : parsed.series.trim(),
|
||||||
|
sub: ep,
|
||||||
|
duration: (shot?.duration.inMilliseconds ?? 0) / 1000,
|
||||||
|
key: _newKey(),
|
||||||
|
),
|
||||||
|
thumb: thumb,
|
||||||
|
);
|
||||||
|
case LinkMedia(:final url, :final anyway):
|
||||||
|
// Alone, a link plays direct: there is nobody to pass it on to.
|
||||||
|
final relay = coord.solo ? LinkRelay.direct : pick.relay;
|
||||||
|
final linked = await mediaForLink(coord.jellyfin, url);
|
||||||
|
final ref = linked.jellyfin;
|
||||||
|
if (ref != null) {
|
||||||
|
return (
|
||||||
|
item: QueueItem(
|
||||||
|
media: HelloMedia(name: linked.name, size: 0, duration: 0, jellyfin: ref),
|
||||||
|
how: QueueHow.jellyfin,
|
||||||
|
title: ref.title.isEmpty ? linked.name : ref.title,
|
||||||
|
sub: ref.subtitle ?? '',
|
||||||
|
duration: ref.runtimeSecs ?? 0),
|
||||||
|
thumb: null,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
LinkProbe? probe;
|
||||||
|
String? probeError;
|
||||||
|
try {
|
||||||
|
probe = await coord.ytDlp.probe(url).timeout(const Duration(seconds: 45));
|
||||||
|
} catch (e) {
|
||||||
|
probeError = '$e';
|
||||||
|
}
|
||||||
|
final problem = probe == null ? playErrorText(probeError ?? '') : probe.problem;
|
||||||
|
if (problem != null && !anyway) return problem;
|
||||||
|
if (relay == LinkRelay.me) {
|
||||||
|
if (probe == null) return problem ?? "couldn't reach the site";
|
||||||
|
final relayProblem = probe.relayProblem;
|
||||||
|
if (relayProblem != null) return relayProblem;
|
||||||
|
}
|
||||||
|
if (relay == LinkRelay.server && !coord.serverHasPassword) return 'server fetch needs a server password';
|
||||||
|
if (relay == LinkRelay.server && probe != null && probe.isPage && probe.info != null) {
|
||||||
|
final relayProblem = probe.relayProblem;
|
||||||
|
if (relayProblem != null) return relayProblem;
|
||||||
|
}
|
||||||
|
final uri = Uri.tryParse(url) ?? Uri();
|
||||||
|
final info = probe?.info;
|
||||||
|
final title = probe?.title ?? linked.name;
|
||||||
|
final site = info == null
|
||||||
|
? uri.host
|
||||||
|
: (info.uploader.isNotEmpty ? info.uploader : (info.extractor.isNotEmpty ? info.extractor : uri.host));
|
||||||
|
final thumbUrl = info?.thumbnail == null ? null : Uri.tryParse(info!.thumbnail!);
|
||||||
|
final thumb = thumbUrl == null ? null : (await thumbnailArt(thumbUrl))?.poster;
|
||||||
|
final how = switch (relay) {
|
||||||
|
LinkRelay.direct => QueueHow.direct,
|
||||||
|
LinkRelay.server => QueueHow.server,
|
||||||
|
LinkRelay.me => QueueHow.through,
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
item: QueueItem(
|
||||||
|
media: HelloMedia(
|
||||||
|
name: title,
|
||||||
|
size: 0,
|
||||||
|
duration: 0,
|
||||||
|
url: how == QueueHow.through ? null : url,
|
||||||
|
relay: how == QueueHow.server ? const MediaRelay(fetch: true) : null),
|
||||||
|
how: how,
|
||||||
|
title: title,
|
||||||
|
sub: site,
|
||||||
|
duration: info?.duration ?? 0,
|
||||||
|
key: how == QueueHow.through ? _newKey() : '',
|
||||||
|
),
|
||||||
|
thumb: thumb,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String _newKey() => [for (var i = 0; i < 12; i++) _random.nextInt(256).toRadixString(16).padLeft(2, '0')].join();
|
||||||
|
|
||||||
|
/// A wide picture of a Jellyfin item: an episode's own still, else the
|
||||||
|
/// item's (or series') thumb or backdrop, else its poster.
|
||||||
|
Future<Uint8List?> _jellyfinThumb(JellyfinClient client, String itemId) async {
|
||||||
|
try {
|
||||||
|
final item = await client.item(itemId).timeout(const Duration(seconds: 10));
|
||||||
|
final ref = (item.kind == JellyfinItemKind.episode ? item.ownImage(JellyfinImageType.primary) : null) ??
|
||||||
|
item.image(JellyfinImageType.thumb) ??
|
||||||
|
item.image(JellyfinImageType.backdrop) ??
|
||||||
|
item.image(JellyfinImageType.primary);
|
||||||
|
if (ref == null) return null;
|
||||||
|
return await fetchImage(
|
||||||
|
client.imageUrl(ref, maxWidth: 480, quality: 80), client.authHeaders, RelayConstants.maxPosterBytes);
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('queue: no Jellyfin picture for $itemId: $e');
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [item]'s link as this app may hand it out (Copy link, Open in
|
||||||
|
/// browser): a link everyone opens (it is in the state), or a link this
|
||||||
|
/// app passes on (its adder). Null otherwise: a server-fetched link stays
|
||||||
|
/// with the server, another member's passed-on link with them.
|
||||||
|
String? linkOf(QueueItem item) => switch (item.how) {
|
||||||
|
QueueHow.direct => item.media.url,
|
||||||
|
QueueHow.through when item.by == _me => switch (_local[item.key]?.pick) {
|
||||||
|
LinkMedia(:final url) => url,
|
||||||
|
_ => null,
|
||||||
|
},
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// [item]'s page on its Jellyfin server, when that server is linked here.
|
||||||
|
String? jellyfinPageOf(QueueItem item) {
|
||||||
|
final ref = item.media.jellyfin;
|
||||||
|
return ref == null ? null : coord.jellyfin.webUrlOf(ref.serverId, ref.itemId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------ editing
|
||||||
|
|
||||||
|
void move(String id, int to) {
|
||||||
|
coord.markInput();
|
||||||
|
coord.sync.sendQueue(QueueIntent.move(id, to));
|
||||||
|
}
|
||||||
|
|
||||||
|
void remove(String id) {
|
||||||
|
coord.markInput();
|
||||||
|
coord.sync.sendQueue(QueueIntent.remove(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Plays [id] now: this app puts it up when it is the one that can,
|
||||||
|
/// else it asks the server, and the app that can puts it up.
|
||||||
|
void playNow(String id) {
|
||||||
|
coord.markInput();
|
||||||
|
final r = coord.serverState.peek();
|
||||||
|
final item = r?.queue.where((q) => q.id == id).firstOrNull;
|
||||||
|
if (r == null || item == null) return;
|
||||||
|
if (queuePerformer(item, r.members).id == _me) {
|
||||||
|
_perform(item);
|
||||||
|
} else {
|
||||||
|
coord.sync.sendQueue(QueueIntent.play(id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Plays the first Up next item now.
|
||||||
|
void skip() {
|
||||||
|
final first = items.peek().firstOrNull;
|
||||||
|
if (first != null) playNow(first.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Cancel on the end-of-media card: no countdown here for this media.
|
||||||
|
void cancelCountdown() {
|
||||||
|
final c = countdown.peek();
|
||||||
|
_timer?.cancel();
|
||||||
|
_timer = null;
|
||||||
|
if (c == null) return;
|
||||||
|
_cancelledFor = c.mediaId;
|
||||||
|
countdown.value = UpNextCountdown(mediaId: c.mediaId, item: c.item);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "Clear": hides the continuation of what plays now (and its next
|
||||||
|
/// episode does not come up by itself).
|
||||||
|
void clearContinuation() {
|
||||||
|
final id = coord.serverState.peek()?.mediaId;
|
||||||
|
if (id != null) _hiddenFor.value = id;
|
||||||
|
if (coord.autoAdvance.peek() != null) coord.cancelAutoAdvance();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The continuation applies to [mediaId]: nothing is queued and it was
|
||||||
|
/// not cleared.
|
||||||
|
bool continuationShown(int mediaId) =>
|
||||||
|
(coord.serverState.peek()?.queue.isEmpty ?? true) && _hiddenFor.peek() != mediaId;
|
||||||
|
|
||||||
|
/// [continuation] unless cleared for the media playing.
|
||||||
|
late final Computed<List<EpisodeLink>> shownContinuation = computed(() {
|
||||||
|
final id = coord.serverState.value?.mediaId;
|
||||||
|
return id != null && _hiddenFor.value == id ? const <EpisodeLink>[] : continuation.value;
|
||||||
|
});
|
||||||
|
|
||||||
|
// --------------------------------------------------------- per state
|
||||||
|
|
||||||
|
void _onState(StateBroadcast r) {
|
||||||
|
_lastState = r;
|
||||||
|
_prune(r);
|
||||||
|
final queue = r.queue;
|
||||||
|
final play = r.queuePlay;
|
||||||
|
if (play != null) {
|
||||||
|
final item = queue.where((q) => q.id == play).firstOrNull;
|
||||||
|
if (item != null) _bringUp(item, r);
|
||||||
|
}
|
||||||
|
final finished = r.transport == 'finished';
|
||||||
|
if (queue.isNotEmpty && r.media == null) {
|
||||||
|
// Nothing up yet: the first item goes up at once.
|
||||||
|
_bringUp(queue.first, r);
|
||||||
|
} else if (finished && queue.isNotEmpty) {
|
||||||
|
_atEnd(r);
|
||||||
|
} else {
|
||||||
|
if (countdown.peek() != null) _stopCountdown();
|
||||||
|
if (!finished) _cancelledFor = -1;
|
||||||
|
}
|
||||||
|
_warm(r);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _onFeed(FeedMessage f) {
|
||||||
|
if (f.action == 'queue-skip') {
|
||||||
|
coord.showToast('Skipped ${f.target ?? 'an item'}${f.reason.isEmpty ? '' : ': ${f.reason}'}');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Forgets what no longer matters: performing marks after a minute (a
|
||||||
|
/// swap that never landed may be tried again), local picks no longer
|
||||||
|
/// queued.
|
||||||
|
void _prune(StateBroadcast r) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
_performing.removeWhere((_, at) => now.difference(at) > const Duration(minutes: 1));
|
||||||
|
final keys = {for (final q in r.queue) q.key};
|
||||||
|
_local.removeWhere((k, v) => !keys.contains(k) && now.difference(v.at) > const Duration(minutes: 1));
|
||||||
|
final ids = {for (final q in r.queue) q.id};
|
||||||
|
_skipped.removeWhere((id) => !ids.contains(id));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [item] should go up now: by this app when it is the one that can;
|
||||||
|
/// nobody can: the lowest member takes it off with the reason.
|
||||||
|
void _bringUp(QueueItem item, StateBroadcast r) {
|
||||||
|
final perf = queuePerformer(item, r.members);
|
||||||
|
if (perf.id == null) {
|
||||||
|
final why = perf.why;
|
||||||
|
if (why != null && queueJanitor(r.members) == _me && _skipped.add(item.id)) {
|
||||||
|
coord.sync.sendQueue(QueueIntent.remove(item.id, why: why));
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (perf.id == _me) _perform(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The media finished with Up next waiting: the card, and with
|
||||||
|
/// auto-advance on the countdown, for its first item.
|
||||||
|
void _atEnd(StateBroadcast r) {
|
||||||
|
// Up next goes before the next episode, even one already counting.
|
||||||
|
if (coord.autoAdvance.peek() != null) coord.cancelAutoAdvance();
|
||||||
|
final head = r.queue.first;
|
||||||
|
final perf = queuePerformer(head, r.members);
|
||||||
|
if (perf.id == null && perf.why != null) {
|
||||||
|
// Taken off by [_bringUp]'s rule; the next state shows the next one.
|
||||||
|
_bringUp(head, r);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final c = countdown.peek();
|
||||||
|
if (c != null && c.mediaId == r.mediaId) {
|
||||||
|
if (c.item.id != head.id || c.item.thumb != head.thumb) {
|
||||||
|
countdown.value = UpNextCountdown(mediaId: c.mediaId, item: head, secondsLeft: c.secondsLeft);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final auto = AppSettings.instance.autoAdvance.peek() && _cancelledFor != r.mediaId;
|
||||||
|
countdown.value = UpNextCountdown(mediaId: r.mediaId, item: head, secondsLeft: auto ? autoAdvanceSecs : null);
|
||||||
|
_timer?.cancel();
|
||||||
|
_timer = auto ? Timer.periodic(const Duration(seconds: 1), (_) => _tick()) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _tick() {
|
||||||
|
final c = countdown.peek();
|
||||||
|
final r = coord.serverState.peek();
|
||||||
|
final left = c?.secondsLeft;
|
||||||
|
if (c == null || left == null || r == null || r.mediaId != c.mediaId || r.transport != 'finished') {
|
||||||
|
_stopCountdown();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (left > 1) {
|
||||||
|
countdown.value = UpNextCountdown(mediaId: c.mediaId, item: c.item, secondsLeft: left - 1);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_timer?.cancel();
|
||||||
|
_timer = null;
|
||||||
|
_cancelledFor = c.mediaId;
|
||||||
|
countdown.value = UpNextCountdown(mediaId: c.mediaId, item: c.item);
|
||||||
|
// Decided on the latest state: only the app that can puts it up.
|
||||||
|
final head = r.queue.firstOrNull;
|
||||||
|
if (head != null && queuePerformer(head, r.members).id == _me) _perform(head);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _stopCountdown() {
|
||||||
|
_timer?.cancel();
|
||||||
|
_timer = null;
|
||||||
|
countdown.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Puts [item] up from here (once per item while it is in flight).
|
||||||
|
/// When it cannot play after all, it is taken off with the reason.
|
||||||
|
void _perform(QueueItem item) {
|
||||||
|
if (_performing.containsKey(item.id)) return;
|
||||||
|
_performing[item.id] = DateTime.now();
|
||||||
|
unawaited(() async {
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
error = await _swapTo(item);
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
if (error != null) {
|
||||||
|
debugPrint('queue: ${item.id} cannot go up: $error');
|
||||||
|
coord.sync.sendQueue(QueueIntent.remove(item.id, why: "couldn't play it ($error)"));
|
||||||
|
}
|
||||||
|
}());
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String?> _swapTo(QueueItem item) async {
|
||||||
|
switch (item.how) {
|
||||||
|
case QueueHow.jellyfin:
|
||||||
|
final ref = item.media.jellyfin;
|
||||||
|
final pick = ref == null ? null : pickForRef(coord.jellyfin, ref);
|
||||||
|
if (pick == null) return 'no Jellyfin account here for it';
|
||||||
|
coord.swapJellyfin(pick, queueId: item.id);
|
||||||
|
return null;
|
||||||
|
case QueueHow.direct:
|
||||||
|
final url = item.media.url;
|
||||||
|
if (url == null) return 'no link';
|
||||||
|
// Each viewer opens it: one computer's probe does not decide.
|
||||||
|
return coord.swapLink(url, relay: LinkRelay.direct, anyway: true, queueId: item.id);
|
||||||
|
case QueueHow.server:
|
||||||
|
coord.swapQueued(HelloMedia(name: item.title, size: 0, duration: 0, relay: const MediaRelay(fetch: true)),
|
||||||
|
item.id,
|
||||||
|
art: thumbs.bytesFor(item.thumb));
|
||||||
|
return null;
|
||||||
|
case QueueHow.through:
|
||||||
|
case QueueHow.file:
|
||||||
|
final local = _local[item.key];
|
||||||
|
if (local == null) return "it isn't on this computer any more";
|
||||||
|
// Only this app can pass it on, and a member sitting out has
|
||||||
|
// nothing open: back first.
|
||||||
|
if (coord.selfOut.peek()) coord.joinBack();
|
||||||
|
return coord.swapPicked(local.pick, queueId: item.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------ warming
|
||||||
|
|
||||||
|
/// How long a warm result is kept, when it is resolved again, and when a
|
||||||
|
/// failed one is tried again.
|
||||||
|
static const _warmKeep = Duration(minutes: 35);
|
||||||
|
static const _warmRefresh = Duration(minutes: 30);
|
||||||
|
static const _warmRetry = Duration(minutes: 2);
|
||||||
|
|
||||||
|
String _warmKey = '';
|
||||||
|
String? _warmUrl;
|
||||||
|
Timer? _warmTimer;
|
||||||
|
int _warmGen = 0;
|
||||||
|
// What the preload player should hold once the media playing has
|
||||||
|
// started (null: nothing); [_preloadFresh]: open it again (a link's
|
||||||
|
// refresh).
|
||||||
|
({String url, Map<String, String>? headers})? _preloadWant;
|
||||||
|
bool _preloadFresh = false;
|
||||||
|
String _preloadKey = '';
|
||||||
|
bool _preloadBusy = false;
|
||||||
|
bool _preloadOk = true;
|
||||||
|
int _preloadGen = 0;
|
||||||
|
StateBroadcast? _lastState;
|
||||||
|
|
||||||
|
bool _ownAccount(String serverId) =>
|
||||||
|
coord.jellyfin.account(serverId) != null && coord.jellyfin.statusOf(serverId) != JellyfinAccountStatus.expired;
|
||||||
|
|
||||||
|
/// What this app gets ready: Up next's first item, else (Up next empty)
|
||||||
|
/// the first continuation episode (only here when this app plays the
|
||||||
|
/// series with its own account). Every app does, each its own copy (see
|
||||||
|
/// [_WarmTarget]); while sitting out only the probe of a link this app
|
||||||
|
/// puts up (its swap reads it). Null: nothing.
|
||||||
|
_WarmTarget? _warmTarget(StateBroadcast? r) {
|
||||||
|
final t = _warmTargetHere(r);
|
||||||
|
if (t == null || !coord.selfOut.peek()) return t;
|
||||||
|
return t.probe == null ? null : _WarmTarget(t.id, probe: t.probe);
|
||||||
|
}
|
||||||
|
|
||||||
|
_WarmTarget? _warmTargetHere(StateBroadcast? r) {
|
||||||
|
if (r == null) return null;
|
||||||
|
final head = r.queue.firstOrNull;
|
||||||
|
if (head != null) {
|
||||||
|
final performer = queuePerformer(head, r.members).id == _me;
|
||||||
|
final local = _local[head.key]?.pick;
|
||||||
|
// The server's warm relay of the item, once bytes can flow: what
|
||||||
|
// everyone without their own copy preloads.
|
||||||
|
final relay = head.media.relay;
|
||||||
|
final warmUrl = relay != null && relay.live ? coord.warmRelayUrl(head, relay) : null;
|
||||||
|
switch (head.how) {
|
||||||
|
case QueueHow.jellyfin:
|
||||||
|
final ref = head.media.jellyfin;
|
||||||
|
if (ref == null) return null;
|
||||||
|
if (_ownAccount(ref.serverId)) return _WarmTarget(head.id, ref: ref);
|
||||||
|
// No account here: the server's login passes it on (`/j`), else
|
||||||
|
// the warm relay a member with an account feeds.
|
||||||
|
final open = r.relayNext ? coord.jellyfinRelayUrl(ref) : warmUrl;
|
||||||
|
return open == null ? null : _WarmTarget(head.id, open: open);
|
||||||
|
case QueueHow.direct:
|
||||||
|
final url = head.media.url;
|
||||||
|
if (url == null) return null;
|
||||||
|
return _WarmTarget(head.id, probe: performer ? url : null, open: url);
|
||||||
|
case QueueHow.through:
|
||||||
|
// Only its adder has the link (and feeds the warm relay).
|
||||||
|
if (!performer) return warmUrl == null ? null : _WarmTarget(head.id, open: warmUrl);
|
||||||
|
final url = local is LinkMedia ? local.url : null;
|
||||||
|
return _WarmTarget(head.id, probe: url, open: url);
|
||||||
|
case QueueHow.file:
|
||||||
|
if (!performer) return warmUrl == null ? null : _WarmTarget(head.id, open: warmUrl);
|
||||||
|
// The host's own file plays from its `/m` URL once it is up.
|
||||||
|
return _WarmTarget(head.id, open: local is FileMedia && coord.hostFile == null ? local.path : null);
|
||||||
|
case QueueHow.server:
|
||||||
|
// The server fetches it into its warm relay; everyone preloads that.
|
||||||
|
if (warmUrl != null) return _WarmTarget(head.id, open: warmUrl);
|
||||||
|
return performer ? _WarmTarget(head.id) : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final next = shownContinuation.peek().firstOrNull;
|
||||||
|
if (next == null) return null;
|
||||||
|
return _WarmTarget('next:${next.item.id}', ref: mediaForPick(next.pick).jellyfin);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Keeps the one item that plays next ready on this app, so a skip or
|
||||||
|
/// the end of what plays starts it at once: a link probed when this app
|
||||||
|
/// puts it up (`AppYtDlp.probe`, kept while it stays first), a Jellyfin
|
||||||
|
/// item resolved with this app's account
|
||||||
|
/// ([SessionCoordinator.warmJellyfin]), and then opened in the hidden
|
||||||
|
/// preload player ([SessionCoordinator.preloadMedia]) once the media
|
||||||
|
/// playing has started. Done as soon as it is first, again before that
|
||||||
|
/// runs out, dropped when it is no longer first.
|
||||||
|
void _warm(StateBroadcast? r) {
|
||||||
|
_feedWarm(r);
|
||||||
|
final t = _warmTarget(r);
|
||||||
|
final key = t?.key ?? '';
|
||||||
|
if (key != _warmKey) {
|
||||||
|
_dropWarm(r);
|
||||||
|
_warmKey = key;
|
||||||
|
if (t == null) {
|
||||||
|
if (warm.peek() != null) warm.value = null;
|
||||||
|
} else if (t.empty) {
|
||||||
|
warm.value = (id: t.id, state: WarmState.ready);
|
||||||
|
} else {
|
||||||
|
warm.value = (id: t.id, state: WarmState.warming);
|
||||||
|
_resolveWarm(t, fresh: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_syncPreload(r);
|
||||||
|
}
|
||||||
|
|
||||||
|
// The warm relay this app feeds (`<queue id>|<token>`), started once.
|
||||||
|
String _fedWarm = '';
|
||||||
|
|
||||||
|
/// Feeds the server's warm relay of Up next's first item from here when
|
||||||
|
/// it names this member as its source (a link passed on, a file), or a
|
||||||
|
/// Jellyfin item this app puts up with its own account when the server
|
||||||
|
/// asks for a source; see [SessionCoordinator.feedWarm]. The server
|
||||||
|
/// drops the relay (and with it the source) once the item is no longer
|
||||||
|
/// first.
|
||||||
|
void _feedWarm(StateBroadcast? r) {
|
||||||
|
final head = r?.queue.firstOrNull;
|
||||||
|
final relay = head?.media.relay;
|
||||||
|
if (r == null || head == null || relay == null || relay.fetch) return;
|
||||||
|
final key = '${head.id}|${coord.sync.token}';
|
||||||
|
if (key == _fedWarm) return;
|
||||||
|
switch (head.how) {
|
||||||
|
case QueueHow.through:
|
||||||
|
case QueueHow.file:
|
||||||
|
if (relay.source != _me) return;
|
||||||
|
final pick = _local[head.key]?.pick;
|
||||||
|
if (pick is FileMedia) {
|
||||||
|
_fedWarm = key;
|
||||||
|
coord.feedWarm(head.id, RelayMedia.single(FileRelayBytes(File(pick.path))));
|
||||||
|
} else if (pick is LinkMedia) {
|
||||||
|
_fedWarm = key;
|
||||||
|
unawaited(() async {
|
||||||
|
try {
|
||||||
|
// The probe [_resolveWarm] keeps: no second yt-dlp run.
|
||||||
|
final probe = await coord.ytDlp.probe(pick.url, keep: _warmKeep).timeout(const Duration(seconds: 60));
|
||||||
|
final y = await coord.ytDlp.ytDlp;
|
||||||
|
if (_fedWarm != key) return;
|
||||||
|
coord.feedWarm(head.id, LinkRelayMedia(Uri.parse(pick.url), ytDlp: y, probe: probe));
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('queue: feeding ${head.id}: $e');
|
||||||
|
}
|
||||||
|
}());
|
||||||
|
}
|
||||||
|
case QueueHow.jellyfin:
|
||||||
|
final ref = head.media.jellyfin;
|
||||||
|
if (ref == null || (relay.source.isNotEmpty && relay.source != _me)) return;
|
||||||
|
if (queuePerformer(head, r.members).id != _me) return;
|
||||||
|
// Resolved with this app's account by [_resolveWarm].
|
||||||
|
final w = coord.warmJellyfin;
|
||||||
|
if (w == null || !sameJellyfinItem(w.ref, ref)) return;
|
||||||
|
_fedWarm = key;
|
||||||
|
coord.feedWarm(
|
||||||
|
head.id, RelayMedia.single(HttpRelayBytes(Uri.parse(w.plan.url), headers: w.plan.headers)));
|
||||||
|
case QueueHow.direct:
|
||||||
|
case QueueHow.server:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _dropWarm(StateBroadcast? r) {
|
||||||
|
_warmTimer?.cancel();
|
||||||
|
_warmTimer = null;
|
||||||
|
_warmGen++;
|
||||||
|
_preloadWant = null;
|
||||||
|
final url = _warmUrl;
|
||||||
|
_warmUrl = null;
|
||||||
|
if (url != null) coord.ytDlp.release(url);
|
||||||
|
// Kept while it is what just went up: that open takes it.
|
||||||
|
final w = coord.warmJellyfin;
|
||||||
|
if (w != null && !sameJellyfinItem(w.ref, refOfStateMedia(r?.media))) coord.warmJellyfin = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void _resolveWarm(_WarmTarget t, {required bool fresh}) {
|
||||||
|
final gen = ++_warmGen;
|
||||||
|
unawaited(() async {
|
||||||
|
var ok = true;
|
||||||
|
({String url, Map<String, String>? headers})? open;
|
||||||
|
try {
|
||||||
|
final probe = t.probe, ref = t.ref, url = t.open;
|
||||||
|
if (probe != null) {
|
||||||
|
_warmUrl = probe;
|
||||||
|
final p = await coord.ytDlp.probe(probe, keep: _warmKeep, fresh: fresh).timeout(const Duration(seconds: 60));
|
||||||
|
ok = p.problem == null;
|
||||||
|
}
|
||||||
|
if (ref != null) {
|
||||||
|
final plan = await resolveJellyfinRef(coord.jellyfin, ref, relay: false, relayUrl: null);
|
||||||
|
if (gen != _warmGen) return;
|
||||||
|
ok = plan is OwnPlay;
|
||||||
|
if (plan is OwnPlay) {
|
||||||
|
coord.warmJellyfin = (ref: ref, plan: plan, until: DateTime.now().add(_warmKeep));
|
||||||
|
open = (url: plan.url, headers: plan.headers);
|
||||||
|
_feedWarm(coord.serverState.peek());
|
||||||
|
}
|
||||||
|
} else if (url != null && ok) {
|
||||||
|
open = (url: url, headers: null);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
ok = false;
|
||||||
|
debugPrint('queue: getting ${t.id} ready: $e');
|
||||||
|
}
|
||||||
|
if (gen != _warmGen) return;
|
||||||
|
_preloadWant = ok ? open : null;
|
||||||
|
// A refresh opens a link again (a page's stream URLs expire); the
|
||||||
|
// same Jellyfin stream stays as it is.
|
||||||
|
_preloadFresh = fresh && ok && t.ref == null && open != null;
|
||||||
|
final waits = ok && open != null && coord.playback.preloadEnabled;
|
||||||
|
warm.value = (id: t.id, state: !ok ? WarmState.failed : (waits ? WarmState.warming : WarmState.ready));
|
||||||
|
_syncPreload(coord.serverState.peek());
|
||||||
|
_warmTimer = Timer(ok ? _warmRefresh : _warmRetry, () => _resolveWarm(t, fresh: true));
|
||||||
|
}());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Puts [_preloadWant] in the preload player, or drops what it holds;
|
||||||
|
/// only once the media playing has started (its own open goes first,
|
||||||
|
/// and a preload a swap is about to take is never replaced before), at
|
||||||
|
/// once while sitting out (nothing preloads then).
|
||||||
|
void _syncPreload(StateBroadcast? r) {
|
||||||
|
// The newest state seen here: the coordinator's lags behind while the
|
||||||
|
// same `state` is still being handed to it.
|
||||||
|
final seen = _lastState;
|
||||||
|
if (r == null || (seen != null && seen.mediaId > r.mediaId)) r = seen;
|
||||||
|
if (r == null) return;
|
||||||
|
final out = coord.selfOut.peek();
|
||||||
|
if (!out && r.media != null && coord.settledMediaId.peek() != r.mediaId) return;
|
||||||
|
final want = out ? null : _preloadWant;
|
||||||
|
final playback = coord.playback;
|
||||||
|
if (want == null) {
|
||||||
|
_preloadKey = '';
|
||||||
|
_preloadGen++;
|
||||||
|
if (playback.preloadUrl != null) unawaited(playback.dropPreload());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (!playback.preloadEnabled) return;
|
||||||
|
final key = '${want.url}|${want.headers}';
|
||||||
|
final fresh = _preloadFresh;
|
||||||
|
// Asked for already: in flight, there, or failed (tried again with the
|
||||||
|
// next refresh). One that went away (Reload video) is asked again.
|
||||||
|
if (!fresh && key == _preloadKey && (_preloadBusy || !_preloadOk || playback.preloadUrl == want.url)) return;
|
||||||
|
_preloadFresh = false;
|
||||||
|
_preloadKey = key;
|
||||||
|
_preloadBusy = true;
|
||||||
|
final gen = ++_preloadGen;
|
||||||
|
final id = warm.peek()?.id;
|
||||||
|
unawaited(coord.preloadMedia(want.url, headers: want.headers, fresh: fresh).then((ok) {
|
||||||
|
if (gen != _preloadGen) return;
|
||||||
|
_preloadBusy = false;
|
||||||
|
_preloadOk = ok;
|
||||||
|
// A preload that fails leaves the usual open: nothing to say.
|
||||||
|
if (!ok) debugPrint('queue: preload of $id failed');
|
||||||
|
final w = warm.peek();
|
||||||
|
if (w != null && w.id == id && w.state == WarmState.warming) {
|
||||||
|
warm.value = (id: w.id, state: WarmState.ready);
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------- continuation
|
||||||
|
|
||||||
|
/// The next few episodes after the one playing (own account only).
|
||||||
|
Future<void> _loadContinuation(EpisodeLink? next, JellyfinPlan? plan) async {
|
||||||
|
if (next == null || plan is! OwnPlay) {
|
||||||
|
_continuationFor = '';
|
||||||
|
if (continuation.peek().isNotEmpty) continuation.value = const [];
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final key = '${plan.account.serverId}/${next.item.id}';
|
||||||
|
if (key == _continuationFor) return;
|
||||||
|
_continuationFor = key;
|
||||||
|
continuation.value = [next];
|
||||||
|
final seriesId = next.item.seriesId;
|
||||||
|
if (seriesId == null) return;
|
||||||
|
try {
|
||||||
|
final list = await coord.jellyfin.cached(
|
||||||
|
plan.account.serverId, 'episodes:$seriesId', () => plan.client.episodes(seriesId));
|
||||||
|
if (_continuationFor != key) return;
|
||||||
|
final more = [next];
|
||||||
|
var at = next.item;
|
||||||
|
while (more.length < 4) {
|
||||||
|
final after = episodeAfter(list, at.id);
|
||||||
|
if (after == null) break;
|
||||||
|
more.add(EpisodeLink(after, pickFor(plan.account, after)));
|
||||||
|
at = after;
|
||||||
|
}
|
||||||
|
continuation.value = more;
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('queue: continuation of $seriesId: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What [QueueController] gets ready for one item on this app: [probe] a
|
||||||
|
/// link (the app that puts it up), resolve [ref] with this app's own
|
||||||
|
/// account, and preload [open] (or the resolved stream). None of it:
|
||||||
|
/// nothing to do here, and it is ready ([empty]).
|
||||||
|
class _WarmTarget {
|
||||||
|
final String id;
|
||||||
|
final String? probe;
|
||||||
|
final JellyfinRef? ref;
|
||||||
|
final String? open;
|
||||||
|
const _WarmTarget(this.id, {this.probe, this.ref, this.open});
|
||||||
|
|
||||||
|
bool get empty => probe == null && ref == null && open == null;
|
||||||
|
String get key => '$id|$probe|$open|${ref?.serverId}/${ref?.itemId}/${ref?.mediaSourceId}';
|
||||||
|
}
|
||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../jellyfin/session_media.dart' show compareMemberIds;
|
||||||
|
|
||||||
|
// Who puts an Up next item up. Pure: only what every client sees in
|
||||||
|
// `state` decides, so all clients agree without a wire message (like the
|
||||||
|
// Jellyfin auto-advance swapper).
|
||||||
|
|
||||||
|
/// Who puts [item] up: [id] a member id; null with [why] when nobody here
|
||||||
|
/// can (the item is skipped), null without [why] when nobody is around
|
||||||
|
/// right now (nothing happens).
|
||||||
|
typedef QueuePerformer = ({String? id, String? why});
|
||||||
|
|
||||||
|
/// - A link passed on by its adder, or the adder's file: only the adder
|
||||||
|
/// (their app has the file, the cookies). Gone: skipped.
|
||||||
|
/// - Jellyfin: the adder when it plays that server with its own account,
|
||||||
|
/// else the lowest member id that does (`jf[serverId] == true`, not
|
||||||
|
/// stale, not sitting out). Nobody: skipped.
|
||||||
|
/// - A link everyone opens, or one the server fetches: the adder when
|
||||||
|
/// present (not stale or sitting out), else the lowest such member id.
|
||||||
|
QueuePerformer queuePerformer(QueueItem item, List<MemberView> members) {
|
||||||
|
MemberView? adder;
|
||||||
|
for (final m in members) {
|
||||||
|
if (m.id == item.by) adder = m;
|
||||||
|
}
|
||||||
|
bool active(MemberView m) => !m.stale && !m.out;
|
||||||
|
if (item.how.adderOnly) {
|
||||||
|
if (adder == null) return (id: null, why: '${_name(item)} left');
|
||||||
|
return (id: adder.id, why: null);
|
||||||
|
}
|
||||||
|
final ref = item.media.jellyfin;
|
||||||
|
if (item.how == QueueHow.jellyfin && ref != null) {
|
||||||
|
bool can(MemberView m) => active(m) && m.jf[ref.serverId] == true;
|
||||||
|
if (adder != null && can(adder)) return (id: adder.id, why: null);
|
||||||
|
final id = autoAdvanceLowest(members.where(can));
|
||||||
|
return id == null ? (id: null, why: 'nobody here has that Jellyfin server') : (id: id, why: null);
|
||||||
|
}
|
||||||
|
if (adder != null && active(adder)) return (id: adder.id, why: null);
|
||||||
|
return (id: autoAdvanceLowest(members.where(active)), why: null);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _name(QueueItem item) => item.byName.isEmpty ? 'who added it' : item.byName;
|
||||||
|
|
||||||
|
/// The lowest member id of [members] ("m2" before "m10"), or null.
|
||||||
|
String? autoAdvanceLowest(Iterable<MemberView> members) {
|
||||||
|
final ids = [for (final m in members) m.id]..sort(compareMemberIds);
|
||||||
|
return ids.isEmpty ? null : ids.first;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Who takes an item nobody can put up off the queue (`remove` with why):
|
||||||
|
/// the lowest member id that is not stale.
|
||||||
|
String? queueJanitor(List<MemberView> members) => autoAdvanceLowest(members.where((m) => !m.stale));
|
||||||
|
|
||||||
|
/// How [item] plays, in a few words for its row: "through Foxyz" (you:
|
||||||
|
/// "through you"), "server fetches", "everyone fetches", "Jellyfin",
|
||||||
|
/// "Foxyz's file".
|
||||||
|
String queueHowLabel(QueueItem item, {required String selfId}) {
|
||||||
|
final mine = item.by == selfId && selfId.isNotEmpty;
|
||||||
|
final who = mine ? 'you' : _name(item);
|
||||||
|
return switch (item.how) {
|
||||||
|
QueueHow.through => 'through $who',
|
||||||
|
QueueHow.file => mine ? 'your file' : "$who's file",
|
||||||
|
QueueHow.server => 'server fetches',
|
||||||
|
QueueHow.direct => 'everyone fetches',
|
||||||
|
QueueHow.jellyfin => 'Jellyfin',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "1:23:45" / "23:45" for [secs]; empty when unknown.
|
||||||
|
String queueClock(double secs) {
|
||||||
|
if (secs <= 0) return '';
|
||||||
|
final s = secs.round();
|
||||||
|
final h = s ~/ 3600, m = (s % 3600) ~/ 60, r = s % 60;
|
||||||
|
String two(int v) => v.toString().padLeft(2, '0');
|
||||||
|
return h > 0 ? '$h:${two(m)}:${two(r)}' : '$m:${two(r)}';
|
||||||
|
}
|
||||||
@@ -0,0 +1,391 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
import 'dart:ui' show Color;
|
||||||
|
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
|
||||||
|
// AniList airing schedule (public GraphQL, no login): every episode airing
|
||||||
|
// in a time range, with covers, banners and popularity; and a title search
|
||||||
|
// (cover + banner of a show, for the media art of files and links).
|
||||||
|
//
|
||||||
|
// AniList allows ~90 requests/min (sometimes degraded to 30), so the raw
|
||||||
|
// pages are cached: in memory for 10 min (tab switches) and on disk for an
|
||||||
|
// hour (restarts), keyed by range start. A 429 waits out Retry-After once;
|
||||||
|
// if AniList still refuses (or is unreachable), stale cached data is
|
||||||
|
// returned with its fetch time.
|
||||||
|
|
||||||
|
final _log = createLogger('anilist');
|
||||||
|
|
||||||
|
const aniListDefaultUrl = 'https://graphql.anilist.co';
|
||||||
|
|
||||||
|
/// One episode airing, as AniList announces it.
|
||||||
|
class Airing {
|
||||||
|
final int anilistId;
|
||||||
|
/// English title, else romaji.
|
||||||
|
final String title;
|
||||||
|
final String titleRomaji;
|
||||||
|
final int episode;
|
||||||
|
/// UTC.
|
||||||
|
final DateTime airingAt;
|
||||||
|
final String? cover;
|
||||||
|
final String? banner;
|
||||||
|
/// The cover's dominant color, if AniList has one.
|
||||||
|
final Color? color;
|
||||||
|
final int popularity;
|
||||||
|
|
||||||
|
const Airing({
|
||||||
|
required this.anilistId,
|
||||||
|
required this.title,
|
||||||
|
required this.titleRomaji,
|
||||||
|
required this.episode,
|
||||||
|
required this.airingAt,
|
||||||
|
this.cover,
|
||||||
|
this.banner,
|
||||||
|
this.color,
|
||||||
|
this.popularity = 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
/// Null for adult entries, music videos and malformed rows.
|
||||||
|
static Airing? fromJson(Object? j) {
|
||||||
|
if (j is! Map) return null;
|
||||||
|
final m = j['media'], at = j['airingAt'], ep = j['episode'];
|
||||||
|
if (m is! Map || at is! int || ep is! int) return null;
|
||||||
|
final id = m['id'];
|
||||||
|
if (id is! int || m['isAdult'] == true || m['format'] == 'MUSIC') return null;
|
||||||
|
final t = m['title'] is Map ? m['title'] as Map : const {};
|
||||||
|
final romaji = t['romaji'] is String ? t['romaji'] as String : '';
|
||||||
|
final english = t['english'] is String ? t['english'] as String : '';
|
||||||
|
final cov = m['coverImage'] is Map ? m['coverImage'] as Map : const {};
|
||||||
|
return Airing(
|
||||||
|
anilistId: id,
|
||||||
|
title: english.isNotEmpty ? english : (romaji.isNotEmpty ? romaji : '?'),
|
||||||
|
titleRomaji: romaji,
|
||||||
|
episode: ep,
|
||||||
|
airingAt: DateTime.fromMillisecondsSinceEpoch(at * 1000, isUtc: true),
|
||||||
|
cover: cov['large'] is String ? cov['large'] as String : null,
|
||||||
|
banner: m['bannerImage'] is String ? m['bannerImage'] as String : null,
|
||||||
|
color: parseHexColor(cov['color']),
|
||||||
|
popularity: m['popularity'] is int ? m['popularity'] as int : 0,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => 'Airing($anilistId "$title" ep $episode @ $airingAt)';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An anime found by title ([AniListClient.searchMedia]).
|
||||||
|
class AniListMedia {
|
||||||
|
final int id;
|
||||||
|
/// English title, else romaji.
|
||||||
|
final String title;
|
||||||
|
/// Cover (portrait) URL: extraLarge, else large.
|
||||||
|
final String? cover;
|
||||||
|
/// The smaller cover, for when [cover] is too big to send on.
|
||||||
|
final String? coverSmall;
|
||||||
|
final String? banner;
|
||||||
|
const AniListMedia({required this.id, required this.title, this.cover, this.coverSmall, this.banner});
|
||||||
|
|
||||||
|
static AniListMedia? fromJson(Object? m) {
|
||||||
|
if (m is! Map || m['id'] is! int) return null;
|
||||||
|
final t = m['title'] is Map ? m['title'] as Map : const {};
|
||||||
|
final romaji = t['romaji'] is String ? t['romaji'] as String : '';
|
||||||
|
final english = t['english'] is String ? t['english'] as String : '';
|
||||||
|
final cov = m['coverImage'] is Map ? m['coverImage'] as Map : const {};
|
||||||
|
final large = cov['large'] is String ? cov['large'] as String : null;
|
||||||
|
return AniListMedia(
|
||||||
|
id: m['id'] as int,
|
||||||
|
title: english.isNotEmpty ? english : romaji,
|
||||||
|
cover: cov['extraLarge'] is String ? cov['extraLarge'] as String : large,
|
||||||
|
coverSmall: large,
|
||||||
|
banner: m['bannerImage'] is String ? m['bannerImage'] as String : null,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "#e4a15d" -> opaque [Color]; anything else -> null.
|
||||||
|
Color? parseHexColor(Object? s) {
|
||||||
|
if (s is! String || s.length != 7 || !s.startsWith('#')) return null;
|
||||||
|
final v = int.tryParse(s.substring(1), radix: 16);
|
||||||
|
return v == null ? null : Color(0xff000000 | v);
|
||||||
|
}
|
||||||
|
|
||||||
|
class AniListException implements Exception {
|
||||||
|
final int? statusCode;
|
||||||
|
final String message;
|
||||||
|
const AniListException(this.message, {this.statusCode});
|
||||||
|
|
||||||
|
bool get isRateLimited => statusCode == 429;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => 'AniListException: $message';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The airings of one range. [staleSince] is set when AniList refused and
|
||||||
|
/// older cached data (fetched then) is returned instead.
|
||||||
|
class AniListSchedule {
|
||||||
|
final List<Airing> airings;
|
||||||
|
final DateTime fetchedAt;
|
||||||
|
final DateTime? staleSince;
|
||||||
|
const AniListSchedule(this.airings, this.fetchedAt, {this.staleSince});
|
||||||
|
|
||||||
|
bool get isStale => staleSince != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _Cached {
|
||||||
|
final DateTime fetched;
|
||||||
|
final int from;
|
||||||
|
final int to;
|
||||||
|
final List<Object?> raw;
|
||||||
|
const _Cached(this.fetched, this.from, this.to, this.raw);
|
||||||
|
}
|
||||||
|
|
||||||
|
class AniListClient {
|
||||||
|
AniListClient({
|
||||||
|
String url = aniListDefaultUrl,
|
||||||
|
HttpClient? http,
|
||||||
|
Future<Directory?> Function()? cacheDir,
|
||||||
|
this.memoryTtl = const Duration(minutes: 10),
|
||||||
|
this.diskTtl = const Duration(hours: 1),
|
||||||
|
Future<void> Function(Duration)? delay,
|
||||||
|
DateTime Function()? now,
|
||||||
|
String? userAgent,
|
||||||
|
}) : url = Uri.parse(url),
|
||||||
|
_http = http ?? HttpClient(),
|
||||||
|
_ownsHttp = http == null,
|
||||||
|
_cacheDir = cacheDir ?? _defaultCacheDir,
|
||||||
|
_delay = delay ?? Future<void>.delayed,
|
||||||
|
_now = now ?? DateTime.now,
|
||||||
|
userAgent = userAgent ?? 'watch-together/$appVersion';
|
||||||
|
|
||||||
|
final Uri url;
|
||||||
|
final Duration memoryTtl;
|
||||||
|
final Duration diskTtl;
|
||||||
|
/// AniList 403s some default agents.
|
||||||
|
final String userAgent;
|
||||||
|
final HttpClient _http;
|
||||||
|
final bool _ownsHttp;
|
||||||
|
final Future<Directory?> Function() _cacheDir;
|
||||||
|
final Future<void> Function(Duration) _delay;
|
||||||
|
final DateTime Function() _now;
|
||||||
|
|
||||||
|
/// Pages per range at most (50 airings each).
|
||||||
|
static const maxPages = 40;
|
||||||
|
static const perPage = 50;
|
||||||
|
|
||||||
|
static const query = r'''
|
||||||
|
query($from:Int,$to:Int,$page:Int){Page(page:$page,perPage:50){pageInfo{hasNextPage}
|
||||||
|
airingSchedules(airingAt_greater:$from,airingAt_lesser:$to,sort:TIME){airingAt episode
|
||||||
|
media{id title{romaji english} coverImage{large color} bannerImage isAdult popularity format}}}}''';
|
||||||
|
|
||||||
|
final _mem = <int, _Cached>{};
|
||||||
|
final _inflight = <String, Future<AniListSchedule>>{};
|
||||||
|
|
||||||
|
static Future<Directory?> _defaultCacheDir() async {
|
||||||
|
try {
|
||||||
|
return await getApplicationCacheDirectory();
|
||||||
|
} catch (_) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every airing in [from, to), cached; see the file comment. [force]
|
||||||
|
/// skips the fresh caches (stale data is still the fallback).
|
||||||
|
Future<AniListSchedule> schedule(DateTime from, DateTime to, {bool force = false}) {
|
||||||
|
final f = from.millisecondsSinceEpoch ~/ 1000, t = to.millisecondsSinceEpoch ~/ 1000;
|
||||||
|
final k = '$f-$t-$force';
|
||||||
|
return _inflight[k] ??= _schedule(f, t, force).whenComplete(() {
|
||||||
|
_inflight.remove(k);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<AniListSchedule> _schedule(int from, int to, bool force) async {
|
||||||
|
final now = _now();
|
||||||
|
final mem = _mem[from];
|
||||||
|
final memHit = mem != null && mem.to == to ? mem : null;
|
||||||
|
if (!force && memHit != null && now.difference(memHit.fetched) < memoryTtl) {
|
||||||
|
return _result(memHit);
|
||||||
|
}
|
||||||
|
final disk = await _readDisk(from, to);
|
||||||
|
if (!force && disk != null && now.difference(disk.fetched) < diskTtl) {
|
||||||
|
_mem[from] = disk;
|
||||||
|
return _result(disk);
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
final raw = await _fetch(from, to);
|
||||||
|
final c = _mem[from] = _Cached(_now(), from, to, raw);
|
||||||
|
await _writeDisk(c);
|
||||||
|
return _result(c);
|
||||||
|
} catch (e) {
|
||||||
|
final stale = [memHit, disk].whereType<_Cached>().fold<_Cached?>(
|
||||||
|
null, (a, b) => a == null || b.fetched.isAfter(a.fetched) ? b : a);
|
||||||
|
if (stale == null) rethrow;
|
||||||
|
_log.warning('AniList failed, using cache from ${stale.fetched}: $e');
|
||||||
|
return _result(stale, stale: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
AniListSchedule _result(_Cached c, {bool stale = false}) => AniListSchedule(
|
||||||
|
[for (final r in c.raw) ?Airing.fromJson(r)],
|
||||||
|
c.fetched,
|
||||||
|
staleSince: stale ? c.fetched : null,
|
||||||
|
);
|
||||||
|
|
||||||
|
Future<List<Object?>> _fetch(int from, int to) async {
|
||||||
|
final out = <Object?>[];
|
||||||
|
for (var page = 1; page <= maxPages; page++) {
|
||||||
|
final data = await _page(from, to, page);
|
||||||
|
final rows = data['airingSchedules'];
|
||||||
|
if (rows is List) out.addAll(rows);
|
||||||
|
final info = data['pageInfo'];
|
||||||
|
if (info is! Map || info['hasNextPage'] != true) break;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Map> _page(int from, int to, int page) async {
|
||||||
|
final (data, status, j) = await _graphql(query, {'from': from - 1, 'to': to, 'page': page});
|
||||||
|
final p = data?['Page'];
|
||||||
|
if (p is! Map) {
|
||||||
|
throw AniListException('AniList: bad response${_errorText(j)}', statusCode: status);
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One GraphQL request: `data` (null when missing), status and body. A
|
||||||
|
/// 429 waits out Retry-After once; other non-200s throw.
|
||||||
|
Future<(Map?, int, Object?)> _graphql(String query, Map<String, Object?> variables) async {
|
||||||
|
for (var attempt = 0;; attempt++) {
|
||||||
|
final (status, body, retryAfter) = await _post(jsonEncode({'query': query, 'variables': variables}));
|
||||||
|
if (status == 429 && attempt == 0) {
|
||||||
|
final wait = retryAfter ?? 60;
|
||||||
|
_log.info('AniList rate limited, retrying in ${wait}s');
|
||||||
|
await _delay(Duration(seconds: wait.clamp(1, 65)));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
Object? j;
|
||||||
|
try {
|
||||||
|
j = jsonDecode(body);
|
||||||
|
} catch (_) {}
|
||||||
|
if (status != 200) {
|
||||||
|
throw AniListException('AniList HTTP $status${_errorText(j)}', statusCode: status);
|
||||||
|
}
|
||||||
|
final data = j is Map && j['data'] is Map ? j['data'] as Map : null;
|
||||||
|
return (data, status, j);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static const searchQuery = r'''
|
||||||
|
query($search:String){Media(search:$search,type:ANIME,isAdult:false){id title{romaji english}
|
||||||
|
coverImage{extraLarge large} bannerImage}}''';
|
||||||
|
|
||||||
|
final _search = <String, Future<AniListMedia?>>{};
|
||||||
|
|
||||||
|
/// AniList's best anime match for [title], or null when there is none.
|
||||||
|
/// One request per title for this client's life (a failure is not kept,
|
||||||
|
/// so a later call asks again).
|
||||||
|
Future<AniListMedia?> searchMedia(String title) {
|
||||||
|
final key = title.trim();
|
||||||
|
if (key.isEmpty) return Future.value(null);
|
||||||
|
return _search[key] ??= _searchMedia(key).catchError((Object e) {
|
||||||
|
_search.remove(key);
|
||||||
|
throw e;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<AniListMedia?> _searchMedia(String title) async {
|
||||||
|
try {
|
||||||
|
final (data, _, _) = await _graphql(searchQuery, {'search': title});
|
||||||
|
return AniListMedia.fromJson(data?['Media']);
|
||||||
|
} on AniListException catch (e) {
|
||||||
|
// No match is a 404 with "Not Found." in errors.
|
||||||
|
if (e.statusCode == 404) return null;
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static String _errorText(Object? j) {
|
||||||
|
final errs = j is Map ? j['errors'] : null;
|
||||||
|
if (errs is! List || errs.isEmpty) return '';
|
||||||
|
final m = errs.first is Map ? (errs.first as Map)['message'] : null;
|
||||||
|
return m is String ? ': $m' : '';
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<(int, String, int?)> _post(String body) async {
|
||||||
|
try {
|
||||||
|
final req = await _http.postUrl(url).timeout(const Duration(seconds: 15));
|
||||||
|
req.headers
|
||||||
|
..contentType = ContentType.json
|
||||||
|
..set(HttpHeaders.acceptHeader, 'application/json')
|
||||||
|
..set(HttpHeaders.userAgentHeader, userAgent);
|
||||||
|
req.write(body);
|
||||||
|
final res = await req.close().timeout(const Duration(seconds: 20));
|
||||||
|
final text = await res.transform(const Utf8Decoder(allowMalformed: true)).join();
|
||||||
|
return (
|
||||||
|
res.statusCode,
|
||||||
|
text,
|
||||||
|
int.tryParse(res.headers.value(HttpHeaders.retryAfterHeader) ?? ''),
|
||||||
|
);
|
||||||
|
} on TimeoutException {
|
||||||
|
throw const AniListException('AniList timed out');
|
||||||
|
} on IOException catch (e) {
|
||||||
|
throw AniListException('AniList unreachable: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- disk
|
||||||
|
|
||||||
|
Future<File?> _file(int from) async {
|
||||||
|
final dir = await _cacheDir();
|
||||||
|
return dir == null ? null : File('${dir.path}/anilist-schedule-$from.json');
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<_Cached?> _readDisk(int from, int to) async {
|
||||||
|
try {
|
||||||
|
final f = await _file(from);
|
||||||
|
if (f == null || !await f.exists()) return null;
|
||||||
|
final j = jsonDecode(await f.readAsString());
|
||||||
|
if (j is! Map || j['from'] != from || j['to'] != to) return null;
|
||||||
|
final fetched = j['fetched'], raw = j['raw'];
|
||||||
|
if (fetched is! int || raw is! List) return null;
|
||||||
|
return _Cached(DateTime.fromMillisecondsSinceEpoch(fetched), from, to, raw);
|
||||||
|
} catch (_) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _writeDisk(_Cached c) async {
|
||||||
|
try {
|
||||||
|
final f = await _file(c.from);
|
||||||
|
if (f == null) return;
|
||||||
|
await f.parent.create(recursive: true);
|
||||||
|
await f.writeAsString(jsonEncode({
|
||||||
|
'fetched': c.fetched.millisecondsSinceEpoch,
|
||||||
|
'from': c.from,
|
||||||
|
'to': c.to,
|
||||||
|
'raw': c.raw,
|
||||||
|
}));
|
||||||
|
// Older ranges are useless once a day has passed.
|
||||||
|
await for (final e in f.parent.list()) {
|
||||||
|
final name = e.uri.pathSegments.last;
|
||||||
|
if (e is File &&
|
||||||
|
e.path != f.path &&
|
||||||
|
name.startsWith('anilist-schedule-') &&
|
||||||
|
_now().difference(await e.lastModified()) > const Duration(days: 1)) {
|
||||||
|
await e.delete();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
_log.warning('AniList cache write failed: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Drops the memory cache (the disk cache stays as the stale fallback).
|
||||||
|
void clearMemory() => _mem.clear();
|
||||||
|
|
||||||
|
void close() {
|
||||||
|
if (_ownsHttp) _http.close(force: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,751 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../jellyfin/accounts.dart';
|
||||||
|
|
||||||
|
// AnimeFlow app API: what the media server tracks, has, downloads and was
|
||||||
|
// asked for. Authenticated with the user's own Jellyfin access token
|
||||||
|
// (X-Emby-Token) on the Jellyfin server next to it.
|
||||||
|
//
|
||||||
|
// Errors are JSON {"detail","code"} ([AnimeFlowException]); nginx in front
|
||||||
|
// may answer 429 with HTML (5 req/s, burst 20), retried with backoff.
|
||||||
|
// /schedule, /series, /series/{id} and /requests send weak ETags: the last
|
||||||
|
// body is kept and revalidated with If-None-Match. Times are UTC ISO
|
||||||
|
// ("2026-10-08T19:36:32Z"). Scopes can change at runtime, so /me is cached
|
||||||
|
// for a minute at most.
|
||||||
|
|
||||||
|
final _log = createLogger('animeflow');
|
||||||
|
|
||||||
|
const animeFlowDefaultBase = 'https://anime.senkochan.moe/api/app/v1';
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- errors
|
||||||
|
|
||||||
|
enum AnimeFlowErrorCode {
|
||||||
|
missingToken('missing_token'),
|
||||||
|
badToken('bad_token'),
|
||||||
|
revoked('revoked'),
|
||||||
|
missingScope('missing_scope'),
|
||||||
|
ownAccount('own_account'),
|
||||||
|
jellyfinUnreachable('jellyfin_unreachable'),
|
||||||
|
searchUnavailable('search_unavailable'),
|
||||||
|
invalidRequest('invalid_request'),
|
||||||
|
invalidTime('invalid_time'),
|
||||||
|
invalidRange('invalid_range'),
|
||||||
|
notFound('not_found'),
|
||||||
|
seriesNotFound('series_not_found'),
|
||||||
|
episodeNotFound('episode_not_found'),
|
||||||
|
requestNotFound('request_not_found'),
|
||||||
|
userNotFound('user_not_found'),
|
||||||
|
alreadyTracked('already_tracked'),
|
||||||
|
alreadyAvailable('already_available'),
|
||||||
|
alreadyRequested('already_requested'),
|
||||||
|
invalidState('invalid_state'),
|
||||||
|
/// nginx 429 (client side, no JSON body).
|
||||||
|
rateLimited('rate_limited'),
|
||||||
|
/// No answer: DNS, connect, timeout (client side).
|
||||||
|
network('network'),
|
||||||
|
/// Anything not in this list.
|
||||||
|
unknown('unknown');
|
||||||
|
|
||||||
|
const AnimeFlowErrorCode(this.wire);
|
||||||
|
final String wire;
|
||||||
|
|
||||||
|
static AnimeFlowErrorCode parse(Object? s) =>
|
||||||
|
values.where((c) => c.wire == s).firstOrNull ?? unknown;
|
||||||
|
|
||||||
|
/// Best guess from the status alone (body was not JSON).
|
||||||
|
static AnimeFlowErrorCode forStatus(int status) => switch (status) {
|
||||||
|
401 => badToken,
|
||||||
|
403 => missingScope,
|
||||||
|
404 => notFound,
|
||||||
|
409 => invalidState,
|
||||||
|
400 => invalidRequest,
|
||||||
|
429 => rateLimited,
|
||||||
|
503 => jellyfinUnreachable,
|
||||||
|
_ => unknown,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowException implements Exception {
|
||||||
|
/// HTTP status; 0 when no answer came.
|
||||||
|
final int statusCode;
|
||||||
|
final AnimeFlowErrorCode code;
|
||||||
|
final String detail;
|
||||||
|
const AnimeFlowException(this.statusCode, this.code, this.detail);
|
||||||
|
|
||||||
|
/// Sign in again (token missing, wrong or expired).
|
||||||
|
bool get isUnauthorized => statusCode == 401;
|
||||||
|
/// Revoked, missing scope or own account.
|
||||||
|
bool get isForbidden => statusCode == 403;
|
||||||
|
bool get isNotFound => statusCode == 404;
|
||||||
|
bool get isConflict => statusCode == 409;
|
||||||
|
bool get isUnavailable => statusCode == 503 || code == AnimeFlowErrorCode.network;
|
||||||
|
bool get isRateLimited => code == AnimeFlowErrorCode.rateLimited;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => 'AnimeFlowException($statusCode ${code.wire}): $detail';
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- models
|
||||||
|
|
||||||
|
DateTime? _time(Object? v) => v is String ? DateTime.tryParse(v)?.toUtc() : null;
|
||||||
|
int? _int(Object? v) => v is int ? v : (v is num ? v.toInt() : null);
|
||||||
|
String? _str(Object? v) => v is String ? v : null;
|
||||||
|
List<Map> _items(Object? j) =>
|
||||||
|
j is Map && j['items'] is List ? (j['items'] as List).whereType<Map>().toList() : const [];
|
||||||
|
|
||||||
|
/// Formats [d] as AnimeFlow wants it: "2026-10-08T19:36:32Z".
|
||||||
|
String animeFlowTime(DateTime d) => '${d.toUtc().toIso8601String().split('.').first.replaceAll('Z', '')}Z';
|
||||||
|
|
||||||
|
enum AnimeFlowScope {
|
||||||
|
view,
|
||||||
|
request,
|
||||||
|
manage;
|
||||||
|
|
||||||
|
static Set<AnimeFlowScope> parse(Object? j) => {
|
||||||
|
if (j is List)
|
||||||
|
for (final s in j) ...values.where((v) => v.name == s),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowMe {
|
||||||
|
final String userId;
|
||||||
|
final String name;
|
||||||
|
final Set<AnimeFlowScope> scopes;
|
||||||
|
const AnimeFlowMe({required this.userId, required this.name, required this.scopes});
|
||||||
|
|
||||||
|
bool can(AnimeFlowScope s) => scopes.contains(s);
|
||||||
|
|
||||||
|
static AnimeFlowMe fromJson(Object? j) {
|
||||||
|
final m = j is Map ? j : const {};
|
||||||
|
return AnimeFlowMe(
|
||||||
|
userId: _str(m['user_id']) ?? '',
|
||||||
|
name: _str(m['name']) ?? '',
|
||||||
|
scopes: AnimeFlowScope.parse(m['scopes']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
enum EpisodeStatus {
|
||||||
|
upcoming,
|
||||||
|
missing,
|
||||||
|
downloading,
|
||||||
|
available,
|
||||||
|
unmonitored,
|
||||||
|
failed;
|
||||||
|
|
||||||
|
/// Unknown values read as upcoming.
|
||||||
|
static EpisodeStatus parse(Object? s) => values.where((v) => v.name == s).firstOrNull ?? upcoming;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A series on Jellyfin (`GET /library`).
|
||||||
|
class AnimeFlowLibraryItem {
|
||||||
|
final String jellyfinSeriesId;
|
||||||
|
final String name;
|
||||||
|
/// Set when AnimeFlow tracks it.
|
||||||
|
final int? seriesId;
|
||||||
|
/// AniList entry per TVDB season (the first, when a season spans more).
|
||||||
|
final Map<int, int> anilistIds;
|
||||||
|
/// Every AniList entry per season with its episode run (`anilist_map`):
|
||||||
|
/// a season AniList splits (one cour as two entries) has several rows.
|
||||||
|
final List<AniListRun> anilistMap;
|
||||||
|
const AnimeFlowLibraryItem({
|
||||||
|
required this.jellyfinSeriesId,
|
||||||
|
required this.name,
|
||||||
|
this.seriesId,
|
||||||
|
this.anilistIds = const {},
|
||||||
|
this.anilistMap = const [],
|
||||||
|
});
|
||||||
|
|
||||||
|
static AnimeFlowLibraryItem fromJson(Map j) => AnimeFlowLibraryItem(
|
||||||
|
jellyfinSeriesId: _str(j['jellyfin_series_id']) ?? '',
|
||||||
|
name: _str(j['name']) ?? '',
|
||||||
|
seriesId: _int(j['series_id']),
|
||||||
|
anilistIds: {
|
||||||
|
for (final e in ((j['anilist_ids'] as Map?) ?? const {}).entries)
|
||||||
|
if (int.tryParse('${e.key}') case final season? when _int(e.value) != null) season: _int(e.value)!,
|
||||||
|
},
|
||||||
|
anilistMap: [
|
||||||
|
for (final r in (j['anilist_map'] as List?) ?? const [])
|
||||||
|
if (r is Map && _int(r['season']) != null && _int(r['anilist_id']) != null)
|
||||||
|
AniListRun(
|
||||||
|
season: _int(r['season'])!,
|
||||||
|
anilistId: _int(r['anilist_id'])!,
|
||||||
|
firstEpisode: _int(r['first_episode']) ?? 1,
|
||||||
|
offset: _int(r['offset']) ?? 0,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One AniList entry's run within a TVDB season: TVDB episode e (from
|
||||||
|
/// [firstEpisode] to the next run of that season) is AniList episode
|
||||||
|
/// e - [offset].
|
||||||
|
class AniListRun {
|
||||||
|
final int season;
|
||||||
|
final int anilistId;
|
||||||
|
final int firstEpisode;
|
||||||
|
final int offset;
|
||||||
|
const AniListRun({required this.season, required this.anilistId, this.firstEpisode = 1, this.offset = 0});
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowEpisode {
|
||||||
|
/// 0 = specials.
|
||||||
|
final int season;
|
||||||
|
final int episode;
|
||||||
|
final int? absolute;
|
||||||
|
final String? title;
|
||||||
|
/// Date-only: midnight Japan time of the broadcast day. Compare it as a
|
||||||
|
/// Japan day (`sameAirDay` in schedule_model.dart), never a local one.
|
||||||
|
final DateTime? airDate;
|
||||||
|
/// The AniList entry of this episode's season (one AnimeFlow series may
|
||||||
|
/// span several AniList entries).
|
||||||
|
final int? anilistId;
|
||||||
|
/// The episode number within [anilistId] when AnimeFlow knows it (split
|
||||||
|
/// cours, absolute numbering); prefer it over [episode] for matching.
|
||||||
|
final int? anilistEpisode;
|
||||||
|
final EpisodeStatus status;
|
||||||
|
/// 0..1, only while downloading.
|
||||||
|
final double? progress;
|
||||||
|
/// Why it failed; for a missing one with rejected releases, a
|
||||||
|
/// ready-to-show sentence ("2 release(s) found, rejected: …").
|
||||||
|
final String? reason;
|
||||||
|
/// Last search for a monitored, not yet downloaded episode.
|
||||||
|
final DateTime? lastSearchedAt;
|
||||||
|
|
||||||
|
const AnimeFlowEpisode({
|
||||||
|
required this.season,
|
||||||
|
required this.episode,
|
||||||
|
this.absolute,
|
||||||
|
this.title,
|
||||||
|
this.airDate,
|
||||||
|
this.anilistId,
|
||||||
|
this.anilistEpisode,
|
||||||
|
required this.status,
|
||||||
|
this.progress,
|
||||||
|
this.reason,
|
||||||
|
this.lastSearchedAt,
|
||||||
|
});
|
||||||
|
|
||||||
|
static AnimeFlowEpisode fromJson(Map j) => AnimeFlowEpisode(
|
||||||
|
season: _int(j['season']) ?? 0,
|
||||||
|
episode: _int(j['episode']) ?? 0,
|
||||||
|
absolute: _int(j['absolute']),
|
||||||
|
title: _str(j['episode_title']),
|
||||||
|
airDate: _time(j['air_date']),
|
||||||
|
// The episode's own entry (a split season rolls into its sequel),
|
||||||
|
// else the series' one.
|
||||||
|
anilistId: _int(j['episode_anilist_id']) ?? _int(j['anilist_id']),
|
||||||
|
anilistEpisode: _int(j['anilist_episode']),
|
||||||
|
status: EpisodeStatus.parse(j['status']),
|
||||||
|
progress: (j['progress'] as num?)?.toDouble(),
|
||||||
|
reason: _str(j['reason']),
|
||||||
|
lastSearchedAt: _time(j['last_searched_at']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A /schedule row: one episode plus its series.
|
||||||
|
class AnimeFlowScheduleItem {
|
||||||
|
final AnimeFlowEpisode episode;
|
||||||
|
final int seriesId;
|
||||||
|
final String title;
|
||||||
|
final int? anidbId;
|
||||||
|
final int? tvdbId;
|
||||||
|
final String? jellyfinSeriesId;
|
||||||
|
|
||||||
|
const AnimeFlowScheduleItem({
|
||||||
|
required this.episode,
|
||||||
|
required this.seriesId,
|
||||||
|
required this.title,
|
||||||
|
this.anidbId,
|
||||||
|
this.tvdbId,
|
||||||
|
this.jellyfinSeriesId,
|
||||||
|
});
|
||||||
|
|
||||||
|
static AnimeFlowScheduleItem fromJson(Map j) => AnimeFlowScheduleItem(
|
||||||
|
episode: AnimeFlowEpisode.fromJson(j),
|
||||||
|
seriesId: _int(j['series_id']) ?? 0,
|
||||||
|
title: _str(j['title']) ?? '',
|
||||||
|
anidbId: _int(j['anidb_id']),
|
||||||
|
tvdbId: _int(j['tvdb_id']),
|
||||||
|
jellyfinSeriesId: _str(j['jellyfin_series_id']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowScheduleWindow {
|
||||||
|
final DateTime? from;
|
||||||
|
final DateTime? to;
|
||||||
|
final List<AnimeFlowScheduleItem> items;
|
||||||
|
const AnimeFlowScheduleWindow({this.from, this.to, required this.items});
|
||||||
|
}
|
||||||
|
|
||||||
|
enum SeriesState {
|
||||||
|
releasing,
|
||||||
|
released;
|
||||||
|
|
||||||
|
static SeriesState parse(Object? s) => s == 'released' ? released : releasing;
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowSeries {
|
||||||
|
final int seriesId;
|
||||||
|
final String title;
|
||||||
|
final int? anidbId;
|
||||||
|
final int? tvdbId;
|
||||||
|
/// The series' (first) AniList entry; later seasons may have others, see
|
||||||
|
/// [AnimeFlowEpisode.anilistId].
|
||||||
|
final int? anilistId;
|
||||||
|
final String? jellyfinSeriesId;
|
||||||
|
final SeriesState state;
|
||||||
|
final bool monitored;
|
||||||
|
final int episodesTotal;
|
||||||
|
final int episodesAvailable;
|
||||||
|
final DateTime? nextAirDate;
|
||||||
|
/// Only from [AnimeFlowClient.seriesDetail].
|
||||||
|
final List<AnimeFlowEpisode> episodes;
|
||||||
|
|
||||||
|
const AnimeFlowSeries({
|
||||||
|
required this.seriesId,
|
||||||
|
required this.title,
|
||||||
|
this.anidbId,
|
||||||
|
this.tvdbId,
|
||||||
|
this.anilistId,
|
||||||
|
this.jellyfinSeriesId,
|
||||||
|
this.state = SeriesState.releasing,
|
||||||
|
this.monitored = false,
|
||||||
|
this.episodesTotal = 0,
|
||||||
|
this.episodesAvailable = 0,
|
||||||
|
this.nextAirDate,
|
||||||
|
this.episodes = const [],
|
||||||
|
});
|
||||||
|
|
||||||
|
static AnimeFlowSeries fromJson(Map j) => AnimeFlowSeries(
|
||||||
|
seriesId: _int(j['series_id']) ?? 0,
|
||||||
|
title: _str(j['title']) ?? '',
|
||||||
|
anidbId: _int(j['anidb_id']),
|
||||||
|
tvdbId: _int(j['tvdb_id']),
|
||||||
|
anilistId: _int(j['anilist_id']),
|
||||||
|
jellyfinSeriesId: _str(j['jellyfin_series_id']),
|
||||||
|
state: SeriesState.parse(j['state']),
|
||||||
|
monitored: j['monitored'] == true,
|
||||||
|
episodesTotal: _int(j['episodes_total']) ?? 0,
|
||||||
|
episodesAvailable: _int(j['episodes_available']) ?? 0,
|
||||||
|
nextAirDate: _time(j['next_air_date']),
|
||||||
|
episodes: [
|
||||||
|
if (j['episodes'] is List)
|
||||||
|
for (final e in (j['episodes'] as List).whereType<Map>()) AnimeFlowEpisode.fromJson(e),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowSearchHit {
|
||||||
|
final int anidbId;
|
||||||
|
final String title;
|
||||||
|
final int? anilistId;
|
||||||
|
/// Set when AnimeFlow already tracks it.
|
||||||
|
final int? seriesId;
|
||||||
|
const AnimeFlowSearchHit({required this.anidbId, required this.title, this.anilistId, this.seriesId});
|
||||||
|
|
||||||
|
static AnimeFlowSearchHit fromJson(Map j) => AnimeFlowSearchHit(
|
||||||
|
anidbId: _int(j['anidb_id']) ?? 0,
|
||||||
|
title: _str(j['title']) ?? '',
|
||||||
|
anilistId: _int(j['anilist_id']),
|
||||||
|
seriesId: _int(j['series_id']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
enum RequestKind {
|
||||||
|
series,
|
||||||
|
season,
|
||||||
|
episode;
|
||||||
|
|
||||||
|
static RequestKind parse(Object? s) => values.where((v) => v.name == s).firstOrNull ?? series;
|
||||||
|
}
|
||||||
|
|
||||||
|
enum RequestStatus {
|
||||||
|
/// Briefly, before auto-approval or a manager decides.
|
||||||
|
pending,
|
||||||
|
approved,
|
||||||
|
searching,
|
||||||
|
done,
|
||||||
|
rejected,
|
||||||
|
failed;
|
||||||
|
|
||||||
|
static RequestStatus parse(Object? s) => values.where((v) => v.name == s).firstOrNull ?? pending;
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowRequest {
|
||||||
|
final int id;
|
||||||
|
final RequestKind kind;
|
||||||
|
final RequestStatus status;
|
||||||
|
final String title;
|
||||||
|
final int? anidbId;
|
||||||
|
final int? seriesId;
|
||||||
|
final int? season;
|
||||||
|
final int? episode;
|
||||||
|
final String? reason;
|
||||||
|
final DateTime? createdAt;
|
||||||
|
final DateTime? updatedAt;
|
||||||
|
/// Only with scope=all.
|
||||||
|
final String? userId;
|
||||||
|
final String? userName;
|
||||||
|
|
||||||
|
const AnimeFlowRequest({
|
||||||
|
required this.id,
|
||||||
|
required this.kind,
|
||||||
|
required this.status,
|
||||||
|
required this.title,
|
||||||
|
this.anidbId,
|
||||||
|
this.seriesId,
|
||||||
|
this.season,
|
||||||
|
this.episode,
|
||||||
|
this.reason,
|
||||||
|
this.createdAt,
|
||||||
|
this.updatedAt,
|
||||||
|
this.userId,
|
||||||
|
this.userName,
|
||||||
|
});
|
||||||
|
|
||||||
|
static AnimeFlowRequest fromJson(Map j) => AnimeFlowRequest(
|
||||||
|
id: _int(j['id']) ?? 0,
|
||||||
|
kind: RequestKind.parse(j['kind']),
|
||||||
|
status: RequestStatus.parse(j['status']),
|
||||||
|
title: _str(j['title']) ?? '',
|
||||||
|
anidbId: _int(j['anidb_id']),
|
||||||
|
seriesId: _int(j['series_id']),
|
||||||
|
season: _int(j['season']),
|
||||||
|
episode: _int(j['episode']),
|
||||||
|
reason: _str(j['reason']),
|
||||||
|
createdAt: _time(j['created_at']),
|
||||||
|
updatedAt: _time(j['updated_at']),
|
||||||
|
userId: _str(j['user_id']),
|
||||||
|
userName: _str(j['user_name']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowUser {
|
||||||
|
/// The Jellyfin user id.
|
||||||
|
final String userId;
|
||||||
|
final String name;
|
||||||
|
final Set<AnimeFlowScope> scopes;
|
||||||
|
final bool revoked;
|
||||||
|
final DateTime? lastSeenAt;
|
||||||
|
const AnimeFlowUser({
|
||||||
|
required this.userId,
|
||||||
|
required this.name,
|
||||||
|
required this.scopes,
|
||||||
|
this.revoked = false,
|
||||||
|
this.lastSeenAt,
|
||||||
|
});
|
||||||
|
|
||||||
|
static AnimeFlowUser fromJson(Map j) => AnimeFlowUser(
|
||||||
|
userId: _str(j['user_id']) ?? '',
|
||||||
|
name: _str(j['name']) ?? '',
|
||||||
|
scopes: AnimeFlowScope.parse(j['scopes']),
|
||||||
|
revoked: j['revoked'] == true,
|
||||||
|
lastSeenAt: _time(j['last_seen_at']),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------- client
|
||||||
|
|
||||||
|
class _Etagged {
|
||||||
|
final String etag;
|
||||||
|
final Object? body;
|
||||||
|
const _Etagged(this.etag, this.body);
|
||||||
|
}
|
||||||
|
|
||||||
|
class AnimeFlowClient {
|
||||||
|
/// [token] wins over [tokenProvider]; with neither, every call fails with
|
||||||
|
/// [AnimeFlowErrorCode.missingToken].
|
||||||
|
AnimeFlowClient({
|
||||||
|
String baseUrl = animeFlowDefaultBase,
|
||||||
|
this._token,
|
||||||
|
this._tokenProvider,
|
||||||
|
HttpClient? http,
|
||||||
|
Future<void> Function(Duration)? delay,
|
||||||
|
DateTime Function()? now,
|
||||||
|
this.meTtl = const Duration(seconds: 60),
|
||||||
|
String? userAgent,
|
||||||
|
}) : baseUrl = baseUrl.endsWith('/') ? baseUrl.substring(0, baseUrl.length - 1) : baseUrl,
|
||||||
|
_http = http ?? HttpClient(),
|
||||||
|
_ownsHttp = http == null,
|
||||||
|
_delay = delay ?? Future<void>.delayed,
|
||||||
|
_now = now ?? DateTime.now,
|
||||||
|
userAgent = userAgent ?? 'watch-together/$appVersion';
|
||||||
|
|
||||||
|
/// Authenticated with the linked Jellyfin account on the same domain
|
||||||
|
/// (see [tokenFor]), looked up on every call so a re-link applies.
|
||||||
|
factory AnimeFlowClient.fromAccounts(
|
||||||
|
JellyfinAccounts accounts, {
|
||||||
|
String baseUrl = animeFlowDefaultBase,
|
||||||
|
HttpClient? http,
|
||||||
|
}) =>
|
||||||
|
AnimeFlowClient(
|
||||||
|
baseUrl: baseUrl,
|
||||||
|
http: http,
|
||||||
|
tokenProvider: () async {
|
||||||
|
await accounts.ensureLoaded(validate: false);
|
||||||
|
return tokenFor(accounts.accounts, baseUrl);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
final String baseUrl;
|
||||||
|
final Duration meTtl;
|
||||||
|
final String userAgent;
|
||||||
|
final String? _token;
|
||||||
|
final Future<String?> Function()? _tokenProvider;
|
||||||
|
final HttpClient _http;
|
||||||
|
final bool _ownsHttp;
|
||||||
|
final Future<void> Function(Duration) _delay;
|
||||||
|
final DateTime Function() _now;
|
||||||
|
|
||||||
|
/// Request bodies above this are refused by the server.
|
||||||
|
static const maxBodyBytes = 16 * 1024;
|
||||||
|
/// Retries after an nginx 429 (backoff 1 s, 2 s unless Retry-After).
|
||||||
|
static const rateLimitRetries = 2;
|
||||||
|
/// The longest /schedule window.
|
||||||
|
static const maxScheduleRange = Duration(days: 45);
|
||||||
|
|
||||||
|
String? _lastToken;
|
||||||
|
final _etags = <String, _Etagged>{};
|
||||||
|
({DateTime at, AnimeFlowMe me})? _me;
|
||||||
|
|
||||||
|
/// The token of the linked Jellyfin account whose host shares
|
||||||
|
/// [animeFlowBase]'s parent domain (anime.example.org -> example.org,
|
||||||
|
/// jellyfin.example.org, ...).
|
||||||
|
static String? tokenFor(Iterable<JellyfinAccount> accounts, String animeFlowBase) {
|
||||||
|
final host = Uri.tryParse(animeFlowBase)?.host.toLowerCase() ?? '';
|
||||||
|
if (host.isEmpty) return null;
|
||||||
|
final labels = host.split('.');
|
||||||
|
final parent = labels.length > 2 ? labels.skip(1).join('.') : host;
|
||||||
|
bool matches(String url) {
|
||||||
|
final h = Uri.tryParse(url)?.host.toLowerCase() ?? '';
|
||||||
|
return h.isNotEmpty && (h == parent || h.endsWith('.$parent'));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (final a in accounts) {
|
||||||
|
if (a.urls.any(matches)) return a.token;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String> _authToken() async {
|
||||||
|
final t = _token ?? await _tokenProvider?.call();
|
||||||
|
if (t == null || t.isEmpty) {
|
||||||
|
throw const AnimeFlowException(
|
||||||
|
401, AnimeFlowErrorCode.missingToken, 'No linked Jellyfin account for AnimeFlow');
|
||||||
|
}
|
||||||
|
if (t != _lastToken) {
|
||||||
|
// Another user: nothing cached belongs to them.
|
||||||
|
_lastToken = t;
|
||||||
|
_etags.clear();
|
||||||
|
_me = null;
|
||||||
|
}
|
||||||
|
return t;
|
||||||
|
}
|
||||||
|
|
||||||
|
Uri _uri(String path, [Map<String, String>? query]) =>
|
||||||
|
Uri.parse('$baseUrl$path').replace(queryParameters: query);
|
||||||
|
|
||||||
|
/// Sends one call; JSON body or null (204). [etag]: revalidate the last
|
||||||
|
/// body of this URL.
|
||||||
|
Future<Object?> _call(String method, String path,
|
||||||
|
{Map<String, String>? query, Object? body, bool etag = false}) async {
|
||||||
|
final token = await _authToken();
|
||||||
|
final uri = _uri(path, query);
|
||||||
|
final key = uri.toString();
|
||||||
|
List<int>? bytes;
|
||||||
|
if (body != null) {
|
||||||
|
bytes = utf8.encode(jsonEncode(body));
|
||||||
|
if (bytes.length > maxBodyBytes) {
|
||||||
|
throw const AnimeFlowException(400, AnimeFlowErrorCode.invalidRequest, 'Request body too large');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (var attempt = 0;; attempt++) {
|
||||||
|
final cached = etag ? _etags[key] : null;
|
||||||
|
final (status, text, retryAfter, tag) = await _send(method, uri, token, bytes, cached?.etag);
|
||||||
|
if (status == 304 && cached != null) return cached.body;
|
||||||
|
if (status >= 200 && status < 300) {
|
||||||
|
final j = text.trim().isEmpty ? null : _decode(text, status);
|
||||||
|
if (etag && tag != null && tag.isNotEmpty) _etags[key] = _Etagged(tag, j);
|
||||||
|
return j;
|
||||||
|
}
|
||||||
|
final err = _error(status, text);
|
||||||
|
if (err.isRateLimited && attempt < rateLimitRetries) {
|
||||||
|
final wait = retryAfter != null ? Duration(seconds: retryAfter.clamp(1, 30)) : Duration(seconds: 1 << attempt);
|
||||||
|
_log.info('AnimeFlow rate limited on $path, retrying in ${wait.inSeconds}s');
|
||||||
|
await _delay(wait);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static Object? _decode(String text, int status) {
|
||||||
|
try {
|
||||||
|
return jsonDecode(text);
|
||||||
|
} catch (_) {
|
||||||
|
throw AnimeFlowException(status, AnimeFlowErrorCode.unknown, 'Response is not JSON');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static AnimeFlowException _error(int status, String text) {
|
||||||
|
Object? j;
|
||||||
|
try {
|
||||||
|
j = jsonDecode(text);
|
||||||
|
} catch (_) {}
|
||||||
|
if (j is Map && j['code'] is String) {
|
||||||
|
final code = AnimeFlowErrorCode.parse(j['code']);
|
||||||
|
return AnimeFlowException(status, code == AnimeFlowErrorCode.unknown ? AnimeFlowErrorCode.forStatus(status) : code,
|
||||||
|
_str(j['detail']) ?? 'HTTP $status');
|
||||||
|
}
|
||||||
|
// Not ours: nginx (HTML 429/502), a proxy, ...
|
||||||
|
return AnimeFlowException(status, AnimeFlowErrorCode.forStatus(status),
|
||||||
|
status == 429 ? 'Too many requests, try again shortly' : 'HTTP $status');
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<(int, String, int?, String?)> _send(
|
||||||
|
String method, Uri uri, String token, List<int>? body, String? ifNoneMatch) async {
|
||||||
|
try {
|
||||||
|
final req = await _http.openUrl(method, uri).timeout(const Duration(seconds: 15));
|
||||||
|
req.headers
|
||||||
|
..set(HttpHeaders.acceptHeader, 'application/json')
|
||||||
|
..set(HttpHeaders.userAgentHeader, userAgent)
|
||||||
|
..set('X-Emby-Token', token);
|
||||||
|
if (ifNoneMatch != null) req.headers.set(HttpHeaders.ifNoneMatchHeader, ifNoneMatch);
|
||||||
|
if (body != null) {
|
||||||
|
req.headers.contentType = ContentType.json;
|
||||||
|
req.contentLength = body.length;
|
||||||
|
req.add(body);
|
||||||
|
}
|
||||||
|
final res = await req.close().timeout(const Duration(seconds: 20));
|
||||||
|
final text = await res.transform(const Utf8Decoder(allowMalformed: true)).join();
|
||||||
|
return (
|
||||||
|
res.statusCode,
|
||||||
|
text,
|
||||||
|
int.tryParse(res.headers.value(HttpHeaders.retryAfterHeader) ?? ''),
|
||||||
|
res.headers.value(HttpHeaders.etagHeader),
|
||||||
|
);
|
||||||
|
} on TimeoutException {
|
||||||
|
throw const AnimeFlowException(0, AnimeFlowErrorCode.network, 'AnimeFlow timed out');
|
||||||
|
} on IOException catch (e) {
|
||||||
|
throw AnimeFlowException(0, AnimeFlowErrorCode.network, 'AnimeFlow unreachable: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------ endpoints
|
||||||
|
|
||||||
|
/// Who the token belongs to and what they may do. Cached for [meTtl]
|
||||||
|
/// (scopes change at runtime).
|
||||||
|
Future<AnimeFlowMe> me({bool force = false}) async {
|
||||||
|
await _authToken();
|
||||||
|
final c = _me;
|
||||||
|
if (!force && c != null && _now().difference(c.at) < meTtl) return c.me;
|
||||||
|
final me = AnimeFlowMe.fromJson(await _call('GET', '/me'));
|
||||||
|
_me = (at: _now(), me: me);
|
||||||
|
return me;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Episodes airing in [from, to) (at most 45 days) [view].
|
||||||
|
Future<AnimeFlowScheduleWindow> schedule(DateTime from, DateTime to) async {
|
||||||
|
if (!from.isBefore(to) || to.difference(from) > maxScheduleRange) {
|
||||||
|
throw const AnimeFlowException(400, AnimeFlowErrorCode.invalidRange, 'from must be before to, at most 45 days');
|
||||||
|
}
|
||||||
|
final j = await _call('GET', '/schedule',
|
||||||
|
query: {'from': animeFlowTime(from), 'to': animeFlowTime(to)}, etag: true);
|
||||||
|
final m = j is Map ? j : const {};
|
||||||
|
return AnimeFlowScheduleWindow(
|
||||||
|
from: _time(m['from']),
|
||||||
|
to: _time(m['to']),
|
||||||
|
items: [for (final e in _items(j)) AnimeFlowScheduleItem.fromJson(e)],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Every tracked series [view].
|
||||||
|
Future<List<AnimeFlowSeries>> series() async =>
|
||||||
|
[for (final s in _items(await _call('GET', '/series', etag: true))) AnimeFlowSeries.fromJson(s)];
|
||||||
|
|
||||||
|
/// Every series on Jellyfin (as the caller sees it), tracked by
|
||||||
|
/// AnimeFlow or not [view]. Empty on servers without the endpoint.
|
||||||
|
Future<List<AnimeFlowLibraryItem>> library() async {
|
||||||
|
try {
|
||||||
|
return [for (final s in _items(await _call('GET', '/library', etag: true))) AnimeFlowLibraryItem.fromJson(s)];
|
||||||
|
} on AnimeFlowException catch (e) {
|
||||||
|
if (e.isNotFound) return const [];
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One series with all its episodes [view].
|
||||||
|
Future<AnimeFlowSeries> seriesDetail(int seriesId) async {
|
||||||
|
final j = await _call('GET', '/series/$seriesId', etag: true);
|
||||||
|
return AnimeFlowSeries.fromJson(j is Map ? j : const {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Titles that can be requested [request].
|
||||||
|
Future<List<AnimeFlowSearchHit>> search(String q) async => [
|
||||||
|
for (final h in _items(await _call('GET', '/search', query: {'q': q}))) AnimeFlowSearchHit.fromJson(h),
|
||||||
|
];
|
||||||
|
|
||||||
|
/// Asks for a whole new series by its AniDB id [request].
|
||||||
|
Future<AnimeFlowRequest> requestSeries(int anidbId) => _request({'anidb_id': anidbId});
|
||||||
|
|
||||||
|
/// Asks for one season of a tracked series [request].
|
||||||
|
Future<AnimeFlowRequest> requestSeason(int seriesId, int season) =>
|
||||||
|
_request({'series_id': seriesId, 'season': season});
|
||||||
|
|
||||||
|
/// Asks for one episode of a tracked series [request].
|
||||||
|
Future<AnimeFlowRequest> requestEpisode(int seriesId, int season, int episode) =>
|
||||||
|
_request({'series_id': seriesId, 'season': season, 'episode': episode});
|
||||||
|
|
||||||
|
Future<AnimeFlowRequest> _request(Map<String, Object> body) async {
|
||||||
|
final j = await _call('POST', '/requests', body: body);
|
||||||
|
return AnimeFlowRequest.fromJson(j is Map ? j : const {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Own requests, newest first [view]; [all] = everyone's, with the user
|
||||||
|
/// [manage].
|
||||||
|
Future<List<AnimeFlowRequest>> requests({bool all = false}) async => [
|
||||||
|
for (final r in _items(await _call('GET', '/requests', query: all ? {'scope': 'all'} : null, etag: true)))
|
||||||
|
AnimeFlowRequest.fromJson(r),
|
||||||
|
];
|
||||||
|
|
||||||
|
/// [manage]. Returns the updated request when the server sends one.
|
||||||
|
Future<AnimeFlowRequest?> approve(int requestId) async =>
|
||||||
|
_maybeRequest(await _call('POST', '/requests/$requestId/approve'));
|
||||||
|
|
||||||
|
/// [manage].
|
||||||
|
Future<AnimeFlowRequest?> reject(int requestId, {String? reason}) async => _maybeRequest(
|
||||||
|
await _call('POST', '/requests/$requestId/reject', body: {'reason': ?reason}));
|
||||||
|
|
||||||
|
static AnimeFlowRequest? _maybeRequest(Object? j) =>
|
||||||
|
j is Map && j['id'] != null ? AnimeFlowRequest.fromJson(j) : null;
|
||||||
|
|
||||||
|
/// [manage].
|
||||||
|
Future<List<AnimeFlowUser>> users() async =>
|
||||||
|
[for (final u in _items(await _call('GET', '/users'))) AnimeFlowUser.fromJson(u)];
|
||||||
|
|
||||||
|
/// Sets a user's scopes (and revocation) [manage]. Returns the updated
|
||||||
|
/// user when the server sends one.
|
||||||
|
Future<AnimeFlowUser?> setScopes(String jellyfinUserId, Set<AnimeFlowScope> scopes, {bool? revoked}) async {
|
||||||
|
final j = await _call('PUT', '/users/${Uri.encodeComponent(jellyfinUserId)}/scopes', body: {
|
||||||
|
'scopes': [for (final s in AnimeFlowScope.values) if (scopes.contains(s)) s.name],
|
||||||
|
'revoked': ?revoked,
|
||||||
|
});
|
||||||
|
_me = null; // could be our own
|
||||||
|
return j is Map && j['user_id'] != null ? AnimeFlowUser.fromJson(j) : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Forgets cached bodies and /me (e.g. on a manual refresh).
|
||||||
|
void clearCache() {
|
||||||
|
_etags.clear();
|
||||||
|
_me = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void close() {
|
||||||
|
if (_ownsHttp) _http.close(force: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,457 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'anilist.dart';
|
||||||
|
import 'animeflow.dart';
|
||||||
|
|
||||||
|
// The Schedule tab's data: AniList says what airs when, AnimeFlow says
|
||||||
|
// what the media server has of it. [matchSchedule] merges the two and
|
||||||
|
// [ScheduleRepository] loads a window of both, degrading to AniList alone
|
||||||
|
// when AnimeFlow is unreachable or not linked.
|
||||||
|
|
||||||
|
enum ScheduleStatus {
|
||||||
|
available,
|
||||||
|
downloading,
|
||||||
|
upcoming,
|
||||||
|
/// AnimeFlow's `missing`: aired, monitored, no release grabbed yet;
|
||||||
|
/// AnimeFlow grabs it by itself once one appears (nothing to request).
|
||||||
|
/// Also an aired episode of a tracked series AnimeFlow has no row for.
|
||||||
|
missing,
|
||||||
|
failed,
|
||||||
|
/// AnimeFlow does not monitor it: the only status worth a Request.
|
||||||
|
unmonitored,
|
||||||
|
/// AnimeFlow does not track this series (or is unreachable).
|
||||||
|
notTracked,
|
||||||
|
/// Not tracked by AnimeFlow, the series is on Jellyfin (`/library`) and
|
||||||
|
/// so is the episode ([confirmOnJellyfin]; [matchSchedule] alone sets
|
||||||
|
/// it from the series).
|
||||||
|
inLibrary,
|
||||||
|
/// Not tracked, the series is on Jellyfin, the episode aired but is not
|
||||||
|
/// there yet.
|
||||||
|
notOnJellyfin,
|
||||||
|
/// Not tracked, the series is on Jellyfin, the episode aired; whether
|
||||||
|
/// it is there is unknown (no linked account, lookup failed).
|
||||||
|
aired;
|
||||||
|
|
||||||
|
static ScheduleStatus of(EpisodeStatus s) => switch (s) {
|
||||||
|
EpisodeStatus.available => available,
|
||||||
|
EpisodeStatus.downloading => downloading,
|
||||||
|
EpisodeStatus.upcoming => upcoming,
|
||||||
|
EpisodeStatus.missing => missing,
|
||||||
|
EpisodeStatus.failed => failed,
|
||||||
|
EpisodeStatus.unmonitored => unmonitored,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One airing with what AnimeFlow knows about it.
|
||||||
|
class ScheduleEntry {
|
||||||
|
final Airing airing;
|
||||||
|
final ScheduleStatus status;
|
||||||
|
/// 0..1 while downloading.
|
||||||
|
final double? progress;
|
||||||
|
/// Why it failed, or (missing) why the releases found were rejected.
|
||||||
|
final String? reason;
|
||||||
|
/// AnimeFlow's last search for it (missing).
|
||||||
|
final DateTime? lastSearchedAt;
|
||||||
|
/// AnimeFlow tracks the series.
|
||||||
|
final bool tracked;
|
||||||
|
/// AnimeFlow's series id (requests).
|
||||||
|
final int? seriesId;
|
||||||
|
/// The AnimeFlow season of the matched episode (requests); untracked
|
||||||
|
/// on Jellyfin: the TVDB season of the AniList entry.
|
||||||
|
final int? season;
|
||||||
|
/// The TVDB episode number in [season]: tracked, AnimeFlow's own;
|
||||||
|
/// untracked on Jellyfin, AniList episode + the `anilist_map` run's
|
||||||
|
/// offset.
|
||||||
|
final int? jellyfinEpisode;
|
||||||
|
/// Play target once available.
|
||||||
|
final String? jellyfinSeriesId;
|
||||||
|
/// This user's progress on the Jellyfin episode ([confirmOnJellyfin]);
|
||||||
|
/// null when it is not on Jellyfin or was not looked up.
|
||||||
|
final EpisodeWatch? watch;
|
||||||
|
/// The series is on Jellyfin (tracked or not).
|
||||||
|
bool get onJellyfin => jellyfinSeriesId != null;
|
||||||
|
|
||||||
|
const ScheduleEntry({
|
||||||
|
required this.airing,
|
||||||
|
required this.status,
|
||||||
|
this.progress,
|
||||||
|
this.reason,
|
||||||
|
this.lastSearchedAt,
|
||||||
|
this.tracked = false,
|
||||||
|
this.seriesId,
|
||||||
|
this.season,
|
||||||
|
this.jellyfinEpisode,
|
||||||
|
this.jellyfinSeriesId,
|
||||||
|
this.watch,
|
||||||
|
});
|
||||||
|
|
||||||
|
ScheduleEntry copyWith({ScheduleStatus? status, EpisodeWatch? watch}) => ScheduleEntry(
|
||||||
|
airing: airing,
|
||||||
|
status: status ?? this.status,
|
||||||
|
progress: progress,
|
||||||
|
reason: reason,
|
||||||
|
lastSearchedAt: lastSearchedAt,
|
||||||
|
tracked: tracked,
|
||||||
|
seriesId: seriesId,
|
||||||
|
season: season,
|
||||||
|
jellyfinEpisode: jellyfinEpisode,
|
||||||
|
jellyfinSeriesId: jellyfinSeriesId,
|
||||||
|
watch: watch ?? this.watch,
|
||||||
|
);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String toString() => 'ScheduleEntry(${airing.anilistId}#${airing.episode} $status)';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Without AnimeFlow: future airings are upcoming, past ones unknown.
|
||||||
|
ScheduleEntry untrackedEntry(Airing a, DateTime now) => ScheduleEntry(
|
||||||
|
airing: a,
|
||||||
|
status: a.airingAt.isAfter(now) ? ScheduleStatus.upcoming : ScheduleStatus.notTracked,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// This user's state of a Jellyfin episode (its `UserData`).
|
||||||
|
class EpisodeWatch {
|
||||||
|
final bool played;
|
||||||
|
/// 0..1: the resume point of a partly watched episode (0 = none).
|
||||||
|
final double progress;
|
||||||
|
const EpisodeWatch({this.played = false, this.progress = 0});
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) => other is EpisodeWatch && other.played == played && other.progress == progress;
|
||||||
|
@override
|
||||||
|
int get hashCode => Object.hash(played, progress);
|
||||||
|
@override
|
||||||
|
String toString() => 'EpisodeWatch(${played ? 'played' : '$progress'})';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One episode Jellyfin has of a series, as the schedule needs it.
|
||||||
|
class JellyfinEpisodeRef {
|
||||||
|
final int season;
|
||||||
|
final int episode;
|
||||||
|
/// Jellyfin's date-only premiere date.
|
||||||
|
final DateTime? premiere;
|
||||||
|
final EpisodeWatch watch;
|
||||||
|
const JellyfinEpisodeRef(this.season, this.episode, {this.premiere, this.watch = const EpisodeWatch()});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Air dates (AnimeFlow's `air_date`, Jellyfin's premiere date) are
|
||||||
|
// date-only: the Japanese broadcast day, sent as midnight Japan time (or
|
||||||
|
// midnight UTC by older servers). Both land on the right day read as a
|
||||||
|
// Japan (UTC+9, no DST) calendar day, never as a local one: midnight JST
|
||||||
|
// is the evening before in Europe and America.
|
||||||
|
const _jst = Duration(hours: 9);
|
||||||
|
|
||||||
|
/// The Japan calendar day of [t].
|
||||||
|
DateTime _jstDay(DateTime t) {
|
||||||
|
final j = t.toUtc().add(_jst);
|
||||||
|
return DateTime.utc(j.year, j.month, j.day);
|
||||||
|
}
|
||||||
|
|
||||||
|
String _dayKey(DateTime d) => '${d.year}-${d.month}-${d.day}';
|
||||||
|
|
||||||
|
/// The Japan days whose air date fits a broadcast at [airingAt]: its own
|
||||||
|
/// and, for a late-night slot (before 05:00 JST, "25:30"), the evening
|
||||||
|
/// before, which listings often give.
|
||||||
|
List<DateTime> _airDays(DateTime airingAt) {
|
||||||
|
final j = airingAt.toUtc().add(_jst);
|
||||||
|
final d = DateTime.utc(j.year, j.month, j.day);
|
||||||
|
return [d, if (j.hour < 5) DateTime.utc(j.year, j.month, j.day - 1)];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The date-only [airDate] is the broadcast day of [airingAt] (see
|
||||||
|
/// [_airDays]).
|
||||||
|
bool sameAirDay(DateTime airDate, DateTime airingAt) => _airDays(airingAt).contains(_jstDay(airDate));
|
||||||
|
|
||||||
|
class _SeriesRef {
|
||||||
|
final int seriesId;
|
||||||
|
final String? jellyfinSeriesId;
|
||||||
|
_SeriesRef(this.seriesId, this.jellyfinSeriesId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Merges AniList [airings] with AnimeFlow's [schedule] rows and tracked
|
||||||
|
/// [series]. Per airing: the episode with the same AniList id (that
|
||||||
|
/// episode's season's entry) and episode number, else absolute number,
|
||||||
|
/// else the same local air day; unmatched airings of a tracked AniList id
|
||||||
|
/// are missing once aired, upcoming before; the rest are not tracked.
|
||||||
|
List<ScheduleEntry> matchSchedule(
|
||||||
|
List<Airing> airings, {
|
||||||
|
required List<AnimeFlowScheduleItem> schedule,
|
||||||
|
List<AnimeFlowSeries> series = const [],
|
||||||
|
List<AnimeFlowLibraryItem> library = const [],
|
||||||
|
DateTime? now,
|
||||||
|
}) {
|
||||||
|
final at = now ?? DateTime.now();
|
||||||
|
// AniList id -> (Jellyfin series, its TVDB season, TVDB - AniList
|
||||||
|
// episode offset) from /library.
|
||||||
|
final lib = <int, (String, int, int)>{};
|
||||||
|
for (final item in library) {
|
||||||
|
if (item.jellyfinSeriesId.isEmpty) continue;
|
||||||
|
for (final r in item.anilistMap) {
|
||||||
|
lib[r.anilistId] ??= (item.jellyfinSeriesId, r.season, r.offset);
|
||||||
|
}
|
||||||
|
for (final e in item.anilistIds.entries) {
|
||||||
|
lib[e.value] ??= (item.jellyfinSeriesId, e.key, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final refs = <int, _SeriesRef>{};
|
||||||
|
for (final s in series) {
|
||||||
|
final id = s.anilistId;
|
||||||
|
if (id != null) refs[id] ??= _SeriesRef(s.seriesId, s.jellyfinSeriesId);
|
||||||
|
}
|
||||||
|
// AnimeFlow's AniList episode number wins outright: TVDB numbering runs
|
||||||
|
// on across split entries (JoJo S6E4 is "2nd & 3rd STAGE" ep 3), so a TVDB
|
||||||
|
// or absolute number, or an air day, is only a guess for AniList entries
|
||||||
|
// AnimeFlow gives no AniList numbers for.
|
||||||
|
final byAni = <String, AnimeFlowScheduleItem>{};
|
||||||
|
final byEp = <String, AnimeFlowScheduleItem>{};
|
||||||
|
final byAbs = <String, AnimeFlowScheduleItem>{};
|
||||||
|
final byDay = <String, AnimeFlowScheduleItem>{};
|
||||||
|
final numbered = <int>{};
|
||||||
|
for (final it in schedule) {
|
||||||
|
final e = it.episode, id = e.anilistId;
|
||||||
|
if (id == null) continue;
|
||||||
|
refs[id] ??= _SeriesRef(it.seriesId, it.jellyfinSeriesId);
|
||||||
|
if (e.anilistEpisode != null) {
|
||||||
|
numbered.add(id);
|
||||||
|
byAni.putIfAbsent('$id#${e.anilistEpisode}', () => it);
|
||||||
|
}
|
||||||
|
byEp.putIfAbsent('$id#${e.episode}', () => it);
|
||||||
|
if (e.absolute != null) byAbs.putIfAbsent('$id#${e.absolute}', () => it);
|
||||||
|
if (e.airDate != null) byDay.putIfAbsent('$id@${_dayKey(_jstDay(e.airDate!))}', () => it);
|
||||||
|
}
|
||||||
|
return [
|
||||||
|
for (final a in airings)
|
||||||
|
() {
|
||||||
|
final id = a.anilistId;
|
||||||
|
final ref = refs[id];
|
||||||
|
final it = numbered.contains(id)
|
||||||
|
? byAni['$id#${a.episode}']
|
||||||
|
: byEp['$id#${a.episode}'] ??
|
||||||
|
byAbs['$id#${a.episode}'] ??
|
||||||
|
_airDays(a.airingAt).map((d) => byDay['$id@${_dayKey(d)}']).nonNulls.firstOrNull;
|
||||||
|
if (it != null) {
|
||||||
|
final e = it.episode;
|
||||||
|
return ScheduleEntry(
|
||||||
|
airing: a,
|
||||||
|
status: ScheduleStatus.of(e.status),
|
||||||
|
progress: e.status == EpisodeStatus.downloading ? e.progress : null,
|
||||||
|
reason: e.status == EpisodeStatus.failed || e.status == EpisodeStatus.missing ? e.reason : null,
|
||||||
|
lastSearchedAt: e.lastSearchedAt,
|
||||||
|
tracked: true,
|
||||||
|
seriesId: it.seriesId,
|
||||||
|
season: e.season,
|
||||||
|
jellyfinEpisode: e.episode,
|
||||||
|
jellyfinSeriesId: it.jellyfinSeriesId ?? ref?.jellyfinSeriesId ?? lib[id]?.$1,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (ref == null) {
|
||||||
|
final onJf = lib[id];
|
||||||
|
if (onJf == null) return ScheduleEntry(airing: a, status: ScheduleStatus.notTracked);
|
||||||
|
return ScheduleEntry(
|
||||||
|
airing: a,
|
||||||
|
status: a.airingAt.isAfter(at) ? ScheduleStatus.upcoming : ScheduleStatus.inLibrary,
|
||||||
|
season: onJf.$2,
|
||||||
|
jellyfinEpisode: a.episode + onJf.$3,
|
||||||
|
jellyfinSeriesId: onJf.$1,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return ScheduleEntry(
|
||||||
|
airing: a,
|
||||||
|
status: a.airingAt.isAfter(at) ? ScheduleStatus.upcoming : ScheduleStatus.missing,
|
||||||
|
tracked: true,
|
||||||
|
seriesId: ref.seriesId,
|
||||||
|
jellyfinSeriesId: ref.jellyfinSeriesId ?? lib[id]?.$1,
|
||||||
|
);
|
||||||
|
}(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The episodes [confirmOnJellyfin] looks up: on Jellyfin, untracked
|
||||||
|
/// ([ScheduleStatus.inLibrary]) or available through AnimeFlow.
|
||||||
|
bool needsJellyfinLookup(ScheduleEntry e) =>
|
||||||
|
e.jellyfinSeriesId != null && (e.status == ScheduleStatus.inLibrary || e.status == ScheduleStatus.available);
|
||||||
|
|
||||||
|
/// Checks [matchSchedule]'s entries against the episodes Jellyfin has:
|
||||||
|
/// [episodes] maps a Jellyfin series id to its episodes. An
|
||||||
|
/// [ScheduleStatus.inLibrary] one found stays inLibrary, absent becomes
|
||||||
|
/// [ScheduleStatus.notOnJellyfin], a series missing from [episodes] (not
|
||||||
|
/// looked up) [ScheduleStatus.aired]. Found episodes (inLibrary or
|
||||||
|
/// available) get this user's [ScheduleEntry.watch]: (season, episode),
|
||||||
|
/// else the one premiered that day.
|
||||||
|
List<ScheduleEntry> confirmOnJellyfin(List<ScheduleEntry> entries, Map<String, List<JellyfinEpisodeRef>> episodes) => [
|
||||||
|
for (final e in entries)
|
||||||
|
if (!needsJellyfinLookup(e))
|
||||||
|
e
|
||||||
|
else
|
||||||
|
switch ((episodes[e.jellyfinSeriesId], e.status)) {
|
||||||
|
(null, ScheduleStatus.inLibrary) => e.copyWith(status: ScheduleStatus.aired),
|
||||||
|
(null, _) => e,
|
||||||
|
(final have?, _) => switch (_episodeOf(have, e)) {
|
||||||
|
final x? => e.copyWith(watch: x.watch),
|
||||||
|
null when e.status == ScheduleStatus.inLibrary => e.copyWith(status: ScheduleStatus.notOnJellyfin),
|
||||||
|
null => e,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
JellyfinEpisodeRef? _episodeOf(List<JellyfinEpisodeRef> have, ScheduleEntry e) {
|
||||||
|
final byNumber = have.where((x) => x.season == e.season && x.episode == e.jellyfinEpisode).firstOrNull;
|
||||||
|
if (byNumber != null || !e.tracked) return byNumber;
|
||||||
|
// AnimeFlow's numbering missed (specials, renumbered seasons): the
|
||||||
|
// episode premiered that day, when only one did.
|
||||||
|
return have.where((x) => x.premiere != null && sameAirDay(x.premiere!, e.airing.airingAt)).singleOrNull;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The episodes Jellyfin has of a series, as the linked account sees
|
||||||
|
/// them; null when it cannot tell (no linked account for that server).
|
||||||
|
typedef JellyfinEpisodeLookup = Future<List<JellyfinEpisodeRef>?> Function(String jellyfinSeriesId);
|
||||||
|
|
||||||
|
/// One loaded window. Errors are display text; [entries] is empty only
|
||||||
|
/// when AniList failed with nothing cached.
|
||||||
|
class ScheduleSnapshot {
|
||||||
|
final DateTime from;
|
||||||
|
final DateTime to;
|
||||||
|
/// Sorted by air time.
|
||||||
|
final List<ScheduleEntry> entries;
|
||||||
|
/// AniList failed and nothing was cached.
|
||||||
|
final String? aniListError;
|
||||||
|
/// AniList failed; [entries] come from the cache fetched then.
|
||||||
|
final DateTime? aniListStaleSince;
|
||||||
|
/// AnimeFlow is unreachable, refused or not linked: statuses are
|
||||||
|
/// AniList-only (upcoming / not tracked).
|
||||||
|
final String? animeFlowError;
|
||||||
|
/// The structured AnimeFlow failure behind [animeFlowError].
|
||||||
|
final AnimeFlowException? animeFlowException;
|
||||||
|
/// Who we are on AnimeFlow (null when it failed).
|
||||||
|
final AnimeFlowMe? me;
|
||||||
|
|
||||||
|
const ScheduleSnapshot({
|
||||||
|
required this.from,
|
||||||
|
required this.to,
|
||||||
|
required this.entries,
|
||||||
|
this.aniListError,
|
||||||
|
this.aniListStaleSince,
|
||||||
|
this.animeFlowError,
|
||||||
|
this.animeFlowException,
|
||||||
|
this.me,
|
||||||
|
});
|
||||||
|
|
||||||
|
bool get hasAnimeFlow => me != null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Loads AniList and AnimeFlow for a window and merges them.
|
||||||
|
class ScheduleRepository {
|
||||||
|
ScheduleRepository({required this.aniList, this.animeFlow, this.jellyfinEpisodes, DateTime Function()? now})
|
||||||
|
: _now = now ?? DateTime.now;
|
||||||
|
|
||||||
|
final AniListClient aniList;
|
||||||
|
/// Null = not configured (AniList only).
|
||||||
|
final AnimeFlowClient? animeFlow;
|
||||||
|
/// Confirms "on Jellyfin" and this user's watched state per episode
|
||||||
|
/// ([confirmOnJellyfin]); null = never confirmed (aired entries read
|
||||||
|
/// [ScheduleStatus.aired], nothing shows as watched).
|
||||||
|
final JellyfinEpisodeLookup? jellyfinEpisodes;
|
||||||
|
final DateTime Function() _now;
|
||||||
|
|
||||||
|
/// Last week's Monday 00:00 local .. 4 weeks later.
|
||||||
|
static ({DateTime from, DateTime to}) defaultWindow(DateTime now) {
|
||||||
|
final l = now.toLocal();
|
||||||
|
final from = DateTime(l.year, l.month, l.day - (l.weekday - 1) - 7);
|
||||||
|
return (from: from, to: DateTime(from.year, from.month, from.day + 28));
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<ScheduleSnapshot> load({DateTime? from, DateTime? to, bool force = false}) async {
|
||||||
|
final w = defaultWindow(_now());
|
||||||
|
final start = from ?? w.from, end = to ?? w.to;
|
||||||
|
final flowF = _animeFlow(start, end, force);
|
||||||
|
final AniListSchedule ani;
|
||||||
|
try {
|
||||||
|
ani = await aniList.schedule(start, end, force: force);
|
||||||
|
} catch (e) {
|
||||||
|
unawaited(flowF.then((_) {}, onError: (_) {}));
|
||||||
|
return ScheduleSnapshot(from: start, to: end, entries: const [], aniListError: _text(e));
|
||||||
|
}
|
||||||
|
final now = _now();
|
||||||
|
final flow = await flowF;
|
||||||
|
final airings = [...ani.airings]..sort((a, b) => a.airingAt.compareTo(b.airingAt));
|
||||||
|
final entries = flow.error == null
|
||||||
|
? await _confirm(
|
||||||
|
matchSchedule(airings, schedule: flow.schedule, series: flow.series, library: flow.library, now: now))
|
||||||
|
: [for (final a in airings) untrackedEntry(a, now)];
|
||||||
|
return ScheduleSnapshot(
|
||||||
|
from: start,
|
||||||
|
to: end,
|
||||||
|
entries: entries,
|
||||||
|
aniListStaleSince: ani.staleSince,
|
||||||
|
animeFlowError: flow.error == null ? null : _text(flow.error!),
|
||||||
|
animeFlowException: flow.error is AnimeFlowException ? flow.error as AnimeFlowException : null,
|
||||||
|
me: flow.me,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Looks up the episodes of every series an entry on Jellyfin is on
|
||||||
|
/// ([needsJellyfinLookup]), in parallel, one request per series; a
|
||||||
|
/// failed or impossible lookup leaves that series out.
|
||||||
|
Future<List<ScheduleEntry>> _confirm(List<ScheduleEntry> entries) async {
|
||||||
|
final lookup = jellyfinEpisodes;
|
||||||
|
final ids = {
|
||||||
|
for (final e in entries)
|
||||||
|
if (needsJellyfinLookup(e)) e.jellyfinSeriesId!,
|
||||||
|
};
|
||||||
|
final found = <String, List<JellyfinEpisodeRef>>{};
|
||||||
|
if (lookup != null) {
|
||||||
|
await Future.wait([
|
||||||
|
for (final id in ids)
|
||||||
|
lookup(id).then((eps) {
|
||||||
|
if (eps != null) found[id] = eps;
|
||||||
|
}, onError: (_) {}),
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
return confirmOnJellyfin(entries, found);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<({AnimeFlowMe? me, List<AnimeFlowScheduleItem> schedule, List<AnimeFlowSeries> series, List<AnimeFlowLibraryItem> library, Object? error})>
|
||||||
|
_animeFlow(DateTime from, DateTime to, bool force) async {
|
||||||
|
final c = animeFlow;
|
||||||
|
if (c == null) {
|
||||||
|
return (me: null, schedule: const <AnimeFlowScheduleItem>[], series: const <AnimeFlowSeries>[],
|
||||||
|
library: const <AnimeFlowLibraryItem>[],
|
||||||
|
error: 'AnimeFlow is not configured');
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
if (force) c.clearCache();
|
||||||
|
final me = await c.me();
|
||||||
|
final (sched, series) = await (c.schedule(from, to), c.series()).wait;
|
||||||
|
// The library only adds "on Jellyfin" for untracked shows: its
|
||||||
|
// failure never fails the schedule.
|
||||||
|
List<AnimeFlowLibraryItem> library = const [];
|
||||||
|
try {
|
||||||
|
library = await c.library();
|
||||||
|
} catch (_) {}
|
||||||
|
return (me: me, schedule: sched.items, series: series, library: library, error: null);
|
||||||
|
} on ParallelWaitError catch (e) {
|
||||||
|
final errs = e.errors as (AsyncError?, AsyncError?);
|
||||||
|
return (
|
||||||
|
me: null,
|
||||||
|
schedule: const <AnimeFlowScheduleItem>[],
|
||||||
|
series: const <AnimeFlowSeries>[],
|
||||||
|
library: const <AnimeFlowLibraryItem>[],
|
||||||
|
error: (errs.$1 ?? errs.$2)!.error,
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
return (me: null, schedule: const <AnimeFlowScheduleItem>[], series: const <AnimeFlowSeries>[], library: const <AnimeFlowLibraryItem>[], error: e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static String _text(Object e) => switch (e) {
|
||||||
|
AnimeFlowException(:final code, :final detail) => switch (code) {
|
||||||
|
AnimeFlowErrorCode.missingToken => 'Link the Jellyfin server to see AnimeFlow statuses',
|
||||||
|
AnimeFlowErrorCode.badToken => 'AnimeFlow: sign in to Jellyfin again',
|
||||||
|
AnimeFlowErrorCode.revoked => 'AnimeFlow: access revoked',
|
||||||
|
AnimeFlowErrorCode.rateLimited => 'AnimeFlow: too many requests, try again shortly',
|
||||||
|
_ => 'AnimeFlow: $detail',
|
||||||
|
},
|
||||||
|
AniListException(:final message) => message,
|
||||||
|
_ => '$e',
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,175 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../../shell/avatar.dart';
|
||||||
|
import '../animeflow.dart';
|
||||||
|
|
||||||
|
// The Schedule page's side sheet: AnimeFlow requests (everyone's for the
|
||||||
|
// owner, who can retry failed ones and decline the rest; own otherwise).
|
||||||
|
|
||||||
|
Color requestColor(RequestStatus s) => switch (s) {
|
||||||
|
RequestStatus.pending || RequestStatus.searching => Colors.amber,
|
||||||
|
RequestStatus.approved => Colors.lightBlueAccent,
|
||||||
|
RequestStatus.rejected || RequestStatus.failed => Colors.redAccent,
|
||||||
|
RequestStatus.done => Colors.greenAccent,
|
||||||
|
};
|
||||||
|
|
||||||
|
String requestWhat(AnimeFlowRequest r) => switch (r.kind) {
|
||||||
|
RequestKind.series => r.title,
|
||||||
|
RequestKind.season => '${r.title} · season ${r.season ?? '?'}',
|
||||||
|
RequestKind.episode => '${r.title} · S${r.season ?? '?'}E${r.episode ?? '?'}',
|
||||||
|
};
|
||||||
|
|
||||||
|
class RequestsSheet extends StatelessWidget {
|
||||||
|
/// Scope manage: everyone's requests, Retry and Decline.
|
||||||
|
final bool owner;
|
||||||
|
|
||||||
|
/// Null while loading.
|
||||||
|
final List<AnimeFlowRequest>? requests;
|
||||||
|
final String? error;
|
||||||
|
|
||||||
|
/// Our own name, for requests without a user name.
|
||||||
|
final String selfName;
|
||||||
|
|
||||||
|
/// Requests with a call in flight.
|
||||||
|
final Set<int> busy;
|
||||||
|
final void Function(AnimeFlowRequest r) onRetry;
|
||||||
|
final void Function(AnimeFlowRequest r) onDecline;
|
||||||
|
final VoidCallback onClose;
|
||||||
|
|
||||||
|
const RequestsSheet({
|
||||||
|
super.key,
|
||||||
|
required this.owner,
|
||||||
|
required this.requests,
|
||||||
|
required this.selfName,
|
||||||
|
required this.onRetry,
|
||||||
|
required this.onDecline,
|
||||||
|
required this.onClose,
|
||||||
|
this.error,
|
||||||
|
this.busy = const {},
|
||||||
|
});
|
||||||
|
|
||||||
|
Widget _tile(BuildContext context, AnimeFlowRequest r) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final who = r.userName ?? (selfName.isEmpty ? 'you' : selfName);
|
||||||
|
final canRetry = owner && r.status == RequestStatus.failed;
|
||||||
|
final canDecline =
|
||||||
|
owner &&
|
||||||
|
(r.status == RequestStatus.pending ||
|
||||||
|
r.status == RequestStatus.approved ||
|
||||||
|
r.status == RequestStatus.searching);
|
||||||
|
final inFlight = busy.contains(r.id);
|
||||||
|
return Padding(
|
||||||
|
key: ValueKey('request-${r.id}'),
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 6),
|
||||||
|
child: Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
StatusAvatar(
|
||||||
|
info: AvatarInfo(name: who, color: colorForName(who)),
|
||||||
|
size: 32,
|
||||||
|
ring: false,
|
||||||
|
badges: false,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(requestWhat(r), style: const TextStyle(fontWeight: FontWeight.w600)),
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Wrap(
|
||||||
|
spacing: 8,
|
||||||
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
|
children: [
|
||||||
|
Text(who, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
Pill(r.status.name, requestColor(r.status)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (r.reason != null && r.reason!.isNotEmpty)
|
||||||
|
Text(r.reason!, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 11)),
|
||||||
|
if (canRetry || canDecline)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 6),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
if (canRetry)
|
||||||
|
FilledButton.tonal(
|
||||||
|
key: ValueKey('retry-${r.id}'),
|
||||||
|
onPressed: inFlight ? null : () => onRetry(r),
|
||||||
|
child: const Text('Retry'),
|
||||||
|
),
|
||||||
|
if (canDecline)
|
||||||
|
TextButton(
|
||||||
|
key: ValueKey('decline-${r.id}'),
|
||||||
|
onPressed: inFlight ? null : () => onDecline(r),
|
||||||
|
child: const Text('Decline'),
|
||||||
|
),
|
||||||
|
if (inFlight) ...[
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
const SizedBox(width: 14, height: 14, child: CircularProgressIndicator(strokeWidth: 2)),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final reqs = requests;
|
||||||
|
return Material(
|
||||||
|
color: scheme.surfaceContainerLow,
|
||||||
|
child: ListView(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 10, 8, 16),
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
owner ? 'Requests' : 'My requests',
|
||||||
|
style: const TextStyle(fontWeight: FontWeight.w700, fontSize: 16),
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('requests-close'),
|
||||||
|
onPressed: onClose,
|
||||||
|
tooltip: 'Close',
|
||||||
|
icon: const Icon(Icons.close, size: 18),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
owner
|
||||||
|
? 'Everyone\'s requests. AnimeFlow approves them automatically; you can decline or retry.'
|
||||||
|
: 'AnimeFlow downloads requests automatically; they appear on Jellyfin when done.',
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
if (error != null)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(bottom: 8),
|
||||||
|
child: Text(error!, style: TextStyle(color: scheme.error, fontSize: 12)),
|
||||||
|
),
|
||||||
|
if (reqs == null && error == null)
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 24),
|
||||||
|
child: Center(child: SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2))),
|
||||||
|
)
|
||||||
|
else if (reqs != null && reqs.isEmpty)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 24),
|
||||||
|
child: Center(
|
||||||
|
child: Text('No requests yet', style: TextStyle(color: scheme.onSurfaceVariant)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
for (final r in reqs ?? const <AnimeFlowRequest>[]) _tile(context, r),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../../jellyfin/accounts.dart';
|
||||||
|
import '../../jellyfin/format.dart' show pickFor, progressOf;
|
||||||
|
import '../../screens/home/picked_media.dart';
|
||||||
|
import '../anilist.dart';
|
||||||
|
import '../animeflow.dart';
|
||||||
|
import '../schedule_model.dart';
|
||||||
|
|
||||||
|
// What the Schedule page's buttons do beyond one client call: friendly
|
||||||
|
// AnimeFlow errors, finding AnimeFlow's own numbering of an airing, the
|
||||||
|
// AniDB id of an untracked AniList entry, and the Jellyfin episode to put
|
||||||
|
// up.
|
||||||
|
|
||||||
|
/// A failure meant for the user as is.
|
||||||
|
class ScheduleActionException implements Exception {
|
||||||
|
final String message;
|
||||||
|
const ScheduleActionException(this.message);
|
||||||
|
@override
|
||||||
|
String toString() => message;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [e] as one short sentence for a toast.
|
||||||
|
String friendlyError(Object e) => switch (e) {
|
||||||
|
ScheduleActionException(:final message) => message,
|
||||||
|
AnimeFlowException(:final code, :final detail) => switch (code) {
|
||||||
|
AnimeFlowErrorCode.alreadyRequested => 'Already requested',
|
||||||
|
AnimeFlowErrorCode.alreadyTracked => 'AnimeFlow already tracks this series',
|
||||||
|
AnimeFlowErrorCode.alreadyAvailable => 'Already on Jellyfin',
|
||||||
|
AnimeFlowErrorCode.missingScope => 'The owner has not allowed you to do that on AnimeFlow',
|
||||||
|
AnimeFlowErrorCode.revoked => 'Your AnimeFlow access was revoked',
|
||||||
|
AnimeFlowErrorCode.missingToken => 'Link the Jellyfin server to use AnimeFlow',
|
||||||
|
AnimeFlowErrorCode.badToken => 'AnimeFlow: sign in to Jellyfin again',
|
||||||
|
AnimeFlowErrorCode.ownAccount => 'You cannot change your own account',
|
||||||
|
AnimeFlowErrorCode.searchUnavailable => 'AniDB search is unavailable right now',
|
||||||
|
AnimeFlowErrorCode.seriesNotFound => 'AnimeFlow does not know this series',
|
||||||
|
AnimeFlowErrorCode.episodeNotFound => 'AnimeFlow does not know this episode',
|
||||||
|
AnimeFlowErrorCode.requestNotFound => 'That request is gone',
|
||||||
|
AnimeFlowErrorCode.notFound => 'AnimeFlow: not found',
|
||||||
|
AnimeFlowErrorCode.invalidState => 'That cannot be done in its current state',
|
||||||
|
AnimeFlowErrorCode.rateLimited => 'AnimeFlow is busy, try again shortly',
|
||||||
|
AnimeFlowErrorCode.network => 'AnimeFlow is unreachable',
|
||||||
|
AnimeFlowErrorCode.jellyfinUnreachable => 'AnimeFlow cannot reach Jellyfin right now',
|
||||||
|
_ => 'AnimeFlow: $detail',
|
||||||
|
},
|
||||||
|
JellyfinException(:final message) => 'Jellyfin: $message',
|
||||||
|
_ => '$e',
|
||||||
|
};
|
||||||
|
|
||||||
|
/// AnimeFlow's episode for [e] (its season and numbering), from the
|
||||||
|
/// series detail: same AniList id and episode, else absolute number, else
|
||||||
|
/// the same air day ([sameAirDay]). Null when the entry is not tracked or nothing fits.
|
||||||
|
Future<AnimeFlowEpisode?> flowEpisodeFor(AnimeFlowClient client, ScheduleEntry e) async {
|
||||||
|
final id = e.seriesId;
|
||||||
|
if (id == null) return null;
|
||||||
|
final eps = (await client.seriesDetail(id)).episodes;
|
||||||
|
final a = e.airing;
|
||||||
|
final mine = eps.where((x) => x.anilistId == null || x.anilistId == a.anilistId).toList();
|
||||||
|
return mine.where((x) => x.anilistId == a.anilistId && x.episode == a.episode).firstOrNull ??
|
||||||
|
mine.where((x) => x.absolute == a.episode).firstOrNull ??
|
||||||
|
mine.where((x) => x.airDate != null && sameAirDay(x.airDate!, a.airingAt)).firstOrNull;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The (season, episode) AnimeFlow uses for [e]; falls back to the
|
||||||
|
/// matched season and AniList's number when the detail has nothing.
|
||||||
|
Future<({int season, int episode})> flowNumbering(AnimeFlowClient? client, ScheduleEntry e) async {
|
||||||
|
AnimeFlowEpisode? ep;
|
||||||
|
if (client != null) {
|
||||||
|
try {
|
||||||
|
ep = await flowEpisodeFor(client, e);
|
||||||
|
} on AnimeFlowException catch (err) {
|
||||||
|
if (err.isUnauthorized || err.isForbidden) rethrow;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ep != null) return (season: ep.season, episode: ep.episode);
|
||||||
|
return (season: e.season ?? 1, episode: e.jellyfinEpisode ?? e.airing.episode);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The AniDB id of an untracked AniList entry, from AnimeFlow's search:
|
||||||
|
/// the hit with the same AniList id, searched by English then romaji
|
||||||
|
/// title. Otherwise every hit seen, for the user to choose from.
|
||||||
|
Future<({AnimeFlowSearchHit? match, List<AnimeFlowSearchHit> hits})> findOnAniDb(
|
||||||
|
AnimeFlowClient client,
|
||||||
|
Airing a,
|
||||||
|
) async {
|
||||||
|
final hits = <AnimeFlowSearchHit>[];
|
||||||
|
final queries = {a.title, if (a.titleRomaji.isNotEmpty) a.titleRomaji};
|
||||||
|
for (final q in queries) {
|
||||||
|
final found = await client.search(q);
|
||||||
|
final match = found.where((h) => h.anilistId == a.anilistId).firstOrNull;
|
||||||
|
if (match != null) return (match: match, hits: found);
|
||||||
|
for (final h in found) {
|
||||||
|
if (hits.every((x) => x.anidbId != h.anidbId)) hits.add(h);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return (match: null, hits: hits);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The linked Jellyfin account AnimeFlow's series ids belong to: the one
|
||||||
|
/// AnimeFlow authenticates with, else the default.
|
||||||
|
JellyfinAccount? jellyfinAccountFor(JellyfinAccounts accounts, AnimeFlowClient? flow) {
|
||||||
|
if (flow != null) {
|
||||||
|
final token = AnimeFlowClient.tokenFor(accounts.accounts, flow.baseUrl);
|
||||||
|
final a = accounts.accounts.where((a) => token != null && a.token == token).firstOrNull;
|
||||||
|
if (a != null) return a;
|
||||||
|
}
|
||||||
|
return accounts.defaultAccount;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The episodes Jellyfin has of [jellyfinSeriesId] (numbers, premiere
|
||||||
|
/// date, this user's watched state), seen by the account AnimeFlow's ids
|
||||||
|
/// belong to ([jellyfinAccountFor]): the user's own; null without a
|
||||||
|
/// linked account. One request per series, memoised a few minutes
|
||||||
|
/// ([JellyfinAccounts.cached]; a stop report drops it,
|
||||||
|
/// [JellyfinAccounts.watched]).
|
||||||
|
Future<List<JellyfinEpisodeRef>?> jellyfinScheduleEpisodes(
|
||||||
|
JellyfinAccounts accounts,
|
||||||
|
AnimeFlowClient? flow,
|
||||||
|
String jellyfinSeriesId,
|
||||||
|
) async {
|
||||||
|
await accounts.ensureLoaded(validate: false);
|
||||||
|
final account = jellyfinAccountFor(accounts, flow);
|
||||||
|
final client = account == null ? null : accounts.clientFor(account.serverId);
|
||||||
|
if (account == null || client == null) return null;
|
||||||
|
return accounts.cached(
|
||||||
|
account.serverId,
|
||||||
|
'schedule-episodes:$jellyfinSeriesId',
|
||||||
|
() async => [
|
||||||
|
for (final x in await client.episodes(jellyfinSeriesId))
|
||||||
|
if (x.parentIndexNumber != null && x.indexNumber != null)
|
||||||
|
JellyfinEpisodeRef(
|
||||||
|
x.parentIndexNumber!,
|
||||||
|
x.indexNumber!,
|
||||||
|
premiere: x.premiereDate,
|
||||||
|
watch: EpisodeWatch(played: x.userData.played, progress: x.userData.played ? 0 : progressOf(x)),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The Jellyfin episode of an available [e] as a media pick. Throws
|
||||||
|
/// [ScheduleActionException] (or a client error) when it cannot be found.
|
||||||
|
Future<JellyfinMedia> resolveJellyfinEpisode(JellyfinAccounts accounts, AnimeFlowClient? flow, ScheduleEntry e) async {
|
||||||
|
final seriesId = e.jellyfinSeriesId;
|
||||||
|
if (seriesId == null) throw const ScheduleActionException('This series is not on Jellyfin yet');
|
||||||
|
await accounts.ensureLoaded(validate: false);
|
||||||
|
final account = jellyfinAccountFor(accounts, flow);
|
||||||
|
final client = account == null ? null : accounts.clientFor(account.serverId);
|
||||||
|
if (account == null || client == null) {
|
||||||
|
throw const ScheduleActionException('Link the Jellyfin server first (Settings)');
|
||||||
|
}
|
||||||
|
final n = await flowNumbering(flow, e);
|
||||||
|
final List<JellyfinItem> eps;
|
||||||
|
try {
|
||||||
|
eps = await client.episodes(seriesId);
|
||||||
|
} on JellyfinException catch (err) {
|
||||||
|
if (err.isUnauthorized) accounts.markExpired(account.serverId);
|
||||||
|
rethrow;
|
||||||
|
}
|
||||||
|
final a = e.airing;
|
||||||
|
final item =
|
||||||
|
eps.where((x) => x.parentIndexNumber == n.season && x.indexNumber == n.episode).firstOrNull ??
|
||||||
|
eps.where((x) => x.premiereDate != null && sameAirDay(x.premiereDate!, a.airingAt)).singleOrNull ??
|
||||||
|
eps.where((x) => x.indexNumber == a.episode).singleOrNull;
|
||||||
|
if (item == null) {
|
||||||
|
throw ScheduleActionException('Episode ${a.episode} of ${a.title} is not on Jellyfin yet');
|
||||||
|
}
|
||||||
|
return pickFor(account, item);
|
||||||
|
}
|
||||||
@@ -0,0 +1,457 @@
|
|||||||
|
import 'package:flutter/gestures.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../schedule_model.dart';
|
||||||
|
|
||||||
|
// One day of the Schedule board and its airing cards: cover poster on the
|
||||||
|
// left (air time on it, download progress or this user's watch progress
|
||||||
|
// under it, a check once watched), title, episode and status on the
|
||||||
|
// right, one full-width action below. Compact mode is a slim row.
|
||||||
|
|
||||||
|
/// What a card's action does, decided by the page.
|
||||||
|
enum CardAction {
|
||||||
|
none,
|
||||||
|
putUp,
|
||||||
|
|
||||||
|
/// Available, nobody else watching (offline or solo): plays it here.
|
||||||
|
play,
|
||||||
|
request,
|
||||||
|
requestSeries,
|
||||||
|
requested,
|
||||||
|
}
|
||||||
|
|
||||||
|
String _two(int n) => n.toString().padLeft(2, '0');
|
||||||
|
|
||||||
|
String clockText(DateTime t) {
|
||||||
|
final l = t.toLocal();
|
||||||
|
return '${_two(l.hour)}:${_two(l.minute)}';
|
||||||
|
}
|
||||||
|
|
||||||
|
String countdownText(DateTime at, DateTime now) {
|
||||||
|
final d = at.difference(now);
|
||||||
|
if (d.isNegative) return 'aired';
|
||||||
|
if (d.inDays > 0) return 'in ${d.inDays}d ${d.inHours % 24}h';
|
||||||
|
if (d.inHours > 0) return 'in ${d.inHours}h ${d.inMinutes % 60}m';
|
||||||
|
return 'in ${d.inMinutes}m';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Aired, tracked, no release yet: AnimeFlow downloads it by itself.
|
||||||
|
bool _waiting(ScheduleEntry e, DateTime now) =>
|
||||||
|
e.status == ScheduleStatus.missing ||
|
||||||
|
(e.status == ScheduleStatus.upcoming && e.tracked && !e.airing.airingAt.isAfter(now));
|
||||||
|
|
||||||
|
const waitingHint = 'Aired in Japan; downloads automatically when a release appears';
|
||||||
|
|
||||||
|
String _ago(DateTime t, DateTime now) {
|
||||||
|
final m = now.difference(t).inMinutes;
|
||||||
|
return m < 1 ? 'just now' : m < 60 ? '$m min ago' : '${m ~/ 60} h ago';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Status line: text, colour, icon.
|
||||||
|
(String, Color, IconData) statusBadge(ScheduleEntry e, DateTime now) => _waiting(e, now)
|
||||||
|
? e.reason != null
|
||||||
|
// Releases exist but AnimeFlow rejected them (the hint says why).
|
||||||
|
? ('release rejected', Colors.orangeAccent, Icons.block)
|
||||||
|
: (
|
||||||
|
e.lastSearchedAt == null ? 'waiting for release' : 'waiting · searched ${_ago(e.lastSearchedAt!, now)}',
|
||||||
|
Colors.amber.shade200,
|
||||||
|
Icons.hourglass_top,
|
||||||
|
)
|
||||||
|
: switch (e.status) {
|
||||||
|
ScheduleStatus.available => ('on Jellyfin', Colors.greenAccent, Icons.check_circle),
|
||||||
|
ScheduleStatus.downloading => (
|
||||||
|
e.progress == null ? 'downloading' : 'downloading ${(e.progress! * 100).round()}%',
|
||||||
|
Colors.lightBlueAccent,
|
||||||
|
Icons.downloading,
|
||||||
|
),
|
||||||
|
ScheduleStatus.upcoming => (countdownText(e.airing.airingAt, now), Colors.amber, Icons.schedule),
|
||||||
|
ScheduleStatus.missing => ('waiting for release', Colors.amber.shade200, Icons.hourglass_top),
|
||||||
|
ScheduleStatus.failed => (
|
||||||
|
'failed${e.reason == null ? '' : ' · ${e.reason}'}',
|
||||||
|
Colors.redAccent,
|
||||||
|
Icons.error_outline,
|
||||||
|
),
|
||||||
|
ScheduleStatus.unmonitored => ('not monitored', Colors.grey, Icons.visibility_off_outlined),
|
||||||
|
ScheduleStatus.notTracked => ('not in AnimeFlow', Colors.grey, Icons.public),
|
||||||
|
ScheduleStatus.inLibrary => ('on Jellyfin', Colors.greenAccent, Icons.video_library_outlined),
|
||||||
|
ScheduleStatus.notOnJellyfin => ('aired · not on Jellyfin yet', Colors.grey, Icons.hourglass_empty),
|
||||||
|
ScheduleStatus.aired => ('aired', Colors.grey, Icons.done),
|
||||||
|
};
|
||||||
|
|
||||||
|
/// What the status line means, when its text alone does not say.
|
||||||
|
String? statusHint(ScheduleEntry e, DateTime now) => !_waiting(e, now)
|
||||||
|
? null
|
||||||
|
: e.reason != null
|
||||||
|
? '${e.reason}${e.lastSearchedAt == null ? '' : ' · searched ${_ago(e.lastSearchedAt!, now)}'}'
|
||||||
|
: waitingHint;
|
||||||
|
|
||||||
|
class DayColumn extends StatelessWidget {
|
||||||
|
final DateTime day;
|
||||||
|
final bool today, past;
|
||||||
|
final List<Widget> cards;
|
||||||
|
final bool compact;
|
||||||
|
const DayColumn({
|
||||||
|
super.key,
|
||||||
|
required this.day,
|
||||||
|
required this.today,
|
||||||
|
required this.past,
|
||||||
|
required this.cards,
|
||||||
|
required this.compact,
|
||||||
|
});
|
||||||
|
|
||||||
|
static const _wd = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: today ? scheme.primary.withValues(alpha: 0.06) : scheme.surfaceContainerLow.withValues(alpha: 0.5),
|
||||||
|
borderRadius: BorderRadius.circular(14),
|
||||||
|
border: today ? Border.all(color: scheme.primary.withValues(alpha: 0.5)) : null,
|
||||||
|
),
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(12, 10, 12, 8),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
today ? 'Today' : _wd[day.weekday - 1],
|
||||||
|
style: TextStyle(fontWeight: FontWeight.w700, color: today ? scheme.primary : null),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Text('${day.day}.${day.month}.', style: TextStyle(color: scheme.onSurfaceVariant)),
|
||||||
|
const Spacer(),
|
||||||
|
if (cards.isNotEmpty)
|
||||||
|
Text('${cards.length}', style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Opacity(
|
||||||
|
opacity: past ? 0.85 : 1,
|
||||||
|
child: cards.isEmpty
|
||||||
|
? Center(
|
||||||
|
child: Text('—', style: TextStyle(color: scheme.onSurfaceVariant)),
|
||||||
|
)
|
||||||
|
// The board's mouse drag is sideways only: a column scrolls by
|
||||||
|
// wheel (or touch), never by dragging the mouse.
|
||||||
|
: ScrollConfiguration(
|
||||||
|
behavior: ScrollConfiguration.of(context)
|
||||||
|
.copyWith(dragDevices: {...PointerDeviceKind.values}..remove(PointerDeviceKind.mouse)),
|
||||||
|
child: ListView.separated(
|
||||||
|
padding: const EdgeInsets.fromLTRB(8, 0, 8, 10),
|
||||||
|
itemCount: cards.length,
|
||||||
|
separatorBuilder: (_, _) => SizedBox(height: compact ? 6 : 10),
|
||||||
|
itemBuilder: (context, i) => cards[i],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class AiringCard extends StatelessWidget {
|
||||||
|
final ScheduleEntry entry;
|
||||||
|
final DateTime now;
|
||||||
|
final bool compact;
|
||||||
|
final CardAction action;
|
||||||
|
|
||||||
|
/// Why [action] is disabled (no request scope, not on Jellyfin, ...);
|
||||||
|
/// null = enabled.
|
||||||
|
final String? disabledHint;
|
||||||
|
|
||||||
|
/// A call for this card is in flight.
|
||||||
|
final bool busy;
|
||||||
|
final VoidCallback onAction;
|
||||||
|
|
||||||
|
/// Right-click ([context]: the card): the page's menu; null: none.
|
||||||
|
final void Function(BuildContext context)? onMenu;
|
||||||
|
|
||||||
|
const AiringCard({
|
||||||
|
super.key,
|
||||||
|
required this.entry,
|
||||||
|
required this.now,
|
||||||
|
required this.compact,
|
||||||
|
required this.action,
|
||||||
|
required this.onAction,
|
||||||
|
this.disabledHint,
|
||||||
|
this.busy = false,
|
||||||
|
this.onMenu,
|
||||||
|
});
|
||||||
|
|
||||||
|
String get _id => '${entry.airing.anilistId}-${entry.airing.episode}';
|
||||||
|
|
||||||
|
Widget _image(String? url, Widget fallback) =>
|
||||||
|
url == null ? fallback : Image.network(url, fit: BoxFit.cover, errorBuilder: (_, _, _) => fallback);
|
||||||
|
|
||||||
|
static Widget _hinted(String? hint, Widget child) => hint == null ? child : Tooltip(message: hint, child: child);
|
||||||
|
|
||||||
|
bool get _played => entry.watch?.played ?? false;
|
||||||
|
|
||||||
|
/// A watched episode's cover is a little dimmer.
|
||||||
|
Widget _dimmed(Widget cover) => _played ? Opacity(opacity: 0.6, child: cover) : cover;
|
||||||
|
|
||||||
|
/// This user's state of the episode on Jellyfin: the library cards'
|
||||||
|
/// green check once watched, else a thin bar to the resume point.
|
||||||
|
List<Widget> _watchMarks({bool small = false}) {
|
||||||
|
final w = entry.watch;
|
||||||
|
if (w == null) return const [];
|
||||||
|
if (w.played) {
|
||||||
|
final size = small ? 16.0 : 22.0;
|
||||||
|
return [
|
||||||
|
Positioned(
|
||||||
|
top: small ? 2 : 4,
|
||||||
|
right: small ? 2 : 4,
|
||||||
|
child: Tooltip(
|
||||||
|
message: 'Watched',
|
||||||
|
child: Container(
|
||||||
|
key: ValueKey('watched-$_id'),
|
||||||
|
constraints: BoxConstraints(minWidth: size, minHeight: size),
|
||||||
|
alignment: Alignment.center,
|
||||||
|
decoration: BoxDecoration(color: const Color(0xCC1B5E20), borderRadius: BorderRadius.circular(size / 2)),
|
||||||
|
child: Icon(Icons.check, size: small ? 11 : 14, color: Colors.white),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
if (w.progress <= 0) return const [];
|
||||||
|
return [
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
child: Tooltip(
|
||||||
|
message: '${(w.progress * 100).round()}% watched',
|
||||||
|
child: LinearProgressIndicator(
|
||||||
|
key: ValueKey('watch-progress-$_id'),
|
||||||
|
value: w.progress,
|
||||||
|
minHeight: small ? 2 : 3,
|
||||||
|
backgroundColor: Colors.black54,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget? _button(BuildContext context) {
|
||||||
|
final enabled = disabledHint == null && !busy;
|
||||||
|
final spinner = const SizedBox(width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2));
|
||||||
|
Widget? b = switch (action) {
|
||||||
|
CardAction.none => null,
|
||||||
|
CardAction.putUp || CardAction.play => FilledButton.tonalIcon(
|
||||||
|
onPressed: enabled ? onAction : null,
|
||||||
|
icon: busy ? spinner : const Icon(Icons.play_arrow, size: 18),
|
||||||
|
label: Text(action == CardAction.play ? 'Play' : 'Put it up'),
|
||||||
|
),
|
||||||
|
CardAction.request || CardAction.requestSeries => OutlinedButton.icon(
|
||||||
|
onPressed: enabled ? onAction : null,
|
||||||
|
icon: busy ? spinner : const Icon(Icons.download, size: 18),
|
||||||
|
label: Text(action == CardAction.request ? 'Request' : 'Request series'),
|
||||||
|
),
|
||||||
|
CardAction.requested => const OutlinedButton(onPressed: null, child: Text('Requested')),
|
||||||
|
};
|
||||||
|
if (b == null) return null;
|
||||||
|
b = KeyedSubtree(key: ValueKey('action-$_id'), child: b);
|
||||||
|
return disabledHint == null ? b : Tooltip(message: disabledHint!, child: b);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final a = entry.airing;
|
||||||
|
final (label, color, icon) = statusBadge(entry, now);
|
||||||
|
final hint = statusHint(entry, now);
|
||||||
|
final time = clockText(a.airingAt);
|
||||||
|
final tintColor = a.color ?? Colors.blueGrey;
|
||||||
|
final tint = DecoratedBox(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.topLeft,
|
||||||
|
end: Alignment.bottomRight,
|
||||||
|
colors: [tintColor.withValues(alpha: 0.85), tintColor.withValues(alpha: 0.35)],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
final tap = (action == CardAction.putUp || action == CardAction.play) && disabledHint == null && !busy
|
||||||
|
? onAction
|
||||||
|
: null;
|
||||||
|
final onMenu = this.onMenu;
|
||||||
|
final menu = onMenu == null || busy ? null : () => onMenu(context);
|
||||||
|
if (compact) {
|
||||||
|
final requestable = action == CardAction.request || action == CardAction.requestSeries;
|
||||||
|
return Material(
|
||||||
|
key: ValueKey('card-$_id'),
|
||||||
|
color: scheme.surfaceContainer,
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
child: InkWell(
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
onTap: tap,
|
||||||
|
onSecondaryTap: menu,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(6),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 34,
|
||||||
|
height: 48,
|
||||||
|
child: Stack(
|
||||||
|
fit: StackFit.expand,
|
||||||
|
children: [_dimmed(_image(a.cover, tint)), ..._watchMarks(small: true)],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
a.title,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: const TextStyle(fontWeight: FontWeight.w600, fontSize: 13),
|
||||||
|
),
|
||||||
|
Text('$time · E${a.episode}', style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 11)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (requestable)
|
||||||
|
Tooltip(
|
||||||
|
message: disabledHint ?? (action == CardAction.request ? 'Request' : 'Request series'),
|
||||||
|
child: IconButton(
|
||||||
|
key: ValueKey('action-$_id'),
|
||||||
|
onPressed: disabledHint == null && !busy ? onAction : null,
|
||||||
|
visualDensity: VisualDensity.compact,
|
||||||
|
iconSize: 18,
|
||||||
|
icon: Icon(Icons.download, color: color),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
else
|
||||||
|
Tooltip(
|
||||||
|
message: hint == null ? label : '$label: $hint',
|
||||||
|
child: Icon(icon, size: 16, color: color),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final button = _button(context);
|
||||||
|
// The cover poster leads: it is what people recognise at a glance.
|
||||||
|
return Material(
|
||||||
|
key: ValueKey('card-$_id'),
|
||||||
|
color: scheme.surfaceContainer,
|
||||||
|
borderRadius: BorderRadius.circular(12),
|
||||||
|
clipBehavior: Clip.antiAlias,
|
||||||
|
child: InkWell(
|
||||||
|
onTap: tap,
|
||||||
|
onSecondaryTap: menu,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(8),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(8),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 84,
|
||||||
|
height: 120,
|
||||||
|
child: Stack(
|
||||||
|
fit: StackFit.expand,
|
||||||
|
children: [
|
||||||
|
_dimmed(_image(a.cover, tint)),
|
||||||
|
Positioned(
|
||||||
|
left: 4,
|
||||||
|
top: 4,
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 5, vertical: 1),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.black.withValues(alpha: 0.7),
|
||||||
|
borderRadius: BorderRadius.circular(5),
|
||||||
|
),
|
||||||
|
child: Text(
|
||||||
|
time,
|
||||||
|
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.w700, fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
..._watchMarks(),
|
||||||
|
if (entry.status == ScheduleStatus.downloading)
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
child: LinearProgressIndicator(
|
||||||
|
value: entry.progress,
|
||||||
|
minHeight: 3,
|
||||||
|
color: Colors.lightBlueAccent,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: SizedBox(
|
||||||
|
height: 120,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
a.title,
|
||||||
|
maxLines: 3,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: const TextStyle(fontWeight: FontWeight.w600, height: 1.25),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Text(
|
||||||
|
'Episode ${a.episode}',
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12),
|
||||||
|
),
|
||||||
|
const Spacer(),
|
||||||
|
_hinted(
|
||||||
|
hint,
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(icon, size: 14, color: color),
|
||||||
|
const SizedBox(width: 4),
|
||||||
|
Expanded(
|
||||||
|
child: Text(
|
||||||
|
label,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: color, fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
if (button != null) ...[const SizedBox(height: 8), SizedBox(width: double.infinity, child: button)],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,607 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../../jellyfin/accounts.dart';
|
||||||
|
import '../../screens/home/picked_media.dart';
|
||||||
|
import '../../shell/avatar.dart';
|
||||||
|
import '../../shell/motion.dart';
|
||||||
|
import '../../widgets/app_menu.dart';
|
||||||
|
import '../anilist.dart';
|
||||||
|
import '../animeflow.dart';
|
||||||
|
import '../schedule_model.dart';
|
||||||
|
import 'requests_sheet.dart';
|
||||||
|
import 'schedule_actions.dart';
|
||||||
|
import 'schedule_card.dart';
|
||||||
|
|
||||||
|
// The Schedule tab: one column per day from last week's Monday to four
|
||||||
|
// weeks out (AniList), each airing with what AnimeFlow has of it, and the
|
||||||
|
// one thing to do about it (put it up, request it; right-click an
|
||||||
|
// available one to queue it). Refreshes every minute while visible; ETags
|
||||||
|
// keep that cheap. Episodes on Jellyfin show this user's watched state,
|
||||||
|
// reloaded after a playback stops (JellyfinAccounts.watched).
|
||||||
|
|
||||||
|
enum ScheduleFilter { jellyfin, all }
|
||||||
|
|
||||||
|
class SchedulePage extends StatefulWidget {
|
||||||
|
/// Nobody else watches (offline or solo): available episodes say Play
|
||||||
|
/// (offline that starts a solo session).
|
||||||
|
final bool solo;
|
||||||
|
|
||||||
|
/// Puts a Jellyfin episode up in the server; returns an error to show.
|
||||||
|
final Future<String?> Function(JellyfinMedia pick) onPutUp;
|
||||||
|
|
||||||
|
/// Adds an episode to Up next; null: no server, the cards have no menu.
|
||||||
|
final AddToQueue? onAddToQueue;
|
||||||
|
final void Function(String message) onToast;
|
||||||
|
|
||||||
|
/// Null = the page makes (and closes) its own.
|
||||||
|
final ScheduleRepository? repository;
|
||||||
|
|
||||||
|
/// Linked Jellyfin servers for Put it up; null = [JellyfinAccounts.instance].
|
||||||
|
final JellyfinAccounts? accounts;
|
||||||
|
|
||||||
|
const SchedulePage({
|
||||||
|
super.key,
|
||||||
|
this.solo = false,
|
||||||
|
required this.onPutUp,
|
||||||
|
this.onAddToQueue,
|
||||||
|
required this.onToast,
|
||||||
|
this.repository,
|
||||||
|
this.accounts,
|
||||||
|
});
|
||||||
|
|
||||||
|
static const columnWidth = 252.0;
|
||||||
|
static const columnGap = 12.0;
|
||||||
|
static const refreshEvery = Duration(seconds: 60);
|
||||||
|
|
||||||
|
/// "All airing" hides entries below this AniList popularity unless
|
||||||
|
/// "Niche too" is on (tracked ones always show).
|
||||||
|
static const nicheBelow = 5000;
|
||||||
|
static const sheetWidth = 360.0;
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<SchedulePage> createState() => _SchedulePageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _SchedulePageState extends State<SchedulePage> {
|
||||||
|
late final ScheduleRepository _repo;
|
||||||
|
late final bool _ownsRepo;
|
||||||
|
ScheduleSnapshot? _snap;
|
||||||
|
bool _refreshing = false;
|
||||||
|
int _gen = 0;
|
||||||
|
Timer? _timer;
|
||||||
|
StreamSubscription<String>? _watchedSub;
|
||||||
|
final _scroll = ScrollController();
|
||||||
|
bool _jumped = false;
|
||||||
|
|
||||||
|
ScheduleFilter _filter = ScheduleFilter.jellyfin;
|
||||||
|
bool _compact = false;
|
||||||
|
bool _niche = false;
|
||||||
|
bool _sheet = false;
|
||||||
|
|
||||||
|
/// The sheet stays built while it slides out.
|
||||||
|
bool _sheetBuilt = false;
|
||||||
|
|
||||||
|
/// Requested in this run: "anilistId#episode" or "series:anilistId".
|
||||||
|
final _requested = <String>{};
|
||||||
|
|
||||||
|
/// Cards with a call in flight (same keys as [_requested], "play:...").
|
||||||
|
final _busy = <String>{};
|
||||||
|
|
||||||
|
List<AnimeFlowRequest>? _requests;
|
||||||
|
String? _requestsError;
|
||||||
|
final _reqBusy = <int>{};
|
||||||
|
|
||||||
|
JellyfinAccounts get _accounts => widget.accounts ?? JellyfinAccounts.instance;
|
||||||
|
AnimeFlowClient? get _flow => _repo.animeFlow;
|
||||||
|
AnimeFlowMe? get _me => _snap?.me;
|
||||||
|
bool get _owner => _me?.can(AnimeFlowScope.manage) ?? false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_ownsRepo = widget.repository == null;
|
||||||
|
_repo = widget.repository ?? _ownRepo();
|
||||||
|
_load();
|
||||||
|
_timer = Timer.periodic(SchedulePage.refreshEvery, (_) {
|
||||||
|
if (mounted && !_refreshing && TickerMode.valuesOf(context).enabled) _load();
|
||||||
|
});
|
||||||
|
// Back from watching: the cards' watched marks follow (the stop report
|
||||||
|
// already dropped the cached episode lists).
|
||||||
|
_watchedSub = _accounts.watched.listen((_) {
|
||||||
|
if (mounted) _load();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ScheduleRepository _ownRepo() {
|
||||||
|
final flow = AnimeFlowClient.fromAccounts(_accounts);
|
||||||
|
return ScheduleRepository(
|
||||||
|
aniList: AniListClient(),
|
||||||
|
animeFlow: flow,
|
||||||
|
jellyfinEpisodes: (id) => jellyfinScheduleEpisodes(_accounts, flow, id),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_timer?.cancel();
|
||||||
|
_watchedSub?.cancel();
|
||||||
|
_scroll.dispose();
|
||||||
|
if (_ownsRepo) {
|
||||||
|
_repo.aniList.close();
|
||||||
|
_repo.animeFlow?.close();
|
||||||
|
}
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _toast(String s) {
|
||||||
|
if (mounted) widget.onToast(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _load({bool force = false}) async {
|
||||||
|
final gen = ++_gen;
|
||||||
|
if (_snap != null) setState(() => _refreshing = true);
|
||||||
|
final snap = await _repo.load(force: force);
|
||||||
|
if (!mounted || gen != _gen) return;
|
||||||
|
final first = _snap == null;
|
||||||
|
setState(() {
|
||||||
|
_snap = snap;
|
||||||
|
_refreshing = false;
|
||||||
|
// Without AnimeFlow nothing is "on Jellyfin": start on everything.
|
||||||
|
if (first && !snap.hasAnimeFlow) _filter = ScheduleFilter.all;
|
||||||
|
});
|
||||||
|
if (!_jumped && snap.entries.isNotEmpty) {
|
||||||
|
_jumped = true;
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) => _jumpToday());
|
||||||
|
}
|
||||||
|
await _loadRequests();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _loadRequests() async {
|
||||||
|
final c = _flow, me = _me;
|
||||||
|
if (c == null || me == null) {
|
||||||
|
if (_requests != null || _requestsError != null) {
|
||||||
|
setState(() {
|
||||||
|
_requests = null;
|
||||||
|
_requestsError = null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
final reqs = await c.requests(all: me.can(AnimeFlowScope.manage));
|
||||||
|
if (mounted) {
|
||||||
|
setState(() {
|
||||||
|
_requests = reqs;
|
||||||
|
_requestsError = null;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
if (mounted) setState(() => _requestsError = friendlyError(e));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------- layout
|
||||||
|
|
||||||
|
int _todayIndex(DateTime from) {
|
||||||
|
final now = DateTime.now();
|
||||||
|
final today = DateTime(now.year, now.month, now.day);
|
||||||
|
final f = DateTime(from.year, from.month, from.day);
|
||||||
|
return (today.difference(f).inHours / 24).round();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _jumpToday({bool animate = false}) {
|
||||||
|
final snap = _snap;
|
||||||
|
if (!_scroll.hasClients || snap == null) return;
|
||||||
|
final i = _todayIndex(snap.from.toLocal());
|
||||||
|
final x = (i * (SchedulePage.columnWidth + SchedulePage.columnGap))
|
||||||
|
.clamp(0.0, _scroll.position.maxScrollExtent)
|
||||||
|
.toDouble();
|
||||||
|
animate ? _scroll.animateTo(x, duration: easeTime, curve: ease) : _scroll.jumpTo(x);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool _shows(ScheduleEntry e) => switch (_filter) {
|
||||||
|
ScheduleFilter.jellyfin => e.tracked || e.onJellyfin,
|
||||||
|
ScheduleFilter.all => _niche || e.tracked || e.airing.popularity >= SchedulePage.nicheBelow,
|
||||||
|
};
|
||||||
|
|
||||||
|
static String _key(ScheduleEntry e) =>
|
||||||
|
e.tracked ? '${e.airing.anilistId}#${e.airing.episode}' : 'series:${e.airing.anilistId}';
|
||||||
|
|
||||||
|
static const _active = {RequestStatus.pending, RequestStatus.approved, RequestStatus.searching};
|
||||||
|
|
||||||
|
bool _isRequested(ScheduleEntry e) {
|
||||||
|
if (_requested.contains(_key(e))) return true;
|
||||||
|
final a = e.airing;
|
||||||
|
for (final r in _requests ?? const <AnimeFlowRequest>[]) {
|
||||||
|
if (!_active.contains(r.status)) continue;
|
||||||
|
if (e.tracked) {
|
||||||
|
if (r.kind == RequestKind.episode && r.seriesId == e.seriesId && r.episode == a.episode) return true;
|
||||||
|
if (r.kind == RequestKind.season && r.seriesId == e.seriesId && r.season == e.season) return true;
|
||||||
|
} else if (r.kind == RequestKind.series && (r.title == a.title || r.title == a.titleRomaji)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
(CardAction, String?) _actionFor(ScheduleEntry e) {
|
||||||
|
if (e.status == ScheduleStatus.available || e.status == ScheduleStatus.inLibrary) {
|
||||||
|
final put = widget.solo ? CardAction.play : CardAction.putUp;
|
||||||
|
if (e.jellyfinSeriesId == null) return (put, 'Not linked to a Jellyfin series yet');
|
||||||
|
return (put, null);
|
||||||
|
}
|
||||||
|
final me = _me;
|
||||||
|
final CardAction kind;
|
||||||
|
if (e.tracked) {
|
||||||
|
// Only an unmonitored episode is worth asking for: AnimeFlow grabs
|
||||||
|
// a missing one (no release yet) by itself once a release appears,
|
||||||
|
// and retries a failed one.
|
||||||
|
kind = e.status == ScheduleStatus.unmonitored ? CardAction.request : CardAction.none;
|
||||||
|
} else {
|
||||||
|
// On Jellyfin already (owner added it by hand): nothing to request.
|
||||||
|
kind = me != null && !e.onJellyfin ? CardAction.requestSeries : CardAction.none;
|
||||||
|
}
|
||||||
|
if (kind == CardAction.none) return (kind, null);
|
||||||
|
if (_isRequested(e)) return (CardAction.requested, null);
|
||||||
|
if (me == null || !me.can(AnimeFlowScope.request)) {
|
||||||
|
return (kind, 'Requests need the owner to allow them for you on AnimeFlow');
|
||||||
|
}
|
||||||
|
return (kind, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------- actions
|
||||||
|
|
||||||
|
Future<void> _onAction(ScheduleEntry e, CardAction action) async {
|
||||||
|
switch (action) {
|
||||||
|
case CardAction.putUp:
|
||||||
|
case CardAction.play:
|
||||||
|
return _putUp(e);
|
||||||
|
case CardAction.request:
|
||||||
|
case CardAction.requestSeries:
|
||||||
|
return _request(e);
|
||||||
|
default:
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _putUp(ScheduleEntry e) async {
|
||||||
|
final key = 'play:${_key(e)}';
|
||||||
|
if (_busy.contains(key)) return;
|
||||||
|
setState(() => _busy.add(key));
|
||||||
|
try {
|
||||||
|
final pick = await resolveJellyfinEpisode(_accounts, _flow, e);
|
||||||
|
final err = await widget.onPutUp(pick);
|
||||||
|
if (err != null) _toast(err);
|
||||||
|
} catch (err) {
|
||||||
|
_toast(friendlyError(err));
|
||||||
|
} finally {
|
||||||
|
if (mounted) setState(() => _busy.remove(key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Right-click on an available episode ([context]: its card): Put it
|
||||||
|
/// up, Add to queue, Play next.
|
||||||
|
Future<void> _menu(BuildContext context, ScheduleEntry e) async {
|
||||||
|
final add = widget.onAddToQueue;
|
||||||
|
if (add == null) return;
|
||||||
|
final pick = await showAppMenu<int>(context, items: [
|
||||||
|
AppMenuItem(value: 0, label: widget.solo ? 'Play' : 'Put it up'),
|
||||||
|
const AppMenuItem(value: 1, label: 'Add to queue'),
|
||||||
|
const AppMenuItem(value: 2, label: 'Play next'),
|
||||||
|
]);
|
||||||
|
if (pick == null || !mounted) return;
|
||||||
|
if (pick == 0) return _putUp(e);
|
||||||
|
final key = 'play:${_key(e)}';
|
||||||
|
if (_busy.contains(key)) return;
|
||||||
|
setState(() => _busy.add(key));
|
||||||
|
try {
|
||||||
|
final media = await resolveJellyfinEpisode(_accounts, _flow, e);
|
||||||
|
final err = await add(media, next: pick == 2);
|
||||||
|
if (err != null) _toast(err);
|
||||||
|
} catch (err) {
|
||||||
|
_toast(friendlyError(err));
|
||||||
|
} finally {
|
||||||
|
if (mounted) setState(() => _busy.remove(key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _request(ScheduleEntry e) async {
|
||||||
|
final c = _flow;
|
||||||
|
if (c == null) return;
|
||||||
|
final key = _key(e);
|
||||||
|
if (_busy.contains(key)) return;
|
||||||
|
setState(() => _busy.add(key));
|
||||||
|
final a = e.airing;
|
||||||
|
try {
|
||||||
|
final seriesId = e.seriesId;
|
||||||
|
if (e.tracked && seriesId != null) {
|
||||||
|
final n = await flowNumbering(c, e);
|
||||||
|
await c.requestEpisode(seriesId, n.season, n.episode);
|
||||||
|
_requested.add(key);
|
||||||
|
_toast('Requested ${a.title}, episode ${a.episode}');
|
||||||
|
} else {
|
||||||
|
final found = await findOnAniDb(c, a);
|
||||||
|
final hit = found.match ?? (mounted ? await _chooseHit(a, found.hits) : null);
|
||||||
|
if (hit == null) return;
|
||||||
|
await c.requestSeries(hit.anidbId);
|
||||||
|
_requested.add(key);
|
||||||
|
_toast('Requested ${hit.title}');
|
||||||
|
}
|
||||||
|
unawaited(_loadRequests());
|
||||||
|
} on AnimeFlowException catch (err) {
|
||||||
|
if (err.code == AnimeFlowErrorCode.alreadyRequested) _requested.add(key);
|
||||||
|
_toast(friendlyError(err));
|
||||||
|
} catch (err) {
|
||||||
|
_toast(friendlyError(err));
|
||||||
|
} finally {
|
||||||
|
if (mounted) setState(() => _busy.remove(key));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// No search hit has [a]'s AniList id: let the user pick one (or learn
|
||||||
|
/// that AniDB does not know it).
|
||||||
|
Future<AnimeFlowSearchHit?> _chooseHit(Airing a, List<AnimeFlowSearchHit> hits) => showDialog<AnimeFlowSearchHit>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return AlertDialog(
|
||||||
|
key: const ValueKey('anidb-choose'),
|
||||||
|
title: Text(hits.isEmpty ? 'Not found on AniDB' : 'Which one is "${a.title}"?'),
|
||||||
|
content: SizedBox(
|
||||||
|
width: 420,
|
||||||
|
child: hits.isEmpty
|
||||||
|
? Text(
|
||||||
|
'AnimeFlow can only add series AniDB knows, and its search found nothing for this title.',
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant),
|
||||||
|
)
|
||||||
|
: ListView(
|
||||||
|
shrinkWrap: true,
|
||||||
|
children: [
|
||||||
|
for (final h in hits)
|
||||||
|
ListTile(
|
||||||
|
key: ValueKey('anidb-${h.anidbId}'),
|
||||||
|
title: Text(h.title),
|
||||||
|
subtitle: Text('AniDB ${h.anidbId}${h.seriesId != null ? ' · already on AnimeFlow' : ''}'),
|
||||||
|
onTap: () => Navigator.of(context).pop(h),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
TextButton(onPressed: () => Navigator.of(context).pop(), child: Text(hits.isEmpty ? 'OK' : 'Cancel')),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
Future<void> _decide(AnimeFlowRequest r, {required bool approve}) async {
|
||||||
|
final c = _flow;
|
||||||
|
if (c == null || _reqBusy.contains(r.id)) return;
|
||||||
|
setState(() => _reqBusy.add(r.id));
|
||||||
|
try {
|
||||||
|
approve ? await c.approve(r.id) : await c.reject(r.id);
|
||||||
|
_toast(approve ? 'Retrying ${r.title}' : 'Declined ${r.title}');
|
||||||
|
await _loadRequests();
|
||||||
|
} catch (err) {
|
||||||
|
_toast(friendlyError(err));
|
||||||
|
} finally {
|
||||||
|
if (mounted) setState(() => _reqBusy.remove(r.id));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------- build
|
||||||
|
|
||||||
|
Widget _header(BuildContext context) {
|
||||||
|
final snap = _snap;
|
||||||
|
final me = _me;
|
||||||
|
final stale = snap?.aniListStaleSince;
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(20, 16, 20, 8),
|
||||||
|
child: Wrap(
|
||||||
|
spacing: 12,
|
||||||
|
runSpacing: 8,
|
||||||
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
|
children: [
|
||||||
|
SegmentedButton<ScheduleFilter>(
|
||||||
|
key: const ValueKey('schedule-filter'),
|
||||||
|
showSelectedIcon: false,
|
||||||
|
segments: const [
|
||||||
|
ButtonSegment(
|
||||||
|
value: ScheduleFilter.jellyfin,
|
||||||
|
icon: Icon(Icons.video_library_outlined),
|
||||||
|
label: Text('On Jellyfin'),
|
||||||
|
),
|
||||||
|
ButtonSegment(value: ScheduleFilter.all, icon: Icon(Icons.public), label: Text('All airing')),
|
||||||
|
],
|
||||||
|
selected: {_filter},
|
||||||
|
onSelectionChanged: (s) => setState(() => _filter = s.first),
|
||||||
|
),
|
||||||
|
FilterChip(
|
||||||
|
key: const ValueKey('schedule-compact'),
|
||||||
|
label: const Text('Compact'),
|
||||||
|
selected: _compact,
|
||||||
|
onSelected: (v) => setState(() => _compact = v),
|
||||||
|
),
|
||||||
|
if (_filter == ScheduleFilter.all)
|
||||||
|
FilterChip(
|
||||||
|
key: const ValueKey('schedule-niche'),
|
||||||
|
label: const Text('Niche too'),
|
||||||
|
selected: _niche,
|
||||||
|
onSelected: (v) => setState(() => _niche = v),
|
||||||
|
),
|
||||||
|
TextButton.icon(
|
||||||
|
key: const ValueKey('schedule-today'),
|
||||||
|
onPressed: () => _jumpToday(animate: true),
|
||||||
|
icon: const Icon(Icons.today, size: 18),
|
||||||
|
label: const Text('Today'),
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
key: const ValueKey('schedule-refresh'),
|
||||||
|
tooltip: 'Refresh',
|
||||||
|
onPressed: _refreshing || snap == null ? null : () => _load(force: true),
|
||||||
|
icon: _refreshing
|
||||||
|
? const SizedBox(width: 18, height: 18, child: CircularProgressIndicator(strokeWidth: 2))
|
||||||
|
: const Icon(Icons.refresh, size: 20),
|
||||||
|
),
|
||||||
|
Tooltip(
|
||||||
|
message: me == null ? (snap?.animeFlowError ?? 'AnimeFlow is not available') : '',
|
||||||
|
child: OutlinedButton.icon(
|
||||||
|
key: const ValueKey('schedule-requests'),
|
||||||
|
onPressed: me == null
|
||||||
|
? null
|
||||||
|
: () => setState(() {
|
||||||
|
_sheet = !_sheet;
|
||||||
|
if (_sheet) _sheetBuilt = true;
|
||||||
|
}),
|
||||||
|
icon: const Icon(Icons.inbox_outlined, size: 18),
|
||||||
|
label: Text(_owner ? 'Requests' : 'My requests'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (stale != null)
|
||||||
|
Pill(
|
||||||
|
key: const ValueKey('schedule-stale'),
|
||||||
|
'AniList busy · showing data from ${clockText(stale)}',
|
||||||
|
Colors.amber,
|
||||||
|
),
|
||||||
|
if (me != null)
|
||||||
|
Pill(
|
||||||
|
key: const ValueKey('schedule-animeflow'),
|
||||||
|
'AnimeFlow · ${me.name} · ${[for (final s in AnimeFlowScope.values)
|
||||||
|
if (me.can(s)) s.name].join(', ')}',
|
||||||
|
Colors.greenAccent.shade400,
|
||||||
|
)
|
||||||
|
else if (snap?.animeFlowError != null)
|
||||||
|
Pill(key: const ValueKey('schedule-animeflow'), snap!.animeFlowError!, Colors.orangeAccent),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _board(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final snap = _snap;
|
||||||
|
if (snap == null) return const Center(child: CircularProgressIndicator());
|
||||||
|
if (snap.aniListError != null && snap.entries.isEmpty) {
|
||||||
|
return Center(
|
||||||
|
key: const ValueKey('schedule-error'),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(24),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(Icons.cloud_off, color: scheme.error),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(
|
||||||
|
'Could not load the schedule: ${snap.aniListError}',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(color: scheme.error),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
FilledButton.tonal(
|
||||||
|
onPressed: _refreshing ? null : () => _load(force: true),
|
||||||
|
child: const Text('Try again'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final now = DateTime.now();
|
||||||
|
final today = DateTime(now.year, now.month, now.day);
|
||||||
|
final from = snap.from.toLocal();
|
||||||
|
final start = DateTime(from.year, from.month, from.day);
|
||||||
|
final to = snap.to.toLocal();
|
||||||
|
final count = (DateTime(to.year, to.month, to.day).difference(start).inHours / 24).round().clamp(1, 60);
|
||||||
|
final days = [for (var d = 0; d < count; d++) DateTime(start.year, start.month, start.day + d)];
|
||||||
|
final byDay = <DateTime, List<ScheduleEntry>>{};
|
||||||
|
for (final e in snap.entries) {
|
||||||
|
if (!_shows(e)) continue;
|
||||||
|
final l = e.airing.airingAt.toLocal();
|
||||||
|
(byDay[DateTime(l.year, l.month, l.day)] ??= []).add(e);
|
||||||
|
}
|
||||||
|
return HScroll(
|
||||||
|
controller: _scroll,
|
||||||
|
builder: (c) => ListView.separated(
|
||||||
|
key: const ValueKey('schedule-board'),
|
||||||
|
controller: c,
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
padding: const EdgeInsets.fromLTRB(20, 4, 20, 16),
|
||||||
|
itemCount: days.length,
|
||||||
|
separatorBuilder: (_, _) => const SizedBox(width: SchedulePage.columnGap),
|
||||||
|
itemBuilder: (context, i) {
|
||||||
|
final d = days[i];
|
||||||
|
final items = byDay[d] ?? const <ScheduleEntry>[];
|
||||||
|
return SizedBox(
|
||||||
|
key: ValueKey('day-${d.year}-${d.month}-${d.day}'),
|
||||||
|
width: SchedulePage.columnWidth,
|
||||||
|
child: DayColumn(
|
||||||
|
day: d,
|
||||||
|
today: d == today,
|
||||||
|
past: d.isBefore(today),
|
||||||
|
compact: _compact,
|
||||||
|
cards: [for (final e in items) _card(e, now)],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _card(ScheduleEntry e, DateTime now) {
|
||||||
|
final (action, hint) = _actionFor(e);
|
||||||
|
final busy = _busy.contains(action == CardAction.putUp || action == CardAction.play ? 'play:${_key(e)}' : _key(e));
|
||||||
|
return AiringCard(
|
||||||
|
entry: e,
|
||||||
|
now: now,
|
||||||
|
compact: _compact,
|
||||||
|
action: action,
|
||||||
|
disabledHint: hint,
|
||||||
|
busy: busy,
|
||||||
|
onAction: () => _onAction(e, action),
|
||||||
|
onMenu: widget.onAddToQueue != null && (action == CardAction.putUp || action == CardAction.play) && hint == null
|
||||||
|
? (context) => _menu(context, e)
|
||||||
|
: null,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
_header(context),
|
||||||
|
Expanded(child: _board(context)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
ClipRect(
|
||||||
|
child: AnimatedContainer(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
width: _sheet ? SchedulePage.sheetWidth : 0,
|
||||||
|
child: OverflowBox(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
minWidth: SchedulePage.sheetWidth,
|
||||||
|
maxWidth: SchedulePage.sheetWidth,
|
||||||
|
child: _sheetBuilt && _me != null
|
||||||
|
? RequestsSheet(
|
||||||
|
key: const ValueKey('requests-sheet'),
|
||||||
|
owner: _owner,
|
||||||
|
requests: _requests,
|
||||||
|
error: _requestsError,
|
||||||
|
selfName: _me?.name ?? '',
|
||||||
|
busy: _reqBusy,
|
||||||
|
onRetry: (r) => _decide(r, approve: true),
|
||||||
|
onDecline: (r) => _decide(r, approve: false),
|
||||||
|
onClose: () => setState(() => _sheet = false),
|
||||||
|
)
|
||||||
|
: const SizedBox.shrink(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,56 +1,34 @@
|
|||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
|
||||||
|
import '../../platform/app_log.dart';
|
||||||
|
import '../../shell/mark_problem.dart';
|
||||||
|
import '../../state/session_state.dart';
|
||||||
|
import '../../state/settings.dart';
|
||||||
import '../../update/update_controller.dart';
|
import '../../update/update_controller.dart';
|
||||||
import '../../update/updater.dart';
|
import '../../widgets/app_menu.dart';
|
||||||
|
import '../../widgets/copy_open.dart';
|
||||||
|
import 'settings_page.dart';
|
||||||
import 'ui.dart';
|
import 'ui.dart';
|
||||||
import 'update_indicator.dart';
|
import 'update_indicator.dart';
|
||||||
|
|
||||||
/// Opens [url] in the default browser (no url_launcher dependency).
|
/// Name, version, update state, the source link and the logs (Settings →
|
||||||
Future<bool> openInBrowser(String url) async {
|
/// About).
|
||||||
try {
|
class AboutPanel extends StatelessWidget {
|
||||||
final ProcessResult r;
|
|
||||||
if (Platform.isWindows) {
|
|
||||||
r = await Process.run('rundll32', ['url.dll,FileProtocolHandler', url]);
|
|
||||||
} else if (Platform.isMacOS) {
|
|
||||||
r = await Process.run('open', [url]);
|
|
||||||
} else {
|
|
||||||
r = await Process.run('xdg-open', [url]);
|
|
||||||
}
|
|
||||||
return r.exitCode == 0;
|
|
||||||
} catch (_) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class AboutPage extends StatelessWidget {
|
|
||||||
final UpdateController? updates;
|
final UpdateController? updates;
|
||||||
const AboutPage({super.key, this.updates});
|
const AboutPanel({super.key, this.updates});
|
||||||
|
|
||||||
Future<void> _open(BuildContext context) async {
|
|
||||||
final messenger = ScaffoldMessenger.maybeOf(context);
|
|
||||||
if (await openInBrowser(repoUrl)) return;
|
|
||||||
await Clipboard.setData(const ClipboardData(text: repoUrl));
|
|
||||||
messenger?.showSnackBar(
|
|
||||||
const SnackBar(content: Text('Could not open a browser — link copied')));
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final t = Theme.of(context).textTheme;
|
final t = Theme.of(context).textTheme;
|
||||||
return PageScroll(
|
return SettingsPanel(
|
||||||
maxWidth: 680,
|
title: 'About',
|
||||||
children: [
|
|
||||||
const PageTitle('About'),
|
|
||||||
Panel(
|
|
||||||
child: Column(
|
child: Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Text(appName, style: t.titleLarge),
|
Text(appName, style: t.titleLarge),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
SelectableText('Version $appVersion',
|
SelectableText('Version ${displayVersion()}',
|
||||||
style: t.bodyMedium?.copyWith(color: Colors.grey)),
|
style: t.bodyMedium?.copyWith(color: Colors.grey)),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 4),
|
||||||
UpdateStatusLine(controller: updates),
|
UpdateStatusLine(controller: updates),
|
||||||
@@ -59,22 +37,85 @@ class AboutPage extends StatelessWidget {
|
|||||||
children: [
|
children: [
|
||||||
Expanded(child: SelectableText(repoUrl, style: t.bodySmall)),
|
Expanded(child: SelectableText(repoUrl, style: t.bodySmall)),
|
||||||
IconButton(
|
IconButton(
|
||||||
tooltip: 'Copy link',
|
tooltip: ReuseText.copyLink,
|
||||||
icon: const Icon(Icons.copy, size: 18),
|
icon: const Icon(Icons.copy, size: 18),
|
||||||
onPressed: () =>
|
onPressed: () => copyToClipboard(repoUrl, done: 'Link copied'),
|
||||||
Clipboard.setData(const ClipboardData(text: repoUrl)),
|
|
||||||
),
|
),
|
||||||
FilledButton.tonalIcon(
|
FilledButton.tonalIcon(
|
||||||
onPressed: () => _open(context),
|
onPressed: () => openLink(repoUrl),
|
||||||
icon: const Icon(Icons.open_in_new, size: 18),
|
icon: const Icon(Icons.open_in_new, size: 18),
|
||||||
label: const Text('Source'),
|
label: const Text('Source'),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: kGap),
|
||||||
|
Text('Something went wrong? Copy diagnostics and send them to whoever helps you: '
|
||||||
|
'versions and the last hours of the log, passwords, tokens and cookies left out. '
|
||||||
|
'In a session it can add the server\'s session log, everyone\'s lines merged. '
|
||||||
|
'Mark a problem (Ctrl+Shift+B) when it happens so the spot is easy to find.',
|
||||||
|
style: t.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Wrap(
|
||||||
|
spacing: 8,
|
||||||
|
runSpacing: 8,
|
||||||
|
children: [
|
||||||
|
Builder(
|
||||||
|
builder: (context) => FilledButton.tonalIcon(
|
||||||
|
key: const ValueKey('copy-diagnostics'),
|
||||||
|
onPressed: () => _copyDiagnostics(context),
|
||||||
|
icon: const Icon(Icons.bug_report_outlined, size: 18),
|
||||||
|
label: const Text('Copy diagnostics'),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const MarkProblemButton(outlined: true),
|
||||||
|
OutlinedButton.icon(
|
||||||
|
onPressed: appLogDir == null ? null : () => _openLogs(),
|
||||||
|
icon: const Icon(Icons.folder_open, size: 18),
|
||||||
|
label: const Text('Open logs folder'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
SignalBuilder(
|
||||||
|
builder: (context) => SwitchListTile(
|
||||||
|
key: const ValueKey('share-diagnostics'),
|
||||||
|
contentPadding: EdgeInsets.zero,
|
||||||
|
title: const Text('Share diagnostics with the server'),
|
||||||
|
subtitle: const Text('In a session, this app\'s log goes to the server\'s session log, '
|
||||||
|
'merged with everyone\'s, so a problem can be read afterwards. Never chat; '
|
||||||
|
'passwords and tokens left out. Off: only a problem you mark is sent.'),
|
||||||
|
value: AppSettings.instance.shareDiagnostics.value,
|
||||||
|
onChanged: AppSettings.instance.setShareDiagnostics,
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
],
|
}
|
||||||
);
|
|
||||||
|
/// In a session it asks whether to add the server's session log.
|
||||||
|
static Future<void> _copyDiagnostics(BuildContext context) async {
|
||||||
|
var withServer = false;
|
||||||
|
if (SessionState.instance.route.peek() == AppRoute.session) {
|
||||||
|
final pick = await showAppMenu<bool>(context, items: const [
|
||||||
|
AppMenuItem(value: false, label: "This app's log"),
|
||||||
|
AppMenuItem(value: true, label: "This app's and the server's session log"),
|
||||||
|
]);
|
||||||
|
if (pick == null) return;
|
||||||
|
withServer = pick;
|
||||||
|
}
|
||||||
|
final text = await diagnosticsText(sessionLog: withServer);
|
||||||
|
final saved = await saveDiagnostics(text);
|
||||||
|
await copyToClipboard(text,
|
||||||
|
done: saved == null ? 'Diagnostics copied' : 'Diagnostics copied (also saved in the logs folder)');
|
||||||
|
}
|
||||||
|
|
||||||
|
static Future<void> _openLogs() async {
|
||||||
|
final dir = appLogDir;
|
||||||
|
if (dir == null) return;
|
||||||
|
// The file manager opens a folder path the way a browser opens a link.
|
||||||
|
if (!await openInBrowser(Uri.directory(dir).toString())) {
|
||||||
|
await copyToClipboard(dir, done: "Couldn't open it — folder path copied");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
import 'dart:io';
|
|
||||||
|
|
||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
import 'package:sync_relay_core/core.dart' show HelloMedia;
|
|
||||||
|
|
||||||
import '../../session/session_coordinator.dart';
|
import '../../session/session_coordinator.dart';
|
||||||
import '../../state/session_state.dart';
|
import '../../state/session_state.dart';
|
||||||
import '../../widgets/avatar_pipeline.dart';
|
import 'profile.dart';
|
||||||
import '../../widgets/media_input.dart';
|
|
||||||
|
|
||||||
/// What a card shows under its fields after a failed attempt.
|
/// What a card shows under its fields after a failed attempt.
|
||||||
class CardError {
|
class CardError {
|
||||||
@@ -15,7 +11,7 @@ class CardError {
|
|||||||
const CardError(this.title, this.message);
|
const CardError(this.title, this.message);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Host/Join submit state for the two Home cards. One attempt at a time;
|
/// Host/Join submit state for the strip's two connect cards. One attempt at a time;
|
||||||
/// [cancel] abandons it via [SessionState.cancelPending].
|
/// [cancel] abandons it via [SessionState.cancelPending].
|
||||||
class ConnectFlow extends ChangeNotifier {
|
class ConnectFlow extends ChangeNotifier {
|
||||||
ConnectFlow({SessionState? session}) : _session = session ?? SessionState.instance;
|
ConnectFlow({SessionState? session}) : _session = session ?? SessionState.instance;
|
||||||
@@ -27,9 +23,6 @@ class ConnectFlow extends ChangeNotifier {
|
|||||||
int _attempt = 0;
|
int _attempt = 0;
|
||||||
bool _disposed = false;
|
bool _disposed = false;
|
||||||
|
|
||||||
/// Set when an attempt ends in a kick, so Home shows the removal dialog.
|
|
||||||
void Function(String reason)? onKicked;
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
@@ -54,61 +47,38 @@ class ConnectFlow extends ChangeNotifier {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Validates and builds the params; throws [FormatException] with a
|
/// Validates and builds the params; throws [FormatException] with a
|
||||||
/// user-facing message.
|
/// user-facing message. [avatar] is the base64 picture (the profile's).
|
||||||
static Future<ConnectParams> buildParams(ConnectMode mode, ConnectForm f) async {
|
/// Hosting puts nothing up: what to watch is picked in the library.
|
||||||
|
static ConnectParams buildParams(ConnectMode mode, ConnectForm f, {String avatar = ''}) {
|
||||||
final rawPort = mode == ConnectMode.host ? f.hostPort : f.port;
|
final rawPort = mode == ConnectMode.host ? f.hostPort : f.port;
|
||||||
final port = int.tryParse(rawPort.trim());
|
final port = int.tryParse(rawPort.trim());
|
||||||
if (port == null || port <= 0 || port > 65535) {
|
if (port == null || port <= 0 || port > 65535) {
|
||||||
throw const FormatException('port must be 1–65535');
|
throw const FormatException('port must be 1–65535');
|
||||||
}
|
}
|
||||||
if (f.name.trim().isEmpty) {
|
if (f.name.trim().isEmpty) {
|
||||||
throw const FormatException('set your display name first (click your profile at the top)');
|
throw const FormatException('set your display name first (click your avatar at the top left)');
|
||||||
}
|
}
|
||||||
if (mode == ConnectMode.join && f.host.trim().isEmpty) {
|
if (mode == ConnectMode.join && f.host.trim().isEmpty) {
|
||||||
throw const FormatException('enter the server address');
|
throw const FormatException('enter the server address');
|
||||||
}
|
}
|
||||||
String avatar = '';
|
|
||||||
try {
|
|
||||||
avatar = await encodeAvatar(f.avatarPath);
|
|
||||||
} on FormatException catch (e) {
|
|
||||||
throw FormatException(e.message);
|
|
||||||
} catch (_) {
|
|
||||||
throw const FormatException('could not process that avatar — pick a PNG, JPG or WebP photo');
|
|
||||||
}
|
|
||||||
if (mode == ConnectMode.host &&
|
|
||||||
f.mediaPath.isNotEmpty &&
|
|
||||||
!await File(f.mediaPath).exists()) {
|
|
||||||
throw const FormatException('media file not found — check the path or pick again with Browse');
|
|
||||||
}
|
|
||||||
return ConnectParams(
|
return ConnectParams(
|
||||||
host: f.host.trim(),
|
host: f.host.trim(),
|
||||||
port: port,
|
port: port,
|
||||||
secret: mode == ConnectMode.host ? f.hostSecret : f.secret,
|
secret: mode == ConnectMode.host ? f.hostSecret : f.secret,
|
||||||
name: f.name.trim(),
|
name: f.name.trim(),
|
||||||
avatar: avatar,
|
avatar: avatar,
|
||||||
mediaPath: mode == ConnectMode.host ? f.mediaPath : '',
|
|
||||||
linkUrl: mode == ConnectMode.host ? f.linkUrl : '',
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// [edit] fills the card's fields into a copy of the last form, so the
|
/// [edit] fills the card's fields into a copy of the last form, so the
|
||||||
/// other card's saved values survive. [media] (host only) is put up
|
/// other card's saved values survive.
|
||||||
/// instead of the form's link or file (a Jellyfin ref; the pick itself is
|
Future<void> submit(ConnectMode mode, void Function(ConnectForm f) edit) async {
|
||||||
/// remembered in the Jellyfin box, not the form).
|
|
||||||
Future<void> submit(ConnectMode mode, void Function(ConnectForm f) edit,
|
|
||||||
{HelloMedia? media}) async {
|
|
||||||
if (busy != null) return;
|
if (busy != null) return;
|
||||||
final myAttempt = ++_attempt;
|
final myAttempt = ++_attempt;
|
||||||
final form = _session.lastForm.copy();
|
final form = _session.lastForm.copy();
|
||||||
edit(form);
|
edit(form);
|
||||||
form.name = form.name.trim();
|
form.name = form.name.trim();
|
||||||
form.host = form.host.trim();
|
form.host = form.host.trim();
|
||||||
if (mode == ConnectMode.host) {
|
|
||||||
final parsed = parseMediaInput(form.linkUrl.isNotEmpty ? form.linkUrl : form.mediaPath);
|
|
||||||
form
|
|
||||||
..mediaPath = parsed.mediaPath
|
|
||||||
..linkUrl = parsed.linkUrl;
|
|
||||||
}
|
|
||||||
busy = mode;
|
busy = mode;
|
||||||
errors[mode] = null;
|
errors[mode] = null;
|
||||||
notices[mode] = null;
|
notices[mode] = null;
|
||||||
@@ -116,8 +86,9 @@ class ConnectFlow extends ChangeNotifier {
|
|||||||
|
|
||||||
ConnectParams params;
|
ConnectParams params;
|
||||||
try {
|
try {
|
||||||
params = await buildParams(mode, form);
|
final profile = Profile.instance;
|
||||||
if (media != null && mode == ConnectMode.host) params = params.withMedia(media);
|
await profile.ensureLoaded();
|
||||||
|
params = buildParams(mode, form, avatar: profile.avatarBase64());
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (myAttempt != _attempt) return;
|
if (myAttempt != _attempt) return;
|
||||||
busy = null;
|
busy = null;
|
||||||
@@ -126,6 +97,7 @@ class ConnectFlow extends ChangeNotifier {
|
|||||||
_notify();
|
_notify();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
final fromSolo = mode == ConnectMode.host && _session.solo.value;
|
||||||
try {
|
try {
|
||||||
if (mode == ConnectMode.host) {
|
if (mode == ConnectMode.host) {
|
||||||
await _session.host(params, form);
|
await _session.host(params, form);
|
||||||
@@ -135,20 +107,19 @@ class ConnectFlow extends ChangeNotifier {
|
|||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (myAttempt != _attempt) return;
|
if (myAttempt != _attempt) return;
|
||||||
busy = null;
|
busy = null;
|
||||||
final kick = _session.coordinator.kickReason.peek();
|
errors[mode] = CardError('Could not connect', '$e');
|
||||||
if (kick != null && kick.isNotEmpty) {
|
|
||||||
onKicked?.call(kick);
|
|
||||||
} else {
|
|
||||||
errors[mode] = CardError('Could not connect', '$e');
|
|
||||||
}
|
|
||||||
_notify();
|
_notify();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (myAttempt != _attempt) {
|
if (myAttempt != _attempt) {
|
||||||
// Cancelled after it got through: back out.
|
// Cancelled after it got through: back out (an Invite: back to solo).
|
||||||
try {
|
try {
|
||||||
await _session.leave();
|
if (fromSolo) {
|
||||||
await _session.stopServer();
|
await _session.cancelInvite();
|
||||||
|
} else {
|
||||||
|
await _session.leave();
|
||||||
|
await _session.stopServer();
|
||||||
|
}
|
||||||
} catch (_) {}
|
} catch (_) {}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,175 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter/services.dart';
|
|
||||||
import 'package:signals/signals_flutter.dart';
|
|
||||||
|
|
||||||
import '../../jellyfin/accounts.dart';
|
|
||||||
import '../../state/session_state.dart';
|
|
||||||
import '../../state/settings.dart';
|
|
||||||
import '../../update/update_controller.dart';
|
|
||||||
import 'about_page.dart';
|
|
||||||
import 'connect_flow.dart';
|
|
||||||
import 'health_probe.dart';
|
|
||||||
import 'host_tab.dart';
|
|
||||||
import 'integrations_page.dart';
|
|
||||||
import 'join_tab.dart';
|
|
||||||
import 'profile.dart';
|
|
||||||
import 'settings_page.dart';
|
|
||||||
import 'top_bar.dart';
|
|
||||||
import 'update_indicator.dart';
|
|
||||||
|
|
||||||
/// Everything outside a session: one top bar (profile, Join/Host tabs,
|
|
||||||
/// Settings/Integrations/About, window buttons) over a full-width body.
|
|
||||||
class HomeScreen extends StatelessWidget {
|
|
||||||
const HomeScreen({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return const Scaffold(body: HomeShell(windowControls: true));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// [HomeScreen]'s content. Tests pump it with [windowControls] off (the
|
|
||||||
/// drag area and window buttons need window_manager) and a fake [healthGet].
|
|
||||||
class HomeShell extends StatefulWidget {
|
|
||||||
final UpdateController? updates;
|
|
||||||
final bool autoUpdateCheck;
|
|
||||||
final bool windowControls;
|
|
||||||
final HealthGetter healthGet;
|
|
||||||
/// Linked Jellyfin servers; defaults to [JellyfinAccounts.instance].
|
|
||||||
final JellyfinAccounts? jellyfin;
|
|
||||||
const HomeShell({
|
|
||||||
super.key,
|
|
||||||
this.updates,
|
|
||||||
this.autoUpdateCheck = true,
|
|
||||||
this.windowControls = false,
|
|
||||||
this.healthGet = defaultHealthGet,
|
|
||||||
this.jellyfin,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<HomeShell> createState() => _HomeShellState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _HomeShellState extends State<HomeShell> {
|
|
||||||
HomeView _view = HomeView.join;
|
|
||||||
final _flow = ConnectFlow();
|
|
||||||
late final _join = JoinFields(SessionState.instance.lastForm);
|
|
||||||
late final _jellyfin = widget.jellyfin ?? JellyfinAccounts.instance;
|
|
||||||
late final _host = HostFields(SessionState.instance.lastForm, jellyfin: _jellyfin);
|
|
||||||
late final void Function() _stopKickWatch;
|
|
||||||
late final void Function() _stopCrashWatch;
|
|
||||||
bool _dialogOpen = false;
|
|
||||||
String? _lastKickShown;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
Profile.instance.ensureLoaded();
|
|
||||||
// Reads linked servers and checks their tokens in the background.
|
|
||||||
_jellyfin.ensureLoaded();
|
|
||||||
if (widget.autoUpdateCheck) _autoCheck();
|
|
||||||
_flow.onKicked = _showKickedDialog;
|
|
||||||
// Back from a session that ended in a kick: say so.
|
|
||||||
_stopKickWatch = effect(() {
|
|
||||||
final kick = SessionState.instance.coordinator.kickReason.value;
|
|
||||||
if (kick == null || kick.isEmpty) {
|
|
||||||
_lastKickShown = null;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) => _showKickedDialog(kick));
|
|
||||||
});
|
|
||||||
// Back from a session whose hosted server crashed: say so on the Host tab.
|
|
||||||
_stopCrashWatch = effect(() {
|
|
||||||
final crash = SessionState.instance.serverCrash.value;
|
|
||||||
if (crash == null) return;
|
|
||||||
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
||||||
SessionState.instance.serverCrash.value = null;
|
|
||||||
if (!mounted) return;
|
|
||||||
_flow.showError(ConnectMode.host, CardError('Server crashed', crash));
|
|
||||||
setState(() => _view = HomeView.host);
|
|
||||||
});
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_stopKickWatch();
|
|
||||||
_stopCrashWatch();
|
|
||||||
_flow.dispose();
|
|
||||||
_join.dispose();
|
|
||||||
_host.dispose();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _autoCheck() async {
|
|
||||||
final s = AppSettings.instance;
|
|
||||||
await s.ensureLoaded();
|
|
||||||
if (s.autoCheckUpdates.peek()) await runUpdateCheck(widget.updates);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _showKickedDialog(String reason) async {
|
|
||||||
if (!mounted || _dialogOpen || reason == _lastKickShown) return;
|
|
||||||
_lastKickShown = reason;
|
|
||||||
_dialogOpen = true;
|
|
||||||
try {
|
|
||||||
await showDialog<void>(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => AlertDialog(
|
|
||||||
title: const Text('You were removed'),
|
|
||||||
content: Text(reason.isEmpty ? 'The host removed you from the server.' : reason),
|
|
||||||
actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
} finally {
|
|
||||||
_dialogOpen = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void _select(HomeView v) => setState(() => _view = v);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final scheme = Theme.of(context).colorScheme;
|
|
||||||
// Only the visible view is mounted: the Join tab polls /health only
|
|
||||||
// while shown. Form state lives here, so nothing is lost on switch.
|
|
||||||
final body = switch (_view) {
|
|
||||||
HomeView.join =>
|
|
||||||
JoinTab(flow: _flow, fields: _join, healthGet: widget.healthGet),
|
|
||||||
HomeView.host => HostTab(
|
|
||||||
flow: _flow,
|
|
||||||
fields: _host,
|
|
||||||
onOpenIntegrations: () => _select(HomeView.integrations),
|
|
||||||
),
|
|
||||||
HomeView.settings => SettingsPage(updates: widget.updates),
|
|
||||||
HomeView.integrations => IntegrationsPage(jellyfin: _jellyfin),
|
|
||||||
HomeView.about => AboutPage(updates: widget.updates),
|
|
||||||
};
|
|
||||||
return CallbackShortcuts(
|
|
||||||
bindings: {
|
|
||||||
const SingleActivator(LogicalKeyboardKey.digit1, control: true): () =>
|
|
||||||
_select(HomeView.join),
|
|
||||||
const SingleActivator(LogicalKeyboardKey.digit2, control: true): () =>
|
|
||||||
_select(HomeView.host),
|
|
||||||
const SingleActivator(LogicalKeyboardKey.comma, control: true): () =>
|
|
||||||
_select(HomeView.settings),
|
|
||||||
},
|
|
||||||
child: FocusScope(
|
|
||||||
autofocus: true,
|
|
||||||
child: Column(
|
|
||||||
children: [
|
|
||||||
HomeTopBar(
|
|
||||||
view: _view,
|
|
||||||
onSelect: _select,
|
|
||||||
updates: widget.updates,
|
|
||||||
windowControls: widget.windowControls,
|
|
||||||
),
|
|
||||||
Divider(height: 1, thickness: 1, color: scheme.outlineVariant.withValues(alpha: 0.4)),
|
|
||||||
Expanded(
|
|
||||||
child: KeyedSubtree(key: ValueKey(_view), child: body),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,392 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:signals/signals_flutter.dart';
|
|
||||||
import 'package:sync_relay_core/core.dart' show HelloMedia;
|
|
||||||
|
|
||||||
import '../../jellyfin/accounts.dart';
|
|
||||||
import '../../jellyfin/session_media.dart';
|
|
||||||
import '../../state/session_state.dart';
|
|
||||||
import 'connect_flow.dart';
|
|
||||||
import 'connect_status.dart';
|
|
||||||
import 'media_picker.dart';
|
|
||||||
import 'ui.dart';
|
|
||||||
|
|
||||||
/// Host form state, owned by the Home shell so it survives tab switches.
|
|
||||||
class HostFields {
|
|
||||||
HostFields(ConnectForm f, {JellyfinAccounts? jellyfin})
|
|
||||||
: jellyfin = jellyfin ?? JellyfinAccounts.instance,
|
|
||||||
port = TextEditingController(text: f.hostPort),
|
|
||||||
secret = TextEditingController(text: f.hostSecret),
|
|
||||||
media = MediaPickerController(mediaPath: f.mediaPath, linkUrl: f.linkUrl) {
|
|
||||||
// The last Jellyfin pick lives in the Jellyfin box (the connect form
|
|
||||||
// only knows links and files); restore it once that box is read.
|
|
||||||
final noMedia = f.mediaPath.isEmpty && f.linkUrl.isEmpty;
|
|
||||||
this.jellyfin.ensureLoaded().then((_) {
|
|
||||||
final pick = this.jellyfin.lastPick;
|
|
||||||
if (_disposed || pick == null || media.jellyfin != null) return;
|
|
||||||
if (this.jellyfin.account(pick.serverId) == null) return;
|
|
||||||
if (noMedia) {
|
|
||||||
media.pickJellyfin(pick);
|
|
||||||
} else {
|
|
||||||
final source = media.source;
|
|
||||||
media.pickJellyfin(pick);
|
|
||||||
media.source = source;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
final JellyfinAccounts jellyfin;
|
|
||||||
final TextEditingController port;
|
|
||||||
final TextEditingController secret;
|
|
||||||
final MediaPickerController media;
|
|
||||||
/// Jellyfin browser enlarged: the server column shrinks to a bar.
|
|
||||||
final browserExpanded = ValueNotifier(false);
|
|
||||||
bool _disposed = false;
|
|
||||||
|
|
||||||
void dispose() {
|
|
||||||
_disposed = true;
|
|
||||||
port.dispose();
|
|
||||||
secret.dispose();
|
|
||||||
media.dispose();
|
|
||||||
browserExpanded.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// What hosting a picked Jellyfin item sends: its ref (no URL, no token).
|
|
||||||
/// Throws [FormatException] with a user-facing message when the server is
|
|
||||||
/// not linked any more or its sign-in expired.
|
|
||||||
HelloMedia hostJellyfinMedia(JellyfinAccounts accounts, JellyfinMedia media) {
|
|
||||||
if (accounts.account(media.serverId) == null) {
|
|
||||||
throw const FormatException('that Jellyfin server is not linked any more — pick again');
|
|
||||||
}
|
|
||||||
if (accounts.statusOf(media.serverId) == JellyfinAccountStatus.expired) {
|
|
||||||
throw const FormatException('Jellyfin sign-in expired — reconnect it in Integrations');
|
|
||||||
}
|
|
||||||
return mediaForPick(media);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Below this width the server column moves under the media picker.
|
|
||||||
const hostStackBelow = 860.0;
|
|
||||||
const _columnWidth = 340.0;
|
|
||||||
|
|
||||||
/// Media picker as the main area; port/password/Host in a narrow column.
|
|
||||||
class HostTab extends StatelessWidget {
|
|
||||||
final ConnectFlow flow;
|
|
||||||
final HostFields fields;
|
|
||||||
final VoidCallback? onOpenIntegrations;
|
|
||||||
const HostTab(
|
|
||||||
{super.key, required this.flow, required this.fields, this.onOpenIntegrations});
|
|
||||||
|
|
||||||
void _host() {
|
|
||||||
if (flow.busy != null) return;
|
|
||||||
final media = fields.media.selection;
|
|
||||||
HelloMedia? jellyfinMedia;
|
|
||||||
if (media is JellyfinMedia) {
|
|
||||||
try {
|
|
||||||
jellyfinMedia = hostJellyfinMedia(fields.jellyfin, media);
|
|
||||||
} on FormatException catch (e) {
|
|
||||||
flow.showError(ConnectMode.host, CardError('Check the form', e.message));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
fields.jellyfin.rememberPick(media);
|
|
||||||
}
|
|
||||||
flow.submit(
|
|
||||||
ConnectMode.host,
|
|
||||||
(f) => f
|
|
||||||
..hostPort = fields.port.text.trim()
|
|
||||||
..hostSecret = fields.secret.text
|
|
||||||
..mediaPath = media is FileMedia ? media.path : ''
|
|
||||||
..linkUrl = media is LinkMedia ? media.url : '',
|
|
||||||
media: jellyfinMedia,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
return ListenableBuilder(
|
|
||||||
listenable: Listenable.merge([flow, fields.media, fields.browserExpanded]),
|
|
||||||
builder: (context, _) {
|
|
||||||
final busy = flow.busy == ConnectMode.host;
|
|
||||||
final jellyfin = fields.media.source == MediaKind.jellyfin;
|
|
||||||
final expanded = jellyfin && fields.browserExpanded.value;
|
|
||||||
Widget picker({required bool fill}) {
|
|
||||||
final p = MediaPicker(
|
|
||||||
controller: fields.media,
|
|
||||||
enabled: !busy,
|
|
||||||
autofocus: true,
|
|
||||||
onSubmit: _host,
|
|
||||||
onOpenIntegrations: onOpenIntegrations,
|
|
||||||
jellyfin: fields.jellyfin,
|
|
||||||
expanded: expanded,
|
|
||||||
onToggleExpanded: () => fields.browserExpanded.value = !fields.browserExpanded.value,
|
|
||||||
);
|
|
||||||
return Column(
|
|
||||||
key: const ValueKey('host-picker'),
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Text('What to watch', style: t.titleMedium),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
fill ? Expanded(child: p) : p,
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
final column = _ServerColumn(flow: flow, fields: fields, onHost: _host);
|
|
||||||
return LayoutBuilder(builder: (context, box) {
|
|
||||||
final stacked = box.maxWidth < hostStackBelow;
|
|
||||||
// Jellyfin browser: fills the height (lazy grids need a bounded
|
|
||||||
// viewport); the form sits beside it or, enlarged, in a bar below.
|
|
||||||
if (expanded) {
|
|
||||||
return Padding(
|
|
||||||
padding: kPagePadding,
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Expanded(child: picker(fill: true)),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
_HostBar(flow: flow, fields: fields, onHost: _host),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (jellyfin && !stacked) {
|
|
||||||
return Padding(
|
|
||||||
padding: kPagePadding,
|
|
||||||
child: Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Expanded(child: picker(fill: true)),
|
|
||||||
const SizedBox(width: 24),
|
|
||||||
SizedBox(
|
|
||||||
width: _columnWidth,
|
|
||||||
child: SingleChildScrollView(child: column),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return SingleChildScrollView(
|
|
||||||
padding: kPagePadding,
|
|
||||||
child: stacked
|
|
||||||
? Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
picker(fill: false),
|
|
||||||
const SizedBox(height: 24),
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.topLeft,
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: kFieldMaxWidth),
|
|
||||||
child: column,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
)
|
|
||||||
: Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Expanded(child: picker(fill: false)),
|
|
||||||
const SizedBox(width: 24),
|
|
||||||
SizedBox(width: _columnWidth, child: column),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _ServerColumn extends StatelessWidget {
|
|
||||||
final ConnectFlow flow;
|
|
||||||
final HostFields fields;
|
|
||||||
final VoidCallback onHost;
|
|
||||||
const _ServerColumn({required this.flow, required this.fields, required this.onHost});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final theme = Theme.of(context);
|
|
||||||
final t = theme.textTheme;
|
|
||||||
return Panel(
|
|
||||||
key: const ValueKey('host-column'),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Icon(Icons.cast, size: 20, color: theme.colorScheme.primary),
|
|
||||||
const SizedBox(width: 10),
|
|
||||||
Text('Your server', style: t.titleMedium),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Text('Runs on this computer. Friends need this port reachable.',
|
|
||||||
style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
const SizedBox(height: kGap),
|
|
||||||
AbsorbPointer(
|
|
||||||
absorbing: flow.busy == ConnectMode.host,
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
spacing: 12,
|
|
||||||
children: [
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.centerLeft,
|
|
||||||
child: SizedBox(
|
|
||||||
width: 120,
|
|
||||||
child: TextField(
|
|
||||||
key: const ValueKey('host-port'),
|
|
||||||
controller: fields.port,
|
|
||||||
decoration: fieldDecoration('Port'),
|
|
||||||
keyboardType: TextInputType.number,
|
|
||||||
onChanged: (_) => flow.clearError(ConnectMode.host),
|
|
||||||
onSubmitted: (_) => onHost(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
ListenableBuilder(
|
|
||||||
listenable: fields.secret,
|
|
||||||
builder: (context, _) => TextField(
|
|
||||||
key: const ValueKey('host-password'),
|
|
||||||
controller: fields.secret,
|
|
||||||
obscureText: true,
|
|
||||||
decoration: fieldDecoration('Password').copyWith(
|
|
||||||
helperText:
|
|
||||||
fields.secret.text.isEmpty ? 'No password — anyone can join' : null,
|
|
||||||
),
|
|
||||||
onSubmitted: (_) => onHost(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
ListenableBuilder(
|
|
||||||
listenable: fields.media,
|
|
||||||
builder: (context, _) => Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 12),
|
|
||||||
child: Text(mediaSummary(fields.media.selection),
|
|
||||||
maxLines: 2,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
ConnectFeedback(flow: flow, mode: ConnectMode.host),
|
|
||||||
const SizedBox(height: kGap),
|
|
||||||
ConnectButton(
|
|
||||||
flow: flow, mode: ConnectMode.host, label: 'Host', onSubmit: onHost, expand: true),
|
|
||||||
_HostedRecents(fields: fields, enabled: flow.busy == null),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
String mediaSummary(PickedMedia? s) =>
|
|
||||||
s == null ? 'No media selected (optional).' : 'Playing: ${s.label}';
|
|
||||||
|
|
||||||
/// Enlarged-browser mode: what is picked, port, password and Host in one
|
|
||||||
/// row under the browser.
|
|
||||||
class _HostBar extends StatelessWidget {
|
|
||||||
final ConnectFlow flow;
|
|
||||||
final HostFields fields;
|
|
||||||
final VoidCallback onHost;
|
|
||||||
const _HostBar({required this.flow, required this.fields, required this.onHost});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
return Panel(
|
|
||||||
key: const ValueKey('host-bar'),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Icon(Icons.cast, size: 20, color: Theme.of(context).colorScheme.primary),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
Expanded(
|
|
||||||
child: Text(mediaSummary(fields.media.selection),
|
|
||||||
maxLines: 1, overflow: TextOverflow.ellipsis, style: t.bodyMedium),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
AbsorbPointer(
|
|
||||||
absorbing: flow.busy == ConnectMode.host,
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
SizedBox(
|
|
||||||
width: 100,
|
|
||||||
child: TextField(
|
|
||||||
controller: fields.port,
|
|
||||||
decoration: fieldDecoration('Port'),
|
|
||||||
keyboardType: TextInputType.number,
|
|
||||||
onChanged: (_) => flow.clearError(ConnectMode.host),
|
|
||||||
onSubmitted: (_) => onHost(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
SizedBox(
|
|
||||||
width: 200,
|
|
||||||
child: TextField(
|
|
||||||
controller: fields.secret,
|
|
||||||
obscureText: true,
|
|
||||||
decoration: fieldDecoration('Password', hint: 'none = open'),
|
|
||||||
onSubmitted: (_) => onHost(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
ConnectButton(flow: flow, mode: ConnectMode.host, label: 'Host', onSubmit: onHost),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
ConnectFeedback(flow: flow, mode: ConnectMode.host),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Ports hosted before: one click refills port and password.
|
|
||||||
class _HostedRecents extends StatelessWidget {
|
|
||||||
final HostFields fields;
|
|
||||||
final bool enabled;
|
|
||||||
const _HostedRecents({required this.fields, required this.enabled});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return SignalBuilder(builder: (context) {
|
|
||||||
final list = [
|
|
||||||
for (final r in SessionState.instance.recents.value)
|
|
||||||
if (r.hosted) r
|
|
||||||
];
|
|
||||||
if (list.isEmpty) return const SizedBox.shrink();
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.only(top: kGap),
|
|
||||||
child: Wrap(
|
|
||||||
spacing: 8,
|
|
||||||
runSpacing: 8,
|
|
||||||
children: [
|
|
||||||
for (final r in list)
|
|
||||||
InputChip(
|
|
||||||
key: ValueKey('recent-${r.key}'),
|
|
||||||
avatar: Icon(r.secret.isEmpty ? Icons.history : Icons.lock_outline, size: 16),
|
|
||||||
label: Text('Port ${r.port}'),
|
|
||||||
tooltip: 'Use port ${r.port} again',
|
|
||||||
isEnabled: enabled,
|
|
||||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
|
||||||
onPressed: () {
|
|
||||||
fields.port.text = r.port;
|
|
||||||
fields.secret.text = r.secret;
|
|
||||||
},
|
|
||||||
deleteButtonTooltipMessage: 'Forget',
|
|
||||||
onDeleted: () => SessionState.instance.forgetServer(r),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
import '../../jellyfin/accounts.dart';
|
|
||||||
import '../../jellyfin/accounts_panel.dart';
|
|
||||||
import 'ui.dart';
|
|
||||||
|
|
||||||
class IntegrationsPage extends StatelessWidget {
|
|
||||||
/// Defaults to [JellyfinAccounts.instance].
|
|
||||||
final JellyfinAccounts? jellyfin;
|
|
||||||
const IntegrationsPage({super.key, this.jellyfin});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return PageScroll(
|
|
||||||
maxWidth: 820,
|
|
||||||
children: [
|
|
||||||
const PageTitle('Integrations',
|
|
||||||
subtitle: 'Connect media libraries to pick what to watch.'),
|
|
||||||
JellyfinAccountsPanel(accounts: jellyfin ?? JellyfinAccounts.instance),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,388 +0,0 @@
|
|||||||
import 'dart:async';
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:signals/signals_flutter.dart';
|
|
||||||
import 'package:sync_relay_core/core.dart';
|
|
||||||
|
|
||||||
import '../../state/session_state.dart';
|
|
||||||
import 'connect_flow.dart';
|
|
||||||
import 'connect_status.dart';
|
|
||||||
import 'health_probe.dart';
|
|
||||||
import 'ui.dart';
|
|
||||||
|
|
||||||
/// Join form text, owned by the Home shell so it survives tab switches.
|
|
||||||
class JoinFields {
|
|
||||||
JoinFields(ConnectForm f)
|
|
||||||
: host = TextEditingController(text: f.host),
|
|
||||||
port = TextEditingController(text: f.port),
|
|
||||||
secret = TextEditingController(text: f.secret);
|
|
||||||
final TextEditingController host;
|
|
||||||
final TextEditingController port;
|
|
||||||
final TextEditingController secret;
|
|
||||||
|
|
||||||
void dispose() {
|
|
||||||
host.dispose();
|
|
||||||
port.dispose();
|
|
||||||
secret.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Smallest recent-server tile; the grid adds columns as the window widens.
|
|
||||||
const _minTileWidth = 300.0;
|
|
||||||
|
|
||||||
/// One compact address/port/password row, then recent servers with live
|
|
||||||
/// status, as a grid that fills the width.
|
|
||||||
class JoinTab extends StatelessWidget {
|
|
||||||
final ConnectFlow flow;
|
|
||||||
final JoinFields fields;
|
|
||||||
final HealthGetter healthGet;
|
|
||||||
const JoinTab(
|
|
||||||
{super.key, required this.flow, required this.fields, required this.healthGet});
|
|
||||||
|
|
||||||
void _join() => flow.submit(ConnectMode.join, (f) {
|
|
||||||
f
|
|
||||||
..host = fields.host.text
|
|
||||||
..port = fields.port.text.trim()
|
|
||||||
..secret = fields.secret.text;
|
|
||||||
});
|
|
||||||
|
|
||||||
void _joinRecent(RecentServer r) {
|
|
||||||
fields.host.text = r.host;
|
|
||||||
fields.port.text = r.port;
|
|
||||||
fields.secret.text = r.secret;
|
|
||||||
_join();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
return ListenableBuilder(
|
|
||||||
listenable: flow,
|
|
||||||
builder: (context, _) => SingleChildScrollView(
|
|
||||||
padding: kPagePadding,
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Text('Join a friend’s server', style: t.titleMedium),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
AbsorbPointer(
|
|
||||||
absorbing: flow.busy == ConnectMode.join,
|
|
||||||
child: _joinRow(),
|
|
||||||
),
|
|
||||||
Align(
|
|
||||||
alignment: Alignment.centerLeft,
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: kFieldMaxWidth),
|
|
||||||
child: ConnectFeedback(flow: flow, mode: ConnectMode.join),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 32),
|
|
||||||
Text('Recent servers', style: t.titleMedium),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
SignalBuilder(builder: (context) {
|
|
||||||
final list = [
|
|
||||||
for (final r in SessionState.instance.recents.value)
|
|
||||||
if (!r.hosted) r
|
|
||||||
];
|
|
||||||
return RecentServersGrid(
|
|
||||||
servers: list,
|
|
||||||
enabled: flow.busy == null,
|
|
||||||
healthGet: healthGet,
|
|
||||||
onJoin: _joinRecent,
|
|
||||||
onForget: SessionState.instance.forgetServer,
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _joinRow() {
|
|
||||||
return Wrap(
|
|
||||||
key: const ValueKey('join-row'),
|
|
||||||
spacing: 12,
|
|
||||||
runSpacing: 12,
|
|
||||||
crossAxisAlignment: WrapCrossAlignment.center,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
SizedBox(
|
|
||||||
width: 280,
|
|
||||||
child: TextField(
|
|
||||||
key: const ValueKey('join-address'),
|
|
||||||
controller: fields.host,
|
|
||||||
decoration: fieldDecoration('Address', hint: 'IP or hostname'),
|
|
||||||
onChanged: (_) => flow.clearError(ConnectMode.join),
|
|
||||||
onSubmitted: (_) => _join(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const Padding(
|
|
||||||
padding: EdgeInsets.symmetric(horizontal: 6),
|
|
||||||
child: Text(':', style: TextStyle(fontSize: 18, color: Colors.grey)),
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: 96,
|
|
||||||
child: TextField(
|
|
||||||
key: const ValueKey('join-port'),
|
|
||||||
controller: fields.port,
|
|
||||||
decoration: fieldDecoration('Port'),
|
|
||||||
keyboardType: TextInputType.number,
|
|
||||||
onSubmitted: (_) => _join(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
SizedBox(
|
|
||||||
width: 220,
|
|
||||||
child: TextField(
|
|
||||||
key: const ValueKey('join-password'),
|
|
||||||
controller: fields.secret,
|
|
||||||
obscureText: true,
|
|
||||||
decoration: fieldDecoration('Password', hint: 'If the server has one'),
|
|
||||||
onSubmitted: (_) => _join(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
ConnectButton(flow: flow, mode: ConnectMode.join, label: 'Join', onSubmit: _join),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Recent servers as tiles; polls each one's `/health` every
|
|
||||||
/// [healthPollEvery] while mounted (i.e. while the Join tab is visible).
|
|
||||||
class RecentServersGrid extends StatefulWidget {
|
|
||||||
final List<RecentServer> servers;
|
|
||||||
final bool enabled;
|
|
||||||
final HealthGetter healthGet;
|
|
||||||
final ValueChanged<RecentServer> onJoin;
|
|
||||||
final ValueChanged<RecentServer> onForget;
|
|
||||||
const RecentServersGrid({
|
|
||||||
super.key,
|
|
||||||
required this.servers,
|
|
||||||
required this.enabled,
|
|
||||||
required this.healthGet,
|
|
||||||
required this.onJoin,
|
|
||||||
required this.onForget,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<RecentServersGrid> createState() => _RecentServersGridState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _RecentServersGridState extends State<RecentServersGrid> {
|
|
||||||
final _health = <String, ServerHealth>{};
|
|
||||||
final _inFlight = <String>{};
|
|
||||||
Timer? _timer;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
_pollAll();
|
|
||||||
_timer = Timer.periodic(healthPollEvery, (_) => _pollAll());
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void didUpdateWidget(RecentServersGrid old) {
|
|
||||||
super.didUpdateWidget(old);
|
|
||||||
for (final r in widget.servers) {
|
|
||||||
if (!_health.containsKey(r.key)) _poll(r);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_timer?.cancel();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
void _pollAll() {
|
|
||||||
for (final r in widget.servers) {
|
|
||||||
_poll(r);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _poll(RecentServer r) async {
|
|
||||||
if (!_inFlight.add(r.key)) return;
|
|
||||||
try {
|
|
||||||
final h = await probeHealth(r.host, r.port, widget.healthGet);
|
|
||||||
if (mounted) setState(() => _health[r.key] = h);
|
|
||||||
} finally {
|
|
||||||
_inFlight.remove(r.key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
if (widget.servers.isEmpty) return const _EmptyRecents();
|
|
||||||
return LayoutBuilder(builder: (context, box) {
|
|
||||||
final cols = ((box.maxWidth + kGap) / (_minTileWidth + kGap)).floor().clamp(1, 64);
|
|
||||||
final width = (box.maxWidth - kGap * (cols - 1)) / cols;
|
|
||||||
return Wrap(
|
|
||||||
spacing: kGap,
|
|
||||||
runSpacing: kGap,
|
|
||||||
children: [
|
|
||||||
for (final r in widget.servers)
|
|
||||||
SizedBox(
|
|
||||||
width: width,
|
|
||||||
child: _RecentTile(
|
|
||||||
key: ValueKey('recent-${r.key}'),
|
|
||||||
server: r,
|
|
||||||
health: _health[r.key],
|
|
||||||
enabled: widget.enabled,
|
|
||||||
onJoin: () => widget.onJoin(r),
|
|
||||||
onForget: () => widget.onForget(r),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _RecentTile extends StatelessWidget {
|
|
||||||
final RecentServer server;
|
|
||||||
/// Null until the first probe answers.
|
|
||||||
final ServerHealth? health;
|
|
||||||
final bool enabled;
|
|
||||||
final VoidCallback onJoin;
|
|
||||||
final VoidCallback onForget;
|
|
||||||
const _RecentTile({
|
|
||||||
super.key,
|
|
||||||
required this.server,
|
|
||||||
required this.health,
|
|
||||||
required this.enabled,
|
|
||||||
required this.onJoin,
|
|
||||||
required this.onForget,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final theme = Theme.of(context);
|
|
||||||
final scheme = theme.colorScheme;
|
|
||||||
final t = theme.textTheme;
|
|
||||||
final h = health;
|
|
||||||
final address = '${server.host}:${server.port}';
|
|
||||||
final title = h != null && h.name.isNotEmpty ? h.name : server.host;
|
|
||||||
final (status, statusColor) = switch (h) {
|
|
||||||
null => ('Checking…', Colors.grey),
|
|
||||||
ServerHealth(online: true) => (
|
|
||||||
'● online · ${h.viewers} watching',
|
|
||||||
Colors.greenAccent.shade400
|
|
||||||
),
|
|
||||||
_ => ('○ offline', Colors.grey),
|
|
||||||
};
|
|
||||||
return Material(
|
|
||||||
color: scheme.surfaceContainer,
|
|
||||||
shape: RoundedRectangleBorder(
|
|
||||||
borderRadius: BorderRadius.circular(kRadius),
|
|
||||||
side: BorderSide(color: scheme.outlineVariant.withValues(alpha: 0.5)),
|
|
||||||
),
|
|
||||||
clipBehavior: Clip.antiAlias,
|
|
||||||
child: InkWell(
|
|
||||||
onTap: enabled ? onJoin : null,
|
|
||||||
child: Tooltip(
|
|
||||||
message: 'Join $address',
|
|
||||||
waitDuration: const Duration(milliseconds: 600),
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.fromLTRB(16, 10, 6, 14),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Icon(Icons.dns_outlined, size: 20, color: scheme.primary),
|
|
||||||
const SizedBox(width: 10),
|
|
||||||
Expanded(
|
|
||||||
child: Text(title,
|
|
||||||
maxLines: 1, overflow: TextOverflow.ellipsis, style: t.titleMedium),
|
|
||||||
),
|
|
||||||
if (server.secret.isNotEmpty)
|
|
||||||
const Tooltip(
|
|
||||||
message: 'Password saved',
|
|
||||||
child: Icon(Icons.lock_outline, size: 16, color: Colors.grey),
|
|
||||||
),
|
|
||||||
IconButton(
|
|
||||||
tooltip: 'Forget',
|
|
||||||
visualDensity: VisualDensity.compact,
|
|
||||||
iconSize: 18,
|
|
||||||
onPressed: onForget,
|
|
||||||
icon: const Icon(Icons.close),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(left: 30, right: 10),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(address,
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Text(status,
|
|
||||||
key: const ValueKey('recent-status'),
|
|
||||||
style: t.bodyMedium?.copyWith(color: statusColor)),
|
|
||||||
),
|
|
||||||
if (h != null && h.needsUpdate)
|
|
||||||
Tooltip(
|
|
||||||
message: 'Server protocol ${h.proto}, this app '
|
|
||||||
'${RelayConstants.protoVersion} — update so both match',
|
|
||||||
child: Container(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: scheme.errorContainer,
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
),
|
|
||||||
child: Text('needs update',
|
|
||||||
style: t.labelSmall
|
|
||||||
?.copyWith(color: scheme.onErrorContainer)),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _EmptyRecents extends StatelessWidget {
|
|
||||||
const _EmptyRecents();
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
return Panel(
|
|
||||||
key: const ValueKey('recents-empty'),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
const Icon(Icons.history, size: 28, color: Colors.grey),
|
|
||||||
const SizedBox(width: kGap),
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text('No recent servers yet', style: t.titleSmall),
|
|
||||||
const SizedBox(height: 2),
|
|
||||||
Text('Servers you join show up here with live status; click one to rejoin.',
|
|
||||||
style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +1,25 @@
|
|||||||
import 'package:file_picker/file_picker.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
|
||||||
|
|
||||||
import '../../jellyfin/accounts.dart';
|
import '../../jellyfin/browse_scope.dart' show JellyfinSelection;
|
||||||
import '../../jellyfin/browse_scope.dart' show BrowseStart;
|
|
||||||
import '../../jellyfin/picker_source.dart';
|
|
||||||
import '../../widgets/media_input.dart';
|
import '../../widgets/media_input.dart';
|
||||||
import 'picked_media.dart';
|
import 'picked_media.dart';
|
||||||
import 'ui.dart';
|
|
||||||
|
|
||||||
export 'picked_media.dart';
|
export 'picked_media.dart';
|
||||||
|
|
||||||
const videoExtensions = ['mp4', 'mkv', 'webm', 'avi', 'mov', 'm4v', 'ts'];
|
/// The Library's sources.
|
||||||
|
|
||||||
enum MediaKind { jellyfin, link, file }
|
enum MediaKind { jellyfin, link, file }
|
||||||
|
|
||||||
/// State of a [MediaPicker], owned by whoever hosts it (Home's Host tab,
|
/// State of the Library tab, owned by the shell so it survives rebuilds
|
||||||
/// later the session's swap panel) so it survives rebuilds.
|
/// and tab switches: the source shown, the link field and its relay mode,
|
||||||
|
/// the selected Jellyfin card (details panel) and the last Jellyfin pick.
|
||||||
class MediaPickerController extends ChangeNotifier {
|
class MediaPickerController extends ChangeNotifier {
|
||||||
MediaPickerController(
|
MediaPickerController(
|
||||||
{String mediaPath = '', String linkUrl = '', JellyfinMedia? jellyfin, MediaKind? source})
|
{String mediaPath = '', String linkUrl = '', JellyfinMedia? jellyfin, MediaKind? source})
|
||||||
: link = TextEditingController(text: linkUrl),
|
: link = TextEditingController(text: linkUrl),
|
||||||
file = TextEditingController(text: mediaPath),
|
file = TextEditingController(text: mediaPath),
|
||||||
_jellyfin = jellyfin,
|
_jellyfin = jellyfin,
|
||||||
_source = source ??
|
_selected = jellyfin == null ? null : JellyfinSelection(jellyfin.serverId, jellyfin.itemId),
|
||||||
(linkUrl.isNotEmpty
|
_source = source ?? MediaKind.jellyfin {
|
||||||
? MediaKind.link
|
|
||||||
: mediaPath.isEmpty && jellyfin != null
|
|
||||||
? MediaKind.jellyfin
|
|
||||||
: MediaKind.file) {
|
|
||||||
link.addListener(notifyListeners);
|
link.addListener(notifyListeners);
|
||||||
file.addListener(notifyListeners);
|
file.addListener(notifyListeners);
|
||||||
}
|
}
|
||||||
@@ -36,18 +27,34 @@ class MediaPickerController extends ChangeNotifier {
|
|||||||
final TextEditingController link;
|
final TextEditingController link;
|
||||||
final TextEditingController file;
|
final TextEditingController file;
|
||||||
MediaKind _source;
|
MediaKind _source;
|
||||||
String? _notice;
|
// Through me unless picked otherwise (Library → Link).
|
||||||
|
LinkRelay _linkRelay = LinkRelay.me;
|
||||||
JellyfinMedia? _jellyfin;
|
JellyfinMedia? _jellyfin;
|
||||||
|
JellyfinSelection? _selected;
|
||||||
|
|
||||||
/// The Jellyfin item picked in the browser (kept while another source
|
LinkRelay get linkRelay => _linkRelay;
|
||||||
/// is shown).
|
set linkRelay(LinkRelay v) {
|
||||||
|
if (v == _linkRelay) return;
|
||||||
|
_linkRelay = v;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The last Jellyfin item picked (restored from the last put-up).
|
||||||
JellyfinMedia? get jellyfin => _jellyfin;
|
JellyfinMedia? get jellyfin => _jellyfin;
|
||||||
|
|
||||||
/// Picks a Jellyfin item and switches to the Jellyfin source.
|
/// Picks a Jellyfin item: selects its card and switches to Jellyfin.
|
||||||
void pickJellyfin(JellyfinMedia? media) {
|
void pickJellyfin(JellyfinMedia? media) {
|
||||||
_jellyfin = media;
|
_jellyfin = media;
|
||||||
|
_selected = media == null ? null : JellyfinSelection(media.serverId, media.itemId);
|
||||||
_source = MediaKind.jellyfin;
|
_source = MediaKind.jellyfin;
|
||||||
_notice = null;
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The selected Jellyfin card (details panel open), or null.
|
||||||
|
JellyfinSelection? get selected => _selected;
|
||||||
|
void select(JellyfinSelection? s) {
|
||||||
|
if (s == _selected && s?.item == _selected?.item) return;
|
||||||
|
_selected = s;
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,23 +62,15 @@ class MediaPickerController extends ChangeNotifier {
|
|||||||
set source(MediaKind v) {
|
set source(MediaKind v) {
|
||||||
if (v == _source) return;
|
if (v == _source) return;
|
||||||
_source = v;
|
_source = v;
|
||||||
_notice = null;
|
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// One-line hint under the fields (e.g. the file dialog failed).
|
/// What the Link or File source holds; for Jellyfin the last pick.
|
||||||
String? get notice => _notice;
|
|
||||||
set notice(String? v) {
|
|
||||||
_notice = v;
|
|
||||||
notifyListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// What the visible source has selected; null = nothing.
|
|
||||||
PickedMedia? get selection {
|
PickedMedia? get selection {
|
||||||
switch (_source) {
|
switch (_source) {
|
||||||
case MediaKind.link:
|
case MediaKind.link:
|
||||||
final url = link.text.trim();
|
final url = link.text.trim();
|
||||||
return url.isEmpty ? null : LinkMedia(url);
|
return url.isEmpty ? null : LinkMedia(url, relay: _linkRelay);
|
||||||
case MediaKind.file:
|
case MediaKind.file:
|
||||||
final path = file.text.trim();
|
final path = file.text.trim();
|
||||||
return path.isEmpty ? null : FileMedia(path);
|
return path.isEmpty ? null : FileMedia(path);
|
||||||
@@ -99,258 +98,3 @@ class MediaPickerController extends ChangeNotifier {
|
|||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Source segments (Jellyfin / Link / File) and the matching input.
|
|
||||||
/// Ctrl+V anywhere in the picker outside a text field pastes a link or path.
|
|
||||||
class MediaPicker extends StatefulWidget {
|
|
||||||
final MediaPickerController controller;
|
|
||||||
final ValueChanged<PickedMedia?>? onChanged;
|
|
||||||
/// Enter in a field.
|
|
||||||
final VoidCallback? onSubmit;
|
|
||||||
final VoidCallback? onOpenIntegrations;
|
|
||||||
final bool enabled;
|
|
||||||
final bool autofocus;
|
|
||||||
/// Defaults to [JellyfinAccounts.instance].
|
|
||||||
final JellyfinAccounts? jellyfin;
|
|
||||||
/// Jellyfin source only: the browser's "bigger" toggle.
|
|
||||||
final VoidCallback? onToggleExpanded;
|
|
||||||
final bool expanded;
|
|
||||||
/// Where the Jellyfin browser opens instead of its remembered location.
|
|
||||||
final BrowseStart? jellyfinStart;
|
|
||||||
/// False hides the File source (only the host can serve a file).
|
|
||||||
final bool allowFile;
|
|
||||||
/// Shown under the Link field instead of the default help.
|
|
||||||
final String? linkHelp;
|
|
||||||
const MediaPicker({
|
|
||||||
super.key,
|
|
||||||
this.jellyfinStart,
|
|
||||||
this.allowFile = true,
|
|
||||||
this.linkHelp,
|
|
||||||
required this.controller,
|
|
||||||
this.onChanged,
|
|
||||||
this.onSubmit,
|
|
||||||
this.onOpenIntegrations,
|
|
||||||
this.enabled = true,
|
|
||||||
this.autofocus = false,
|
|
||||||
this.jellyfin,
|
|
||||||
this.onToggleExpanded,
|
|
||||||
this.expanded = false,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<MediaPicker> createState() => _MediaPickerState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _MediaPickerState extends State<MediaPicker> {
|
|
||||||
MediaPickerController get _c => widget.controller;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
_c.addListener(_changed);
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void didUpdateWidget(MediaPicker old) {
|
|
||||||
super.didUpdateWidget(old);
|
|
||||||
if (old.controller != widget.controller) {
|
|
||||||
old.controller.removeListener(_changed);
|
|
||||||
widget.controller.addListener(_changed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_c.removeListener(_changed);
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
void _changed() {
|
|
||||||
widget.onChanged?.call(_c.selection);
|
|
||||||
if (mounted) setState(() {});
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<String?> _clipboard() async {
|
|
||||||
try {
|
|
||||||
return (await Clipboard.getData(Clipboard.kTextPlain))?.text?.trim();
|
|
||||||
} catch (_) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _pasteAnywhere() async {
|
|
||||||
final text = await _clipboard();
|
|
||||||
if (text != null && text.isNotEmpty) _c.pasteText(text);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _pasteLink() async {
|
|
||||||
final text = await _clipboard();
|
|
||||||
if (text != null && text.isNotEmpty) _c.link.text = text;
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _browse() async {
|
|
||||||
try {
|
|
||||||
final files = await FilePicker.pickFiles(
|
|
||||||
dialogTitle: 'Pick media file',
|
|
||||||
type: FileType.custom,
|
|
||||||
allowedExtensions: videoExtensions,
|
|
||||||
);
|
|
||||||
final path = files.isEmpty ? null : files.first.path;
|
|
||||||
if (path != null) {
|
|
||||||
_c.file.text = path;
|
|
||||||
_c.notice = null;
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
_c.notice = 'File dialog unavailable (${e.runtimeType}) — paste the path instead';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
KeyEventResult _onKey(FocusNode node, KeyEvent e) {
|
|
||||||
final ctrl = HardwareKeyboard.instance.isControlPressed ||
|
|
||||||
HardwareKeyboard.instance.isMetaPressed;
|
|
||||||
if (!widget.enabled || e is! KeyDownEvent || !ctrl || e.logicalKey != LogicalKeyboardKey.keyV) {
|
|
||||||
return KeyEventResult.ignored;
|
|
||||||
}
|
|
||||||
// A focused text field handles its own paste.
|
|
||||||
final inField = FocusManager.instance.primaryFocus?.context
|
|
||||||
?.findAncestorStateOfType<EditableTextState>() !=
|
|
||||||
null;
|
|
||||||
if (inField) return KeyEventResult.ignored;
|
|
||||||
_pasteAnywhere();
|
|
||||||
return KeyEventResult.handled;
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final source = _c.source;
|
|
||||||
final Widget content = switch (source) {
|
|
||||||
MediaKind.jellyfin => JellyfinPickerSource(
|
|
||||||
accounts: widget.jellyfin ?? JellyfinAccounts.instance,
|
|
||||||
selected: _c.jellyfin,
|
|
||||||
onPick: _c.pickJellyfin,
|
|
||||||
onOpenIntegrations: widget.onOpenIntegrations,
|
|
||||||
onToggleExpanded: widget.onToggleExpanded,
|
|
||||||
expanded: widget.expanded,
|
|
||||||
start: widget.jellyfinStart,
|
|
||||||
),
|
|
||||||
MediaKind.link => _FieldRow(
|
|
||||||
key: const ValueKey('media-link'),
|
|
||||||
field: TextField(
|
|
||||||
controller: _c.link,
|
|
||||||
autofocus: widget.autofocus,
|
|
||||||
decoration: fieldDecoration('Video link', hint: 'https://…/movie.mkv'),
|
|
||||||
keyboardType: TextInputType.url,
|
|
||||||
onSubmitted: (_) => widget.onSubmit?.call(),
|
|
||||||
),
|
|
||||||
button: OutlinedButton.icon(
|
|
||||||
onPressed: _pasteLink,
|
|
||||||
icon: const Icon(Icons.content_paste, size: 18),
|
|
||||||
label: const Text('Paste'),
|
|
||||||
),
|
|
||||||
help: widget.linkHelp ??
|
|
||||||
'A direct http(s) link to a video file; everyone streams it from there. '
|
|
||||||
'Jellyfin links are shared as the item, without your sign-in.',
|
|
||||||
notice: _c.notice,
|
|
||||||
),
|
|
||||||
MediaKind.file => _FieldRow(
|
|
||||||
key: const ValueKey('media-file'),
|
|
||||||
field: TextField(
|
|
||||||
controller: _c.file,
|
|
||||||
decoration: fieldDecoration('Video file', hint: 'Path to a video on this computer'),
|
|
||||||
onSubmitted: (_) => widget.onSubmit?.call(),
|
|
||||||
),
|
|
||||||
button: OutlinedButton.icon(
|
|
||||||
onPressed: _browse,
|
|
||||||
icon: const Icon(Icons.folder_open, size: 18),
|
|
||||||
label: const Text('Browse'),
|
|
||||||
),
|
|
||||||
help: 'Friends stream it from you while you watch. Optional — you can host without media.',
|
|
||||||
notice: _c.notice,
|
|
||||||
),
|
|
||||||
};
|
|
||||||
final segments = Align(
|
|
||||||
alignment: Alignment.centerLeft,
|
|
||||||
child: SegmentedButton<MediaKind>(
|
|
||||||
key: const ValueKey('media-source'),
|
|
||||||
showSelectedIcon: false,
|
|
||||||
segments: [
|
|
||||||
const ButtonSegment(
|
|
||||||
value: MediaKind.jellyfin,
|
|
||||||
icon: Icon(Icons.video_library_outlined),
|
|
||||||
label: Text('Jellyfin')),
|
|
||||||
const ButtonSegment(value: MediaKind.link, icon: Icon(Icons.link), label: Text('Link')),
|
|
||||||
const ButtonSegment(
|
|
||||||
value: MediaKind.file,
|
|
||||||
icon: Icon(Icons.insert_drive_file_outlined),
|
|
||||||
label: Text('File')),
|
|
||||||
].where((s) => widget.allowFile || s.value != MediaKind.file).toList(),
|
|
||||||
selected: {source},
|
|
||||||
onSelectionChanged: (s) => _c.source = s.first,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
return Focus(
|
|
||||||
autofocus: widget.autofocus,
|
|
||||||
onKeyEvent: _onKey,
|
|
||||||
child: AbsorbPointer(
|
|
||||||
absorbing: !widget.enabled,
|
|
||||||
// The browser fills the height it is given; in an unbounded
|
|
||||||
// (scrolling) parent it gets a fixed one.
|
|
||||||
child: LayoutBuilder(builder: (context, box) {
|
|
||||||
final fill = source == MediaKind.jellyfin;
|
|
||||||
return Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
mainAxisSize: fill && box.hasBoundedHeight ? MainAxisSize.max : MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
segments,
|
|
||||||
const SizedBox(height: kGap),
|
|
||||||
if (!fill)
|
|
||||||
content
|
|
||||||
else if (box.hasBoundedHeight)
|
|
||||||
Expanded(child: content)
|
|
||||||
else
|
|
||||||
SizedBox(height: jellyfinPickerHeight, child: content),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Height of the Jellyfin browser when the picker sits in a scroll view.
|
|
||||||
const jellyfinPickerHeight = 640.0;
|
|
||||||
|
|
||||||
class _FieldRow extends StatelessWidget {
|
|
||||||
final Widget field;
|
|
||||||
final Widget button;
|
|
||||||
final String help;
|
|
||||||
final String? notice;
|
|
||||||
const _FieldRow(
|
|
||||||
{super.key, required this.field, required this.button, required this.help, this.notice});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final small = Theme.of(context).textTheme.bodySmall?.copyWith(color: Colors.grey);
|
|
||||||
return Align(
|
|
||||||
alignment: Alignment.topLeft,
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: kFieldMaxWidth + 140),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Expanded(child: field),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
button,
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Text(notice ?? help, style: small),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,10 +7,19 @@ sealed class PickedMedia {
|
|||||||
String get label;
|
String get label;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A direct http(s) link everyone streams from.
|
/// How the others get a link: each fetches it ([direct]), the server
|
||||||
|
/// fetches it once for everyone ([server]), or this computer does and
|
||||||
|
/// passes it on through the server ([me]; for links only you can reach).
|
||||||
|
enum LinkRelay { direct, server, me }
|
||||||
|
|
||||||
|
/// An http(s) link.
|
||||||
final class LinkMedia extends PickedMedia {
|
final class LinkMedia extends PickedMedia {
|
||||||
final String url;
|
final String url;
|
||||||
const LinkMedia(this.url);
|
final LinkRelay relay;
|
||||||
|
/// Put it up even though this computer's probe found a problem
|
||||||
|
/// (`LinkProbe.problem`): the server or a friend may still open it.
|
||||||
|
final bool anyway;
|
||||||
|
const LinkMedia(this.url, {this.relay = LinkRelay.direct, this.anyway = false});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
String get label {
|
String get label {
|
||||||
@@ -25,14 +34,15 @@ final class LinkMedia extends PickedMedia {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
bool operator ==(Object other) => other is LinkMedia && other.url == url;
|
bool operator ==(Object other) => other is LinkMedia && other.url == url && other.relay == relay;
|
||||||
@override
|
@override
|
||||||
int get hashCode => url.hashCode;
|
int get hashCode => Object.hash(url, relay);
|
||||||
@override
|
@override
|
||||||
String toString() => 'LinkMedia($url)';
|
String toString() => 'LinkMedia($url)';
|
||||||
}
|
}
|
||||||
|
|
||||||
/// A file on this computer; friends stream it from the host.
|
/// A file on this computer; the others stream it from here (the host's
|
||||||
|
/// app serves it itself, anyone else's goes through the server's relay).
|
||||||
final class FileMedia extends PickedMedia {
|
final class FileMedia extends PickedMedia {
|
||||||
final String path;
|
final String path;
|
||||||
const FileMedia(this.path);
|
const FileMedia(this.path);
|
||||||
@@ -112,3 +122,7 @@ final class JellyfinMedia extends PickedMedia {
|
|||||||
@override
|
@override
|
||||||
String toString() => 'JellyfinMedia($serverId/$itemId "$title")';
|
String toString() => 'JellyfinMedia($serverId/$itemId "$title")';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Adds a pick to Up next (with [next]: right after what plays); returns
|
||||||
|
/// an error text, or null when sent. Null where there is no server.
|
||||||
|
typedef AddToQueue = Future<String?> Function(PickedMedia media, {bool next});
|
||||||
@@ -1,285 +1,131 @@
|
|||||||
|
import 'dart:async';
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
|
|
||||||
import 'package:file_picker/file_picker.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:signals/signals_flutter.dart';
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
|
||||||
|
import '../../state/connect_prefs.dart';
|
||||||
import '../../state/session_state.dart';
|
import '../../state/session_state.dart';
|
||||||
import '../../widgets/avatar_pipeline.dart';
|
import '../../widgets/avatar_pipeline.dart';
|
||||||
import 'ui.dart';
|
|
||||||
|
|
||||||
/// Display name + avatar, shared by the Home profile row and Settings.
|
/// Colours offered in the profile card; the first is the default.
|
||||||
/// Backed by [SessionState.lastForm]; every change is persisted. The
|
const profileColors = <Color>[
|
||||||
/// avatar goes through [encodeAvatar] (the same shrink the server gets)
|
Colors.deepPurple,
|
||||||
/// before its path is stored, and the encoded bytes are the preview.
|
Colors.indigo,
|
||||||
|
Colors.teal,
|
||||||
|
Colors.pink,
|
||||||
|
Colors.orange,
|
||||||
|
Colors.blueGrey,
|
||||||
|
];
|
||||||
|
|
||||||
|
const _keyPicture = 'avatarPng';
|
||||||
|
const _keyColor = 'profileColor';
|
||||||
|
|
||||||
|
/// Sends a mid-session name/picture change (null = unchanged, empty
|
||||||
|
/// avatar = removed). Swappable so tests can watch it.
|
||||||
|
typedef ProfilePush = void Function({String? name, String? avatar});
|
||||||
|
|
||||||
|
/// The one place a profile change reaches the server.
|
||||||
|
void pushProfileToSession({String? name, String? avatar}) {
|
||||||
|
final session = SessionState.instance;
|
||||||
|
if (session.route.peek() != AppRoute.session) return;
|
||||||
|
session.coordinator.updateProfile(name: name, avatar: avatar);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Display name, picture and colour of this app's user. Backed by
|
||||||
|
/// [SessionState.lastForm] (name) and the connect-form box (the cropped
|
||||||
|
/// 256 px PNG and the colour); every change is persisted, and while in a
|
||||||
|
/// server it is pushed through [push] so everyone sees it at once.
|
||||||
class Profile {
|
class Profile {
|
||||||
static final Profile instance = Profile._();
|
static final Profile instance = Profile._();
|
||||||
Profile._();
|
Profile._();
|
||||||
|
|
||||||
final name = signal('');
|
final name = signal('');
|
||||||
final preview = signal<Uint8List?>(null);
|
/// The cropped PNG; null shows the initial on [color].
|
||||||
|
final picture = signal<Uint8List?>(null);
|
||||||
|
final color = signal<Color>(profileColors.first);
|
||||||
final error = signal<String?>(null);
|
final error = signal<String?>(null);
|
||||||
final picking = signal(false);
|
ProfilePush push = pushProfileToSession;
|
||||||
bool _loaded = false;
|
bool _loaded = false;
|
||||||
|
Timer? _nameTimer;
|
||||||
|
|
||||||
void ensureLoaded() {
|
/// Reads the stored profile once (the app shell starts it). Old installs
|
||||||
|
/// stored a picture path: it is shrunk through [encodeAvatar] once and
|
||||||
|
/// kept as bytes. A caller during the first read does not wait for it
|
||||||
|
/// (no shared Future: tests run each in its own zone).
|
||||||
|
Future<void> ensureLoaded() async {
|
||||||
if (_loaded) return;
|
if (_loaded) return;
|
||||||
_loaded = true;
|
_loaded = true;
|
||||||
final f = SessionState.instance.lastForm;
|
await _load();
|
||||||
name.value = f.name;
|
|
||||||
_refreshPreview(f.avatarPath);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _refreshPreview(String path) async {
|
Future<void> _load() async {
|
||||||
|
final form = SessionState.instance.lastForm;
|
||||||
|
name.value = form.name;
|
||||||
try {
|
try {
|
||||||
final b64 = await encodeAvatar(path);
|
final box = connectFormBoxIfOpen() ?? await openConnectFormBox();
|
||||||
preview.value = b64.isEmpty ? null : base64Decode(b64);
|
final png = box.get(_keyPicture);
|
||||||
} catch (_) {
|
final c = box.get(_keyColor);
|
||||||
preview.value = null;
|
if (c is int) color.value = Color(c);
|
||||||
|
if (png is Uint8List && png.isNotEmpty) {
|
||||||
|
picture.value = png;
|
||||||
|
} else if (form.avatarPath.isNotEmpty) {
|
||||||
|
final b64 = await encodeAvatar(form.avatarPath);
|
||||||
|
if (b64.isNotEmpty) picture.value = base64Decode(b64);
|
||||||
|
form.avatarPath = '';
|
||||||
|
await _save();
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
// No store (tests) or an unreadable old picture: start without.
|
||||||
|
debugPrint('profile load: $e');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The picture as sent in hello and profile updates; '' when none.
|
||||||
|
String avatarBase64() {
|
||||||
|
final png = picture.peek();
|
||||||
|
return png == null ? '' : avatarWireBase64(png);
|
||||||
|
}
|
||||||
|
|
||||||
void setName(String value) {
|
void setName(String value) {
|
||||||
name.value = value.trim();
|
final v = value.trim();
|
||||||
SessionState.instance.lastForm.name = value.trim();
|
if (v.isEmpty || v == name.peek()) return;
|
||||||
_save();
|
name.value = v;
|
||||||
|
SessionState.instance.lastForm.name = v;
|
||||||
|
unawaited(_save());
|
||||||
|
// Typing renames once it settles, not on every key.
|
||||||
|
_nameTimer?.cancel();
|
||||||
|
_nameTimer = Timer(const Duration(milliseconds: 600), () => push(name: name.peek()));
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> pickAvatar() async {
|
Future<void> setPicture(Uint8List? png) async {
|
||||||
if (picking.peek()) return;
|
picture.value = png;
|
||||||
picking.value = true;
|
|
||||||
error.value = null;
|
error.value = null;
|
||||||
|
await _save();
|
||||||
try {
|
try {
|
||||||
final List<PlatformFile> files;
|
push(avatar: png == null ? '' : avatarWireBase64(png));
|
||||||
try {
|
} on FormatException catch (e) {
|
||||||
files = await FilePicker.pickFiles(
|
error.value = e.message;
|
||||||
dialogTitle: 'Pick avatar image',
|
|
||||||
type: FileType.custom,
|
|
||||||
allowedExtensions: const ['png', 'jpg', 'jpeg', 'webp'],
|
|
||||||
);
|
|
||||||
} catch (_) {
|
|
||||||
error.value = 'file dialog unavailable — try again';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
final path = files.isEmpty ? null : files.first.path;
|
|
||||||
if (path == null) return;
|
|
||||||
final String b64;
|
|
||||||
try {
|
|
||||||
b64 = await encodeAvatar(path);
|
|
||||||
} on FormatException catch (e) {
|
|
||||||
error.value = e.message;
|
|
||||||
return;
|
|
||||||
} catch (_) {
|
|
||||||
error.value = 'could not read that image — pick a PNG, JPG or WebP photo';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
SessionState.instance.lastForm.avatarPath = path;
|
|
||||||
preview.value = b64.isEmpty ? null : base64Decode(b64);
|
|
||||||
await _save();
|
|
||||||
} finally {
|
|
||||||
picking.value = false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> clearAvatar() async {
|
Future<void> setColor(Color c) async {
|
||||||
SessionState.instance.lastForm.avatarPath = '';
|
color.value = c;
|
||||||
preview.value = null;
|
|
||||||
error.value = null;
|
|
||||||
await _save();
|
await _save();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> _save() async {
|
Future<void> _save() async {
|
||||||
try {
|
try {
|
||||||
await SessionState.instance.saveForm();
|
await SessionState.instance.saveForm();
|
||||||
|
final box = connectFormBoxIfOpen() ?? await openConnectFormBox();
|
||||||
|
final png = picture.peek();
|
||||||
|
await box.putAll({
|
||||||
|
_keyPicture: png ?? Uint8List(0),
|
||||||
|
_keyColor: color.peek().toARGB32(),
|
||||||
|
});
|
||||||
} catch (_) {
|
} catch (_) {
|
||||||
error.value = 'could not save profile — try again';
|
error.value = 'could not save profile — try again';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Avatar circle with the initial as fallback.
|
|
||||||
class ProfileAvatar extends StatelessWidget {
|
|
||||||
final double radius;
|
|
||||||
const ProfileAvatar({super.key, this.radius = 20});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final p = Profile.instance;
|
|
||||||
return SignalBuilder(builder: (context) {
|
|
||||||
final img = p.preview.value;
|
|
||||||
final n = p.name.value;
|
|
||||||
return CircleAvatar(
|
|
||||||
radius: radius,
|
|
||||||
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
|
|
||||||
backgroundImage: img != null ? MemoryImage(img) : null,
|
|
||||||
child: img != null
|
|
||||||
? null
|
|
||||||
: p.picking.value
|
|
||||||
? SizedBox(
|
|
||||||
width: radius * 0.8,
|
|
||||||
height: radius * 0.8,
|
|
||||||
child: const CircularProgressIndicator(strokeWidth: 2))
|
|
||||||
: Text(n.isEmpty ? '?' : n[0].toUpperCase(),
|
|
||||||
style: TextStyle(fontSize: radius * 0.8)),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Avatar (tap to change) + name field. Used inline in Settings and in
|
|
||||||
/// the Home profile dialog.
|
|
||||||
class ProfileEditor extends StatefulWidget {
|
|
||||||
final bool autofocus;
|
|
||||||
final VoidCallback? onSubmitted;
|
|
||||||
const ProfileEditor({super.key, this.autofocus = false, this.onSubmitted});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<ProfileEditor> createState() => _ProfileEditorState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _ProfileEditorState extends State<ProfileEditor> {
|
|
||||||
late final _name = TextEditingController(text: Profile.instance.name.peek());
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_name.dispose();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final p = Profile.instance;
|
|
||||||
return Row(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Tooltip(
|
|
||||||
message: 'Change avatar',
|
|
||||||
child: InkWell(
|
|
||||||
customBorder: const CircleBorder(),
|
|
||||||
onTap: p.pickAvatar,
|
|
||||||
child: const ProfileAvatar(radius: 36),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: kGap),
|
|
||||||
Expanded(
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
TextField(
|
|
||||||
controller: _name,
|
|
||||||
autofocus: widget.autofocus,
|
|
||||||
decoration: fieldDecoration('Display name'),
|
|
||||||
onChanged: p.setName,
|
|
||||||
onSubmitted: (_) => widget.onSubmitted?.call(),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
SignalBuilder(builder: (context) {
|
|
||||||
final err = p.error.value;
|
|
||||||
return Wrap(
|
|
||||||
crossAxisAlignment: WrapCrossAlignment.center,
|
|
||||||
children: [
|
|
||||||
TextButton(
|
|
||||||
onPressed: p.pickAvatar,
|
|
||||||
child: const Text('Change avatar')),
|
|
||||||
if (p.preview.value != null)
|
|
||||||
TextButton(
|
|
||||||
onPressed: p.clearAvatar,
|
|
||||||
child: const Text('Remove avatar')),
|
|
||||||
if (err != null)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(left: 8),
|
|
||||||
child: Text(err,
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 12,
|
|
||||||
color: Theme.of(context).colorScheme.error)),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> showProfileDialog(BuildContext context) {
|
|
||||||
return showDialog<void>(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => AlertDialog(
|
|
||||||
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(kRadius)),
|
|
||||||
title: const Text('Profile'),
|
|
||||||
content: SizedBox(
|
|
||||||
width: 380,
|
|
||||||
child: ProfileEditor(
|
|
||||||
autofocus: true,
|
|
||||||
onSubmitted: () => Navigator.pop(context),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
actions: [
|
|
||||||
FilledButton(
|
|
||||||
onPressed: () => Navigator.pop(context), child: const Text('Done')),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Home's top-left: avatar + name, click to edit.
|
|
||||||
class ProfileChip extends StatelessWidget {
|
|
||||||
/// One line and a small avatar, for the Home top bar.
|
|
||||||
final bool dense;
|
|
||||||
/// Just the avatar, for very narrow windows.
|
|
||||||
final bool avatarOnly;
|
|
||||||
const ProfileChip({super.key, this.dense = false, this.avatarOnly = false});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final p = Profile.instance;
|
|
||||||
return Tooltip(
|
|
||||||
message: 'Edit profile',
|
|
||||||
child: InkWell(
|
|
||||||
borderRadius: BorderRadius.circular(kRadius),
|
|
||||||
onTap: () => showProfileDialog(context),
|
|
||||||
child: avatarOnly
|
|
||||||
? const Padding(padding: EdgeInsets.all(4), child: ProfileAvatar(radius: 14))
|
|
||||||
: Padding(
|
|
||||||
padding: dense
|
|
||||||
? const EdgeInsets.fromLTRB(4, 4, 10, 4)
|
|
||||||
: const EdgeInsets.fromLTRB(6, 6, 14, 6),
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
ProfileAvatar(radius: dense ? 14 : 20),
|
|
||||||
SizedBox(width: dense ? 8 : 12),
|
|
||||||
SignalBuilder(builder: (context) {
|
|
||||||
final n = p.name.value;
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
final name = Text(n.isEmpty ? 'Set your name' : n,
|
|
||||||
maxLines: 1,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: (dense ? t.titleSmall : t.titleMedium)
|
|
||||||
?.copyWith(color: n.isEmpty ? Colors.grey : null));
|
|
||||||
if (dense) {
|
|
||||||
return ConstrainedBox(
|
|
||||||
constraints: const BoxConstraints(maxWidth: 200), child: name);
|
|
||||||
}
|
|
||||||
return Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
name,
|
|
||||||
Text('Edit profile',
|
|
||||||
style: t.bodySmall?.copyWith(color: Colors.grey)),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -2,136 +2,91 @@ import 'package:file_picker/file_picker.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:signals/signals_flutter.dart';
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
|
||||||
import '../../playback/playback_controller.dart';
|
|
||||||
import '../../shaders/shader_presets.dart';
|
|
||||||
import '../../state/settings.dart';
|
import '../../state/settings.dart';
|
||||||
import '../../update/update_controller.dart';
|
import '../../update/update_controller.dart';
|
||||||
import 'profile.dart';
|
|
||||||
import 'ui.dart';
|
import 'ui.dart';
|
||||||
import 'update_indicator.dart';
|
import 'update_indicator.dart';
|
||||||
|
|
||||||
/// In-session keys, as handled by the session screen's global key handler.
|
/// Session keys: Space and Tab anywhere in a server (`AppKeys`), the
|
||||||
|
/// rest by the session player's key handler (while it fills the window).
|
||||||
const sessionShortcuts = [
|
const sessionShortcuts = [
|
||||||
('Space', 'Toggle ready'),
|
('Space', 'Toggle ready'),
|
||||||
('← / →', 'Seek back / forward 10 s'),
|
('← / →', 'Seek back / forward 10 s'),
|
||||||
|
('↑ / ↓, wheel', 'Volume up / down (up to 150 %)'),
|
||||||
('Shift+→', 'Skip 1:30 (for everyone)'),
|
('Shift+→', 'Skip 1:30 (for everyone)'),
|
||||||
('PgUp / PgDn', 'Previous / next chapter'),
|
('PgUp / PgDn', 'Previous / next chapter'),
|
||||||
('F', 'Toggle fullscreen'),
|
('F', 'Toggle fullscreen'),
|
||||||
('Tab', 'Open / close the people & chat panel'),
|
('Tab', 'Open / close chat & activity'),
|
||||||
('Ctrl+R', 'Reload the video'),
|
('Ctrl+R', 'Reload the video'),
|
||||||
('> or Shift+N', 'Put up the next Jellyfin episode'),
|
('> or Shift+N', 'Put up the next Jellyfin episode'),
|
||||||
('< or Shift+P', 'Put up the previous Jellyfin episode'),
|
('< or Shift+P', 'Put up the previous Jellyfin episode'),
|
||||||
('Ctrl+1…6', 'Shaders: Anime4K mode A, B, C, A+A, B+B, C+A'),
|
('Ctrl+1…6', 'Shaders: Anime4K mode A, B, C, A+A, B+B, C+A'),
|
||||||
('Ctrl+0', 'Shaders off'),
|
('Ctrl+0', 'Shaders off'),
|
||||||
('Esc', 'Close panel or fullscreen, else ask to leave'),
|
('Esc', 'Close the panel or fullscreen, shrink the player, then ask to leave'),
|
||||||
|
('Ctrl+Shift+B', 'Mark a problem in the session log (anywhere)'),
|
||||||
];
|
];
|
||||||
|
|
||||||
class SettingsPage extends StatelessWidget {
|
/// One titled card of the Settings tab (rounded Material, so list tiles
|
||||||
final UpdateController? updates;
|
/// paint their ripple on it).
|
||||||
const SettingsPage({super.key, this.updates});
|
class SettingsPanel extends StatelessWidget {
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return PageScroll(
|
|
||||||
maxWidth: 680,
|
|
||||||
children: [
|
|
||||||
const PageTitle('Settings'),
|
|
||||||
const _Section(title: 'Profile', child: ProfileEditor()),
|
|
||||||
const _Section(
|
|
||||||
title: 'Player',
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [_HwdecSetting(), SizedBox(height: 12), _MpvControlsSetting()],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const _Section(title: 'Jellyfin', child: _AutoAdvanceSetting()),
|
|
||||||
_Section(title: 'Updates', child: _UpdateSettings(controller: updates)),
|
|
||||||
const _Section(title: 'Keyboard shortcuts', child: _ShortcutList()),
|
|
||||||
const _Section(title: 'Video quality & shaders', child: _ShaderSettings()),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _Section extends StatelessWidget {
|
|
||||||
final String title;
|
final String title;
|
||||||
final Widget child;
|
final Widget child;
|
||||||
const _Section({required this.title, required this.child});
|
const SettingsPanel({super.key, required this.title, required this.child});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.only(bottom: kGap),
|
padding: const EdgeInsets.only(bottom: kGap),
|
||||||
child: Panel(
|
child: Material(
|
||||||
child: Column(
|
color: Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
borderRadius: BorderRadius.circular(16),
|
||||||
children: [SectionLabel(title), child],
|
clipBehavior: Clip.antiAlias,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(18, 14, 18, 12),
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Text(title, style: const TextStyle(fontWeight: FontWeight.w700)),
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
child,
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _HwdecSetting extends StatefulWidget {
|
/// A tinted hint card at the top of a Settings page.
|
||||||
const _HwdecSetting();
|
class SettingsHintCard extends StatelessWidget {
|
||||||
|
final IconData icon;
|
||||||
@override
|
final String text;
|
||||||
State<_HwdecSetting> createState() => _HwdecSettingState();
|
const SettingsHintCard({super.key, required this.icon, required this.text});
|
||||||
}
|
|
||||||
|
|
||||||
class _HwdecSettingState extends State<_HwdecSetting> {
|
|
||||||
final _s = AppSettings.instance;
|
|
||||||
late final _custom = TextEditingController(text: _s.hwdecCustom.peek());
|
|
||||||
|
|
||||||
@override
|
|
||||||
void dispose() {
|
|
||||||
_custom.dispose();
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return SignalBuilder(builder: (context) {
|
final scheme = Theme.of(context).colorScheme;
|
||||||
final mode = _s.hwdecMode.value;
|
return Container(
|
||||||
return Column(
|
margin: const EdgeInsets.only(bottom: kGap),
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
padding: const EdgeInsets.all(14),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: scheme.primary.withValues(alpha: 0.08),
|
||||||
|
borderRadius: BorderRadius.circular(16),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
const Text('Hardware decoding'),
|
Icon(icon, color: scheme.primary),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(width: 12),
|
||||||
const Text(
|
Expanded(child: Text(text)),
|
||||||
'Applies on the next join or Reload video (Ctrl+R). Turn it off if video '
|
|
||||||
'shows glitches or a black picture.',
|
|
||||||
style: TextStyle(fontSize: 12, color: Colors.grey),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
SegmentedButton<HwdecMode>(
|
|
||||||
showSelectedIcon: false,
|
|
||||||
segments: const [
|
|
||||||
ButtonSegment(value: HwdecMode.auto, label: Text('Auto')),
|
|
||||||
ButtonSegment(value: HwdecMode.off, label: Text('Off')),
|
|
||||||
ButtonSegment(value: HwdecMode.custom, label: Text('Custom')),
|
|
||||||
],
|
|
||||||
selected: {mode},
|
|
||||||
onSelectionChanged: (s) => _s.setHwdecMode(s.first),
|
|
||||||
),
|
|
||||||
if (mode == HwdecMode.custom)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 12),
|
|
||||||
child: TextField(
|
|
||||||
controller: _custom,
|
|
||||||
decoration: fieldDecoration('mpv hwdec value',
|
|
||||||
hint: 'e.g. vaapi, nvdec, d3d11va, auto-safe'),
|
|
||||||
onChanged: _s.setHwdecCustom,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
);
|
),
|
||||||
});
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _ShaderSettings extends StatelessWidget {
|
/// The .glsl files of the "Custom shaders" preset, in mpv order.
|
||||||
const _ShaderSettings();
|
class CustomShaderFiles extends StatelessWidget {
|
||||||
|
const CustomShaderFiles({super.key});
|
||||||
|
|
||||||
Future<void> _addFiles() async {
|
Future<void> _addFiles() async {
|
||||||
final List<PlatformFile> files;
|
final List<PlatformFile> files;
|
||||||
@@ -156,65 +111,18 @@ class _ShaderSettings extends StatelessWidget {
|
|||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final s = AppSettings.instance;
|
final s = AppSettings.instance;
|
||||||
|
final muted = TextStyle(fontSize: 12, color: Theme.of(context).colorScheme.onSurfaceVariant);
|
||||||
return SignalBuilder(builder: (context) {
|
return SignalBuilder(builder: (context) {
|
||||||
final preset = s.shaderPreset.value;
|
|
||||||
final quality = s.shaderQuality.value;
|
|
||||||
final custom = s.customShaders.value;
|
final custom = s.customShaders.value;
|
||||||
final mode = PlaybackController.lastRenderMode.value;
|
|
||||||
const hint = TextStyle(fontSize: 12, color: Colors.grey);
|
|
||||||
return Column(
|
return Column(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
const Text(
|
|
||||||
'Anime4K upscales and sharpens anime on your GPU, for you only. '
|
|
||||||
'Mode A suits 1080p sources, B 720p, C 480p; A+A, B+B and C+A add '
|
|
||||||
'a second pass. HQ is for strong GPUs (GTX 1080 and up), Fast for '
|
|
||||||
'weaker ones. Costs GPU time every frame and only works with '
|
|
||||||
'hardware video rendering. In the player: the ✨ button or '
|
|
||||||
'Ctrl+1…6, Ctrl+0 for off; changes apply live and are saved here.',
|
|
||||||
style: hint,
|
|
||||||
),
|
|
||||||
if (mode == RenderMode.software || mode == RenderMode.softwareGl)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 8),
|
|
||||||
child: Text(
|
|
||||||
mode == RenderMode.software
|
|
||||||
? 'The last session used software rendering: shaders had no effect there.'
|
|
||||||
: 'The last session rendered OpenGL on the CPU: shaders will be slow.',
|
|
||||||
style: const TextStyle(fontSize: 12, color: Colors.orange),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
Row(
|
Row(
|
||||||
children: [
|
children: [
|
||||||
const Text('Shaders'),
|
Expanded(
|
||||||
const SizedBox(width: 16),
|
child: Text('Your own mpv shaders for the "Custom shaders" choice; they run in this order.',
|
||||||
DropdownButton<ShaderPreset>(
|
style: muted),
|
||||||
value: preset,
|
|
||||||
onChanged: (p) {
|
|
||||||
if (p != null) s.setShaderPreset(p);
|
|
||||||
},
|
|
||||||
items: [
|
|
||||||
for (final p in ShaderPreset.values)
|
|
||||||
DropdownMenuItem(value: p, child: Text(p.label)),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
const Spacer(),
|
|
||||||
SegmentedButton<ShaderQuality>(
|
|
||||||
showSelectedIcon: false,
|
|
||||||
segments: [
|
|
||||||
for (final q in ShaderQuality.values)
|
|
||||||
ButtonSegment(value: q, label: Text(q.label)),
|
|
||||||
],
|
|
||||||
selected: {quality},
|
|
||||||
onSelectionChanged: (q) => s.setShaderQuality(q.first),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
const Expanded(child: Text('Custom shaders (run in this order)')),
|
|
||||||
TextButton.icon(
|
TextButton.icon(
|
||||||
onPressed: _addFiles,
|
onPressed: _addFiles,
|
||||||
icon: const Icon(Icons.add, size: 18),
|
icon: const Icon(Icons.add, size: 18),
|
||||||
@@ -223,7 +131,7 @@ class _ShaderSettings extends StatelessWidget {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
if (custom.isEmpty)
|
if (custom.isEmpty)
|
||||||
const Text('None picked.', style: hint)
|
Text('None picked.', style: muted)
|
||||||
else
|
else
|
||||||
for (final (i, path) in custom.indexed)
|
for (final (i, path) in custom.indexed)
|
||||||
Row(
|
Row(
|
||||||
@@ -231,15 +139,13 @@ class _ShaderSettings extends StatelessWidget {
|
|||||||
Expanded(
|
Expanded(
|
||||||
child: Tooltip(
|
child: Tooltip(
|
||||||
message: path,
|
message: path,
|
||||||
child: Text(path.split(RegExp(r'[/\\]')).last,
|
child: Text(path.split(RegExp(r'[/\\]')).last, overflow: TextOverflow.ellipsis),
|
||||||
overflow: TextOverflow.ellipsis),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
IconButton(
|
IconButton(
|
||||||
tooltip: 'Remove',
|
tooltip: 'Remove',
|
||||||
icon: const Icon(Icons.close, size: 18),
|
icon: const Icon(Icons.close, size: 18),
|
||||||
onPressed: () =>
|
onPressed: () => s.setCustomShaders([...custom]..removeAt(i)),
|
||||||
s.setCustomShaders([...custom]..removeAt(i)),
|
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -249,9 +155,9 @@ class _ShaderSettings extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _UpdateSettings extends StatelessWidget {
|
class UpdateSettings extends StatelessWidget {
|
||||||
final UpdateController? controller;
|
final UpdateController? controller;
|
||||||
const _UpdateSettings({this.controller});
|
const UpdateSettings({super.key, this.controller});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
@@ -290,8 +196,10 @@ class _UpdateSettings extends StatelessWidget {
|
|||||||
const SizedBox(height: 8),
|
const SizedBox(height: 8),
|
||||||
SignalBuilder(
|
SignalBuilder(
|
||||||
builder: (context) => SwitchListTile(
|
builder: (context) => SwitchListTile(
|
||||||
|
key: const ValueKey('auto-check-updates'),
|
||||||
contentPadding: EdgeInsets.zero,
|
contentPadding: EdgeInsets.zero,
|
||||||
title: const Text('Check automatically on start'),
|
title: const Text('Check for updates on start'),
|
||||||
|
subtitle: const Text('Looks for a new version when the app opens; nothing installs without asking'),
|
||||||
value: s.autoCheckUpdates.value,
|
value: s.autoCheckUpdates.value,
|
||||||
onChanged: s.setAutoCheckUpdates,
|
onChanged: s.setAutoCheckUpdates,
|
||||||
),
|
),
|
||||||
@@ -301,28 +209,8 @@ class _UpdateSettings extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _MpvControlsSetting extends StatelessWidget {
|
class AutoAdvanceSetting extends StatelessWidget {
|
||||||
const _MpvControlsSetting();
|
const AutoAdvanceSetting({super.key});
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final s = AppSettings.instance;
|
|
||||||
return SignalBuilder(
|
|
||||||
builder: (context) => SwitchListTile(
|
|
||||||
key: const ValueKey('mpv-controls'),
|
|
||||||
contentPadding: EdgeInsets.zero,
|
|
||||||
title: const Text('Experimental: mpv-style controls'),
|
|
||||||
subtitle: const Text('Video controls modeled on mpv\'s uosc theme: a thick timeline with '
|
|
||||||
'chapters and the cached range, flat buttons and menus. Applies right away.'),
|
|
||||||
value: s.mpvControls.value,
|
|
||||||
onChanged: s.setMpvControls,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _AutoAdvanceSetting extends StatelessWidget {
|
|
||||||
const _AutoAdvanceSetting();
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
@@ -332,8 +220,8 @@ class _AutoAdvanceSetting extends StatelessWidget {
|
|||||||
key: const ValueKey('auto-advance'),
|
key: const ValueKey('auto-advance'),
|
||||||
contentPadding: EdgeInsets.zero,
|
contentPadding: EdgeInsets.zero,
|
||||||
title: const Text('Play the next episode automatically'),
|
title: const Text('Play the next episode automatically'),
|
||||||
subtitle: const Text('When an episode ends, a 10 s countdown puts up the next one; '
|
subtitle: const Text('When a Jellyfin episode ends, a 10 s countdown puts up the next one; '
|
||||||
'anyone can cancel it on their screen.'),
|
'anyone can cancel it'),
|
||||||
value: s.autoAdvance.value,
|
value: s.autoAdvance.value,
|
||||||
onChanged: s.setAutoAdvance,
|
onChanged: s.setAutoAdvance,
|
||||||
),
|
),
|
||||||
@@ -341,8 +229,28 @@ class _AutoAdvanceSetting extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class _ShortcutList extends StatelessWidget {
|
class HideReReleasesSetting extends StatelessWidget {
|
||||||
const _ShortcutList();
|
const HideReReleasesSetting({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final s = AppSettings.instance;
|
||||||
|
return SignalBuilder(
|
||||||
|
builder: (context) => SwitchListTile(
|
||||||
|
key: const ValueKey('hide-re-releases'),
|
||||||
|
contentPadding: EdgeInsets.zero,
|
||||||
|
title: const Text('Hide re-releases in Latest'),
|
||||||
|
subtitle: const Text('Skips episodes added more than 30 days after they aired '
|
||||||
|
'(re-uploads, upgrades); also in each Latest row\'s ⋮ menu'),
|
||||||
|
value: s.hideReReleases.value,
|
||||||
|
onChanged: s.setHideReReleases,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ShortcutList extends StatelessWidget {
|
||||||
|
const ShortcutList({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
|
|||||||
@@ -1,151 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:window_manager/window_manager.dart';
|
|
||||||
|
|
||||||
import '../../update/update_controller.dart';
|
|
||||||
import '../../widgets/window_buttons.dart';
|
|
||||||
import 'profile.dart';
|
|
||||||
import 'update_indicator.dart';
|
|
||||||
|
|
||||||
/// What the Home body shows: the two tabs, or one of the side pages.
|
|
||||||
enum HomeView { join, host, settings, integrations, about }
|
|
||||||
|
|
||||||
const homeTopBarHeight = 48.0;
|
|
||||||
|
|
||||||
/// Below this width the bar drops the profile name and tab icons.
|
|
||||||
const _compactBelow = 760.0;
|
|
||||||
|
|
||||||
/// Home's single top bar: profile, Join/Host tabs, update pill, page
|
|
||||||
/// buttons and (in the real window) the drag area and window buttons.
|
|
||||||
class HomeTopBar extends StatelessWidget {
|
|
||||||
final HomeView view;
|
|
||||||
final ValueChanged<HomeView> onSelect;
|
|
||||||
final UpdateController? updates;
|
|
||||||
/// Off in tests: the drag area and window buttons need window_manager.
|
|
||||||
final bool windowControls;
|
|
||||||
const HomeTopBar({
|
|
||||||
super.key,
|
|
||||||
required this.view,
|
|
||||||
required this.onSelect,
|
|
||||||
this.updates,
|
|
||||||
this.windowControls = false,
|
|
||||||
});
|
|
||||||
|
|
||||||
static const _pages = [
|
|
||||||
(HomeView.settings, Icons.settings_outlined, Icons.settings, 'Settings'),
|
|
||||||
(HomeView.integrations, Icons.extension_outlined, Icons.extension, 'Integrations'),
|
|
||||||
(HomeView.about, Icons.info_outline, Icons.info, 'About'),
|
|
||||||
];
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return LayoutBuilder(
|
|
||||||
builder: (context, box) => _bar(context, compact: box.maxWidth < _compactBelow));
|
|
||||||
}
|
|
||||||
|
|
||||||
Widget _bar(BuildContext context, {required bool compact}) {
|
|
||||||
final scheme = Theme.of(context).colorScheme;
|
|
||||||
final row = Row(
|
|
||||||
children: [
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
ProfileChip(dense: true, avatarOnly: compact),
|
|
||||||
SizedBox(width: compact ? 8 : 20),
|
|
||||||
_Tab(
|
|
||||||
key: const ValueKey('tab-join'),
|
|
||||||
label: 'Join',
|
|
||||||
icon: compact ? null : Icons.login,
|
|
||||||
selected: view == HomeView.join,
|
|
||||||
onTap: () => onSelect(HomeView.join),
|
|
||||||
),
|
|
||||||
_Tab(
|
|
||||||
key: const ValueKey('tab-host'),
|
|
||||||
label: 'Host',
|
|
||||||
icon: compact ? null : Icons.cast,
|
|
||||||
selected: view == HomeView.host,
|
|
||||||
onTap: () => onSelect(HomeView.host),
|
|
||||||
),
|
|
||||||
const Spacer(),
|
|
||||||
UpdateIndicator(controller: updates),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
for (final (v, icon, selectedIcon, label) in _pages)
|
|
||||||
IconButton(
|
|
||||||
tooltip: label,
|
|
||||||
isSelected: view == v,
|
|
||||||
icon: Icon(icon, size: 20),
|
|
||||||
selectedIcon: Icon(selectedIcon, size: 20, color: scheme.primary),
|
|
||||||
onPressed: () => onSelect(v),
|
|
||||||
),
|
|
||||||
if (windowControls) ...[
|
|
||||||
const SizedBox(width: 4),
|
|
||||||
SizedBox(
|
|
||||||
height: 20,
|
|
||||||
child: VerticalDivider(width: 12, color: scheme.outlineVariant),
|
|
||||||
),
|
|
||||||
const WindowButtons(),
|
|
||||||
] else
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
final bar = SizedBox(height: homeTopBarHeight, child: row);
|
|
||||||
return ColoredBox(
|
|
||||||
color: scheme.surfaceContainerLowest,
|
|
||||||
// Empty bar space drags the window; the controls on top take their
|
|
||||||
// own clicks without waiting out the drag area's double-tap.
|
|
||||||
child: windowControls
|
|
||||||
? Stack(children: [
|
|
||||||
const Positioned.fill(child: DragToMoveArea(child: SizedBox.expand())),
|
|
||||||
bar,
|
|
||||||
])
|
|
||||||
: bar,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _Tab extends StatelessWidget {
|
|
||||||
final String label;
|
|
||||||
final IconData? icon;
|
|
||||||
final bool selected;
|
|
||||||
final VoidCallback onTap;
|
|
||||||
const _Tab(
|
|
||||||
{super.key,
|
|
||||||
required this.label,
|
|
||||||
this.icon,
|
|
||||||
required this.selected,
|
|
||||||
required this.onTap});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final scheme = Theme.of(context).colorScheme;
|
|
||||||
final color = selected ? scheme.primary : scheme.onSurfaceVariant;
|
|
||||||
return Semantics(
|
|
||||||
selected: selected,
|
|
||||||
button: true,
|
|
||||||
child: InkWell(
|
|
||||||
onTap: onTap,
|
|
||||||
borderRadius: BorderRadius.circular(8),
|
|
||||||
child: Container(
|
|
||||||
height: homeTopBarHeight,
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
border: Border(
|
|
||||||
bottom: BorderSide(
|
|
||||||
color: selected ? scheme.primary : Colors.transparent, width: 2),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
child: Row(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
if (icon != null) ...[
|
|
||||||
Icon(icon, size: 18, color: color),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
],
|
|
||||||
Text(label,
|
|
||||||
style: Theme.of(context).textTheme.titleSmall?.copyWith(
|
|
||||||
color: color, fontWeight: selected ? FontWeight.w600 : null)),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,15 +1,31 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart' show appVersion, isDevBuild;
|
||||||
|
|
||||||
/// Product name (working title). Change it here only.
|
/// Product name (working title). Change it here only.
|
||||||
const appName = 'Watch Together';
|
const appName = 'Starsync';
|
||||||
|
|
||||||
const repoUrl = 'https://git.senkochan.moe/Foxyz/sync_replay_project';
|
const repoUrl = 'https://git.senkochan.moe/Foxyz/sync_replay_project';
|
||||||
|
|
||||||
|
/// The pubspec's version: the Flutter tool defines it for every build and
|
||||||
|
/// run (`flutter run` too).
|
||||||
|
const _pubspecVersion = String.fromEnvironment('FLUTTER_BUILD_NAME');
|
||||||
|
|
||||||
|
/// The short commit a packaged build was made from (`tool/package_linux.sh`;
|
||||||
|
/// `-dirty` with uncommitted changes); empty otherwise.
|
||||||
|
const _gitCommit = String.fromEnvironment('GIT_COMMIT');
|
||||||
|
|
||||||
|
/// The version to show: a release's own ("1.1.2"), a test build's with its
|
||||||
|
/// commit ("1.1.3-dev.12 · 1a2b3c4"), and for a dev run (no `APP_VERSION`)
|
||||||
|
/// the pubspec's with "dev" ("1.1.2 · dev run").
|
||||||
|
String displayVersion({String version = appVersion, String pubspec = _pubspecVersion, String commit = _gitCommit}) {
|
||||||
|
if (version == '0.0.0-dev') return pubspec.isEmpty ? 'dev run' : '$pubspec · dev run';
|
||||||
|
return isDevBuild(version) && commit.isNotEmpty ? '$version · $commit' : version;
|
||||||
|
}
|
||||||
|
|
||||||
const kRadius = 12.0;
|
const kRadius = 12.0;
|
||||||
const kGap = 16.0;
|
const kGap = 16.0;
|
||||||
const kPagePadding = EdgeInsets.fromLTRB(28, 20, 28, 28);
|
|
||||||
|
|
||||||
/// Rounded panel used by every Home/Settings section.
|
/// Rounded panel used by every Settings section.
|
||||||
class Panel extends StatelessWidget {
|
class Panel extends StatelessWidget {
|
||||||
final Widget child;
|
final Widget child;
|
||||||
final EdgeInsetsGeometry padding;
|
final EdgeInsetsGeometry padding;
|
||||||
@@ -38,33 +54,6 @@ class Panel extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Page heading + optional subtitle, same spacing everywhere.
|
|
||||||
class PageTitle extends StatelessWidget {
|
|
||||||
final String title;
|
|
||||||
final String? subtitle;
|
|
||||||
const PageTitle(this.title, {super.key, this.subtitle});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
return Padding(
|
|
||||||
padding: const EdgeInsets.only(bottom: kGap),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(title, style: t.headlineSmall),
|
|
||||||
if (subtitle != null)
|
|
||||||
Padding(
|
|
||||||
padding: const EdgeInsets.only(top: 4),
|
|
||||||
child: Text(subtitle!,
|
|
||||||
style: t.bodyMedium?.copyWith(color: Colors.grey)),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Small grey heading inside a panel.
|
/// Small grey heading inside a panel.
|
||||||
class SectionLabel extends StatelessWidget {
|
class SectionLabel extends StatelessWidget {
|
||||||
final String text;
|
final String text;
|
||||||
@@ -87,7 +76,7 @@ class SectionLabel extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Text field style shared by the connect cards.
|
/// Outlined text field style (settings, Jellyfin sign-in).
|
||||||
InputDecoration fieldDecoration(String label, {String? hint, Widget? suffix}) =>
|
InputDecoration fieldDecoration(String label, {String? hint, Widget? suffix}) =>
|
||||||
InputDecoration(
|
InputDecoration(
|
||||||
labelText: label,
|
labelText: label,
|
||||||
@@ -97,31 +86,6 @@ InputDecoration fieldDecoration(String label, {String? hint, Widget? suffix}) =>
|
|||||||
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
|
border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
|
||||||
);
|
);
|
||||||
|
|
||||||
/// Single-item scrollable page body, width-capped so it doesn't sprawl
|
|
||||||
/// on wide windows.
|
|
||||||
class PageScroll extends StatelessWidget {
|
|
||||||
final List<Widget> children;
|
|
||||||
final double maxWidth;
|
|
||||||
const PageScroll({super.key, required this.children, this.maxWidth = 920});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return SingleChildScrollView(
|
|
||||||
padding: kPagePadding,
|
|
||||||
child: Align(
|
|
||||||
alignment: Alignment.topLeft,
|
|
||||||
child: ConstrainedBox(
|
|
||||||
constraints: BoxConstraints(maxWidth: maxWidth),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: children,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Widest a single text field gets, however wide the window.
|
/// Widest a single text field gets, however wide the window.
|
||||||
const kFieldMaxWidth = 720.0;
|
const kFieldMaxWidth = 720.0;
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import '../../update/update_controller.dart';
|
|||||||
import '../../widgets/update_banner.dart';
|
import '../../widgets/update_banner.dart';
|
||||||
import 'ui.dart';
|
import 'ui.dart';
|
||||||
|
|
||||||
/// Compact "Update vX" pill for Home's top-right; hidden until there is
|
/// Compact "Update vX" pill for the party strip; hidden until there is
|
||||||
/// something to install. Click opens the full [UpdateBanner].
|
/// something to install. Click opens the full [UpdateBanner].
|
||||||
class UpdateIndicator extends StatelessWidget {
|
class UpdateIndicator extends StatelessWidget {
|
||||||
final UpdateController? controller;
|
final UpdateController? controller;
|
||||||
|
|||||||
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
|
|||||||
|
|
||||||
import '../../jellyfin/session_media.dart';
|
import '../../jellyfin/session_media.dart';
|
||||||
import '../../session/session_coordinator.dart' show AutoAdvance, autoAdvanceSecs;
|
import '../../session/session_coordinator.dart' show AutoAdvance, autoAdvanceSecs;
|
||||||
|
import '../../widgets/app_menu.dart' show AppGlass;
|
||||||
import 'player_controls.dart' show FloatingPill;
|
import 'player_controls.dart' show FloatingPill;
|
||||||
|
|
||||||
// Jellyfin pieces of the session screen. Plain widgets fed by the
|
// Jellyfin pieces of the session player. Plain widgets fed by the
|
||||||
// coordinator's signals, so tests can pump them without the player.
|
// coordinator's signals, so tests can pump them without the player.
|
||||||
|
|
||||||
/// Previous / next episode in the video controls. Nothing when there is
|
/// Previous / next episode in the video controls. Nothing when there is
|
||||||
@@ -36,9 +37,8 @@ class EpisodeSkipButton extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Floating "Next episode ›" from the ED (or the last two minutes):
|
/// Floating "Next episode ›" from the ED (or the last two minutes), while
|
||||||
/// faint at rest, lit on hover. Lives outside the auto-hiding controls, so
|
/// the controls are up (`PillGate`): faint at rest, lit on hover.
|
||||||
/// it shows in fullscreen and with the controls hidden.
|
|
||||||
class NextEpisodePill extends StatelessWidget {
|
class NextEpisodePill extends StatelessWidget {
|
||||||
final EpisodeLink episode;
|
final EpisodeLink episode;
|
||||||
final VoidCallback onPressed;
|
final VoidCallback onPressed;
|
||||||
@@ -70,27 +70,36 @@ class EndOfEpisodeCard extends StatelessWidget {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
final c = countdown;
|
final c = countdown;
|
||||||
return Card(
|
// The same card as Up next's (`UpNextCard`): the app's glass, 400 wide.
|
||||||
|
return AppGlass(
|
||||||
key: const ValueKey('end-of-episode'),
|
key: const ValueKey('end-of-episode'),
|
||||||
color: Colors.black.withValues(alpha: 0.85),
|
child: SizedBox(
|
||||||
child: Padding(
|
width: 400,
|
||||||
padding: const EdgeInsets.fromLTRB(16, 12, 12, 12),
|
child: Padding(
|
||||||
child: ConstrainedBox(
|
padding: const EdgeInsets.all(12),
|
||||||
constraints: const BoxConstraints(maxWidth: 380),
|
|
||||||
child: Column(
|
child: Column(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
children: [
|
children: [
|
||||||
Text(c == null ? 'Up next' : 'Next episode in ${c.secondsLeft} s',
|
Text(c == null ? 'Up next' : 'Next episode in ${c.secondsLeft} s',
|
||||||
style: t.labelLarge?.copyWith(color: Colors.white70)),
|
style: const TextStyle(color: Colors.white60, fontSize: 12)),
|
||||||
const SizedBox(height: 4),
|
const SizedBox(height: 2),
|
||||||
Text('Next: ${next.label}',
|
Text('Next: ${next.label}',
|
||||||
maxLines: 2, overflow: TextOverflow.ellipsis, style: t.titleMedium),
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: const TextStyle(color: Colors.white, fontSize: 15, fontWeight: FontWeight.w600, height: 1.25)),
|
||||||
if (c != null) ...[
|
if (c != null) ...[
|
||||||
const SizedBox(height: 8),
|
const SizedBox(height: 10),
|
||||||
LinearProgressIndicator(value: c.secondsLeft / autoAdvanceSecs),
|
ClipRRect(
|
||||||
|
borderRadius: BorderRadius.circular(2),
|
||||||
|
child: TweenAnimationBuilder<double>(
|
||||||
|
tween: Tween(end: c.secondsLeft / autoAdvanceSecs),
|
||||||
|
duration: const Duration(seconds: 1),
|
||||||
|
builder: (context, v, _) =>
|
||||||
|
LinearProgressIndicator(value: v, minHeight: 3, backgroundColor: const Color(0x1FFFFFFF)),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
Row(
|
Row(
|
||||||
@@ -144,7 +153,9 @@ class JellyfinBlockedCard extends StatelessWidget {
|
|||||||
const SizedBox(height: 10),
|
const SizedBox(height: 10),
|
||||||
Text(blocked.message, textAlign: TextAlign.center, style: t.titleSmall),
|
Text(blocked.message, textAlign: TextAlign.center, style: t.titleSmall),
|
||||||
const SizedBox(height: 6),
|
const SizedBox(height: 6),
|
||||||
Text('Link your own account in Integrations, or ask the host to relay it.',
|
Text(
|
||||||
|
'Whoever put it up passes it on automatically while their app is open; '
|
||||||
|
'if they left, ask them to put it up again. Or link your own account in Integrations.',
|
||||||
textAlign: TextAlign.center, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
textAlign: TextAlign.center, style: t.bodySmall?.copyWith(color: Colors.grey)),
|
||||||
const SizedBox(height: 14),
|
const SizedBox(height: 14),
|
||||||
Wrap(
|
Wrap(
|
||||||
@@ -164,25 +175,3 @@ class JellyfinBlockedCard extends StatelessWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Small member-list badge: plays the Jellyfin item through the host.
|
|
||||||
class ViaHostBadge extends StatelessWidget {
|
|
||||||
const ViaHostBadge({super.key});
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return Tooltip(
|
|
||||||
message: 'No Jellyfin account here: watches through the host',
|
|
||||||
child: Container(
|
|
||||||
key: const ValueKey('via-host'),
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1),
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
color: Colors.white10,
|
|
||||||
borderRadius: BorderRadius.circular(999),
|
|
||||||
border: Border.all(color: Colors.white24),
|
|
||||||
),
|
|
||||||
child: const Text('via host', style: TextStyle(fontSize: 10, color: Colors.white70)),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -7,6 +7,7 @@ import 'package:sync_relay_core/core.dart' show JellyfinStreamType;
|
|||||||
|
|
||||||
import '../../jellyfin/track_prefs.dart' show MpvTrack;
|
import '../../jellyfin/track_prefs.dart' show MpvTrack;
|
||||||
import '../../playback/media_marks.dart';
|
import '../../playback/media_marks.dart';
|
||||||
|
import '../../widgets/app_menu.dart' show AppGlass;
|
||||||
|
|
||||||
// Session control-bar pieces built on the playback signals (chapters,
|
// Session control-bar pieces built on the playback signals (chapters,
|
||||||
// tracks, skip offers): the seek bar with chapter marks, the chapter and
|
// tracks, skip offers): the seek bar with chapter marks, the chapter and
|
||||||
@@ -525,10 +526,13 @@ class SkipForwardButton extends StatelessWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Floating pill over the video (Next episode, Skip OP / ED / 1:30):
|
/// The player's action pill (Next episode, Skip OP / ED / 1:30): the
|
||||||
/// faint at rest, lit on hover. Lives outside the auto-hiding controls, so
|
/// status pill's glass ([AppGlass.pill]) at [height], faint at rest, lit
|
||||||
/// it shows in fullscreen and with the controls hidden.
|
/// on hover. Lives in the player's action area, outside the auto-hiding
|
||||||
|
/// controls (also in fullscreen); `PillGate` shows it with them.
|
||||||
class FloatingPill extends StatefulWidget {
|
class FloatingPill extends StatefulWidget {
|
||||||
|
/// Every action pill's height: the status pill's without avatars.
|
||||||
|
static const height = 44.0;
|
||||||
final String label;
|
final String label;
|
||||||
final String tooltip;
|
final String tooltip;
|
||||||
final IconData icon;
|
final IconData icon;
|
||||||
@@ -540,7 +544,7 @@ class FloatingPill extends StatefulWidget {
|
|||||||
required this.label,
|
required this.label,
|
||||||
required this.tooltip,
|
required this.tooltip,
|
||||||
required this.onPressed,
|
required this.onPressed,
|
||||||
this.icon = Icons.chevron_right,
|
this.icon = Icons.chevron_right_rounded,
|
||||||
this.tapKey,
|
this.tapKey,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -553,38 +557,31 @@ class _FloatingPillState extends State<FloatingPill> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final primary = Theme.of(context).colorScheme.primary;
|
const fade = Duration(milliseconds: 150);
|
||||||
return MouseRegion(
|
return MouseRegion(
|
||||||
cursor: SystemMouseCursors.click,
|
cursor: SystemMouseCursors.click,
|
||||||
onEnter: (_) => setState(() => _hover = true),
|
onEnter: (_) => setState(() => _hover = true),
|
||||||
onExit: (_) => setState(() => _hover = false),
|
onExit: (_) => setState(() => _hover = false),
|
||||||
child: Tooltip(
|
child: Tooltip(
|
||||||
message: widget.tooltip,
|
message: widget.tooltip,
|
||||||
child: AnimatedScale(
|
child: AnimatedOpacity(
|
||||||
duration: const Duration(milliseconds: 150),
|
duration: fade,
|
||||||
scale: _hover ? 1.06 : 1,
|
opacity: _hover ? 1 : 0.45,
|
||||||
child: AnimatedOpacity(
|
child: GestureDetector(
|
||||||
duration: const Duration(milliseconds: 150),
|
key: widget.tapKey,
|
||||||
opacity: _hover ? 1 : 0.45,
|
onTap: widget.onPressed,
|
||||||
child: GestureDetector(
|
child: AppGlass.pill(
|
||||||
key: widget.tapKey,
|
|
||||||
onTap: widget.onPressed,
|
|
||||||
child: AnimatedContainer(
|
child: AnimatedContainer(
|
||||||
duration: const Duration(milliseconds: 150),
|
duration: fade,
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 9),
|
height: FloatingPill.height,
|
||||||
decoration: BoxDecoration(
|
padding: const EdgeInsets.only(left: 16, right: 12),
|
||||||
color: Colors.black.withValues(alpha: 0.75),
|
color: _hover ? Colors.white12 : Colors.transparent,
|
||||||
borderRadius: BorderRadius.circular(999),
|
|
||||||
border: Border.all(color: _hover ? primary : Colors.white24),
|
|
||||||
boxShadow: _hover
|
|
||||||
? [BoxShadow(color: primary.withValues(alpha: 0.45), blurRadius: 16)]
|
|
||||||
: const [],
|
|
||||||
),
|
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
children: [
|
children: [
|
||||||
Text(widget.label, style: const TextStyle(color: Colors.white, fontSize: 13)),
|
Text(widget.label,
|
||||||
const SizedBox(width: 4),
|
style: const TextStyle(color: Colors.white, fontSize: 14, fontWeight: FontWeight.w600)),
|
||||||
|
const SizedBox(width: 6),
|
||||||
Icon(widget.icon, color: Colors.white, size: 18),
|
Icon(widget.icon, color: Colors.white, size: 18),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,136 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
|
|
||||||
import '../../jellyfin/accounts.dart';
|
|
||||||
import '../../jellyfin/browse_scope.dart' show BrowseStart;
|
|
||||||
import '../home/media_picker.dart';
|
|
||||||
|
|
||||||
/// "Change video" in a session: the same [MediaPicker] as Home's Host tab
|
|
||||||
/// (Jellyfin browser, Link, File) and a button that puts the pick up for
|
|
||||||
/// everyone. File is offered to the host only (the file streams from the
|
|
||||||
/// host's disk). [onSwap] returns an error text, or null when sent.
|
|
||||||
class SwapPanel extends StatefulWidget {
|
|
||||||
final MediaPickerController controller;
|
|
||||||
final JellyfinAccounts accounts;
|
|
||||||
final bool isHost;
|
|
||||||
final BrowseStart? jellyfinStart;
|
|
||||||
final Future<String?> Function(PickedMedia media) onSwap;
|
|
||||||
final VoidCallback onClose;
|
|
||||||
final VoidCallback? onOpenIntegrations;
|
|
||||||
const SwapPanel({
|
|
||||||
super.key,
|
|
||||||
required this.controller,
|
|
||||||
required this.accounts,
|
|
||||||
required this.isHost,
|
|
||||||
required this.onSwap,
|
|
||||||
required this.onClose,
|
|
||||||
this.jellyfinStart,
|
|
||||||
this.onOpenIntegrations,
|
|
||||||
});
|
|
||||||
|
|
||||||
@override
|
|
||||||
State<SwapPanel> createState() => _SwapPanelState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _SwapPanelState extends State<SwapPanel> {
|
|
||||||
bool _busy = false;
|
|
||||||
String? _error;
|
|
||||||
|
|
||||||
@override
|
|
||||||
void initState() {
|
|
||||||
super.initState();
|
|
||||||
final c = widget.controller;
|
|
||||||
if (!widget.isHost && c.source == MediaKind.file) c.source = MediaKind.link;
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<void> _swap() async {
|
|
||||||
final media = widget.controller.selection;
|
|
||||||
if (media == null || _busy) return;
|
|
||||||
setState(() {
|
|
||||||
_busy = true;
|
|
||||||
_error = null;
|
|
||||||
});
|
|
||||||
String? error;
|
|
||||||
try {
|
|
||||||
error = await widget.onSwap(media);
|
|
||||||
} catch (e) {
|
|
||||||
error = '$e';
|
|
||||||
}
|
|
||||||
if (!mounted) return;
|
|
||||||
setState(() {
|
|
||||||
_busy = false;
|
|
||||||
_error = error;
|
|
||||||
});
|
|
||||||
if (error == null) widget.onClose();
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
final t = Theme.of(context).textTheme;
|
|
||||||
return Material(
|
|
||||||
key: const ValueKey('swap-panel'),
|
|
||||||
elevation: 12,
|
|
||||||
borderRadius: BorderRadius.circular(16),
|
|
||||||
clipBehavior: Clip.antiAlias,
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.fromLTRB(20, 12, 12, 16),
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
|
||||||
children: [
|
|
||||||
Row(
|
|
||||||
children: [
|
|
||||||
Expanded(child: Text('Change video', style: t.titleLarge)),
|
|
||||||
IconButton(
|
|
||||||
tooltip: 'Close (Esc)', icon: const Icon(Icons.close), onPressed: widget.onClose),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 8),
|
|
||||||
Expanded(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.only(right: 8),
|
|
||||||
child: MediaPicker(
|
|
||||||
controller: widget.controller,
|
|
||||||
jellyfin: widget.accounts,
|
|
||||||
enabled: !_busy,
|
|
||||||
allowFile: widget.isHost,
|
|
||||||
jellyfinStart: widget.jellyfinStart,
|
|
||||||
onOpenIntegrations: widget.onOpenIntegrations,
|
|
||||||
onSubmit: _swap,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 12),
|
|
||||||
ListenableBuilder(
|
|
||||||
listenable: widget.controller,
|
|
||||||
builder: (context, _) {
|
|
||||||
final sel = widget.controller.selection;
|
|
||||||
return Row(
|
|
||||||
children: [
|
|
||||||
Expanded(
|
|
||||||
child: Text(
|
|
||||||
_error ?? (sel == null ? 'Pick something to watch' : 'Put up: ${sel.label}'),
|
|
||||||
maxLines: 2,
|
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: t.bodyMedium?.copyWith(
|
|
||||||
color: _error != null ? Theme.of(context).colorScheme.error : null),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
FilledButton.icon(
|
|
||||||
key: const ValueKey('swap-go'),
|
|
||||||
onPressed: sel == null || _busy ? null : _swap,
|
|
||||||
icon: _busy
|
|
||||||
? const SizedBox(
|
|
||||||
width: 16, height: 16, child: CircularProgressIndicator(strokeWidth: 2))
|
|
||||||
: const Icon(Icons.swap_horiz),
|
|
||||||
label: const Text('Put it up for everyone'),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,309 @@
|
|||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../jellyfin/session_media.dart';
|
||||||
|
|
||||||
|
// Who fetches the current media and how it spreads, from the state alone:
|
||||||
|
// the members card's source line and each member's route and buffer.
|
||||||
|
|
||||||
|
/// "4.1 MB/s", "850 kB/s".
|
||||||
|
String formatRate(int bytesPerSec) {
|
||||||
|
if (bytesPerSec >= 1000000) {
|
||||||
|
final mb = bytesPerSec / 1e6;
|
||||||
|
return '${mb.toStringAsFixed(mb >= 10 ? 0 : 1)} MB/s';
|
||||||
|
}
|
||||||
|
return '${(bytesPerSec / 1000).round()} kB/s';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// How the current media reaches the party.
|
||||||
|
enum DeliveryKind {
|
||||||
|
/// A link every app opens itself.
|
||||||
|
link,
|
||||||
|
/// The hosting app's file, read by everyone from its server.
|
||||||
|
hostFile,
|
||||||
|
/// A file the dedicated server was started with.
|
||||||
|
serverFile,
|
||||||
|
/// A member's machine passes it on through the server.
|
||||||
|
memberRelay,
|
||||||
|
/// The server reads the link itself.
|
||||||
|
serverFetch,
|
||||||
|
/// Jellyfin: own accounts, the server's login for the rest.
|
||||||
|
jellyfin,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// How a member gets the bytes.
|
||||||
|
enum DeliveryRoute {
|
||||||
|
/// It serves them (a relay source, the host's file).
|
||||||
|
source,
|
||||||
|
/// It reads them from the server.
|
||||||
|
server,
|
||||||
|
/// It fetches them itself (a link, its own Jellyfin account).
|
||||||
|
direct,
|
||||||
|
}
|
||||||
|
|
||||||
|
enum BufferHealth { good, low, starving }
|
||||||
|
|
||||||
|
/// The relay source's condition.
|
||||||
|
enum SourceState {
|
||||||
|
ok,
|
||||||
|
/// Measured slower than the media's bitrate.
|
||||||
|
slow,
|
||||||
|
/// Its channel is down (or the server has not read the link yet).
|
||||||
|
waiting,
|
||||||
|
/// It left the server.
|
||||||
|
left,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Members' names by id, kept after they leave: "Foxyz left" needs the
|
||||||
|
/// name the state no longer has.
|
||||||
|
class MemberNames {
|
||||||
|
final _names = <String, String>{};
|
||||||
|
|
||||||
|
void observe(StateBroadcast r) {
|
||||||
|
if (_names.length > 256) _names.clear();
|
||||||
|
for (final m in r.members) {
|
||||||
|
_names[m.id] = m.name;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String? operator [](String id) => _names[id];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The member [m]'s route and buffer.
|
||||||
|
class MemberDelivery {
|
||||||
|
/// Null when unknown (a Jellyfin member that has not reported yet).
|
||||||
|
final DeliveryRoute? route;
|
||||||
|
final DeliveryKind kind;
|
||||||
|
/// Bytes per second the server sends it lately.
|
||||||
|
final int rate;
|
||||||
|
/// Null when it does not count: sitting out, reconnecting, cannot play.
|
||||||
|
final BufferHealth? health;
|
||||||
|
final double buffered;
|
||||||
|
/// The media is a Jellyfin item (direct = its own account).
|
||||||
|
final bool jellyfin;
|
||||||
|
const MemberDelivery({
|
||||||
|
required this.route,
|
||||||
|
required this.kind,
|
||||||
|
this.jellyfin = false,
|
||||||
|
required this.rate,
|
||||||
|
required this.health,
|
||||||
|
required this.buffered,
|
||||||
|
});
|
||||||
|
|
||||||
|
/// "via server · 3.2 MB/s", "direct", "passes it on"; empty when unknown.
|
||||||
|
String get short => switch (route) {
|
||||||
|
DeliveryRoute.source => kind == DeliveryKind.hostFile ? 'hosts the file' : 'passes it on',
|
||||||
|
DeliveryRoute.server => rate > 0 ? 'via server · ${formatRate(rate)}' : 'via server',
|
||||||
|
DeliveryRoute.direct => jellyfin ? 'own Jellyfin account' : 'direct',
|
||||||
|
null => '',
|
||||||
|
};
|
||||||
|
|
||||||
|
/// [short] and the buffer: "via server · 3.2 MB/s · 45 s buffered".
|
||||||
|
String get detail => [
|
||||||
|
if (short.isNotEmpty) short,
|
||||||
|
if (health != null) health == BufferHealth.starving ? 'buffer empty' : '${buffered.round()} s buffered',
|
||||||
|
].join(' · ');
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The current media's path for everyone: what the members card's source
|
||||||
|
/// line says.
|
||||||
|
class Delivery {
|
||||||
|
final DeliveryKind kind;
|
||||||
|
/// The member serving it ([DeliveryKind.memberRelay], [DeliveryKind.hostFile]); empty otherwise.
|
||||||
|
final String sourceId;
|
||||||
|
final String sourceName;
|
||||||
|
final bool sourceIsSelf;
|
||||||
|
final SourceState state;
|
||||||
|
/// `media.relay.rate` / `need` (0 unknown).
|
||||||
|
final int rate, need;
|
||||||
|
/// Members (not sitting out, not the source) reading from the server,
|
||||||
|
/// and fetching it themselves.
|
||||||
|
final int viaServer, direct;
|
||||||
|
const Delivery({
|
||||||
|
required this.kind,
|
||||||
|
this.sourceId = '',
|
||||||
|
this.sourceName = '',
|
||||||
|
this.sourceIsSelf = false,
|
||||||
|
this.state = SourceState.ok,
|
||||||
|
this.rate = 0,
|
||||||
|
this.need = 0,
|
||||||
|
this.viaServer = 0,
|
||||||
|
this.direct = 0,
|
||||||
|
});
|
||||||
|
|
||||||
|
bool get relayed => kind == DeliveryKind.memberRelay || kind == DeliveryKind.serverFetch;
|
||||||
|
|
||||||
|
/// Rate against bitrate, both known: 1 = exactly what the media needs.
|
||||||
|
double? get headroom => rate > 0 && need > 0 ? rate / need : null;
|
||||||
|
|
||||||
|
String get title {
|
||||||
|
final who = sourceIsSelf ? 'You' : sourceName;
|
||||||
|
switch (kind) {
|
||||||
|
case DeliveryKind.link:
|
||||||
|
return 'Everyone plays the link directly';
|
||||||
|
case DeliveryKind.serverFile:
|
||||||
|
return 'The server has the file';
|
||||||
|
case DeliveryKind.hostFile:
|
||||||
|
return sourceIsSelf ? 'You host the file' : '$who hosts the file';
|
||||||
|
case DeliveryKind.jellyfin:
|
||||||
|
return viaServer == 0 ? 'Everyone streams it from Jellyfin' : 'From Jellyfin';
|
||||||
|
case DeliveryKind.serverFetch:
|
||||||
|
return switch (state) {
|
||||||
|
SourceState.waiting => 'The server is getting the video…',
|
||||||
|
SourceState.slow => 'The server fetches it slower than it plays',
|
||||||
|
_ => 'The server fetches it',
|
||||||
|
};
|
||||||
|
case DeliveryKind.memberRelay:
|
||||||
|
return switch (state) {
|
||||||
|
SourceState.left => '$sourceName left: playing what the server has',
|
||||||
|
SourceState.waiting => sourceIsSelf ? 'Reconnecting you to the server…' : 'Waiting for $who to reconnect',
|
||||||
|
SourceState.slow => sourceIsSelf ? 'Your upload is slower than the video' : "$who's upload is slower than the video",
|
||||||
|
SourceState.ok => sourceIsSelf ? 'You pass it on through the server' : '$who passes it on through the server',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "3 through the server · 4.1 MB/s, needs 2.3 MB/s"; empty when
|
||||||
|
/// there is nothing to add.
|
||||||
|
String get detail {
|
||||||
|
final parts = <String>[
|
||||||
|
if (direct > 0 && (kind == DeliveryKind.jellyfin || kind == DeliveryKind.memberRelay))
|
||||||
|
'$direct with their own account',
|
||||||
|
if (viaServer > 0 && kind != DeliveryKind.link) '$viaServer through the server',
|
||||||
|
if (rate > 0 && state != SourceState.left) need > 0 ? '${formatRate(rate)}, needs ${formatRate(need)}' : formatRate(rate),
|
||||||
|
];
|
||||||
|
return parts.join(' · ');
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The hover text: what the numbers mean.
|
||||||
|
String get explain => switch (kind) {
|
||||||
|
DeliveryKind.memberRelay || DeliveryKind.serverFetch => [
|
||||||
|
if (rate > 0)
|
||||||
|
'${kind == DeliveryKind.serverFetch ? 'The server gets' : sourceIsSelf ? 'You send' : '$sourceName sends'} '
|
||||||
|
'${formatRate(rate)} while the server asks for more.',
|
||||||
|
if (need > 0) 'The video averages ${formatRate(need)}.',
|
||||||
|
if (state == SourceState.slow) 'Slower than the video: the others will pause to buffer.',
|
||||||
|
if (rate == 0) 'The speed shows once bytes have flowed for a few seconds.',
|
||||||
|
].join(' '),
|
||||||
|
DeliveryKind.hostFile || DeliveryKind.serverFile => 'Everyone else reads the file from the server.',
|
||||||
|
DeliveryKind.jellyfin => 'Members with an account on that Jellyfin stream it themselves; '
|
||||||
|
'the rest through the server.',
|
||||||
|
DeliveryKind.link => 'Each app opens the link itself; the server only keeps time.',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The current media's [Delivery]; null with nothing up or nobody else in
|
||||||
|
/// the server. [names] remembers a source that left.
|
||||||
|
Delivery? deliveryOf(StateBroadcast r, {required String selfId, MemberNames? names}) {
|
||||||
|
final media = r.media;
|
||||||
|
if (media == null || r.members.length < 2) return null;
|
||||||
|
final rel = media['relay'];
|
||||||
|
final relay = rel is Map ? MediaRelay.fromJson(Map<String, Object?>.from(rel)) : null;
|
||||||
|
final ref = refOfStateMedia(media);
|
||||||
|
final url = media['url'];
|
||||||
|
final kind = relay != null
|
||||||
|
? (relay.fetch ? DeliveryKind.serverFetch : DeliveryKind.memberRelay)
|
||||||
|
: ref != null
|
||||||
|
? DeliveryKind.jellyfin
|
||||||
|
: url is String && url.isNotEmpty
|
||||||
|
? DeliveryKind.link
|
||||||
|
: r.members.any((m) => m.host)
|
||||||
|
? DeliveryKind.hostFile
|
||||||
|
: DeliveryKind.serverFile;
|
||||||
|
final sourceId = switch (kind) {
|
||||||
|
DeliveryKind.memberRelay => relay!.source,
|
||||||
|
DeliveryKind.hostFile => r.members.firstWhere((m) => m.host).id,
|
||||||
|
_ => '',
|
||||||
|
};
|
||||||
|
final source = r.members.where((m) => m.id == sourceId).firstOrNull;
|
||||||
|
var via = 0, direct = 0;
|
||||||
|
for (final m in r.members) {
|
||||||
|
if (m.out || m.id == sourceId) continue;
|
||||||
|
switch (routeOf(m, kind, sourceId, ref, r.relay)) {
|
||||||
|
case DeliveryRoute.server:
|
||||||
|
via++;
|
||||||
|
case DeliveryRoute.direct:
|
||||||
|
direct++;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// A Jellyfin item that everyone streams with their own account: the
|
||||||
|
// relay stands by, nothing goes through it.
|
||||||
|
if (kind == DeliveryKind.memberRelay && ref != null && via == 0 && source != null) {
|
||||||
|
return Delivery(kind: DeliveryKind.jellyfin, direct: direct);
|
||||||
|
}
|
||||||
|
final state = relay == null
|
||||||
|
? SourceState.ok
|
||||||
|
: kind == DeliveryKind.memberRelay && source == null
|
||||||
|
? SourceState.left
|
||||||
|
: !relay.live
|
||||||
|
? SourceState.waiting
|
||||||
|
: relay.slow
|
||||||
|
? SourceState.slow
|
||||||
|
: SourceState.ok;
|
||||||
|
return Delivery(
|
||||||
|
kind: kind,
|
||||||
|
sourceId: sourceId,
|
||||||
|
sourceName: source?.name ?? names?[sourceId] ?? 'The member passing it on',
|
||||||
|
sourceIsSelf: sourceId.isNotEmpty && sourceId == selfId,
|
||||||
|
state: state,
|
||||||
|
rate: relay?.rate ?? 0,
|
||||||
|
need: relay?.need ?? 0,
|
||||||
|
viaServer: via,
|
||||||
|
direct: direct,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// How [m] gets media of [kind] served by [sourceId]. Jellyfin: by its
|
||||||
|
/// last `report.jf` for [ref]'s server ([jellyfinRelay]: the server can
|
||||||
|
/// relay it); null before it reported.
|
||||||
|
DeliveryRoute? routeOf(MemberView m, DeliveryKind kind, String sourceId, JellyfinRef? ref, bool jellyfinRelay) {
|
||||||
|
if (sourceId.isNotEmpty && m.id == sourceId) return DeliveryRoute.source;
|
||||||
|
switch (kind) {
|
||||||
|
case DeliveryKind.link:
|
||||||
|
return DeliveryRoute.direct;
|
||||||
|
case DeliveryKind.hostFile:
|
||||||
|
case DeliveryKind.serverFile:
|
||||||
|
case DeliveryKind.serverFetch:
|
||||||
|
return DeliveryRoute.server;
|
||||||
|
case DeliveryKind.memberRelay:
|
||||||
|
case DeliveryKind.jellyfin:
|
||||||
|
final own = ref == null ? null : m.jf[ref.serverId];
|
||||||
|
if (own == true) return DeliveryRoute.direct;
|
||||||
|
if (kind == DeliveryKind.memberRelay) return DeliveryRoute.server;
|
||||||
|
return own == false && jellyfinRelay ? DeliveryRoute.server : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [m]'s route and buffer for [d] (from [deliveryOf] on [r]).
|
||||||
|
MemberDelivery memberDeliveryOf(MemberView m, StateBroadcast r, Delivery d) {
|
||||||
|
final counts = !m.out && !m.stale && m.error.isEmpty;
|
||||||
|
final need = r.bufferNeed;
|
||||||
|
final ref = refOfStateMedia(r.media);
|
||||||
|
final health = !counts
|
||||||
|
? null
|
||||||
|
: m.buffered >= need
|
||||||
|
? BufferHealth.good
|
||||||
|
: r.transport == 'playing' && m.buffered < 1
|
||||||
|
? BufferHealth.starving
|
||||||
|
: BufferHealth.low;
|
||||||
|
return MemberDelivery(
|
||||||
|
route: m.out ? null : routeOf(m, d.kind, d.sourceId, ref, r.relay),
|
||||||
|
kind: d.kind,
|
||||||
|
jellyfin: ref != null,
|
||||||
|
rate: m.rate,
|
||||||
|
health: health,
|
||||||
|
buffered: m.buffered,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the source is told once per media when it is too slow; null
|
||||||
|
/// while it keeps up (or this member is not the source).
|
||||||
|
String? slowSourceWarning(StateBroadcast r, String selfId) {
|
||||||
|
final rel = r.media?['relay'];
|
||||||
|
if (rel is! Map || selfId.isEmpty) return null;
|
||||||
|
final relay = MediaRelay.fromJson(Map<String, Object?>.from(rel));
|
||||||
|
if (relay.source != selfId || !relay.slow) return null;
|
||||||
|
return 'Your upload (${formatRate(relay.rate)}) is slower than this video needs '
|
||||||
|
'(${formatRate(relay.need)}): the others will pause to buffer now and then.';
|
||||||
|
}
|
||||||
@@ -0,0 +1,124 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
import 'dart:isolate';
|
||||||
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:image/image.dart' as img;
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../files/name_parser.dart';
|
||||||
|
import '../schedule/anilist.dart';
|
||||||
|
|
||||||
|
// Art for media this client swapped in (`art`, see PROTOCOL.md "Media
|
||||||
|
// art"): Jellyfin images with this install's account, a web link's
|
||||||
|
// thumbnail, else an AniList title search. Everything here fails quietly
|
||||||
|
// to "no art".
|
||||||
|
|
||||||
|
/// Poster and banner bytes; either may be null.
|
||||||
|
typedef ArtBytes = ({Uint8List? poster, Uint8List? banner});
|
||||||
|
|
||||||
|
/// Series poster (the item's own for movies) and series/item backdrop,
|
||||||
|
/// else its Banner image, scaled by Jellyfin to fit the caps.
|
||||||
|
Future<ArtBytes> jellyfinArt(JellyfinClient client, String itemId,
|
||||||
|
{Future<Uint8List?> Function(Uri url, Map<String, String> headers, int maxBytes) fetch = fetchImage}) async {
|
||||||
|
final item = await client.item(itemId).timeout(const Duration(seconds: 10));
|
||||||
|
final seriesPoster = item.seriesId != null && item.seriesPrimaryImageTag != null
|
||||||
|
? JellyfinImageRef(item.seriesId!, JellyfinImageType.primary, item.seriesPrimaryImageTag!)
|
||||||
|
: null;
|
||||||
|
final poster = seriesPoster ?? item.image(JellyfinImageType.primary);
|
||||||
|
var banner = item.image(JellyfinImageType.backdrop);
|
||||||
|
if (banner == null) {
|
||||||
|
var owner = item;
|
||||||
|
if (item.seriesId != null && item.ownImage(JellyfinImageType.banner) == null) {
|
||||||
|
try {
|
||||||
|
owner = await client.item(item.seriesId!).timeout(const Duration(seconds: 10));
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
banner = owner.ownImage(JellyfinImageType.banner);
|
||||||
|
}
|
||||||
|
final headers = client.authHeaders;
|
||||||
|
final (p, b) = await (
|
||||||
|
poster == null
|
||||||
|
? Future<Uint8List?>.value()
|
||||||
|
: fetch(client.imageUrl(poster, maxHeight: 450, quality: 85), headers, RelayConstants.maxPosterBytes),
|
||||||
|
banner == null
|
||||||
|
? Future<Uint8List?>.value()
|
||||||
|
: fetch(client.imageUrl(banner, maxWidth: 1280, quality: 85), headers, RelayConstants.maxBannerBytes),
|
||||||
|
).wait;
|
||||||
|
return (poster: p, banner: b);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The series of release name [name] on AniList: cover and banner; null
|
||||||
|
/// when the name says nothing or AniList knows no match.
|
||||||
|
Future<ArtBytes?> aniListArt(AniListClient aniList, String name,
|
||||||
|
{Future<Uint8List?> Function(Uri url, Map<String, String> headers, int maxBytes) fetch = fetchImage}) async {
|
||||||
|
final series = parseReleaseName(name).series.trim();
|
||||||
|
// "1", "2026-10-09": nothing a show could be called.
|
||||||
|
if (!RegExp(r'\p{L}', unicode: true).hasMatch(series)) return null;
|
||||||
|
final match = await aniList.searchMedia(series);
|
||||||
|
if (match == null) return null;
|
||||||
|
Future<Uint8List?> get(String? url, int maxBytes) async {
|
||||||
|
final uri = url == null ? null : Uri.tryParse(url);
|
||||||
|
return uri == null ? null : fetch(uri, const {}, maxBytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
final (cover, banner) = await (
|
||||||
|
get(match.cover, RelayConstants.maxPosterBytes),
|
||||||
|
get(match.banner, RelayConstants.maxBannerBytes),
|
||||||
|
).wait;
|
||||||
|
final poster = cover ?? (match.coverSmall == match.cover ? null : await get(match.coverSmall, RelayConstants.maxPosterBytes));
|
||||||
|
return (poster: poster, banner: banner);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A web video's thumbnail at [url] as both cover and banner (the same
|
||||||
|
/// bytes, so the same hash: what tells clients it is a thumbnail, see
|
||||||
|
/// `NowPlaying.thumbnail`); shrunk to a JPEG under the cover cap when
|
||||||
|
/// larger; null when it cannot be had.
|
||||||
|
Future<ArtBytes?> thumbnailArt(Uri url,
|
||||||
|
{Future<Uint8List?> Function(Uri url, Map<String, String> headers, int maxBytes) fetch = fetchImage}) async {
|
||||||
|
var bytes = await fetch(url, const {}, 8 * 1024 * 1024);
|
||||||
|
if (bytes != null && bytes.length > RelayConstants.maxPosterBytes) bytes = await _shrinkApart(bytes);
|
||||||
|
return bytes == null ? null : (poster: bytes, banner: bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Its own function, so the isolate's closure holds nothing but [raw].
|
||||||
|
Future<Uint8List?> _shrinkApart(Uint8List raw) => Isolate.run<Uint8List?>(() => _shrinkThumbnail(raw));
|
||||||
|
|
||||||
|
Uint8List? _shrinkThumbnail(Uint8List raw) {
|
||||||
|
final decoded = img.decodeImage(raw);
|
||||||
|
if (decoded == null) return null;
|
||||||
|
for (final width in const [1280, 960, 640]) {
|
||||||
|
final small = decoded.width > width ? img.copyResize(decoded, width: width, interpolation: img.Interpolation.average) : decoded;
|
||||||
|
final jpg = img.encodeJpg(small, quality: 82);
|
||||||
|
if (jpg.length <= RelayConstants.maxPosterBytes) return jpg;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// GET [url]: the bytes when 200, at most [maxBytes] and a known image
|
||||||
|
/// type (see `avatarImageType`); else null.
|
||||||
|
Future<Uint8List?> fetchImage(Uri url, Map<String, String> headers, int maxBytes) async {
|
||||||
|
final client = HttpClient()..connectionTimeout = const Duration(seconds: 10);
|
||||||
|
try {
|
||||||
|
final req = await client.getUrl(url);
|
||||||
|
headers.forEach(req.headers.set);
|
||||||
|
final resp = await req.close().timeout(const Duration(seconds: 15));
|
||||||
|
if (resp.statusCode != 200 || resp.contentLength > maxBytes) {
|
||||||
|
await resp.drain<void>().catchError((_) {});
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
final builder = BytesBuilder(copy: false);
|
||||||
|
await for (final chunk in resp.timeout(const Duration(seconds: 15))) {
|
||||||
|
builder.add(chunk);
|
||||||
|
if (builder.length > maxBytes) return null;
|
||||||
|
}
|
||||||
|
final bytes = builder.takeBytes();
|
||||||
|
return avatarImageType(bytes) == null ? null : bytes;
|
||||||
|
} catch (e) {
|
||||||
|
debugPrint('art: fetch failed: $e');
|
||||||
|
return null;
|
||||||
|
} finally {
|
||||||
|
client.close(force: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
/// What the player shows about the current media: a title, an episode line
|
||||||
|
/// and art. Art is by content hash (`state.media.art`), fetched by everyone
|
||||||
|
/// (guests included) from the server they dialled; '' when there is none.
|
||||||
|
class NowPlaying {
|
||||||
|
/// Series name for episodes, else the movie, file or link name.
|
||||||
|
final String title;
|
||||||
|
/// "S2 E4 · Episode title", "E12", or null (movies, links).
|
||||||
|
final String? episode;
|
||||||
|
/// Portrait cover (2:3) and wide banner; '' when none.
|
||||||
|
final String posterHash;
|
||||||
|
final String bannerHash;
|
||||||
|
/// A web video: its art is its thumbnail (the same picture as cover and
|
||||||
|
/// banner, or none yet), shown wide, under the video's own name.
|
||||||
|
final bool thumbnail;
|
||||||
|
const NowPlaying(
|
||||||
|
{required this.title, this.episode, this.posterHash = '', this.bannerHash = '', this.thumbnail = false});
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) =>
|
||||||
|
other is NowPlaying &&
|
||||||
|
other.title == title &&
|
||||||
|
other.episode == episode &&
|
||||||
|
other.posterHash == posterHash &&
|
||||||
|
other.bannerHash == bannerHash &&
|
||||||
|
other.thumbnail == thumbnail;
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode => Object.hash(title, episode, posterHash, bannerHash, thumbnail);
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
import 'package:sync_relay_core/core.dart' show hasMediaExtension;
|
||||||
|
|
||||||
|
import '../files/name_parser.dart';
|
||||||
|
import '../jellyfin/session_media.dart';
|
||||||
|
import 'now_playing.dart';
|
||||||
|
|
||||||
|
// Title and episode line of `state.media` (pure; see [NowPlaying]).
|
||||||
|
|
||||||
|
// "S1E6" (pickFor) or "S01E02".
|
||||||
|
final _episodeLabel = RegExp(r'^S(\d{1,3})\s?E(\d{1,4})$', caseSensitive: false);
|
||||||
|
final _year = RegExp(r'^(?:19|20)\d{2}$');
|
||||||
|
final _ext = RegExp(r'\.(?=[a-z0-9]*[a-z])[a-z0-9]{2,4}$', caseSensitive: false);
|
||||||
|
|
||||||
|
/// What the player shows for [media] (`state.media`); null with nothing up.
|
||||||
|
NowPlaying? nowPlayingOf(Map<String, Object?>? media) {
|
||||||
|
if (media == null) return null;
|
||||||
|
final name = media['name'] is String ? media['name'] as String : '';
|
||||||
|
final art = media['art'] is Map ? media['art'] as Map : const {};
|
||||||
|
final poster = art['poster'] is String ? art['poster'] as String : '';
|
||||||
|
final banner = art['banner'] is String ? art['banner'] as String : '';
|
||||||
|
final ref = refOfStateMedia(media);
|
||||||
|
// A web video: its name as is, no episode guessing, its thumbnail as
|
||||||
|
// the art. Told by the art once it is up (the same picture as cover and
|
||||||
|
// banner), before that by the media itself, so it never changes layout.
|
||||||
|
final web = poster.isNotEmpty || banner.isNotEmpty ? poster == banner : ref == null && isWebVideo(media);
|
||||||
|
if (web) {
|
||||||
|
return NowPlaying(title: name, posterHash: poster, bannerHash: banner, thumbnail: true);
|
||||||
|
}
|
||||||
|
final (title, episode) = ref != null
|
||||||
|
? jellyfinTitle(ref.title.isNotEmpty ? ref.title : name, ref.subtitle)
|
||||||
|
: fileTitle(name);
|
||||||
|
return NowPlaying(title: title, episode: episode, posterHash: poster, bannerHash: banner);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [media] (`state.media`, not Jellyfin) is a web page's video, whose art
|
||||||
|
/// will be its thumbnail: a shared http(s) link that is no media file (the
|
||||||
|
/// everyone-opens-it mode), or a relayed one (passed on by a member or
|
||||||
|
/// fetched by the server: the URL stays private) named by the page's title,
|
||||||
|
/// not a file name. A relayed file keeps its file name's extension.
|
||||||
|
bool isWebVideo(Map<String, Object?> media) {
|
||||||
|
final url = media['url'];
|
||||||
|
if (url is String && url.isNotEmpty) {
|
||||||
|
final uri = Uri.tryParse(url);
|
||||||
|
return uri != null &&
|
||||||
|
(uri.isScheme('http') || uri.isScheme('https')) &&
|
||||||
|
uri.host.isNotEmpty &&
|
||||||
|
!hasMediaExtension(uri);
|
||||||
|
}
|
||||||
|
final name = media['name'] is String ? media['name'] as String : '';
|
||||||
|
return media['relay'] is Map && name.isNotEmpty && !_ext.hasMatch(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Jellyfin: [name] is the item's, [subtitle] "Series · S1E6" (or
|
||||||
|
/// "Series - S01E02") for episodes, the year for movies. Episodes give the
|
||||||
|
/// series and "S1 E6 · Name"; anything else the name alone.
|
||||||
|
(String, String?) jellyfinTitle(String name, String? subtitle) {
|
||||||
|
final sub = subtitle?.trim() ?? '';
|
||||||
|
if (sub.isEmpty || _year.hasMatch(sub)) return (name, null);
|
||||||
|
// The label is after the last separator (or the whole subtitle).
|
||||||
|
final cut = RegExp(r' [·-] ').allMatches(sub).lastOrNull;
|
||||||
|
final m = _episodeLabel.firstMatch(cut == null ? sub : sub.substring(cut.end).trim());
|
||||||
|
final series = m == null ? sub : (cut == null ? '' : sub.substring(0, cut.start).trim());
|
||||||
|
final label = m == null ? null : 'S${int.parse(m.group(1)!)} E${int.parse(m.group(2)!)}';
|
||||||
|
if (series.isEmpty) return (name, label);
|
||||||
|
final episode = [?label, if (name.isNotEmpty) name].join(' · ');
|
||||||
|
return (series, episode.isEmpty ? null : episode);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Files and links: the release name's series and "S1 E3", "E25" or its
|
||||||
|
/// extra marker (NCOP1, OVA 2); the name minus extension when it says
|
||||||
|
/// nothing better.
|
||||||
|
(String, String?) fileTitle(String name) {
|
||||||
|
final p = parseReleaseName(name);
|
||||||
|
final series = p.series.trim();
|
||||||
|
if (series.isEmpty) return (name.replaceFirst(_ext, ''), null);
|
||||||
|
final String? episode;
|
||||||
|
if (p.episode != null) {
|
||||||
|
episode = p.season != null ? 'S${p.season} E${p.episode}' : 'E${p.episode}';
|
||||||
|
} else {
|
||||||
|
episode = p.extra;
|
||||||
|
}
|
||||||
|
return (series, episode);
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
|
||||||
|
/// Timings of one media change on this client, from the `state` naming
|
||||||
|
/// the new media to the server playing it (see ARCHITECTURE.md "Getting
|
||||||
|
/// ready"). Printed when [enabled] (env `SYNC_RELAY_TRACE_SWITCH=1`);
|
||||||
|
/// marks are always kept for the last few media, tests read them.
|
||||||
|
class SwitchTrace {
|
||||||
|
/// Phases, in the order they usually happen.
|
||||||
|
static const state = 'state';
|
||||||
|
static const resolved = 'resolved';
|
||||||
|
static const open = 'open';
|
||||||
|
/// A fresh player is up for it (no preload held it).
|
||||||
|
static const player = 'player';
|
||||||
|
static const opened = 'opened';
|
||||||
|
static const preloaded = 'preloaded';
|
||||||
|
static const buffered = 'buffered';
|
||||||
|
static const playing = 'playing';
|
||||||
|
|
||||||
|
static bool enabled = (Platform.environment['SYNC_RELAY_TRACE_SWITCH'] ?? '').isNotEmpty;
|
||||||
|
|
||||||
|
final String who;
|
||||||
|
SwitchTrace([this.who = '']);
|
||||||
|
|
||||||
|
final Map<int, Map<String, int>> _marks = {};
|
||||||
|
final Map<int, Stopwatch> _clocks = {};
|
||||||
|
|
||||||
|
/// Milliseconds from [state] to each phase of media [mediaId].
|
||||||
|
Map<String, int> of(int mediaId) => Map.unmodifiable(_marks[mediaId] ?? const {});
|
||||||
|
|
||||||
|
/// Starts the clock for [mediaId] (its first `state`).
|
||||||
|
void start(int mediaId) {
|
||||||
|
if (_clocks.containsKey(mediaId)) return;
|
||||||
|
_clocks[mediaId] = Stopwatch()..start();
|
||||||
|
_marks[mediaId] = {state: 0};
|
||||||
|
while (_clocks.length > 4) {
|
||||||
|
final oldest = _clocks.keys.first;
|
||||||
|
_clocks.remove(oldest);
|
||||||
|
_marks.remove(oldest);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Records [phase] once for [mediaId]; [playing] ends the trace.
|
||||||
|
void mark(int mediaId, String phase) {
|
||||||
|
final clock = _clocks[mediaId];
|
||||||
|
final marks = _marks[mediaId];
|
||||||
|
if (clock == null || marks == null || marks.containsKey(phase)) return;
|
||||||
|
marks[phase] = clock.elapsedMilliseconds;
|
||||||
|
if (phase == playing && enabled) {
|
||||||
|
debugPrint('switch${who.isEmpty ? '' : ' $who'} m$mediaId: '
|
||||||
|
'${[for (final e in marks.entries) '${e.key} +${e.value} ms'].join(', ')}');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,20 +1,25 @@
|
|||||||
|
/// The app's sounds. Only events that carry news get one: no sound for
|
||||||
|
/// what the video itself makes obvious (start, pause, end, seeks).
|
||||||
enum SfxKind {
|
enum SfxKind {
|
||||||
|
/// Someone readies up; pitch climbs with [SfxCue.readyIndex].
|
||||||
ready,
|
ready,
|
||||||
unready,
|
unready,
|
||||||
|
/// Someone marks everyone ready.
|
||||||
forceReady,
|
forceReady,
|
||||||
forceUnready,
|
|
||||||
forcePlay,
|
|
||||||
forceHold,
|
|
||||||
kick,
|
|
||||||
join,
|
join,
|
||||||
leave,
|
leave,
|
||||||
stale,
|
/// Someone sat you out (played by the session, not from a feed action).
|
||||||
|
kick,
|
||||||
|
/// A new video or episode is put up.
|
||||||
swap,
|
swap,
|
||||||
seek,
|
|
||||||
pause,
|
|
||||||
resume,
|
|
||||||
chat,
|
chat,
|
||||||
|
/// Idle warning: auto-unready soon.
|
||||||
warn,
|
warn,
|
||||||
|
/// The connection to the server dropped / came back.
|
||||||
|
lost,
|
||||||
|
back,
|
||||||
|
/// Someone pokes you for attention; plays only on your end.
|
||||||
|
nudge,
|
||||||
}
|
}
|
||||||
|
|
||||||
class SfxCue {
|
class SfxCue {
|
||||||
@@ -23,42 +28,16 @@ class SfxCue {
|
|||||||
const SfxCue(this.kind, {this.readyIndex = 0});
|
const SfxCue(this.kind, {this.readyIndex = 0});
|
||||||
}
|
}
|
||||||
|
|
||||||
SfxKind? sfxForFeedAction(String action) {
|
SfxKind? sfxForFeedAction(String action) => switch (action) {
|
||||||
switch (action) {
|
'ready' => SfxKind.ready,
|
||||||
case 'ready':
|
'unready' => SfxKind.unready,
|
||||||
return SfxKind.ready;
|
'force-ready' => SfxKind.forceReady,
|
||||||
case 'unready':
|
'join' => SfxKind.join,
|
||||||
return SfxKind.unready;
|
'leave' => SfxKind.leave,
|
||||||
case 'force-ready':
|
'swap' => SfxKind.swap,
|
||||||
return SfxKind.forceReady;
|
'chat' => SfxKind.chat,
|
||||||
case 'force-unready':
|
_ => null,
|
||||||
return SfxKind.forceUnready;
|
};
|
||||||
case 'force-play':
|
|
||||||
return SfxKind.forcePlay;
|
|
||||||
case 'force-hold':
|
|
||||||
return SfxKind.forceHold;
|
|
||||||
case 'kick':
|
|
||||||
return SfxKind.kick;
|
|
||||||
case 'join':
|
|
||||||
return SfxKind.join;
|
|
||||||
case 'leave':
|
|
||||||
return SfxKind.leave;
|
|
||||||
case 'stale':
|
|
||||||
return SfxKind.stale;
|
|
||||||
case 'swap':
|
|
||||||
return SfxKind.swap;
|
|
||||||
case 'seek':
|
|
||||||
return SfxKind.seek;
|
|
||||||
case 'pause':
|
|
||||||
return SfxKind.pause;
|
|
||||||
case 'resume':
|
|
||||||
return SfxKind.resume;
|
|
||||||
case 'chat':
|
|
||||||
return SfxKind.chat;
|
|
||||||
default:
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
abstract class SfxService {
|
abstract class SfxService {
|
||||||
Future<void> play(SfxCue cue);
|
Future<void> play(SfxCue cue);
|
||||||
|
|||||||
@@ -0,0 +1,268 @@
|
|||||||
|
import 'sfx.dart';
|
||||||
|
import 'synth.dart';
|
||||||
|
|
||||||
|
// The app's sounds come in presets; each action can take its sound from any
|
||||||
|
// of them. Every preset is quiet, short and on D, so sounds from different
|
||||||
|
// presets still agree when they overlap.
|
||||||
|
// - Cosmic: star bells, stardust, bubbles, soft pads, a space tail.
|
||||||
|
// - Abyss: deep space and its dread. Far beacons, nebula washes, slow
|
||||||
|
// beating clusters and tritone sags, on D phrygian, with a vast tail.
|
||||||
|
// - Wood & glass: plucked strings, glass bells, wood knocks, a short room.
|
||||||
|
|
||||||
|
enum SoundPreset { cosmic, abyss, woodAndGlass }
|
||||||
|
|
||||||
|
/// Shown in Settings: name and feel.
|
||||||
|
const presetInfo = {
|
||||||
|
SoundPreset.cosmic: ('Cosmic', 'Star bells, stardust and a soft space tail'),
|
||||||
|
SoundPreset.abyss: ('Abyss', 'Deep space: far beacons, nebula, a vast dark tail'),
|
||||||
|
SoundPreset.woodAndGlass: ('Wood & glass', 'Plucked strings, glass bells and wood, close and dry'),
|
||||||
|
};
|
||||||
|
|
||||||
|
/// The preset used when nothing else is chosen.
|
||||||
|
const defaultPreset = SoundPreset.abyss;
|
||||||
|
|
||||||
|
const _d3 = -19, _ab3 = -13;
|
||||||
|
const _d4 = -7, _eb4 = -6, _ab4 = -1, _a4 = 0, _b4 = 2;
|
||||||
|
const _d5 = 5, _eb5 = 6, _e5 = 7, _f5 = 8, _fs5 = 9, _g5 = 10, _a5 = 12, _bb5 = 13, _b5 = 14;
|
||||||
|
const _c6 = 15, _cs6 = 16, _d6 = 17, _e6 = 19, _f6 = 20, _fs6 = 21, _g6 = 22, _a6 = 24, _b6 = 26;
|
||||||
|
|
||||||
|
double _p(int s) => semi(s);
|
||||||
|
|
||||||
|
/// The ready sound's answer climbs with each person ready.
|
||||||
|
const _cosmicLadder = [_a5, _b5, _d6, _e6, _fs6, _a6];
|
||||||
|
const _abyssLadder = [_f5, _g5, _a5, _c6, _d6, _f6];
|
||||||
|
const _woodLadder = [_g5, _a5, _b5, _d6, _e6, _g6];
|
||||||
|
|
||||||
|
SoundSpec readySound(int readyIndex, {SoundPreset preset = defaultPreset}) =>
|
||||||
|
soundFor(SfxKind.ready, readyIndex: readyIndex, preset: preset);
|
||||||
|
|
||||||
|
SoundSpec soundFor(SfxKind kind, {int readyIndex = 1, SoundPreset preset = defaultPreset}) {
|
||||||
|
final i = (readyIndex - 1).clamp(0, 5);
|
||||||
|
return switch (preset) {
|
||||||
|
SoundPreset.cosmic => _cosmic(kind, i),
|
||||||
|
SoundPreset.abyss => _abyss(kind, i),
|
||||||
|
SoundPreset.woodAndGlass => _wood(kind, i),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
SoundSpec _cosmic(SfxKind kind, int i) => switch (kind) {
|
||||||
|
SfxKind.ready => SoundSpec([
|
||||||
|
Note(0, _p(_d4), 1.0, voice: Voice.pad, gain: 0.3),
|
||||||
|
Note(0, _p(_d5), 1.2, voice: Voice.star, gain: 0.8, bright: 0.4),
|
||||||
|
Note(0.09, _p(_cosmicLadder[i]), 1.5, voice: Voice.star, bright: 0.5),
|
||||||
|
], peakDb: -17, room: 0.3),
|
||||||
|
// The same bells, dimmed and stepping down.
|
||||||
|
SfxKind.unready => SoundSpec([
|
||||||
|
Note(0, _p(_fs5), 0.6, voice: Voice.star, gain: 0.8, bright: 0.15),
|
||||||
|
Note(0.1, _p(_d5), 0.8, voice: Voice.star, bright: 0.1),
|
||||||
|
], cutoff: 3500, peakDb: -20, room: 0.25),
|
||||||
|
// Just the bell, left hanging in space: playback is the rest of the cue.
|
||||||
|
SfxKind.forceReady => SoundSpec([
|
||||||
|
Note(0, _p(_d6), 1.8, voice: Voice.star, bright: 0.7),
|
||||||
|
], cutoff: 7000, peakDb: -18, room: 0.35, tail: 1.6),
|
||||||
|
// A star arriving: dust rising into a bell.
|
||||||
|
SfxKind.join => SoundSpec([
|
||||||
|
Note(0, _p(_d6), 1.0, voice: Voice.dust, to: _p(_a6), gain: 0.5),
|
||||||
|
Note(0.15, _p(_a5), 1.4, voice: Voice.star, bright: 0.35, gain: 0.6),
|
||||||
|
], cutoff: 7000, peakDb: -19, room: 0.3),
|
||||||
|
// Dust drifting down, a low bell going out.
|
||||||
|
SfxKind.leave => SoundSpec([
|
||||||
|
Note(0, _p(_a6), 0.9, voice: Voice.dust, to: _p(_d6), gain: 0.5),
|
||||||
|
Note(0.1, _p(_d5), 1.3, voice: Voice.star, bright: 0.2, gain: 0.5),
|
||||||
|
], cutoff: 5000, peakDb: -22, room: 0.3),
|
||||||
|
// Falling into the dark: a deep tone sinking an octave under a sagging pad.
|
||||||
|
SfxKind.kick => SoundSpec([
|
||||||
|
Note(0, _p(_d4), 1.0, voice: Voice.sub, to: _p(_d3)),
|
||||||
|
Note(0, _p(_a4), 0.9, voice: Voice.pad, to: _p(_d4), gain: 0.4),
|
||||||
|
], cutoff: 3000, peakDb: -19, room: 0.25),
|
||||||
|
// Something new opens up: a rush of air, then a wide chord blooms.
|
||||||
|
SfxKind.swap => SoundSpec([
|
||||||
|
Note(0, 300, 0.6, voice: Voice.slide, to: 2400, gain: 0.35),
|
||||||
|
Note(0.35, _p(_d4), 1.4, voice: Voice.pad, gain: 0.5, bright: 0.3),
|
||||||
|
Note(0.35, _p(_a4), 1.4, voice: Voice.pad, gain: 0.5, bright: 0.3),
|
||||||
|
Note(0.35, _p(_e5), 1.4, voice: Voice.pad, gain: 0.4, bright: 0.3),
|
||||||
|
Note(0.38, _p(_fs6), 1.2, voice: Voice.star, bright: 0.3, gain: 0.3),
|
||||||
|
], peakDb: -18, room: 0.3),
|
||||||
|
// Two bubbles rising: bloop-bloop, the second higher.
|
||||||
|
SfxKind.chat => SoundSpec([
|
||||||
|
Note(0, _p(_a5), 0.18, voice: Voice.drop, gain: 0.8),
|
||||||
|
Note(0.08, _p(_e6), 0.22, voice: Voice.drop),
|
||||||
|
], peakDb: -19, room: 0.15, tail: 1.0),
|
||||||
|
// Something huge drifting past: a slow, deep swell.
|
||||||
|
SfxKind.warn => SoundSpec([
|
||||||
|
Note(0, _p(_d4), 2.0, voice: Voice.pad),
|
||||||
|
Note(0, _p(_a4), 2.0, voice: Voice.pad, gain: 0.5),
|
||||||
|
Note(0.3, _p(_d3), 1.7, voice: Voice.sub, gain: 0.4),
|
||||||
|
], cutoff: 3000, peakDb: -20, room: 0.2, tail: 1.0),
|
||||||
|
// The signal fading: a chord sagging down and dimming.
|
||||||
|
SfxKind.lost => SoundSpec([
|
||||||
|
Note(0, _p(_a4), 1.2, voice: Voice.pad, to: _p(_d4), gain: 0.7),
|
||||||
|
Note(0, _p(_e5), 1.2, voice: Voice.pad, to: _p(_a4), gain: 0.4),
|
||||||
|
], cutoff: 2500, peakDb: -19, room: 0.3, tail: 1.2),
|
||||||
|
// Re-acquired: a bell gliding up into tune, landing with dust.
|
||||||
|
SfxKind.back => SoundSpec([
|
||||||
|
Note(0, _p(_a4), 0.6, voice: Voice.star, to: _p(_d5), bright: 0.3, gain: 0.5),
|
||||||
|
Note(0.22, _p(_a5), 1.2, voice: Voice.star, bright: 0.5),
|
||||||
|
Note(0.25, _p(_d6), 0.6, voice: Voice.dust, to: _p(_a6), gain: 0.3),
|
||||||
|
], peakDb: -18, room: 0.25),
|
||||||
|
// A poke: two quick bright bubbles flicking up, a glint on the second.
|
||||||
|
// High and dry so it cuts through a video and stays a patter when spammed.
|
||||||
|
SfxKind.nudge => SoundSpec([
|
||||||
|
Note(0, _p(_d6), 0.12, voice: Voice.drop, to: _p(_fs6), gain: 0.8),
|
||||||
|
Note(0.09, _p(_a6), 0.16, voice: Voice.drop),
|
||||||
|
Note(0.09, _p(_cs6) * 2, 0.3, voice: Voice.star, bright: 0.6, gain: 0.2),
|
||||||
|
], cutoff: 7000, peakDb: -18, room: 0.05, tail: 0.6),
|
||||||
|
};
|
||||||
|
|
||||||
|
SoundSpec _abyss(SfxKind kind, int i) => switch (kind) {
|
||||||
|
// A beacon pinging far out, the void humming under it.
|
||||||
|
SfxKind.ready => SoundSpec([
|
||||||
|
Note(0, _p(_d3), 1.2, voice: Voice.pad, gain: 0.35),
|
||||||
|
Note(0, _p(_d5), 1.4, voice: Voice.star, gain: 0.8, bright: 0.25),
|
||||||
|
Note(0.12, _p(_abyssLadder[i]), 1.6, voice: Voice.star, bright: 0.3),
|
||||||
|
], cutoff: 5000, peakDb: -18, room: 0.4, tail: 1.8),
|
||||||
|
// The beacon answering itself a tritone down, dimmer.
|
||||||
|
SfxKind.unready => SoundSpec([
|
||||||
|
Note(0, _p(_a4), 0.7, voice: Voice.star, gain: 0.8, bright: 0.1),
|
||||||
|
Note(0.12, _p(_eb4), 0.9, voice: Voice.star, bright: 0.1),
|
||||||
|
], cutoff: 2500, peakDb: -21, room: 0.35, tail: 1.6),
|
||||||
|
// One bell, huge and very far away.
|
||||||
|
SfxKind.forceReady => SoundSpec([
|
||||||
|
Note(0, _p(_d5), 1.7, voice: Voice.star, bright: 0.5),
|
||||||
|
], cutoff: 5000, peakDb: -18, room: 0.45, tail: 1.8),
|
||||||
|
// Something emerging from the nebula: a dark wash brightening into a bell.
|
||||||
|
SfxKind.join => SoundSpec([
|
||||||
|
Note(0, 150, 1.2, voice: Voice.slide, to: 900, gain: 0.4),
|
||||||
|
Note(0.05, _p(_d4), 1.2, voice: Voice.pad, gain: 0.3),
|
||||||
|
Note(0.3, _p(_a5), 1.3, voice: Voice.star, bright: 0.3, gain: 0.5),
|
||||||
|
], cutoff: 4500, peakDb: -19, room: 0.4, tail: 1.6),
|
||||||
|
// Swallowed back into it: the wash darkening over a fading bell.
|
||||||
|
SfxKind.leave => SoundSpec([
|
||||||
|
Note(0, 900, 1.1, voice: Voice.slide, to: 150, gain: 0.4),
|
||||||
|
Note(0.1, _p(_d5), 1.2, voice: Voice.star, bright: 0.15, gain: 0.4),
|
||||||
|
], cutoff: 3500, peakDb: -22, room: 0.4, tail: 1.6),
|
||||||
|
// Pulled under: a deep fall with a tritone sagging over it.
|
||||||
|
SfxKind.kick => SoundSpec([
|
||||||
|
Note(0, _p(_d4), 1.3, voice: Voice.sub, to: _p(_d3)),
|
||||||
|
Note(0, _p(_ab4), 1.2, voice: Voice.pad, to: _p(_d4), gain: 0.35),
|
||||||
|
], cutoff: 2000, peakDb: -19, room: 0.35, tail: 1.6),
|
||||||
|
// A door into the dark: low air, then an unresolved chord opens.
|
||||||
|
SfxKind.swap => SoundSpec([
|
||||||
|
Note(0, 120, 0.8, voice: Voice.slide, to: 1200, gain: 0.35),
|
||||||
|
Note(0.45, _p(_d4), 1.3, voice: Voice.pad, gain: 0.5, bright: 0.2),
|
||||||
|
Note(0.45, _p(_a4), 1.3, voice: Voice.pad, gain: 0.45, bright: 0.2),
|
||||||
|
Note(0.45, _p(_eb5), 1.3, voice: Voice.pad, gain: 0.3, bright: 0.2),
|
||||||
|
Note(0.5, _p(_bb5), 1.1, voice: Voice.star, bright: 0.2, gain: 0.25),
|
||||||
|
], cutoff: 4000, peakDb: -19, room: 0.35, tail: 1.4),
|
||||||
|
// Bubbles rising from deep water.
|
||||||
|
SfxKind.chat => SoundSpec([
|
||||||
|
Note(0, _p(_d5), 0.25, voice: Voice.drop, gain: 0.8),
|
||||||
|
Note(0.1, _p(_a5), 0.3, voice: Voice.drop),
|
||||||
|
], cutoff: 4500, peakDb: -19, room: 0.3, tail: 1.4),
|
||||||
|
// Something vast drawing near: a slow swell of two notes rubbing.
|
||||||
|
SfxKind.warn => SoundSpec([
|
||||||
|
Note(0, _p(_d4), 2.0, voice: Voice.pad),
|
||||||
|
Note(0, _p(_eb4), 2.0, voice: Voice.pad, gain: 0.35),
|
||||||
|
Note(0.3, _p(_d3), 1.7, voice: Voice.sub, gain: 0.45),
|
||||||
|
], cutoff: 2200, peakDb: -20, room: 0.25, tail: 1.0),
|
||||||
|
// The signal drowning: a chord sagging by a tritone into static.
|
||||||
|
SfxKind.lost => SoundSpec([
|
||||||
|
Note(0, _p(_a4), 1.3, voice: Voice.pad, to: _p(_eb4), gain: 0.7),
|
||||||
|
Note(0, _p(_d4), 1.3, voice: Voice.pad, to: _p(_ab3), gain: 0.5),
|
||||||
|
Note(0.2, 600, 1.0, voice: Voice.slide, to: 200, gain: 0.2),
|
||||||
|
], cutoff: 2000, peakDb: -19, room: 0.35, tail: 1.4),
|
||||||
|
// Found again: a bell climbing out of the tritone into tune.
|
||||||
|
SfxKind.back => SoundSpec([
|
||||||
|
Note(0, _p(_ab4), 0.6, voice: Voice.star, to: _p(_d5), bright: 0.25, gain: 0.5),
|
||||||
|
Note(0.25, _p(_a5), 1.3, voice: Voice.star, bright: 0.4),
|
||||||
|
Note(0.28, _p(_d5), 0.6, voice: Voice.dust, to: _p(_a5), gain: 0.25),
|
||||||
|
], cutoff: 5000, peakDb: -18, room: 0.35, tail: 1.6),
|
||||||
|
// A poke from the dark: two quick bubbles flicking up, a pale glint.
|
||||||
|
// Still high and fairly dry so it cuts through a video when spammed.
|
||||||
|
SfxKind.nudge => SoundSpec([
|
||||||
|
Note(0, _p(_a5), 0.13, voice: Voice.drop, to: _p(_c6), gain: 0.8),
|
||||||
|
Note(0.1, _p(_d6), 0.18, voice: Voice.drop),
|
||||||
|
Note(0.1, _p(_a6), 0.35, voice: Voice.star, bright: 0.5, gain: 0.2),
|
||||||
|
], cutoff: 6000, peakDb: -18, room: 0.1, tail: 1.0),
|
||||||
|
};
|
||||||
|
|
||||||
|
SoundSpec _wood(SfxKind kind, int i) => switch (kind) {
|
||||||
|
SfxKind.ready => SoundSpec([
|
||||||
|
Note(0, _p(_d5), 0.9, gain: 0.75, bright: 0.55),
|
||||||
|
Note(0.085, _p(_woodLadder[i]), 1.1, bright: 0.65),
|
||||||
|
], peakDb: -17, room: 0.14, tail: 0.5),
|
||||||
|
// The same strings, muted and stepping down.
|
||||||
|
SfxKind.unready => SoundSpec([
|
||||||
|
Note(0, _p(_a5), 0.35, gain: 0.8, bright: 0.2),
|
||||||
|
Note(0.09, _p(_g5), 0.45, bright: 0.15),
|
||||||
|
], cutoff: 3800, peakDb: -20, room: 0.1, tail: 0.5),
|
||||||
|
// Just the bell: playback starting is the rest of the cue.
|
||||||
|
SfxKind.forceReady => SoundSpec([
|
||||||
|
Note(0, _p(_d6) * 2, 1.6, voice: Voice.chime),
|
||||||
|
], cutoff: 7000, peakDb: -18, room: 0.18, tail: 0.5),
|
||||||
|
// Wind through glass: three uneven tinkles.
|
||||||
|
SfxKind.join => SoundSpec([
|
||||||
|
Note(0, _p(_a6), 1.3, voice: Voice.chime, gain: 0.8),
|
||||||
|
Note(0.11, _p(_d6) * 2, 1.2, voice: Voice.chime, gain: 0.55),
|
||||||
|
Note(0.26, _p(_e6) * 2, 1.4, voice: Voice.chime, gain: 0.45),
|
||||||
|
], cutoff: 7000, peakDb: -19, room: 0.18, tail: 0.5),
|
||||||
|
// The wind settling: two softer, lower tinkles.
|
||||||
|
SfxKind.leave => SoundSpec([
|
||||||
|
Note(0, _p(_b6), 1.0, voice: Voice.chime, gain: 0.6),
|
||||||
|
Note(0.17, _p(_e6), 1.3, voice: Voice.chime, gain: 0.5),
|
||||||
|
], cutoff: 5000, peakDb: -22, room: 0.18, tail: 0.5),
|
||||||
|
// Two hardwood clacks, then a low muted string.
|
||||||
|
SfxKind.kick => SoundSpec([
|
||||||
|
Note(0, 1900, 0.09, voice: Voice.clack),
|
||||||
|
Note(0.16, 1750, 0.11, voice: Voice.clack, gain: 0.9),
|
||||||
|
Note(0.3, _p(_d4), 0.7, bright: 0.15, gain: 0.7),
|
||||||
|
], cutoff: 5000, peakDb: -19, room: 0.12, tail: 0.5),
|
||||||
|
// The door slides open on something new: air, then a fifth.
|
||||||
|
SfxKind.swap => SoundSpec([
|
||||||
|
Note(0, 500, 0.42, voice: Voice.slide, to: 1700, gain: 0.5),
|
||||||
|
Note(0.33, _p(_d5), 1.1, bright: 0.6, gain: 0.8),
|
||||||
|
Note(0.36, _p(_a5), 1.1, bright: 0.6, gain: 0.7),
|
||||||
|
], peakDb: -18, tail: 0.5),
|
||||||
|
// A hollow wooden tok-tok, the second higher.
|
||||||
|
SfxKind.chat => SoundSpec([
|
||||||
|
Note(0, _p(_g5), 0.13, voice: Voice.bamboo, gain: 0.85),
|
||||||
|
Note(0.075, _p(_d6), 0.16, voice: Voice.bamboo),
|
||||||
|
], cutoff: 5500, peakDb: -19, room: 0.1, tail: 0.5),
|
||||||
|
// A bowl: one soft strike that hums.
|
||||||
|
SfxKind.warn => SoundSpec([
|
||||||
|
Note(0, _p(_d5), 2.6, voice: Voice.rin),
|
||||||
|
], cutoff: 4500, peakDb: -20, room: 0.1, tail: 0.5),
|
||||||
|
// A string going slack: plucked, its pitch sagging away.
|
||||||
|
SfxKind.lost => SoundSpec([
|
||||||
|
Note(0, _p(_a5), 1.1, to: _p(_d5), bright: 0.4),
|
||||||
|
Note(0.05, _p(_d5), 1.0, to: _p(_a4), bright: 0.3, gain: 0.6),
|
||||||
|
], cutoff: 3500, peakDb: -19, tail: 0.5),
|
||||||
|
// Re-tuned: a quick bend up that lands, and a tinkle.
|
||||||
|
SfxKind.back => SoundSpec([
|
||||||
|
Note(0, _p(_b4), 0.9, to: _p(_d5), bright: 0.5),
|
||||||
|
Note(0.2, _p(_a5), 1.0, bright: 0.6, gain: 0.7),
|
||||||
|
Note(0.3, _p(_d6) * 2, 1.0, voice: Voice.chime, gain: 0.2),
|
||||||
|
], peakDb: -18, tail: 0.5),
|
||||||
|
// Two quick wooden taps, the second flicking up, with a glint.
|
||||||
|
SfxKind.nudge => SoundSpec([
|
||||||
|
Note(0, _p(_a5), 0.12, voice: Voice.bamboo, gain: 0.8),
|
||||||
|
Note(0.09, _p(_e6), 0.16, voice: Voice.bamboo),
|
||||||
|
Note(0.09, _p(_b6), 0.35, voice: Voice.chime, gain: 0.3),
|
||||||
|
], cutoff: 6500, peakDb: -18, room: 0.04, tail: 0.5),
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Shown in Settings → Notifications & sounds: name and when it plays.
|
||||||
|
const soundInfo = {
|
||||||
|
SfxKind.ready: ('Ready', 'Someone presses Space; climbs with each ready person'),
|
||||||
|
SfxKind.unready: ('Not ready', 'Someone takes their ready back'),
|
||||||
|
SfxKind.forceReady: ('Everyone ready', 'Someone marks everyone ready'),
|
||||||
|
SfxKind.join: ('Joined', 'Someone joins the server'),
|
||||||
|
SfxKind.leave: ('Left', 'Someone leaves'),
|
||||||
|
SfxKind.kick: ('Sat out', 'Someone sits you out'),
|
||||||
|
SfxKind.swap: ('New video', 'A different video or episode is put up'),
|
||||||
|
SfxKind.chat: ('Message', 'A chat message from someone else'),
|
||||||
|
SfxKind.warn: ('Idle warning', 'Auto-unready soon unless you press Space'),
|
||||||
|
SfxKind.lost: ('Connection lost', 'The server stopped answering; reconnecting'),
|
||||||
|
SfxKind.back: ('Reconnected', 'Back in the server after a drop'),
|
||||||
|
SfxKind.nudge: ('Nudge', 'Someone nudges you; always plays (volume still applies)'),
|
||||||
|
};
|
||||||
@@ -0,0 +1,473 @@
|
|||||||
|
import 'dart:math' as math;
|
||||||
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
// A tiny offline synthesizer for UI sounds. The current palette is
|
||||||
|
// spacious: FM star bells, bubble drops, slow pads, a sub that falls away,
|
||||||
|
// stardust and a long dark space tail. Older voices (plucked string, glass
|
||||||
|
// and bowl bells, wood) stay available. Renders to 16-bit mono WAV bytes.
|
||||||
|
// Pure Dart.
|
||||||
|
|
||||||
|
const sampleRate = 44100;
|
||||||
|
|
||||||
|
enum Voice {
|
||||||
|
/// Plucked string; [Note.to] bends it (the delay line stretches).
|
||||||
|
koto,
|
||||||
|
/// Small glass bell: inharmonic partials, a slow shimmer.
|
||||||
|
chime,
|
||||||
|
/// Singing bowl: a soft strike and a long beating hum.
|
||||||
|
rin,
|
||||||
|
/// Hollow bamboo knock, pitched.
|
||||||
|
bamboo,
|
||||||
|
/// Two hardwood blocks struck together.
|
||||||
|
clack,
|
||||||
|
/// Breathy air sweeping up (a sliding door); [Note.hz]→[Note.to] is the
|
||||||
|
/// sweep of its band.
|
||||||
|
slide,
|
||||||
|
/// FM bell: strikes glassy, settles to a pure hanging tone; [Note.bright]
|
||||||
|
/// scales the strike, [Note.to] glides it.
|
||||||
|
star,
|
||||||
|
/// A bubble: the pitch rises into the note fast; [Note.to] flicks it on.
|
||||||
|
drop,
|
||||||
|
/// Slow detuned swell (in over a third of its length, then out);
|
||||||
|
/// [Note.bright] adds overtones, [Note.to] glides it.
|
||||||
|
pad,
|
||||||
|
/// Deep round tone that falls from [Note.hz] to [Note.to].
|
||||||
|
sub,
|
||||||
|
/// A scatter of tiny pings on the scale above [Note.hz], drifting
|
||||||
|
/// towards [Note.to].
|
||||||
|
dust,
|
||||||
|
}
|
||||||
|
|
||||||
|
class Note {
|
||||||
|
final double at;
|
||||||
|
final double hz;
|
||||||
|
final double? to;
|
||||||
|
/// Length (s) to about -40 dB.
|
||||||
|
final double len;
|
||||||
|
final double gain;
|
||||||
|
final Voice voice;
|
||||||
|
/// Koto only: 0 = dark/muted pluck, 1 = bright.
|
||||||
|
final double bright;
|
||||||
|
const Note(this.at, this.hz, this.len,
|
||||||
|
{this.to, this.gain = 1, this.voice = Voice.koto, this.bright = 0.6});
|
||||||
|
}
|
||||||
|
|
||||||
|
class SoundSpec {
|
||||||
|
final List<Note> notes;
|
||||||
|
/// Gentle low-pass cutoff (Hz) over the mix.
|
||||||
|
final double cutoff;
|
||||||
|
/// Peak level after normalising, dBFS (quiet by design).
|
||||||
|
final double peakDb;
|
||||||
|
/// Space tail mix (0..1).
|
||||||
|
final double room;
|
||||||
|
/// Space tail decay to -60 dB (s); the sound keeps about half of it.
|
||||||
|
final double tail;
|
||||||
|
const SoundSpec(this.notes,
|
||||||
|
{this.cutoff = 6000, this.peakDb = -17, this.room = 0.14, this.tail = 1.4});
|
||||||
|
|
||||||
|
double get length =>
|
||||||
|
notes.fold<double>(0, (m, n) => math.max(m, n.at + n.len)) + (room > 0 ? tail * 0.55 : 0.02);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Semitones from A4 (440 Hz) to Hz.
|
||||||
|
double semi(num n) => 440 * math.pow(2, n / 12).toDouble();
|
||||||
|
|
||||||
|
Float64List render(SoundSpec spec, {int seed = 7}) {
|
||||||
|
final total = (spec.length * sampleRate).ceil();
|
||||||
|
final out = Float64List(total);
|
||||||
|
final rnd = math.Random(seed);
|
||||||
|
for (final n in spec.notes) {
|
||||||
|
final start = (n.at * sampleRate).round();
|
||||||
|
if (start >= total) continue;
|
||||||
|
final s = switch (n.voice) {
|
||||||
|
Voice.koto => _koto(n, rnd),
|
||||||
|
Voice.chime => _bell(n, const [(1.0, 1.0, 1.0), (2.76, 0.45, 1.9), (5.40, 0.2, 3.2), (8.93, 0.08, 4.5)], 1.6, 0.003),
|
||||||
|
Voice.rin => _bell(n, const [(1.0, 1.0, 1.0), (2.71, 0.35, 1.5), (5.15, 0.12, 2.4)], 2.4, 0.012),
|
||||||
|
Voice.bamboo => _bamboo(n, rnd),
|
||||||
|
Voice.clack => _clack(n, rnd),
|
||||||
|
Voice.slide => _slide(n, rnd),
|
||||||
|
Voice.star => _star(n),
|
||||||
|
Voice.drop => _drop(n),
|
||||||
|
Voice.pad => _pad(n, rnd),
|
||||||
|
Voice.sub => _sub(n),
|
||||||
|
Voice.dust => _dust(n, rnd),
|
||||||
|
};
|
||||||
|
for (var i = 0; i < s.length && start + i < total; i++) {
|
||||||
|
out[start + i] += n.gain * s[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_lowpass(out, spec.cutoff);
|
||||||
|
if (spec.room > 0) _space(out, spec.room, spec.tail);
|
||||||
|
// 1 ms in, 10 ms out: no clicks at either end.
|
||||||
|
final fadeIn = (0.001 * sampleRate).round();
|
||||||
|
for (var i = 0; i < fadeIn && i < total; i++) {
|
||||||
|
out[i] *= i / fadeIn;
|
||||||
|
}
|
||||||
|
final fade = (0.01 * sampleRate).round();
|
||||||
|
for (var i = 0; i < fade && i < total; i++) {
|
||||||
|
out[total - 1 - i] *= i / fade;
|
||||||
|
}
|
||||||
|
var peak = 0.0;
|
||||||
|
for (final v in out) {
|
||||||
|
peak = math.max(peak, v.abs());
|
||||||
|
}
|
||||||
|
if (peak > 0) {
|
||||||
|
final g = math.pow(10, spec.peakDb / 20) / peak;
|
||||||
|
for (var i = 0; i < total; i++) {
|
||||||
|
out[i] *= g;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
int _n(double secs) => (secs * sampleRate).round();
|
||||||
|
double _smooth(double t) => t * t * (3 - 2 * t);
|
||||||
|
|
||||||
|
/// Karplus-Strong with a fractional, movable delay: a noise burst in a
|
||||||
|
/// loop that loses a little of its highs each pass.
|
||||||
|
Float64List _koto(Note n, math.Random rnd) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final maxPeriod = sampleRate / math.min(n.hz, n.to ?? n.hz) + 4;
|
||||||
|
final buf = Float64List(maxPeriod.ceil() + 4);
|
||||||
|
final size = buf.length;
|
||||||
|
// Excitation: noise, smoothed more for a darker pluck.
|
||||||
|
final period0 = sampleRate / n.hz;
|
||||||
|
var prev = 0.0;
|
||||||
|
final smooth = 1 - (0.25 + 0.7 * n.bright);
|
||||||
|
for (var i = 0; i < period0.ceil(); i++) {
|
||||||
|
final x = rnd.nextDouble() * 2 - 1;
|
||||||
|
prev = smooth * prev + (1 - smooth) * x;
|
||||||
|
buf[i % size] = prev;
|
||||||
|
}
|
||||||
|
// Loop gain so the note reaches -40 dB at len.
|
||||||
|
final loss = math.pow(0.01, 1 / (n.len * n.hz)).toDouble();
|
||||||
|
var w = period0.ceil();
|
||||||
|
var last = 0.0;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final t = i / len;
|
||||||
|
final hz = n.to == null ? n.hz : n.hz * math.pow(n.to! / n.hz, _smooth(math.min(1, t * 1.6)));
|
||||||
|
// The two-point average below delays half a sample: take it off.
|
||||||
|
final period = sampleRate / hz - 0.5;
|
||||||
|
final r = w - period;
|
||||||
|
final ri = r.floor();
|
||||||
|
final f = r - ri;
|
||||||
|
final a = buf[(ri % size + size) % size];
|
||||||
|
final b = buf[((ri + 1) % size + size) % size];
|
||||||
|
final y = a + (b - a) * f;
|
||||||
|
// Two-point average = the string's damping; the 0.5 mix keeps it bright.
|
||||||
|
final v = loss * (0.5 * y + 0.5 * last);
|
||||||
|
last = y;
|
||||||
|
buf[w % size] = v;
|
||||||
|
w++;
|
||||||
|
// A 3 ms attack takes the click off the pluck.
|
||||||
|
out[i] = v * (i < 132 ? i / 132 : 1);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Inharmonic partials (ratio, amplitude, decay multiplier), each doubled
|
||||||
|
/// with a slightly detuned twin so the tail shimmers.
|
||||||
|
Float64List _bell(Note n, List<(double, double, double)> partials, double beatHz, double attackSecs) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final k = math.log(100) / len;
|
||||||
|
final attack = _n(attackSecs);
|
||||||
|
for (final (ratio, amp, decay) in partials) {
|
||||||
|
final f1 = n.hz * ratio, f2 = f1 + beatHz * ratio;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final env = math.exp(-k * decay * i) * (i < attack ? _smooth(i / attack) : 1);
|
||||||
|
final ph = 2 * math.pi * i / sampleRate;
|
||||||
|
out[i] += amp * env * 0.5 * (math.sin(ph * f1) + math.sin(ph * f2));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A hollow tube: a pitched thump that drops into its note, an overtone
|
||||||
|
/// that dies fast, and a short click of air.
|
||||||
|
Float64List _bamboo(Note n, math.Random rnd) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final k = math.log(100) / len;
|
||||||
|
var ph = 0.0, ph2 = 0.0;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final drop = math.exp(-i / _n(0.012));
|
||||||
|
final hz = n.hz * (1 + 0.5 * drop);
|
||||||
|
ph += 2 * math.pi * hz / sampleRate;
|
||||||
|
ph2 += 2 * math.pi * hz * 2.31 / sampleRate;
|
||||||
|
out[i] = math.exp(-k * i) * (math.sin(ph) + 0.35 * math.sin(ph2) * math.exp(-k * 3 * i));
|
||||||
|
}
|
||||||
|
final click = _bandNoise(_n(0.006), n.hz * 3, 2.0, rnd);
|
||||||
|
for (var i = 0; i < click.length && i < len; i++) {
|
||||||
|
out[i] += 0.5 * click[i] * (1 - i / click.length);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Hardwood: two resonances excited by a very short noise burst.
|
||||||
|
Float64List _clack(Note n, math.Random rnd) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final burst = Float64List(len);
|
||||||
|
for (var i = 0; i < _n(0.002) && i < len; i++) {
|
||||||
|
burst[i] = rnd.nextDouble() * 2 - 1;
|
||||||
|
}
|
||||||
|
for (final (f, q, g) in [(n.hz, 18.0, 1.0), (n.hz * 1.47, 14.0, 0.6), (n.hz * 2.6, 10.0, 0.25)]) {
|
||||||
|
final r = _biquadBand(burst, f, q);
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
out[i] += g * r[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
final k = math.log(100) / len;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
out[i] *= math.exp(-k * i);
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Air through a band that sweeps from [Note.hz] to [Note.to], swelling in
|
||||||
|
/// and out (a paper door sliding along its track).
|
||||||
|
Float64List _slide(Note n, math.Random rnd) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final noise = Float64List(len);
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
noise[i] = rnd.nextDouble() * 2 - 1;
|
||||||
|
}
|
||||||
|
final out = Float64List(len);
|
||||||
|
// Sweep in short blocks (a fixed band per block is plenty).
|
||||||
|
const block = 256;
|
||||||
|
var z1 = 0.0, z2 = 0.0;
|
||||||
|
for (var b0 = 0; b0 < len; b0 += block) {
|
||||||
|
final t = b0 / len;
|
||||||
|
final f = n.hz * math.pow((n.to ?? n.hz) / n.hz, t);
|
||||||
|
final c = _bandCoeffs(f.toDouble(), 2.5);
|
||||||
|
for (var i = b0; i < math.min(len, b0 + block); i++) {
|
||||||
|
final y = c.$1 * noise[i] + z1;
|
||||||
|
z1 = c.$2 * noise[i] - c.$4 * y + z2;
|
||||||
|
z2 = c.$3 * noise[i] - c.$5 * y;
|
||||||
|
final tt = i / len;
|
||||||
|
// Rises, holds, eases off: sin^2 swell with a tail.
|
||||||
|
final env = math.pow(math.sin(math.pi * math.min(1, tt * 1.25)), 2).toDouble();
|
||||||
|
// The track's grain: a slow flutter.
|
||||||
|
final grain = 1 + 0.25 * math.sin(2 * math.pi * 23 * i / sampleRate);
|
||||||
|
out[i] = y * env * grain;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64List _bandNoise(int len, double f, double q, math.Random rnd) {
|
||||||
|
final x = Float64List(len);
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
x[i] = rnd.nextDouble() * 2 - 1;
|
||||||
|
}
|
||||||
|
return _biquadBand(x, f, q);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// RBJ band-pass (constant 0 dB peak): (b0, b1, b2, a1, a2), b1 = 0.
|
||||||
|
(double, double, double, double, double) _bandCoeffs(double f, double q) {
|
||||||
|
final w = 2 * math.pi * math.min(f, sampleRate * 0.45) / sampleRate;
|
||||||
|
final alpha = math.sin(w) / (2 * q);
|
||||||
|
final a0 = 1 + alpha;
|
||||||
|
return (alpha / a0, 0, -alpha / a0, -2 * math.cos(w) / a0, (1 - alpha) / a0);
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64List _biquadBand(Float64List x, double f, double q) {
|
||||||
|
final c = _bandCoeffs(f, q);
|
||||||
|
final y = Float64List(x.length);
|
||||||
|
var z1 = 0.0, z2 = 0.0;
|
||||||
|
for (var i = 0; i < x.length; i++) {
|
||||||
|
final v = c.$1 * x[i] + z1;
|
||||||
|
z1 = c.$2 * x[i] - c.$4 * v + z2;
|
||||||
|
z2 = c.$3 * x[i] - c.$5 * v;
|
||||||
|
y[i] = v;
|
||||||
|
}
|
||||||
|
return y;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One pole, twice: a soft 12 dB/oct roll-off.
|
||||||
|
void _lowpass(Float64List out, double cutoff) {
|
||||||
|
final a = math.exp(-2 * math.pi * cutoff / sampleRate);
|
||||||
|
for (var pass = 0; pass < 2; pass++) {
|
||||||
|
var y = 0.0;
|
||||||
|
for (var i = 0; i < out.length; i++) {
|
||||||
|
y = (1 - a) * out[i] + a * y;
|
||||||
|
out[i] = y;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Space: four damped feedback combs and two allpasses (a dark, smooth
|
||||||
|
/// tail decaying to -60 dB in [tail] s) after a short pre-delay.
|
||||||
|
void _space(Float64List out, double mix, double tail) {
|
||||||
|
const combs = [0.0297, 0.0371, 0.0411, 0.0437];
|
||||||
|
const damp = 0.35;
|
||||||
|
final len = out.length;
|
||||||
|
final pre = _n(0.018);
|
||||||
|
final dry = Float64List(len);
|
||||||
|
for (var i = pre; i < len; i++) {
|
||||||
|
dry[i] = out[i - pre];
|
||||||
|
}
|
||||||
|
final wet = Float64List(len);
|
||||||
|
for (final d in combs) {
|
||||||
|
final delay = _n(d);
|
||||||
|
final g = math.pow(0.001, d / tail).toDouble();
|
||||||
|
final y = Float64List(len);
|
||||||
|
var lp = 0.0;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final back = i >= delay ? y[i - delay] : 0.0;
|
||||||
|
lp = back * (1 - damp) + lp * damp;
|
||||||
|
y[i] = dry[i] + g * lp;
|
||||||
|
wet[i] += y[i] / combs.length;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (final d in const [0.005, 0.0017]) {
|
||||||
|
final delay = _n(d);
|
||||||
|
final x = Float64List.fromList(wet);
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final xd = i >= delay ? x[i - delay] : 0.0;
|
||||||
|
final yd = i >= delay ? wet[i - delay] : 0.0;
|
||||||
|
wet[i] = -0.5 * x[i] + xd + 0.5 * yd;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
out[i] += mix * wet[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [Note.hz] gliding to [Note.to] over the first ~60% of the note.
|
||||||
|
double _glide(Note n, double t) =>
|
||||||
|
n.to == null ? n.hz : n.hz * math.pow(n.to! / n.hz, _smooth(math.min(1, t * 1.6))).toDouble();
|
||||||
|
|
||||||
|
Float64List _star(Note n) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final k = math.log(100) / len;
|
||||||
|
final attack = _n(0.004);
|
||||||
|
final index0 = 0.3 + 3.0 * n.bright;
|
||||||
|
final idxTau = _n(0.09 + 0.12 * n.bright);
|
||||||
|
const ratio = 3.5;
|
||||||
|
var c1 = 0.0, c2 = 0.0, m1 = 0.0, m2 = 0.0;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final hz = _glide(n, i / len);
|
||||||
|
final w = 2 * math.pi * hz / sampleRate;
|
||||||
|
c1 += w;
|
||||||
|
c2 += w * 1.0017;
|
||||||
|
m1 += w * ratio;
|
||||||
|
m2 += w * ratio * 1.0017;
|
||||||
|
final idx = index0 * math.exp(-i / idxTau);
|
||||||
|
final env = math.exp(-k * i) * (i < attack ? _smooth(i / attack) : 1);
|
||||||
|
out[i] = env * 0.5 * (math.sin(c1 + idx * math.sin(m1)) + math.sin(c2 + idx * math.sin(m2)));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64List _drop(Note n) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final k = math.log(100) / len;
|
||||||
|
final attack = _n(0.002);
|
||||||
|
final riseTau = _n(0.016);
|
||||||
|
var ph = 0.0;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final t = i / len;
|
||||||
|
final base = n.to == null ? n.hz : n.hz * math.pow(n.to! / n.hz, _smooth(math.min(1, t * 2.5)));
|
||||||
|
final hz = base * (0.62 + 0.38 * (1 - math.exp(-i / riseTau)));
|
||||||
|
ph += 2 * math.pi * hz / sampleRate;
|
||||||
|
final env = math.exp(-k * i) * (i < attack ? _smooth(i / attack) : 1);
|
||||||
|
out[i] = env * (math.sin(ph) + 0.15 * math.sin(2 * ph));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64List _pad(Note n, math.Random rnd) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
const detune = [-9.0, -3.0, 4.0, 10.0];
|
||||||
|
final ph = [for (var j = 0; j < detune.length + 1; j++) rnd.nextDouble() * 2 * math.pi];
|
||||||
|
final ratios = [for (final c in detune) math.pow(2, c / 1200).toDouble(), 0.5];
|
||||||
|
final amps = [for (final _ in detune) 1.0, 0.45];
|
||||||
|
const a = 0.33;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final t = i / len;
|
||||||
|
final env = t < a ? _smooth(t / a) : math.pow(1 - _smooth((t - a) / (1 - a)), 2).toDouble();
|
||||||
|
final vib = 1 + 0.002 * math.sin(2 * math.pi * 0.3 * i / sampleRate);
|
||||||
|
final hz = _glide(n, t) * vib;
|
||||||
|
var v = 0.0;
|
||||||
|
for (var j = 0; j < ratios.length; j++) {
|
||||||
|
ph[j] += 2 * math.pi * hz * ratios[j] / sampleRate;
|
||||||
|
v += amps[j] * (math.sin(ph[j]) + n.bright * (0.25 * math.sin(2 * ph[j]) + 0.1 * math.sin(3 * ph[j])));
|
||||||
|
}
|
||||||
|
out[i] = env * v / ratios.length;
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64List _sub(Note n) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
final k = math.log(100) / len;
|
||||||
|
final attack = _n(0.025);
|
||||||
|
var ph = 0.0;
|
||||||
|
for (var i = 0; i < len; i++) {
|
||||||
|
final t = i / len;
|
||||||
|
final hz = n.to == null ? n.hz : n.hz * math.pow(n.to! / n.hz, _smooth(t));
|
||||||
|
ph += 2 * math.pi * hz / sampleRate;
|
||||||
|
final env = math.exp(-k * i) * (i < attack ? _smooth(i / attack) : 1);
|
||||||
|
// Overtones so it still reads on small speakers.
|
||||||
|
out[i] = env * (math.sin(ph) + 0.35 * math.sin(2 * ph) + 0.12 * math.sin(3 * ph));
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
Float64List _dust(Note n, math.Random rnd) {
|
||||||
|
final len = _n(n.len);
|
||||||
|
final out = Float64List(len);
|
||||||
|
const steps = [0, 2, 4, 7, 9, 12, 14];
|
||||||
|
final count = math.max(4, (n.len * 14).round());
|
||||||
|
for (var g = 0; g < count; g++) {
|
||||||
|
final tg = (g + rnd.nextDouble() * 0.6) / count * 0.75;
|
||||||
|
final start = _n(tg * n.len);
|
||||||
|
final centre = n.to == null ? n.hz : n.hz * math.pow(n.to! / n.hz, tg);
|
||||||
|
final f = centre * math.pow(2, steps[rnd.nextInt(steps.length)] / 12);
|
||||||
|
final glen = math.min(_n(0.1 + 0.15 * rnd.nextDouble()), len - start);
|
||||||
|
if (glen <= 0) continue;
|
||||||
|
final amp = (1 - tg) * (0.5 + 0.5 * rnd.nextDouble());
|
||||||
|
final k = math.log(100) / glen;
|
||||||
|
final w = 2 * math.pi * f / sampleRate;
|
||||||
|
for (var i = 0; i < glen; i++) {
|
||||||
|
out[start + i] += amp * math.exp(-k * i) * (i < 88 ? i / 88 : 1) * math.sin(w * i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 16-bit PCM mono WAV.
|
||||||
|
Uint8List wav(Float64List samples) {
|
||||||
|
final data = samples.length * 2;
|
||||||
|
final b = ByteData(44 + data);
|
||||||
|
void str(int o, String s) {
|
||||||
|
for (var i = 0; i < s.length; i++) {
|
||||||
|
b.setUint8(o + i, s.codeUnitAt(i));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
str(0, 'RIFF');
|
||||||
|
b.setUint32(4, 36 + data, Endian.little);
|
||||||
|
str(8, 'WAVE');
|
||||||
|
str(12, 'fmt ');
|
||||||
|
b.setUint32(16, 16, Endian.little);
|
||||||
|
b.setUint16(20, 1, Endian.little);
|
||||||
|
b.setUint16(22, 1, Endian.little);
|
||||||
|
b.setUint32(24, sampleRate, Endian.little);
|
||||||
|
b.setUint32(28, sampleRate * 2, Endian.little);
|
||||||
|
b.setUint16(32, 2, Endian.little);
|
||||||
|
b.setUint16(34, 16, Endian.little);
|
||||||
|
str(36, 'data');
|
||||||
|
b.setUint32(40, data, Endian.little);
|
||||||
|
for (var i = 0; i < samples.length; i++) {
|
||||||
|
b.setInt16(44 + i * 2, (samples[i].clamp(-1.0, 1.0) * 32767).round(), Endian.little);
|
||||||
|
}
|
||||||
|
return b.buffer.asUint8List();
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/foundation.dart';
|
||||||
|
import 'package:media_kit/media_kit.dart';
|
||||||
|
import 'package:path_provider/path_provider.dart';
|
||||||
|
|
||||||
|
import 'sfx.dart';
|
||||||
|
import 'sound_bank.dart';
|
||||||
|
import 'synth.dart';
|
||||||
|
|
||||||
|
/// Plays [SoundSpec]s: each is rendered once to a WAV in the temp dir and
|
||||||
|
/// played on a small pool of audio-only mpv players (so two sounds can
|
||||||
|
/// overlap). [volume] (0..1) is read per play and applied on a square
|
||||||
|
/// curve (ears are log); [enabled] filters cues.
|
||||||
|
class SynthSfx implements SfxService {
|
||||||
|
final double Function() volume;
|
||||||
|
final bool Function(SfxKind kind) enabled;
|
||||||
|
/// Which sound set each sound plays from.
|
||||||
|
final SoundPreset Function(SfxKind kind) presetFor;
|
||||||
|
SynthSfx({required this.volume, bool Function(SfxKind kind)? enabled, SoundPreset Function(SfxKind kind)? presetFor})
|
||||||
|
: enabled = enabled ?? ((_) => true),
|
||||||
|
presetFor = presetFor ?? ((_) => defaultPreset);
|
||||||
|
|
||||||
|
static const _poolSize = 3;
|
||||||
|
final List<Player> _pool = [];
|
||||||
|
var _next = 0;
|
||||||
|
final Map<String, Future<String>> _files = {};
|
||||||
|
Directory? _dir;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Future<void> play(SfxCue cue) async {
|
||||||
|
if (!enabled(cue.kind)) return;
|
||||||
|
final preset = presetFor(cue.kind);
|
||||||
|
await playSpec('${preset.name}-${cue.kind.name}-${cue.readyIndex}',
|
||||||
|
soundFor(cue.kind, readyIndex: cue.readyIndex, preset: preset));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Plays [kind] even when it is switched off (Settings' preview), always
|
||||||
|
/// freshly rendered: an edited spec plays after a hot reload.
|
||||||
|
Future<void> preview(SfxKind kind, {int readyIndex = 1, SoundPreset? preset}) {
|
||||||
|
final p = preset ?? presetFor(kind);
|
||||||
|
final key = '${p.name}-${kind.name}-$readyIndex';
|
||||||
|
_files.remove(key);
|
||||||
|
return playSpec(key, soundFor(kind, readyIndex: readyIndex, preset: p));
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Plays [spec], cached under [key] (same key = same sound).
|
||||||
|
Future<void> playSpec(String key, SoundSpec spec) async {
|
||||||
|
final v = volume();
|
||||||
|
if (v <= 0) return;
|
||||||
|
try {
|
||||||
|
final path = await (_files[key] ??= _write(key, spec));
|
||||||
|
final player = await _player();
|
||||||
|
await player.setVolume(100 * v * v);
|
||||||
|
await player.open(Media(path));
|
||||||
|
} catch (e) {
|
||||||
|
_files.remove(key);
|
||||||
|
debugPrint('sfx $key: $e');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<String> _write(String key, SoundSpec spec) async {
|
||||||
|
_dir ??= await Directory('${(await getTemporaryDirectory()).path}/watch_together_sfx').create(recursive: true);
|
||||||
|
final f = File('${_dir!.path}/$key.wav');
|
||||||
|
await f.writeAsBytes(wav(render(spec)));
|
||||||
|
return f.path;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Player> _player() async {
|
||||||
|
if (_pool.length < _poolSize) {
|
||||||
|
final p = Player(
|
||||||
|
configuration: const PlayerConfiguration(vo: 'null', osc: false, libass: false, title: 'sfx'),
|
||||||
|
);
|
||||||
|
await (p.platform as NativePlayer).setProperty('audio-display', 'no');
|
||||||
|
_pool.add(p);
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
return _pool[_next++ % _poolSize];
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> dispose() async {
|
||||||
|
for (final p in _pool) {
|
||||||
|
await p.dispose();
|
||||||
|
}
|
||||||
|
_pool.clear();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,867 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io' show File;
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:fox_utils/fox_utils.dart' show ClipboardX, DesktopDropX, DropTarget;
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
import 'package:window_manager/window_manager.dart';
|
||||||
|
|
||||||
|
import '../files/folder_store.dart';
|
||||||
|
import '../files/ui/files_page.dart' show showFilesFolder;
|
||||||
|
import '../jellyfin/accounts.dart';
|
||||||
|
import '../jellyfin/browse_scope.dart' show BrowseStart;
|
||||||
|
import '../jellyfin/session_media.dart';
|
||||||
|
import '../screens/home/connect_flow.dart';
|
||||||
|
import '../session/session_coordinator.dart' show ConnectParams;
|
||||||
|
import '../screens/home/health_probe.dart';
|
||||||
|
import '../screens/home/media_picker.dart';
|
||||||
|
import '../screens/home/profile.dart';
|
||||||
|
import '../screens/home/update_indicator.dart';
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import '../state/settings.dart';
|
||||||
|
import '../update/update_controller.dart';
|
||||||
|
import 'chat_panel.dart';
|
||||||
|
import 'connect_cards.dart';
|
||||||
|
import 'handoff.dart';
|
||||||
|
import 'library_tab.dart';
|
||||||
|
import 'motion.dart';
|
||||||
|
import 'party_strip.dart';
|
||||||
|
import 'profile_card.dart';
|
||||||
|
import '../schedule/ui/schedule_page.dart';
|
||||||
|
import 'session_player.dart';
|
||||||
|
import 'settings_tab.dart';
|
||||||
|
import 'toasts.dart';
|
||||||
|
import 'welcome.dart';
|
||||||
|
|
||||||
|
/// The one window: the party strip over a body that fades through between
|
||||||
|
/// the tabs and the full player, the floating mini player, the chat panel
|
||||||
|
/// and the toasts. Online/offline follows [SessionState.route].
|
||||||
|
///
|
||||||
|
/// The player ([SessionPlayer], the only `Video`) lives in one layer of
|
||||||
|
/// the body: full it fills the body (fullscreen: the window, strip
|
||||||
|
/// hidden), mini it is a 384x216 box snapped to a corner. A mode change
|
||||||
|
/// fades the layer out, moves it while invisible and fades it back in, so
|
||||||
|
/// the video is never mounted twice nor remounted.
|
||||||
|
///
|
||||||
|
/// A drop anywhere on the window or Ctrl+V outside a text field is a
|
||||||
|
/// [Handoff]: a card near the pointer asks how to open it.
|
||||||
|
class AppShell extends StatefulWidget {
|
||||||
|
final UpdateController? updates;
|
||||||
|
final bool autoUpdateCheck;
|
||||||
|
/// Off in tests: the drag area, window buttons and fullscreen need
|
||||||
|
/// window_manager.
|
||||||
|
final bool windowControls;
|
||||||
|
final HealthGetter healthGet;
|
||||||
|
/// Linked Jellyfin servers; defaults to [JellyfinAccounts.instance].
|
||||||
|
final JellyfinAccounts? jellyfin;
|
||||||
|
/// Stand-in for media_kit's `Video` (tests).
|
||||||
|
final VideoViewBuilder? videoBuilder;
|
||||||
|
const AppShell({
|
||||||
|
super.key,
|
||||||
|
this.updates,
|
||||||
|
this.autoUpdateCheck = true,
|
||||||
|
this.windowControls = true,
|
||||||
|
this.healthGet = defaultHealthGet,
|
||||||
|
this.jellyfin,
|
||||||
|
this.videoBuilder,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AppShell> createState() => AppShellState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class AppShellState extends State<AppShell> with SingleTickerProviderStateMixin {
|
||||||
|
static const miniSize = Size(384, 216);
|
||||||
|
static const _miniMargin = 16.0;
|
||||||
|
|
||||||
|
ShellTab _tab = ShellTab.library;
|
||||||
|
SettingsSection _section = SettingsSection.profile;
|
||||||
|
|
||||||
|
/// Where the player is going ([_mode]) and where it is drawn ([_shown]):
|
||||||
|
/// they differ for the first part of a change, while it fades out.
|
||||||
|
PlayerMode _mode = PlayerMode.none;
|
||||||
|
PlayerMode _shown = PlayerMode.none;
|
||||||
|
PlayerMode _from = PlayerMode.none;
|
||||||
|
int _modeSeq = 0;
|
||||||
|
late final AnimationController _fade = AnimationController(vsync: this, value: 1);
|
||||||
|
|
||||||
|
bool _fullscreen = false;
|
||||||
|
bool _chatOpen = false;
|
||||||
|
int _unread = 0;
|
||||||
|
int _feedSeen = 0;
|
||||||
|
final _chat = TextEditingController();
|
||||||
|
final _chatFocus = FocusNode();
|
||||||
|
final _playerKey = GlobalKey();
|
||||||
|
|
||||||
|
Alignment _corner = Alignment.bottomRight;
|
||||||
|
Offset? _drag; // mini top-left while dragging
|
||||||
|
bool _snapping = false;
|
||||||
|
|
||||||
|
/// Last pointer position in the window (where a paste's card opens).
|
||||||
|
Offset? _pointer;
|
||||||
|
bool _dragging = false;
|
||||||
|
bool _handoffOpen = false;
|
||||||
|
|
||||||
|
final _flow = ConnectFlow();
|
||||||
|
late final _join = JoinFields(SessionState.instance.lastForm);
|
||||||
|
late final _host = HostFields(SessionState.instance.lastForm);
|
||||||
|
late final JellyfinAccounts _jellyfin = widget.jellyfin ?? JellyfinAccounts.instance;
|
||||||
|
late MediaPickerController _picker = _newPicker();
|
||||||
|
BrowseStart? _libraryStart;
|
||||||
|
int _libraryGen = 0;
|
||||||
|
|
||||||
|
/// The next media to come up opens full (just joined, or put up here).
|
||||||
|
bool _autoFull = false;
|
||||||
|
int _lastMediaId = -1;
|
||||||
|
bool _dialogOpen = false;
|
||||||
|
final _stops = <void Function()>[];
|
||||||
|
// Rebuild the shell on these flips, not on every state broadcast.
|
||||||
|
final _online = computed(() => SessionState.instance.route.value == AppRoute.session);
|
||||||
|
/// Nobody else watches: offline, solo, or solo becoming a server.
|
||||||
|
final _alone = computed(() {
|
||||||
|
final s = SessionState.instance;
|
||||||
|
return s.route.value != AppRoute.session || s.solo.value || s.switching.value;
|
||||||
|
});
|
||||||
|
final _hasMedia = computed(() =>
|
||||||
|
SessionState.instance.route.value == AppRoute.session &&
|
||||||
|
SessionState.instance.coordinator.serverState.value?.media != null);
|
||||||
|
|
||||||
|
PlayerMode get mode => _mode;
|
||||||
|
PlayerMode get shownMode => _shown;
|
||||||
|
bool get fullscreen => _fullscreen;
|
||||||
|
|
||||||
|
MediaPickerController _newPicker({JellyfinMedia? jellyfin, MediaKind? source}) {
|
||||||
|
final f = SessionState.instance.lastForm;
|
||||||
|
final c = MediaPickerController(mediaPath: f.mediaPath, linkUrl: f.linkUrl, jellyfin: jellyfin, source: source);
|
||||||
|
if (jellyfin == null) unawaited(restoreLastPick(c, _jellyfin, () => mounted && identical(c, _picker)));
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
unawaited(Profile.instance.ensureLoaded());
|
||||||
|
// Reads linked servers and checks their tokens in the background.
|
||||||
|
_jellyfin.ensureLoaded();
|
||||||
|
if (widget.autoUpdateCheck) _autoCheck();
|
||||||
|
HardwareKeyboard.instance.addHandler(_onKey);
|
||||||
|
final session = SessionState.instance;
|
||||||
|
final coord = session.coordinator;
|
||||||
|
_feedSeen = coord.feedLog.peek().length;
|
||||||
|
_stops.add(effect(() {
|
||||||
|
final online = session.route.value == AppRoute.session;
|
||||||
|
// Set now, not later: the media effect below may run first in this
|
||||||
|
// same flush, and its scheduled show reads these.
|
||||||
|
_autoFull = online;
|
||||||
|
if (!online) _lastMediaId = -1;
|
||||||
|
untracked(() => _later(() => online ? _wentOnline() : _wentOffline()));
|
||||||
|
}));
|
||||||
|
// Something comes up while the player is closed: show it (full right
|
||||||
|
// after joining or a put-up of ours, else as the mini player).
|
||||||
|
_stops.add(effect(() {
|
||||||
|
final r = coord.serverState.value;
|
||||||
|
final online = session.route.value == AppRoute.session;
|
||||||
|
if (!online || r == null || r.media == null) return;
|
||||||
|
if (r.mediaId == _lastMediaId) return;
|
||||||
|
_lastMediaId = r.mediaId;
|
||||||
|
_later(() {
|
||||||
|
if (_mode == PlayerMode.none) {
|
||||||
|
_show(_autoFull ? PlayerMode.full : PlayerMode.mini);
|
||||||
|
} else if (_autoFull) {
|
||||||
|
_show(PlayerMode.full);
|
||||||
|
}
|
||||||
|
_autoFull = false;
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
// Chat that arrives while the panel is closed.
|
||||||
|
_stops.add(effect(() {
|
||||||
|
final log = coord.feedLog.value;
|
||||||
|
final fresh = log.length < _feedSeen ? log : log.sublist(_feedSeen);
|
||||||
|
_feedSeen = log.length;
|
||||||
|
final chats = fresh.where((f) => f.action == 'chat').length;
|
||||||
|
if (chats == 0) return;
|
||||||
|
untracked(() => _later(() {
|
||||||
|
if (!_chatOpen) setState(() => _unread += chats);
|
||||||
|
}));
|
||||||
|
}));
|
||||||
|
// Back from sitting out with the player closed: show it (the media
|
||||||
|
// plays again).
|
||||||
|
var wasOut = false;
|
||||||
|
_stops.add(effect(() {
|
||||||
|
final out = coord.selfOut.value;
|
||||||
|
if (wasOut && !out && session.route.peek() == AppRoute.session) {
|
||||||
|
_later(() {
|
||||||
|
if (_mode == PlayerMode.none) _show(PlayerMode.mini);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
wasOut = out;
|
||||||
|
}));
|
||||||
|
// Solo becoming a hosted server: the player closes while the media
|
||||||
|
// moves over and comes back the way it was once it is up again.
|
||||||
|
_stops.add(effect(() {
|
||||||
|
if (!session.switching.value) return;
|
||||||
|
_later(() {
|
||||||
|
_lastMediaId = -1;
|
||||||
|
_autoFull = _mode == PlayerMode.full;
|
||||||
|
if (_fullscreen) _toggleFullscreen();
|
||||||
|
_show(PlayerMode.none);
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
// The hosted server died mid-session (SessionState leaves): say so.
|
||||||
|
_stops.add(effect(() {
|
||||||
|
final crash = session.serverCrash.value;
|
||||||
|
if (crash == null) return;
|
||||||
|
_later(() {
|
||||||
|
session.serverCrash.value = null;
|
||||||
|
_alert('Server crashed', crash);
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
for (final stop in _stops) {
|
||||||
|
stop();
|
||||||
|
}
|
||||||
|
HardwareKeyboard.instance.removeHandler(_onKey);
|
||||||
|
_fade.dispose();
|
||||||
|
_online.dispose();
|
||||||
|
_alone.dispose();
|
||||||
|
_hasMedia.dispose();
|
||||||
|
_flow.dispose();
|
||||||
|
_join.dispose();
|
||||||
|
_host.dispose();
|
||||||
|
_picker.dispose();
|
||||||
|
_chat.dispose();
|
||||||
|
_chatFocus.dispose();
|
||||||
|
if (_fullscreen) _setWindowFullscreen(false);
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Runs [f] after the current signal notification / build.
|
||||||
|
void _later(VoidCallback f) => scheduleMicrotask(() {
|
||||||
|
if (mounted) f();
|
||||||
|
});
|
||||||
|
|
||||||
|
Future<void> _autoCheck() async {
|
||||||
|
final s = AppSettings.instance;
|
||||||
|
await s.ensureLoaded();
|
||||||
|
if (s.autoCheckUpdates.peek()) await runUpdateCheck(widget.updates);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _wentOnline() {
|
||||||
|
_unread = 0;
|
||||||
|
_feedSeen = SessionState.instance.coordinator.feedLog.peek().length;
|
||||||
|
// Hosting starts with nothing up: the library is where to pick it.
|
||||||
|
setState(() => _tab = ShellTab.library);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _wentOffline() {
|
||||||
|
if (_fullscreen) _toggleFullscreen();
|
||||||
|
setState(() {
|
||||||
|
_chatOpen = false;
|
||||||
|
_unread = 0;
|
||||||
|
});
|
||||||
|
_show(PlayerMode.none);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ----------------------------------------------------------- player mode
|
||||||
|
|
||||||
|
/// Fade through to [m]: the player layer (and, when full is involved,
|
||||||
|
/// the tabs) fades out, moves while invisible, then fades in.
|
||||||
|
Future<void> _show(PlayerMode m) async {
|
||||||
|
if (m == _mode) return;
|
||||||
|
final seq = ++_modeSeq;
|
||||||
|
setState(() {
|
||||||
|
_from = _shown;
|
||||||
|
_mode = m;
|
||||||
|
});
|
||||||
|
if (m == PlayerMode.full) FocusManager.instance.primaryFocus?.unfocus();
|
||||||
|
if (_shown != PlayerMode.none || m == PlayerMode.full) {
|
||||||
|
await _fade.animateTo(0,
|
||||||
|
duration: fadeThroughTime * fadeOutPart, curve: Curves.easeIn);
|
||||||
|
} else {
|
||||||
|
_fade.value = 0;
|
||||||
|
}
|
||||||
|
if (!mounted || seq != _modeSeq) return;
|
||||||
|
setState(() => _shown = m);
|
||||||
|
await _fade.animateTo(1, duration: fadeThroughTime * (1 - fadeOutPart), curve: ease);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _expand() => _show(PlayerMode.full);
|
||||||
|
|
||||||
|
void _collapse() {
|
||||||
|
if (_fullscreen) _toggleFullscreen();
|
||||||
|
_show(PlayerMode.mini);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The player's ×: sit out (stay in the server, nothing loaded; the
|
||||||
|
/// player shows the join-back card). Once out, × closes the player.
|
||||||
|
void _closePlayer() {
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
if (coord.selfOut.peek()) {
|
||||||
|
_show(PlayerMode.none);
|
||||||
|
} else {
|
||||||
|
coord.sitOut();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _setWindowFullscreen(bool on) async {
|
||||||
|
if (!widget.windowControls) return;
|
||||||
|
try {
|
||||||
|
await windowManager.setFullScreen(on);
|
||||||
|
} catch (_) {
|
||||||
|
// No window manager.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _toggleFullscreen() {
|
||||||
|
final on = !_fullscreen;
|
||||||
|
setState(() => _fullscreen = on);
|
||||||
|
if (on && _mode != PlayerMode.full) _show(PlayerMode.full);
|
||||||
|
_setWindowFullscreen(on);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _selectTab(ShellTab t) {
|
||||||
|
if (_fullscreen) _toggleFullscreen();
|
||||||
|
setState(() => _tab = t);
|
||||||
|
if (_mode == PlayerMode.full) _show(PlayerMode.mini);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _openSettings(SettingsSection s) {
|
||||||
|
setState(() => _section = s);
|
||||||
|
_selectTab(ShellTab.settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _toggleChat() => setState(() {
|
||||||
|
_chatOpen = !_chatOpen;
|
||||||
|
_unread = 0;
|
||||||
|
if (!_chatOpen) _chatFocus.unfocus();
|
||||||
|
});
|
||||||
|
|
||||||
|
// --------------------------------------------------------------- library
|
||||||
|
|
||||||
|
/// "Change video": the library, opened on the series of the episode
|
||||||
|
/// playing (season selected, episode highlighted), else where it was.
|
||||||
|
void _changeVideo() {
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
coord.markInput();
|
||||||
|
final ref = coord.currentRef.peek();
|
||||||
|
final pick = ref == null ? null : pickForRef(_jellyfin, ref);
|
||||||
|
final plan = coord.jellyfinPlan.peek();
|
||||||
|
final old = _picker;
|
||||||
|
_picker = pick == null
|
||||||
|
? _newPicker()
|
||||||
|
: _newPicker(jellyfin: pick, source: MediaKind.jellyfin);
|
||||||
|
old.dispose();
|
||||||
|
_libraryStart = ref != null && plan is OwnPlay && plan.item != null
|
||||||
|
? BrowseStart.seriesOf(ref.serverId, plan.item!)
|
||||||
|
: null;
|
||||||
|
_libraryGen++;
|
||||||
|
_selectTab(ShellTab.library);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Library → "Put it up for everyone"; the player opens full. Offline
|
||||||
|
/// it starts a solo session first (just you, on this computer).
|
||||||
|
Future<String?> _putUp(PickedMedia media) async {
|
||||||
|
final session = SessionState.instance;
|
||||||
|
if (media is JellyfinMedia) {
|
||||||
|
try {
|
||||||
|
putUpJellyfinMedia(_jellyfin, media);
|
||||||
|
} on FormatException catch (e) {
|
||||||
|
return e.message;
|
||||||
|
}
|
||||||
|
unawaited(_jellyfin.rememberPick(media));
|
||||||
|
}
|
||||||
|
if (!_online.peek()) {
|
||||||
|
final error = await _startSolo();
|
||||||
|
if (error != null || !mounted) return error;
|
||||||
|
}
|
||||||
|
// Alone, a link plays direct: there is nobody to pass it on to.
|
||||||
|
if (media is LinkMedia && session.solo.peek()) {
|
||||||
|
media = LinkMedia(media.url, relay: LinkRelay.direct, anyway: media.anyway);
|
||||||
|
}
|
||||||
|
final error = await session.coordinator.swapPicked(media);
|
||||||
|
if (error != null || !mounted) return error;
|
||||||
|
final f = session.lastForm;
|
||||||
|
f
|
||||||
|
..linkUrl = media is LinkMedia ? media.url : f.linkUrl
|
||||||
|
..mediaPath = media is FileMedia ? media.path : f.mediaPath;
|
||||||
|
unawaited(session.saveForm().catchError((Object _) {}));
|
||||||
|
_autoFull = true;
|
||||||
|
_show(PlayerMode.full);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Starts a solo session; returns an error text, or null.
|
||||||
|
Future<String?> _startSolo() async {
|
||||||
|
final profile = Profile.instance;
|
||||||
|
try {
|
||||||
|
await profile.ensureLoaded();
|
||||||
|
final name = profile.name.peek().trim();
|
||||||
|
await SessionState.instance.startSolo(ConnectParams(
|
||||||
|
host: '127.0.0.1',
|
||||||
|
port: 0,
|
||||||
|
secret: '',
|
||||||
|
name: name.isEmpty ? 'Me' : name,
|
||||||
|
avatar: profile.avatarBase64(),
|
||||||
|
));
|
||||||
|
return null;
|
||||||
|
} catch (e) {
|
||||||
|
return "couldn't start playing: $e";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Library's "Watch solo": somewhere to pick from (Jellyfin when linked,
|
||||||
|
/// else Files).
|
||||||
|
void _watchSolo() => _openLibrary(_jellyfin.isEmpty ? MediaKind.file : MediaKind.jellyfin);
|
||||||
|
|
||||||
|
// --------------------------------------------------------------- handoff
|
||||||
|
|
||||||
|
/// Nothing (a dialog, a popover) is over the shell.
|
||||||
|
bool get _onTop => !_handoffOpen && handoffHolds == 0 && (ModalRoute.of(context)?.isCurrent ?? true);
|
||||||
|
|
||||||
|
/// Ctrl+V outside a text field (a focused field pastes on its own).
|
||||||
|
bool _onKey(KeyEvent e) {
|
||||||
|
if (e is! KeyDownEvent || e.logicalKey != LogicalKeyboardKey.keyV) return false;
|
||||||
|
final keys = HardwareKeyboard.instance;
|
||||||
|
if (!(keys.isControlPressed || keys.isMetaPressed) || keys.isShiftPressed || keys.isAltPressed) return false;
|
||||||
|
if (!mounted || !_onTop) return false;
|
||||||
|
final inField =
|
||||||
|
FocusManager.instance.primaryFocus?.context?.findAncestorStateOfType<EditableTextState>() != null;
|
||||||
|
if (inField) return false;
|
||||||
|
unawaited(_paste());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Clipboard files first, then text (a link or absolute paths). A pasted
|
||||||
|
/// image has no taker yet, so the clipboard's image data is not read.
|
||||||
|
Future<void> _paste() async {
|
||||||
|
var files = const <String>[];
|
||||||
|
String? text;
|
||||||
|
try {
|
||||||
|
files = await ClipboardX.readFiles();
|
||||||
|
} catch (_) {}
|
||||||
|
if (files.isEmpty) {
|
||||||
|
try {
|
||||||
|
text = await ClipboardX.readText();
|
||||||
|
} catch (_) {}
|
||||||
|
}
|
||||||
|
await _handOff(classifyHandoff(paths: files, text: text), _pointer);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _handOff(Handoff item, Offset? at) async {
|
||||||
|
if (!mounted || !_onTop || item is HandoffNothing || item is HandoffImage) return;
|
||||||
|
final size = MediaQuery.sizeOf(context);
|
||||||
|
final align = at == null || size.isEmpty
|
||||||
|
? Alignment.center
|
||||||
|
: Alignment((at.dx / size.width * 2 - 1).clamp(-1, 1), (at.dy / size.height * 2 - 1).clamp(-1, 1));
|
||||||
|
_handoffOpen = true;
|
||||||
|
final HandoffAction? action;
|
||||||
|
try {
|
||||||
|
action = await showPopover<HandoffAction>(context,
|
||||||
|
at: align, child: HandoffCard(item: item, solo: _alone.peek(), queue: _online.peek()));
|
||||||
|
} finally {
|
||||||
|
_handoffOpen = false;
|
||||||
|
}
|
||||||
|
if (action == null || !mounted) return;
|
||||||
|
switch ((item, action)) {
|
||||||
|
case (HandoffVideos(:final paths), HandoffAction.putUp):
|
||||||
|
final error = await _putUp(FileMedia(paths.first));
|
||||||
|
if (error != null) {
|
||||||
|
SessionState.instance.coordinator.showToast(error);
|
||||||
|
} else {
|
||||||
|
await FolderStore.instance.ensureLoaded();
|
||||||
|
FolderStore.instance.addRecent(paths.first);
|
||||||
|
}
|
||||||
|
case (HandoffVideos(:final paths), HandoffAction.queue || HandoffAction.playNext):
|
||||||
|
// In order: with Play next, the last one added goes first.
|
||||||
|
final next = action == HandoffAction.playNext;
|
||||||
|
for (final p in next ? paths.reversed : paths) {
|
||||||
|
final error = await SessionState.instance.coordinator.queue.add(FileMedia(p), next: next);
|
||||||
|
if (error != null) {
|
||||||
|
SessionState.instance.coordinator.showToast(error);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case (HandoffLink(:final url), HandoffAction.queue || HandoffAction.playNext):
|
||||||
|
// In the Link page's mode, probed and refused like there.
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
final error = await coord.queue
|
||||||
|
.add(LinkMedia(url, relay: _picker.linkRelay), next: action == HandoffAction.playNext);
|
||||||
|
if (error != null) coord.showToast(error);
|
||||||
|
case (HandoffVideos(:final paths), HandoffAction.addFolder):
|
||||||
|
await _addFolder(File(paths.first).parent.path);
|
||||||
|
case (HandoffFolder(:final path), _):
|
||||||
|
await _addFolder(path);
|
||||||
|
case (HandoffLink(:final url), _):
|
||||||
|
_picker.link.text = url;
|
||||||
|
_openLibrary(MediaKind.link);
|
||||||
|
default:
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _addFolder(String dir) async {
|
||||||
|
await FolderStore.instance.ensureLoaded();
|
||||||
|
FolderStore.instance.addFolder(dir);
|
||||||
|
_openFiles(dir);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Library → Files on [dir] (null: Recent).
|
||||||
|
void _openFiles(String? dir) {
|
||||||
|
showFilesFolder(dir);
|
||||||
|
_openLibrary(MediaKind.file);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _openLibrary(MediaKind source) {
|
||||||
|
if (!mounted) return;
|
||||||
|
_picker.source = source;
|
||||||
|
_selectTab(ShellTab.library);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Off on Settings: its own drop targets (cookies) take the files there.
|
||||||
|
Widget _dropTarget(Widget child) => DropTarget(
|
||||||
|
enable: _tab != ShellTab.settings,
|
||||||
|
onDragEntered: (_) => setState(() => _dragging = _onTop),
|
||||||
|
onDragExited: (_) => setState(() => _dragging = false),
|
||||||
|
onDragDone: (d) {
|
||||||
|
setState(() => _dragging = false);
|
||||||
|
_handOff(classifyHandoff(paths: DesktopDropX.pathsOf(d.files)), d.localPosition);
|
||||||
|
},
|
||||||
|
child: Stack(
|
||||||
|
fit: StackFit.expand,
|
||||||
|
children: [
|
||||||
|
child,
|
||||||
|
Positioned.fill(
|
||||||
|
child: IgnorePointer(
|
||||||
|
child: AnimatedOpacity(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
opacity: _dragging ? 1 : 0,
|
||||||
|
child: const _DropOverlay(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
// --------------------------------------------------------------- dialogs
|
||||||
|
|
||||||
|
/// Leave asks first; a solo session just stops.
|
||||||
|
Future<void> _confirmLeave() async {
|
||||||
|
final session = SessionState.instance;
|
||||||
|
if (session.solo.peek()) {
|
||||||
|
await session.leave();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final ok = await showDialog<bool>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: const Text('Leave server?'),
|
||||||
|
content: const Text('You can rejoin right away.'),
|
||||||
|
actions: [
|
||||||
|
TextButton(onPressed: () => Navigator.pop(context, false), child: const Text('Cancel')),
|
||||||
|
TextButton(
|
||||||
|
key: const ValueKey('confirm-leave'),
|
||||||
|
onPressed: () => Navigator.pop(context, true),
|
||||||
|
child: const Text('Leave'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (ok == true) await SessionState.instance.leave();
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _alert(String title, String text) async {
|
||||||
|
if (!mounted || _dialogOpen) return;
|
||||||
|
_dialogOpen = true;
|
||||||
|
try {
|
||||||
|
await showDialog<void>(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: Text(title),
|
||||||
|
content: Text(text),
|
||||||
|
actions: [TextButton(onPressed: () => Navigator.pop(context), child: const Text('OK'))],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
_dialogOpen = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _connect(ConnectMode mode) => showConnectCard(
|
||||||
|
context,
|
||||||
|
mode: mode,
|
||||||
|
flow: _flow,
|
||||||
|
join: _join,
|
||||||
|
host: _host,
|
||||||
|
healthGet: widget.healthGet,
|
||||||
|
);
|
||||||
|
|
||||||
|
// ----------------------------------------------------------------- build
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final shell = CallbackShortcuts(
|
||||||
|
bindings: {
|
||||||
|
const SingleActivator(LogicalKeyboardKey.comma, control: true): () => _selectTab(ShellTab.settings),
|
||||||
|
},
|
||||||
|
child: Scaffold(
|
||||||
|
backgroundColor: _fullscreen ? Colors.black : scheme.surface,
|
||||||
|
body: SignalBuilder(builder: (context) {
|
||||||
|
final online = _online.value;
|
||||||
|
final alone = _alone.value;
|
||||||
|
final hasMedia = _hasMedia.value;
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
if (!_fullscreen)
|
||||||
|
PartyStrip(
|
||||||
|
key: const ValueKey('strip'),
|
||||||
|
tab: _tab,
|
||||||
|
onTab: _selectTab,
|
||||||
|
chatOpen: _chatOpen,
|
||||||
|
unread: _unread,
|
||||||
|
onChat: _toggleChat,
|
||||||
|
onJoin: () => _connect(ConnectMode.join),
|
||||||
|
onHost: () => _connect(ConnectMode.host),
|
||||||
|
onLeave: _confirmLeave,
|
||||||
|
onInvite: () => _connect(ConnectMode.host),
|
||||||
|
onProfile: () => showProfileCard(context, onOpenSettings: _openSettings, updates: widget.updates),
|
||||||
|
onShowPlayer: hasMedia && _mode == PlayerMode.none ? () => _show(PlayerMode.mini) : null,
|
||||||
|
updates: widget.updates,
|
||||||
|
windowControls: widget.windowControls,
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
key: const ValueKey('body'),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
Expanded(child: _body(online, alone)),
|
||||||
|
AnimatedSize(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
child: _chatOpen && online
|
||||||
|
? ChatPanel(chat: _chat, chatFocus: _chatFocus, onClose: _toggleChat)
|
||||||
|
: const SizedBox(height: double.infinity),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
return Listener(
|
||||||
|
onPointerHover: (e) => _pointer = e.localPosition,
|
||||||
|
onPointerDown: (e) => _pointer = e.localPosition,
|
||||||
|
child: _dropTarget(shell),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// No Jellyfin account, no server joined or hosted yet, band not
|
||||||
|
/// dismissed: the welcome band explains the three ways in.
|
||||||
|
bool get _newcomer =>
|
||||||
|
!AppSettings.instance.welcomeDismissed.value &&
|
||||||
|
_jellyfin.isEmpty &&
|
||||||
|
SessionState.instance.recents.value.isEmpty;
|
||||||
|
|
||||||
|
Widget _body(bool online, bool alone) {
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
final tabBody = switch (_tab) {
|
||||||
|
ShellTab.library => LibraryTab(
|
||||||
|
key: ValueKey('library-$_libraryGen'),
|
||||||
|
controller: _picker,
|
||||||
|
accounts: _jellyfin,
|
||||||
|
solo: alone,
|
||||||
|
// Offline, a put-up starts a solo session, which hosts.
|
||||||
|
isHost: !online || coord.hostFile != null,
|
||||||
|
// Only for newcomers: the strip has Join and Host for everyone else.
|
||||||
|
banner: online || !_newcomer
|
||||||
|
? null
|
||||||
|
: WelcomeBand(
|
||||||
|
onJoin: () => _connect(ConnectMode.join),
|
||||||
|
onHost: () => _connect(ConnectMode.host),
|
||||||
|
onSolo: _watchSolo,
|
||||||
|
onDismiss: () => setState(AppSettings.instance.dismissWelcome),
|
||||||
|
),
|
||||||
|
jellyfinStart: _libraryStart,
|
||||||
|
onPutUp: _putUp,
|
||||||
|
// Up next needs a server (a solo session has one).
|
||||||
|
onAddToQueue: online ? coord.queue.add : null,
|
||||||
|
onOpenIntegrations: () => _openSettings(SettingsSection.integrations),
|
||||||
|
),
|
||||||
|
ShellTab.schedule => SchedulePage(
|
||||||
|
solo: alone,
|
||||||
|
onPutUp: _putUp,
|
||||||
|
onAddToQueue: online ? coord.queue.add : null,
|
||||||
|
onToast: coord.showToast,
|
||||||
|
),
|
||||||
|
ShellTab.settings => SettingsTab(
|
||||||
|
section: _section,
|
||||||
|
onSection: (s) => setState(() => _section = s),
|
||||||
|
onEditProfile: () => showProfileCard(context, onOpenSettings: _openSettings, updates: widget.updates),
|
||||||
|
updates: widget.updates,
|
||||||
|
jellyfin: _jellyfin,
|
||||||
|
),
|
||||||
|
};
|
||||||
|
final full = _shown == PlayerMode.full;
|
||||||
|
final fullInvolved = _mode == PlayerMode.full || _from == PlayerMode.full;
|
||||||
|
return LayoutBuilder(builder: (context, box) {
|
||||||
|
final area = box.biggest;
|
||||||
|
return Stack(
|
||||||
|
children: [
|
||||||
|
Positioned.fill(
|
||||||
|
child: AnimatedBuilder(
|
||||||
|
animation: _fade,
|
||||||
|
builder: (context, child) {
|
||||||
|
// The tabs take part in the fade only when the full player
|
||||||
|
// comes or goes; a mini player appearing leaves them be.
|
||||||
|
final v = full ? 0.0 : (fullInvolved ? _fade.value : 1.0);
|
||||||
|
return Opacity(
|
||||||
|
opacity: v,
|
||||||
|
child: Transform.scale(scale: 0.985 + 0.015 * v, child: child),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: IgnorePointer(
|
||||||
|
ignoring: full,
|
||||||
|
child: ExcludeFocus(
|
||||||
|
excluding: full,
|
||||||
|
child: TickerMode(
|
||||||
|
enabled: !full,
|
||||||
|
child: fadeThrough(KeyedSubtree(key: ValueKey(_tab), child: tabBody)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (online && _shown != PlayerMode.none) _playerLayer(area),
|
||||||
|
Positioned(left: 16, bottom: _fullscreen ? 90 : 16, child: PartyToasts(
|
||||||
|
onOpenChat: () {
|
||||||
|
if (!_chatOpen) _toggleChat();
|
||||||
|
},
|
||||||
|
)),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Offset _cornerPos(Size area, Alignment a, Size size) => Offset(
|
||||||
|
a.x < 0 ? _miniMargin : (area.width - size.width - _miniMargin).clamp(0, double.infinity),
|
||||||
|
a.y < 0 ? _miniMargin : (area.height - size.height - _miniMargin).clamp(0, double.infinity),
|
||||||
|
);
|
||||||
|
|
||||||
|
Widget _playerLayer(Size area) {
|
||||||
|
final mini = _shown == PlayerMode.mini;
|
||||||
|
final size = mini
|
||||||
|
? Size(miniSize.width.clamp(0, area.width), miniSize.height.clamp(0, area.height))
|
||||||
|
: area;
|
||||||
|
final pos = mini ? (_drag ?? _cornerPos(area, _corner, size)) : Offset.zero;
|
||||||
|
return AnimatedPositioned(
|
||||||
|
key: const ValueKey('player-layer'),
|
||||||
|
duration: _snapping ? easeTime : Duration.zero,
|
||||||
|
curve: ease,
|
||||||
|
left: pos.dx,
|
||||||
|
top: pos.dy,
|
||||||
|
width: size.width,
|
||||||
|
height: size.height,
|
||||||
|
onEnd: () => _snapping = false,
|
||||||
|
child: AnimatedBuilder(
|
||||||
|
animation: _fade,
|
||||||
|
builder: (context, child) {
|
||||||
|
final v = _fade.value;
|
||||||
|
return IgnorePointer(
|
||||||
|
ignoring: v < 0.5 || _shown != _mode,
|
||||||
|
child: Opacity(
|
||||||
|
opacity: v,
|
||||||
|
child: Transform.scale(scale: mini ? 0.97 + 0.03 * v : 0.985 + 0.015 * v, child: child),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
// Same widgets in both modes (only their settings change), so the
|
||||||
|
// player below never moves in the element tree.
|
||||||
|
child: GestureDetector(
|
||||||
|
onPanStart: mini ? (_) => setState(() => _drag = pos) : null,
|
||||||
|
onPanUpdate: mini ? (d) => setState(() => _drag = _drag! + d.delta) : null,
|
||||||
|
onPanEnd: mini
|
||||||
|
? (_) => setState(() {
|
||||||
|
final c = _drag! + Offset(size.width / 2, size.height / 2);
|
||||||
|
_corner = Alignment(c.dx < area.width / 2 ? -1 : 1, c.dy < area.height / 2 ? -1 : 1);
|
||||||
|
_drag = null;
|
||||||
|
_snapping = true;
|
||||||
|
})
|
||||||
|
: null,
|
||||||
|
child: DoubleClickListener(
|
||||||
|
onDoubleClick: mini ? _expand : () {},
|
||||||
|
skipTop: 40,
|
||||||
|
skipBottom: 60,
|
||||||
|
child: Material(
|
||||||
|
elevation: mini ? 16 : 0,
|
||||||
|
color: Colors.black,
|
||||||
|
borderRadius: BorderRadius.circular(mini ? 14 : 0),
|
||||||
|
clipBehavior: Clip.antiAlias,
|
||||||
|
child: KeyedSubtree(
|
||||||
|
key: _playerKey,
|
||||||
|
child: SessionPlayer(
|
||||||
|
mode: _shown,
|
||||||
|
fullscreen: _fullscreen,
|
||||||
|
chatOpen: _chatOpen,
|
||||||
|
unread: _unread,
|
||||||
|
onExpand: _expand,
|
||||||
|
onCollapse: _collapse,
|
||||||
|
onClose: _closePlayer,
|
||||||
|
onToggleFullscreen: _toggleFullscreen,
|
||||||
|
onToggleChat: _toggleChat,
|
||||||
|
onChangeVideo: _changeVideo,
|
||||||
|
onOpenIntegrations: () => _openSettings(SettingsSection.integrations),
|
||||||
|
onLeave: _confirmLeave,
|
||||||
|
videoBuilder: widget.videoBuilder,
|
||||||
|
windowControls: widget.windowControls,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Over the window while something is dragged over it.
|
||||||
|
class _DropOverlay extends StatelessWidget {
|
||||||
|
const _DropOverlay();
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Container(
|
||||||
|
key: const ValueKey('drop-overlay'),
|
||||||
|
margin: const EdgeInsets.all(10),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: scheme.surface.withValues(alpha: 0.55),
|
||||||
|
borderRadius: BorderRadius.circular(18),
|
||||||
|
border: Border.all(color: scheme.primary.withValues(alpha: 0.7), width: 2),
|
||||||
|
),
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: Material(
|
||||||
|
color: scheme.surfaceContainerHigh,
|
||||||
|
borderRadius: BorderRadius.circular(14),
|
||||||
|
elevation: 8,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 18, vertical: 12),
|
||||||
|
child: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Icon(Icons.file_download_outlined, color: scheme.primary),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Text('Drop to open', style: Theme.of(context).textTheme.titleMedium),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,368 @@
|
|||||||
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../screens/home/profile.dart';
|
||||||
|
import '../session/delivery.dart';
|
||||||
|
import '../session/session_coordinator.dart';
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import 'motion.dart';
|
||||||
|
|
||||||
|
/// What an avatar shows: who, their picture or initial on [color], and
|
||||||
|
/// the status the ring and badges carry.
|
||||||
|
class AvatarInfo {
|
||||||
|
final String id;
|
||||||
|
final String name;
|
||||||
|
final Color color;
|
||||||
|
final ImageProvider? image;
|
||||||
|
final bool ready, buffering, relaying, stale, host, self;
|
||||||
|
/// Sitting out: dimmed, with an "away" mark.
|
||||||
|
final bool out;
|
||||||
|
/// Why their player cannot open the media (`members[].error`): an error
|
||||||
|
/// mark; empty when it can.
|
||||||
|
final String error;
|
||||||
|
/// How it gets the media and its buffer ([MemberDelivery.detail]), for
|
||||||
|
/// the hover; empty when unknown.
|
||||||
|
final String delivery;
|
||||||
|
const AvatarInfo({
|
||||||
|
this.id = '',
|
||||||
|
required this.name,
|
||||||
|
required this.color,
|
||||||
|
this.image,
|
||||||
|
this.ready = false,
|
||||||
|
this.buffering = false,
|
||||||
|
this.relaying = false,
|
||||||
|
this.stale = false,
|
||||||
|
this.host = false,
|
||||||
|
this.self = false,
|
||||||
|
this.out = false,
|
||||||
|
this.error = '',
|
||||||
|
this.delivery = '',
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Stable colour for someone else (colours are not on the wire).
|
||||||
|
Color colorForName(String name) {
|
||||||
|
const palette = [
|
||||||
|
Colors.teal,
|
||||||
|
Colors.orange,
|
||||||
|
Colors.pink,
|
||||||
|
Colors.blue,
|
||||||
|
Colors.green,
|
||||||
|
Colors.indigo,
|
||||||
|
Colors.amber,
|
||||||
|
Colors.cyan,
|
||||||
|
Colors.red,
|
||||||
|
Colors.deepPurple,
|
||||||
|
];
|
||||||
|
var h = 0;
|
||||||
|
for (final c in name.codeUnits) {
|
||||||
|
h = (h * 31 + c) & 0x7fffffff;
|
||||||
|
}
|
||||||
|
return palette[h % palette.length];
|
||||||
|
}
|
||||||
|
|
||||||
|
final _images = <Object, MemoryImage>{};
|
||||||
|
|
||||||
|
MemoryImage _memo(Object key, Uint8List bytes) {
|
||||||
|
final hit = _images[key];
|
||||||
|
if (hit != null && identical(hit.bytes, bytes)) return hit;
|
||||||
|
if (_images.length > 64) _images.clear();
|
||||||
|
return _images[key] = MemoryImage(bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The one lookup for a member's picture: your own from the profile (no
|
||||||
|
/// round trip), anyone else's from the session's avatar cache by hash.
|
||||||
|
/// Callers rebuild on [SessionCoordinator.avatars] and [Profile.picture]
|
||||||
|
/// (see [PartyWatch]).
|
||||||
|
ImageProvider? memberAvatarImage(MemberView m, SessionCoordinator coord) {
|
||||||
|
if (m.id.isNotEmpty && m.id == coord.sync.memberId) {
|
||||||
|
final own = Profile.instance.picture.value;
|
||||||
|
if (own != null) return _memo('self', own);
|
||||||
|
}
|
||||||
|
final bytes = coord.avatars.bytesFor(m.avatarHash);
|
||||||
|
return bytes == null ? null : _memo(m.avatarHash, bytes);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Your own avatar from the profile (also offline).
|
||||||
|
AvatarInfo selfAvatarInfo({bool ready = false, bool host = false, bool out = false, String error = ''}) {
|
||||||
|
final p = Profile.instance;
|
||||||
|
final png = p.picture.value;
|
||||||
|
final name = p.name.value;
|
||||||
|
return AvatarInfo(
|
||||||
|
name: name.isEmpty ? '?' : name,
|
||||||
|
color: p.color.value,
|
||||||
|
image: png == null ? null : _memo('self', png),
|
||||||
|
ready: ready,
|
||||||
|
host: host,
|
||||||
|
self: true,
|
||||||
|
out: out,
|
||||||
|
error: error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// [m] as the party strip, toasts and the chat show it.
|
||||||
|
AvatarInfo memberAvatarInfo(MemberView m, StateBroadcast? r, SessionCoordinator coord) {
|
||||||
|
final self = m.id.isNotEmpty && m.id == coord.sync.memberId;
|
||||||
|
final relay = r == null ? null : stateMediaRelay(r);
|
||||||
|
final playing = r?.media != null;
|
||||||
|
final delivery = r == null ? null : deliveryOf(r, selfId: coord.sync.memberId, names: coord.memberNames);
|
||||||
|
return AvatarInfo(
|
||||||
|
id: m.id,
|
||||||
|
name: m.name,
|
||||||
|
color: self ? Profile.instance.color.value : colorForName(m.name),
|
||||||
|
image: memberAvatarImage(m, coord),
|
||||||
|
ready: m.ready,
|
||||||
|
buffering: !m.stale && m.ready && m.error.isEmpty && playing && m.buffered < r!.bufferNeed,
|
||||||
|
relaying: relay != null && relay.source.isNotEmpty && relay.source == m.id,
|
||||||
|
stale: m.stale,
|
||||||
|
// The state marks the host (`members[].host`); your own app also
|
||||||
|
// knows before the first state.
|
||||||
|
host: m.host || (self && coord.hostFile != null),
|
||||||
|
self: self,
|
||||||
|
out: m.out,
|
||||||
|
error: m.error,
|
||||||
|
delivery: delivery == null ? '' : memberDeliveryOf(m, r!, delivery).detail,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Everyone in the server, from the latest state.
|
||||||
|
List<AvatarInfo> partyAvatars([SessionCoordinator? coord]) {
|
||||||
|
final c = coord ?? SessionState.instance.coordinator;
|
||||||
|
final r = c.serverState.value;
|
||||||
|
return [for (final m in r?.members ?? const <MemberView>[]) memberAvatarInfo(m, r, c)];
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Rebuilds [builder] when the party state, your profile or a member's
|
||||||
|
/// picture changes.
|
||||||
|
class PartyWatch extends StatelessWidget {
|
||||||
|
final WidgetBuilder builder;
|
||||||
|
const PartyWatch({super.key, required this.builder});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => ListenableBuilder(
|
||||||
|
listenable: SessionState.instance.coordinator.avatars,
|
||||||
|
builder: (context, _) => SignalBuilder(builder: (context) => builder(context)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Circle avatar with a status ring outside it and a gap in the background
|
||||||
|
/// colour, so overlapping neighbours never hide the status. Crown = host,
|
||||||
|
/// tower = passing the video on, spinner = buffering, dimmed = stale,
|
||||||
|
/// dimmed with a moon = sitting out, red "!" = cannot play the media.
|
||||||
|
class StatusAvatar extends StatelessWidget {
|
||||||
|
final AvatarInfo info;
|
||||||
|
final double size;
|
||||||
|
|
||||||
|
/// Host crown and relay tower; off where the context already says it.
|
||||||
|
final bool badges;
|
||||||
|
|
||||||
|
/// Ring colour when not ready (the profile shows none at all).
|
||||||
|
final bool ring;
|
||||||
|
const StatusAvatar({super.key, required this.info, required this.size, this.badges = true, this.ring = true});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final bg = Theme.of(context).colorScheme.surfaceContainerLowest;
|
||||||
|
final ringColor = !ring
|
||||||
|
? bg
|
||||||
|
: info.stale
|
||||||
|
? Colors.grey.shade700
|
||||||
|
: info.buffering
|
||||||
|
? Colors.amber
|
||||||
|
: info.ready
|
||||||
|
? Colors.greenAccent.shade400
|
||||||
|
: Colors.grey;
|
||||||
|
final badge = size * 0.42;
|
||||||
|
// Ring and gap scale with the avatar (2 px at strip size).
|
||||||
|
final stroke = (size * 0.055).clamp(2.0, 4.0);
|
||||||
|
final initial = info.name.isEmpty ? '?' : info.name.characters.first.toUpperCase();
|
||||||
|
return SizedBox(
|
||||||
|
width: size,
|
||||||
|
height: size,
|
||||||
|
child: Stack(
|
||||||
|
clipBehavior: Clip.none,
|
||||||
|
children: [
|
||||||
|
// Fills the box: a non-positioned Stack child only gets loose
|
||||||
|
// constraints, and CircleAvatar then falls back to 40 px.
|
||||||
|
Positioned.fill(
|
||||||
|
child: Container(
|
||||||
|
decoration: BoxDecoration(shape: BoxShape.circle, color: ringColor),
|
||||||
|
padding: EdgeInsets.all(stroke),
|
||||||
|
child: Container(
|
||||||
|
decoration: BoxDecoration(shape: BoxShape.circle, color: bg),
|
||||||
|
padding: EdgeInsets.all(stroke),
|
||||||
|
child: Opacity(
|
||||||
|
opacity: info.stale || info.out ? 0.4 : 1,
|
||||||
|
child: CircleAvatar(
|
||||||
|
radius: size / 2,
|
||||||
|
backgroundColor: info.color,
|
||||||
|
backgroundImage: info.image,
|
||||||
|
child: info.image != null
|
||||||
|
? null
|
||||||
|
: Text(initial, style: TextStyle(fontSize: size * 0.38, color: Colors.white)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (info.buffering)
|
||||||
|
Positioned.fill(child: CircularProgressIndicator(strokeWidth: stroke, color: ringColor)),
|
||||||
|
if (badges && info.host)
|
||||||
|
Positioned(
|
||||||
|
left: -4,
|
||||||
|
top: -6,
|
||||||
|
child: Transform.rotate(
|
||||||
|
angle: -0.4,
|
||||||
|
child: Icon(
|
||||||
|
Icons.workspace_premium,
|
||||||
|
size: badge,
|
||||||
|
color: Colors.amber,
|
||||||
|
shadows: const [Shadow(blurRadius: 3, color: Colors.black)],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (info.out)
|
||||||
|
Positioned(
|
||||||
|
key: const ValueKey('away-mark'),
|
||||||
|
left: -3,
|
||||||
|
bottom: -3,
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.all(2),
|
||||||
|
decoration: BoxDecoration(shape: BoxShape.circle, color: bg),
|
||||||
|
child: Icon(Icons.bedtime, size: (badge * 0.8).clamp(10.0, 24.0), color: Colors.blueGrey.shade200),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (info.error.isNotEmpty)
|
||||||
|
Positioned(
|
||||||
|
key: const ValueKey('error-mark'),
|
||||||
|
right: -3,
|
||||||
|
top: -3,
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.all(1),
|
||||||
|
decoration: BoxDecoration(shape: BoxShape.circle, color: bg),
|
||||||
|
child: Icon(Icons.error, size: (badge * 0.8).clamp(10.0, 24.0), color: Colors.redAccent.shade200),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (badges && info.relaying)
|
||||||
|
Positioned(
|
||||||
|
right: -3,
|
||||||
|
bottom: -3,
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.all(2),
|
||||||
|
decoration: BoxDecoration(shape: BoxShape.circle, color: bg),
|
||||||
|
child: Icon(Icons.cell_tower, size: badge * 0.8, color: Colors.lightBlueAccent),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Overlapping avatars, host first then ready (the stack itself reads as
|
||||||
|
/// progress); they spread apart on hover. "+N" past [shown].
|
||||||
|
class AvatarStack extends StatefulWidget {
|
||||||
|
final List<AvatarInfo> members;
|
||||||
|
final VoidCallback? onTap;
|
||||||
|
final int shown;
|
||||||
|
final double size;
|
||||||
|
const AvatarStack({super.key, required this.members, this.onTap, this.shown = 5, this.size = 42});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AvatarStack> createState() => _AvatarStackState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AvatarStackState extends State<AvatarStack> {
|
||||||
|
bool _hover = false;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final size = widget.size;
|
||||||
|
int rank(AvatarInfo m) => m.host ? 0 : (m.out ? 3 : m.ready ? 1 : 2);
|
||||||
|
final sorted = [...widget.members]..sort((a, b) => rank(a) - rank(b));
|
||||||
|
final visible = sorted.take(widget.shown).toList();
|
||||||
|
final extra = sorted.length - visible.length;
|
||||||
|
final step = _hover ? size + 6 : size * 0.62;
|
||||||
|
final count = visible.length + (extra > 0 ? 1 : 0);
|
||||||
|
final width = count == 0 ? 0.0 : step * (count - 1) + size;
|
||||||
|
return MouseRegion(
|
||||||
|
onEnter: (_) => setState(() => _hover = true),
|
||||||
|
onExit: (_) => setState(() => _hover = false),
|
||||||
|
cursor: widget.onTap == null ? MouseCursor.defer : SystemMouseCursors.click,
|
||||||
|
child: GestureDetector(
|
||||||
|
onTap: widget.onTap,
|
||||||
|
child: AnimatedContainer(
|
||||||
|
key: const ValueKey('avatar-stack'),
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
width: width,
|
||||||
|
height: size,
|
||||||
|
child: Stack(
|
||||||
|
clipBehavior: Clip.none,
|
||||||
|
children: [
|
||||||
|
for (var i = visible.length - 1; i >= 0; i--)
|
||||||
|
AnimatedPositioned(
|
||||||
|
key: ValueKey('stack-${visible[i].id}-${visible[i].name}'),
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
left: i * step,
|
||||||
|
top: 0,
|
||||||
|
child: Tooltip(
|
||||||
|
message: [
|
||||||
|
visible[i].error.isEmpty
|
||||||
|
? visible[i].name
|
||||||
|
: "${visible[i].name} can't play this: ${visible[i].error}",
|
||||||
|
if (visible[i].delivery.isNotEmpty) visible[i].delivery,
|
||||||
|
].join('\n'),
|
||||||
|
child: StatusAvatar(info: visible[i], size: size),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (extra > 0)
|
||||||
|
AnimatedPositioned(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
left: visible.length * step,
|
||||||
|
top: 0,
|
||||||
|
child: CircleAvatar(
|
||||||
|
radius: size / 2,
|
||||||
|
child: Text('+$extra', style: const TextStyle(fontSize: 12)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Small coloured label ("host", "passing the video on").
|
||||||
|
class Pill extends StatelessWidget {
|
||||||
|
final String text;
|
||||||
|
final Color color;
|
||||||
|
const Pill(this.text, this.color, {super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: color.withValues(alpha: 0.15),
|
||||||
|
borderRadius: BorderRadius.circular(6),
|
||||||
|
),
|
||||||
|
child: Text(text, style: TextStyle(color: color, fontSize: 10, fontWeight: FontWeight.w600)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Someone by display name (feed lines carry names, not ids): from the
|
||||||
|
/// latest state when still there, else their initial on a stable colour.
|
||||||
|
AvatarInfo avatarForName(String name, [SessionCoordinator? coord]) {
|
||||||
|
final c = coord ?? SessionState.instance.coordinator;
|
||||||
|
final r = c.serverState.value;
|
||||||
|
for (final m in r?.members ?? const <MemberView>[]) {
|
||||||
|
if (m.name == name) return memberAvatarInfo(m, r, c);
|
||||||
|
}
|
||||||
|
return AvatarInfo(name: name, color: colorForName(name));
|
||||||
|
}
|
||||||
@@ -0,0 +1,314 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart';
|
||||||
|
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import '../widgets/app_menu.dart';
|
||||||
|
import '../widgets/copy_open.dart';
|
||||||
|
import '../widgets/text_focus.dart';
|
||||||
|
import 'avatar.dart';
|
||||||
|
|
||||||
|
/// Activity lines (joins, ready, seeks...) between the messages: off by
|
||||||
|
/// default, kept for the app's run.
|
||||||
|
final showActivity = ValueNotifier(false);
|
||||||
|
|
||||||
|
/// Side panel: chat with avatars, other activity as quiet lines (behind
|
||||||
|
/// the "Activity" toggle), and the message field. Width is fixed; the
|
||||||
|
/// shell slides it in and out. The field takes focus on open; Tab and Esc
|
||||||
|
/// in it close the panel.
|
||||||
|
class ChatPanel extends StatefulWidget {
|
||||||
|
static const width = 340.0;
|
||||||
|
final TextEditingController chat;
|
||||||
|
final FocusNode chatFocus;
|
||||||
|
final VoidCallback onClose;
|
||||||
|
const ChatPanel({super.key, required this.chat, required this.chatFocus, required this.onClose});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<ChatPanel> createState() => _ChatPanelState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _ChatPanelState extends State<ChatPanel> {
|
||||||
|
// Where focus was before the field took it; it goes back there on close
|
||||||
|
// (else a field behind could take it, and Space with it).
|
||||||
|
FocusNode? _before;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (!mounted) return;
|
||||||
|
final before = FocusManager.instance.primaryFocus;
|
||||||
|
if (before != widget.chatFocus) _before = before;
|
||||||
|
widget.chatFocus.requestFocus();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
final before = _before;
|
||||||
|
if (before != null && before.context != null && before.canRequestFocus && !textInputFocused(before)) {
|
||||||
|
before.requestFocus();
|
||||||
|
} else if (textInputFocused()) {
|
||||||
|
FocusManager.instance.primaryFocus?.unfocus();
|
||||||
|
}
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _send() {
|
||||||
|
SessionState.instance.coordinator.sendChat(widget.chat.text);
|
||||||
|
widget.chat.clear();
|
||||||
|
widget.chatFocus.requestFocus();
|
||||||
|
}
|
||||||
|
|
||||||
|
KeyEventResult _fieldKey(FocusNode node, KeyEvent e) {
|
||||||
|
if (e is! KeyDownEvent) return KeyEventResult.ignored;
|
||||||
|
if (e.logicalKey != LogicalKeyboardKey.tab && e.logicalKey != LogicalKeyboardKey.escape) {
|
||||||
|
return KeyEventResult.ignored;
|
||||||
|
}
|
||||||
|
widget.onClose();
|
||||||
|
return KeyEventResult.handled;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
return Container(
|
||||||
|
key: const ValueKey('chat-panel'),
|
||||||
|
width: ChatPanel.width,
|
||||||
|
color: scheme.surfaceContainerLow,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 8, 4, 0),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const Text('Chat', style: TextStyle(fontWeight: FontWeight.w600)),
|
||||||
|
const Spacer(),
|
||||||
|
ValueListenableBuilder<bool>(
|
||||||
|
valueListenable: showActivity,
|
||||||
|
builder: (context, on, _) => FilterChip(
|
||||||
|
key: const ValueKey('chat-activity'),
|
||||||
|
label: const Text('Activity', style: TextStyle(fontSize: 12)),
|
||||||
|
tooltip: 'Show joins, ready, seeks and other activity',
|
||||||
|
selected: on,
|
||||||
|
showCheckmark: false,
|
||||||
|
visualDensity: VisualDensity.compact,
|
||||||
|
materialTapTargetSize: MaterialTapTargetSize.shrinkWrap,
|
||||||
|
onSelected: (v) => showActivity.value = v,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
IconButton(tooltip: 'Close (Tab)', onPressed: widget.onClose, icon: const Icon(Icons.close, size: 18)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: ValueListenableBuilder<bool>(
|
||||||
|
valueListenable: showActivity,
|
||||||
|
builder: (context, activity, _) => PartyWatch(builder: (context) {
|
||||||
|
final all = SessionState.instance.coordinator.feedLog.value;
|
||||||
|
final log = activity ? all : [for (final f in all) if (f.action == 'chat') f];
|
||||||
|
if (log.isEmpty) {
|
||||||
|
return Center(
|
||||||
|
child: Text(activity ? 'Nothing yet' : 'No messages yet',
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return ListView.builder(
|
||||||
|
reverse: true,
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 8),
|
||||||
|
itemCount: log.length,
|
||||||
|
itemBuilder: (context, i) => ActivityRow(item: log[log.length - 1 - i]),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.all(12),
|
||||||
|
child: Focus(
|
||||||
|
canRequestFocus: false,
|
||||||
|
skipTraversal: true,
|
||||||
|
onKeyEvent: _fieldKey,
|
||||||
|
child: TextField(
|
||||||
|
key: const ValueKey('chat-field'),
|
||||||
|
controller: widget.chat,
|
||||||
|
focusNode: widget.chatFocus,
|
||||||
|
onSubmitted: (_) => _send(),
|
||||||
|
decoration: InputDecoration(
|
||||||
|
hintText: 'Message (Enter)',
|
||||||
|
isDense: true,
|
||||||
|
filled: true,
|
||||||
|
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12), borderSide: BorderSide.none),
|
||||||
|
suffixIcon: IconButton(tooltip: 'Send', onPressed: _send, icon: const Icon(Icons.send, size: 18)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// One feed line: a chat message with the sender's avatar, anything else
|
||||||
|
/// as an icon and "who did what".
|
||||||
|
class ActivityRow extends StatelessWidget {
|
||||||
|
final FeedMessage item;
|
||||||
|
const ActivityRow({super.key, required this.item});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final time = _clock(item.at);
|
||||||
|
if (item.action == 'chat') {
|
||||||
|
final link = firstLinkIn(item.reason);
|
||||||
|
// Right-click on the text: its selection menu plus the whole message
|
||||||
|
// and its link; beside it, the same as the app's menu.
|
||||||
|
final message = SelectableText(
|
||||||
|
item.reason,
|
||||||
|
contextMenuBuilder: (context, state) => AdaptiveTextSelectionToolbar.buttonItems(
|
||||||
|
anchors: state.contextMenuAnchors,
|
||||||
|
buttonItems: [
|
||||||
|
...state.contextMenuButtonItems,
|
||||||
|
for (final (label, action) in _messageActions(item.reason, link))
|
||||||
|
ContextMenuButtonItem(
|
||||||
|
label: label,
|
||||||
|
onPressed: () {
|
||||||
|
state.hideToolbar();
|
||||||
|
action();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
return Builder(
|
||||||
|
builder: (context) => GestureDetector(
|
||||||
|
onSecondaryTap: () => _messageMenu(context, item.reason, link),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 6),
|
||||||
|
child: Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
StatusAvatar(info: avatarForName(item.actor), size: 34, badges: false),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Flexible(
|
||||||
|
child: Text(item.actor,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: const TextStyle(fontWeight: FontWeight.w700)),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Text(time, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 11)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
message,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final (icon, color, text) = item.actor == 'server' ? serverFeedStyle(item) : feedStyle(item, scheme);
|
||||||
|
final line = item.actor == 'server' ? text : '${item.actor} $text';
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(vertical: 4),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Icon(icon, size: 14, color: color),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Expanded(child: Text(line, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12))),
|
||||||
|
Text(time, style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 11)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The first http(s) link in [text], if any.
|
||||||
|
String? firstLinkIn(String text) => RegExp(r'https?://[^\s<>"]+', caseSensitive: false).firstMatch(text)?.group(0);
|
||||||
|
|
||||||
|
/// What a chat message offers: Copy message, and its link's Copy link and
|
||||||
|
/// Open in browser.
|
||||||
|
List<(String, VoidCallback)> _messageActions(String text, String? link) => [
|
||||||
|
(ReuseText.copyMessage, () => copyToClipboard(text, done: 'Message copied')),
|
||||||
|
if (link != null) ...[
|
||||||
|
(ReuseText.copyLink, () => copyToClipboard(link, done: 'Link copied')),
|
||||||
|
(ReuseText.openInBrowser, () => openLink(link)),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
/// Right-click beside a chat message: [_messageActions] in the app's menu.
|
||||||
|
Future<void> _messageMenu(BuildContext context, String text, String? link) async {
|
||||||
|
final actions = _messageActions(text, link);
|
||||||
|
final pick = await showAppMenu<int>(context, items: [
|
||||||
|
for (final (i, (label, _)) in actions.indexed) AppMenuItem(value: i, label: label),
|
||||||
|
]);
|
||||||
|
if (pick != null) actions[pick].$2();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Icon, colour and wording of a member's feed action.
|
||||||
|
(IconData, Color, String) feedStyle(FeedMessage f, ColorScheme scheme) {
|
||||||
|
switch (f.action) {
|
||||||
|
case 'join':
|
||||||
|
return (Icons.login, Colors.green, 'joined');
|
||||||
|
case 'leave':
|
||||||
|
final reason = f.reason == 'silent too long' ? ' · timed out' : (f.reason.isEmpty ? '' : ' · ${f.reason}');
|
||||||
|
return (Icons.logout, Colors.grey, 'left$reason');
|
||||||
|
case 'ready':
|
||||||
|
return (Icons.check_circle, Colors.green, 'is ready');
|
||||||
|
case 'unready':
|
||||||
|
return (Icons.radio_button_unchecked, Colors.grey, "isn't ready");
|
||||||
|
case 'force-ready':
|
||||||
|
return (Icons.how_to_reg, Colors.orange, 'marked ${f.target ?? ''} ready');
|
||||||
|
case 'force-unready':
|
||||||
|
return (Icons.how_to_reg, Colors.orange, 'marked ${f.target ?? ''} not ready');
|
||||||
|
case 'force-play':
|
||||||
|
return (Icons.play_arrow, Colors.green, 'started playback for everyone');
|
||||||
|
case 'force-hold':
|
||||||
|
return (Icons.pause, Colors.orange, 'held playback for everyone');
|
||||||
|
case 'seek':
|
||||||
|
return (Icons.fast_forward, scheme.primary, 'seeked');
|
||||||
|
case 'swap':
|
||||||
|
return (Icons.swap_horiz, scheme.primary, 'changed the media');
|
||||||
|
case 'stale':
|
||||||
|
return (Icons.cloud_off, Colors.orange, 'lost signal');
|
||||||
|
case 'out':
|
||||||
|
final who = f.target;
|
||||||
|
return (Icons.bedtime, Colors.blueGrey, who == null || who.isEmpty ? 'is sitting out' : 'sat $who out');
|
||||||
|
case 'back':
|
||||||
|
return (Icons.login, Colors.green, 'joined back');
|
||||||
|
case 'queue-add':
|
||||||
|
return (Icons.playlist_add_rounded, scheme.primary, 'added ${f.target ?? ''} to Up next');
|
||||||
|
case 'queue-remove':
|
||||||
|
return (Icons.playlist_remove_rounded, Colors.grey, 'removed ${f.target ?? ''} from Up next');
|
||||||
|
case 'queue-skip':
|
||||||
|
final why = f.reason.isEmpty ? '' : ' · ${f.reason}';
|
||||||
|
return (Icons.redo_rounded, Colors.orange, 'skipped ${f.target ?? ''}$why');
|
||||||
|
case 'fetch-fail':
|
||||||
|
return (Icons.cloud_off, Colors.red, "couldn't fetch ${f.target ?? 'the video'}");
|
||||||
|
default:
|
||||||
|
final target = f.target == null || f.target!.isEmpty ? '' : ' ${f.target}';
|
||||||
|
return (Icons.info_outline, Colors.grey, '${f.action}$target');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The server's own lines (pause / resume).
|
||||||
|
(IconData, Color, String) serverFeedStyle(FeedMessage f) => switch (f.action) {
|
||||||
|
'resume' => (Icons.play_arrow, Colors.green, 'Playback resumed'),
|
||||||
|
_ => (Icons.pause, Colors.orange, 'Playback paused · waiting for readiness'),
|
||||||
|
};
|
||||||
|
|
||||||
|
String _clock(DateTime at) {
|
||||||
|
final l = at.toLocal();
|
||||||
|
String two(int n) => n.toString().padLeft(2, '0');
|
||||||
|
return '${two(l.hour)}:${two(l.minute)}';
|
||||||
|
}
|
||||||
@@ -0,0 +1,505 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart' show RelayConstants;
|
||||||
|
|
||||||
|
import '../screens/home/connect_flow.dart';
|
||||||
|
import '../screens/home/connect_status.dart';
|
||||||
|
import '../screens/home/health_probe.dart';
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import 'motion.dart';
|
||||||
|
|
||||||
|
/// Join card text, owned by the shell so it survives the card closing.
|
||||||
|
class JoinFields {
|
||||||
|
JoinFields(ConnectForm f)
|
||||||
|
: host = TextEditingController(text: f.host),
|
||||||
|
port = TextEditingController(text: f.port),
|
||||||
|
secret = TextEditingController(text: f.secret);
|
||||||
|
final TextEditingController host;
|
||||||
|
final TextEditingController port;
|
||||||
|
final TextEditingController secret;
|
||||||
|
|
||||||
|
void dispose() {
|
||||||
|
host.dispose();
|
||||||
|
port.dispose();
|
||||||
|
secret.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Host card text, owned by the shell so it survives the card closing.
|
||||||
|
class HostFields {
|
||||||
|
HostFields(ConnectForm f)
|
||||||
|
: port = TextEditingController(text: f.hostPort),
|
||||||
|
secret = TextEditingController(text: f.hostSecret);
|
||||||
|
final TextEditingController port;
|
||||||
|
final TextEditingController secret;
|
||||||
|
|
||||||
|
void dispose() {
|
||||||
|
port.dispose();
|
||||||
|
secret.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The strip's Join / Host buttons (and solo's Invite friends, the Host
|
||||||
|
/// card): a card over the window. It closes itself once the attempt got
|
||||||
|
/// in; a failed one shows its error inside.
|
||||||
|
Future<void> showConnectCard(
|
||||||
|
BuildContext context, {
|
||||||
|
required ConnectMode mode,
|
||||||
|
required ConnectFlow flow,
|
||||||
|
required JoinFields join,
|
||||||
|
required HostFields host,
|
||||||
|
HealthGetter healthGet = defaultHealthGet,
|
||||||
|
}) =>
|
||||||
|
showPopover<void>(
|
||||||
|
context,
|
||||||
|
dim: true,
|
||||||
|
at: const Alignment(0.8, -0.75),
|
||||||
|
child: _CloseWhenOnline(
|
||||||
|
child: mode == ConnectMode.host
|
||||||
|
? HostCard(flow: flow, fields: host)
|
||||||
|
: JoinCard(flow: flow, fields: join, healthGet: healthGet),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
class _CloseWhenOnline extends StatefulWidget {
|
||||||
|
final Widget child;
|
||||||
|
const _CloseWhenOnline({required this.child});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<_CloseWhenOnline> createState() => _CloseWhenOnlineState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CloseWhenOnlineState extends State<_CloseWhenOnline> {
|
||||||
|
late final void Function() _stop;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_stop = effect(() {
|
||||||
|
final s = SessionState.instance;
|
||||||
|
// Solo is in a session too: wait until it is a hosted server.
|
||||||
|
if (s.route.value != AppRoute.session || s.solo.value || s.switching.value) return;
|
||||||
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
||||||
|
if (mounted) Navigator.of(context).maybePop();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_stop();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => widget.child;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Card frame shared by Join and Host.
|
||||||
|
class _Card extends StatelessWidget {
|
||||||
|
final String title;
|
||||||
|
final List<Widget> children;
|
||||||
|
const _Card({required this.title, required this.children});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => Material(
|
||||||
|
elevation: 12,
|
||||||
|
borderRadius: BorderRadius.circular(14),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 360,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.all(16),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Text(title, style: Theme.of(context).textTheme.titleMedium),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
...children,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const _dense = InputDecoration(isDense: true);
|
||||||
|
|
||||||
|
/// Recent servers as one-click rows (with live status), then address and
|
||||||
|
/// password.
|
||||||
|
class JoinCard extends StatelessWidget {
|
||||||
|
final ConnectFlow flow;
|
||||||
|
final JoinFields fields;
|
||||||
|
final HealthGetter healthGet;
|
||||||
|
const JoinCard({super.key, required this.flow, required this.fields, this.healthGet = defaultHealthGet});
|
||||||
|
|
||||||
|
void _join() => flow.submit(ConnectMode.join, (f) {
|
||||||
|
f
|
||||||
|
..host = fields.host.text
|
||||||
|
..port = fields.port.text.trim()
|
||||||
|
..secret = fields.secret.text;
|
||||||
|
});
|
||||||
|
|
||||||
|
void _joinRecent(RecentServer r) {
|
||||||
|
fields.host.text = r.host;
|
||||||
|
fields.port.text = r.port;
|
||||||
|
fields.secret.text = r.secret;
|
||||||
|
_join();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return ListenableBuilder(
|
||||||
|
listenable: flow,
|
||||||
|
builder: (context, _) {
|
||||||
|
final busy = flow.busy == ConnectMode.join;
|
||||||
|
return _Card(
|
||||||
|
title: 'Join a friend',
|
||||||
|
children: [
|
||||||
|
SignalBuilder(builder: (context) {
|
||||||
|
final list = [
|
||||||
|
for (final r in SessionState.instance.recents.value)
|
||||||
|
if (!r.hosted) r
|
||||||
|
];
|
||||||
|
if (list.isEmpty) return const SizedBox.shrink();
|
||||||
|
return Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
const Text('Recent', style: TextStyle(color: Colors.grey)),
|
||||||
|
RecentServerRows(
|
||||||
|
servers: list,
|
||||||
|
enabled: flow.busy == null,
|
||||||
|
healthGet: healthGet,
|
||||||
|
onJoin: _joinRecent,
|
||||||
|
onForget: SessionState.instance.forgetServer,
|
||||||
|
),
|
||||||
|
const Divider(),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
AbsorbPointer(
|
||||||
|
absorbing: busy,
|
||||||
|
child: Column(
|
||||||
|
key: const ValueKey('join-row'),
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Expanded(
|
||||||
|
child: TextField(
|
||||||
|
key: const ValueKey('join-address'),
|
||||||
|
controller: fields.host,
|
||||||
|
autofocus: true,
|
||||||
|
decoration: _dense.copyWith(labelText: 'Address', hintText: 'IP or hostname'),
|
||||||
|
onChanged: (_) => flow.clearError(ConnectMode.join),
|
||||||
|
onSubmitted: (_) => _join(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
SizedBox(
|
||||||
|
width: 72,
|
||||||
|
child: TextField(
|
||||||
|
key: const ValueKey('join-port'),
|
||||||
|
controller: fields.port,
|
||||||
|
decoration: _dense.copyWith(labelText: 'Port'),
|
||||||
|
keyboardType: TextInputType.number,
|
||||||
|
onSubmitted: (_) => _join(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
TextField(
|
||||||
|
key: const ValueKey('join-password'),
|
||||||
|
controller: fields.secret,
|
||||||
|
obscureText: true,
|
||||||
|
decoration: _dense.copyWith(labelText: 'Password (optional)'),
|
||||||
|
onSubmitted: (_) => _join(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
ConnectButton(flow: flow, mode: ConnectMode.join, label: 'Join', onSubmit: _join, expand: true),
|
||||||
|
ConnectFeedback(flow: flow, mode: ConnectMode.join),
|
||||||
|
const Padding(
|
||||||
|
padding: EdgeInsets.only(top: 8),
|
||||||
|
child: Text(
|
||||||
|
'Your friend gives you the address and password. No account or Jellyfin needed.',
|
||||||
|
style: TextStyle(color: Colors.grey, fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Port and password; what to watch is picked afterwards, in the library.
|
||||||
|
class HostCard extends StatelessWidget {
|
||||||
|
final ConnectFlow flow;
|
||||||
|
final HostFields fields;
|
||||||
|
const HostCard({super.key, required this.flow, required this.fields});
|
||||||
|
|
||||||
|
void _host() => flow.submit(
|
||||||
|
ConnectMode.host,
|
||||||
|
(f) => f
|
||||||
|
..hostPort = fields.port.text.trim()
|
||||||
|
..hostSecret = fields.secret.text,
|
||||||
|
);
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
// From a solo session this is "Invite friends": same server settings,
|
||||||
|
// and what plays carries over.
|
||||||
|
final solo = SessionState.instance.solo.peek();
|
||||||
|
return ListenableBuilder(
|
||||||
|
listenable: flow,
|
||||||
|
builder: (context, _) => _Card(
|
||||||
|
title: solo ? 'Invite friends' : 'Host a server',
|
||||||
|
children: [
|
||||||
|
AbsorbPointer(
|
||||||
|
absorbing: flow.busy == ConnectMode.host,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
TextField(
|
||||||
|
key: const ValueKey('host-port'),
|
||||||
|
controller: fields.port,
|
||||||
|
autofocus: true,
|
||||||
|
decoration: _dense.copyWith(labelText: 'Port', hintText: '8080'),
|
||||||
|
keyboardType: TextInputType.number,
|
||||||
|
onChanged: (_) => flow.clearError(ConnectMode.host),
|
||||||
|
onSubmitted: (_) => _host(),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
ListenableBuilder(
|
||||||
|
listenable: fields.secret,
|
||||||
|
builder: (context, _) => TextField(
|
||||||
|
key: const ValueKey('host-password'),
|
||||||
|
controller: fields.secret,
|
||||||
|
obscureText: true,
|
||||||
|
decoration: _dense.copyWith(
|
||||||
|
labelText: 'Password (optional)',
|
||||||
|
helperText: fields.secret.text.isEmpty ? 'No password — anyone can join' : null,
|
||||||
|
),
|
||||||
|
onSubmitted: (_) => _host(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
_HostedRecents(fields: fields, enabled: flow.busy == null),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
ConnectButton(
|
||||||
|
flow: flow, mode: ConnectMode.host, label: solo ? 'Start hosting' : 'Host', onSubmit: _host, expand: true),
|
||||||
|
ConnectFeedback(flow: flow, mode: ConnectMode.host),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 8),
|
||||||
|
child: Text(
|
||||||
|
solo
|
||||||
|
? 'Your video keeps playing from where it is; friends join with your address.'
|
||||||
|
: 'You pick what to watch afterwards, in the library.',
|
||||||
|
style: const TextStyle(color: Colors.grey, fontSize: 12),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Ports hosted before: one click refills port and password.
|
||||||
|
class _HostedRecents extends StatelessWidget {
|
||||||
|
final HostFields fields;
|
||||||
|
final bool enabled;
|
||||||
|
const _HostedRecents({required this.fields, required this.enabled});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return SignalBuilder(builder: (context) {
|
||||||
|
final list = [
|
||||||
|
for (final r in SessionState.instance.recents.value)
|
||||||
|
if (r.hosted) r
|
||||||
|
];
|
||||||
|
if (list.isEmpty) return const SizedBox.shrink();
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 12),
|
||||||
|
child: Wrap(
|
||||||
|
spacing: 8,
|
||||||
|
runSpacing: 8,
|
||||||
|
children: [
|
||||||
|
for (final r in list)
|
||||||
|
InputChip(
|
||||||
|
key: ValueKey('recent-${r.key}'),
|
||||||
|
avatar: Icon(r.secret.isEmpty ? Icons.history : Icons.lock_outline, size: 16),
|
||||||
|
label: Text('Port ${r.port}'),
|
||||||
|
tooltip: 'Use port ${r.port} again',
|
||||||
|
isEnabled: enabled,
|
||||||
|
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(8)),
|
||||||
|
onPressed: () {
|
||||||
|
fields.port.text = r.port;
|
||||||
|
fields.secret.text = r.secret;
|
||||||
|
},
|
||||||
|
deleteButtonTooltipMessage: 'Forget',
|
||||||
|
onDeleted: () => SessionState.instance.forgetServer(r),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Recent servers as rows; polls each one's `/health` every
|
||||||
|
/// [healthPollEvery] while mounted (i.e. while the Join card is open).
|
||||||
|
class RecentServerRows extends StatefulWidget {
|
||||||
|
final List<RecentServer> servers;
|
||||||
|
final bool enabled;
|
||||||
|
final HealthGetter healthGet;
|
||||||
|
final ValueChanged<RecentServer> onJoin;
|
||||||
|
final ValueChanged<RecentServer> onForget;
|
||||||
|
const RecentServerRows({
|
||||||
|
super.key,
|
||||||
|
required this.servers,
|
||||||
|
required this.enabled,
|
||||||
|
required this.healthGet,
|
||||||
|
required this.onJoin,
|
||||||
|
required this.onForget,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<RecentServerRows> createState() => _RecentServerRowsState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _RecentServerRowsState extends State<RecentServerRows> {
|
||||||
|
final _health = <String, ServerHealth>{};
|
||||||
|
final _inFlight = <String>{};
|
||||||
|
Timer? _timer;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_pollAll();
|
||||||
|
_timer = Timer.periodic(healthPollEvery, (_) => _pollAll());
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(RecentServerRows old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
for (final r in widget.servers) {
|
||||||
|
if (!_health.containsKey(r.key)) _poll(r);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_timer?.cancel();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _pollAll() {
|
||||||
|
for (final r in widget.servers) {
|
||||||
|
_poll(r);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _poll(RecentServer r) async {
|
||||||
|
if (!_inFlight.add(r.key)) return;
|
||||||
|
try {
|
||||||
|
final h = await probeHealth(r.host, r.port, widget.healthGet);
|
||||||
|
if (mounted) setState(() => _health[r.key] = h);
|
||||||
|
} finally {
|
||||||
|
_inFlight.remove(r.key);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Column(
|
||||||
|
children: [
|
||||||
|
for (final r in widget.servers)
|
||||||
|
_RecentRow(
|
||||||
|
key: ValueKey('recent-${r.key}'),
|
||||||
|
server: r,
|
||||||
|
health: _health[r.key],
|
||||||
|
enabled: widget.enabled,
|
||||||
|
onJoin: () => widget.onJoin(r),
|
||||||
|
onForget: () => widget.onForget(r),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class _RecentRow extends StatelessWidget {
|
||||||
|
final RecentServer server;
|
||||||
|
/// Null until the first probe answers.
|
||||||
|
final ServerHealth? health;
|
||||||
|
final bool enabled;
|
||||||
|
final VoidCallback onJoin;
|
||||||
|
final VoidCallback onForget;
|
||||||
|
const _RecentRow({
|
||||||
|
super.key,
|
||||||
|
required this.server,
|
||||||
|
required this.health,
|
||||||
|
required this.enabled,
|
||||||
|
required this.onJoin,
|
||||||
|
required this.onForget,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final h = health;
|
||||||
|
final address = '${server.host}:${server.port}';
|
||||||
|
final title = h != null && h.name.isNotEmpty ? h.name : server.host;
|
||||||
|
final (status, statusColor) = switch (h) {
|
||||||
|
null => ('checking…', Colors.grey),
|
||||||
|
ServerHealth(online: true) => ('● online · ${h.viewers} watching', Colors.greenAccent.shade400),
|
||||||
|
_ => ('○ offline', Colors.grey),
|
||||||
|
};
|
||||||
|
return ListTile(
|
||||||
|
dense: true,
|
||||||
|
contentPadding: const EdgeInsets.only(left: 4),
|
||||||
|
enabled: enabled,
|
||||||
|
leading: Icon(server.secret.isEmpty ? Icons.history : Icons.lock_outline, size: 18),
|
||||||
|
title: Text(title, maxLines: 1, overflow: TextOverflow.ellipsis),
|
||||||
|
subtitle: Wrap(
|
||||||
|
spacing: 6,
|
||||||
|
crossAxisAlignment: WrapCrossAlignment.center,
|
||||||
|
children: [
|
||||||
|
Text(address, style: const TextStyle(color: Colors.grey)),
|
||||||
|
Text(status, key: const ValueKey('recent-status'), style: TextStyle(color: statusColor)),
|
||||||
|
if (h != null && h.needsUpdate)
|
||||||
|
Tooltip(
|
||||||
|
message: 'Server protocol ${h.proto}, this app '
|
||||||
|
'${RelayConstants.protoVersion} — update so both match',
|
||||||
|
child: Container(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 1),
|
||||||
|
decoration: BoxDecoration(color: scheme.errorContainer, borderRadius: BorderRadius.circular(6)),
|
||||||
|
child: Text('needs update', style: TextStyle(fontSize: 11, color: scheme.onErrorContainer)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
tooltip: 'Forget',
|
||||||
|
visualDensity: VisualDensity.compact,
|
||||||
|
iconSize: 16,
|
||||||
|
onPressed: onForget,
|
||||||
|
icon: const Icon(Icons.close),
|
||||||
|
),
|
||||||
|
const Icon(Icons.login, size: 18),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
onTap: onJoin,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,176 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../session/delivery.dart';
|
||||||
|
import 'motion.dart';
|
||||||
|
|
||||||
|
// The members card's view of [Delivery]: one source line on top, a buffer
|
||||||
|
// dot on each member. Nothing of it sits on the picture.
|
||||||
|
|
||||||
|
Color _tone(SourceState s, ColorScheme scheme) => switch (s) {
|
||||||
|
SourceState.ok => scheme.primary,
|
||||||
|
SourceState.slow || SourceState.waiting => Colors.amber,
|
||||||
|
SourceState.left => Colors.redAccent.shade200,
|
||||||
|
};
|
||||||
|
|
||||||
|
IconData _icon(Delivery d) => switch (d.state) {
|
||||||
|
SourceState.left => Icons.link_off_rounded,
|
||||||
|
SourceState.waiting => Icons.hourglass_top_rounded,
|
||||||
|
_ => switch (d.kind) {
|
||||||
|
DeliveryKind.memberRelay => Icons.cell_tower,
|
||||||
|
DeliveryKind.serverFetch => Icons.cloud_download_outlined,
|
||||||
|
DeliveryKind.hostFile => Icons.folder_shared_outlined,
|
||||||
|
DeliveryKind.serverFile => Icons.dns_outlined,
|
||||||
|
DeliveryKind.link => Icons.public,
|
||||||
|
DeliveryKind.jellyfin => Icons.video_library_outlined,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/// Where the current media comes from and how it reaches the others:
|
||||||
|
/// "Foxyz passes it on through the server", "3 through the server ·
|
||||||
|
/// 4.1 MB/s, needs 2.3 MB/s" and a bar of the source's speed against the
|
||||||
|
/// video's (past the mark: keeping up). Amber when slow or waiting, red
|
||||||
|
/// when the source left.
|
||||||
|
class SourceLine extends StatelessWidget {
|
||||||
|
final Delivery delivery;
|
||||||
|
const SourceLine({super.key, required this.delivery});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final d = delivery;
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final tone = _tone(d.state, scheme);
|
||||||
|
final detail = d.detail;
|
||||||
|
final headroom = d.state == SourceState.left ? null : d.headroom;
|
||||||
|
return Tooltip(
|
||||||
|
message: d.explain,
|
||||||
|
waitDuration: const Duration(milliseconds: 400),
|
||||||
|
child: Container(
|
||||||
|
key: const ValueKey('source-line'),
|
||||||
|
margin: const EdgeInsets.fromLTRB(12, 0, 12, 6),
|
||||||
|
padding: const EdgeInsets.fromLTRB(10, 8, 12, 8),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: d.state == SourceState.ok ? scheme.surfaceContainerHigh : tone.withValues(alpha: 0.12),
|
||||||
|
borderRadius: BorderRadius.circular(10),
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 1),
|
||||||
|
child: Icon(_icon(d), size: 18, color: tone),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(d.title, style: const TextStyle(fontSize: 13, fontWeight: FontWeight.w600)),
|
||||||
|
if (detail.isNotEmpty) ...[
|
||||||
|
const SizedBox(height: 2),
|
||||||
|
Text(detail, style: TextStyle(fontSize: 11.5, color: scheme.onSurfaceVariant)),
|
||||||
|
],
|
||||||
|
if (headroom != null) ...[
|
||||||
|
const SizedBox(height: 6),
|
||||||
|
_HeadroomBar(headroom: headroom, slow: d.state == SourceState.slow),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The source's speed on a scale to twice the video's bitrate; the mark
|
||||||
|
/// in the middle is what the video needs.
|
||||||
|
class _HeadroomBar extends StatelessWidget {
|
||||||
|
final double headroom;
|
||||||
|
final bool slow;
|
||||||
|
const _HeadroomBar({required this.headroom, required this.slow});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
final fill = (headroom / 2).clamp(0.04, 1.0);
|
||||||
|
final color = slow ? Colors.amber : Colors.greenAccent.shade400;
|
||||||
|
return SizedBox(
|
||||||
|
key: const ValueKey('headroom-bar'),
|
||||||
|
height: 4,
|
||||||
|
child: LayoutBuilder(
|
||||||
|
builder: (context, box) => Stack(
|
||||||
|
children: [
|
||||||
|
Positioned.fill(
|
||||||
|
child: DecoratedBox(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: scheme.outlineVariant.withValues(alpha: 0.4),
|
||||||
|
borderRadius: BorderRadius.circular(2),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
AnimatedContainer(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
width: box.maxWidth * fill,
|
||||||
|
decoration: BoxDecoration(color: color, borderRadius: BorderRadius.circular(2)),
|
||||||
|
),
|
||||||
|
Positioned(
|
||||||
|
left: box.maxWidth / 2 - 0.75,
|
||||||
|
top: -1,
|
||||||
|
bottom: -1,
|
||||||
|
child: Container(width: 1.5, color: scheme.onSurface.withValues(alpha: 0.7)),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A member's buffer at a glance: green enough to play on, amber low,
|
||||||
|
/// red empty while playing.
|
||||||
|
Color healthColor(BufferHealth h) => switch (h) {
|
||||||
|
BufferHealth.good => Colors.greenAccent.shade400,
|
||||||
|
BufferHealth.low => Colors.amber,
|
||||||
|
BufferHealth.starving => Colors.redAccent.shade200,
|
||||||
|
};
|
||||||
|
|
||||||
|
/// The members card's subtitle: [status] ("ready"), then how the member
|
||||||
|
/// gets the media (the source's own pill says it serves it), after a dot
|
||||||
|
/// coloured by its buffer; the hover says how much it has buffered.
|
||||||
|
class DeliveryStatus extends StatelessWidget {
|
||||||
|
final String status;
|
||||||
|
final MemberDelivery? delivery;
|
||||||
|
const DeliveryStatus({super.key, required this.status, this.delivery});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final d = delivery;
|
||||||
|
final route = d == null || d.route == DeliveryRoute.source ? '' : d.short;
|
||||||
|
final text = Text([status, if (route.isNotEmpty) route].join(' · '),
|
||||||
|
maxLines: 1, overflow: TextOverflow.ellipsis);
|
||||||
|
if (d == null) return text;
|
||||||
|
final health = d.health;
|
||||||
|
return Tooltip(
|
||||||
|
message: d.detail,
|
||||||
|
waitDuration: const Duration(milliseconds: 400),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
if (health != null) ...[
|
||||||
|
AnimatedContainer(
|
||||||
|
key: const ValueKey('health-dot'),
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
width: 7,
|
||||||
|
height: 7,
|
||||||
|
decoration: BoxDecoration(color: healthColor(health), shape: BoxShape.circle),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
],
|
||||||
|
Flexible(child: text),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,212 @@
|
|||||||
|
import 'dart:io';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import '../files/scanner.dart' show FileKind, kindOf;
|
||||||
|
import '../files/ui/file_tiles.dart' show baseName;
|
||||||
|
|
||||||
|
// Something handed to the app, by a drop or by Ctrl+V outside a text
|
||||||
|
// field: what it is ([classifyHandoff], pure) and the small card that asks
|
||||||
|
// how to open it ([HandoffCard]). The shell wires both.
|
||||||
|
|
||||||
|
/// Open overlays over the shell that take drops and pastes themselves
|
||||||
|
/// (the Up next popover, which is not a route): the shell's own handoff
|
||||||
|
/// stays off while any is open.
|
||||||
|
int handoffHolds = 0;
|
||||||
|
|
||||||
|
/// What was dropped or pasted.
|
||||||
|
sealed class Handoff {
|
||||||
|
const Handoff();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Video files (by the Files page's extensions), in the order given.
|
||||||
|
final class HandoffVideos extends Handoff {
|
||||||
|
final List<String> paths;
|
||||||
|
const HandoffVideos(this.paths);
|
||||||
|
}
|
||||||
|
|
||||||
|
final class HandoffFolder extends Handoff {
|
||||||
|
final String path;
|
||||||
|
const HandoffFolder(this.path);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An http(s) link.
|
||||||
|
final class HandoffLink extends Handoff {
|
||||||
|
final String url;
|
||||||
|
const HandoffLink(this.url);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// An image file. Nothing takes one yet; the shell ignores it.
|
||||||
|
final class HandoffImage extends Handoff {
|
||||||
|
final String path;
|
||||||
|
const HandoffImage(this.path);
|
||||||
|
}
|
||||||
|
|
||||||
|
final class HandoffNothing extends Handoff {
|
||||||
|
const HandoffNothing();
|
||||||
|
}
|
||||||
|
|
||||||
|
const _imageExtensions = {'png', 'jpg', 'jpeg', 'webp', 'gif', 'bmp'};
|
||||||
|
|
||||||
|
final _link = RegExp(r'^https?://\S+$', caseSensitive: false);
|
||||||
|
final _windowsAbsolute = RegExp(r'^([A-Za-z]:[\\/]|\\\\)');
|
||||||
|
|
||||||
|
bool _absolute(String p) => p.startsWith('/') || _windowsAbsolute.hasMatch(p);
|
||||||
|
|
||||||
|
/// A `file://` URI as a path; anything else as is.
|
||||||
|
String _pathOf(String p) {
|
||||||
|
if (!p.startsWith('file://')) return p;
|
||||||
|
try {
|
||||||
|
return Uri.parse(p).toFilePath();
|
||||||
|
} catch (_) {
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Classifies dropped or pasted [paths] (files first) or, when there are
|
||||||
|
/// none, pasted [text]: a link, or one absolute path (or `file://` URI) per
|
||||||
|
/// line. Videos win over folders, folders over images; paths that do not
|
||||||
|
/// exist ([typeOf], defaults to the file system) count for nothing.
|
||||||
|
Handoff classifyHandoff({
|
||||||
|
List<String> paths = const [],
|
||||||
|
String? text,
|
||||||
|
FileSystemEntityType Function(String path)? typeOf,
|
||||||
|
}) {
|
||||||
|
final type = typeOf ?? (p) => FileSystemEntity.typeSync(p);
|
||||||
|
var list = [for (final p in paths) if (p.trim().isNotEmpty) _pathOf(p.trim())];
|
||||||
|
if (list.isEmpty && text != null) {
|
||||||
|
final t = text.trim();
|
||||||
|
if (_link.hasMatch(t)) return HandoffLink(t);
|
||||||
|
final lines = [for (final l in t.split(RegExp(r'[\r\n]+'))) if (l.trim().isNotEmpty) _pathOf(l.trim())];
|
||||||
|
if (lines.isEmpty || !lines.every(_absolute)) return const HandoffNothing();
|
||||||
|
list = lines;
|
||||||
|
}
|
||||||
|
final types = {for (final p in list) p: type(p)};
|
||||||
|
bool file(String p) => types[p] == FileSystemEntityType.file;
|
||||||
|
final videos = [for (final p in list) if (file(p) && kindOf(p) == FileKind.video) p];
|
||||||
|
if (videos.isNotEmpty) return HandoffVideos(videos);
|
||||||
|
for (final p in list) {
|
||||||
|
if (types[p] == FileSystemEntityType.directory) return HandoffFolder(p);
|
||||||
|
}
|
||||||
|
for (final p in list) {
|
||||||
|
final dot = p.lastIndexOf('.');
|
||||||
|
if (file(p) && dot >= 0 && _imageExtensions.contains(p.substring(dot + 1).toLowerCase())) {
|
||||||
|
return HandoffImage(p);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return const HandoffNothing();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What the card's buttons ask the shell to do.
|
||||||
|
enum HandoffAction {
|
||||||
|
/// Put the (first) video up (offline: watch it solo).
|
||||||
|
putUp,
|
||||||
|
/// Add the video's folder (or the folder) to Files and open it.
|
||||||
|
addFolder,
|
||||||
|
/// Open Library → Link with the URL filled.
|
||||||
|
openLink,
|
||||||
|
/// Add the videos (or the link, in the Link page's mode) to Up next.
|
||||||
|
queue,
|
||||||
|
/// The same, right after what plays.
|
||||||
|
playNext,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The card asking how to open a [Handoff] (videos, a folder or a link);
|
||||||
|
/// pops the [HandoffAction] chosen.
|
||||||
|
class HandoffCard extends StatelessWidget {
|
||||||
|
final Handoff item;
|
||||||
|
/// Nobody else watches (offline or solo): videos play, no relay talk.
|
||||||
|
final bool solo;
|
||||||
|
/// In a server: videos and links can go to Up next.
|
||||||
|
final bool queue;
|
||||||
|
const HandoffCard({super.key, required this.item, required this.solo, this.queue = false});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final scheme = Theme.of(context).colorScheme;
|
||||||
|
void pick(HandoffAction a) => Navigator.of(context).pop(a);
|
||||||
|
Widget button(HandoffAction a, IconData icon, String label, {bool primary = false}) => primary
|
||||||
|
? FilledButton.icon(
|
||||||
|
key: ValueKey('handoff-${a.name}'), onPressed: () => pick(a), icon: Icon(icon, size: 18), label: Text(label))
|
||||||
|
: OutlinedButton.icon(
|
||||||
|
key: ValueKey('handoff-${a.name}'), onPressed: () => pick(a), icon: Icon(icon, size: 18), label: Text(label));
|
||||||
|
final many = switch (item) { HandoffVideos(:final paths) => paths.length > 1, _ => false };
|
||||||
|
final queueButtons = [
|
||||||
|
if (queue) ...[
|
||||||
|
button(HandoffAction.queue, Icons.playlist_add_rounded, many ? 'Add all to queue' : 'Add to queue'),
|
||||||
|
button(HandoffAction.playNext, Icons.queue_play_next_rounded, many ? 'Play all next' : 'Play next'),
|
||||||
|
],
|
||||||
|
];
|
||||||
|
|
||||||
|
final (IconData icon, String title, String detail, List<Widget> buttons) = switch (item) {
|
||||||
|
HandoffVideos(:final paths) => (
|
||||||
|
Icons.movie_outlined,
|
||||||
|
baseName(paths.first),
|
||||||
|
paths.length > 1 ? 'and ${paths.length - 1} more · the first one goes up' : 'A video on this computer',
|
||||||
|
[
|
||||||
|
button(HandoffAction.putUp, Icons.play_arrow, solo ? 'Play' : 'Put it up', primary: true),
|
||||||
|
...queueButtons,
|
||||||
|
button(HandoffAction.addFolder, Icons.create_new_folder_outlined, 'Add its folder to Files'),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
HandoffFolder(:final path) => (
|
||||||
|
Icons.folder_outlined,
|
||||||
|
baseName(path),
|
||||||
|
path,
|
||||||
|
[button(HandoffAction.addFolder, Icons.create_new_folder_outlined, 'Add to Files', primary: true)],
|
||||||
|
),
|
||||||
|
HandoffLink(:final url) => (
|
||||||
|
Icons.link,
|
||||||
|
url,
|
||||||
|
solo ? 'Opens it on the Link page' : 'Pick how the others get it on the Link page',
|
||||||
|
[
|
||||||
|
button(HandoffAction.openLink, Icons.link, solo ? 'Open in Link' : 'Put it up as a link…',
|
||||||
|
primary: true),
|
||||||
|
...queueButtons,
|
||||||
|
],
|
||||||
|
),
|
||||||
|
HandoffImage() || HandoffNothing() => (Icons.help_outline, '', '', const <Widget>[]),
|
||||||
|
};
|
||||||
|
return Material(
|
||||||
|
key: const ValueKey('handoff-card'),
|
||||||
|
elevation: 12,
|
||||||
|
color: scheme.surfaceContainer,
|
||||||
|
borderRadius: BorderRadius.circular(18),
|
||||||
|
child: ConstrainedBox(
|
||||||
|
constraints: const BoxConstraints(maxWidth: 380),
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(18, 16, 18, 16),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
children: [
|
||||||
|
Icon(icon, color: scheme.primary),
|
||||||
|
const SizedBox(width: 10),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(title,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: Theme.of(context).textTheme.titleSmall),
|
||||||
|
Text(detail,
|
||||||
|
maxLines: 2,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
style: TextStyle(color: scheme.onSurfaceVariant, fontSize: 12)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 14),
|
||||||
|
Wrap(spacing: 8, runSpacing: 8, children: buttons),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,443 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:signals/signals_flutter.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart' show HelloMedia, JellyfinException, JellyfinItem;
|
||||||
|
|
||||||
|
import '../files/ui/files_page.dart';
|
||||||
|
import '../jellyfin/accounts.dart';
|
||||||
|
import '../jellyfin/browse_scope.dart';
|
||||||
|
import '../jellyfin/details_panel.dart';
|
||||||
|
import '../jellyfin/format.dart' show pickFor;
|
||||||
|
import '../jellyfin/home_page.dart' show libraryIcon, isVideoLibrary;
|
||||||
|
import '../jellyfin/picker_source.dart';
|
||||||
|
import '../jellyfin/session_media.dart';
|
||||||
|
import '../screens/home/media_picker.dart';
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import 'library_link.dart';
|
||||||
|
import 'motion.dart';
|
||||||
|
import 'welcome.dart';
|
||||||
|
|
||||||
|
/// What putting up a Jellyfin pick sends: its ref (no URL, no token).
|
||||||
|
/// Throws [FormatException] with a user-facing message when the server is
|
||||||
|
/// not linked any more or its sign-in expired.
|
||||||
|
HelloMedia putUpJellyfinMedia(JellyfinAccounts accounts, JellyfinMedia media) {
|
||||||
|
if (accounts.account(media.serverId) == null) {
|
||||||
|
throw const FormatException('that Jellyfin server is not linked any more — pick again');
|
||||||
|
}
|
||||||
|
if (accounts.statusOf(media.serverId) == JellyfinAccountStatus.expired) {
|
||||||
|
throw const FormatException('Jellyfin sign-in expired — reconnect it in Settings → Jellyfin & integrations');
|
||||||
|
}
|
||||||
|
return mediaForPick(media);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Brings back the last Jellyfin pick (kept in the Jellyfin box) once the
|
||||||
|
/// accounts are read, unless something else was picked meanwhile or
|
||||||
|
/// [alive] says the picker is gone.
|
||||||
|
Future<void> restoreLastPick(
|
||||||
|
MediaPickerController c, JellyfinAccounts accounts, bool Function() alive) async {
|
||||||
|
final hadMedia = c.selection != null;
|
||||||
|
try {
|
||||||
|
await accounts.ensureLoaded();
|
||||||
|
} catch (_) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final pick = accounts.lastPick;
|
||||||
|
if (!alive() || pick == null || c.jellyfin != null) return;
|
||||||
|
if (accounts.account(pick.serverId) == null) return;
|
||||||
|
final source = c.source;
|
||||||
|
c.pickJellyfin(pick);
|
||||||
|
if (hadMedia) c.source = source;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The file playing now, when it is the one put up from here last: the
|
||||||
|
/// server's current media (state JSON) is a plain file (no link, no
|
||||||
|
/// Jellyfin ref) named like [lastPath].
|
||||||
|
String? nowPlayingFile(Map<String, Object?>? media, String lastPath) {
|
||||||
|
if (media == null || media['url'] != null || media['jellyfin'] != null || lastPath.isEmpty) return null;
|
||||||
|
final name = lastPath.split(RegExp(r'[/\\]')).lastWhere((p) => p.isNotEmpty, orElse: () => lastPath);
|
||||||
|
return name == media['name'] ? lastPath : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Window width under which the details panel floats over the library.
|
||||||
|
const detailsDockFrom = 1000.0;
|
||||||
|
|
||||||
|
/// The Library tab: a source switch (Jellyfin / Link / Files, fading
|
||||||
|
/// through), the Jellyfin library chips beside it, and the source below.
|
||||||
|
/// Jellyfin cards select on click and open their details in a panel at
|
||||||
|
/// the right (docked from [detailsDockFrom], floating over the library
|
||||||
|
/// below it); a double-click or the panel's button puts it up. With
|
||||||
|
/// nobody else watching ([solo]: offline or a solo session) the buttons
|
||||||
|
/// say Play and putting something up starts (or uses) a solo session.
|
||||||
|
class LibraryTab extends StatefulWidget {
|
||||||
|
final MediaPickerController controller;
|
||||||
|
final JellyfinAccounts accounts;
|
||||||
|
final bool solo;
|
||||||
|
/// This app hosts the server: its files stream from here directly.
|
||||||
|
final bool isHost;
|
||||||
|
final BrowseStart? jellyfinStart;
|
||||||
|
/// Puts the pick up; returns an error text, or null when sent.
|
||||||
|
final Future<String?> Function(PickedMedia media) onPutUp;
|
||||||
|
/// Adds a pick to Up next; null without a server (no queue actions).
|
||||||
|
final AddToQueue? onAddToQueue;
|
||||||
|
final VoidCallback? onPutUpDone;
|
||||||
|
final VoidCallback? onOpenIntegrations;
|
||||||
|
/// Defaults to [RecentLinks.instance].
|
||||||
|
final RecentLinks? recentLinks;
|
||||||
|
final LinkProber probe;
|
||||||
|
/// The Files source (tests inject one); defaults to [FilesPage].
|
||||||
|
final Widget Function(BuildContext context, {required bool solo, required bool relayed,
|
||||||
|
required Future<String?> Function(String path) onPlay, String? nowPlayingPath})? filesBuilder;
|
||||||
|
/// Clock for the Jellyfin Continue row (tests pin it).
|
||||||
|
final DateTime Function() now;
|
||||||
|
/// Over the source switch (the shell's welcome band while offline).
|
||||||
|
final Widget? banner;
|
||||||
|
const LibraryTab({
|
||||||
|
super.key,
|
||||||
|
required this.controller,
|
||||||
|
required this.accounts,
|
||||||
|
required this.solo,
|
||||||
|
required this.isHost,
|
||||||
|
required this.onPutUp,
|
||||||
|
this.onAddToQueue,
|
||||||
|
this.onPutUpDone,
|
||||||
|
this.jellyfinStart,
|
||||||
|
this.onOpenIntegrations,
|
||||||
|
this.recentLinks,
|
||||||
|
this.probe = defaultLinkProber,
|
||||||
|
this.filesBuilder,
|
||||||
|
this.now = DateTime.now,
|
||||||
|
this.banner,
|
||||||
|
});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<LibraryTab> createState() => _LibraryTabState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _LibraryTabState extends State<LibraryTab> {
|
||||||
|
late final BrowseController _browse = BrowseController(widget.accounts, now: widget.now);
|
||||||
|
/// What the closing panel keeps showing while it slides out.
|
||||||
|
JellyfinSelection? _shown;
|
||||||
|
|
||||||
|
MediaPickerController get _c => widget.controller;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_c.addListener(_changed);
|
||||||
|
_browse.addListener(_changed);
|
||||||
|
_shown = _c.selected;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void didUpdateWidget(LibraryTab old) {
|
||||||
|
super.didUpdateWidget(old);
|
||||||
|
if (old.controller != widget.controller) {
|
||||||
|
old.controller.removeListener(_changed);
|
||||||
|
widget.controller.addListener(_changed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_c.removeListener(_changed);
|
||||||
|
_browse.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _changed() {
|
||||||
|
if (!mounted) return;
|
||||||
|
setState(() {
|
||||||
|
if (_c.selected != null) _shown = _c.selected;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// ------------------------------------------------------------- put up
|
||||||
|
|
||||||
|
Future<String?> _put(PickedMedia media) async {
|
||||||
|
String? error;
|
||||||
|
try {
|
||||||
|
error = await widget.onPutUp(media);
|
||||||
|
} catch (e) {
|
||||||
|
error = '$e';
|
||||||
|
}
|
||||||
|
if (error == null) widget.onPutUpDone?.call();
|
||||||
|
return error;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A Jellyfin card or episode: a series goes up as its next episode.
|
||||||
|
Future<String?> _putUpJellyfin(JellyfinSelection sel) async {
|
||||||
|
final pick = await _jellyfinPick(sel);
|
||||||
|
return pick is JellyfinMedia ? _put(pick) : pick as String;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// What a Jellyfin card stands for (a series: its next episode), or an
|
||||||
|
/// error text.
|
||||||
|
Future<Object> _jellyfinPick(JellyfinSelection sel) async {
|
||||||
|
final account = widget.accounts.account(sel.serverId);
|
||||||
|
final client = widget.accounts.clientFor(sel.serverId);
|
||||||
|
if (account == null || client == null) return 'that Jellyfin server is not linked any more';
|
||||||
|
JellyfinItem? item = sel.item;
|
||||||
|
try {
|
||||||
|
item ??= await client.item(sel.itemId);
|
||||||
|
item = await playableFor(client, item);
|
||||||
|
} on JellyfinException catch (e) {
|
||||||
|
return e.message;
|
||||||
|
}
|
||||||
|
if (item == null) return 'nothing to play in there';
|
||||||
|
return pickFor(account, item);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "Add to queue" on a Jellyfin card, episode or the details panel.
|
||||||
|
Future<String?> _queueJellyfin(JellyfinSelection sel, {bool next = false}) async {
|
||||||
|
final add = widget.onAddToQueue;
|
||||||
|
if (add == null) return null;
|
||||||
|
final pick = await _jellyfinPick(sel);
|
||||||
|
return pick is JellyfinMedia ? add(pick, next: next) : pick as String;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A card's menu: errors as a snack bar.
|
||||||
|
Future<void> _cardQueue(JellyfinSelection sel, {bool next = false}) async {
|
||||||
|
final error = await _queueJellyfin(sel, next: next);
|
||||||
|
if (error != null && mounted) {
|
||||||
|
ScaffoldMessenger.maybeOf(context)?.showSnackBar(SnackBar(content: Text(error)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Double-click on a card: put it up, errors as a snack bar.
|
||||||
|
Future<void> _doublePutUp(JellyfinSelection sel) async {
|
||||||
|
_c.select(sel);
|
||||||
|
final error = await _putUpJellyfin(sel);
|
||||||
|
if (error != null && mounted) {
|
||||||
|
ScaffoldMessenger.maybeOf(context)?.showSnackBar(SnackBar(content: Text(error)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// -------------------------------------------------------------- build
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final source = _c.source;
|
||||||
|
final header = Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(20, 16, 20, 0),
|
||||||
|
child: LayoutBuilder(builder: (context, box) {
|
||||||
|
// Narrow: icons only, so the chips keep some room.
|
||||||
|
final labels = box.maxWidth >= 620;
|
||||||
|
ButtonSegment<MediaKind> seg(MediaKind k, IconData icon, String label) => ButtonSegment(
|
||||||
|
value: k, icon: Icon(icon), label: labels ? Text(label) : null, tooltip: labels ? null : label);
|
||||||
|
return Row(
|
||||||
|
children: [
|
||||||
|
SegmentedButton<MediaKind>(
|
||||||
|
key: const ValueKey('media-source'),
|
||||||
|
showSelectedIcon: false,
|
||||||
|
segments: [
|
||||||
|
seg(MediaKind.jellyfin, Icons.video_library_outlined, 'Jellyfin'),
|
||||||
|
seg(MediaKind.link, Icons.link, 'Link'),
|
||||||
|
seg(MediaKind.file, Icons.folder_outlined, 'Files'),
|
||||||
|
],
|
||||||
|
selected: {source},
|
||||||
|
onSelectionChanged: (s) => _c.source = s.first,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 16),
|
||||||
|
Expanded(
|
||||||
|
child: AnimatedSwitcher(
|
||||||
|
duration: easeTime,
|
||||||
|
child: source == MediaKind.jellyfin
|
||||||
|
? _LibraryChips(key: const ValueKey('chips'), controller: _browse)
|
||||||
|
: const SizedBox(height: 40),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
final Widget content = switch (source) {
|
||||||
|
MediaKind.jellyfin => Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(20, 12, 20, 0),
|
||||||
|
child: JellyfinPickerSource(
|
||||||
|
accounts: widget.accounts,
|
||||||
|
controller: _browse,
|
||||||
|
selected: _c.selected,
|
||||||
|
onSelect: _c.select,
|
||||||
|
onPutUp: _doublePutUp,
|
||||||
|
onAddToQueue: widget.onAddToQueue == null ? null : _cardQueue,
|
||||||
|
onOpenIntegrations: widget.onOpenIntegrations,
|
||||||
|
start: widget.jellyfinStart,
|
||||||
|
libraryStrip: false,
|
||||||
|
empty: (context) => NoJellyfinPanel(
|
||||||
|
accounts: widget.accounts,
|
||||||
|
onFiles: () => _c.source = MediaKind.file,
|
||||||
|
onLink: () => _c.source = MediaKind.link,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
MediaKind.link => LibraryLinkSource(
|
||||||
|
controller: _c,
|
||||||
|
solo: widget.solo,
|
||||||
|
recents: widget.recentLinks ?? RecentLinks.instance,
|
||||||
|
probe: widget.probe,
|
||||||
|
onPutUp: _put,
|
||||||
|
onAddToQueue: widget.onAddToQueue,
|
||||||
|
),
|
||||||
|
MediaKind.file => _files(context),
|
||||||
|
};
|
||||||
|
|
||||||
|
final main = Column(
|
||||||
|
children: [
|
||||||
|
AnimatedSize(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
alignment: Alignment.topCenter,
|
||||||
|
child: AnimatedSwitcher(
|
||||||
|
duration: easeTime,
|
||||||
|
child: widget.banner ?? const SizedBox(width: double.infinity),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
header,
|
||||||
|
Expanded(child: fadeThrough(KeyedSubtree(key: ValueKey(source), child: content))),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
|
final open = source == MediaKind.jellyfin && _c.selected != null;
|
||||||
|
final shown = _shown;
|
||||||
|
final details = shown == null
|
||||||
|
? const SizedBox.shrink()
|
||||||
|
: fadeThrough(KeyedSubtree(
|
||||||
|
key: ValueKey('${shown.serverId}/${shown.itemId}'),
|
||||||
|
child: JellyfinDetailsPanel(
|
||||||
|
controller: _browse,
|
||||||
|
selection: shown,
|
||||||
|
solo: widget.solo,
|
||||||
|
onPutUp: _putUpJellyfin,
|
||||||
|
onAddToQueue: widget.onAddToQueue == null ? null : _queueJellyfin,
|
||||||
|
onClose: () => _c.select(null),
|
||||||
|
),
|
||||||
|
));
|
||||||
|
Widget slide(Widget child) => AnimatedSlide(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
offset: open ? Offset.zero : const Offset(1, 0),
|
||||||
|
child: AnimatedOpacity(duration: easeTime, curve: ease, opacity: open ? 1 : 0, child: child),
|
||||||
|
);
|
||||||
|
|
||||||
|
// Holds focus so the shell's shortcuts (Ctrl+,) work.
|
||||||
|
return Focus(
|
||||||
|
key: const ValueKey('library-tab'),
|
||||||
|
autofocus: true,
|
||||||
|
child: LayoutBuilder(builder: (context, box) {
|
||||||
|
if (box.maxWidth >= detailsDockFrom) {
|
||||||
|
return Row(
|
||||||
|
children: [
|
||||||
|
Expanded(child: main),
|
||||||
|
ClipRect(
|
||||||
|
child: AnimatedContainer(
|
||||||
|
duration: easeTime,
|
||||||
|
curve: ease,
|
||||||
|
width: open ? detailsPanelWidth : 0,
|
||||||
|
child: OverflowBox(
|
||||||
|
alignment: Alignment.centerLeft,
|
||||||
|
minWidth: detailsPanelWidth,
|
||||||
|
maxWidth: detailsPanelWidth,
|
||||||
|
child: slide(details),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return Stack(
|
||||||
|
children: [
|
||||||
|
Positioned.fill(child: main),
|
||||||
|
Positioned(
|
||||||
|
top: 0,
|
||||||
|
bottom: 0,
|
||||||
|
right: 0,
|
||||||
|
width: detailsPanelWidth,
|
||||||
|
child: IgnorePointer(
|
||||||
|
ignoring: !open,
|
||||||
|
child: slide(Material(elevation: 16, child: details)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _files(BuildContext context) {
|
||||||
|
final relayed = !widget.isHost;
|
||||||
|
Future<String?> play(String path) => _put(FileMedia(path));
|
||||||
|
return SignalBuilder(builder: (context) {
|
||||||
|
final session = SessionState.instance;
|
||||||
|
final now = session.route.value == AppRoute.session
|
||||||
|
? nowPlayingFile(session.coordinator.serverState.value?.media, session.lastForm.mediaPath)
|
||||||
|
: null;
|
||||||
|
final b = widget.filesBuilder;
|
||||||
|
if (b != null) {
|
||||||
|
return b(context, solo: widget.solo, relayed: relayed, onPlay: play, nowPlayingPath: now);
|
||||||
|
}
|
||||||
|
final add = widget.onAddToQueue;
|
||||||
|
return FilesPage(
|
||||||
|
solo: widget.solo,
|
||||||
|
relayed: relayed,
|
||||||
|
onPlay: play,
|
||||||
|
onAddToQueue: add == null ? null : (path, {next = false}) => add(FileMedia(path), next: next),
|
||||||
|
nowPlayingPath: now);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The current server's video libraries as chips in the Library header; a
|
||||||
|
/// click opens one (the chip of the library open is selected).
|
||||||
|
class _LibraryChips extends StatelessWidget {
|
||||||
|
final BrowseController controller;
|
||||||
|
const _LibraryChips({super.key, required this.controller});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return ListenableBuilder(
|
||||||
|
listenable: Listenable.merge([controller, controller.accounts]),
|
||||||
|
builder: (context, _) {
|
||||||
|
final accounts = controller.accounts;
|
||||||
|
final account = accounts.loaded ? controller.account : null;
|
||||||
|
final client = account == null ? null : accounts.clientFor(account.serverId);
|
||||||
|
if (account == null || client == null) return const SizedBox(height: 40);
|
||||||
|
final stack = controller.stack;
|
||||||
|
final openId = stack.length > 1 && stack[1] is LibraryRoute ? (stack[1] as LibraryRoute).folder.id : null;
|
||||||
|
return FutureBuilder<List<JellyfinItem>>(
|
||||||
|
future: accounts.cached(account.serverId, 'views', client.userViews),
|
||||||
|
builder: (context, snap) {
|
||||||
|
final views = (snap.data ?? const <JellyfinItem>[]).where(isVideoLibrary).toList();
|
||||||
|
return SizedBox(
|
||||||
|
height: 40,
|
||||||
|
child: HScroll(
|
||||||
|
builder: (c) => ListView.separated(
|
||||||
|
controller: c,
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
itemCount: views.length,
|
||||||
|
separatorBuilder: (_, _) => const SizedBox(width: 8),
|
||||||
|
itemBuilder: (context, i) {
|
||||||
|
final v = views[i];
|
||||||
|
return Center(
|
||||||
|
child: ChoiceChip(
|
||||||
|
key: ValueKey('library-${v.id}'),
|
||||||
|
avatar: Icon(libraryIcon(v), size: 16),
|
||||||
|
showCheckmark: false,
|
||||||
|
label: Text(v.name),
|
||||||
|
selected: v.id == openId,
|
||||||
|
onSelected: (_) => v.id == openId
|
||||||
|
? controller.popTo(0)
|
||||||
|
: controller.openTop(LibraryRoute(v)),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,113 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter/services.dart';
|
||||||
|
import 'package:sync_relay_core/core.dart' show RelayConstants;
|
||||||
|
|
||||||
|
import '../state/session_state.dart';
|
||||||
|
import '../widgets/app_menu.dart' show AppGlass;
|
||||||
|
import 'motion.dart';
|
||||||
|
|
||||||
|
// "Mark a problem" (Ctrl+Shift+B, the player's ⚙, Settings → About): a
|
||||||
|
// marker line in the server's session log at this moment, with an
|
||||||
|
// optional short note, so whoever reads the log finds the spot.
|
||||||
|
|
||||||
|
/// The key that opens it.
|
||||||
|
const markProblemKey = SingleActivator(LogicalKeyboardKey.keyB, control: true, shift: true);
|
||||||
|
|
||||||
|
/// Asks for the note, then marks; the toast says where it went.
|
||||||
|
Future<void> showMarkProblem(BuildContext context) async {
|
||||||
|
final note = await showPopover<String>(context, at: Alignment.center, child: const MarkProblemCard());
|
||||||
|
if (note == null) return;
|
||||||
|
final coord = SessionState.instance.coordinator;
|
||||||
|
final inSession = await coord.markProblem(note);
|
||||||
|
coord.showToast(inSession ? 'Marked in the session log' : "Marked in this app's log");
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The small card: a one-line note and Mark. Pops with the note (maybe
|
||||||
|
/// empty), or nothing on Cancel / Esc.
|
||||||
|
class MarkProblemCard extends StatefulWidget {
|
||||||
|
const MarkProblemCard({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<MarkProblemCard> createState() => _MarkProblemCardState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _MarkProblemCardState extends State<MarkProblemCard> {
|
||||||
|
final _note = TextEditingController();
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_note.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _mark() => Navigator.of(context).pop(_note.text.trim());
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final muted = Theme.of(context).colorScheme.onSurfaceVariant;
|
||||||
|
return AppGlass(
|
||||||
|
key: const ValueKey('mark-problem-card'),
|
||||||
|
child: SizedBox(
|
||||||
|
width: 380,
|
||||||
|
child: Padding(
|
||||||
|
padding: const EdgeInsets.fromLTRB(16, 12, 16, 10),
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||||
|
children: [
|
||||||
|
const Text('Mark a problem', style: TextStyle(fontWeight: FontWeight.w600, fontSize: 14)),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text("Puts a marker in the server's session log right now, so whoever reads it finds the moment.",
|
||||||
|
style: TextStyle(color: muted, fontSize: 12)),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
TextField(
|
||||||
|
key: const ValueKey('mark-problem-note'),
|
||||||
|
controller: _note,
|
||||||
|
autofocus: true,
|
||||||
|
maxLength: RelayConstants.maxProblemNoteLength,
|
||||||
|
decoration: const InputDecoration(
|
||||||
|
isDense: true,
|
||||||
|
hintText: 'What happened? (optional)',
|
||||||
|
counterText: '',
|
||||||
|
),
|
||||||
|
onSubmitted: (_) => _mark(),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
TextButton(onPressed: () => Navigator.of(context).pop(), child: const Text('Cancel')),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
FilledButton.tonal(
|
||||||
|
key: const ValueKey('mark-problem-go'),
|
||||||
|
onPressed: _mark,
|
||||||
|
child: const Text('Mark'),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// "Mark a problem" as a quiet row button (the ⚙ card, Settings → About).
|
||||||
|
class MarkProblemButton extends StatelessWidget {
|
||||||
|
final bool outlined;
|
||||||
|
const MarkProblemButton({super.key, this.outlined = false});
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
const icon = Icon(Icons.flag_outlined, size: 18);
|
||||||
|
const label = Text('Mark a problem');
|
||||||
|
void open() => showMarkProblem(context);
|
||||||
|
return Tooltip(
|
||||||
|
message: 'Ctrl+Shift+B',
|
||||||
|
child: outlined
|
||||||
|
? OutlinedButton.icon(key: const ValueKey('mark-problem'), onPressed: open, icon: icon, label: label)
|
||||||
|
: TextButton.icon(key: const ValueKey('mark-problem'), onPressed: open, icon: icon, label: label),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,137 @@
|
|||||||
|
import 'package:flutter/gestures.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
// The shell's shared motion: one curve and one duration for everything
|
||||||
|
// that moves, a fade-through for views that replace each other, popovers
|
||||||
|
// that grow from where they open, and mouse-friendly horizontal lists.
|
||||||
|
|
||||||
|
const ease = Curves.fastEaseInToSlowEaseOut;
|
||||||
|
const easeTime = Duration(milliseconds: 320);
|
||||||
|
|
||||||
|
/// Fade-through length; the old view is gone after [fadeOutPart] of it.
|
||||||
|
const fadeThroughTime = Duration(milliseconds: 360);
|
||||||
|
const fadeOutPart = 0.35;
|
||||||
|
|
||||||
|
/// Fade through (Material motion): the old view is gone after the first
|
||||||
|
/// 35%, then the new one fades and scales in; they never overlap. Key
|
||||||
|
/// [child] by what it shows so a change of key runs the transition.
|
||||||
|
/// [expand] false: sized by the views (at [alignment]) instead of filling
|
||||||
|
/// the box, for unbounded places (a row, a pill).
|
||||||
|
Widget fadeThrough(Widget child,
|
||||||
|
{Key? key, bool expand = true, AlignmentGeometry alignment = AlignmentDirectional.topStart}) =>
|
||||||
|
AnimatedSwitcher(
|
||||||
|
key: key,
|
||||||
|
duration: fadeThroughTime,
|
||||||
|
layoutBuilder: (current, previous) => Stack(
|
||||||
|
fit: expand ? StackFit.expand : StackFit.loose,
|
||||||
|
alignment: alignment,
|
||||||
|
children: [...previous, ?current],
|
||||||
|
),
|
||||||
|
transitionBuilder: (c, anim) {
|
||||||
|
if (c.key == child.key) {
|
||||||
|
// Incoming (anim 0 -> 1): wait, then fade and scale up.
|
||||||
|
final a = CurvedAnimation(
|
||||||
|
parent: anim,
|
||||||
|
curve: const Interval(fadeOutPart, 1, curve: ease),
|
||||||
|
);
|
||||||
|
return FadeTransition(
|
||||||
|
opacity: a,
|
||||||
|
child: ScaleTransition(scale: Tween(begin: 0.985, end: 1.0).animate(a), child: c),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Outgoing (anim 1 -> 0): fully faded by the time it reaches 0.65.
|
||||||
|
// Same widget shape as the incoming branch, or the old view would
|
||||||
|
// remount (and lose its state) while it fades.
|
||||||
|
return FadeTransition(
|
||||||
|
opacity: CurvedAnimation(
|
||||||
|
parent: anim,
|
||||||
|
curve: const Interval(1 - fadeOutPart, 1, curve: Curves.easeIn),
|
||||||
|
),
|
||||||
|
child: ScaleTransition(scale: const AlwaysStoppedAnimation(1.0), child: c),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
child: child,
|
||||||
|
);
|
||||||
|
|
||||||
|
/// A card over the window that fades and scales in from [at] (window
|
||||||
|
/// alignment) instead of popping; a click outside or Esc closes it. Short
|
||||||
|
/// windows: the card scrolls instead of overflowing.
|
||||||
|
Future<T?> showPopover<T>(
|
||||||
|
BuildContext context, {
|
||||||
|
required Alignment at,
|
||||||
|
required Widget child,
|
||||||
|
bool dim = false,
|
||||||
|
}) =>
|
||||||
|
showGeneralDialog<T>(
|
||||||
|
context: context,
|
||||||
|
barrierDismissible: true,
|
||||||
|
barrierLabel: 'close',
|
||||||
|
barrierColor: dim ? Colors.black26 : Colors.transparent,
|
||||||
|
transitionDuration: easeTime,
|
||||||
|
pageBuilder: (context, _, _) => SafeArea(
|
||||||
|
child: Align(
|
||||||
|
alignment: at,
|
||||||
|
child: ConstrainedBox(
|
||||||
|
constraints: BoxConstraints(maxHeight: MediaQuery.sizeOf(context).height - 32),
|
||||||
|
child: SingleChildScrollView(child: child),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
transitionBuilder: (context, anim, _, child) {
|
||||||
|
final a = CurvedAnimation(parent: anim, curve: ease, reverseCurve: Curves.easeIn);
|
||||||
|
return FadeTransition(
|
||||||
|
opacity: a,
|
||||||
|
child: ScaleTransition(
|
||||||
|
scale: Tween(begin: 0.96, end: 1.0).animate(a),
|
||||||
|
alignment: at,
|
||||||
|
child: child,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
/// Horizontal lists for mouse users: drag with the mouse or Shift+wheel;
|
||||||
|
/// the plain wheel stays vertical (the page scrolls under the cursor, not
|
||||||
|
/// the row).
|
||||||
|
class HScroll extends StatefulWidget {
|
||||||
|
final ScrollController? controller;
|
||||||
|
final Widget Function(ScrollController controller) builder;
|
||||||
|
/// Also map the plain (vertical) wheel to sideways scrolling (at either
|
||||||
|
/// end the wheel goes to the page). Off by default: one wheel doing two
|
||||||
|
/// things was confusing.
|
||||||
|
final bool wheel;
|
||||||
|
const HScroll({super.key, this.controller, required this.builder, this.wheel = false});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<HScroll> createState() => _HScrollState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _HScrollState extends State<HScroll> {
|
||||||
|
ScrollController? _own;
|
||||||
|
ScrollController get _c => widget.controller ?? (_own ??= ScrollController());
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_own?.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _wheel(PointerSignalEvent e) {
|
||||||
|
if (e is! PointerScrollEvent) return;
|
||||||
|
final dy = e.scrollDelta.dy;
|
||||||
|
if (dy == 0 || e.scrollDelta.dx != 0 || !_c.hasClients) return;
|
||||||
|
final p = _c.position;
|
||||||
|
final target = (p.pixels + dy * 1.5).clamp(p.minScrollExtent, p.maxScrollExtent);
|
||||||
|
if (target == p.pixels) return; // at the end: let the page scroll
|
||||||
|
GestureBinding.instance.pointerSignalResolver.register(e, (_) {
|
||||||
|
_c.animateTo(target, duration: const Duration(milliseconds: 140), curve: Curves.easeOutCubic);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) => ScrollConfiguration(
|
||||||
|
behavior: ScrollConfiguration.of(context)
|
||||||
|
.copyWith(dragDevices: PointerDeviceKind.values.toSet()),
|
||||||
|
child: widget.wheel ? Listener(onPointerSignal: _wheel, child: widget.builder(_c)) : widget.builder(_c),
|
||||||
|
);
|
||||||
|
}
|
||||||