aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-26 12:08:16 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-06-26 12:08:16 -0400
commit6025a89235f0677e38992abee49e914b47e762cb (patch)
treeeb584963d579027ffbce725dad55fa9ca302dce2 /MediaBrowser.Server.Implementations/Library/LibraryManager.cs
parent934584313eb1ce97ba26eba343dc1b3cd53f36dc (diff)
read 3d format from xml
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/LibraryManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/Library/LibraryManager.cs11
1 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 3e6370868..a2ef2fe4e 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -573,7 +573,7 @@ namespace MediaBrowser.Server.Implementations.Library
Directory.CreateDirectory(rootFolderPath);
}
- var rootFolder = RetrieveItem(rootFolderPath.GetMBId(typeof(AggregateFolder)), typeof(AggregateFolder)) as AggregateFolder ?? (AggregateFolder)ResolvePath(new DirectoryInfo(rootFolderPath));
+ var rootFolder = RetrieveItem(rootFolderPath.GetMBId(typeof(AggregateFolder))) as AggregateFolder ?? (AggregateFolder)ResolvePath(new DirectoryInfo(rootFolderPath));
// Add in the plug-in folders
foreach (var child in PluginFolderCreators)
@@ -598,7 +598,7 @@ namespace MediaBrowser.Server.Implementations.Library
/// <returns>UserRootFolder.</returns>
public UserRootFolder GetUserRootFolder(string userRootPath)
{
- return _userRootFolders.GetOrAdd(userRootPath, key => RetrieveItem(userRootPath.GetMBId(typeof(UserRootFolder)), typeof(UserRootFolder)) as UserRootFolder ??
+ return _userRootFolders.GetOrAdd(userRootPath, key => RetrieveItem(userRootPath.GetMBId(typeof(UserRootFolder))) as UserRootFolder ??
(UserRootFolder)ResolvePath(new DirectoryInfo(userRootPath)));
}
@@ -793,7 +793,7 @@ namespace MediaBrowser.Server.Implementations.Library
var id = path.GetMBId(type);
- var item = RetrieveItem(id, type) as T;
+ var item = RetrieveItem(id) as T;
if (item == null)
{
item = new T
@@ -1350,11 +1350,10 @@ namespace MediaBrowser.Server.Implementations.Library
/// Retrieves the item.
/// </summary>
/// <param name="id">The id.</param>
- /// <param name="type">The type.</param>
/// <returns>BaseItem.</returns>
- public BaseItem RetrieveItem(Guid id, Type type)
+ public BaseItem RetrieveItem(Guid id)
{
- return ItemRepository.RetrieveItem(id, type);
+ return ItemRepository.RetrieveItem(id);
}
private readonly ConcurrentDictionary<string, SemaphoreSlim> _fileLocks = new ConcurrentDictionary<string, SemaphoreSlim>();