From ab3da461130b0db2f77e7e848c4bbd1280e5524a Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 12 Dec 2014 22:56:30 -0500 Subject: more sync movement --- MediaBrowser.Model/Devices/DeviceQuery.cs | 17 +++++++++++++++ MediaBrowser.Model/Dto/BaseItemDto.cs | 6 ++++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 3 +++ MediaBrowser.Model/Querying/ItemFields.cs | 5 +++++ MediaBrowser.Model/Session/ClientCapabilities.cs | 5 +++-- MediaBrowser.Model/Sync/SyncJobItem.cs | 13 +++++++++--- MediaBrowser.Model/Sync/SyncJobItemQuery.cs | 27 ++++++++++++++++++++++++ MediaBrowser.Model/Sync/SyncJobItemStatus.cs | 12 +++++++++++ MediaBrowser.Model/Sync/SyncJobQuery.cs | 5 +++++ MediaBrowser.Model/Sync/SyncJobStatus.cs | 7 +++--- 10 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 MediaBrowser.Model/Devices/DeviceQuery.cs create mode 100644 MediaBrowser.Model/Sync/SyncJobItemQuery.cs create mode 100644 MediaBrowser.Model/Sync/SyncJobItemStatus.cs (limited to 'MediaBrowser.Model') 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 + { + /// + /// Gets or sets a value indicating whether [supports content uploading]. + /// + /// null if [supports content uploading] contains no value, true if [supports content uploading]; otherwise, false. + public bool? SupportsContentUploading { get; set; } + /// + /// Gets or sets a value indicating whether [supports unique identifier]. + /// + /// null if [supports unique identifier] contains no value, true if [supports unique identifier]; otherwise, false. + 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 /// /// The genres. public List Genres { get; set; } + + /// + /// Gets or sets the series genres. + /// + /// The series genres. + public List SeriesGenres { get; set; } /// /// 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 @@ + @@ -365,6 +366,8 @@ + + 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 @@ -161,6 +161,11 @@ namespace MediaBrowser.Model.Querying /// ScreenshotImageTags, + /// + /// The series genres + /// + SeriesGenres, + /// /// The series studio /// 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(); SupportedCommands = new List(); - 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. /// /// The status. - public SyncJobStatus Status { get; set; } + public SyncJobItemStatus Status { get; set; } /// /// Gets or sets the current progress. /// /// The current progress. - public double? CurrentProgress { get; set; } + public double? Progress { get; set; } + + /// + /// Gets or sets the date created. + /// + /// The date created. + 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 + { + /// + /// Gets or sets the start index. + /// + /// The start index. + public int? StartIndex { get; set; } + /// + /// Gets or sets the limit. + /// + /// The limit. + public int? Limit { get; set; } + /// + /// Gets or sets the job identifier. + /// + /// The job identifier. + public string JobId { get; set; } + /// + /// Gets or sets a value indicating whether this instance is completed. + /// + /// null if [is completed] contains no value, true if [is completed]; otherwise, false. + 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 /// /// The limit. public int? Limit { get; set; } + /// + /// Gets or sets a value indicating whether this instance is completed. + /// + /// null if [is completed] contains no value, true if [is completed]; otherwise, false. + 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 } } -- cgit v1.2.3