Fix canonical history ID migration

Author: neckaros

scripts/remap_trakt_watched.py

@@ -44,7 +44,8 @@ class EpisodeRow:
 
 
 def episode_history_id(series: SeriesRow, episode: EpisodeRow) -> str:
-    key = f"imdb/{series.imdb}" if series.imdb else f"redseat/{series.id}"
+    imdb = series.imdb.strip() if series.imdb else ""
+    key = f"imdb/{imdb}" if imdb else f"redseat/{series.id}"
     return f"episode:{key}/{episode.season}/{episode.number}"
 
 

src/model/history.rs

@@ -15,10 +15,12 @@ use super::{
 
 const HISTORY_MIGRATION: &str = "canonical_history_ids_v4";
 
+fn non_empty_id(id: Option<&str>) -> Option<&str> {
+    id.map(str::trim).filter(|id| !id.is_empty())
+}
+
 fn series_history_key(serie: &Serie) -> String {
-    serie
-        .imdb
-        .as_ref()
+    non_empty_id(serie.imdb.as_deref())
         .map(|imdb| format!("imdb/{imdb}"))
         .unwrap_or_else(|| format!("redseat/{}", serie.id))
 }
@@ -28,9 +30,7 @@ pub fn series_history_id(serie: &Serie) -> String {
 }
 
 pub fn movie_history_id(movie: &Movie) -> String {
-    movie
-        .imdb
-        .as_ref()
+    non_empty_id(movie.imdb.as_deref())
         .map(|imdb| format!("movie:imdb/{imdb}"))
         .unwrap_or_else(|| format!("movie:redseat/{}", movie.id))
 }
@@ -121,7 +121,7 @@ fn episode_legacy_ids(serie: &Serie, episode: &Episode) -> HashSet<String> {
         .collect();
 
     for key in [
-        serie.imdb.as_ref().map(|id| format!("imdb/{id}")),
+        non_empty_id(serie.imdb.as_deref()).map(|id| format!("imdb/{id}")),
         serie.tmdb.map(|id| format!("tmdb/{id}")),
         serie.tvdb.map(|id| format!("tvdb/{id}")),
         Some(format!("redseat/{}", serie.id)),
@@ -160,8 +160,22 @@ fn unique_candidates<T>(candidates: HashMap<String, HashSet<T>>) -> HashMap<Stri
 
 fn is_current_history_id(kind: &MediaType, id: &str) -> bool {
     match kind {
-        MediaType::Movie => id.starts_with("movie:imdb/") || id.starts_with("movie:redseat/"),
-        MediaType::Episode => id.starts_with("episode:imdb/"),
+        MediaType::Movie => ["movie:imdb/", "movie:redseat/"]
+            .into_iter()
+            .any(|prefix| non_empty_id(id.strip_prefix(prefix)).is_some()),
+        MediaType::Episode => {
+            let Some(path) = id.strip_prefix("episode:imdb/") else {
+                return false;
+            };
+            let mut parts = path.split('/');
+            matches!(
+                (parts.next(), parts.next(), parts.next(), parts.next()),
+                (Some(imdb), Some(season), Some(number), None)
+                    if non_empty_id(Some(imdb)).is_some()
+                        && season.parse::<u32>().is_ok()
+                        && number.parse::<u32>().is_ok()
+            )
+        }
         _ => true,
     }
 }
@@ -354,38 +368,25 @@ impl ModelController {
 
     pub async fn migrate_series_history_ids(
         &self,
-        library_id: &str,
         old_serie: &Serie,
         new_serie: &Serie,
     ) -> crate::Result<()> {
-        if series_history_id(old_serie) == series_history_id(new_serie) {
+        let old_prefix = format!("episode:{}/", series_history_key(old_serie));
+        let new_prefix = format!("episode:{}/", series_history_key(new_serie));
+        if old_prefix == new_prefix {
             return Ok(());
         }
 
-        let store = self.store.get_library_store(library_id)?;
-        let episode_targets: HashMap<String, String> = store
-            .get_episodes(EpisodeQuery {
-                serie_ref: Some(new_serie.id.clone()),
-                ..Default::default()
-            })
-            .await?
-            .into_iter()
-            .map(|episode| {
-                (
-                    episode_history_id(old_serie, &episode),
-                    episode_history_id(new_serie, &episode),
-                )
-            })
-            .collect();
         let watched_rewrites = self
             .store
             .get_all_watched()
             .await?
             .into_iter()
             .filter(|row| row.kind == MediaType::Episode)
             .filter_map(|row| {
+                let suffix = row.id.strip_prefix(&old_prefix)?;
                 Some(HistoryIdRewrite {
-                    new_id: episode_targets.get(&row.id)?.clone(),
+                    new_id: format!("{new_prefix}{suffix}"),
                     kind: row.kind,
                     old_id: row.id,
                     user_ref: row.user_ref?,
@@ -399,8 +400,9 @@ impl ModelController {
             .into_iter()
             .filter(|row| row.kind == MediaType::Episode)
             .filter_map(|row| {
+                let suffix = row.id.strip_prefix(&old_prefix)?;
                 Some(ProgressIdRewrite {
-                    new_id: episode_targets.get(&row.id)?.clone(),
+                    new_id: format!("{new_prefix}{suffix}"),
                     new_parent: Some(series_history_id(new_serie)),
                     kind: row.kind,
                     old_id: row.id,

src/model/series.rs

@@ -381,6 +381,12 @@ impl ModelController {
                     "get_serie".to_string(),
                 ))?
                 .item;
+            let mut updated_serie = old_serie.clone();
+            if let Some(imdb) = &update.imdb {
+                updated_serie.imdb = Some(imdb.clone());
+            }
+            self.migrate_series_history_ids(&old_serie, &updated_serie)
+                .await?;
             store.update_serie(&serie_id, update).await?;
             let serie = store
                 .get_serie(&serie_id)
@@ -391,8 +397,6 @@ impl ModelController {
                     "get_serie".to_string(),
                 ))?
                 .item;
-            self.migrate_series_history_ids(library_id, &old_serie, &serie)
-                .await?;
             self.send_serie(SeriesMessage {
                 library: library_id.to_string(),
                 series: vec![SerieWithAction {