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 with multi disc movies

Browse Source
This commit is contained in:
Luke Pulverenti 2013-06-16 21:49:41 -04:00
parent ff22828dd8
commit 90155278f8
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
MediaBrowser.Controller/Entities/Video.cs
View File

@ -1,4 +1,5 @@
using MediaBrowser.Controller.Library; using System.Collections;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Entities; using MediaBrowser.Model.Entities;
using System; using System;
@ -136,7 +137,19 @@ namespace MediaBrowser.Controller.Entities
// Kick off a task to refresh the main item // Kick off a task to refresh the main item
var result = await base.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders).ConfigureAwait(false); var result = await base.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders).ConfigureAwait(false);
var additionalPartsChanged = await RefreshAdditionalParts(cancellationToken, forceSave, forceRefresh, allowSlowProviders).ConfigureAwait(false); var additionalPartsChanged = false;
if (IsMultiPart && LocationType == LocationType.FileSystem)
{
try
{
additionalPartsChanged = await RefreshAdditionalParts(cancellationToken, forceSave, forceRefresh, allowSlowProviders).ConfigureAwait(false);
}
catch (IOException ex)
{
Logger.ErrorException("Error loading additional parts for {0}.", ex, Name);
}
}
return additionalPartsChanged || result; return additionalPartsChanged || result;
} }
@ -151,7 +164,13 @@ namespace MediaBrowser.Controller.Entities
/// <returns>Task{System.Boolean}.</returns> /// <returns>Task{System.Boolean}.</returns>
private async Task<bool> RefreshAdditionalParts(CancellationToken cancellationToken, bool forceSave = false, bool forceRefresh = false, bool allowSlowProviders = true) private async Task<bool> RefreshAdditionalParts(CancellationToken cancellationToken, bool forceSave = false, bool forceRefresh = false, bool allowSlowProviders = true)
{ {
if (!IsMultiPart || LocationType != LocationType.FileSystem)
{
return false;
}
var newItems = LoadAdditionalParts().ToList(); var newItems = LoadAdditionalParts().ToList();
var newItemIds = newItems.Select(i => i.Id).ToList(); var newItemIds = newItems.Select(i => i.Id).ToList();
var itemsChanged = !AdditionalPartIds.SequenceEqual(newItemIds); var itemsChanged = !AdditionalPartIds.SequenceEqual(newItemIds);
@ -171,11 +190,6 @@ namespace MediaBrowser.Controller.Entities
/// <returns>IEnumerable{Video}.</returns> /// <returns>IEnumerable{Video}.</returns>
private IEnumerable<Video> LoadAdditionalParts() private IEnumerable<Video> LoadAdditionalParts()
{ {
if (!IsMultiPart || LocationType != LocationType.FileSystem)
{
return new List<Video>();
}
IEnumerable<FileSystemInfo> files; IEnumerable<FileSystemInfo> files;
if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd) if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd)
@ -186,19 +200,7 @@ namespace MediaBrowser.Controller.Entities
} }
else else
{ {
ItemResolveArgs resolveArgs; files = ResolveArgs.FileSystemChildren.Where(i =>
try
{
resolveArgs = ResolveArgs;
}
catch (IOException ex)
{
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
return new List<Video>();
}
files = resolveArgs.FileSystemChildren.Where(i =>
{ {
if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory) if ((i.Attributes & FileAttributes.Directory) == FileAttributes.Directory)
{ {