From ab01b49f6430fddb6eae4c29d4591f698a8405b2 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Mon, 20 Aug 2012 08:20:51 -0400
Subject: [PATCH] Added more Audio fields to DTOBaseItem

---
 MediaBrowser.Api/ApiService.cs                |  3 +-
 .../Providers/AudioInfoProvider.cs            | 44 +++++++++++++++++--
 MediaBrowser.Model/DTO/AudioInfo.cs           |  1 -
 MediaBrowser.Model/Entities/Audio.cs          |  1 -
 4 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs
index 99b25f94e6..b7a2c4adc3 100644
--- a/MediaBrowser.Api/ApiService.cs
+++ b/MediaBrowser.Api/ApiService.cs
@@ -113,8 +113,7 @@ namespace MediaBrowser.Api
                     AlbumArtist = audio.AlbumArtist,
                     Artist = audio.Artist,
                     BitRate = audio.BitRate,
-                    Channels = audio.Channels,
-                    Composer = audio.Composer
+                    Channels = audio.Channels
                 };
             }
 
diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
index 4b79d2b7bc..6d2287b2d6 100644
--- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs
@@ -78,8 +78,16 @@ namespace MediaBrowser.Controller.Providers
                 audio.Name = title;
             }
 
+            string composer = GetDictionaryValue(tags, "composer");
+
+            if (!string.IsNullOrEmpty(composer))
+            {
+                var list = (audio.People ?? new PersonInfo[] { }).ToList();
+                list.Add(new PersonInfo() { Name = composer, Type = "Composer" });
+                audio.People = list;
+            }
+
             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");
 
@@ -91,6 +99,36 @@ namespace MediaBrowser.Controller.Providers
             audio.ProductionYear = GetDictionaryNumericValue(tags, "date");
 
             audio.PremiereDate = GetDictionaryDateTime(tags, "retaildate") ?? GetDictionaryDateTime(tags, "retail date") ?? GetDictionaryDateTime(tags, "retail_date");
+
+            FetchGenres(audio, tags);
+
+            FetchStudios(audio, tags, "organization");
+            FetchStudios(audio, tags, "ensemble");
+            FetchStudios(audio, tags, "publisher");
+        }
+
+        private void FetchStudios(Audio audio, Dictionary<string, string> tags, string tagName)
+        {
+            string val = GetDictionaryValue(tags, tagName);
+
+            if (!string.IsNullOrEmpty(val))
+            {
+                var list = (audio.Studios ?? new string[] { }).ToList();
+                list.AddRange(val.Split('/'));
+                audio.Studios = list;
+            }
+        }
+        
+        private void FetchGenres(Audio audio, Dictionary<string, string> tags)
+        {
+            string val = GetDictionaryValue(tags, "genre");
+
+            if (!string.IsNullOrEmpty(val))
+            {
+                var list = (audio.Genres ?? new string[] { }).ToList();
+                list.AddRange(val.Split('/'));
+                audio.Genres = list;
+            }
         }
 
         private int? GetDictionaryDiscValue(Dictionary<string, string> tags)
@@ -123,7 +161,7 @@ namespace MediaBrowser.Controller.Providers
 
             return null;
         }
-        
+
         private string GetDictionaryValue(Dictionary<string, string> tags, string key)
         {
             string[] keys = tags.Keys.ToArray();
@@ -174,7 +212,7 @@ namespace MediaBrowser.Controller.Providers
 
             return null;
         }
-        
+
         private string GetOutputCachePath(BaseItem item)
         {
             string outputDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.FFProbeAudioCacheDirectory, item.Id.ToString().Substring(0, 1));
diff --git a/MediaBrowser.Model/DTO/AudioInfo.cs b/MediaBrowser.Model/DTO/AudioInfo.cs
index 3aa1cc1bf5..b9a1c4db3a 100644
--- a/MediaBrowser.Model/DTO/AudioInfo.cs
+++ b/MediaBrowser.Model/DTO/AudioInfo.cs
@@ -9,6 +9,5 @@ namespace MediaBrowser.Model.DTO
         public string Artist { get; set; }
         public string Album { get; set; }
         public string AlbumArtist { get; set; }
-        public string Composer { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Entities/Audio.cs b/MediaBrowser.Model/Entities/Audio.cs
index cc48a58a7f..fcf33dbebc 100644
--- a/MediaBrowser.Model/Entities/Audio.cs
+++ b/MediaBrowser.Model/Entities/Audio.cs
@@ -10,6 +10,5 @@ namespace MediaBrowser.Model.Entities
         public string Artist { get; set; }
         public string Album { get; set; }
         public string AlbumArtist { get; set; }
-        public string Composer { get; set; }
     }
 }