euzu/tuliprox
1
0
Fork 0
mirror of https://github.com/euzu/tuliprox.git synced 2026-10-20 23:02:34 +02:00
Code Issues Packages Projects Releases 5 Wiki Activity

- **Breaking CHANGE** Sort refactor, now with filter

Browse Source 
- Fixed xtream api season info, filled missing seasons attribute
- xtream api category_id = 0 filter ignored
This commit is contained in:
euzu
2026-01-10 17:11:15 +01:00
parent f976d15f62
commit 24e09f0c7d
20 changed files with 812 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/processing/processor/library.rs
+38 -2
View File
@@ -1,10 +1,12 @@
use std::collections::HashMap;
use crate::library::{MediaMetadata, MetadataAsyncIter, MetadataCacheEntry};
use crate::model::{AppConfig, ConfigInput};
use shared::error::TuliproxError;
use shared::model::{EpisodeStreamProperties, PlaylistGroup, PlaylistItem, PlaylistItemHeader, PlaylistItemType, SeriesStreamDetailEpisodeProperties, SeriesStreamDetailProperties, SeriesStreamProperties, StreamProperties, UUIDType, VideoStreamDetailProperties, VideoStreamProperties, XtreamCluster};
use shared::model::{EpisodeStreamProperties, PlaylistGroup, PlaylistItem, PlaylistItemHeader, PlaylistItemType, SeriesStreamDetailEpisodeProperties, SeriesStreamDetailProperties, SeriesStreamDetailSeasonProperties, SeriesStreamProperties, StreamProperties, UUIDType, VideoStreamDetailProperties, VideoStreamProperties, XtreamCluster};
use shared::utils::{generate_playlist_uuid, StringInterner};
use std::path::Path;
use std::sync::Arc;
use shared::concat_string;
pub async fn download_library_playlist(_client: &reqwest::Client, app_config: &Arc<AppConfig>, input: &ConfigInput) -> (Vec<PlaylistGroup>, Vec<TuliproxError>) {
let config = &*app_config.config.load();
@@ -230,6 +232,21 @@ pub fn metadata_cache_entry_to_xtream_series_info(
let release_date = series.year.map(|y| format!("{y}-01-01"));
let youtube_trailer = series.videos.as_ref().and_then(|v| v.iter().find(|video| video.site.eq_ignore_ascii_case("youtube")).map(|video| video.key.clone())).unwrap_or_default();
let mut season_data = HashMap::new();
series.seasons.as_ref().iter().for_each(|seasons| seasons.iter().for_each(|season_metadata| {
season_data.insert(season_metadata.season_number,SeriesStreamDetailSeasonProperties {
name: season_metadata.name.clone(),
season_number: season_metadata.season_number,
episode_count: 0,
overview: season_metadata.overview.clone(),
air_date: season_metadata.air_date.clone(),
cover: season_metadata.poster_path.clone(),
cover_tmdb: season_metadata.poster_path.clone(),
cover_big: None,
duration: Some(String::from("0")),
});
}));
let episodes = series.episodes.as_ref().map(|episodes| {
episodes.iter().filter(|episode| !episode.file_path.is_empty()).map(|episode| {
let container_extension = Path::new(&episode.file_path)
@@ -240,6 +257,20 @@ pub fn metadata_cache_entry_to_xtream_series_info(
let episode_release_date = episode.aired.as_ref().map(ToString::to_string).unwrap_or_default();
let tmdb_id = (episode.tmdb_id > 0).then_some(episode.tmdb_id);
let _ =season_data.entry(episode.season).or_insert_with(|| {
SeriesStreamDetailSeasonProperties {
name: concat_string!(&series.title, " ", &episode.season.to_string()),
season_number: episode.season,
episode_count: 0,
overview: series.poster.clone(),
air_date: episode.aired.clone(),
cover: series.poster.clone(),
cover_tmdb: None,
cover_big: None,
duration: None,
}
}).episode_count.saturating_add(1);
SeriesStreamDetailEpisodeProperties {
id: tmdb_id.unwrap_or_default(),
episode_num: episode.episode,
@@ -252,6 +283,7 @@ pub fn metadata_cache_entry_to_xtream_series_info(
tmdb: tmdb_id,
release_date: episode_release_date.clone(),
plot: episode.plot.clone(),
crew: series.actors.as_ref().map(|a| a.iter().map(|a| a.name.clone()).collect::<Vec<_>>().join(", ")),
duration_secs: episode.runtime.map_or(0, |r| r * 60),
duration: episode.runtime
.map(|r| format!("{:02}:{:02}:00", r / 60, r % 60))
@@ -265,6 +297,10 @@ pub fn metadata_cache_entry_to_xtream_series_info(
}).collect::<Vec<_>>()
});
let mut seasons = season_data.into_values().collect::<Vec<_>>();
seasons.sort_by_key(|s| s.season_number);
let properties = SeriesStreamProperties {
name: series.title.clone(),
category_id: 0,
@@ -293,7 +329,7 @@ pub fn metadata_cache_entry_to_xtream_series_info(
tmdb: series.tmdb_id,
details: Some(SeriesStreamDetailProperties {
year: series.year,
// seasons are not delivered through xtream get_series_info.
seasons: Some(seasons),
episodes,
}),
};