mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
update FindByPath to not check PhysicalLocations for remote items
This commit is contained in:
parent
f856e166ff
commit
baf6c3efc7
1 changed files with 14 additions and 3 deletions
|
@ -1359,13 +1359,24 @@ namespace MediaBrowser.Controller.Entities
|
||||||
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
|
Logger.ErrorException("Error getting ResolveArgs for {0}", ex, Path);
|
||||||
}
|
}
|
||||||
|
|
||||||
//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 =>
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
return string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase)
|
if (string.Equals(i.Path, path, StringComparison.OrdinalIgnoreCase))
|
||||||
|| i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase);
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (i.LocationType != LocationType.Remote)
|
||||||
|
{
|
||||||
|
if (i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
catch (IOException ex)
|
catch (IOException ex)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue