Import @Dalvany's genre (#5)

* Add genre Add genre tag * Add some tests Co-authored-by: Dalvany <[email protected]>
TianyiShi2001 · May 25, 2022 · edae1dc · edae1dc
1 parent 66d8994
commit edae1dc
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 0 deletions.
diff --git a/src/anytag.rs b/src/anytag.rs
@@ -14,6 +14,7 @@ pub struct AnyTag<'a> {
     pub total_tracks: Option<u16>,
     pub disc_number: Option<u16>,
     pub total_discs: Option<u16>,
+    pub genre:Option<&'a str>,
 }
 
 impl AudioTagConfig for AnyTag<'_> {
@@ -66,6 +67,9 @@ impl<'a> AnyTag<'a> {
     pub fn total_discs(&self) -> Option<u16> {
         self.total_tracks
     }
+    pub fn genre(&self) -> Option<&str> {
+        self.genre.as_deref()
+    }
 }
 
 impl AnyTag<'_> {

diff --git a/src/components/flac_tag.rs b/src/components/flac_tag.rs
@@ -177,6 +177,13 @@ impl AudioTagEdit for FlacTag {
         self.set_first("TOTALDISCS", &v.to_string())
     }
 
+    fn genre(&self) -> Option<&str> {
+        self.get_first("GENRE")
+    }
+    fn set_genre(&mut self, v: &str) {
+        self.set_first("GENRE", v);
+    }
+
     fn remove_title(&mut self) {
         self.remove("TITLE");
     }
@@ -209,6 +216,9 @@ impl AudioTagEdit for FlacTag {
     fn remove_total_discs(&mut self) {
         self.remove("TOTALDISCS");
     }
+    fn remove_genre(&mut self) {
+        self.remove("GENRE");
+    }
 }
 
 impl AudioTagWrite for FlacTag {

diff --git a/src/components/id3_tag.rs b/src/components/id3_tag.rs
@@ -21,6 +21,7 @@ impl<'a> From<&'a Id3v2Tag> for AnyTag<'a> {
             total_tracks: inp.total_tracks(),
             disc_number: inp.disc_number(),
             total_discs: inp.total_discs(),
+            genre: inp.genre(),
         }
     }
 }
@@ -40,6 +41,7 @@ impl<'a> From<AnyTag<'a>> for Id3v2Tag {
                 inp.total_tracks().map(|v| t.set_total_tracks(v as u32));
                 inp.disc_number().map(|v| t.set_disc(v as u32));
                 inp.total_discs().map(|v| t.set_total_discs(v as u32));
+                inp.genre().map(|v| t.set_genre(v));
                 t
             },
         }
@@ -181,6 +183,16 @@ impl AudioTagEdit for Id3v2Tag {
     fn remove_total_discs(&mut self) {
         self.inner.remove_total_discs();
     }
+
+    fn genre(&self) -> Option<&str> {
+        self.inner.genre()
+    }
+    fn set_genre(&mut self, v: &str) {
+        self.inner.set_genre(v);
+    }
+    fn remove_genre(&mut self) {
+        self.inner.remove_genre();
+    }
 }
 
 impl AudioTagWrite for Id3v2Tag {

diff --git a/src/components/mp4_tag.rs b/src/components/mp4_tag.rs
@@ -22,6 +22,7 @@ impl<'a> From<&'a Mp4Tag> for AnyTag<'a> {
         let (a, b) = inp.disc();
         let disc_number = a;
         let total_discs = b;
+        let genre = inp.genre();
         Self {
             config: inp.config.clone(),
             title,
@@ -35,6 +36,7 @@ impl<'a> From<&'a Mp4Tag> for AnyTag<'a> {
             total_tracks,
             disc_number,
             total_discs,
+            genre,
         }
     }
 }
@@ -203,6 +205,13 @@ impl AudioTagEdit for Mp4Tag {
         self.inner.set_total_discs(total_discs)
     }
 
+    fn genre(&self) -> Option<&str> {
+        self.inner.genre()
+    }
+    fn set_genre(&mut self, genre: &str) {
+        self.inner.set_genre(genre);
+    }
+
     fn remove_title(&mut self) {
         self.inner.remove_title();
     }
@@ -239,6 +248,9 @@ impl AudioTagEdit for Mp4Tag {
     fn remove_total_discs(&mut self) {
         self.inner.remove_total_discs();
     }
+    fn remove_genre(&mut self) {
+        self.inner.remove_genres();
+    }
 }
 
 impl AudioTagWrite for Mp4Tag {

diff --git a/src/traits.rs b/src/traits.rs
@@ -126,6 +126,10 @@ pub trait AudioTagEdit: AudioTagConfig {
     fn total_discs(&self) -> Option<u16>;
     fn set_total_discs(&mut self, total_discs: u16);
     fn remove_total_discs(&mut self);
+
+    fn genre(&self) -> Option<&str>;
+    fn set_genre(&mut self, genre:&str);
+    fn remove_genre(&mut self);
 }
 
 pub trait AudioTagWrite {

diff --git a/tests/io.rs b/tests/io.rs
@@ -56,6 +56,12 @@ macro_rules! test_file {
             tags.remove_album_cover();
             assert!(tags.album_cover().is_none());
             tags.remove_album_cover();
+
+            tags.set_genre("foo song genre");
+            assert_eq!(tags.genre(), Some("foo song genre"));
+            tags.remove_genre();
+            assert!(tags.genre().is_none());
+            tags.remove_genre();
         }
     };
 }