diff --git a/Cargo.lock b/Cargo.lock index 314397370..b65404852 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1096,7 +1096,7 @@ dependencies = [ [[package]] name = "frontend" -version = "3.2.20" +version = "3.2.21" dependencies = [ "anyhow", "base64", @@ -1108,7 +1108,7 @@ dependencies = [ "futures-signals", "gloo-render 0.2.0", "gloo-storage 0.3.0", - "gloo-timers 0.3.0", + "gloo-timers 0.2.6", "gloo-utils 0.2.0", "implicit-clone", "js-sys", @@ -1621,6 +1621,8 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" dependencies = [ + "futures-channel", + "futures-core", "js-sys", "wasm-bindgen", ] @@ -3791,7 +3793,7 @@ dependencies = [ [[package]] name = "shared" -version = "3.2.20" +version = "3.2.21" dependencies = [ "base64", "bitflags 2.10.0", @@ -4354,7 +4356,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tuliprox" -version = "3.2.20" +version = "3.2.21" dependencies = [ "arc-swap", "async-compression", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index 8f8c60a6f..9c99059e8 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tuliprox" -version = "3.2.20" +version = "3.2.21" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/backend/src/api/api_utils.rs b/backend/src/api/api_utils.rs index 079dfd8a7..2cee4b7f0 100644 --- a/backend/src/api/api_utils.rs +++ b/backend/src/api/api_utils.rs @@ -1146,7 +1146,7 @@ pub async fn local_stream_response( fn is_path_within_allowed_directories(sub_path: &Path, root_paths: &[String]) -> bool { for root_path in root_paths { - if sub_path.starts_with(&PathBuf::from(root_path)) { + if sub_path.starts_with(PathBuf::from(root_path)) { return true; } } diff --git a/backend/src/library/tmdb.rs b/backend/src/library/tmdb.rs index 31a327fa8..c3ae3c2d4 100644 --- a/backend/src/library/tmdb.rs +++ b/backend/src/library/tmdb.rs @@ -438,14 +438,14 @@ pub struct TmdbSeason { impl TmdbSeason { pub fn to_meta_data(&self) -> SeasonMetadata { SeasonMetadata { - id: self.id.clone(), + id: self.id, air_date: self.air_date.clone(), - episode_count: self.episode_count.clone(), + episode_count: self.episode_count, name: self.name.clone(), overview: self.overview.clone(), poster_path: self.poster_path.clone(), - season_number: self.season_number.clone(), - vote_average: self.vote_average.clone(), + season_number: self.season_number, + vote_average: self.vote_average, episodes: self.episodes.clone(), networks: self.networks.clone(), credits: self.credits.clone(), diff --git a/backend/src/model/xtream.rs b/backend/src/model/xtream.rs index 4aa35ba9e..727245f78 100644 --- a/backend/src/model/xtream.rs +++ b/backend/src/model/xtream.rs @@ -472,6 +472,7 @@ where } } +#[allow(clippy::ref_option)] fn serialize_episodes( episodes: &Option>, serializer: S, diff --git a/backend/src/processing/processor/library.rs b/backend/src/processing/processor/library.rs index b598f82ae..746fbf0e7 100644 --- a/backend/src/processing/processor/library.rs +++ b/backend/src/processing/processor/library.rs @@ -104,7 +104,7 @@ fn to_playlist_item(entry: &MetadataCacheEntry, input_name: &str, group_name: &s id: episode.id.to_string(), // we use parent_code for local series to find the parent series info and straighten the virtual_ids parent_code: entry.uuid.clone(), - uuid: generate_playlist_uuid(&input_name, &episode.id.to_string(), PlaylistItemType::LocalSeries, &episode.direct_source), + uuid: generate_playlist_uuid(input_name, &episode.id.to_string(), PlaylistItemType::LocalSeries, &episode.direct_source), name: episode.title.clone(), group: group_name.to_string(), title: episode.title.clone(), @@ -241,9 +241,9 @@ pub fn metadata_cache_entry_to_xtream_series_info( youtube_trailer, episode_run_time: String::from("0"), category_id: 0, - tmdb_id: series.tmdb_id.clone(), - tmdb: series.tmdb_id.clone(), - year: series.year.clone(), + tmdb_id: series.tmdb_id, + tmdb: series.tmdb_id, + year: series.year, }; // seasons are not delivered through xtream get_series_info. @@ -288,7 +288,7 @@ pub fn metadata_cache_entry_to_xtream_series_info( releaseDate: episode_release_date.clone(), releasedate: episode_release_date, plot: episode.plot.clone().unwrap_or_default(), - duration_secs: episode.runtime.map(|r| r * 60).unwrap_or(0), + duration_secs: episode.runtime.map_or(0, |r| r * 60), duration: episode.runtime .map(|r| format!("{:02}:{:02}:00", r / 60, r % 60)) .unwrap_or_default(), diff --git a/backend/src/repository/playlist_repository.rs b/backend/src/repository/playlist_repository.rs index 0a29bef33..32e021006 100644 --- a/backend/src/repository/playlist_repository.rs +++ b/backend/src/repository/playlist_repository.rs @@ -171,7 +171,7 @@ fn rewrite_local_series_info_episode_virtual_id(playlist: &mut [PlaylistGroup], } } if let Ok(s) = serde_json::to_string(&series_info) { - header.additional_properties = RawValue::from_string(s).ok() + header.additional_properties = RawValue::from_string(s).ok(); } } } diff --git a/backend/src/repository/xtream_playlist_iterator.rs b/backend/src/repository/xtream_playlist_iterator.rs index 50ff7a895..e2ca6f433 100644 --- a/backend/src/repository/xtream_playlist_iterator.rs +++ b/backend/src/repository/xtream_playlist_iterator.rs @@ -78,11 +78,10 @@ impl XtreamPlaylistIterator { fn matches_filters(cluster: XtreamCluster, filter_ids: Option<&HashSet>, item: &XtreamPlaylistItem) -> bool { - if cluster == XtreamCluster::Series { - if !matches!(item.item_type, PlaylistItemType::SeriesInfo | PlaylistItemType::LocalSeriesInfo) { + if cluster == XtreamCluster::Series + && !matches!(item.item_type, PlaylistItemType::SeriesInfo | PlaylistItemType::LocalSeriesInfo) { return false; } - } // category_id-Filter if let Some(set) = filter_ids { diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml index c7d388db0..c7c81128c 100644 --- a/frontend/Cargo.toml +++ b/frontend/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "frontend" -version = "3.2.20" +version = "3.2.21" edition = "2021" [dependencies] -shared = { version = "3.2.20", path = "../shared" } +shared = { version = "3.2.21", path = "../shared" } chrono = "0" yew = "0.21" yew-router = "0.18" diff --git a/shared/Cargo.toml b/shared/Cargo.toml index 3fd601ff7..03e48aa3d 100644 --- a/shared/Cargo.toml +++ b/shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "shared" -version = "3.2.20" +version = "3.2.21" edition = "2021" [dependencies]