Merge pull request #956 from MediaBrowser/dev

3.0.5464.40000

7 files changed, 85 insertions, 1 deletions

diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 0fb92d3ae..9521f8538 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1387,6 +1387,35 @@ namespace MediaBrowser.Model.ApiClient
         Task<SyncJob> CreateSyncJob(SyncJobRequest request);
 
         /// <summary>
+        /// Gets the synchronize jobs.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>Task&lt;QueryResult&lt;SyncJob&gt;&gt;.</returns>
+        Task<QueryResult<SyncJob>> GetSyncJobs(SyncJobQuery query);
+
+        /// <summary>
+        /// Gets the synchronize job items.
+        /// </summary>
+        /// <param name="query">The query.</param>
+        /// <returns>Task&lt;QueryResult&lt;SyncJobItem&gt;&gt;.</returns>
+        Task<QueryResult<SyncJobItem>> GetSyncJobItems(SyncJobItemQuery query);
+
+        /// <summary>
+        /// Reports the synchronize job item transferred.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <returns>Task.</returns>
+        Task ReportSyncJobItemTransferred(string id);
+
+        /// <summary>
+        /// Gets the synchronize job item file.
+        /// </summary>
+        /// <param name="id">The identifier.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task&lt;Stream&gt;.</returns>
+        Task<Stream> GetSyncJobItemFile(string id, CancellationToken cancellationToken);
+
+        /// <summary>
         /// Opens the web socket.
         /// </summary>
         /// <param name="webSocketFactory">The web socket factory.</param>
diff --git a/MediaBrowser.Model/Logging/ILogManager.cs b/MediaBrowser.Model/Logging/ILogManager.cs
index 674d8fd16..59bb86756 100644
--- a/MediaBrowser.Model/Logging/ILogManager.cs
+++ b/MediaBrowser.Model/Logging/ILogManager.cs
@@ -14,6 +14,12 @@ namespace MediaBrowser.Model.Logging
         LogSeverity LogSeverity { get; set; }
 
         /// <summary>
+        /// Gets or sets the exception message prefix.
+        /// </summary>
+        /// <value>The exception message prefix.</value>
+        string ExceptionMessagePrefix { get; set; }
+
+        /// <summary>
         /// Gets the logger.
         /// </summary>
         /// <param name="name">The name.</param>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index fbf45e0ae..b81b4c1fd 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -364,6 +364,7 @@
     <Compile Include="Session\UserDataChangeInfo.cs" />
     <Compile Include="Devices\ContentUploadHistory.cs" />
     <Compile Include="Sync\SyncCategory.cs" />
+    <Compile Include="Sync\SyncDialogOptions.cs" />
     <Compile Include="Sync\SyncHelper.cs" />
     <Compile Include="Sync\SyncJob.cs" />
     <Compile Include="Sync\SyncJobCreationResult.cs" />
diff --git a/MediaBrowser.Model/Sync/SyncDialogOptions.cs b/MediaBrowser.Model/Sync/SyncDialogOptions.cs
new file mode 100644
index 000000000..0154b16ec
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncDialogOptions.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Model.Sync
+{
+    public class SyncDialogOptions
+    {
+        /// <summary>
+        /// Gets or sets the targets.
+        /// </summary>
+        /// <value>The targets.</value>
+        public List<SyncTarget> Targets { get; set; }
+        /// <summary>
+        /// Gets or sets the options.
+        /// </summary>
+        /// <value>The options.</value>
+        public List<SyncOptions> Options { get; set; }
+
+        public SyncDialogOptions()
+        {
+            Targets = new List<SyncTarget>();
+            Options = new List<SyncOptions>();
+        }
+    }
+}
diff --git a/MediaBrowser.Model/Sync/SyncHelper.cs b/MediaBrowser.Model/Sync/SyncHelper.cs
index 64dc024e1..28a36ed21 100644
--- a/MediaBrowser.Model/Sync/SyncHelper.cs
+++ b/MediaBrowser.Model/Sync/SyncHelper.cs
@@ -21,7 +21,10 @@ namespace MediaBrowser.Model.Sync
                     if (item.IsVideo)
                     {
                         options.Add(SyncOptions.Quality);
-                        options.Add(SyncOptions.UnwatchedOnly);
+                        if (items.Count > 1)
+                        {
+                            options.Add(SyncOptions.UnwatchedOnly);
+                        }
                         break;
                     }
                     if (item.IsFolder && !item.IsMusicGenre && !item.IsArtist && !item.IsType("musicalbum") && !item.IsGameGenre)
@@ -30,6 +33,12 @@ namespace MediaBrowser.Model.Sync
                         options.Add(SyncOptions.UnwatchedOnly);
                         break;
                     }
+                    if (item.IsGenre)
+                    {
+                        options.Add(SyncOptions.SyncNewContent);
+                        options.Add(SyncOptions.ItemLimit);
+                        break;
+                    }
                 }
             }
 
diff --git a/MediaBrowser.Model/Sync/SyncJobItemQuery.cs b/MediaBrowser.Model/Sync/SyncJobItemQuery.cs
index e9af642ac..b85c21691 100644
--- a/MediaBrowser.Model/Sync/SyncJobItemQuery.cs
+++ b/MediaBrowser.Model/Sync/SyncJobItemQuery.cs
@@ -19,6 +19,16 @@ namespace MediaBrowser.Model.Sync
         /// <value>The job identifier.</value>
         public string JobId { get; set; }
         /// <summary>
+        /// Gets or sets the target identifier.
+        /// </summary>
+        /// <value>The target identifier.</value>
+        public string TargetId { get; set; }
+        /// <summary>
+        /// Gets or sets the status.
+        /// </summary>
+        /// <value>The status.</value>
+        public SyncJobItemStatus? Status { get; set; }
+        /// <summary>
         /// Gets or sets a value indicating whether this instance is completed.
         /// </summary>
         /// <value><c>null</c> if [is completed] contains no value, <c>true</c> if [is completed]; otherwise, <c>false</c>.</value>
diff --git a/MediaBrowser.Model/Sync/SyncJobQuery.cs b/MediaBrowser.Model/Sync/SyncJobQuery.cs
index 218b3823e..2af06bcfa 100644
--- a/MediaBrowser.Model/Sync/SyncJobQuery.cs
+++ b/MediaBrowser.Model/Sync/SyncJobQuery.cs
@@ -18,5 +18,10 @@ namespace MediaBrowser.Model.Sync
         /// </summary>
         /// <value><c>null</c> if [is completed] contains no value, <c>true</c> if [is completed]; otherwise, <c>false</c>.</value>
         public bool? IsCompleted { get; set; }
+        /// <summary>
+        /// Gets or sets the target identifier.
+        /// </summary>
+        /// <value>The target identifier.</value>
+        public string TargetId { get; set; }
     }
 }