forked from Furumi/furumi-web
Resume unknown episode positions from progress, not 0
The web player only knows a podcast episode's position from a handoff or a seek. When Next, auto-advance, a click or a play command makes an episode current, it now reports `position_unknown` instead of 0, and the server takes the resume position (and the register generation) from the relayed progress register before it hands the state to another device. Remote Next/Prev/play commands to a device do the same. Next with repeat all or shuffle wraps past a trailing unplayable item instead of stopping on it. Prev leaves an unplayable item instead of "restarting" it, and seeking such an item moves its kept position. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
ab7202fc73
commit
d1be583d1e
8 files changed
+435
-30
No files matched your search
+94
-13
@@ -22,14 +22,16 @@ use std::time::Duration;
|
||||
use anyhow::{Context, Result};
|
||||
use music_dht::device_sync::{
|
||||
DEVICE_SYNC_PROTOCOL_VERSION, DeviceProfileWire, InviteWire, ListenEndReason, ListenEvent,
|
||||
ListenTrackMetadata, PlaybackCommand, PlaybackRepeat, PlaybackSnapshot, PlaybackStateWire,
|
||||
PlaybackTrack, SnapshotLike, SnapshotLikeTombstone, SnapshotPlaylist, SnapshotPlaylistItem,
|
||||
SnapshotPlaylistItemTombstone, SnapshotPlaylistTombstone, SyncOpPayload, SyncOpWire,
|
||||
SyncSnapshot, SyncedFedTrack, WireMessage, encode_invite, hash_secret, op_allowed_for_peer,
|
||||
parse_invite, playback_allowed_for_peer, playback_command_allowed_from_peer,
|
||||
podcast_snapshot_budget, profile_protocol_version, random_hex, relayed_protocol_version,
|
||||
supports_listen_history, supports_podcasts, ticket_endpoint_id,
|
||||
ListenTrackMetadata, PlaybackCommand, PlaybackRepeat, PlaybackSnapshot, PlaybackSource,
|
||||
PlaybackStateWire, PlaybackTrack, SnapshotLike, SnapshotLikeTombstone, SnapshotPlaylist,
|
||||
SnapshotPlaylistItem, SnapshotPlaylistItemTombstone, SnapshotPlaylistTombstone, SyncOpPayload,
|
||||
SyncOpWire, SyncSnapshot, SyncedFedTrack, WireMessage, encode_invite, hash_secret,
|
||||
op_allowed_for_peer, parse_invite, playback_allowed_for_peer,
|
||||
playback_command_allowed_from_peer, podcast_snapshot_budget, profile_protocol_version,
|
||||
random_hex, relayed_protocol_version, supports_listen_history, supports_podcasts,
|
||||
ticket_endpoint_id,
|
||||
};
|
||||
use music_dht::podcast::ProgressRecord;
|
||||
use music_dht::{ByteStream, MusicDhtService, NetworkId, PeerTicket, SecretKey, StreamAcceptor};
|
||||
use serde::Serialize;
|
||||
use sqlx::Row;
|
||||
@@ -2893,8 +2895,14 @@ pub async fn record_web_playback_command(
|
||||
current_state: Option<serde_json::Value>,
|
||||
) -> Result<serde_json::Value> {
|
||||
ensure_web_playback_target(pool, user_id, target_device_id).await?;
|
||||
let next_state = browser_state_for_command(command, payload, current_state)?;
|
||||
let wire = playback_state_from_browser_json(pool, next_state.clone()).await?;
|
||||
let mut next_state = browser_state_for_command(command, payload, current_state)?;
|
||||
let wire = playback_state_from_browser_json(pool, user_id, next_state.clone()).await?;
|
||||
// Show the resume position that was sent, not the 0 the browser picked.
|
||||
if let Some(object) = next_state.as_object_mut()
|
||||
&& object.remove(queue_items::POSITION_UNKNOWN_KEY).is_some()
|
||||
{
|
||||
object.insert("position_seconds".to_string(), json_f64(wire.position_secs));
|
||||
}
|
||||
ensure_playback_supported_by(pool, user_id, target_device_id, &wire).await?;
|
||||
record_local_op(
|
||||
pool,
|
||||
@@ -2923,7 +2931,7 @@ pub async fn record_web_active_transfer(
|
||||
state: serde_json::Value,
|
||||
) -> Result<()> {
|
||||
ensure_web_playback_target(pool, user_id, target_device_id).await?;
|
||||
let wire = playback_state_from_browser_json(pool, state).await?;
|
||||
let wire = playback_state_from_browser_json(pool, user_id, state).await?;
|
||||
// Refuse instead of stripping podcast episodes from the queue.
|
||||
ensure_playback_supported_by(pool, user_id, target_device_id, &wire).await?;
|
||||
let target_name = web_playback_target_name(pool, user_id, target_device_id).await?;
|
||||
@@ -2977,7 +2985,7 @@ pub async fn check_web_transfer(
|
||||
target_device_id: &str,
|
||||
state: serde_json::Value,
|
||||
) -> Result<()> {
|
||||
let wire = playback_state_from_browser_json(pool, state).await?;
|
||||
let wire = playback_state_from_browser_json(pool, user_id, state).await?;
|
||||
ensure_playback_supported_by(pool, user_id, target_device_id, &wire).await
|
||||
}
|
||||
|
||||
@@ -2989,7 +2997,7 @@ pub async fn record_web_active_takeover(
|
||||
) -> Result<()> {
|
||||
ensure_web_playback_target(pool, user_id, previous_device_id).await?;
|
||||
let identity = ensure_identity(pool, user_id, "").await?;
|
||||
let wire = playback_state_from_browser_json(pool, state).await?;
|
||||
let wire = playback_state_from_browser_json(pool, user_id, state).await?;
|
||||
with_playback_engine(pool, user_id, &identity, |engine| {
|
||||
engine.transfer(&identity.device_id, playback_clock())
|
||||
})
|
||||
@@ -3088,6 +3096,11 @@ fn browser_state_for_command(
|
||||
current_state.unwrap_or_else(empty_browser_playback_state)
|
||||
};
|
||||
normalize_browser_playback_state(&mut state);
|
||||
// Only a transfer carries the sender's knowledge of the position; the
|
||||
// commands below decide for themselves.
|
||||
if command != "transfer_state" {
|
||||
browser_object_mut(&mut state).remove(queue_items::POSITION_UNKNOWN_KEY);
|
||||
}
|
||||
|
||||
match command {
|
||||
"play_track" | "play_from_index" | "transfer_state" => {
|
||||
@@ -3097,6 +3110,11 @@ fn browser_state_for_command(
|
||||
"paused",
|
||||
browser_bool(&payload, "paused").unwrap_or(false),
|
||||
);
|
||||
if command != "transfer_state" {
|
||||
// The browser always starts the item at 0. For a podcast
|
||||
// episode, ordinary Play resumes from its progress register.
|
||||
mark_browser_position_unknown(&mut state);
|
||||
}
|
||||
}
|
||||
"pause" => set_browser_bool(&mut state, "paused", true),
|
||||
"resume" => {
|
||||
@@ -3314,11 +3332,20 @@ fn advance_browser_state(state: &mut serde_json::Value, payload: &serde_json::Va
|
||||
set_browser_tracks(state, tracks, next);
|
||||
set_browser_number(state, "position_seconds", 0.0);
|
||||
set_browser_bool(state, "paused", false);
|
||||
if next != current {
|
||||
mark_browser_position_unknown(state);
|
||||
}
|
||||
} else {
|
||||
set_browser_bool(state, "paused", true);
|
||||
}
|
||||
}
|
||||
|
||||
/// The current item changed without its position: a podcast episode resumes
|
||||
/// from its progress register (see `playback_state_from_browser_json`).
|
||||
fn mark_browser_position_unknown(state: &mut serde_json::Value) {
|
||||
set_browser_bool(state, queue_items::POSITION_UNKNOWN_KEY, true);
|
||||
}
|
||||
|
||||
fn rewind_browser_state(state: &mut serde_json::Value) {
|
||||
let tracks = browser_tracks(state);
|
||||
if tracks.is_empty() {
|
||||
@@ -3349,6 +3376,9 @@ fn rewind_browser_state(state: &mut serde_json::Value) {
|
||||
if let Some(previous) = previous {
|
||||
set_browser_tracks(state, tracks, previous);
|
||||
set_browser_bool(state, "paused", false);
|
||||
if previous != current {
|
||||
mark_browser_position_unknown(state);
|
||||
}
|
||||
}
|
||||
set_browser_number(state, "position_seconds", 0.0);
|
||||
}
|
||||
@@ -3495,7 +3525,9 @@ async fn local_playback_snapshot(
|
||||
let state = hub
|
||||
.playback_state_json_for_commands(user_id)
|
||||
.unwrap_or_else(|| serde_json::json!({}));
|
||||
let wire = playback_state_from_browser_json(pool, state).await.ok()?;
|
||||
let wire = playback_state_from_browser_json(pool, user_id, state)
|
||||
.await
|
||||
.ok()?;
|
||||
if !playback_allowed_for_peer(&wire, peer_version) {
|
||||
return None;
|
||||
}
|
||||
@@ -3622,7 +3654,56 @@ fn playback_clock() -> u64 {
|
||||
.as_millis() as u64
|
||||
}
|
||||
|
||||
/// Wire playback state of a browser state.
|
||||
///
|
||||
/// When the browser does not know the position of its current item
|
||||
/// ([`queue_items::POSITION_UNKNOWN_KEY`]) and that item is a podcast
|
||||
/// episode, the position comes from the relayed progress register: handing
|
||||
/// 0 to the next device would be written there as an explicit action and
|
||||
/// restart the episode everywhere.
|
||||
async fn playback_state_from_browser_json(
|
||||
pool: &sqlx::PgPool,
|
||||
user_id: i64,
|
||||
state: serde_json::Value,
|
||||
) -> Result<PlaybackStateWire> {
|
||||
let unknown = browser_bool(&state, queue_items::POSITION_UNKNOWN_KEY) == Some(true);
|
||||
let mut wire = browser_json_to_wire(pool, state).await?;
|
||||
if unknown
|
||||
&& let Some(episode) = wire
|
||||
.queue
|
||||
.get(wire.queue_pos)
|
||||
.and_then(PlaybackTrack::podcast_episode_ref)
|
||||
{
|
||||
let record =
|
||||
podcast_relay::progress_record(pool, user_id, episode.episode_id.as_str()).await?;
|
||||
apply_resume_position(&mut wire, record.as_ref());
|
||||
}
|
||||
Ok(wire)
|
||||
}
|
||||
|
||||
/// Sets the position of the current podcast episode to where ordinary Play
|
||||
/// resumes it (`ProgressRecord::resume_position_ms`, 0 without a register),
|
||||
/// and records the register's generation as seen for the handoff.
|
||||
fn apply_resume_position(state: &mut PlaybackStateWire, record: Option<&ProgressRecord>) {
|
||||
let Some(track) = state.queue.get_mut(state.queue_pos) else {
|
||||
return;
|
||||
};
|
||||
let Some(PlaybackSource::PodcastEpisode(episode)) = track.source.as_mut() else {
|
||||
return;
|
||||
};
|
||||
let Some(record) = record.filter(|record| record.episode_id == episode.episode_id) else {
|
||||
state.position_secs = 0.0;
|
||||
return;
|
||||
};
|
||||
state.position_secs = record.resume_position_ms().max(0) as f64 / 1000.0;
|
||||
episode.progress_generation = Some(
|
||||
episode
|
||||
.progress_generation
|
||||
.map_or(record.generation, |seen| seen.max(record.generation)),
|
||||
);
|
||||
}
|
||||
|
||||
async fn browser_json_to_wire(
|
||||
pool: &sqlx::PgPool,
|
||||
state: serde_json::Value,
|
||||
) -> Result<PlaybackStateWire> {
|
||||
|
||||
Reference in new issue
Block a user