From 913da0c0ef2191c15df3f27395fcb08a3d87016b Mon Sep 17 00:00:00 2001
From: "alterwain@protonmail.com" <alterwain@protonmail.com>
Date: Thu, 6 Mar 2025 02:09:58 +0300
Subject: [PATCH] Large bugfix

---
 Cargo.lock         |  4 ++--
 Cargo.toml         |  2 +-
 src/main_screen.rs | 30 +++++++++++++++--------------
 src/sync.rs        | 48 +++++++++++++++++++++++-----------------------
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 10e805c..45873de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2356,8 +2356,8 @@ dependencies = [
 
 [[package]]
 name = "soundcloud"
-version = "0.1.9"
-source = "git+https://gitea.awain.net/alterwain/soundcloud_api.git#a6732847bebbcb6e59a1b8a44a965fe7092af6e9"
+version = "0.1.11"
+source = "git+https://gitea.awain.net/alterwain/soundcloud_api.git#06a9c773fc01e37867298a4985899be843aeb3ae"
 dependencies = [
  "hyper-util",
  "regex",
diff --git a/Cargo.toml b/Cargo.toml
index b39f9b2..01c6989 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,7 +20,7 @@ crossterm = { version = "0.28.1", features = ["event-stream"] }
 futures = "0.3"
 tokio = { version = "1", features = ["full"] }
 tokio-util = { version = "0.7.12", features = ["codec"] }
-soundcloud = { version = "0.1.9", git = "https://gitea.awain.net/alterwain/soundcloud_api.git" }
+soundcloud = { version = "0.1.11", git = "https://gitea.awain.net/alterwain/soundcloud_api.git" }
 youtube-api = { version = "0.1.1", git = "https://gitea.awain.net/alterwain/youtube_api.git" }
 itunesdb = { version = "0.1.99", git = "https://gitea.awain.net/alterwain/ITunesDB.git" }
 rand = "0.8.5"
diff --git a/src/main_screen.rs b/src/main_screen.rs
index 75a87f7..adcbb6b 100644
--- a/src/main_screen.rs
+++ b/src/main_screen.rs
@@ -419,21 +419,23 @@ impl MainScreen {
                 self.set_mode(self.mode);
 
                 if let Some(pls) = &self.youtube {
-                    let y = &pls.get(self.pl_table.selected_row()).unwrap().videos;
-                    let data = y
-                        .iter()
-                        .map(|video| {
-                            vec![
-                                video.videoId.clone(),
-                                video.title.clone(),
-                                video.publisher.clone(),
-                                video.lengthSeconds.to_string(),
-                                String::new(),
-                            ]
-                        })
-                        .collect::<Vec<Vec<String>>>();
+                    if let Some(ypl) = &pls.get(self.pl_table.selected_row()) {
+                        let y = ypl.videos.clone();
+                        let data = y
+                            .iter()
+                            .map(|video| {
+                                vec![
+                                    video.videoId.clone(),
+                                    video.title.clone(),
+                                    video.publisher.clone(),
+                                    video.lengthSeconds.to_string(),
+                                    String::new(),
+                                ]
+                            })
+                            .collect::<Vec<Vec<String>>>();
 
-                    self.song_table.set_data(data);
+                        self.song_table.set_data(data);
+                    }
                 }
                 self.song_table.set_title(" Songs ".to_string());
             }
diff --git a/src/sync.rs b/src/sync.rs
index 830896d..5369b20 100644
--- a/src/sync.rs
+++ b/src/sync.rs
@@ -940,36 +940,36 @@ async fn parse_itunes(sender: &Sender<AppEvent>, path: String) -> XDatabase {
     tokio::spawn(async move {
         let app_version = soundcloud::get_app().await.unwrap().unwrap();
         let client_id = soundcloud::get_client_id().await.unwrap().unwrap();
-        let playlists =
+        if let Ok(playlists) =
             soundcloud::get_playlists(soundcloud_user_id, client_id.clone(), app_version.clone())
                 .await
-                .unwrap();
+        {
+            let mut playlists = playlists.collection;
 
-        let mut playlists = playlists.collection;
-
-        for playlist in playlists.iter_mut() {
-            let trr = playlist.tracks.clone();
-            playlist.tracks = Vec::new();
-            for pl_tracks in trr.clone().chunks(45) {
-                if let Ok(tracks) = soundcloud::get_tracks(
-                    pl_tracks.to_vec(),
-                    client_id.clone(),
-                    app_version.clone(),
-                )
-                .await
-                {
-                    let mut tracks = tracks;
-                    tracks.retain(|t| t.title.is_some());
-                    playlist.tracks.append(&mut tracks);
+            for playlist in playlists.iter_mut() {
+                let trr = playlist.tracks.clone();
+                playlist.tracks = Vec::new();
+                for pl_tracks in trr.clone().chunks(45) {
+                    if let Ok(tracks) = soundcloud::get_tracks(
+                        pl_tracks.to_vec(),
+                        client_id.clone(),
+                        app_version.clone(),
+                    )
+                    .await
+                    {
+                        let mut tracks = tracks;
+                        tracks.retain(|t| t.title.is_some());
+                        playlist.tracks.append(&mut tracks);
+                    }
                 }
             }
-        }
 
-        let _ = soundcloud_sender
-            .send(AppEvent::SoundcloudGot(CloudPlaylists {
-                collection: playlists,
-            }))
-            .await;
+            let _ = soundcloud_sender
+                .send(AppEvent::SoundcloudGot(CloudPlaylists {
+                    collection: playlists,
+                }))
+                .await;
+        }
     });
 
     database