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

Merge pull request #5945 from Bond-009/fix

Browse Source 
Fix scanning
This commit is contained in:
Bond-009 2021-05-01 17:43:12 +02:00 committed by GitHub
commit 9a8c08b3e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/IO/ManagedFileSystem.cs
View File

@ -260,8 +260,6 @@ namespace Emby.Server.Implementations.IO
result.Exists = false; result.Exists = false;
} }
} }
result.DirectoryName = fileInfo.DirectoryName;
} }
result.CreationTimeUtc = GetCreationTimeUtc(info); result.CreationTimeUtc = GetCreationTimeUtc(info);

2
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -683,7 +683,7 @@ namespace Emby.Server.Implementations.Library
foreach (var item in items) foreach (var item in items)
{ {
ResolverHelper.SetInitialItemValues(item, parent, _fileSystem, this, directoryService); ResolverHelper.SetInitialItemValues(item, parent, this, directoryService);
} }
items.AddRange(ResolveFileList(result.ExtraFiles, directoryService, parent, collectionType, resolvers, libraryOptions)); items.AddRange(ResolveFileList(result.ExtraFiles, directoryService, parent, collectionType, resolvers, libraryOptions));

3
Emby.Server.Implementations/Library/ResolverHelper.cs
View File

@ -20,11 +20,10 @@ namespace Emby.Server.Implementations.Library
/// </summary> /// </summary>
/// <param name="item">The item.</param> /// <param name="item">The item.</param>
/// <param name="parent">The parent.</param> /// <param name="parent">The parent.</param>
/// <param name="fileSystem">The file system.</param>
/// <param name="libraryManager">The library manager.</param> /// <param name="libraryManager">The library manager.</param>
/// <param name="directoryService">The directory service.</param> /// <param name="directoryService">The directory service.</param>
/// <exception cref="ArgumentException">Item must have a path.</exception> /// <exception cref="ArgumentException">Item must have a path.</exception>
public static void SetInitialItemValues(BaseItem item, Folder? parent, IFileSystem fileSystem, ILibraryManager libraryManager, IDirectoryService directoryService) public static void SetInitialItemValues(BaseItem item, Folder? parent, ILibraryManager libraryManager, IDirectoryService directoryService)
{ {
// This version of the below method has no ItemResolveArgs, so we have to require the path already being set // This version of the below method has no ItemResolveArgs, so we have to require the path already being set
if (string.IsNullOrEmpty(item.Path)) if (string.IsNullOrEmpty(item.Path))

2
MediaBrowser.Controller/Library/ItemResolveArgs.cs
View File

@ -87,7 +87,7 @@ namespace MediaBrowser.Controller.Library
return false; return false;
} }
var parentDir = FileInfo.DirectoryName ?? string.Empty; var parentDir = System.IO.Path.GetDirectoryName(Path) ?? string.Empty;
return parentDir.Length > _appPaths.RootFolderPath.Length return parentDir.Length > _appPaths.RootFolderPath.Length
&& parentDir.StartsWith(_appPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase); && parentDir.StartsWith(_appPaths.RootFolderPath, StringComparison.OrdinalIgnoreCase);

6
MediaBrowser.Model/IO/FileSystemMetadata.cs
View File

@ -37,12 +37,6 @@ namespace MediaBrowser.Model.IO
/// <value>The length.</value> /// <value>The length.</value>
public long Length { get; set; } public long Length { get; set; }
/// <summary>
/// Gets or sets the name of the directory.
/// </summary>
/// <value>The name of the directory.</value>
public string DirectoryName { get; set; }
/// <summary> /// <summary>
/// Gets or sets the last write time UTC. /// Gets or sets the last write time UTC.
/// </summary> /// </summary>