Fix playback, account, download and library bugs found in review
All checks were successful
Validate Kaleido Desktop / validate (push) Successful in 1m22s
All checks were successful
Validate Kaleido Desktop / validate (push) Successful in 1m22s
- Clear cached library data when the account or profile behind the server connection changes, not only on Home user switches. - TitleArt falls back to the title when there is no server, so the player no longer crashes offline. - Playback keeps the server it started on: progress, watched state and transcodes never go to a server selected later, a download only reports to its own server, and switching account or server ends a stream from the old one. - Closing or replacing playback during setup can no longer start the file afterwards. - Transcodes save the chosen audio/subtitle tracks on the server before starting (and name them in the request), apply the language and subtitle preferences, and keep the current tracks across quality changes. - Offline playback saves its resume point and watched count in the download's metadata. - Download tasks take over from a previous task for the same title only after it exits, and pause/remove stay wired to the current task. - Downloads prefer a single-file version and refuse split ones instead of saving only part one. - Download artwork is named per file, so episodes in one season folder no longer overwrite or delete each other's images. - Library grids refetch loaded pages when the cache is invalidated. - Request timeouts and cancellation also cover the response body. - Hero rotation resumes after being scrolled back into view. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
c70aeede74
commit
8755d16735
9 changed files with 399 additions and 99 deletions
|
|
@ -5,8 +5,9 @@
|
||||||
//! server-relative source path; resuming after a restart asks the interface for
|
//! server-relative source path; resuming after a restart asks the interface for
|
||||||
//! a freshly signed URL.
|
//! a freshly signed URL.
|
||||||
|
|
||||||
use std::collections::HashMap;
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
|
use std::sync::atomic::{AtomicU64, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
use std::time::{Duration, Instant, SystemTime, UNIX_EPOCH};
|
||||||
|
|
||||||
|
|
@ -47,10 +48,19 @@ pub struct Item {
|
||||||
pub speed: u64,
|
pub speed: u64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The transfer task that currently owns a download (and its `.part` file).
|
||||||
|
struct Worker {
|
||||||
|
generation: u64,
|
||||||
|
cancel: watch::Sender<bool>,
|
||||||
|
/// Closes once the task has exited and let go of the file.
|
||||||
|
done: watch::Receiver<()>,
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Downloads {
|
pub struct Downloads {
|
||||||
items: Mutex<Vec<Item>>,
|
items: Mutex<Vec<Item>>,
|
||||||
dir: Mutex<Option<PathBuf>>,
|
dir: Mutex<Option<PathBuf>>,
|
||||||
cancels: Mutex<HashMap<String, watch::Sender<bool>>>,
|
workers: Mutex<HashMap<String, Worker>>,
|
||||||
|
generation: AtomicU64,
|
||||||
permits: Arc<Semaphore>,
|
permits: Arc<Semaphore>,
|
||||||
client: reqwest::Client,
|
client: reqwest::Client,
|
||||||
}
|
}
|
||||||
|
|
@ -60,7 +70,8 @@ impl Default for Downloads {
|
||||||
Downloads {
|
Downloads {
|
||||||
items: Mutex::new(Vec::new()),
|
items: Mutex::new(Vec::new()),
|
||||||
dir: Mutex::new(None),
|
dir: Mutex::new(None),
|
||||||
cancels: Mutex::new(HashMap::new()),
|
workers: Mutex::new(HashMap::new()),
|
||||||
|
generation: AtomicU64::new(0),
|
||||||
permits: Arc::new(Semaphore::new(MAX_ACTIVE)),
|
permits: Arc::new(Semaphore::new(MAX_ACTIVE)),
|
||||||
client: reqwest::Client::builder()
|
client: reqwest::Client::builder()
|
||||||
.connect_timeout(Duration::from_secs(20))
|
.connect_timeout(Duration::from_secs(20))
|
||||||
|
|
@ -168,8 +179,11 @@ pub async fn download_start<R: Runtime>(app: AppHandle<R>, request: StartRequest
|
||||||
let mut meta = request.meta.clone();
|
let mut meta = request.meta.clone();
|
||||||
if let Value::Object(map) = &mut meta {
|
if let Value::Object(map) = &mut meta {
|
||||||
let mut local = serde_json::Map::new();
|
let mut local = serde_json::Map::new();
|
||||||
|
// Episodes share their season's folder, so artwork is named after the file it
|
||||||
|
// belongs to: one episode's still never replaces another's.
|
||||||
|
let stem = file_path.file_stem().and_then(|s| s.to_str()).map(sanitize).unwrap_or_else(|| sanitize(&request.id));
|
||||||
for (name, url) in &request.assets {
|
for (name, url) in &request.assets {
|
||||||
let target = folder.join(format!(".{}.jpg", sanitize(name)));
|
let target = folder.join(format!(".{stem}.{}.jpg", sanitize(name)));
|
||||||
if fetch_to(&state.client, url, &target).await.is_ok() {
|
if fetch_to(&state.client, url, &target).await.is_ok() {
|
||||||
local.insert(name.clone(), Value::String(target.display().to_string()));
|
local.insert(name.clone(), Value::String(target.display().to_string()));
|
||||||
}
|
}
|
||||||
|
|
@ -204,21 +218,48 @@ async fn fetch_to(client: &reqwest::Client, url: &str, target: &Path) -> Result<
|
||||||
tokio::fs::write(target, bytes).await.map_err(|e| e.to_string())
|
tokio::fs::write(target, bytes).await.map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Starts a transfer task for `id`, taking over from any task still running for it:
|
||||||
|
/// that one is cancelled and the new one waits for it to exit before touching the file.
|
||||||
fn spawn<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
fn spawn<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
|
let state = app.state::<Downloads>();
|
||||||
|
let generation = state.generation.fetch_add(1, Ordering::Relaxed);
|
||||||
let (tx, rx) = watch::channel(false);
|
let (tx, rx) = watch::channel(false);
|
||||||
app.state::<Downloads>().cancels.lock().insert(id.clone(), tx);
|
let (done_tx, done_rx) = watch::channel(());
|
||||||
|
let previous = state.workers.lock().insert(id.clone(), Worker { generation, cancel: tx, done: done_rx });
|
||||||
|
let previous = previous.map(|w| {
|
||||||
|
let _ = w.cancel.send(true);
|
||||||
|
w.done
|
||||||
|
});
|
||||||
tauri::async_runtime::spawn(async move {
|
tauri::async_runtime::spawn(async move {
|
||||||
|
// Held until this task ends: whoever waits on `done` then knows the file is free.
|
||||||
|
let _done = done_tx;
|
||||||
|
let took_over = previous.is_some();
|
||||||
|
if let Some(done) = previous {
|
||||||
|
exited(done).await;
|
||||||
|
}
|
||||||
|
let stopped = rx.clone();
|
||||||
|
if *stopped.borrow() {
|
||||||
|
release(&app, &id, generation);
|
||||||
|
return;
|
||||||
|
}
|
||||||
let permits = app.state::<Downloads>().permits.clone();
|
let permits = app.state::<Downloads>().permits.clone();
|
||||||
let _permit = tokio::select! {
|
let _permit = tokio::select! {
|
||||||
p = permits.acquire_owned() => p,
|
p = permits.acquire_owned() => p,
|
||||||
_ = cancelled(rx.clone()) => return,
|
_ = cancelled(rx.clone()) => { release(&app, &id, generation); return; }
|
||||||
};
|
};
|
||||||
let result = transfer(&app, &id, &url, rx).await;
|
// The task it replaced may have finished the file just as it was stopped.
|
||||||
app.state::<Downloads>().cancels.lock().remove(&id);
|
let result = if took_over && finished_file(&app, &id) { Ok(true) } else { transfer(&app, &id, &url, rx).await };
|
||||||
|
release(&app, &id, generation);
|
||||||
|
// Once paused, removed or replaced, the outcome is no longer this task's to
|
||||||
|
// report, except a finished file, which is complete whatever happened since.
|
||||||
|
if *stopped.borrow() && !matches!(result, Ok(true)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
match result {
|
match result {
|
||||||
Ok(true) => {
|
Ok(true) => {
|
||||||
update(&app, &id, |i| {
|
update(&app, &id, |i| {
|
||||||
i.status = Status::Completed;
|
i.status = Status::Completed;
|
||||||
|
i.error = None;
|
||||||
i.speed = 0;
|
i.speed = 0;
|
||||||
i.received = i.total.max(i.received);
|
i.received = i.total.max(i.received);
|
||||||
});
|
});
|
||||||
|
|
@ -236,6 +277,30 @@ fn spawn<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Drops the worker entry, unless a newer task has taken it over.
|
||||||
|
fn release<R: Runtime>(app: &AppHandle<R>, id: &str, generation: u64) {
|
||||||
|
let state = app.state::<Downloads>();
|
||||||
|
let mut workers = state.workers.lock();
|
||||||
|
if workers.get(id).map(|w| w.generation) == Some(generation) {
|
||||||
|
workers.remove(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The download's file is in place and nothing is left to transfer.
|
||||||
|
fn finished_file<R: Runtime>(app: &AppHandle<R>, id: &str) -> bool {
|
||||||
|
let Some(path) = app.state::<Downloads>().items.lock().iter().find(|i| i.id == id).map(|i| PathBuf::from(&i.file_path)) else { return false };
|
||||||
|
path.exists() && !part_path(&path).exists()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn part_path(path: &Path) -> PathBuf {
|
||||||
|
path.with_extension(format!("{}.part", path.extension().and_then(|e| e.to_str()).unwrap_or("bin")))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Resolves once a worker task has exited.
|
||||||
|
async fn exited(mut done: watch::Receiver<()>) {
|
||||||
|
while done.changed().await.is_ok() {}
|
||||||
|
}
|
||||||
|
|
||||||
async fn cancelled(mut rx: watch::Receiver<bool>) {
|
async fn cancelled(mut rx: watch::Receiver<bool>) {
|
||||||
while !*rx.borrow() {
|
while !*rx.borrow() {
|
||||||
if rx.changed().await.is_err() {
|
if rx.changed().await.is_err() {
|
||||||
|
|
@ -248,10 +313,7 @@ async fn cancelled(mut rx: watch::Receiver<bool>) {
|
||||||
async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch::Receiver<bool>) -> Result<bool, String> {
|
async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch::Receiver<bool>) -> Result<bool, String> {
|
||||||
let Some(item) = app.state::<Downloads>().items.lock().iter().find(|i| i.id == id).cloned() else { return Ok(false) };
|
let Some(item) = app.state::<Downloads>().items.lock().iter().find(|i| i.id == id).cloned() else { return Ok(false) };
|
||||||
let final_path = PathBuf::from(&item.file_path);
|
let final_path = PathBuf::from(&item.file_path);
|
||||||
let part_path = final_path.with_extension(format!(
|
let part_path = part_path(&final_path);
|
||||||
"{}.part",
|
|
||||||
final_path.extension().and_then(|e| e.to_str()).unwrap_or("bin")
|
|
||||||
));
|
|
||||||
let existing = tokio::fs::metadata(&part_path).await.map(|m| m.len()).unwrap_or(0);
|
let existing = tokio::fs::metadata(&part_path).await.map(|m| m.len()).unwrap_or(0);
|
||||||
|
|
||||||
let client = app.state::<Downloads>().client.clone();
|
let client = app.state::<Downloads>().client.clone();
|
||||||
|
|
@ -259,7 +321,10 @@ async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch
|
||||||
if existing > 0 {
|
if existing > 0 {
|
||||||
request = request.header("Range", format!("bytes={existing}-"));
|
request = request.header("Range", format!("bytes={existing}-"));
|
||||||
}
|
}
|
||||||
let response = request.send().await.map_err(|e| format!("Could not reach the server: {e}"))?;
|
let response = tokio::select! {
|
||||||
|
r = request.send() => r.map_err(|e| format!("Could not reach the server: {e}"))?,
|
||||||
|
_ = cancelled(rx.clone()) => return Ok(false),
|
||||||
|
};
|
||||||
let status = response.status();
|
let status = response.status();
|
||||||
if status.as_u16() == 401 || status.as_u16() == 403 {
|
if status.as_u16() == 401 || status.as_u16() == 403 {
|
||||||
return Err("The server does not allow downloads for this account.".into());
|
return Err("The server does not allow downloads for this account.".into());
|
||||||
|
|
@ -336,10 +401,14 @@ async fn transfer<R: Runtime>(app: &AppHandle<R>, id: &str, url: &str, rx: watch
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn cancel<R: Runtime>(app: &AppHandle<R>, id: &str) {
|
/// Stops the transfer for `id`, if one is running; the receiver closes once it has exited.
|
||||||
if let Some(tx) = app.state::<Downloads>().cancels.lock().remove(id) {
|
/// The entry stays until then, so a task started meanwhile knows to wait for it.
|
||||||
let _ = tx.send(true);
|
fn cancel<R: Runtime>(app: &AppHandle<R>, id: &str) -> Option<watch::Receiver<()>> {
|
||||||
}
|
let state = app.state::<Downloads>();
|
||||||
|
let workers = state.workers.lock();
|
||||||
|
let worker = workers.get(id)?;
|
||||||
|
let _ = worker.cancel.send(true);
|
||||||
|
Some(worker.done.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
|
|
@ -356,7 +425,7 @@ pub fn download_pause<R: Runtime>(app: AppHandle<R>, id: String) {
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub fn download_resume<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
pub fn download_resume<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
cancel(&app, &id);
|
// `spawn` takes over from a transfer still winding down.
|
||||||
update(&app, &id, |i| {
|
update(&app, &id, |i| {
|
||||||
i.status = Status::Queued;
|
i.status = Status::Queued;
|
||||||
i.error = None;
|
i.error = None;
|
||||||
|
|
@ -366,7 +435,7 @@ pub fn download_resume<R: Runtime>(app: AppHandle<R>, id: String, url: String) {
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn download_remove<R: Runtime>(app: AppHandle<R>, id: String, delete_files: bool) -> Result<(), String> {
|
pub async fn download_remove<R: Runtime>(app: AppHandle<R>, id: String, delete_files: bool) -> Result<(), String> {
|
||||||
cancel(&app, &id);
|
let running = cancel(&app, &id);
|
||||||
let removed = {
|
let removed = {
|
||||||
let state = app.state::<Downloads>();
|
let state = app.state::<Downloads>();
|
||||||
let mut items = state.items.lock();
|
let mut items = state.items.lock();
|
||||||
|
|
@ -375,14 +444,24 @@ pub async fn download_remove<R: Runtime>(app: AppHandle<R>, id: String, delete_f
|
||||||
};
|
};
|
||||||
if let (Some(item), true) = (removed, delete_files) {
|
if let (Some(item), true) = (removed, delete_files) {
|
||||||
let path = PathBuf::from(&item.file_path);
|
let path = PathBuf::from(&item.file_path);
|
||||||
// Give the cancelled transfer a moment to release its file handle.
|
// Let the cancelled transfer release its file handle first.
|
||||||
tokio::time::sleep(Duration::from_millis(150)).await;
|
if let Some(done) = running {
|
||||||
|
let _ = tokio::time::timeout(Duration::from_secs(10), exited(done)).await;
|
||||||
|
}
|
||||||
let _ = tokio::fs::remove_file(&path).await;
|
let _ = tokio::fs::remove_file(&path).await;
|
||||||
let part = path.with_extension(format!("{}.part", path.extension().and_then(|e| e.to_str()).unwrap_or("bin")));
|
let _ = tokio::fs::remove_file(part_path(&path)).await;
|
||||||
let _ = tokio::fs::remove_file(&part).await;
|
// Older downloads shared artwork between a season's episodes: keep what others still use.
|
||||||
|
let in_use: HashSet<String> = app
|
||||||
|
.state::<Downloads>()
|
||||||
|
.items
|
||||||
|
.lock()
|
||||||
|
.iter()
|
||||||
|
.filter_map(|i| i.meta.get("localAssets").and_then(Value::as_object))
|
||||||
|
.flat_map(|a| a.values().filter_map(Value::as_str).map(str::to_owned))
|
||||||
|
.collect();
|
||||||
if let Value::Object(assets) = &item.meta["localAssets"] {
|
if let Value::Object(assets) = &item.meta["localAssets"] {
|
||||||
for v in assets.values() {
|
for v in assets.values() {
|
||||||
if let Some(p) = v.as_str() {
|
if let Some(p) = v.as_str().filter(|p| !in_use.contains(*p)) {
|
||||||
let _ = tokio::fs::remove_file(p).await;
|
let _ = tokio::fs::remove_file(p).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
import { QueryClient, useQuery, type UseQueryOptions } from '@tanstack/react-query';
|
import { QueryClient, useQuery, type UseQueryOptions } from '@tanstack/react-query';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import type { Item, Section } from '../plex/types';
|
import type { Item, Section } from '../plex/types';
|
||||||
import { useServer } from './session';
|
import { useServer, useSession } from './session';
|
||||||
import { useSettings } from './settings';
|
import { useSettings } from './settings';
|
||||||
|
|
||||||
export const queryClient = new QueryClient({
|
export const queryClient = new QueryClient({
|
||||||
|
|
@ -27,6 +27,13 @@ export const PROGRESS = { ...WATCH_STATE, staleTime: 15_000, refetchInterval: 60
|
||||||
// app doesn't change visibility, so a window focus counts as well.
|
// app doesn't change visibility, so a window focus counts as well.
|
||||||
window.addEventListener('focus', () => queryClient.getQueryCache().onFocus());
|
window.addEventListener('focus', () => queryClient.getQueryCache().onFocus());
|
||||||
|
|
||||||
|
// Keys carry the server but not the account, and another account (or a Home profile) on
|
||||||
|
// the same server sees different watch state and libraries. Whenever the credentials
|
||||||
|
// behind the connection change, nothing cached under the old ones may be shown.
|
||||||
|
useSession.subscribe((st, prev) => {
|
||||||
|
if (prev.server && st.server !== prev.server && st.server?.token !== prev.server.token) queryClient.clear();
|
||||||
|
});
|
||||||
|
|
||||||
/** Every key starts with the server so switching servers never mixes caches. */
|
/** Every key starts with the server so switching servers never mixes caches. */
|
||||||
export function useKey(...parts: unknown[]) {
|
export function useKey(...parts: unknown[]) {
|
||||||
const server = useServer();
|
const server = useServer();
|
||||||
|
|
|
||||||
|
|
@ -52,12 +52,16 @@ function sanitize(s: string) {
|
||||||
return s.replace(/[<>:"/\\|?*\u0000-\u001f]/g, '_').trim() || 'Untitled';
|
return s.replace(/[<>:"/\\|?*\u0000-\u001f]/g, '_').trim() || 'Untitled';
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Trims metadata kept for offline display: no extras, related hubs or raw blobs. */
|
/**
|
||||||
function slim(raw: any) {
|
* Trims metadata kept for offline display: no extras, related hubs or raw blobs, and
|
||||||
|
* only the version downloaded, so its streams describe the file that plays.
|
||||||
|
*/
|
||||||
|
function slim(raw: any, mediaIndex: number) {
|
||||||
const { Extras, Related, OnDeck, ...rest } = raw ?? {};
|
const { Extras, Related, OnDeck, ...rest } = raw ?? {};
|
||||||
void Extras;
|
void Extras;
|
||||||
void Related;
|
void Related;
|
||||||
void OnDeck;
|
void OnDeck;
|
||||||
|
if (Array.isArray(rest.Media) && rest.Media[mediaIndex]) rest.Media = [rest.Media[mediaIndex]];
|
||||||
return rest;
|
return rest;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -102,9 +106,12 @@ export const useDownloads = create<DownloadsState>((set, get) => ({
|
||||||
try {
|
try {
|
||||||
await get().init();
|
await get().init();
|
||||||
const item = await api.metadata(server, input.id);
|
const item = await api.metadata(server, input.id);
|
||||||
const media = item.media[0];
|
// A download is one file. A version split across several (CD1, CD2) would be
|
||||||
|
// kept as its first part only, so prefer a version in one piece.
|
||||||
|
const media = item.media.find((m) => m.parts.length === 1) ?? item.media[0];
|
||||||
const part = media?.parts[0];
|
const part = media?.parts[0];
|
||||||
if (!part) throw new Error('This title has no downloadable file.');
|
if (!part) throw new Error('This title has no downloadable file.');
|
||||||
|
if (media.parts.length > 1) throw new Error('This title is split across several files, which Kaleido can’t download yet.');
|
||||||
const id = get().idFor(item.id);
|
const id = get().idFor(item.id);
|
||||||
if (get().items.some((d) => d.id === id && d.status !== 'failed')) {
|
if (get().items.some((d) => d.id === id && d.status !== 'failed')) {
|
||||||
toast('This title is already in Downloads.');
|
toast('This title is already in Downloads.');
|
||||||
|
|
@ -129,7 +136,7 @@ export const useDownloads = create<DownloadsState>((set, get) => ({
|
||||||
url: server.signed(part.key, { download: 1 }),
|
url: server.signed(part.key, { download: 1 }),
|
||||||
folder,
|
folder,
|
||||||
fileName: sanitize(baseName),
|
fileName: sanitize(baseName),
|
||||||
meta: { serverId: server.machineId, serverName: server.name, ratingKey: item.id, partKey: part.key, raw: slim(item.raw) } satisfies DownloadMeta,
|
meta: { serverId: server.machineId, serverName: server.name, ratingKey: item.id, partKey: part.key, raw: slim(item.raw, item.media.indexOf(media)) } satisfies DownloadMeta,
|
||||||
assets,
|
assets,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -2,12 +2,14 @@ import { create } from 'zustand';
|
||||||
import * as api from '../plex/api';
|
import * as api from '../plex/api';
|
||||||
import { directUrl, previewUrl, reportTimeline, stopTranscode, transcodeUrl, type Delivery } from '../plex/playback';
|
import { directUrl, previewUrl, reportTimeline, stopTranscode, transcodeUrl, type Delivery } from '../plex/playback';
|
||||||
import type { Item, Stream } from '../plex/types';
|
import type { Item, Stream } from '../plex/types';
|
||||||
|
import type { PlexServer } from '../plex/client';
|
||||||
import { useSession } from '../app/session';
|
import { useSession } from '../app/session';
|
||||||
|
import { useDownloads, type Download } from '../downloads/store';
|
||||||
import { useSettings, SUBTITLE_MARGIN, type Preferences, type Quality, type Upscaling } from '../app/settings';
|
import { useSettings, SUBTITLE_MARGIN, type Preferences, type Quality, type Upscaling } from '../app/settings';
|
||||||
import { followVideoSize, noteMpvLog, requestEnhancement, watchPerformance } from './enhance';
|
import { followVideoSize, noteMpvLog, requestEnhancement, watchPerformance } from './enhance';
|
||||||
import { channelLabel } from '../app/format';
|
import { channelLabel } from '../app/format';
|
||||||
import { invalidateLibrary } from '../app/queries';
|
import { invalidateLibrary } from '../app/queries';
|
||||||
import { keepAwake, isNative, win } from '../platform/native';
|
import { invoke, keepAwake, isNative, win } from '../platform/native';
|
||||||
import { mpv, type MpvEvent, type MpvTrack } from './engine';
|
import { mpv, type MpvEvent, type MpvTrack } from './engine';
|
||||||
import { toast } from '../ui/overlays';
|
import { toast } from '../ui/overlays';
|
||||||
import { stopThemeMusic } from './theme';
|
import { stopThemeMusic } from './theme';
|
||||||
|
|
@ -32,6 +34,8 @@ export interface PlayOptions {
|
||||||
/** A local file path (offline download). */
|
/** A local file path (offline download). */
|
||||||
localFile?: string;
|
localFile?: string;
|
||||||
quality?: Quality;
|
quality?: Quality;
|
||||||
|
/** Keep these track choices (UI keys) instead of applying the preferences again. */
|
||||||
|
tracks?: { audioKey: string; subKey: string };
|
||||||
}
|
}
|
||||||
|
|
||||||
interface PlayerState {
|
interface PlayerState {
|
||||||
|
|
@ -113,7 +117,16 @@ let loadToken = 0;
|
||||||
let wasFullscreenBeforePlay = false;
|
let wasFullscreenBeforePlay = false;
|
||||||
let pendingExternal: Track | null = null;
|
let pendingExternal: Track | null = null;
|
||||||
|
|
||||||
const server = () => useSession.getState().server;
|
/**
|
||||||
|
* The server this playback belongs to, fixed when it starts. Progress, watched state
|
||||||
|
* and transcodes always go there, never to whichever server is selected later. A
|
||||||
|
* download plays without one unless its own server is the one connected.
|
||||||
|
*/
|
||||||
|
let playServer: PlexServer | null = null;
|
||||||
|
/** The download being played, whose saved metadata keeps the offline resume point. */
|
||||||
|
let playDownload: Download | null = null;
|
||||||
|
|
||||||
|
const server = () => playServer;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* mpv applies its volume on a cubic curve, so halfway on a linear slider was
|
* mpv applies its volume on a cubic curve, so halfway on a linear slider was
|
||||||
|
|
@ -218,8 +231,34 @@ async function applySubtitleStyle(prefs: Preferences = useSettings.getState()) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** A download's watch was counted this session; its resume point stays cleared. */
|
||||||
|
let localScrobbled = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Keeps a download's resume point (or, once watched, its watch count) in its saved
|
||||||
|
* metadata, which is all an offline title has to resume from.
|
||||||
|
*/
|
||||||
|
function saveLocalProgress(watched = false) {
|
||||||
|
const d = playDownload;
|
||||||
|
const { item, position, delivery, firstFrame } = usePlayer.getState();
|
||||||
|
// Before the first frame the position is only where it was asked to start.
|
||||||
|
if (!d || !item || delivery?.mode !== 'local' || !firstFrame || (localScrobbled && !watched)) return;
|
||||||
|
const raw = { ...(d.meta.raw ?? {}) };
|
||||||
|
if (watched) {
|
||||||
|
if (localScrobbled) return;
|
||||||
|
localScrobbled = true;
|
||||||
|
raw.viewOffset = 0;
|
||||||
|
raw.viewCount = (Number(raw.viewCount) || 0) + 1;
|
||||||
|
raw.lastViewedAt = Math.floor(Date.now() / 1000);
|
||||||
|
} else raw.viewOffset = Math.max(0, Math.round(position * 1000));
|
||||||
|
const meta = { ...d.meta, raw };
|
||||||
|
playDownload = { ...d, meta };
|
||||||
|
invoke('download_write_meta', { id: d.id, meta }).catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
/** Reports progress to Plex; resolves true if the reply says the stream was stopped. */
|
/** Reports progress to Plex; resolves true if the reply says the stream was stopped. */
|
||||||
function report(state: 'playing' | 'paused' | 'buffering' | 'stopped'): Promise<boolean> {
|
function report(state: 'playing' | 'paused' | 'buffering' | 'stopped'): Promise<boolean> {
|
||||||
|
if (state === 'paused' || state === 'stopped') saveLocalProgress();
|
||||||
const s = server();
|
const s = server();
|
||||||
const { item, position, delivery } = usePlayer.getState();
|
const { item, position, delivery } = usePlayer.getState();
|
||||||
if (!s || !item || !session || item.type === 'clip') return Promise.resolve(false);
|
if (!s || !item || !session || item.type === 'clip') return Promise.resolve(false);
|
||||||
|
|
@ -266,9 +305,11 @@ function onTerminated(text: string) {
|
||||||
function checkScrobble() {
|
function checkScrobble() {
|
||||||
const { item, position, duration } = usePlayer.getState();
|
const { item, position, duration } = usePlayer.getState();
|
||||||
const s = server();
|
const s = server();
|
||||||
if (!item || !s || scrobbled || !duration || item.type === 'clip') return;
|
if (!item || scrobbled || !duration || item.type === 'clip') return;
|
||||||
const percent = useSettings.getState().watchedPercent;
|
const percent = useSettings.getState().watchedPercent;
|
||||||
if (position / duration >= percent / 100) {
|
if (position / duration >= percent / 100) {
|
||||||
|
saveLocalProgress(true);
|
||||||
|
if (!s) return;
|
||||||
scrobbled = true;
|
scrobbled = true;
|
||||||
api
|
api
|
||||||
.setWatched(s, item.id, true)
|
.setWatched(s, item.id, true)
|
||||||
|
|
@ -317,25 +358,12 @@ function stopCountdown() {
|
||||||
countdownTimer = null;
|
countdownTimer = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Applies Plex/user track preferences once mpv has loaded the file. */
|
/**
|
||||||
async function applyInitialTracks(tracks: MpvTrack[]) {
|
* The tracks to play: a choice already made is kept ('' audio and '__init' subtitles
|
||||||
const st = usePlayer.getState();
|
* mean none yet), otherwise the preferred audio language, then Plex's selection, then
|
||||||
const prefs = useSettings.getState();
|
* the file default; subtitles follow the subtitle mode.
|
||||||
const direct = st.delivery?.mode !== 'transcode';
|
*/
|
||||||
const byFF = (type: string, idx: number) => tracks.find((t) => t.type === type && t['ff-index'] === idx && !t.external);
|
function preferredTracks(audio: Track[], subs: Track[], prefs: Preferences, audioKey = '', subKey = '__init') {
|
||||||
|
|
||||||
let audio = st.audioTracks;
|
|
||||||
let subs = st.subTracks;
|
|
||||||
if (direct) {
|
|
||||||
audio = audio.map((t) => ({ ...t, mpvId: t.stream ? (byFF('audio', t.stream.index)?.id ?? null) : t.mpvId }));
|
|
||||||
subs = subs.map((t) => ({ ...t, mpvId: t.stream && !t.external ? (byFF('sub', t.stream.index)?.id ?? null) : t.mpvId }));
|
|
||||||
// Files without Plex stream info (offline) use mpv's own list.
|
|
||||||
if (!audio.length) audio = tracks.filter((t) => t.type === 'audio').map(mpvTrackLabel);
|
|
||||||
if (!subs.length) subs = tracks.filter((t) => t.type === 'sub').map(mpvTrackLabel);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Audio: preferred language, else Plex's selection, else the file default.
|
|
||||||
let audioKey = st.audioKey;
|
|
||||||
if (!audioKey) {
|
if (!audioKey) {
|
||||||
const lang = prefs.audioLanguage;
|
const lang = prefs.audioLanguage;
|
||||||
audioKey =
|
audioKey =
|
||||||
|
|
@ -345,8 +373,6 @@ async function applyInitialTracks(tracks: MpvTrack[]) {
|
||||||
audio[0]?.key ||
|
audio[0]?.key ||
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
// Subtitles: follow the subtitle mode.
|
|
||||||
let subKey = st.subKey;
|
|
||||||
if (subKey === '__init') {
|
if (subKey === '__init') {
|
||||||
const lang = prefs.subtitleLanguage || audio.find((t) => t.key === audioKey)?.language || '';
|
const lang = prefs.subtitleLanguage || audio.find((t) => t.key === audioKey)?.language || '';
|
||||||
const inLang = subs.filter((t) => !lang || t.language === lang);
|
const inLang = subs.filter((t) => !lang || t.language === lang);
|
||||||
|
|
@ -364,6 +390,87 @@ async function applyInitialTracks(tracks: MpvTrack[]) {
|
||||||
subKey = subs.find((t) => t.stream?.selected)?.key ?? inLang.find((t) => t.forced)?.key ?? '';
|
subKey = subs.find((t) => t.stream?.selected)?.key ?? inLang.find((t) => t.forced)?.key ?? '';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return { audioKey, subKey };
|
||||||
|
}
|
||||||
|
|
||||||
|
type Selection = { audioStreamID?: string; subtitleStreamID?: string };
|
||||||
|
|
||||||
|
/** The item with Plex's stream selection updated locally to match `sel`. */
|
||||||
|
function withSelection(item: Item, mediaIndex: number, sel: Selection): Item {
|
||||||
|
const media = item.media.map((m, i) =>
|
||||||
|
i !== mediaIndex
|
||||||
|
? m
|
||||||
|
: {
|
||||||
|
...m,
|
||||||
|
parts: m.parts.map((p) => ({
|
||||||
|
...p,
|
||||||
|
streams: p.streams.map((x) =>
|
||||||
|
x.streamType === 2 && sel.audioStreamID !== undefined
|
||||||
|
? { ...x, selected: x.id === sel.audioStreamID }
|
||||||
|
: x.streamType === 3 && sel.subtitleStreamID !== undefined
|
||||||
|
? { ...x, selected: x.id === sel.subtitleStreamID }
|
||||||
|
: x,
|
||||||
|
),
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return { ...item, media };
|
||||||
|
}
|
||||||
|
|
||||||
|
const streamId = (tracks: Track[], key: string) => tracks.find((t) => t.key === key)?.stream?.id;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* What Plex must be told so its selection on this media matches the given streams
|
||||||
|
* (subtitle '' is none, undefined leaves either as it is). Empty if it already does.
|
||||||
|
*/
|
||||||
|
function selectionFor(item: Item, mediaIndex: number, audioId: string | undefined, subId: string | undefined): Selection {
|
||||||
|
const streams = item.media[mediaIndex]?.parts.flatMap((p) => p.streams) ?? [];
|
||||||
|
const sel: Selection = {};
|
||||||
|
if (audioId && !streams.some((x) => x.streamType === 2 && x.selected && x.id === audioId)) sel.audioStreamID = audioId;
|
||||||
|
if (subId !== undefined && (streams.find((x) => x.streamType === 3 && x.selected)?.id ?? '') !== subId) sel.subtitleStreamID = subId || '0';
|
||||||
|
return sel;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Saves a track choice on the server; resolves to the item with that selection. */
|
||||||
|
async function saveSelection(s: PlexServer, item: Item, mediaIndex: number, sel: Selection): Promise<Item> {
|
||||||
|
const part = item.media[mediaIndex]?.parts[0];
|
||||||
|
if (!part || (sel.audioStreamID === undefined && sel.subtitleStreamID === undefined)) return item;
|
||||||
|
await api.selectStreams(s, part.id, sel);
|
||||||
|
return withSelection(item, mediaIndex, sel);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Saves a choice made during direct play, so other Plex apps (and a later conversion) use it too. */
|
||||||
|
function rememberSelection(st: PlayerState, audioId: string | undefined, subId: string | undefined) {
|
||||||
|
const s = server();
|
||||||
|
const { item, mediaIndex } = st;
|
||||||
|
if (!s || !item) return;
|
||||||
|
const sel = selectionFor(item, mediaIndex, audioId, subId);
|
||||||
|
saveSelection(s, item, mediaIndex, sel)
|
||||||
|
.then(() => {
|
||||||
|
const now = usePlayer.getState();
|
||||||
|
if (now.item?.id === item.id && now.mediaIndex === mediaIndex) usePlayer.setState({ item: withSelection(now.item, mediaIndex, sel) });
|
||||||
|
})
|
||||||
|
.catch(() => {});
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Applies Plex/user track preferences once mpv has loaded the file. */
|
||||||
|
async function applyInitialTracks(tracks: MpvTrack[]) {
|
||||||
|
const st = usePlayer.getState();
|
||||||
|
const prefs = useSettings.getState();
|
||||||
|
const direct = st.delivery?.mode !== 'transcode';
|
||||||
|
const byFF = (type: string, idx: number) => tracks.find((t) => t.type === type && t['ff-index'] === idx && !t.external);
|
||||||
|
|
||||||
|
let audio = st.audioTracks;
|
||||||
|
let subs = st.subTracks;
|
||||||
|
if (direct) {
|
||||||
|
audio = audio.map((t) => ({ ...t, mpvId: t.stream ? (byFF('audio', t.stream.index)?.id ?? null) : t.mpvId }));
|
||||||
|
subs = subs.map((t) => ({ ...t, mpvId: t.stream && !t.external ? (byFF('sub', t.stream.index)?.id ?? null) : t.mpvId }));
|
||||||
|
// Files without Plex stream info (offline) use mpv's own list.
|
||||||
|
if (!audio.length) audio = tracks.filter((t) => t.type === 'audio').map(mpvTrackLabel);
|
||||||
|
if (!subs.length) subs = tracks.filter((t) => t.type === 'sub').map(mpvTrackLabel);
|
||||||
|
}
|
||||||
|
|
||||||
|
const { audioKey, subKey } = preferredTracks(audio, subs, prefs, st.audioKey, st.subKey);
|
||||||
usePlayer.setState({ audioTracks: audio, subTracks: subs, audioKey, subKey });
|
usePlayer.setState({ audioTracks: audio, subTracks: subs, audioKey, subKey });
|
||||||
if (direct) {
|
if (direct) {
|
||||||
const a = audio.find((t) => t.key === audioKey);
|
const a = audio.find((t) => t.key === audioKey);
|
||||||
|
|
@ -501,6 +608,9 @@ function onEvent(e: MpvEvent) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The tracks playing now, to carry over when the same media restarts (a choice not made yet stays open). */
|
||||||
|
const currentTracks = (st: PlayerState) => ({ audioKey: st.audioKey, subKey: st.subKey });
|
||||||
|
|
||||||
/** Direct play failed: retry once through Plex's converter. */
|
/** Direct play failed: retry once through Plex's converter. */
|
||||||
let triedFallback = false;
|
let triedFallback = false;
|
||||||
function fallbackAfterError() {
|
function fallbackAfterError() {
|
||||||
|
|
@ -509,7 +619,7 @@ function fallbackAfterError() {
|
||||||
triedFallback = true;
|
triedFallback = true;
|
||||||
toast('Direct playback failed. Asking Plex to convert this video.');
|
toast('Direct playback failed. Asking Plex to convert this video.');
|
||||||
usePlayer.setState({ error: '' });
|
usePlayer.setState({ error: '' });
|
||||||
st.play(st.item, { offsetMs: st.position * 1000 || startOffsetMs, mediaIndex: st.mediaIndex, quality: '1080' });
|
st.play(st.item, { offsetMs: st.position * 1000 || startOffsetMs, mediaIndex: st.mediaIndex, quality: '1080', tracks: currentTracks(st) });
|
||||||
}
|
}
|
||||||
|
|
||||||
function maybeCredits(pos: number) {
|
function maybeCredits(pos: number) {
|
||||||
|
|
@ -567,7 +677,8 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
|
|
||||||
async play(input, opts = {}) {
|
async play(input, opts = {}) {
|
||||||
const token = ++loadToken;
|
const token = ++loadToken;
|
||||||
const s = server();
|
// Closing or starting something else while this one is still setting up wins.
|
||||||
|
const stale = () => token !== loadToken;
|
||||||
const prefs = useSettings.getState();
|
const prefs = useSettings.getState();
|
||||||
stopThemeMusic();
|
stopThemeMusic();
|
||||||
stopCountdown();
|
stopCountdown();
|
||||||
|
|
@ -576,13 +687,25 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const previous = get();
|
const previous = get();
|
||||||
|
// The previous title's reporting ends here, against its own server.
|
||||||
|
if (reportTimer) clearInterval(reportTimer);
|
||||||
|
reportTimer = null;
|
||||||
if (previous.open && previous.item) {
|
if (previous.open && previous.item) {
|
||||||
report('stopped');
|
report('stopped');
|
||||||
if (previous.delivery?.session && s) stopTranscode(s, previous.delivery.session);
|
const ps = server();
|
||||||
|
if (previous.delivery?.session && ps) stopTranscode(ps, previous.delivery.session);
|
||||||
}
|
}
|
||||||
|
session = '';
|
||||||
|
const current = useSession.getState().server;
|
||||||
|
const download = opts.localFile ? (useDownloads.getState().items.find((d) => d.filePath === opts.localFile) ?? null) : null;
|
||||||
|
const s = opts.localFile ? (current && download && current.machineId === download.meta.serverId ? current : null) : current;
|
||||||
|
playServer = s;
|
||||||
|
playDownload = download;
|
||||||
|
localScrobbled = false;
|
||||||
if (!previous.open) {
|
if (!previous.open) {
|
||||||
triedFallback = false;
|
triedFallback = false;
|
||||||
wasFullscreenBeforePlay = await win.isFullscreen().catch(() => false);
|
wasFullscreenBeforePlay = await win.isFullscreen().catch(() => false);
|
||||||
|
if (stale()) return;
|
||||||
}
|
}
|
||||||
set({
|
set({
|
||||||
open: true,
|
open: true,
|
||||||
|
|
@ -604,8 +727,8 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
chapters: [],
|
chapters: [],
|
||||||
audioTracks: [],
|
audioTracks: [],
|
||||||
subTracks: [],
|
subTracks: [],
|
||||||
audioKey: '',
|
audioKey: opts.tracks?.audioKey ?? '',
|
||||||
subKey: '__init',
|
subKey: opts.tracks?.subKey ?? '__init',
|
||||||
video: null,
|
video: null,
|
||||||
fullscreen: wasFullscreenBeforePlay,
|
fullscreen: wasFullscreenBeforePlay,
|
||||||
mini: false,
|
mini: false,
|
||||||
|
|
@ -619,16 +742,16 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
if (!opts.localFile && s && (!input.media.length || !input.media[0].parts[0]?.streams.length || !input.raw?.Marker)) {
|
if (!opts.localFile && s && (!input.media.length || !input.media[0].parts[0]?.streams.length || !input.raw?.Marker)) {
|
||||||
item = await api.metadata(s, input.id).catch(() => input);
|
item = await api.metadata(s, input.id).catch(() => input);
|
||||||
}
|
}
|
||||||
if (token !== loadToken) return;
|
if (stale()) return;
|
||||||
const mediaIndex = Math.min(opts.mediaIndex ?? 0, Math.max(0, item.media.length - 1));
|
const mediaIndex = Math.min(opts.mediaIndex ?? 0, Math.max(0, item.media.length - 1));
|
||||||
const media = item.media[mediaIndex];
|
let media = item.media[mediaIndex];
|
||||||
let offsetMs = opts.offsetMs ?? (opts.resume !== false && item.viewOffset && item.viewOffset < item.duration * 0.97 ? item.viewOffset : 0);
|
let offsetMs = opts.offsetMs ?? (opts.resume !== false && item.viewOffset && item.viewOffset < item.duration * 0.97 ? item.viewOffset : 0);
|
||||||
startOffsetMs = offsetMs;
|
|
||||||
const local = useSession.getState().connection?.local ?? true;
|
const local = useSession.getState().connection?.local ?? true;
|
||||||
const quality: Quality = opts.quality ?? (local ? prefs.quality : prefs.remoteQuality);
|
const quality: Quality = opts.quality ?? (local ? prefs.quality : prefs.remoteQuality);
|
||||||
session = crypto.randomUUID();
|
const streams = media?.parts.flatMap((p) => p.streams) ?? [];
|
||||||
sessionAnswered = false;
|
const audioTracks = streams.filter((x) => x.streamType === 2).map(audioTrackFromStream);
|
||||||
scrobbled = false;
|
const subTracks = streams.filter((x) => x.streamType === 3).map(subTrackFromStream);
|
||||||
|
let tracks: { audioKey: string; subKey: string } | null = null;
|
||||||
|
|
||||||
let delivery: Delivery;
|
let delivery: Delivery;
|
||||||
if (opts.localFile) {
|
if (opts.localFile) {
|
||||||
|
|
@ -638,30 +761,43 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
} else if (quality === 'original') {
|
} else if (quality === 'original') {
|
||||||
delivery = { url: directUrl(s, media), mode: 'direct', label: 'Original', absoluteTime: false };
|
delivery = { url: directUrl(s, media), mode: 'direct', label: 'Original', absoluteTime: false };
|
||||||
} else {
|
} else {
|
||||||
|
// Plex converts (and burns in) the tracks selected on the server, so the chosen
|
||||||
|
// ones are saved there before the conversion starts, not after.
|
||||||
|
tracks = preferredTracks(audioTracks, subTracks, prefs, opts.tracks?.audioKey, opts.tracks?.subKey);
|
||||||
|
const audioStreamID = streamId(audioTracks, tracks.audioKey);
|
||||||
|
const subtitleStreamID = streamId(subTracks, tracks.subKey) ?? '';
|
||||||
|
const base = item;
|
||||||
|
item = await saveSelection(s, base, mediaIndex, selectionFor(base, mediaIndex, audioStreamID, subtitleStreamID)).catch(() => base);
|
||||||
|
if (stale()) return;
|
||||||
|
media = item.media[mediaIndex];
|
||||||
const tsession = crypto.randomUUID();
|
const tsession = crypto.randomUUID();
|
||||||
delivery = {
|
delivery = {
|
||||||
url: transcodeUrl(s, item, { mediaIndex, quality, offsetMs, session: tsession, local }),
|
url: transcodeUrl(s, item, { mediaIndex, quality, offsetMs, session: tsession, local, audioStreamID, subtitleStreamID: subtitleStreamID || undefined }),
|
||||||
mode: 'transcode',
|
mode: 'transcode',
|
||||||
session: tsession,
|
session: tsession,
|
||||||
label: quality === '2160' ? '4K' : `${quality}p`,
|
label: quality === '2160' ? '4K' : `${quality}p`,
|
||||||
absoluteTime: true,
|
absoluteTime: true,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
startOffsetMs = offsetMs;
|
||||||
|
session = crypto.randomUUID();
|
||||||
|
sessionAnswered = false;
|
||||||
|
scrobbled = false;
|
||||||
|
|
||||||
const streams = media?.parts.flatMap((p) => p.streams) ?? [];
|
|
||||||
set({
|
set({
|
||||||
item,
|
item,
|
||||||
delivery,
|
delivery,
|
||||||
mediaIndex,
|
mediaIndex,
|
||||||
quality,
|
quality,
|
||||||
duration: (item.duration || media?.duration || 0) / 1000,
|
duration: (item.duration || media?.duration || 0) / 1000,
|
||||||
audioTracks: streams.filter((x) => x.streamType === 2).map(audioTrackFromStream),
|
audioTracks,
|
||||||
subTracks: streams.filter((x) => x.streamType === 3).map(subTrackFromStream),
|
subTracks,
|
||||||
|
...(tracks ?? {}),
|
||||||
});
|
});
|
||||||
|
|
||||||
await mpv.init({ hwdec: prefs.hwdec, hdr: prefs.hdrPassthrough });
|
await mpv.init({ hwdec: prefs.hwdec, hdr: prefs.hdrPassthrough });
|
||||||
if (!unlisten) unlisten = await mpv.on(onEvent);
|
if (!unlisten) unlisten = await mpv.on(onEvent);
|
||||||
if (token !== loadToken) return;
|
if (stale()) return;
|
||||||
// mpv keeps pause across files: a title paused and closed would start paused.
|
// mpv keeps pause across files: a title paused and closed would start paused.
|
||||||
await mpv.set('pause', false);
|
await mpv.set('pause', false);
|
||||||
await mpv.set('mute', false);
|
await mpv.set('mute', false);
|
||||||
|
|
@ -669,16 +805,21 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
await mpv.set('speed', 1);
|
await mpv.set('speed', 1);
|
||||||
await mpv.set('audio-delay', 0);
|
await mpv.set('audio-delay', 0);
|
||||||
await applySubtitleStyle(prefs);
|
await applySubtitleStyle(prefs);
|
||||||
|
if (stale()) return;
|
||||||
followVideoSize();
|
followVideoSize();
|
||||||
await requestEnhancement();
|
await requestEnhancement();
|
||||||
|
if (stale()) return;
|
||||||
watchPerformance(true);
|
watchPerformance(true);
|
||||||
await mpv.set('force-media-title', item.type === 'episode' ? `${item.grandparentTitle} — ${item.title}` : item.title);
|
await mpv.set('force-media-title', item.type === 'episode' ? `${item.grandparentTitle} — ${item.title}` : item.title);
|
||||||
|
if (stale()) return;
|
||||||
await mpv.show(true);
|
await mpv.show(true);
|
||||||
|
if (stale()) return;
|
||||||
const fileOpts = [
|
const fileOpts = [
|
||||||
delivery.mode === 'transcode' ? 'rebase-start-time=no' : 'rebase-start-time=yes',
|
delivery.mode === 'transcode' ? 'rebase-start-time=no' : 'rebase-start-time=yes',
|
||||||
offsetMs > 0 && delivery.mode !== 'transcode' ? `start=${(offsetMs / 1000).toFixed(2)}` : 'start=none',
|
offsetMs > 0 && delivery.mode !== 'transcode' ? `start=${(offsetMs / 1000).toFixed(2)}` : 'start=none',
|
||||||
].join(',');
|
].join(',');
|
||||||
await mpv.command('loadfile', delivery.url, 'replace', -1, fileOpts);
|
await mpv.command('loadfile', delivery.url, 'replace', -1, fileOpts);
|
||||||
|
if (stale()) return;
|
||||||
keepAwake(true);
|
keepAwake(true);
|
||||||
report('buffering');
|
report('buffering');
|
||||||
reportTimer && clearInterval(reportTimer);
|
reportTimer && clearInterval(reportTimer);
|
||||||
|
|
@ -702,6 +843,10 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
if (st.item && !st.error) report('stopped');
|
if (st.item && !st.error) report('stopped');
|
||||||
const s = server();
|
const s = server();
|
||||||
if (st.delivery?.session && s) stopTranscode(s, st.delivery.session);
|
if (st.delivery?.session && s) stopTranscode(s, st.delivery.session);
|
||||||
|
// Nothing more is reported for this playback, whatever mpv says while it stops.
|
||||||
|
session = '';
|
||||||
|
playServer = null;
|
||||||
|
playDownload = null;
|
||||||
keepAwake(false);
|
keepAwake(false);
|
||||||
watchPerformance(false);
|
watchPerformance(false);
|
||||||
if (isNative) {
|
if (isNative) {
|
||||||
|
|
@ -794,35 +939,30 @@ export const usePlayer = create<PlayerState>((set, get) => ({
|
||||||
const t = st.audioTracks.find((x) => x.key === key);
|
const t = st.audioTracks.find((x) => x.key === key);
|
||||||
if (!t) return;
|
if (!t) return;
|
||||||
set({ audioKey: key });
|
set({ audioKey: key });
|
||||||
const s = server();
|
|
||||||
const part = st.item?.media[st.mediaIndex]?.parts[0];
|
|
||||||
if (s && part && t.stream) api.selectStreams(s, part.id, { audioStreamID: t.stream.id }).catch(() => {});
|
|
||||||
if (st.delivery?.mode === 'transcode' && st.item) {
|
if (st.delivery?.mode === 'transcode' && st.item) {
|
||||||
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality });
|
// The restart saves the choice on the server before converting with it.
|
||||||
|
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality, tracks: { ...currentTracks(st), audioKey: key } });
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (t.mpvId) await mpv.set('aid', t.mpvId).catch(() => {});
|
if (t.mpvId) await mpv.set('aid', t.mpvId).catch(() => {});
|
||||||
|
rememberSelection(st, t.stream?.id, undefined);
|
||||||
},
|
},
|
||||||
|
|
||||||
async selectSubtitle(key) {
|
async selectSubtitle(key) {
|
||||||
const st = get();
|
const st = get();
|
||||||
set({ subKey: key });
|
set({ subKey: key });
|
||||||
const s = server();
|
|
||||||
const part = st.item?.media[st.mediaIndex]?.parts[0];
|
|
||||||
const t = st.subTracks.find((x) => x.key === key);
|
|
||||||
if (s && part) api.selectStreams(s, part.id, { subtitleStreamID: t?.stream?.id ?? '0' }).catch(() => {});
|
|
||||||
if (st.delivery?.mode === 'transcode' && st.item) {
|
if (st.delivery?.mode === 'transcode' && st.item) {
|
||||||
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality });
|
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: st.quality, tracks: { ...currentTracks(st), subKey: key } });
|
||||||
usePlayer.setState({ subKey: key });
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
await setMpvSubtitle(key);
|
await setMpvSubtitle(key);
|
||||||
|
rememberSelection(st, undefined, streamId(st.subTracks, key) ?? '');
|
||||||
},
|
},
|
||||||
|
|
||||||
async setQuality(q) {
|
async setQuality(q) {
|
||||||
const st = get();
|
const st = get();
|
||||||
if (!st.item || q === st.quality) return;
|
if (!st.item || q === st.quality) return;
|
||||||
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: q });
|
await st.play(st.item, { offsetMs: st.position * 1000, mediaIndex: st.mediaIndex, quality: q, tracks: currentTracks(st) });
|
||||||
},
|
},
|
||||||
|
|
||||||
async selectVersion(index) {
|
async selectVersion(index) {
|
||||||
|
|
@ -885,6 +1025,24 @@ usePlayer.subscribe((st, prev) => {
|
||||||
|
|
||||||
bridgeMiniWindow(usePlayer);
|
bridgeMiniWindow(usePlayer);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Signing out, or switching server or profile, ends a stream from the old one: its
|
||||||
|
* progress belongs to that account. A download keeps playing, without reporting.
|
||||||
|
* A reconnect to the same server with the same credentials carries on.
|
||||||
|
*/
|
||||||
|
useSession.subscribe((st, prev) => {
|
||||||
|
const old = prev.server;
|
||||||
|
if (!old || st.server === old) return;
|
||||||
|
const same = !!st.server && st.server.machineId === old.machineId && st.server.token === old.token;
|
||||||
|
if (playServer !== old) return;
|
||||||
|
if (same) {
|
||||||
|
playServer = st.server;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (usePlayer.getState().open && !playDownload) usePlayer.getState().close();
|
||||||
|
playServer = null;
|
||||||
|
});
|
||||||
|
|
||||||
/** Subtitle look changes apply to the playing video straight away. */
|
/** Subtitle look changes apply to the playing video straight away. */
|
||||||
const SUBTITLE_PREFS = ['subtitleScale', 'subtitleColor', 'subtitleEdge', 'subtitleBox', 'subtitleBold', 'subtitlePosition'] as const;
|
const SUBTITLE_PREFS = ['subtitleScale', 'subtitleColor', 'subtitleEdge', 'subtitleBox', 'subtitleBold', 'subtitlePosition'] as const;
|
||||||
useSettings.subscribe((prefs, prev) => {
|
useSettings.subscribe((prefs, prev) => {
|
||||||
|
|
|
||||||
|
|
@ -121,23 +121,41 @@ export async function plexRequest<T = any>(url: string, token: string | null | u
|
||||||
const timer = setTimeout(() => controller.abort(), opts.timeout ?? 30000);
|
const timer = setTimeout(() => controller.abort(), opts.timeout ?? 30000);
|
||||||
const onAbort = () => controller.abort();
|
const onAbort = () => controller.abort();
|
||||||
opts.signal?.addEventListener('abort', onAbort);
|
opts.signal?.addEventListener('abort', onAbort);
|
||||||
|
// The timeout and the caller's cancel cover the body as well as the headers: a reply
|
||||||
|
// that stalls part way must still end. (Rejects only once aborted.)
|
||||||
|
const aborted = new Promise<never>((_, reject) =>
|
||||||
|
controller.signal.addEventListener('abort', () => reject(opts.signal?.aborted ? opts.signal.reason : new PlexError('The server took too long to respond.', 0)), { once: true }),
|
||||||
|
);
|
||||||
|
aborted.catch(() => {});
|
||||||
|
if (opts.signal?.aborted) controller.abort();
|
||||||
let response: Response;
|
let response: Response;
|
||||||
|
let text: string;
|
||||||
try {
|
try {
|
||||||
response = await httpFetch(withParams(url, opts.params), {
|
try {
|
||||||
method: opts.method ?? 'GET',
|
response = await Promise.race([
|
||||||
headers: { ...plexHeaders(token), ...opts.headers },
|
httpFetch(withParams(url, opts.params), {
|
||||||
body: opts.body ?? undefined,
|
method: opts.method ?? 'GET',
|
||||||
signal: controller.signal,
|
headers: { ...plexHeaders(token), ...opts.headers },
|
||||||
});
|
body: opts.body ?? undefined,
|
||||||
} catch (e: any) {
|
signal: controller.signal,
|
||||||
if (opts.signal?.aborted) throw e;
|
}),
|
||||||
throw new PlexError(controller.signal.aborted ? 'The server took too long to respond.' : 'Could not reach the server.', 0);
|
aborted,
|
||||||
|
]);
|
||||||
|
} catch (e: any) {
|
||||||
|
if (opts.signal?.aborted) throw e;
|
||||||
|
throw new PlexError(controller.signal.aborted ? 'The server took too long to respond.' : 'Could not reach the server.', 0);
|
||||||
|
}
|
||||||
|
if (!response.ok) throw new PlexError(statusMessage(response.status), response.status);
|
||||||
|
try {
|
||||||
|
text = await Promise.race([response.text(), aborted]);
|
||||||
|
} catch (e: any) {
|
||||||
|
if (opts.signal?.aborted || e instanceof PlexError) throw e;
|
||||||
|
throw new PlexError('The connection to the server was lost.', 0);
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
clearTimeout(timer);
|
clearTimeout(timer);
|
||||||
opts.signal?.removeEventListener('abort', onAbort);
|
opts.signal?.removeEventListener('abort', onAbort);
|
||||||
}
|
}
|
||||||
if (!response.ok) throw new PlexError(statusMessage(response.status), response.status);
|
|
||||||
const text = await response.text();
|
|
||||||
if (opts.text) return text as unknown as T;
|
if (opts.text) return text as unknown as T;
|
||||||
if (!text.trim()) return {} as T;
|
if (!text.trim()) return {} as T;
|
||||||
try {
|
try {
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,10 @@ export function transcodeUrl(
|
||||||
path: `/library/metadata/${item.id}`,
|
path: `/library/metadata/${item.id}`,
|
||||||
mediaIndex: opts.mediaIndex,
|
mediaIndex: opts.mediaIndex,
|
||||||
partIndex: 0,
|
partIndex: 0,
|
||||||
|
// Plex converts the part's selected streams; callers save the selection first and
|
||||||
|
// name it here as well.
|
||||||
|
audioStreamID: opts.audioStreamID,
|
||||||
|
subtitleStreamID: opts.subtitleStreamID,
|
||||||
protocol: 'hls',
|
protocol: 'hls',
|
||||||
session: opts.session,
|
session: opts.session,
|
||||||
offset: (opts.offsetMs / 1000).toFixed(1),
|
offset: (opts.offsetMs / 1000).toFixed(1),
|
||||||
|
|
|
||||||
|
|
@ -236,6 +236,33 @@ function LibraryGrid({ section, type, sort, filters, title, sortTitle }: { secti
|
||||||
loadPage(0);
|
loadPage(0);
|
||||||
}, [loadPage]);
|
}, [loadPage]);
|
||||||
|
|
||||||
|
// Pages are copied out of the cache, so nothing re-renders when it is invalidated
|
||||||
|
// (watched state, edits, deletions, library changes): fetch the loaded ones again.
|
||||||
|
const loaded = useRef(pages);
|
||||||
|
loaded.current = pages;
|
||||||
|
useEffect(() => {
|
||||||
|
const prefix = JSON.stringify([server.machineId, 'libraryPage', section.id, params]);
|
||||||
|
const due = new Set<number>();
|
||||||
|
let timer: ReturnType<typeof setTimeout> | null = null;
|
||||||
|
const unsubscribe = queryClient.getQueryCache().subscribe((event) => {
|
||||||
|
if (event.type !== 'updated' || event.action.type !== 'invalidate') return;
|
||||||
|
const key = event.query.queryKey;
|
||||||
|
const p = key[4];
|
||||||
|
if (typeof p !== 'number' || !loaded.current[p] || JSON.stringify(key.slice(0, 4)) !== prefix) return;
|
||||||
|
due.add(p);
|
||||||
|
// One pass after the whole invalidation, not one per page as it happens.
|
||||||
|
timer ??= setTimeout(() => {
|
||||||
|
timer = null;
|
||||||
|
for (const page of due) loadPage(page);
|
||||||
|
due.clear();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
return () => {
|
||||||
|
unsubscribe();
|
||||||
|
if (timer) clearTimeout(timer);
|
||||||
|
};
|
||||||
|
}, [loadPage]);
|
||||||
|
|
||||||
const gap = 16;
|
const gap = 16;
|
||||||
const target = CARD_WIDTH[posterSize];
|
const target = CARD_WIDTH[posterSize];
|
||||||
const cols = Math.max(2, Math.floor((width + gap) / (target + gap)));
|
const cols = Math.max(2, Math.floor((width + gap) / (target + gap)));
|
||||||
|
|
|
||||||
|
|
@ -43,14 +43,14 @@ export function Hero({ features, variant = 'home' }: { features: Feature[]; vari
|
||||||
img.decode?.().catch(() => {});
|
img.decode?.().catch(() => {});
|
||||||
}, [upcoming?.id]);
|
}, [upcoming?.id]);
|
||||||
|
|
||||||
|
// Pause rotation when the hero is scrolled away; it picks up again on its return.
|
||||||
|
const [visible, setVisible] = useState(true);
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!rotate || reduced || count < 2 || hover) return;
|
if (!rotate || reduced || count < 2 || hover || !visible) return;
|
||||||
const t = setTimeout(() => go(index + 1), ROTATE_MS);
|
const t = setTimeout(() => go(index + 1), ROTATE_MS);
|
||||||
return () => clearTimeout(t);
|
return () => clearTimeout(t);
|
||||||
}, [index, rotate, reduced, count, hover]);
|
}, [index, rotate, reduced, count, hover, visible]);
|
||||||
|
|
||||||
// Pause rotation when the hero is scrolled away.
|
|
||||||
const [visible, setVisible] = useState(true);
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const el = root.current;
|
const el = root.current;
|
||||||
if (!el) return;
|
if (!el) return;
|
||||||
|
|
@ -60,7 +60,6 @@ export function Hero({ features, variant = 'home' }: { features: Feature[]; vari
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const go = (i: number) => {
|
const go = (i: number) => {
|
||||||
if (!visible && i !== index) return;
|
|
||||||
setIndex(((i % count) + count) % count);
|
setIndex(((i % count) + count) % count);
|
||||||
setCopyKey((k) => k + 1);
|
setCopyKey((k) => k + 1);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
import { memo, useEffect, useRef, useState, type ReactNode } from 'react';
|
import { memo, useEffect, useRef, useState, type ReactNode } from 'react';
|
||||||
import type { Item } from '../plex/types';
|
import type { Item } from '../plex/types';
|
||||||
import { useServer } from '../app/session';
|
import { useServer, useSession } from '../app/session';
|
||||||
import { useSettings } from '../app/settings';
|
import { useSettings } from '../app/settings';
|
||||||
import { art, displayTitle, duration, episodeLabel, formatBadges, isWatched, progress, remaining, remainingEpisodes } from '../app/format';
|
import { art, displayTitle, duration, episodeLabel, formatBadges, isWatched, progress, remaining, remainingEpisodes } from '../app/format';
|
||||||
import { itemMenu, openItem, playWithVersion } from '../app/actions';
|
import { itemMenu, openItem, playWithVersion } from '../app/actions';
|
||||||
|
|
@ -90,7 +90,8 @@ export function Facts({ item, withFormats = true, episode = true, children }: {
|
||||||
|
|
||||||
/** Original clear-logo artwork, falling back to the title in type. */
|
/** Original clear-logo artwork, falling back to the title in type. */
|
||||||
export function TitleArt({ item, logo, className = '', maxWidth = 420, maxHeight = 130, as: As = 'h1' }: { item: Item; logo?: string; className?: string; maxWidth?: number; maxHeight?: number; as?: 'h1' | 'h2' }) {
|
export function TitleArt({ item, logo, className = '', maxWidth = 420, maxHeight = 130, as: As = 'h1' }: { item: Item; logo?: string; className?: string; maxWidth?: number; maxHeight?: number; as?: 'h1' | 'h2' }) {
|
||||||
const server = useServer();
|
// The player shows this offline too, where there is no server to draw the logo from.
|
||||||
|
const server = useSession((s) => s.server);
|
||||||
const path = logo ?? item.logo;
|
const path = logo ?? item.logo;
|
||||||
const [failed, setFailed] = useState(false);
|
const [failed, setFailed] = useState(false);
|
||||||
const [ready, setReady] = useState(false);
|
const [ready, setReady] = useState(false);
|
||||||
|
|
@ -99,7 +100,7 @@ export function TitleArt({ item, logo, className = '', maxWidth = 420, maxHeight
|
||||||
setReady(false);
|
setReady(false);
|
||||||
}, [path]);
|
}, [path]);
|
||||||
const title = item.type === 'episode' ? item.grandparentTitle : item.type === 'season' ? item.parentTitle || item.title : item.title;
|
const title = item.type === 'episode' ? item.grandparentTitle : item.type === 'season' ? item.parentTitle || item.title : item.title;
|
||||||
if (!path || failed)
|
if (!path || failed || !server)
|
||||||
return (
|
return (
|
||||||
<As className={`title-text ${className}`} style={{ maxWidth: maxWidth * 1.4 }}>
|
<As className={`title-text ${className}`} style={{ maxWidth: maxWidth * 1.4 }}>
|
||||||
{title}
|
{title}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue