mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-08 18:54:26 -04:00
Merge fixes
This commit is contained in:
parent
3a868e28b3
commit
c02635c256
@ -38,7 +38,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
|||||||
|
|
||||||
private bool EnableOrganization(FileSystemMetadata fileInfo, TvFileOrganizationOptions options)
|
private bool EnableOrganization(FileSystemMetadata fileInfo, TvFileOrganizationOptions options)
|
||||||
{
|
{
|
||||||
var minFileBytes = options.TvOptions.MinFileSizeMb * 1024 * 1024;
|
var minFileBytes = options.MinFileSizeMb * 1024 * 1024;
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -58,7 +58,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
|||||||
|
|
||||||
var eligibleFiles = watchLocations.SelectMany(GetFilesToOrganize)
|
var eligibleFiles = watchLocations.SelectMany(GetFilesToOrganize)
|
||||||
.OrderBy(_fileSystem.GetCreationTimeUtc)
|
.OrderBy(_fileSystem.GetCreationTimeUtc)
|
||||||
.Where(i => EnableOrganization(i, options))
|
.Where(i => EnableOrganization(i, options.TvOptions))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
var processedFolders = new HashSet<string>();
|
var processedFolders = new HashSet<string>();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user