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

update frontend, make title optional

Browse Source
This commit is contained in:
jb-alvarado 2024-05-02 07:52:31 +02:00
parent 441af894c2
commit fbe810bb0b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ffplayout-engine/src/utils/mod.rs
View File

@ -251,14 +251,21 @@ pub fn prepare_output_cmd(
/// map media struct to json object /// map media struct to json object
pub fn get_media_map(media: Media) -> Value { pub fn get_media_map(media: Media) -> Value {
json!({ let mut obj = json!({
"title": media.title,
"in": media.seek, "in": media.seek,
"out": media.out, "out": media.out,
"duration": media.duration, "duration": media.duration,
"category": media.category, "category": media.category,
"source": media.source, "source": media.source,
}) });
if let Some(title) = media.title {
obj.as_object_mut()
.unwrap()
.insert("title".to_string(), Value::String(title));
}
obj
} }
/// prepare json object for response /// prepare json object for response

2
ffplayout-frontend

@ -1 +1 @@
Subproject commit 6111c2686d14b3bf33a4c0b29c85672f7e4f4399 Subproject commit 05d0ada8e155a9bf858a26fcda219fb39782cf05

2
lib/src/utils/mod.rs
View File

@ -65,7 +65,7 @@ pub struct Media {
#[serde(skip_serializing, skip_deserializing)] #[serde(skip_serializing, skip_deserializing)]
pub index: Option<usize>, pub index: Option<usize>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(default, skip_serializing_if = "Option::is_none")]
pub title: Option<String>, pub title: Option<String>,
#[serde(rename = "in")] #[serde(rename = "in")]
pub seek: f64, pub seek: f64,