rename genres to playlists

.gitignore

@@ -1,6 +1,4 @@
-/out
+/out
-/music_mgr/target
+/target
-/music_mgr/config.json
+/config.json
-/music_mgr/manifest.json
+/manifest.json
-/.venv
-/config.json

src/commands/add.rs

@@ -10,7 +10,7 @@ pub async fn add(cfg: &ConfigWrapper, manifest: &mut Manifest, downloader: &mut
     log::debug!("url: {url:?}");
     log::debug!("name: {name:?}");
 
-    let mut genres = manifest.get_genres().keys().map(|f| f.clone()).collect::<Vec<String>>();
+    let mut genres = manifest.get_playlists().keys().map(|f| f.clone()).collect::<Vec<String>>();
 
     genres.sort();
 
@@ -47,4 +47,4 @@ pub async fn add(cfg: &ConfigWrapper, manifest: &mut Manifest, downloader: &mut
     }
 
     Ok(())
-}
+}

src/commands/gui/mod.rs

@@ -65,7 +65,7 @@ impl eframe::App for Gui {
                 .max_width(f32::INFINITY)
                 .auto_shrink(false)
                 .show(ui, |ui| {
-                for (genre, songs) in  self.manifest.get_genres() {
+                for (genre, songs) in  self.manifest.get_playlists() {
                     for (song_name, song) in songs {
                         ui.horizontal(|ui| {
                             ui.spacing_mut().item_spacing.x = 0.0;
@@ -102,4 +102,4 @@ impl eframe::App for Gui {
             });
         });
     }
-}
+}

src/commands/gui/song_edit_window.rs

@@ -66,7 +66,7 @@ impl Gui {
                 *song.get_url_str_mut() = self.song_editor.ed_url.clone();
             }
 
-            let Some(genre) = self.manifest.get_genre_mut(genre.clone()) else {
+            let Some(genre) = self.manifest.get_playlist_mut(genre.clone()) else {
                 return;
             };
 
@@ -76,4 +76,4 @@ impl Gui {
             let _ = self.manifest.save(None);
         }
     }
-}
+}

src/downloader.rs

@@ -32,7 +32,7 @@ impl Downloader {
     pub async fn download_all(&mut self, manifest: &Manifest, cfg: &ConfigWrapper) -> anyhow::Result<usize> {
         let format = manifest.get_format();
 
-        for (genre, songs) in manifest.get_genres() {
+        for (genre, songs) in manifest.get_playlists() {
             for (song_name, song) in songs {
                 self.download_song(cfg, song_name, song, &genre, format).await?;
                 self.count += crate::process_manager::wait_for_procs_untill(10).await?;
@@ -92,4 +92,4 @@ impl Downloader {
         crate::process_manager::add_proc(cmd, format!("Downloaded {dl_file}")).await?;
         Ok(())
     }
-}
+}

src/manifest/mod.rs

@@ -31,7 +31,7 @@ pub struct Manifest {
     #[serde(skip)]
     path: PathBuf,
     format: Format,
-    genres: HashMap<GenreName, Genre>
+    playlists: HashMap<GenreName, Genre>
 }
 
 #[allow(dead_code)]
@@ -40,32 +40,32 @@ impl Manifest {
         &self.format
     }
     pub fn add_song(&mut self, genre: GenreName, name: SongName, song: Song) -> Option<Song> {
-        self.get_genre_mut(genre)?.insert(name, song)
+        self.get_playlist_mut(genre)?.insert(name, song)
     }
     pub fn get_song(&self, genre: GenreName, name: &SongName) -> Option<&Song> {
-        self.get_genre(genre)?.get(name)
+        self.get_playlist(genre)?.get(name)
     }
     pub fn get_song_mut(&mut self, genre: GenreName, name: &SongName) -> Option<&mut Song> {
-        self.get_genre_mut(genre)?.get_mut(name)
+        self.get_playlist_mut(genre)?.get_mut(name)
     }
-    pub fn add_genre(&mut self, name: GenreName) {
+    pub fn add_playlist(&mut self, name: GenreName) {
-        self.genres.insert(name, Default::default());
+        self.playlists.insert(name, Default::default());
     }
-    pub fn get_genre(&self, name: GenreName) -> Option<&Genre> {
+    pub fn get_playlist(&self, name: GenreName) -> Option<&Genre> {
-        self.genres.get(&name)
+        self.playlists.get(&name)
     }
-    pub fn get_genre_mut(&mut self, name: GenreName) -> Option<&mut Genre> {
+    pub fn get_playlist_mut(&mut self, name: GenreName) -> Option<&mut Genre> {
-        self.genres.get_mut(&name)
+        self.playlists.get_mut(&name)
     }
-    pub fn get_genres(&self) -> &HashMap<GenreName, Genre> {
+    pub fn get_playlists(&self) -> &HashMap<GenreName, Genre> {
-        &self.genres
+        &self.playlists
     }
-    pub fn get_genres_mut(&mut self) -> &mut HashMap<GenreName, Genre> {
+    pub fn get_playlists_mut(&mut self) -> &mut HashMap<GenreName, Genre> {
-        &mut self.genres
+        &mut self.playlists
     }
     pub fn get_song_count(&self) -> usize {
         let mut count = 0;
-        for (_, v) in &self.genres {
+        for (_, v) in &self.playlists {
             count += v.len();
         }
         count
@@ -76,7 +76,7 @@ impl Manifest {
         let data = std::fs::read_to_string(path)?;
 
         let s: Self = serde_json::from_str(data.as_str())?;
-        self.genres = s.genres;
+        self.playlists = s.playlists;
         self.format = s.format;
 
         Ok(())