Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

added error handling to collection folder

Browse Source
This commit is contained in:
Luke Pulverenti 2013-06-20 14:07:58 -04:00
parent 1fe32171cd
commit 8ccc871d72
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
using MediaBrowser.Common.Extensions; using System;
using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -7,6 +6,7 @@ using System.Linq;
using System.Runtime.Serialization; using System.Runtime.Serialization;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.Library;
namespace MediaBrowser.Controller.Entities namespace MediaBrowser.Controller.Entities
{ {
@ -73,11 +73,23 @@ namespace MediaBrowser.Controller.Entities
{ {
get get
{ {
ItemResolveArgs resolveArgs;
try
{
resolveArgs = ResolveArgs;
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new ConcurrentDictionary<Guid, BaseItem>();
}
var ourChildren = var ourChildren =
LibraryManager.RootFolder.RecursiveChildren LibraryManager.RootFolder.RecursiveChildren
.Where(i => i is Folder && i.Path != null && ResolveArgs.PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase)) .OfType<Folder>()
.Cast<Folder>().SelectMany(c => c.Children); .Where(i => i.Path != null && resolveArgs.PhysicalLocations.Contains(i.Path, StringComparer.OrdinalIgnoreCase))
.SelectMany(c => c.Children);
return new ConcurrentDictionary<Guid,BaseItem>(ourChildren.ToDictionary(i => i.Id)); return new ConcurrentDictionary<Guid,BaseItem>(ourChildren.ToDictionary(i => i.Id));
} }