From 4c9f77eead7148bb451de2a3f261bb3a61efe321 Mon Sep 17 00:00:00 2001
From: LukePulverenti Luke Pulverenti luke pulverenti
 <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>
Date: Thu, 12 Jul 2012 13:09:35 -0400
Subject: Added some resolver improvements

---
 MediaBrowser.Controller/Kernel.cs                  |  3 --
 MediaBrowser.Controller/Library/ItemDataCache.cs   | 32 ----------------------
 .../MediaBrowser.Controller.csproj                 |  1 -
 MediaBrowser.Controller/Xml/BaseItemXmlParser.cs   | 20 +++++++-------
 4 files changed, 10 insertions(+), 46 deletions(-)
 delete mode 100644 MediaBrowser.Controller/Library/ItemDataCache.cs

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index 2bb78e7e7..455a63f67 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -26,7 +26,6 @@ namespace MediaBrowser.Controller
         public string DataPath { get; private set; }
 
         public HttpServer HttpServer { get; private set; }
-        public ItemDataCache ItemDataCache { get; private set; }
         public ItemController ItemController { get; private set; }
         public UserController UserController { get; private set; }
         public PluginController PluginController { get; private set; }
@@ -61,7 +60,6 @@ namespace MediaBrowser.Controller
             UserController = new UserController(Path.Combine(DataPath, "Users"));
             PluginController = new PluginController(Path.Combine(DataPath, "Plugins"));
             DirectoryWatchers = new DirectoryWatchers();
-            ItemDataCache = new ItemDataCache();
 
             ItemController.PreBeginResolvePath += ItemController_PreBeginResolvePath;
             ItemController.BeginResolvePath += ItemController_BeginResolvePath;
@@ -86,7 +84,6 @@ namespace MediaBrowser.Controller
             // Get users from users folder
             // Load root media folder
             Parallel.Invoke(ReloadUsers, ReloadRoot);
-            var b = true;
         }
 
         private void ReloadConfiguration()
diff --git a/MediaBrowser.Controller/Library/ItemDataCache.cs b/MediaBrowser.Controller/Library/ItemDataCache.cs
deleted file mode 100644
index 35b3551a9..000000000
--- a/MediaBrowser.Controller/Library/ItemDataCache.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using MediaBrowser.Model.Entities;
-
-namespace MediaBrowser.Controller.Library
-{
-    public class ItemDataCache
-    {
-        private Dictionary<string, object> Data = new Dictionary<string, object>();
-
-        public void SetValue<T>(BaseItem item, string propertyName, T value)
-        {
-            Data[GetKey(item, propertyName)] = value;
-        }
-
-        public T GetValue<T>(BaseItem item, string propertyName)
-        {
-            string key = GetKey(item, propertyName);
-
-            if (Data.ContainsKey(key))
-            {
-                return (T)Data[key];
-            }
-
-            return default(T);
-        }
-
-        private string GetKey(BaseItem item, string propertyName)
-        {
-            return item.Id.ToString() + "-" + propertyName;
-        }
-    }
-}
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index a84fc8091..30b1070bc 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -51,7 +51,6 @@
     <Compile Include="IO\Shortcut.cs" />
     <Compile Include="Library\ItemController.cs" />
     <Compile Include="Kernel.cs" />
-    <Compile Include="Library\ItemDataCache.cs" />
     <Compile Include="Net\CollectionExtensions.cs" />
     <Compile Include="Net\HttpServer.cs" />
     <Compile Include="Net\Request.cs" />
diff --git a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs
index 2addf6a1d..8948c979e 100644
--- a/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs
+++ b/MediaBrowser.Controller/Xml/BaseItemXmlParser.cs
@@ -146,16 +146,16 @@ namespace MediaBrowser.Controller.Xml
 
                 case "Director":
                     {
-                        var list = (item.People ?? new Person[]{}).ToList();
-                        list.AddRange(GetSplitValues(node.InnerText, '|').Select(v => new Person() { Name = v, PersonType = PersonType.Director }));
+                        var list = (item.People ?? new PersonInfo[]{}).ToList();
+                        list.AddRange(GetSplitValues(node.InnerText, '|').Select(v => new PersonInfo() { Name = v, PersonType = PersonType.Director }));
 
                         item.People = list;
                         break;
                     }
                 case "Writer":
                     {
-                        var list = (item.People ?? new Person[] { }).ToList();
-                        list.AddRange(GetSplitValues(node.InnerText, '|').Select(v => new Person() { Name = v, PersonType = PersonType.Writer }));
+                        var list = (item.People ?? new PersonInfo[] { }).ToList();
+                        list.AddRange(GetSplitValues(node.InnerText, '|').Select(v => new PersonInfo() { Name = v, PersonType = PersonType.Writer }));
 
                         item.People = list;
                         break;
@@ -164,8 +164,8 @@ namespace MediaBrowser.Controller.Xml
                 case "Actors":
                 case "GuestStars":
                     {
-                        var list = (item.People ?? new Person[] { }).ToList();
-                        list.AddRange(GetSplitValues(node.InnerText, '|').Select(v => new Person() { Name = v, PersonType = PersonType.Actor }));
+                        var list = (item.People ?? new PersonInfo[] { }).ToList();
+                        list.AddRange(GetSplitValues(node.InnerText, '|').Select(v => new PersonInfo() { Name = v, PersonType = PersonType.Actor }));
 
                         item.People = list;
                         break;
@@ -450,7 +450,7 @@ namespace MediaBrowser.Controller.Xml
 
         protected virtual void FetchDataFromPersonsNode(XmlNode node, T item)
         {
-            List<Person> list = (item.People ?? new Person[] { }).ToList();
+            List<PersonInfo> list = (item.People ?? new PersonInfo[] { }).ToList();
 
             foreach (XmlNode childNode in node.ChildNodes)
             {
@@ -542,9 +542,9 @@ namespace MediaBrowser.Controller.Xml
             }
         }
 
-        private Person GetPersonFromXmlNode(XmlNode node)
+        private PersonInfo GetPersonFromXmlNode(XmlNode node)
         {
-            Person person = new Person();
+            PersonInfo person = new PersonInfo();
 
             foreach (XmlNode childNode in node.ChildNodes)
             {
@@ -570,7 +570,7 @@ namespace MediaBrowser.Controller.Xml
                         }
 
                     case "Role":
-                        person.Description = childNode.InnerText ?? string.Empty;
+                        person.Overview = childNode.InnerText ?? string.Empty;
                         break;
 
                     default:
-- 
cgit v1.2.3