aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Sync
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api/Sync')
-rw-r--r--MediaBrowser.Api/Sync/SyncJobWebSocketListener.cs120
-rw-r--r--MediaBrowser.Api/Sync/SyncJobsWebSocketListener.cs101
-rw-r--r--MediaBrowser.Api/Sync/SyncService.cs98
3 files changed, 314 insertions, 5 deletions
diff --git a/MediaBrowser.Api/Sync/SyncJobWebSocketListener.cs b/MediaBrowser.Api/Sync/SyncJobWebSocketListener.cs
new file mode 100644
index 000000000..61a26d160
--- /dev/null
+++ b/MediaBrowser.Api/Sync/SyncJobWebSocketListener.cs
@@ -0,0 +1,120 @@
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Events;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Sync;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.Sync
+{
+ /// <summary>
+ /// Class SessionInfoWebSocketListener
+ /// </summary>
+ class SyncJobWebSocketListener : BasePeriodicWebSocketListener<CompleteSyncJobInfo, WebSocketListenerState>
+ {
+ /// <summary>
+ /// Gets the name.
+ /// </summary>
+ /// <value>The name.</value>
+ protected override string Name
+ {
+ get { return "SyncJob"; }
+ }
+
+ private readonly ISyncManager _syncManager;
+ private string _jobId;
+
+ public SyncJobWebSocketListener(ILogger logger, ISyncManager syncManager)
+ : base(logger)
+ {
+ _syncManager = syncManager;
+ _syncManager.SyncJobCancelled += _syncManager_SyncJobCancelled;
+ _syncManager.SyncJobUpdated += _syncManager_SyncJobUpdated;
+ _syncManager.SyncJobItemCreated += _syncManager_SyncJobItemCreated;
+ _syncManager.SyncJobItemUpdated += _syncManager_SyncJobItemUpdated;
+ }
+
+ void _syncManager_SyncJobItemUpdated(object sender, GenericEventArgs<SyncJobItem> e)
+ {
+ if (string.Equals(e.Argument.Id, _jobId, StringComparison.Ordinal))
+ {
+ SendData(false);
+ }
+ }
+
+ void _syncManager_SyncJobItemCreated(object sender, GenericEventArgs<SyncJobItem> e)
+ {
+ if (string.Equals(e.Argument.Id, _jobId, StringComparison.Ordinal))
+ {
+ SendData(true);
+ }
+ }
+
+ protected override void ParseMessageParams(string[] values)
+ {
+ base.ParseMessageParams(values);
+
+ if (values.Length > 0)
+ {
+ _jobId = values[0];
+ }
+ }
+
+ void _syncManager_SyncJobUpdated(object sender, GenericEventArgs<SyncJob> e)
+ {
+ if (string.Equals(e.Argument.Id, _jobId, StringComparison.Ordinal))
+ {
+ SendData(false);
+ }
+ }
+
+ void _syncManager_SyncJobCancelled(object sender, GenericEventArgs<SyncJob> e)
+ {
+ if (string.Equals(e.Argument.Id, _jobId, StringComparison.Ordinal))
+ {
+ SendData(true);
+ }
+ }
+
+ /// <summary>
+ /// Gets the data to send.
+ /// </summary>
+ /// <param name="state">The state.</param>
+ /// <returns>Task{SystemInfo}.</returns>
+ protected override Task<CompleteSyncJobInfo> GetDataToSend(WebSocketListenerState state)
+ {
+ var job = _syncManager.GetJob(_jobId);
+ var items = _syncManager.GetJobItems(new SyncJobItemQuery
+ {
+ AddMetadata = true,
+ JobId = _jobId
+ });
+
+ var info = new CompleteSyncJobInfo
+ {
+ Job = job,
+ JobItems = items.Items.ToList()
+ };
+
+ return Task.FromResult(info);
+ }
+
+ protected override bool SendOnTimer
+ {
+ get
+ {
+ return false;
+ }
+ }
+
+ protected override void Dispose(bool dispose)
+ {
+ _syncManager.SyncJobCancelled -= _syncManager_SyncJobCancelled;
+ _syncManager.SyncJobUpdated -= _syncManager_SyncJobUpdated;
+
+ base.Dispose(dispose);
+ }
+ }
+}
diff --git a/MediaBrowser.Api/Sync/SyncJobsWebSocketListener.cs b/MediaBrowser.Api/Sync/SyncJobsWebSocketListener.cs
new file mode 100644
index 000000000..906a52209
--- /dev/null
+++ b/MediaBrowser.Api/Sync/SyncJobsWebSocketListener.cs
@@ -0,0 +1,101 @@
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Sync;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Sync;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Api.Sync
+{
+ /// <summary>
+ /// Class SessionInfoWebSocketListener
+ /// </summary>
+ class SyncJobsWebSocketListener : BasePeriodicWebSocketListener<IEnumerable<SyncJob>, WebSocketListenerState>
+ {
+ /// <summary>
+ /// Gets the name.
+ /// </summary>
+ /// <value>The name.</value>
+ protected override string Name
+ {
+ get { return "SyncJobs"; }
+ }
+
+ private readonly ISyncManager _syncManager;
+ private string _userId;
+ private string _targetId;
+
+ public SyncJobsWebSocketListener(ILogger logger, ISyncManager syncManager)
+ : base(logger)
+ {
+ _syncManager = syncManager;
+ _syncManager.SyncJobCancelled += _syncManager_SyncJobCancelled;
+ _syncManager.SyncJobCreated += _syncManager_SyncJobCreated;
+ _syncManager.SyncJobUpdated += _syncManager_SyncJobUpdated;
+ }
+
+ protected override void ParseMessageParams(string[] values)
+ {
+ base.ParseMessageParams(values);
+
+ if (values.Length > 0)
+ {
+ _userId = values[0];
+ }
+
+ if (values.Length > 1)
+ {
+ _targetId = values[1];
+ }
+ }
+
+ void _syncManager_SyncJobUpdated(object sender, Model.Events.GenericEventArgs<SyncJob> e)
+ {
+ SendData(false);
+ }
+
+ void _syncManager_SyncJobCreated(object sender, Model.Events.GenericEventArgs<SyncJobCreationResult> e)
+ {
+ SendData(true);
+ }
+
+ void _syncManager_SyncJobCancelled(object sender, Model.Events.GenericEventArgs<SyncJob> e)
+ {
+ SendData(true);
+ }
+
+ /// <summary>
+ /// Gets the data to send.
+ /// </summary>
+ /// <param name="state">The state.</param>
+ /// <returns>Task{SystemInfo}.</returns>
+ protected override async Task<IEnumerable<SyncJob>> GetDataToSend(WebSocketListenerState state)
+ {
+ var jobs = await _syncManager.GetJobs(new SyncJobQuery
+ {
+ UserId = _userId,
+ TargetId = _targetId
+
+ }).ConfigureAwait(false);
+
+ return jobs.Items;
+ }
+
+ protected override bool SendOnTimer
+ {
+ get
+ {
+ return false;
+ }
+ }
+
+ protected override void Dispose(bool dispose)
+ {
+ _syncManager.SyncJobCancelled -= _syncManager_SyncJobCancelled;
+ _syncManager.SyncJobCreated -= _syncManager_SyncJobCreated;
+ _syncManager.SyncJobUpdated -= _syncManager_SyncJobUpdated;
+
+ base.Dispose(dispose);
+ }
+ }
+}
diff --git a/MediaBrowser.Api/Sync/SyncService.cs b/MediaBrowser.Api/Sync/SyncService.cs
index a7467c12f..094f056bd 100644
--- a/MediaBrowser.Api/Sync/SyncService.cs
+++ b/MediaBrowser.Api/Sync/SyncService.cs
@@ -2,7 +2,6 @@
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Sync;
-using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Querying;
using MediaBrowser.Model.Sync;
using MediaBrowser.Model.Users;
@@ -38,6 +37,34 @@ namespace MediaBrowser.Api.Sync
{
}
+ [Route("/Sync/JobItems/{Id}/Enable", "POST", Summary = "Enables a cancelled or queued sync job item")]
+ public class EnableSyncJobItem : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+ public string Id { get; set; }
+ }
+
+ [Route("/Sync/JobItems/{Id}/MarkForRemoval", "POST", Summary = "Marks a job item for removal")]
+ public class MarkJobItemForRemoval : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+ public string Id { get; set; }
+ }
+
+ [Route("/Sync/JobItems/{Id}/UnmarkForRemoval", "POST", Summary = "Unmarks a job item for removal")]
+ public class UnmarkJobItemForRemoval : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
+ public string Id { get; set; }
+ }
+
+ [Route("/Sync/JobItems/{Id}", "DELETE", Summary = "Cancels a sync job item")]
+ public class CancelSyncJobItem : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+ public string Id { get; set; }
+ }
+
[Route("/Sync/Jobs", "GET", Summary = "Gets sync jobs.")]
public class GetSyncJobs : SyncJobQuery, IReturn<QueryResult<SyncJob>>
{
@@ -85,6 +112,16 @@ namespace MediaBrowser.Api.Sync
public string Id { get; set; }
}
+ [Route("/Sync/JobItems/{Id}/AdditionalFiles", "GET", Summary = "Gets a sync job item file")]
+ public class GetSyncJobItemAdditionalFile
+ {
+ [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Id { get; set; }
+
+ [ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
+ public string Name { get; set; }
+ }
+
[Route("/Sync/OfflineActions", "POST", Summary = "Reports an action that occurred while offline.")]
public class ReportOfflineActions : List<UserAction>, IReturnVoid
{
@@ -169,11 +206,14 @@ namespace MediaBrowser.Api.Sync
{
var jobItem = _syncManager.GetJobItem(request.Id);
- if (jobItem.Status != SyncJobItemStatus.Transferring)
+ if (jobItem.Status < SyncJobItemStatus.ReadyToTransfer)
{
throw new ArgumentException("The job item is not yet ready for transfer.");
}
+ var task = _syncManager.ReportSyncJobItemTransferBeginning(request.Id);
+ Task.WaitAll(task);
+
return ToStaticFileResult(jobItem.OutputPath);
}
@@ -198,10 +238,11 @@ namespace MediaBrowser.Api.Sync
}
};
- var dtos = request.ItemIds.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
+ var items = request.ItemIds.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries)
.Select(_libraryManager.GetItemById)
- .Where(i => i != null)
- .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions))
+ .Where(i => i != null);
+
+ var dtos = _dtoService.GetBaseItemDtos(items, dtoOptions)
.ToList();
result.Options = SyncHelper.GetSyncOptions(dtos);
@@ -243,5 +284,52 @@ namespace MediaBrowser.Api.Sync
Task.WaitAll(task);
}
+
+ public object Get(GetSyncJobItemAdditionalFile request)
+ {
+ var jobItem = _syncManager.GetJobItem(request.Id);
+
+ if (jobItem.Status < SyncJobItemStatus.ReadyToTransfer)
+ {
+ throw new ArgumentException("The job item is not yet ready for transfer.");
+ }
+
+ var file = jobItem.AdditionalFiles.FirstOrDefault(i => string.Equals(i.Name, request.Name, StringComparison.OrdinalIgnoreCase));
+
+ if (file == null)
+ {
+ throw new ArgumentException("Sync job additional file not found.");
+ }
+
+ return ToStaticFileResult(file.Path);
+ }
+
+ public void Post(EnableSyncJobItem request)
+ {
+ var task = _syncManager.ReEnableJobItem(request.Id);
+
+ Task.WaitAll(task);
+ }
+
+ public void Delete(CancelSyncJobItem request)
+ {
+ var task = _syncManager.CancelJobItem(request.Id);
+
+ Task.WaitAll(task);
+ }
+
+ public void Post(MarkJobItemForRemoval request)
+ {
+ var task = _syncManager.MarkJobItemForRemoval(request.Id);
+
+ Task.WaitAll(task);
+ }
+
+ public void Post(UnmarkJobItemForRemoval request)
+ {
+ var task = _syncManager.UnmarkJobItemForRemoval(request.Id);
+
+ Task.WaitAll(task);
+ }
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-30 18:56:10 +0000