From 5878190cab93a2e81418d296af69a3ec185f11bf Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 3 Mar 2015 13:48:47 -0500 Subject: [PATCH] updated nuget --- .../MediaBrowser.Model.Portable.csproj | 6 ++++ .../MediaBrowser.Model.net35.csproj | 6 ++++ MediaBrowser.Model/MediaBrowser.Model.csproj | 2 ++ .../Notifications/NotificationOptions.cs | 6 ++++ MediaBrowser.Model/Sync/LocalItemInfo.cs | 11 +++++++ MediaBrowser.Model/Sync/LocalItemQuery.cs | 19 ++++++++++++ MediaBrowser.Model/Sync/SyncDialogOptions.cs | 29 +++++++++++++++---- Nuget/MediaBrowser.Common.Internal.nuspec | 4 +-- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Model.Signed.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +-- 11 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 MediaBrowser.Model/Sync/LocalItemInfo.cs create mode 100644 MediaBrowser.Model/Sync/LocalItemQuery.cs diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 62677f8182..2f5e8a5d79 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -1067,6 +1067,12 @@ Sync\LocalItem.cs + + Sync\LocalItemInfo.cs + + + Sync\LocalItemQuery.cs + Sync\SyncCategory.cs diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj index 4ed8cceae3..f15e752ffb 100644 --- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -1026,6 +1026,12 @@ Sync\LocalItem.cs + + Sync\LocalItemInfo.cs + + + Sync\LocalItemQuery.cs + Sync\SyncCategory.cs diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 27b5a53db0..0bfd0d3fdd 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -376,6 +376,8 @@ + + diff --git a/MediaBrowser.Model/Notifications/NotificationOptions.cs b/MediaBrowser.Model/Notifications/NotificationOptions.cs index 7d80f31774..e57955c9e2 100644 --- a/MediaBrowser.Model/Notifications/NotificationOptions.cs +++ b/MediaBrowser.Model/Notifications/NotificationOptions.cs @@ -64,6 +64,12 @@ namespace MediaBrowser.Model.Notifications Type = NotificationType.PluginError.ToString(), Enabled = true, SendToUserMode = SendToUserType.Admins + }, + new NotificationOption + { + Type = NotificationType.UserLockedOut.ToString(), + Enabled = true, + SendToUserMode = SendToUserType.Admins } }; } diff --git a/MediaBrowser.Model/Sync/LocalItemInfo.cs b/MediaBrowser.Model/Sync/LocalItemInfo.cs new file mode 100644 index 0000000000..f52873b2f7 --- /dev/null +++ b/MediaBrowser.Model/Sync/LocalItemInfo.cs @@ -0,0 +1,11 @@ + +namespace MediaBrowser.Model.Sync +{ + public class LocalItemInfo + { + public string ServerId { get; set; } + public string Id { get; set; } + public string Name { get; set; } + public string PrimaryImageTag { get; set; } + } +} diff --git a/MediaBrowser.Model/Sync/LocalItemQuery.cs b/MediaBrowser.Model/Sync/LocalItemQuery.cs new file mode 100644 index 0000000000..0993929083 --- /dev/null +++ b/MediaBrowser.Model/Sync/LocalItemQuery.cs @@ -0,0 +1,19 @@ + +namespace MediaBrowser.Model.Sync +{ + public class LocalItemQuery + { + public string ServerId { get; set; } + public string AlbumArtist { get; set; } + public string AlbumId { get; set; } + public string SeriesId { get; set; } + public string Type { get; set; } + public string MediaType { get; set; } + public string[] ExcludeTypes { get; set; } + + public LocalItemQuery() + { + ExcludeTypes = new string[] { }; + } + } +} diff --git a/MediaBrowser.Model/Sync/SyncDialogOptions.cs b/MediaBrowser.Model/Sync/SyncDialogOptions.cs index cf8b0130b3..5c84fb81f8 100644 --- a/MediaBrowser.Model/Sync/SyncDialogOptions.cs +++ b/MediaBrowser.Model/Sync/SyncDialogOptions.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using MediaBrowser.Model.Dto; namespace MediaBrowser.Model.Sync { @@ -18,18 +19,34 @@ namespace MediaBrowser.Model.Sync /// Gets or sets the quality options. /// /// The quality options. - public List QualityOptions { get; set; } + public List QualityOptions { get; set; } public SyncDialogOptions() { Targets = new List(); Options = new List(); - QualityOptions = new List + QualityOptions = new List { - SyncQuality.Original, - SyncQuality.High, - SyncQuality.Medium, - SyncQuality.Low + new NameValuePair + { + Name = SyncQuality.Original.ToString(), + Value = SyncQuality.Original.ToString() + }, + new NameValuePair + { + Name = SyncQuality.High.ToString(), + Value = SyncQuality.High.ToString() + }, + new NameValuePair + { + Name = SyncQuality.Medium.ToString(), + Value = SyncQuality.Medium.ToString() + }, + new NameValuePair + { + Name = SyncQuality.Low.ToString(), + Value = SyncQuality.Low.ToString() + } }; } } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 88c6e9f8ae..f83ddcbf12 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.579 + 3.0.580 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 facbe53661..675b9aafc8 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.579 + 3.0.580 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index dab1034466..892b64be98 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Model.Signed - 3.0.579 + 3.0.580 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 e94d18fb5a..537313ec88 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.579 + 3.0.580 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 - +