Merge pull request #965 from MediaBrowser/dev

3.0.5482.0

2 files changed, 42 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs
index 47339f677..59136c0e6 100644
--- a/MediaBrowser.Controller/Sync/ISyncManager.cs
+++ b/MediaBrowser.Controller/Sync/ISyncManager.cs
@@ -2,6 +2,7 @@
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Sync;
+using MediaBrowser.Model.Users;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -20,7 +21,7 @@ namespace MediaBrowser.Controller.Sync
         /// Gets the jobs.
         /// </summary>
         /// <returns>QueryResult&lt;SyncJob&gt;.</returns>
-        QueryResult<SyncJob> GetJobs(SyncJobQuery query);
+        Task<QueryResult<SyncJob>> GetJobs(SyncJobQuery query);
 
         /// <summary>
         /// Gets the job items.
@@ -37,6 +38,13 @@ namespace MediaBrowser.Controller.Sync
         SyncJob GetJob(string id);
 
         /// <summary>
+        /// Updates the job.
+        /// </summary>
+        /// <param name="job">The job.</param>
+        /// <returns>Task.</returns>
+        Task UpdateJob(SyncJob job);
+
+        /// <summary>
         /// Cancels the job.
         /// </summary>
         /// <param name="id">The identifier.</param>
@@ -80,5 +88,26 @@ namespace MediaBrowser.Controller.Sync
         /// <param name="id">The identifier.</param>
         /// <returns>SyncJobItem.</returns>
         SyncJobItem GetJobItem(string id);
+
+        /// <summary>
+        /// Reports the offline action.
+        /// </summary>
+        /// <param name="action">The action.</param>
+        /// <returns>Task.</returns>
+        Task ReportOfflineAction(UserAction action);
+
+        /// <summary>
+        /// Gets the ready synchronize items.
+        /// </summary>
+        /// <param name="targetId">The target identifier.</param>
+        /// <returns>List&lt;SyncedItem&gt;.</returns>
+        List<SyncedItem> GetReadySyncItems(string targetId);
+
+        /// <summary>
+        /// Synchronizes the data.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>Task&lt;SyncDataResponse&gt;.</returns>
+        Task<SyncDataResponse> SyncData(SyncDataRequest request);
     }
 }
diff --git a/MediaBrowser.Controller/Sync/ISyncProvider.cs b/MediaBrowser.Controller/Sync/ISyncProvider.cs
index 89f61b80e..af08edb5e 100644
--- a/MediaBrowser.Controller/Sync/ISyncProvider.cs
+++ b/MediaBrowser.Controller/Sync/ISyncProvider.cs
@@ -19,10 +19,22 @@ namespace MediaBrowser.Controller.Sync
         IEnumerable<SyncTarget> GetSyncTargets();
 
         /// <summary>
+        /// Gets the synchronize targets.
+        /// </summary>
+        /// <param name="userId">The user identifier.</param>
+        /// <returns>IEnumerable&lt;SyncTarget&gt;.</returns>
+        IEnumerable<SyncTarget> GetSyncTargets(string userId);
+        
+        /// <summary>
         /// Gets the device profile.
         /// </summary>
         /// <param name="target">The target.</param>
         /// <returns>DeviceProfile.</returns>
         DeviceProfile GetDeviceProfile(SyncTarget target);
     }
+
+    public interface IHasUniqueTargetIds
+    {
+        
+    }
 }