From b96e765f0b1106ba412ce66c657fd6bdc8569835 Mon Sep 17 00:00:00 2001
From: jb-alvarado <jb@pixelcrusher.de>
Date: Sun, 8 Oct 2023 20:47:24 +0200
Subject: [PATCH] backport: rename filler_clip -> filler

---
 ffplayout-engine/src/input/playlist.rs | 8 ++++----
 lib/src/utils/config.rs                | 3 ++-
 lib/src/utils/generator.rs             | 2 +-
 tests/src/engine_playlist.rs           | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ffplayout-engine/src/input/playlist.rs b/ffplayout-engine/src/input/playlist.rs
index e296acc1..f8b82dca 100644
--- a/ffplayout-engine/src/input/playlist.rs
+++ b/ffplayout-engine/src/input/playlist.rs
@@ -509,17 +509,17 @@ pub fn gen_source(
 
         warn!("Generate filler with <yellow>{duration:.2}</> seconds length!");
 
-        let probe = MediaProbe::new(&config.storage.filler_clip);
+        let probe = MediaProbe::new(&config.storage.filler);
 
         if config
             .storage
-            .filler_clip
+            .filler
             .rsplit_once('.')
             .map(|(_, e)| e.to_lowercase())
             .filter(|c| IMAGE_FORMAT.contains(&c.as_str()))
             .is_some()
         {
-            node.source = config.storage.filler_clip.clone();
+            node.source = config.storage.filler.clone();
             node.cmd = Some(loop_image(&node));
             node.probe = Some(probe);
         } else if let Some(length) = probe
@@ -529,7 +529,7 @@ pub fn gen_source(
             .and_then(|d| d.parse::<f64>().ok())
         {
             // create placeholder from config filler.
-            node.source = config.storage.filler_clip.clone();
+            node.source = config.storage.filler.clone();
             node.duration = length;
             node.out = duration;
             node.cmd = Some(loop_filler(&node));
diff --git a/lib/src/utils/config.rs b/lib/src/utils/config.rs
index a2d1bbcb..9adeb841 100644
--- a/lib/src/utils/config.rs
+++ b/lib/src/utils/config.rs
@@ -267,7 +267,8 @@ pub struct Storage {
     pub path: String,
     #[serde(skip_serializing, skip_deserializing)]
     pub paths: Vec<String>,
-    pub filler_clip: String,
+    #[serde(alias = "filler_clip")]
+    pub filler: String,
     pub extensions: Vec<String>,
     pub shuffle: bool,
 }
diff --git a/lib/src/utils/generator.rs b/lib/src/utils/generator.rs
index 1053dca4..c58421d2 100644
--- a/lib/src/utils/generator.rs
+++ b/lib/src/utils/generator.rs
@@ -90,7 +90,7 @@ pub fn generate_playlist(
             playlist_file.display()
         );
 
-        let mut filler = Media::new(0, &config.storage.filler_clip, true);
+        let mut filler = Media::new(0, &config.storage.filler, true);
         let filler_length = filler.duration;
         let mut length = 0.0;
         let mut round = 0;
diff --git a/tests/src/engine_playlist.rs b/tests/src/engine_playlist.rs
index 259e651a..19f1a3a7 100644
--- a/tests/src/engine_playlist.rs
+++ b/tests/src/engine_playlist.rs
@@ -31,7 +31,7 @@ fn playlist_change_at_midnight() {
     config.playlist.length = "24:00:00".into();
     config.playlist.length_sec = Some(86400.0);
     config.playlist.path = "assets/playlists".into();
-    config.storage.filler_clip = "assets/with_audio.mp4".into();
+    config.storage.filler = "assets/with_audio.mp4".into();
     config.logging.log_to_file = false;
     config.logging.timestamp = false;
     config.out.mode = Null;
@@ -72,7 +72,7 @@ fn playlist_change_at_six() {
     config.playlist.length = "24:00:00".into();
     config.playlist.length_sec = Some(86400.0);
     config.playlist.path = "assets/playlists".into();
-    config.storage.filler_clip = "assets/with_audio.mp4".into();
+    config.storage.filler = "assets/with_audio.mp4".into();
     config.logging.log_to_file = false;
     config.logging.timestamp = false;
     config.out.mode = Null;