Merge branch 'bugfix/multi_xtream_input' into feature/multi_xtream_input

# Conflicts:
#	src/api/v1_api.rs
#	src/api/xtream_api.rs
#	src/processing/playlist_processor.rs
#	src/utils/mod.rs
This commit is contained in:
euzu
2024-03-28 16:27:39 +01:00
parent 5a0da1320b
commit 63c3e24006
7 changed files with 92 additions and 86 deletions
+1 -1
View File
@@ -143,7 +143,7 @@ pub(crate) fn parse_xtream(input: &ConfigInput,
Ok(Some(group_map.values().map(|category| {
let cat = category.borrow();
PlaylistGroup {
id: 0,
id: cat.category_id.parse::<u32>().unwrap_or(0),
xtream_cluster: xtream_cluster.clone(),
title: Rc::clone(&cat.category_name),
channels: cat.channels.clone()