diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index 06f65c4480..552091280a 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -130,6 +130,7 @@
+
diff --git a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
index 25130776ee..8f68569b7a 100644
--- a/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
+++ b/MediaBrowser.Api/Session/SessionInfoWebSocketListener.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Logging;
diff --git a/MediaBrowser.Api/Sync/SyncJobsWebSocketListener.cs b/MediaBrowser.Api/Sync/SyncJobsWebSocketListener.cs
new file mode 100644
index 0000000000..906a52209a
--- /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
+{
+ ///
+ /// Class SessionInfoWebSocketListener
+ ///
+ class SyncJobsWebSocketListener : BasePeriodicWebSocketListener, WebSocketListenerState>
+ {
+ ///
+ /// Gets the name.
+ ///
+ /// The name.
+ 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 e)
+ {
+ SendData(false);
+ }
+
+ void _syncManager_SyncJobCreated(object sender, Model.Events.GenericEventArgs e)
+ {
+ SendData(true);
+ }
+
+ void _syncManager_SyncJobCancelled(object sender, Model.Events.GenericEventArgs e)
+ {
+ SendData(true);
+ }
+
+ ///
+ /// Gets the data to send.
+ ///
+ /// The state.
+ /// Task{SystemInfo}.
+ protected override async Task> 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.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index f1e371c1a7..990d23970a 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -93,6 +93,11 @@ namespace MediaBrowser.Controller.Net
}
}
+ protected virtual void ParseMessageParams(string[] values)
+ {
+
+ }
+
///
/// Starts sending messages over a web socket
///
@@ -104,6 +109,11 @@ namespace MediaBrowser.Controller.Net
var dueTimeMs = long.Parse(vals[0], UsCulture);
var periodMs = long.Parse(vals[1], UsCulture);
+ if (vals.Length > 2)
+ {
+ ParseMessageParams(vals.Skip(2).ToArray());
+ }
+
var cancellationTokenSource = new CancellationTokenSource();
Logger.Info("{1} Begin transmitting over websocket to {0}", message.Connection.RemoteEndPoint, GetType().Name);
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index bcd1dfe12a..9fe138a49e 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -893,6 +893,22 @@ namespace MediaBrowser.Model.ApiClient
/// if set to true [keep existing authentication].
void ChangeServerLocation(string address, bool keepExistingAuth = false);
+ ///
+ /// Starts the receiving synchronize jobs updates.
+ ///
+ /// The interval ms.
+ /// The user identifier.
+ /// The target identifier.
+ /// Task.
+ Task StartReceivingSyncJobsUpdates(int intervalMs, string userId, string targetId);
+
+ ///
+ /// Stops the receiving synchronize jobs updates.
+ ///
+ /// The interval ms.
+ /// Task.
+ Task StopReceivingSyncJobsUpdates(int intervalMs);
+
///
/// Starts the receiving session updates.
///
diff --git a/MediaBrowser.Model/ApiClient/IServerEvents.cs b/MediaBrowser.Model/ApiClient/IServerEvents.cs
index cc51ce4c64..311cb8b213 100644
--- a/MediaBrowser.Model/ApiClient/IServerEvents.cs
+++ b/MediaBrowser.Model/ApiClient/IServerEvents.cs
@@ -7,6 +7,7 @@ using MediaBrowser.Model.Sync;
using MediaBrowser.Model.Tasks;
using MediaBrowser.Model.Updates;
using System;
+using System.Collections.Generic;
namespace MediaBrowser.Model.ApiClient
{
@@ -139,5 +140,9 @@ namespace MediaBrowser.Model.ApiClient
/// Occurs when [synchronize job cancelled].
///
event EventHandler> SyncJobCancelled;
+ ///
+ /// Occurs when [synchronize jobs updated].
+ ///
+ event EventHandler>> SyncJobsUpdated;
}
}
diff --git a/MediaBrowser.Model/Sync/SyncJob.cs b/MediaBrowser.Model/Sync/SyncJob.cs
index 5737ed3bbf..93e73d22e3 100644
--- a/MediaBrowser.Model/Sync/SyncJob.cs
+++ b/MediaBrowser.Model/Sync/SyncJob.cs
@@ -16,6 +16,11 @@ namespace MediaBrowser.Model.Sync
/// The device identifier.
public string TargetId { get; set; }
///
+ /// Gets or sets the name of the target.
+ ///
+ /// The name of the target.
+ public string TargetName { get; set; }
+ ///
/// Gets or sets the quality.
///
/// The quality.
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
index 6ef74d9539..c373faf1e1 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncJobProcessor.cs
@@ -144,7 +144,7 @@ namespace MediaBrowser.Server.Implementations.Sync
return UpdateJobStatus(job, result.Items.ToList());
}
- private Task UpdateJobStatus(SyncJob job, List jobItems)
+ private async Task UpdateJobStatus(SyncJob job, List jobItems)
{
job.ItemCount = jobItems.Count;
@@ -204,7 +204,9 @@ namespace MediaBrowser.Server.Implementations.Sync
job.Status = SyncJobStatus.Transferring;
}
- return _syncRepo.Update(job);
+ await _syncRepo.Update(job).ConfigureAwait(false);
+
+ ((SyncManager)_syncManager).OnSyncJobUpdated(job);
}
public async Task> GetItemsForSync(SyncCategory? category, string parentId, IEnumerable itemIds, User user, bool unwatchedOnly)
diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
index 627e94eb14..6eef268b99 100644
--- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
+++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs
@@ -174,7 +174,7 @@ namespace MediaBrowser.Server.Implementations.Sync
return returnResult;
}
- public Task UpdateJob(SyncJob job)
+ public async Task UpdateJob(SyncJob job)
{
// Get fresh from the db and only update the fields that are supported to be changed.
var instance = _repo.GetJob(job.Id);
@@ -185,7 +185,21 @@ namespace MediaBrowser.Server.Implementations.Sync
instance.SyncNewContent = job.SyncNewContent;
instance.ItemLimit = job.ItemLimit;
- return _repo.Update(instance);
+ await _repo.Update(instance).ConfigureAwait(false);
+
+ OnSyncJobUpdated(instance);
+ }
+
+ internal void OnSyncJobUpdated(SyncJob job)
+ {
+ if (SyncJobUpdated != null)
+ {
+ EventHelper.FireEventIfNotNull(SyncJobUpdated, this, new GenericEventArgs
+ {
+ Argument = job
+
+ }, _logger);
+ }
}
public async Task> GetJobs(SyncJobQuery query)
@@ -202,6 +216,14 @@ namespace MediaBrowser.Server.Implementations.Sync
private async Task FillMetadata(SyncJob job)
{
+ var target = GetSyncTargets(job.UserId)
+ .FirstOrDefault(i => string.Equals(i.Id, job.TargetId, StringComparison.OrdinalIgnoreCase));
+
+ if (target != null)
+ {
+ job.TargetName = target.Name;
+ }
+
var item = job.RequestedItemIds
.Select(_libraryManager.GetItemById)
.FirstOrDefault(i => i != null);
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 37c4d9ba40..4b104fe252 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
MediaBrowser.Common.Internal
- 3.0.556
+ 3.0.559
MediaBrowser.Common.Internal
Luke
ebr,Luke,scottisafool
@@ -12,7 +12,7 @@
Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.
Copyright © Media Browser 2013
-
+
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index a2472fb847..40a395a63f 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
MediaBrowser.Common
- 3.0.556
+ 3.0.559
MediaBrowser.Common
Media Browser Team
ebr,Luke,scottisafool
diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec
index 24f94d22e2..17597b582b 100644
--- a/Nuget/MediaBrowser.Model.Signed.nuspec
+++ b/Nuget/MediaBrowser.Model.Signed.nuspec
@@ -2,7 +2,7 @@
MediaBrowser.Model.Signed
- 3.0.556
+ 3.0.559
MediaBrowser.Model - Signed Edition
Media Browser Team
ebr,Luke,scottisafool
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index b50c59b598..c9a635f64a 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
MediaBrowser.Server.Core
- 3.0.556
+ 3.0.559
Media Browser.Server.Core
Media Browser Team
ebr,Luke,scottisafool
@@ -12,7 +12,7 @@
Contains core components required to build plugins for Media Browser Server.
Copyright © Media Browser 2013
-
+