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

fix(search-plan): JSON-encode transport-url/genre FFI returns

Browse source 
resolve_transport_url_json and resolve_feed_option_genre_json feed
opt_json() at the FFI boundary, which requires valid JSON — a bare
URL/genre string isn't, so resolveTransportUrl/resolveFeedOptionGenre
would fail from the frontend whenever they had a result. Finishes an
in-progress fix that JSON-encoded the transport-url return but missed
the early-return genre branch, and updates home_ranking.rs's direct
(non-FFI) callers to unwrap the now JSON-encoded string before
embedding it in a json!() literal, since json!() already does its own
string encoding.
This commit is contained in:
KhooLy 2026-07-07 13:58:18 +03:00
parent ca749a8d00
commit f00a09a4ce
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/home_ranking.rs
View file

@ -898,7 +898,9 @@ fn resolve_folder_catalog_sources(folder: &Map<String, Value>, addons_json: &str
if s.get("catalogId").and_then(Value::as_str).is_none() { if s.get("catalogId").and_then(Value::as_str).is_none() {
continue; continue;
} }
if let Some(t_url) = resolve_transport_url_json(&s.to_string(), addons_json) { if let Some(t_url) = resolve_transport_url_json(&s.to_string(), addons_json)
.and_then(|json| serde_json::from_str::<String>(&json).ok())
{
let catalog_id = s.get("catalogId").and_then(Value::as_str).unwrap_or(""); let catalog_id = s.get("catalogId").and_then(Value::as_str).unwrap_or("");
let content_type = s.get("type").and_then(Value::as_str).unwrap_or("movie"); let content_type = s.get("type").and_then(Value::as_str).unwrap_or("movie");
let mut entry = let mut entry =
@ -914,7 +916,9 @@ fn resolve_folder_catalog_sources(folder: &Map<String, Value>, addons_json: &str
if resolved.is_empty() { if resolved.is_empty() {
if let Some(catalog_id) = folder.get("catalogId").and_then(Value::as_str) { if let Some(catalog_id) = folder.get("catalogId").and_then(Value::as_str) {
let src = json!({ "catalogId": catalog_id, "type": "movie" }); let src = json!({ "catalogId": catalog_id, "type": "movie" });
if let Some(t_url) = resolve_transport_url_json(&src.to_string(), addons_json) { if let Some(t_url) = resolve_transport_url_json(&src.to_string(), addons_json)
.and_then(|json| serde_json::from_str::<String>(&json).ok())
{
let mut entry = let mut entry =
json!({ "transportUrl": t_url, "catalogId": catalog_id, "type": "movie" }); json!({ "transportUrl": t_url, "catalogId": catalog_id, "type": "movie" });
if let Some(g) = folder.get("genre").and_then(Value::as_str) { if let Some(g) = folder.get("genre").and_then(Value::as_str) {

6
src/search_plan.rs
View file

@ -660,7 +660,7 @@ pub(crate) fn resolve_transport_url_json(source_json: &str, addons_json: &str) -
}) })
}); });
if matches { if matches {
return Some(t_url.to_string()); return serde_json::to_string(t_url).ok();
} }
} }
None None
@ -682,7 +682,7 @@ pub(crate) fn resolve_feed_option_genre_json(
.and_then(Value::as_str) .and_then(Value::as_str)
.filter(|s| !s.trim().is_empty()) .filter(|s| !s.trim().is_empty())
{ {
return Some(genre.to_string()); return serde_json::to_string(genre).ok();
} }
let transport_url = option.get("transportUrl").and_then(Value::as_str)?; let transport_url = option.get("transportUrl").and_then(Value::as_str)?;
@ -721,7 +721,7 @@ pub(crate) fn resolve_feed_option_genre_json(
.and_then(Value::as_str); .and_then(Value::as_str);
let resolved = default_genre.or(if is_required { first_option } else { None })?; let resolved = default_genre.or(if is_required { first_option } else { None })?;
Some(resolved.to_string()) serde_json::to_string(resolved).ok()
} }
#[cfg(test)] #[cfg(test)]