Merge pull request #130 from pybt/features/remote-source

accept remote source start with http or https
This commit is contained in:
jb-alvarado 2022-05-30 19:42:08 +02:00 committed by GitHub
commit dd575cb159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 10 deletions

View File

@ -12,7 +12,7 @@ use simplelog::*;
use crate::utils::{ use crate::utils::{
check_sync, gen_dummy, get_delta, get_sec, is_close, json_serializer::read_json, modified_time, check_sync, gen_dummy, get_delta, get_sec, is_close, json_serializer::read_json, modified_time,
seek_and_length, GlobalConfig, Media, PlayoutStatus, DUMMY_LEN, seek_and_length, validate_source, GlobalConfig, Media, PlayoutStatus, DUMMY_LEN,
}; };
/// Struct for current playlist. /// Struct for current playlist.
@ -430,7 +430,7 @@ fn timed_source(
/// Generate the source CMD, or when clip not exist, get a dummy. /// Generate the source CMD, or when clip not exist, get a dummy.
fn gen_source(config: &GlobalConfig, mut node: Media) -> Media { fn gen_source(config: &GlobalConfig, mut node: Media) -> Media {
if Path::new(&node.source).is_file() { if validate_source(&node.source) {
node.add_probe(); node.add_probe();
node.cmd = Some(seek_and_length( node.cmd = Some(seek_and_length(
node.source.clone(), node.source.clone(),

View File

@ -1,14 +1,11 @@
use std::{ use std::sync::{
path::Path, atomic::{AtomicBool, Ordering},
sync::{ Arc,
atomic::{AtomicBool, Ordering},
Arc,
},
}; };
use simplelog::*; use simplelog::*;
use crate::utils::{sec_to_time, GlobalConfig, MediaProbe, Playlist}; use crate::utils::{sec_to_time, validate_source, GlobalConfig, MediaProbe, Playlist};
/// Validate a given playlist, to check if: /// Validate a given playlist, to check if:
/// ///
@ -31,7 +28,7 @@ pub fn validate_playlist(playlist: Playlist, is_terminated: Arc<AtomicBool>, con
return; return;
} }
if Path::new(&item.source).is_file() { if validate_source(&item.source) {
let probe = MediaProbe::new(item.source.clone()); let probe = MediaProbe::new(item.source.clone());
if probe.format.is_none() { if probe.format.is_none() {

View File

@ -489,6 +489,23 @@ pub fn validate_ffmpeg(config: &GlobalConfig) {
} }
} }
pub fn validate_source(source: &String) -> bool {
let re: Regex = Regex::new(r"^https?://.*").unwrap();
if re.is_match(source) {
let probe = MediaProbe::new(source.clone());
match probe.video_streams {
Some(_video_streams) => true,
None => {
error!("Remote file not exist: {source}");
false
}
}
} else {
return Path::new(&source).is_file();
}
}
/// Get system time, in non test case. /// Get system time, in non test case.
#[cfg(not(test))] #[cfg(not(test))]
pub fn time_now() -> DateTime<Local> { pub fn time_now() -> DateTime<Local> {