michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Luke Pulverenti 2013-12-06 15:07:39 -05:00
commit eac0ab9d59
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1212,7 +1212,7 @@ namespace MediaBrowser.Controller.Entities
{ {
var changed = await base.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders, resetResolveArgs).ConfigureAwait(false); var changed = await base.RefreshMetadata(cancellationToken, forceSave, forceRefresh, allowSlowProviders, resetResolveArgs).ConfigureAwait(false);
return changed || (SupportsShortcutChildren && LocationType == LocationType.FileSystem && RefreshLinkedChildren()); return (SupportsShortcutChildren && LocationType == LocationType.FileSystem && RefreshLinkedChildren()) || changed;
} }
/// <summary> /// <summary>
@ -1362,14 +1362,10 @@ namespace MediaBrowser.Controller.Entities
//this should be functionally equivilent to what was here since it is IEnum and works on a thread-safe copy //this should be functionally equivilent to what was here since it is IEnum and works on a thread-safe copy
return RecursiveChildren.Where(i => i.LocationType != LocationType.Virtual).FirstOrDefault(i => return RecursiveChildren.Where(i => i.LocationType != LocationType.Virtual).FirstOrDefault(i =>
{ {
if (i.LocationType == LocationType.Remote)
{
return string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase);
}
try try
{ {
return i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase); return string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase)
|| i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase);
} }
catch (IOException ex) catch (IOException ex)
{ {