Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion psst-gui/src/data/playlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ where
total: Option<usize>,
}

Ok(PlaylistTracksRef::deserialize(deserializer)?.total)
Ok(Option::<PlaylistTracksRef>::deserialize(deserializer)?.and_then(|r| r.total))
}

fn deserialize_description<'de, D>(deserializer: D) -> Result<Arc<str>, D::Error>
Expand Down
11 changes: 11 additions & 0 deletions psst-gui/src/data/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ impl<T: Data> Cached<T> {

#[derive(Deserialize)]
pub struct Page<T: Clone> {
#[serde(deserialize_with = "deserialize_ignore_nulls")]
pub items: Vector<T>,
pub limit: usize,
pub offset: usize,
Expand Down Expand Up @@ -158,6 +159,16 @@ where
Ok(Option::deserialize(deserializer)?.map(|Wrapper(val)| val))
}

pub fn deserialize_ignore_nulls<'de, D, T>(deserializer: D) -> Result<Vector<T>, D::Error>
where
T: Clone,
T: Deserialize<'de>,
D: Deserializer<'de>,
{
let items: Vec<Option<T>> = Vec::deserialize(deserializer)?;
Ok(items.into_iter().flatten().collect())
}

pub fn deserialize_first_page<'de, D, T>(deserializer: D) -> Result<Vector<T>, D::Error>
where
T: Clone,
Expand Down