diff options
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 16 |
2 files changed, 26 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 3f670b807f..77cc541675 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -357,7 +357,10 @@ namespace MediaBrowser.Controller.Entities { var path = Path; - if (LocationType == LocationType.Remote || LocationType == LocationType.Virtual) + var locationType = LocationType; + + if (locationType == LocationType.Remote || + locationType == LocationType.Virtual) { return new ItemResolveArgs(ConfigurationManager.ApplicationPaths, LibraryManager); } @@ -1499,7 +1502,7 @@ namespace MediaBrowser.Controller.Entities BackdropImagePaths.Remove(file); RemoveImageSourceForPath(file); - + // Delete the source file DeleteImagePath(file); } @@ -1720,6 +1723,14 @@ namespace MediaBrowser.Controller.Entities throw new ArgumentNullException("imagePath"); } + var locationType = LocationType; + + if (locationType == LocationType.Remote || + locationType == LocationType.Virtual) + { + return File.GetLastWriteTimeUtc(imagePath); + } + var metaFileEntry = ResolveArgs.GetMetaFileByPath(imagePath); // If we didn't the metafile entry, check the Season diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index faaf2ad8b7..c54b812420 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -796,7 +796,7 @@ namespace MediaBrowser.Controller.Entities foreach (var tuple in list) { - if (tasks.Count > 5) + if (tasks.Count > 7) { await Task.WhenAll(tasks).ConfigureAwait(false); } @@ -1347,7 +1347,12 @@ namespace MediaBrowser.Controller.Entities try { - if (ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase)) + if (LocationType == LocationType.Remote && string.Equals(Path, path, StringComparison.OrdinalIgnoreCase)) + { + return this; + } + + if (LocationType != LocationType.Virtual && ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase)) { return this; } @@ -1358,8 +1363,13 @@ namespace MediaBrowser.Controller.Entities } //this should be functionally equivilent to what was here since it is IEnum and works on a thread-safe copy - return RecursiveChildren.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 { return i.ResolveArgs.PhysicalLocations.Contains(path, StringComparer.OrdinalIgnoreCase); |