alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-25 03:26:32 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Added some resolver improvements

Browse Source
This commit is contained in:
LukePulverenti Luke Pulverenti luke pulverenti
2012-07-12 13:09:35 -04:00
parent b50f78e5da
commit 4c9f77eead
9 changed files with 51 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/Kernel.cs
View File

@@ -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()

32
MediaBrowser.Controller/Library/ItemDataCache.cs
View File

@@ -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;
}
}
}

1
MediaBrowser.Controller/MediaBrowser.Controller.csproj
View File

@@ -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" />

20
MediaBrowser.Controller/Xml/BaseItemXmlParser.cs
View File

@@ -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: