Merge pull request #661 from jb-alvarado/master

 correct save absolut path, improve infinit mode, fix #643

Cargo.toml

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

assets/ffplayout.toml

@@ -118,7 +118,7 @@ help_text = """'filler' is for playing instead of a missing file or fill the end
     to pick files randomly."""
 path = "/var/lib/ffplayout/tv-media"
 filler = "/var/lib/ffplayout/tv-media/filler/filler.mp4"
-extensions = ["mp4", "mkv"]
+extensions = ["mp4", "mkv", "webm"]
 shuffle = true
 
 [text]
@@ -131,7 +131,7 @@ add_text = true
 text_from_filename = false
 fontfile = "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
 style = "x=(w-tw)/2:y=(h-line_h)*0.9:fontsize=24:fontcolor=#ffffff:box=1:boxcolor=#000000:boxborderw=4"
-regex = "^.+[/\\](.*)(.mp4|.mkv)$"
+regex = "^.+[/\\](.*)(.mp4|.mkv|.webm)$"
 
 [task]
 help_text = """Run an external program with a given media object. The media object is in json format \

ffplayout-api/src/utils/playlist.rs

@@ -35,13 +35,22 @@ pub async fn write_playlist(
 ) -> Result<String, ServiceError> {
     let (config, _) = playout_config(conn, &id).await?;
     let date = json_data.date.clone();
-    let mut playlist_path = PathBuf::from(&config.playlist.path);
+    let mut playlist_path = config.playlist.path;
     let d: Vec<&str> = date.split('-').collect();
-    playlist_path = playlist_path
-        .join(d[0])
-        .join(d[1])
-        .join(date.clone())
-        .with_extension("json");
+
+    if !playlist_path
+        .extension()
+        .and_then(|ext| ext.to_str())
+        .map(|ext| ext.eq_ignore_ascii_case("json"))
+        .unwrap_or(false)
+    {
+        playlist_path = playlist_path
+            .join(d[0])
+            .join(d[1])
+            .join(date.clone())
+            .with_extension("json");
+    }
+
     let mut file_exists = false;
 
     if let Some(p) = playlist_path.parent() {