euzu/tuliprox
1
0
Fork 0
mirror of https://github.com/euzu/tuliprox.git synced 2026-10-24 08:42:23 +02:00
Code Issues Packages Projects Releases 5 Wiki Activity

Adjustments to epg smart match

Browse Source
This commit is contained in:
euzu
2025-08-18 20:21:58 +02:00
parent 4ce1ba351f
commit adf1c13523
2 changed files with 95 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/processing/processor/epg.rs
+33 -13
View File
@@ -67,8 +67,15 @@ impl EpgIdCache<'_> {
fn normalize_and_store(&mut self, name: &str, epg_id: Option<&String>) {
let normalized_name = self.normalize(name);
let phonetic = self.phonetic(&normalized_name);
self.normalized.insert(normalized_name.to_string(), epg_id.map(std::string::ToString::to_string));
self.normalized.insert(normalized_name.to_string(), None, /*epg_id.map(std::string::ToString::to_string) */);
self.phonetics.entry(phonetic.to_string()).or_default().insert(normalized_name);
if let Some(chan_epg_id) = epg_id {
let normalized_name = self.normalize(chan_epg_id);
let phonetic = self.phonetic(&normalized_name);
self.normalized.insert(normalized_name.to_string(), None, /*epg_id.map(std::string::ToString::to_string) */);
self.phonetics.entry(phonetic.to_string()).or_default().insert(normalized_name);
}
}
/// Returns the normalized form of a channel name using the configured smart match settings.
@@ -85,7 +92,12 @@ impl EpgIdCache<'_> {
}
pub(crate) fn phonetic(&self, name: &str) -> String {
self.metaphone.encode(name)
let result = self.metaphone.encode(name);
if result.is_empty() {
name.to_owned()
} else {
result
}
}
pub fn collect_epg_id(&mut self, fp: &mut FetchedPlaylist) {
@@ -138,7 +150,7 @@ impl EpgIdCache<'_> {
/// assign_channel_epg(&mut new_epg, &mut playlist, &mut id_cache);
/// ```
fn assign_channel_epg(new_epg: &mut Vec<Epg>, fp: &mut FetchedPlaylist, id_cache: &mut EpgIdCache) {
id_cache.normalized.retain(|_, v| v.is_some());
//id_cache.normalized.retain(|_, v| v.is_some());
if let Some(tv_guide) = &fp.epg {
let mut processed_epgs = vec![];
if let Some(epg_sources) = tv_guide.filter(id_cache) {
@@ -151,19 +163,27 @@ fn assign_channel_epg(new_epg: &mut Vec<Epg>, fp: &mut FetchedPlaylist, id_cache
.collect();
let assign_values = |chan: &mut PlaylistItem| {
if id_cache.smart_match_enabled && chan.header.epg_channel_id.is_none() {
// if the channel has no epg_id or the epg_id is not present in xmltv/tvguide then we need to match one from existing tvguide
let not_processed = match &chan.header.epg_channel_id {
if id_cache.smart_match_enabled {
// id_cache.processed contains the epg_ids from the xml epg file.
// if the channel has no epg_id or the epg_id is not present in xmltv/tvguide then we need to match one from existing tvguide
let not_found_in_epg = match &chan.header.epg_channel_id {
None => true,
Some(epg_id) => !id_cache.processed.contains(epg_id),
};
if not_processed {
let normalized = id_cache.normalize(&chan.header.name);
if let Some(epg_id) = id_cache.normalized.get(&normalized) {
if epg_id.is_some() {
trace!("Matched channel {} to epg {epg_id:?}", chan.header.name);
chan.header.epg_channel_id.clone_from(epg_id);
}
if not_found_in_epg {
let try_match = |key: &str| {
let normalized = id_cache.normalize(key);
id_cache.normalized.get(&normalized).and_then(|epg_id| {
epg_id.as_ref().map(|id| {
trace!("Matched channel {} to epg {id:?}", chan.header.name);
id.clone()
})
})
};
if let Some(new_id) = try_match(&chan.header.name)
.or_else(|| chan.header.epg_channel_id.as_deref().and_then(try_match))
{
chan.header.epg_channel_id = Some(new_id);
}
}
}