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

set paths absolut, fix 740

Browse Source
This commit is contained in:
jb-alvarado 2024-09-08 20:07:19 +02:00
parent efb723aaff
commit e5be9835cc
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ffplayout/src/utils/config.rs
View File

@ -407,14 +407,14 @@ impl Playlist {
#[derive(Debug, Default, Clone, Deserialize, Serialize)] #[derive(Debug, Default, Clone, Deserialize, Serialize)]
pub struct Storage { pub struct Storage {
pub help_text: String, pub help_text: String,
#[serde(skip_deserializing)] #[serde(skip_serializing, skip_deserializing)]
pub path: PathBuf, pub path: PathBuf,
#[serde(skip_serializing, skip_deserializing)] #[serde(skip_serializing, skip_deserializing)]
pub paths: Vec<PathBuf>, pub paths: Vec<PathBuf>,
pub filler: PathBuf, pub filler: PathBuf,
pub extensions: Vec<String>, pub extensions: Vec<String>,
pub shuffle: bool, pub shuffle: bool,
#[serde(skip_deserializing)] #[serde(skip_serializing, skip_deserializing)]
pub shared_storage: bool, pub shared_storage: bool,
} }
@ -603,10 +603,14 @@ impl PlayoutConfig {
playlist.length_sec = Some(86400.0); playlist.length_sec = Some(86400.0);
} }
if processing.add_logo && !Path::new(&processing.logo).is_file() { let (logo_path, _, _) = norm_abs_path(&channel.storage_path, &processing.logo)?;
if processing.add_logo && !logo_path.is_file() {
processing.add_logo = false; processing.add_logo = false;
} }
processing.logo = logo_path.to_string_lossy().to_string();
if processing.audio_tracks < 1 { if processing.audio_tracks < 1 {
processing.audio_tracks = 1 processing.audio_tracks = 1
} }
@ -711,6 +715,9 @@ impl PlayoutConfig {
text.node_pos = None; text.node_pos = None;
} }
let (text_path, _, _) = norm_abs_path(&channel.storage_path, &text.fontfile)?;
text.fontfile = text_path.to_string_lossy().to_string();
Ok(Self { Ok(Self {
channel, channel,
advanced, advanced,
@ -859,6 +866,12 @@ pub async fn get_config(
} }
} }
if args.shared_storage {
// config.channel.shared_storage could be true already,
// so should not be overridden with false when args.shared_storage is not set
config.channel.shared_storage = args.shared_storage
}
if let Some(volume) = args.volume { if let Some(volume) = args.volume {
config.processing.volume = volume; config.processing.volume = volume;
} }