From bca4cd4eb1465ad5420eb088ecd2b98650cb51c3 Mon Sep 17 00:00:00 2001
From: jude <jude@jellywx.com>
Date: Fri, 16 Aug 2024 21:27:49 +0100
Subject: [PATCH] Reduce error proneness

---
 .idea/workspace.xml            |  6 +++++-
 Cargo.lock                     |  2 +-
 Cargo.toml                     |  2 +-
 src/daemon/update_playlists.rs | 14 ++++++++++----
 src/listenbrainz.rs            | 14 ++------------
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7787aa0..383f4fb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,8 +14,10 @@
   <component name="ChangeListManager">
     <list default="true" id="52900e09-9584-4b6c-95ff-fbd4ed5d8b2c" name="Changes" comment="Add interface package. Start adding auth stuff for refreshing tokens.">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Cargo.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Cargo.toml" beforeDir="false" afterPath="$PROJECT_DIR$/Cargo.toml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/daemon/update_playlists.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/daemon/update_playlists.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/listenbrainz.rs" beforeDir="false" afterPath="$PROJECT_DIR$/src/listenbrainz.rs" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -165,7 +167,9 @@
       <workItem from="1716043707662" duration="542000" />
       <workItem from="1716046070333" duration="1484000" />
       <workItem from="1716640392358" duration="367000" />
-      <workItem from="1716642009543" duration="1073000" />
+      <workItem from="1716642009543" duration="1546000" />
+      <workItem from="1716650511971" duration="14000" />
+      <workItem from="1723834879628" duration="4009000" />
     </task>
     <task id="LOCAL-00001" summary="Structure">
       <created>1692008860369</created>
diff --git a/Cargo.lock b/Cargo.lock
index e69f1d2..7588c66 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1456,7 +1456,7 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "playlistd"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "chrono",
  "config",
diff --git a/Cargo.toml b/Cargo.toml
index 453e0ed..88a9351 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playlistd"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 authors = ["Jude Southworth (judesouthworth@pm.me)"]
 license = "AGPL-3.0 only"
diff --git a/src/daemon/update_playlists.rs b/src/daemon/update_playlists.rs
index bcd0ae5..d164090 100644
--- a/src/daemon/update_playlists.rs
+++ b/src/daemon/update_playlists.rs
@@ -2,7 +2,7 @@ use crate::listenbrainz::StatsRange;
 use crate::models::TrackedPlaylist;
 use crate::subsonic::Subsonic;
 use crate::{listenbrainz, CONFIG};
-use log::error;
+use log::{error, warn};
 use sqlx::postgres::PgPool;
 use std::time::Duration;
 use thiserror::Error;
@@ -44,8 +44,9 @@ pub async fn update_playlists_daemon(
         match records_res {
             Ok(records) => {
                 for record in records {
-                    // todo handle me
-                    update_playlist(media_client.clone(), record).await.unwrap();
+                    if let Err(e) = update_playlist(media_client.clone(), record).await {
+                        warn!("Could not update playlist: {:?}", e);
+                    }
                 }
             }
 
@@ -74,11 +75,16 @@ async fn update_playlist(
 
             let mut tracks = vec![];
             for recording in recordings {
+                if recording.artists.clone().map_or(true, |o| o.is_empty()) {
+                    continue;
+                }
+
                 let search_results = media_client
                     .as_ref()
                     .song_search(format!(
                         "{} {}",
-                        recording.track_name, recording.artists[0].artist_credit_name
+                        recording.track_name,
+                        recording.artists.unwrap_or(vec![])[0].artist_credit_name
                     ))
                     .await?;
 
diff --git a/src/listenbrainz.rs b/src/listenbrainz.rs
index 5f1b673..10a8b21 100644
--- a/src/listenbrainz.rs
+++ b/src/listenbrainz.rs
@@ -71,18 +71,10 @@ struct RecordingsResponse {
 
 #[derive(Deserialize)]
 pub struct RecordingsPayload {
-    count: u64,
-    from_ts: u64,
-    to_ts: u64,
-    last_updated: u64,
-    total_recording_count: u64,
-    user_id: String,
-    offset: u64,
-    range: String,
     pub recordings: Vec<RecordingsEntry>,
 }
 
-#[derive(Deserialize)]
+#[derive(Deserialize, Clone)]
 pub struct Artist {
     pub artist_credit_name: String,
 }
@@ -92,9 +84,7 @@ pub struct RecordingsEntry {
     pub track_name: String,
     pub release_name: String,
     pub artist_name: String,
-    pub artists: Vec<Artist>,
-    pub recording_mbid: String,
-    pub release_mbid: String,
+    pub artists: Option<Vec<Artist>>,
 }
 
 pub async fn recordings(