songy

commit ec060fd8a4f24c72e6fa9bbbe802f1e5a929dd3a
parent 065f44af88b2682918ae6a2794390ce3dae8579b
Author: devrobinkroeker <kroekerrobin@gmail.com>
Date:   Thu, 27 Apr 2023 18:27:39 +0200

Fix bugs

Diffstat:
M
Cargo.lock
 | 
2
+-
M
src/main.rs
 | 
15
++++-----------

2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
@@ -490,7 +490,7 @@ dependencies = [
 
 [[package]]
 name = "songs"
-version = "1.0.1"
+version = "1.0.6"
 dependencies = [
  "clap",
  "frankenstein",
diff --git a/src/main.rs b/src/main.rs
@@ -212,23 +212,16 @@ fn find_songs(search_string: &String, songs_path: &String, strings: &langs::Stri
 	let mut result: Vec<fs::DirEntry> = vec![];
 	let mut filename: String;
 	let ss = strings.format(search_string).to_lowercase();
-	// Check for exact match
 	for file in get_songs(songs_path, None) {
 		filename = file.file_name().to_str().expect("Error: name").to_string();
 		let f: Vec<&str> = filename.split(".").collect();
 		let mut name: String = f.get(0).expect("Error: get(0)").to_string();
 		name = name.to_lowercase();
 		if name == ss {
-			result.push(file)
-		}
-	}
-	// Check for partial match
-	for file in get_songs(songs_path, None) {
-		filename = file.file_name().to_str().expect("Error: name").to_string();
-		let f: Vec<&str> = filename.split(".").collect();
-		let mut name: String = f.get(0).expect("Error: get(0)").to_string();
-		name = name.to_lowercase();
-		if name.contains(&ss) {
+			let mut one = vec![file];
+			one.append(&mut result);
+			result = one;
+		} else if name.contains(&ss) {
 			result.push(file);
 		}
 	}