github/television
1
1
Fork 0
mirror of https://github.com/alexpasmantier/television.git synced 2025-06-06 03:25:23 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

refactor(providers): improve cable provider files loading sequence (#254)

Browse Source
This commit is contained in:
Alex Pasmantier 2025-01-08 17:10:05 +01:00 committed by GitHub
parent ef26d326f4
commit b5e9846e1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
crates/television/cable.rs
View File

@ -1,8 +1,10 @@
use std::path::PathBuf;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use color_eyre::Result; use color_eyre::Result;
use television_channels::cable::{CableChannelPrototype, CableChannels}; use television_channels::cable::{CableChannelPrototype, CableChannels};
use tracing::debug; use tracing::{debug, error};
use crate::config::get_config_dir; use crate::config::get_config_dir;
@ -45,30 +47,43 @@ pub fn load_cable_channels() -> Result<CableChannels> {
let files = std::fs::read_dir(&config_dir)?; let files = std::fs::read_dir(&config_dir)?;
// filter the files that match the pattern // filter the files that match the pattern
let file_paths = files let mut file_paths: Vec<PathBuf> = files
.filter_map(|f| f.ok().map(|f| f.path())) .filter_map(|f| f.ok().map(|f| f.path()))
.filter(|p| is_cable_file_format(p) && p.is_file()); .filter(|p| is_cable_file_format(p) && p.is_file())
.collect();
let user_defined_prototypes = file_paths.fold(Vec::new(), |mut acc, p| { debug!("Found cable channel files: {:?}", file_paths);
let r: ChannelPrototypes = toml::from_str(
&std::fs::read_to_string(p)
.expect("Unable to read configuration file"),
)
.unwrap_or_default();
acc.extend(r.prototypes);
acc
});
// If no user defined prototypes are found, write the default prototypes for the current // If no cable provider files are found, write the default provider for the current
// platform to the config directory // platform to the config directory
if user_defined_prototypes.is_empty() { if file_paths.is_empty() {
debug!("No user defined cable channels found"); debug!("No user defined cable channels found");
// write the default cable channels to the config directory // write the default cable channels to the config directory
let default_channels_path = let default_channels_path =
config_dir.join(DEFAULT_CABLE_CHANNELS_FILE_NAME); config_dir.join(DEFAULT_CABLE_CHANNELS_FILE_NAME);
std::fs::write(default_channels_path, DEFAULT_CABLE_CHANNELS)?; std::fs::write(&default_channels_path, DEFAULT_CABLE_CHANNELS)?;
file_paths.push(default_channels_path);
} }
let user_defined_prototypes = file_paths.iter().fold(
Vec::<CableChannelPrototype>::new(),
|mut acc, p| {
match toml::from_str::<ChannelPrototypes>(
&std::fs::read_to_string(p)
.expect("Unable to read configuration file"),
) {
Ok(prototypes) => acc.extend(prototypes.prototypes),
Err(e) => {
error!(
"Failed to parse cable channel file {:?}: {}",
p, e
);
}
}
acc
},
);
debug!("Loaded cable channels: {:?}", user_defined_prototypes); debug!("Loaded cable channels: {:?}", user_defined_prototypes);
let mut cable_channels = FxHashMap::default(); let mut cable_channels = FxHashMap::default();