diff options
| -rw-r--r-- | common/src/api.rs | 14 | ||||
| -rw-r--r-- | import/src/lib.rs | 5 |
2 files changed, 10 insertions, 9 deletions
diff --git a/common/src/api.rs b/common/src/api.rs index d0b1db7..111ae57 100644 --- a/common/src/api.rs +++ b/common/src/api.rs @@ -8,10 +8,12 @@ use crate::{user::NodeUserData, Node}; use serde::{Deserialize, Serialize}; use std::sync::Arc; +type NodesWithUdata = Vec<(Arc<Node>, NodeUserData)>; + #[derive(Serialize, Deserialize)] pub struct ApiNodeResponse { - pub parents: Vec<(Arc<Node>, NodeUserData)>, - pub children: Vec<(Arc<Node>, NodeUserData)>, + pub parents: NodesWithUdata, + pub children: NodesWithUdata, pub node: Arc<Node>, pub userdata: NodeUserData, } @@ -19,18 +21,18 @@ pub struct ApiNodeResponse { #[derive(Serialize, Deserialize)] pub struct ApiSearchResponse { pub count: usize, - pub results: Vec<(Arc<Node>, NodeUserData)>, + pub results: NodesWithUdata, } #[derive(Serialize, Deserialize)] pub struct ApiItemsResponse { pub count: usize, pub pages: usize, - pub items: Vec<(Arc<Node>, NodeUserData)>, + pub items: NodesWithUdata, } #[derive(Serialize, Deserialize)] pub struct ApiHomeResponse { - pub toplevel: Vec<(Arc<Node>, NodeUserData)>, - pub categories: Vec<(String, Vec<(Arc<Node>, NodeUserData)>)>, + pub toplevel: NodesWithUdata, + pub categories: Vec<(String, NodesWithUdata)>, } diff --git a/import/src/lib.rs b/import/src/lib.rs index 8cc9ddd..f97e70f 100644 --- a/import/src/lib.rs +++ b/import/src/lib.rs @@ -496,9 +496,8 @@ fn import_media_file( let tmdb_details = rthandle.block_on(tmdb.episode_details(tmdb_id, season, episode))?; if let Some(still) = &tmdb_details.still_path { - poster = Some( - AssetInner::Cache(rthandle.block_on(tmdb.image(still))?).ser(), - ) + poster = + Some(AssetInner::Cache(rthandle.block_on(tmdb.image(still))?).ser()) } } } |