1 files changed, 131 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
index 70adb688f..79ee7f9f6 100644
--- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using MediaBrowser.Controller.Events;
 using MediaBrowser.Controller.FFMpeg;
 using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Providers
 {
@@ -27,30 +28,155 @@ namespace MediaBrowser.Controller.Providers
 
             FFProbeResult data = await FFProbe.Run(audio, outputPath);
 
-            MediaStream stream = data.streams.FirstOrDefault(s => s.codec_type.Equals("audio", StringComparison.OrdinalIgnoreCase));
+            MediaStream stream = data.streams.First(s => s.codec_type.Equals("audio", StringComparison.OrdinalIgnoreCase));
+
+            string bitrate = null;
+            string duration = null;
 
             audio.Channels = stream.channels;
 
-            string bitrate = null;
-            
             if (!string.IsNullOrEmpty(stream.sample_rate))
             {
                 audio.SampleRate = int.Parse(stream.sample_rate);
-
-                bitrate = stream.bit_rate;
             }
 
+            bitrate = stream.bit_rate;
+            duration = stream.duration;
+
             if (string.IsNullOrEmpty(bitrate))
             {
                 bitrate = data.format.bit_rate;
             }
 
+            if (string.IsNullOrEmpty(duration))
+            {
+                duration = data.format.duration;
+            }
+
             if (!string.IsNullOrEmpty(bitrate))
             {
                 audio.BitRate = int.Parse(bitrate);
             }
+
+            if (!string.IsNullOrEmpty(duration))
+            {
+                audio.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(duration)).Ticks;
+            }
+
+            if (data.format.tags != null)
+            {
+                FetchDataFromTags(audio, data.format.tags);
+            }
         }
 
+        private void FetchDataFromTags(Audio audio, Dictionary<string, string> tags)
+        {
+            string title = GetDictionaryValue(tags, "title");
+
+            if (!string.IsNullOrEmpty(title))
+            {
+                audio.Name = title;
+            }
+
+            audio.Album = GetDictionaryValue(tags, "album");
+            audio.Composer = GetDictionaryValue(tags, "composer");
+            audio.Artist = GetDictionaryValue(tags, "artist");
+            audio.AlbumArtist = GetDictionaryValue(tags, "albumartist") ?? GetDictionaryValue(tags, "album artist") ?? GetDictionaryValue(tags, "album_artist");
+
+            audio.IndexNumber = GetDictionaryNumericValue(tags, "track");
+            audio.ParentIndexNumber = GetDictionaryDiscValue(tags);
+
+            audio.Language = GetDictionaryValue(tags, "language");
+
+            audio.ProductionYear = GetDictionaryNumericValue(tags, "date");
+
+            audio.PremiereDate = GetDictionaryDateTime(tags, "retaildate") ?? GetDictionaryDateTime(tags, "retail date") ?? GetDictionaryDateTime(tags, "retail_date");
+            
+            MediaBrowser.Common.Logging.Logger.LogInfo(tags.Comparer.GetType().Name.ToString());
+        }
+
+        private int? GetDictionaryDiscValue(Dictionary<string, string> tags)
+        {
+            string[] keys = tags.Keys.ToArray();
+
+            for (int i = 0; i < keys.Length; i++)
+            {
+                string currentKey = keys[i];
+
+                if ("disc".Equals(currentKey, StringComparison.OrdinalIgnoreCase))
+                {
+                    string disc = tags[currentKey];
+
+                    if (!string.IsNullOrEmpty(disc))
+                    {
+                        disc = disc.Split('/')[0];
+
+                        int num;
+
+                        if (int.TryParse(disc, out num))
+                        {
+                            return num;
+                        }
+                    }
+
+                    break;
+                }
+            }
+
+            return null;
+        }
+        
+        private string GetDictionaryValue(Dictionary<string, string> tags, string key)
+        {
+            string[] keys = tags.Keys.ToArray();
+
+            for (int i = 0; i < keys.Length; i++)
+            {
+                string currentKey = keys[i];
+
+                if (key.Equals(currentKey, StringComparison.OrdinalIgnoreCase))
+                {
+                    return tags[currentKey];
+                }
+            }
+
+            return null;
+        }
+
+        private int? GetDictionaryNumericValue(Dictionary<string, string> tags, string key)
+        {
+            string val = GetDictionaryValue(tags, key);
+
+            if (!string.IsNullOrEmpty(val))
+            {
+                int i;
+
+                if (int.TryParse(val, out i))
+                {
+                    return i;
+                }
+            }
+
+            return null;
+        }
+
+        private DateTime? GetDictionaryDateTime(Dictionary<string, string> tags, string key)
+        {
+            string val = GetDictionaryValue(tags, key);
+
+            if (!string.IsNullOrEmpty(val))
+            {
+                DateTime i;
+
+                if (DateTime.TryParse(val, out i))
+                {
+                    return i;
+                }
+            }
+
+            return null;
+        }
+        
         private string GetOutputCachePath(BaseItem item)
         {
             string outputDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.FFProbeAudioCacheDirectory, item.Id.ToString().Substring(0, 1));