diff --git a/Cargo.lock b/Cargo.lock index 6aa037f..b27c409 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1003,7 +1003,7 @@ dependencies = [ [[package]] name = "stremio-core" version = "0.1.0" -source = "git+https://github.com/Stremio/stremio-core?branch=development#aee54a121078b0ff9f94f2f2c09cfead451993e2" +source = "git+https://github.com/Stremio/stremio-core?branch=development#542bfb1717206806eefa78caae05b318f5a65163" dependencies = [ "anyhow", "base64 0.21.2", @@ -1081,7 +1081,7 @@ dependencies = [ [[package]] name = "stremio-derive" version = "0.1.0" -source = "git+https://github.com/Stremio/stremio-core?branch=development#aee54a121078b0ff9f94f2f2c09cfead451993e2" +source = "git+https://github.com/Stremio/stremio-core?branch=development#542bfb1717206806eefa78caae05b318f5a65163" dependencies = [ "case", "proc-macro-crate", @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "stremio-watched-bitfield" version = "0.1.0" -source = "git+https://github.com/Stremio/stremio-core?branch=development#aee54a121078b0ff9f94f2f2c09cfead451993e2" +source = "git+https://github.com/Stremio/stremio-core?branch=development#542bfb1717206806eefa78caae05b318f5a65163" dependencies = [ "base64 0.13.1", "flate2", diff --git a/src/model/serialize_player.rs b/src/model/serialize_player.rs index 1e9adf9..9311ea1 100644 --- a/src/model/serialize_player.rs +++ b/src/model/serialize_player.rs @@ -185,9 +185,14 @@ pub fn serialize_player(player: &Player, ctx: &Ctx, streaming_server: &Streaming next_video: player .selected .as_ref() - .and_then(|selected| selected.meta_request.as_ref()) + .and_then(|selected| { + selected + .meta_request + .as_ref() + .zip(selected.stream_request.as_ref()) + }) .zip(player.next_video.as_ref()) - .map(|(request, video)| model::Video { + .map(|((meta_request, stream_request), video)| model::Video { video, upcoming: player .meta_item @@ -219,7 +224,8 @@ pub fn serialize_player(player: &Player, ctx: &Ctx, streaming_server: &Streaming .unwrap_or_default(), deep_links: VideoDeepLinks::from(( video, - request, + stream_request, + meta_request, &streaming_server.base_url, &ctx.profile.settings, ))