Merge pull request #5 from flbn/ov/random-fixes

random fixes
pombadev · Sep 17, 2023 · 199a6e9 · 199a6e9
2 parents 150bc6a + 0c7778c
commit 199a6e9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/lib/multi_dl.rs b/src/lib/multi_dl.rs
@@ -56,7 +56,7 @@ impl<'a> Downloader<'a> {
             .enumerate()
             .filter(|(_, (track, root))| {
                 if make_path(track, root, &tf).exists() {
-                    eprintln!("`{}` already exist, skipping", track.name);
+                    eprintln!("`{}` already exists, skipping", track.name);
                     false
                 } else {
                     true

diff --git a/src/lib/spider.rs b/src/lib/spider.rs
@@ -86,7 +86,7 @@ fn scrape_by_application_ld_json(dom: &Html) -> Option<Album> {
 
         vec![Track {
             num: 1,
-            name: track_name.to_string(),
+            name: track_name.to_string().replace("/", ":"),
             url,
             lyrics: None,
             album: album.clone(),
@@ -113,7 +113,9 @@ fn scrape_by_application_ld_json(dom: &Html) -> Option<Album> {
 
                 Some(Track {
                     num: track.get("position").i32(),
-                    name: decode_html_entities(&track.get("item.name").to_string()).into(),
+                    name: decode_html_entities(&track.get("item.name").to_string())
+                        .replace("/", ":")
+                        .into(),
                     url: decode_html_entities(&url).to_string(),
                     lyrics: Some(track.get("item.recordingOf.lyrics.text").to_string()),
                     album: album.clone(),

diff --git a/src/lib/utils.rs b/src/lib/utils.rs
@@ -48,7 +48,7 @@ pub fn track_path(track: &Track, root: &Path, track_format: &String) -> Result<P
     let file = root.join(file_name).with_extension("mp3");
 
     if file.exists() {
-        bail!("{} already exist", file.display())
+        bail!("{} already exists", file.display())
     }
 
     Ok(file)