Added metadata decoding tests

src/index.rs

@@ -9,7 +9,7 @@ use std::thread;
 use std::time;
 
 use error::*;
-use metadata::SongTags;
+use metadata;
 use utils;
 use vfs::Vfs;
 
@@ -364,7 +364,7 @@ impl Index {
                     self.populate_directory(builder, file_path.as_path());
                 } else {
                     if let Some(file_path_string) = file_path.to_str() {
-                        if let Ok(tags) = SongTags::read(file_path.as_path()) {
+                        if let Ok(tags) = metadata::read(file_path.as_path()) {
                             if tags.year.is_some() {
                                 inconsistent_directory_year |= directory_year.is_some() &&
                                                                directory_year != tags.year;

src/metadata.rs

@@ -11,6 +11,7 @@ use error::PError;
 use utils;
 use utils::AudioFormat;
 
+#[derive(Debug, PartialEq)]
 pub struct SongTags {
     pub disc_number: Option<u32>,
     pub track_number: Option<u32>,
@@ -21,13 +22,12 @@ pub struct SongTags {
     pub year: Option<i32>,
 }
 
-impl SongTags {
 pub fn read(path: &Path) -> Result<SongTags, PError> {
     match utils::get_audio_format(path) {
-            Some(AudioFormat::FLAC) => SongTags::read_flac(path),
+        Some(AudioFormat::FLAC) => read_flac(path),
-            Some(AudioFormat::MP3) => SongTags::read_id3(path),
+        Some(AudioFormat::MP3) => read_id3(path),
-            Some(AudioFormat::MPC) => SongTags::read_ape(path),
+        Some(AudioFormat::MPC) => read_ape(path),
-            Some(AudioFormat::OGG) => SongTags::read_vorbis(path),
+        Some(AudioFormat::OGG) => read_vorbis(path),
         _ => Err(PError::UnsupportedMetadataFormat),
     }
 }
@@ -87,13 +87,13 @@ impl SongTags {
 
 fn read_ape(path: &Path) -> Result<SongTags, PError> {
     let tag = try!(ape::read(path));
-        let artist = tag.item("Artist").and_then(SongTags::read_ape_string);
+    let artist = tag.item("Artist").and_then(read_ape_string);
-        let album = tag.item("Album").and_then(SongTags::read_ape_string);
+    let album = tag.item("Album").and_then(read_ape_string);
-        let album_artist = tag.item("Album artist").and_then(SongTags::read_ape_string);
+    let album_artist = tag.item("Album artist").and_then(read_ape_string);
-        let title = tag.item("Title").and_then(SongTags::read_ape_string);
+    let title = tag.item("Title").and_then(read_ape_string);
-        let year = tag.item("Year").and_then(SongTags::read_ape_i32);
+    let year = tag.item("Year").and_then(read_ape_i32);
-        let disc_number = tag.item("Disc").and_then(SongTags::read_ape_x_of_y);
+    let disc_number = tag.item("Disc").and_then(read_ape_x_of_y);
-        let track_number = tag.item("Track").and_then(SongTags::read_ape_x_of_y);
+    let track_number = tag.item("Track").and_then(read_ape_x_of_y);
     Ok(SongTags {
         artist: artist,
         album_artist: album_artist,
@@ -151,4 +151,19 @@ impl SongTags {
         year: year,
     })
 }
+
+#[test]
+fn test_read_metadata() {
+    let sample_tags = SongTags {
+        disc_number: Some(3),
+        track_number: Some(1),
+        title: Some("TEST TITLE".into()),
+        artist: Some("TEST ARTIST".into()),
+        album_artist: Some("TEST ALBUM ARTIST".into()),
+        album: Some("TEST ALBUM".into()),
+        year: Some(2016),
+    };
+    assert_eq!(read(Path::new("test/sample.mp3")).unwrap(), sample_tags);
+    assert_eq!(read(Path::new("test/sample.ogg")).unwrap(), sample_tags);
+    assert_eq!(read(Path::new("test/sample.flac")).unwrap(), sample_tags);
 }