Merge branch 'development' into fix/bubble-up-serde-errors

Stremio · Feb 29, 2024 · 5b94f8c · 5b94f8c
2 parents 545bfed + ee2dafc
commit 5b94f8c
Show file tree

Hide file tree

Showing 8 changed files with 120 additions and 53 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stremio-core-web"
-version = "0.46.1"
+version = "0.46.3"
 authors = ["Smart Code OOD"]
 edition = "2021"
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@stremio/stremio-core-web",
-    "version": "0.46.1",
+    "version": "0.46.3",
     "description": "Bridge between stremio-core and stremio-web",
     "author": "Smart Code OOD",
     "main": "stremio_core_web.js",

diff --git a/src/model/model.rs b/src/model/model.rs
@@ -140,16 +140,14 @@ impl WebModel {
             }
             WebModelField::Library => serialize_library(
                 &self.library,
-                &self.ctx.streams,
+                &self.ctx,
                 self.streaming_server.base_url.as_ref(),
-                &self.ctx.profile.settings,
                 "library".to_owned(),
             ),
             WebModelField::ContinueWatching => serialize_library(
                 &self.continue_watching,
-                &self.ctx.streams,
+                &self.ctx,
                 self.streaming_server.base_url.as_ref(),
-                &self.ctx.profile.settings,
                 "continuewatching".to_owned(),
             ),
             WebModelField::Search => serialize_catalogs_with_extra(&self.search, &self.ctx),

diff --git a/src/model/serialize_continue_watching_preview.rs b/src/model/serialize_continue_watching_preview.rs
@@ -169,11 +169,7 @@ mod model {
                     // else use the provided shape
                     _ => &library_item.poster_shape,
                 },
-                progress: if library_item.state.time_offset > 0 && library_item.state.duration > 0 {
-                    library_item.state.time_offset as f64 / library_item.state.duration as f64
-                } else {
-                    0.0
-                },
+                progress: library_item.progress(),
                 deep_links: LibraryItemDeepLinks::from((
                     library_item,
                     streams_item,