1 files changed, 13 insertions, 1 deletions

diff --git a/src/queue.rs b/src/queue.rs
index 3c1c6fa..7675ddd 100644
--- a/src/queue.rs
+++ b/src/queue.rs
@@ -21,6 +21,7 @@ pub struct AudioMetadata {
     pub title: Option<String>,
     pub artist: Option<String>,
     pub album: Option<String>,
+    pub track_number: Option<i32>,
     pub duration_secs: Option<f64>,
 }
 
@@ -64,16 +65,27 @@ pub fn extract_metadata(path: &Path) -> Option<AudioMetadata> {
                     Some(StandardTag::Artist(value)) => {
                         metadata.artist = Some(value.to_string());
                     }
+                    Some(StandardTag::AlbumArtist(value)) => {
+                        metadata.artist = Some(value.to_string());
+                    }
                     Some(StandardTag::Album(value)) => {
                         metadata.album = Some(value.to_string());
                     }
+                    Some(StandardTag::TrackNumber(value)) => {
+                        metadata.track_number = value.to_string().parse().ok();
+                    }
                     _ => {}
                 }
             }
         }
     }
 
-    if metadata.title.is_some() || metadata.artist.is_some() || metadata.album.is_some() {
+    if metadata.title.is_some()
+        || metadata.artist.is_some()
+        || metadata.album.is_some()
+        || metadata.track_number.is_some()
+        || metadata.duration_secs.is_some()
+    {
         Some(metadata)
     } else {
         None