more sync movement

10 files changed, 91 insertions, 9 deletions

diff --git a/MediaBrowser.Model/Devices/DeviceQuery.cs b/MediaBrowser.Model/Devices/DeviceQuery.cs
new file mode 100644
index 000000000..76f7117b6
--- /dev/null
+++ b/MediaBrowser.Model/Devices/DeviceQuery.cs
@@ -0,0 +1,17 @@
+
+namespace MediaBrowser.Model.Devices
+{
+    public class DeviceQuery
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports content uploading].
+        /// </summary>
+        /// <value><c>null</c> if [supports content uploading] contains no value, <c>true</c> if [supports content uploading]; otherwise, <c>false</c>.</value>
+        public bool? SupportsContentUploading { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether [supports unique identifier].
+        /// </summary>
+        /// <value><c>null</c> if [supports unique identifier] contains no value, <c>true</c> if [supports unique identifier]; otherwise, <c>false</c>.</value>
+        public bool? SupportsUniqueIdentifier { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index b83243ba8..45f681066 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -186,6 +186,12 @@ namespace MediaBrowser.Model.Dto
         /// </summary>
         /// <value>The genres.</value>
         public List<string> Genres { get; set; }
+
+        /// <summary>
+        /// Gets or sets the series genres.
+        /// </summary>
+        /// <value>The series genres.</value>
+        public List<string> SeriesGenres { get; set; }
         
         /// <summary>
         /// Gets or sets the community rating.
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 4825cb4cc..5aebe42eb 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -113,6 +113,7 @@
     <Compile Include="Connect\PinStatusResult.cs" />
     <Compile Include="Connect\UserLinkType.cs" />
     <Compile Include="Devices\DeviceOptions.cs" />
+    <Compile Include="Devices\DeviceQuery.cs" />
     <Compile Include="Devices\LocalFileInfo.cs" />
     <Compile Include="Devices\DeviceInfo.cs" />
     <Compile Include="Devices\DevicesOptions.cs" />
@@ -365,6 +366,8 @@
     <Compile Include="Sync\SyncJob.cs" />
     <Compile Include="Sync\SyncJobCreationResult.cs" />
     <Compile Include="Sync\SyncJobItem.cs" />
+    <Compile Include="Sync\SyncJobItemQuery.cs" />
+    <Compile Include="Sync\SyncJobItemStatus.cs" />
     <Compile Include="Sync\SyncJobQuery.cs" />
     <Compile Include="Sync\SyncJobRequest.cs" />
     <Compile Include="Sync\SyncJobStatus.cs" />
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index a5a906f95..19e30cd8a 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -162,6 +162,11 @@ namespace MediaBrowser.Model.Querying
         ScreenshotImageTags,
 
         /// <summary>
+        /// The series genres
+        /// </summary>
+        SeriesGenres,
+
+        /// <summary>
         /// The series studio
         /// </summary>
         SeriesStudio,
diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
index fc0d3a1fb..f2faa0545 100644
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -13,13 +13,14 @@ namespace MediaBrowser.Model.Session
         public string MessageCallbackUrl { get; set; }
 
         public bool SupportsContentUploading { get; set; }
-        public bool SupportsDeviceId { get; set; }
+        public bool SupportsUniqueIdentifier { get; set; }
+        public bool SupportsSync { get; set; }
 
         public ClientCapabilities()
         {
             PlayableMediaTypes = new List<string>();
             SupportedCommands = new List<string>();
-            SupportsDeviceId = true;
+            SupportsUniqueIdentifier = true;
         }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Sync/SyncJobItem.cs b/MediaBrowser.Model/Sync/SyncJobItem.cs
index 141546eb5..063f7feb2 100644
--- a/MediaBrowser.Model/Sync/SyncJobItem.cs
+++ b/MediaBrowser.Model/Sync/SyncJobItem.cs
@@ -1,4 +1,5 @@
-
+using System;
+
 namespace MediaBrowser.Model.Sync
 {
     public class SyncJobItem
@@ -37,12 +38,18 @@ namespace MediaBrowser.Model.Sync
         /// Gets or sets the status.
         /// </summary>
         /// <value>The status.</value>
-        public SyncJobStatus Status { get; set; }
+        public SyncJobItemStatus Status { get; set; }
 
         /// <summary>
         /// Gets or sets the current progress.
         /// </summary>
         /// <value>The current progress.</value>
-        public double? CurrentProgress { get; set; }
+        public double? Progress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the date created.
+        /// </summary>
+        /// <value>The date created.</value>
+        public DateTime DateCreated { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobItemQuery.cs b/MediaBrowser.Model/Sync/SyncJobItemQuery.cs
new file mode 100644
index 000000000..e9af642ac
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncJobItemQuery.cs
@@ -0,0 +1,27 @@
+
+namespace MediaBrowser.Model.Sync
+{
+    public class SyncJobItemQuery
+    {
+        /// <summary>
+        /// Gets or sets the start index.
+        /// </summary>
+        /// <value>The start index.</value>
+        public int? StartIndex { get; set; }
+        /// <summary>
+        /// Gets or sets the limit.
+        /// </summary>
+        /// <value>The limit.</value>
+        public int? Limit { get; set; }
+        /// <summary>
+        /// Gets or sets the job identifier.
+        /// </summary>
+        /// <value>The job identifier.</value>
+        public string JobId { 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>
+        public bool? IsCompleted { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Sync/SyncJobItemStatus.cs b/MediaBrowser.Model/Sync/SyncJobItemStatus.cs
new file mode 100644
index 000000000..3d0579a3c
--- /dev/null
+++ b/MediaBrowser.Model/Sync/SyncJobItemStatus.cs
@@ -0,0 +1,12 @@
+
+namespace MediaBrowser.Model.Sync
+{
+    public enum SyncJobItemStatus
+    {
+        Queued = 0,
+        Converting = 1,
+        Transferring = 2,
+        Completed = 3,
+        Failed = 4
+    }
+}
diff --git a/MediaBrowser.Model/Sync/SyncJobQuery.cs b/MediaBrowser.Model/Sync/SyncJobQuery.cs
index 74b35186e..218b3823e 100644
--- a/MediaBrowser.Model/Sync/SyncJobQuery.cs
+++ b/MediaBrowser.Model/Sync/SyncJobQuery.cs
@@ -13,5 +13,10 @@ namespace MediaBrowser.Model.Sync
         /// </summary>
         /// <value>The limit.</value>
         public int? Limit { 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>
+        public bool? IsCompleted { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Sync/SyncJobStatus.cs b/MediaBrowser.Model/Sync/SyncJobStatus.cs
index 42af96509..961ccf544 100644
--- a/MediaBrowser.Model/Sync/SyncJobStatus.cs
+++ b/MediaBrowser.Model/Sync/SyncJobStatus.cs
@@ -4,9 +4,8 @@ namespace MediaBrowser.Model.Sync
     public enum SyncJobStatus
     {
         Queued = 0,
-        Converting = 1,
-        Transferring = 2,
-        Completed = 3,
-        Cancelled = 4
+        InProgress = 1,
+        Completed = 2,
+        CompletedWithError = 3
     }
 }