From eee720d6b503e695b37a9c1de1647adc3c7b7696 Mon Sep 17 00:00:00 2001 From: moritsbw-cpu Date: Fri, 20 Nov 2026 22:59:08 +0000 Subject: [PATCH] listcast: P4 simulcast plays counted once per minute Co-Authored-By: Claude Opus 5.5 --- src/listcast.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/listcast.rs b/src/listcast.rs index a4a31de..a482c44 100644 --- a/src/listcast.rs +++ b/src/listcast.rs @@ -87,8 +87,8 @@ struct Data { nmf: HashMap, String)>>, /// (artist id, group) -> week -> plays (P4: the busiest region) weekly: HashMap<(String, &'static str), BTreeMap>, - /// (group, song key) -> play dates - song_plays: HashMap<(&'static str, String), Vec>, + /// (group, song key) -> plays (date, minute); a P4 play simulcast on several regions counts once + song_plays: HashMap<(&'static str, String), HashSet<(NaiveDate, String)>>, plays_from: Option, } @@ -138,14 +138,14 @@ fn load(db: &Db) -> Result { *e = e.max(p); } } - let mut song_plays: HashMap<(&'static str, String), Vec> = HashMap::new(); + let mut song_plays: HashMap<(&'static str, String), HashSet<(NaiveDate, String)>> = HashMap::new(); let mut plays_from: Option = None; - for r in c.prepare("SELECT station, artist, title, substr(played_at, 1, 10) FROM plays WHERE source = 'dr'")? + for r in c.prepare("SELECT station, artist, title, substr(played_at, 1, 16) FROM plays WHERE source = 'dr'")? .query_map([], |r| Ok((r.get::<_, String>(0)?, r.get::<_, String>(1)?, r.get::<_, String>(2)?, r.get::<_, String>(3)?)))? { - let (st, a, t, d) = r?; - let (Some(g), Ok(d)) = (group(&st), d.parse::()) else { continue }; + let (st, a, t, at) = r?; + let (Some(g), Ok(d)) = (group(&st), at[..10.min(at.len())].parse::()) else { continue }; plays_from = Some(plays_from.map_or(d, |f| f.min(d))); - song_plays.entry((g, song_key(&a, &t))).or_default().push(d); + song_plays.entry((g, song_key(&a, &t))).or_default().insert((d, at)); } Ok(Data { lists, listed, artists, releases, nmf, weekly, song_plays, plays_from }) } @@ -176,7 +176,7 @@ fn candidates(data: &Data, d: NaiveDate) -> Vec { let listed_before = data.listed.get(g).and_then(|m| m.get(akey)).is_some_and(|ds| ds.iter().any(|x| *x < d && (d - *x).num_days() <= 730)); let share = if all > 0.0 { year[gi] / all } else { 0.0 }; let level = tot(g, 56) / 8.0; - let plays7 = data.song_plays.get(&(*g, song.clone())).map(|v| v.iter().filter(|x| **x < d && (d - **x).num_days() <= 7).count()).unwrap_or(0) as i64; + let plays7 = data.song_plays.get(&(*g, song.clone())).map(|v| v.iter().filter(|x| x.0 < d && (d - x.0).num_days() <= 7).count()).unwrap_or(0) as i64; let wk = (d - *rdate).num_days() as f64 / 7.0; let mut x = [0.0; NF]; x[0] = 1.0; x[1] = wk / 10.0; x[2] = (wk <= 3.0) as i32 as f64; x[3] = (!placed.is_empty()) as i32 as f64;