From 1f333d647582c7dd800285f09f6d15c64ef11f35 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@pushingpixels.at>
Date: Wed, 1 Feb 2023 20:34:23 +0100
Subject: [PATCH 1/3] check if path exists (without extension)

---
 src/file_sink.rs | 15 ++++++---------
 src/main.rs      | 26 +++++++++++++++++---------
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/file_sink.rs b/src/file_sink.rs
index 8cfd812..966694b 100644
--- a/src/file_sink.rs
+++ b/src/file_sink.rs
@@ -22,16 +22,13 @@ impl FileSink {
 }
 
 impl Open for FileSink {
+	// use the unwrap_or_else method instead of the if let statement to handle the absence of a path value
     fn open(path: Option<String>, _audio_format: AudioFormat) -> Self {
-        if let Some(path) = path {
-            let file = path;
-            FileSink {
-                sink: file,
-                content: Vec::new(),
-                metadata: None
-            }
-        } else {
-            panic!();
+        let file = path.unwrap_or_else(|| panic!());
+        FileSink {
+            sink: file,
+            content: Vec::new(),
+            metadata: None
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
index c04a4b1..7d154d6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,6 +3,7 @@ mod file_sink;
 extern crate rpassword;
 
 use std::{path::PathBuf};
+use std::path::Path;
 
 use librespot::{core::authentication::Credentials, metadata::Playlist};
 use librespot::core::config::SessionConfig;
@@ -82,15 +83,22 @@ async fn download_tracks(session: &Session, destination: PathBuf, tracks: Vec<Sp
         let joined_path = destination.join(&filename);
         let path = joined_path.to_str().unwrap();
         bar.set_message(full_track_name.as_str());
-        let mut file_sink = file_sink::FileSink::open(Some(path.to_owned()), librespot::playback::config::AudioFormat::S16);
-        file_sink.add_metadata(metadata);
-        let (mut player, _) = Player::new(player_config.clone(), session.clone(), None, move || {
-            Box::new(file_sink)
-        });
-        player.load(track, true, 0);
-        player.await_end_of_track().await;
-        player.stop();
-        bar.inc(1);
+        
+        let path_with_no_extension = Path::new(path).with_extension("");
+        if !path_with_no_extension.exists() {
+			let mut file_sink = file_sink::FileSink::open(Some(path.to_owned()), librespot::playback::config::AudioFormat::S16);
+			file_sink.add_metadata(metadata);
+			let (mut player, _) = Player::new(player_config.clone(), session.clone(), None, move || {
+				Box::new(file_sink)
+			});
+			player.load(track, true, 0);
+			player.await_end_of_track().await;
+			player.stop();
+			bar.inc(1);
+        } else {
+            println!("File already exists: {}", path);
+			bar.inc(1);
+        }
     }
     bar.finish();
 }

From ae0e8f6ebc2aed178f3101125bd12748b10f723e Mon Sep 17 00:00:00 2001
From: Daniel <daniel@pushingpixels.at>
Date: Fri, 3 Feb 2023 17:26:47 +0100
Subject: [PATCH 2/3] clean filenames too

---
 src/main.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 7d154d6..6e6b779 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -46,6 +46,17 @@ async fn create_session(credentials: Credentials) -> Session {
     session
 }
 
+fn make_filename_compatible(filename: &str) -> String {
+    let invalid_chars = ['<', '>', ':', '\'', '"', '/', '\\', '|', '?', '*'];
+    let mut clean = String::new();
+    for c in filename.chars() {
+        if !invalid_chars.contains(&c) && c.is_ascii() && !c.is_control() && c.len_utf8() == 1  {
+            clean.push(c);
+        }
+    }
+    clean
+}
+
 async fn download_tracks(session: &Session, destination: PathBuf, tracks: Vec<SpotifyId>) {
     let player_config = PlayerConfig::default();
     let bar_style = ProgressStyle::default_bar()
@@ -79,10 +90,11 @@ async fn download_tracks(session: &Session, destination: PathBuf, tracks: Vec<Sp
             metadata.artists.push(artist_name.clone());
         }
         let full_track_name = format!("{} - {}", artist_name, metadata.track_name);
-        let filename = format!("{}.flac", full_track_name);
+        let full_track_name_clean = make_filename_compatible(full_track_name.as_str());
+        let filename = format!("{}.flac", full_track_name_clean);
         let joined_path = destination.join(&filename);
         let path = joined_path.to_str().unwrap();
-        bar.set_message(full_track_name.as_str());
+        bar.set_message(full_track_name_clean.as_str());
         
         let path_with_no_extension = Path::new(path).with_extension("");
         if !path_with_no_extension.exists() {

From 61dcdb6e55bd0574509139c81a17245237a87792 Mon Sep 17 00:00:00 2001
From: Daniel <daniel@pushingpixels.at>
Date: Fri, 3 Feb 2023 19:01:03 +0100
Subject: [PATCH 3/3] fixed excluding logic - now it works

---
 src/file_sink.rs |  5 ++---
 src/main.rs      | 26 +++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/file_sink.rs b/src/file_sink.rs
index 966694b..3253273 100644
--- a/src/file_sink.rs
+++ b/src/file_sink.rs
@@ -22,11 +22,10 @@ impl FileSink {
 }
 
 impl Open for FileSink {
-	// use the unwrap_or_else method instead of the if let statement to handle the absence of a path value
     fn open(path: Option<String>, _audio_format: AudioFormat) -> Self {
-        let file = path.unwrap_or_else(|| panic!());
+        let file_path = path.unwrap_or_else(|| panic!());
         FileSink {
-            sink: file,
+            sink: file_path,
             content: Vec::new(),
             metadata: None
         }
diff --git a/src/main.rs b/src/main.rs
index 6e6b779..bda7df5 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -96,8 +96,28 @@ async fn download_tracks(session: &Session, destination: PathBuf, tracks: Vec<Sp
         let path = joined_path.to_str().unwrap();
         bar.set_message(full_track_name_clean.as_str());
         
-        let path_with_no_extension = Path::new(path).with_extension("");
-        if !path_with_no_extension.exists() {
+        
+		let file_name = Path::new(path)
+			.file_stem()
+			.unwrap()
+			.to_str()
+			.unwrap();
+
+		let path_parent = Path::new(path).parent().unwrap();
+		let entries = path_parent.read_dir().unwrap();
+
+		let mut file_exists = false;
+		for entry in entries {
+			let entry = entry.unwrap();
+			let entry_path = entry.path();
+			let entry_file_name = entry_path.file_stem().unwrap().to_str().unwrap();
+			if entry_file_name == file_name {
+				file_exists = true;
+				break;
+			}
+		}
+
+        if !file_exists {
 			let mut file_sink = file_sink::FileSink::open(Some(path.to_owned()), librespot::playback::config::AudioFormat::S16);
 			file_sink.add_metadata(metadata);
 			let (mut player, _) = Player::new(player_config.clone(), session.clone(), None, move || {
@@ -108,7 +128,7 @@ async fn download_tracks(session: &Session, destination: PathBuf, tracks: Vec<Sp
 			player.stop();
 			bar.inc(1);
         } else {
-            println!("File already exists: {}", path);
+			// println!("File with the same name already exists, skipping: {}", path);
 			bar.inc(1);
         }
     }