djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catch remote playlist error and get empty playlist

Browse Source
This commit is contained in:
jb-alvarado 2024-04-21 21:23:06 +02:00
parent d077f5aa09
commit 586a5a91e6
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -1217,7 +1217,7 @@ checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
[[package]] [[package]]
name = "ffplayout" name = "ffplayout"
version = "0.21.2" version = "0.21.3"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
@ -1239,7 +1239,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-api" name = "ffplayout-api"
version = "0.21.2" version = "0.21.3"
dependencies = [ dependencies = [
"actix-files", "actix-files",
"actix-multipart", "actix-multipart",
@ -1278,7 +1278,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-lib" name = "ffplayout-lib"
version = "0.21.2" version = "0.21.3"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossbeam-channel", "crossbeam-channel",
@ -3458,7 +3458,7 @@ dependencies = [
[[package]] [[package]]
name = "tests" name = "tests"
version = "0.21.2" version = "0.21.3"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossbeam-channel", "crossbeam-channel",

2
Cargo.toml
View File

@ -4,7 +4,7 @@ default-members = ["ffplayout-api", "ffplayout-engine", "tests"]
resolver = "2" resolver = "2"
[workspace.package] [workspace.package]
version = "0.21.2" version = "0.21.3"
license = "GPL-3.0" license = "GPL-3.0"
repository = "https://github.com/ffplayout/ffplayout" repository = "https://github.com/ffplayout/ffplayout"
authors = ["Jonathan Baecker <jonbae77@gmail.com>"] authors = ["Jonathan Baecker <jonbae77@gmail.com>"]

10
lib/src/utils/json_serializer.rs
View File

@ -126,8 +126,14 @@ pub fn read_json(
let headers = resp.headers().clone(); let headers = resp.headers().clone();
if let Ok(body) = resp.text() { if let Ok(body) = resp.text() {
let mut playlist: JsonPlaylist = let mut playlist: JsonPlaylist = match serde_json::from_str(&body) {
serde_json::from_str(&body).expect("Could't read remote json playlist."); Ok(p) => p,
Err(e) => {
error!("Could't read remote json playlist. {e:?}");
JsonPlaylist::new(date.clone(), start_sec)
}
};
playlist.path = Some(current_file); playlist.path = Some(current_file);
playlist.start_sec = Some(start_sec); playlist.start_sec = Some(start_sec);