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

check for playlist update, add media probe node

Browse Source
This commit is contained in:
jb-alvarado 2022-02-18 16:47:11 +01:00
parent 0b82779292
commit 0bcbadbdd0
1 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/utils/playlist.rs
View File

@ -1,9 +1,12 @@
use crate::utils::{ use crate::utils::{
get_config, get_config,
json_reader::{read_json, Program}, json_reader::{read_json, Program},
modified_time, MediaProbe,
}; };
pub struct CurrentProgram { pub struct CurrentProgram {
json_mod: String,
json_path: String,
nodes: Vec<Program>, nodes: Vec<Program>,
idx: usize, idx: usize,
} }
@ -12,12 +15,31 @@ impl CurrentProgram {
fn new() -> Self { fn new() -> Self {
let config = get_config(); let config = get_config();
let json = read_json(&config, true); let json = read_json(&config, true);
let program: Vec<Program> = json.program;
Self { Self {
nodes: program, json_mod: json.modified.unwrap(),
json_path: json.current_file.unwrap(),
nodes: json.program.into(),
idx: json.start_index.unwrap(), idx: json.start_index.unwrap(),
} }
} }
fn check_update(&mut self) {
let config = get_config();
let mod_time = modified_time(self.json_path.clone());
if !mod_time.unwrap().to_string().eq(&self.json_mod) {
// when playlist has changed, reload it
let json = read_json(&config, true);
self.json_mod = json.modified.unwrap();
self.nodes = json.program.into();
}
}
fn append_probe(&mut self, node: &mut Program) {
node.probe = Some(MediaProbe::new(node.source.clone()))
}
} }
impl Iterator for CurrentProgram { impl Iterator for CurrentProgram {
@ -25,18 +47,24 @@ impl Iterator for CurrentProgram {
fn next(&mut self) -> Option<Self::Item> { fn next(&mut self) -> Option<Self::Item> {
if self.idx < self.nodes.len() { if self.idx < self.nodes.len() {
let current = self.nodes[self.idx].clone(); self.check_update();
let mut current = self.nodes[self.idx].clone();
self.idx += 1; self.idx += 1;
self.append_probe(&mut current);
Some(current) Some(current)
} else { } else {
// play first item from next playlist
let config = get_config(); let config = get_config();
let program: Vec<Program> = read_json(&config, false).program; let json = read_json(&config, false);
self.nodes = program; self.json_mod = json.modified.unwrap();
self.json_path = json.current_file.unwrap();
self.nodes = json.program.into();
self.idx = 1; self.idx = 1;
let current = self.nodes[0].clone(); let mut current = self.nodes[0].clone();
self.append_probe(&mut current);
Some(current) Some(current)
} }