alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 22:38:30 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

referenced core plugins, fixed some dashboard issues, extracted library manager

Browse Source
This commit is contained in:
LukePulverenti
2013-02-28 14:32:41 -05:00
parent 4435e83e69
commit af7aa597c3
52 changed files with 557 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@@ -95,6 +95,7 @@ namespace MediaBrowser.Controller.Entities
/// The logger
/// </summary>
protected static internal ILogger Logger { get; internal set; }
protected static internal ILibraryManager LibraryManager { get; internal set; }
/// <summary>
/// Returns a <see cref="System.String" /> that represents this instance.
@@ -613,7 +614,7 @@ namespace MediaBrowser.Controller.Entities
return new List<Video> { };
}
return Kernel.Instance.LibraryManager.GetItems<Video>(files, null).Select(video =>
return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = Kernel.Instance.ItemRepository.RetrieveItem(video.Id) as Video;

2
MediaBrowser.Controller/Entities/CollectionFolder.cs
View File

@@ -88,7 +88,7 @@ namespace MediaBrowser.Controller.Entities
}
var ourChildren =
Kernel.Instance.RootFolder.Children.OfType<Folder>()
LibraryManager.RootFolder.Children.OfType<Folder>()
.Where(i => folderIds.Contains(i.Id))
.SelectMany(c => c.Children);

12
MediaBrowser.Controller/Entities/Folder.cs
View File

@@ -317,7 +317,7 @@ namespace MediaBrowser.Controller.Entities
{
try
{
return Kernel.Instance.LibraryManager.GetPerson(i).Result;
return LibraryManager.GetPerson(i).Result;
}
catch (IOException ex)
{
@@ -359,7 +359,7 @@ namespace MediaBrowser.Controller.Entities
{
try
{
return Kernel.Instance.LibraryManager.GetStudio(i).Result;
return LibraryManager.GetStudio(i).Result;
}
catch (IOException ex)
{
@@ -399,7 +399,7 @@ namespace MediaBrowser.Controller.Entities
{
try
{
return Kernel.Instance.LibraryManager.GetGenre(i).Result;
return LibraryManager.GetGenre(i).Result;
}
catch (IOException ex)
{
@@ -440,7 +440,7 @@ namespace MediaBrowser.Controller.Entities
{
try
{
return Kernel.Instance.LibraryManager.GetYear(i).Result;
return LibraryManager.GetYear(i).Result;
}
catch (IOException ex)
{
@@ -768,7 +768,7 @@ namespace MediaBrowser.Controller.Entities
IndexCache.Clear();
//and fire event
Kernel.Instance.LibraryManager.OnLibraryChanged(changedArgs);
LibraryManager.ReportLibraryChanged(changedArgs);
}
progress.Report(15);
@@ -860,7 +860,7 @@ namespace MediaBrowser.Controller.Entities
return new List<BaseItem> { };
}
return Kernel.Instance.LibraryManager.GetItems<BaseItem>(fileSystemChildren, this);
return LibraryManager.ResolvePaths<BaseItem>(fileSystemChildren, this);
}
/// <summary>

2
MediaBrowser.Controller/Entities/Movies/Movie.cs
View File

@@ -181,7 +181,7 @@ namespace MediaBrowser.Controller.Entities.Movies
return new List<Video> { };
}
return Kernel.Instance.LibraryManager.GetItems<Video>(files, null).Select(video =>
return LibraryManager.ResolvePaths<Video>(files, null).Select(video =>
{
// Try to retrieve it from the db. If we don't find it, use the resolved version
var dbItem = Kernel.Instance.ItemRepository.RetrieveItem(video.Id) as Video;

2
MediaBrowser.Controller/Entities/User.cs
View File

@@ -124,7 +124,7 @@ namespace MediaBrowser.Controller.Entities
{
get
{
LazyInitializer.EnsureInitialized(ref _rootFolder, ref _userRootFolderInitialized, ref _userRootFolderSyncLock, () => (UserRootFolder)Kernel.Instance.LibraryManager.GetItem(RootFolderPath));
LazyInitializer.EnsureInitialized(ref _rootFolder, ref _userRootFolderInitialized, ref _userRootFolderSyncLock, () => (UserRootFolder)LibraryManager.ResolvePath(RootFolderPath));
return _rootFolder;
}
private set

2
MediaBrowser.Controller/Entities/UserRootFolder.cs
View File

@@ -15,7 +15,7 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IEnumerable{BaseItem}.</returns>
protected override IEnumerable<BaseItem> GetNonCachedChildren()
{
return base.GetNonCachedChildren().Concat(Kernel.Instance.RootFolder.VirtualChildren);
return base.GetNonCachedChildren().Concat(LibraryManager.RootFolder.VirtualChildren);
}
}
}