Creepso/fluxa-core
1
0
Fork 0
mirror of https://github.com/FluxaMedia/fluxa-core.git synced 2026-07-26 20:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Handle wrapped SIMKL library responses

Browse source
This commit is contained in:
KhooLy 2026-07-26 02:53:55 +03:00
parent 36c10734ae
commit 0179c0871d
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/external_sync.rs
View file

@ -1561,7 +1561,7 @@ mod tests {
#[test]
fn simkl_watching_items_are_kept_for_continue_watching() {
let items = simkl_watching_to_items_json(
r#"[{"show":{"title":"Example","ids":{"imdb":"tt42"}},"last_watched":"2026-07-21T00:00:00.000Z"}]"#,
r#"{"shows":[{"show":{"title":"Example","ids":{"imdb":"tt42"}},"last_watched":"2026-07-21T00:00:00.000Z"}]}"#,
"[]",
)
.expect("items");

24
src/external_sync/provider_mappers.rs
View file

@ -2,9 +2,21 @@ use super::{ranked_winner, saved_at_ms, trakt_id_from_source, trakt_ids_from_con
use crate::content_identity::parse_video_id_json;
use serde_json::{json, Value};
fn simkl_entries(json: &str, key: &str) -> Vec<Value> {
match serde_json::from_str::<Value>(json).ok() {
Some(Value::Array(entries)) => entries,
Some(Value::Object(response)) => response
.get(key)
.and_then(Value::as_array)
.cloned()
.unwrap_or_default(),
_ => Vec::new(),
}
}
pub(crate) fn simkl_watching_to_items_json(shows_json: &str, movies_json: &str) -> Option<String> {
let shows: Vec<Value> = serde_json::from_str(shows_json).unwrap_or_default();
let movies: Vec<Value> = serde_json::from_str(movies_json).unwrap_or_default();
let shows = simkl_entries(shows_json, "shows");
let movies = simkl_entries(movies_json, "movies");
let mut items: Vec<Value> = Vec::new();
for entry in &shows {
let Some(show) = entry.get("show") else {
@ -137,8 +149,8 @@ pub(crate) fn trakt_watched_shows_to_items_json(shows_json: &str) -> Option<Stri
}
pub(crate) fn simkl_watchlist_to_items_json(shows_json: &str, movies_json: &str) -> Option<String> {
let shows: Vec<Value> = serde_json::from_str(shows_json).unwrap_or_default();
let movies: Vec<Value> = serde_json::from_str(movies_json).unwrap_or_default();
let shows = simkl_entries(shows_json, "shows");
let movies = simkl_entries(movies_json, "movies");
let mut items: Vec<Value> = Vec::new();
for entry in &shows {
let Some(show) = entry.get("show") else {
@ -172,8 +184,8 @@ pub(crate) fn simkl_watchlist_to_items_json(shows_json: &str, movies_json: &str)
}
pub(crate) fn simkl_watched_to_ids_json(shows_json: &str, movies_json: &str) -> Option<String> {
let shows: Vec<Value> = serde_json::from_str(shows_json).unwrap_or_default();
let movies: Vec<Value> = serde_json::from_str(movies_json).unwrap_or_default();
let shows = simkl_entries(shows_json, "shows");
let movies = simkl_entries(movies_json, "movies");
let mut ids: serde_json::Map<String, Value> = serde_json::Map::new();
for entry in &shows {
if let Some(id) = entry.get("show").and_then(trakt_id_from_source) {