mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-08 04:18:06 +02:00
This commit includes changes to enable and stabilize asyncronous operation in the auto-organize area. Here are the key points: - The auto-organize correction dialog is now closed (almost) instantly. This means that the user does not have to wait until the file copy/move operation is completed in order to continue. (even with local HDs the copy/move process can take several minutes or even much longer with network destination). - This commit also implements locking of files to be organized in order to prevent parallel processing of the same item. In effect, there can be 2 or more manual organization operations active even while the normal auto-organization task is running without causing any problems - The items that are currently being processed are indicated as such in the log with an orange color and a spinner graphic - The client display is refreshed through websocket messages - A side effect of this is that other clients showing the auto-organize log at the same time are always up-to-date as well
281 lines
9.9 KiB
C#
281 lines
9.9 KiB
C#
using MediaBrowser.Common.Extensions;
|
|
using MediaBrowser.Common.ScheduledTasks;
|
|
using MediaBrowser.Controller.Configuration;
|
|
using MediaBrowser.Controller.FileOrganization;
|
|
using MediaBrowser.Controller.Library;
|
|
using MediaBrowser.Controller.Net;
|
|
using MediaBrowser.Controller.Persistence;
|
|
using MediaBrowser.Controller.Providers;
|
|
using MediaBrowser.Model.FileOrganization;
|
|
using MediaBrowser.Model.Logging;
|
|
using MediaBrowser.Model.Querying;
|
|
using System;
|
|
using System.Collections.Concurrent;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using System.Threading.Tasks;
|
|
using CommonIO;
|
|
using MediaBrowser.Controller.Session;
|
|
using MediaBrowser.Model.Events;
|
|
using MediaBrowser.Common.Events;
|
|
|
|
namespace MediaBrowser.Server.Implementations.FileOrganization
|
|
{
|
|
public class FileOrganizationService : IFileOrganizationService
|
|
{
|
|
private readonly ITaskManager _taskManager;
|
|
private readonly IFileOrganizationRepository _repo;
|
|
private readonly ILogger _logger;
|
|
private readonly ILibraryMonitor _libraryMonitor;
|
|
private readonly ILibraryManager _libraryManager;
|
|
private readonly IServerConfigurationManager _config;
|
|
private readonly IFileSystem _fileSystem;
|
|
private readonly IProviderManager _providerManager;
|
|
private readonly ConcurrentDictionary<string, bool> _inProgressItemIds = new ConcurrentDictionary<string, bool>();
|
|
|
|
public event EventHandler<GenericEventArgs<FileOrganizationResult>> ItemAdded;
|
|
public event EventHandler<GenericEventArgs<FileOrganizationResult>> ItemUpdated;
|
|
public event EventHandler<GenericEventArgs<FileOrganizationResult>> ItemRemoved;
|
|
public event EventHandler LogReset;
|
|
|
|
public FileOrganizationService(ITaskManager taskManager, IFileOrganizationRepository repo, ILogger logger, ILibraryMonitor libraryMonitor, ILibraryManager libraryManager, IServerConfigurationManager config, IFileSystem fileSystem, IProviderManager providerManager)
|
|
{
|
|
_taskManager = taskManager;
|
|
_repo = repo;
|
|
_logger = logger;
|
|
_libraryMonitor = libraryMonitor;
|
|
_libraryManager = libraryManager;
|
|
_config = config;
|
|
_fileSystem = fileSystem;
|
|
_providerManager = providerManager;
|
|
}
|
|
|
|
public void BeginProcessNewFiles()
|
|
{
|
|
_taskManager.CancelIfRunningAndQueue<OrganizerScheduledTask>();
|
|
}
|
|
|
|
public Task SaveResult(FileOrganizationResult result, CancellationToken cancellationToken)
|
|
{
|
|
if (result == null || string.IsNullOrEmpty(result.OriginalPath))
|
|
{
|
|
throw new ArgumentNullException("result");
|
|
}
|
|
|
|
result.Id = result.OriginalPath.GetMD5().ToString("N");
|
|
|
|
return _repo.SaveResult(result, cancellationToken);
|
|
}
|
|
|
|
public QueryResult<FileOrganizationResult> GetResults(FileOrganizationResultQuery query)
|
|
{
|
|
var results = _repo.GetResults(query);
|
|
|
|
foreach (var result in results.Items)
|
|
{
|
|
result.IsInProgress = _inProgressItemIds.ContainsKey(result.Id);
|
|
}
|
|
|
|
return results;
|
|
}
|
|
|
|
public FileOrganizationResult GetResult(string id)
|
|
{
|
|
var result = _repo.GetResult(id);
|
|
|
|
if (result != null)
|
|
{
|
|
result.IsInProgress = _inProgressItemIds.ContainsKey(result.Id);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
public FileOrganizationResult GetResultBySourcePath(string path)
|
|
{
|
|
if (string.IsNullOrEmpty(path))
|
|
{
|
|
throw new ArgumentNullException("path");
|
|
}
|
|
|
|
var id = path.GetMD5().ToString("N");
|
|
|
|
return GetResult(id);
|
|
}
|
|
|
|
public async Task DeleteOriginalFile(string resultId)
|
|
{
|
|
var result = _repo.GetResult(resultId);
|
|
|
|
_logger.Info("Requested to delete {0}", result.OriginalPath);
|
|
|
|
if (!AddToInProgressList(result, false))
|
|
{
|
|
throw new Exception("Path is currently processed otherwise. Please try again later.");
|
|
}
|
|
|
|
try
|
|
{
|
|
_fileSystem.DeleteFile(result.OriginalPath);
|
|
}
|
|
catch (Exception ex)
|
|
{
|
|
_logger.ErrorException("Error deleting {0}", ex, result.OriginalPath);
|
|
}
|
|
finally
|
|
{
|
|
RemoveFromInprogressList(result);
|
|
}
|
|
|
|
await _repo.Delete(resultId);
|
|
|
|
EventHelper.FireEventIfNotNull(ItemRemoved, this, new GenericEventArgs<FileOrganizationResult>(result), _logger);
|
|
}
|
|
|
|
private AutoOrganizeOptions GetAutoOrganizeOptions()
|
|
{
|
|
return _config.GetAutoOrganizeOptions();
|
|
}
|
|
|
|
public async Task PerformOrganization(string resultId)
|
|
{
|
|
var result = _repo.GetResult(resultId);
|
|
|
|
if (string.IsNullOrEmpty(result.TargetPath))
|
|
{
|
|
throw new ArgumentException("No target path available.");
|
|
}
|
|
|
|
var organizer = new EpisodeFileOrganizer(this, _config, _fileSystem, _logger, _libraryManager,
|
|
_libraryMonitor, _providerManager);
|
|
|
|
var organizeResult = await organizer.OrganizeEpisodeFile(result.OriginalPath, GetAutoOrganizeOptions(), true, CancellationToken.None)
|
|
.ConfigureAwait(false);
|
|
|
|
if (organizeResult.Status != FileSortingStatus.Success)
|
|
{
|
|
throw new Exception(result.StatusMessage);
|
|
}
|
|
}
|
|
|
|
public async Task ClearLog()
|
|
{
|
|
await _repo.DeleteAll();
|
|
EventHelper.FireEventIfNotNull(LogReset, this, EventArgs.Empty, _logger);
|
|
}
|
|
|
|
public async Task PerformEpisodeOrganization(EpisodeFileOrganizationRequest request)
|
|
{
|
|
var organizer = new EpisodeFileOrganizer(this, _config, _fileSystem, _logger, _libraryManager,
|
|
_libraryMonitor, _providerManager);
|
|
|
|
var result = await organizer.OrganizeWithCorrection(request, GetAutoOrganizeOptions(), CancellationToken.None).ConfigureAwait(false);
|
|
|
|
if (result.Status != FileSortingStatus.Success)
|
|
{
|
|
throw new Exception(result.StatusMessage);
|
|
}
|
|
}
|
|
|
|
public QueryResult<SmartMatchInfo> GetSmartMatchInfos(FileOrganizationResultQuery query)
|
|
{
|
|
if (query == null)
|
|
{
|
|
throw new ArgumentNullException("query");
|
|
}
|
|
|
|
var options = GetAutoOrganizeOptions();
|
|
|
|
var items = options.SmartMatchInfos.Skip(query.StartIndex ?? 0).Take(query.Limit ?? Int32.MaxValue).ToArray();
|
|
|
|
return new QueryResult<SmartMatchInfo>()
|
|
{
|
|
Items = items,
|
|
TotalRecordCount = options.SmartMatchInfos.Length
|
|
};
|
|
}
|
|
|
|
public void DeleteSmartMatchEntry(string itemName, string matchString)
|
|
{
|
|
if (string.IsNullOrEmpty(itemName))
|
|
{
|
|
throw new ArgumentNullException("itemName");
|
|
}
|
|
|
|
if (string.IsNullOrEmpty(matchString))
|
|
{
|
|
throw new ArgumentNullException("matchString");
|
|
}
|
|
|
|
var options = GetAutoOrganizeOptions();
|
|
|
|
SmartMatchInfo info = options.SmartMatchInfos.FirstOrDefault(i => string.Equals(i.ItemName, itemName));
|
|
|
|
if (info != null && info.MatchStrings.Contains(matchString))
|
|
{
|
|
var list = info.MatchStrings.ToList();
|
|
list.Remove(matchString);
|
|
info.MatchStrings = list.ToArray();
|
|
|
|
if (info.MatchStrings.Length == 0)
|
|
{
|
|
var infos = options.SmartMatchInfos.ToList();
|
|
infos.Remove(info);
|
|
options.SmartMatchInfos = infos.ToArray();
|
|
}
|
|
|
|
_config.SaveAutoOrganizeOptions(options);
|
|
}
|
|
}
|
|
|
|
/// <summary>
|
|
/// Attempts to add a an item to the list of currently processed items.
|
|
/// </summary>
|
|
/// <param name="result">The result item.</param>
|
|
/// <param name="isNewItem">Passing true will notify the client to reload all items, otherwise only a single item will be refreshed.</param>
|
|
/// <returns>True if the item was added, False if the item is already contained in the list.</returns>
|
|
public bool AddToInProgressList(FileOrganizationResult result, bool isNewItem)
|
|
{
|
|
if (string.IsNullOrWhiteSpace(result.Id))
|
|
{
|
|
result.Id = result.OriginalPath.GetMD5().ToString("N");
|
|
}
|
|
|
|
if (!_inProgressItemIds.TryAdd(result.Id, false))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
result.IsInProgress = true;
|
|
|
|
if (isNewItem)
|
|
{
|
|
EventHelper.FireEventIfNotNull(ItemAdded, this, new GenericEventArgs<FileOrganizationResult>(result), _logger);
|
|
}
|
|
else
|
|
{
|
|
EventHelper.FireEventIfNotNull(ItemUpdated, this, new GenericEventArgs<FileOrganizationResult>(result), _logger);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Removes an item from the list of currently processed items.
|
|
/// </summary>
|
|
/// <param name="result">The result item.</param>
|
|
/// <returns>True if the item was removed, False if the item was not contained in the list.</returns>
|
|
public bool RemoveFromInprogressList(FileOrganizationResult result)
|
|
{
|
|
bool itemValue;
|
|
var retval = _inProgressItemIds.TryRemove(result.Id, out itemValue);
|
|
|
|
result.IsInProgress = false;
|
|
|
|
EventHelper.FireEventIfNotNull(ItemUpdated, this, new GenericEventArgs<FileOrganizationResult>(result), _logger);
|
|
|
|
return retval;
|
|
}
|
|
|
|
}
|
|
}
|