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

Merge pull request #194 from jb-alvarado/master

Browse Source 
fix unwrap error on None output_cmd, #193
This commit is contained in:
jb-alvarado 2022-09-13 13:56:17 +02:00 committed by GitHub
commit a7ccf3dbf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.lock generated
View File

@ -941,7 +941,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout" name = "ffplayout"
version = "0.15.1" version = "0.15.2"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
@ -960,7 +960,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-api" name = "ffplayout-api"
version = "0.6.1" version = "0.6.2"
dependencies = [ dependencies = [
"actix-files", "actix-files",
"actix-multipart", "actix-multipart",
@ -990,7 +990,7 @@ dependencies = [
[[package]] [[package]]
name = "ffplayout-lib" name = "ffplayout-lib"
version = "0.15.1" version = "0.15.2"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossbeam-channel", "crossbeam-channel",

2
ffplayout-api/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Rest API for ffplayout"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Jonathan Baecker jonbae77@gmail.com"] authors = ["Jonathan Baecker jonbae77@gmail.com"]
readme = "README.md" readme = "README.md"
version = "0.6.1" version = "0.6.2"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
ffplayout-engine/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "24/7 playout based on rust and ffmpeg"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Jonathan Baecker jonbae77@gmail.com"] authors = ["Jonathan Baecker jonbae77@gmail.com"]
readme = "README.md" readme = "README.md"
version = "0.15.1" version = "0.15.2"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

2
ffplayout-frontend

@ -1 +1 @@
Subproject commit 3512dec8f117dce1bad4f82461de21e37e01d770 Subproject commit 51719eb9c03d26da8ffac6a677d1c41b756bdf83

2
lib/Cargo.toml
View File

@ -4,7 +4,7 @@ description = "Library for ffplayout"
license = "GPL-3.0" license = "GPL-3.0"
authors = ["Jonathan Baecker jonbae77@gmail.com"] authors = ["Jonathan Baecker jonbae77@gmail.com"]
readme = "README.md" readme = "README.md"
version = "0.15.1" version = "0.15.2"
edition = "2021" edition = "2021"
[dependencies] [dependencies]

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

@ -647,7 +647,7 @@ pub fn include_file(config: PlayoutConfig, file_path: &Path) -> bool {
.out .out
.output_cmd .output_cmd
.clone() .clone()
.unwrap() .unwrap_or_else(|| vec![String::new()])
.iter() .iter()
.find(|s| s.contains(".ts")) .find(|s| s.contains(".ts"))
{ {
@ -661,7 +661,7 @@ pub fn include_file(config: PlayoutConfig, file_path: &Path) -> bool {
if let Some(m3u8_path) = config if let Some(m3u8_path) = config
.out .out
.output_cmd .output_cmd
.unwrap() .unwrap_or_else(|| vec![String::new()])
.iter() .iter()
.find(|s| s.contains(".m3u8") && !s.contains("master.m3u8")) .find(|s| s.contains(".m3u8") && !s.contains("master.m3u8"))
{ {