mirror of https://github.com/jellyfin/jellyfin.git
update media sync
This commit is contained in:
parent
8327094df3
commit
0d6580baf3
|
@ -62,7 +62,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
|
var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
|
||||||
if (result.Status == FileSortingStatus.Success && !processedFolders.Contains(file.DirectoryName))
|
if (result.Status == FileSortingStatus.Success && !processedFolders.Contains(file.DirectoryName, StringComparer.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
processedFolders.Add(file.DirectoryName);
|
processedFolders.Add(file.DirectoryName);
|
||||||
}
|
}
|
||||||
|
@ -188,18 +188,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
||||||
/// <param name="watchLocations">A list of folders.</param>
|
/// <param name="watchLocations">A list of folders.</param>
|
||||||
private bool IsWatchFolder(string path, IEnumerable<string> watchLocations)
|
private bool IsWatchFolder(string path, IEnumerable<string> watchLocations)
|
||||||
{
|
{
|
||||||
// Use GetFullPath to resolve 8.3 naming and path indirections
|
return watchLocations.Contains(path, StringComparer.OrdinalIgnoreCase);
|
||||||
path = Path.GetFullPath(path);
|
|
||||||
|
|
||||||
foreach (var watchFolder in watchLocations)
|
|
||||||
{
|
|
||||||
if (String.Equals(path, Path.GetFullPath(watchFolder), StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue