From 67528a07992326472a4e6dfe826ddcc5358a6f67 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Mon, 27 Oct 2014 17:45:50 -0400 Subject: [PATCH] update connect scripts --- MediaBrowser.Model/ApiClient/IDevice.cs | 4 ++-- .../Connect/ConnectManager.cs | 8 ++++---- MediaBrowser.Server.Implementations/Connect/Responses.cs | 5 +++++ Nuget/MediaBrowser.Common.Internal.nuspec | 4 ++-- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Model.Signed.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 ++-- 7 files changed, 17 insertions(+), 12 deletions(-) diff --git a/MediaBrowser.Model/ApiClient/IDevice.cs b/MediaBrowser.Model/ApiClient/IDevice.cs index 0c0f55f9bb..84927c20a9 100644 --- a/MediaBrowser.Model/ApiClient/IDevice.cs +++ b/MediaBrowser.Model/ApiClient/IDevice.cs @@ -26,12 +26,12 @@ namespace MediaBrowser.Model.ApiClient /// Gets the local images. /// /// IEnumerable<LocalFileInfo>. - IEnumerable GetLocalPhotos(); + Task> GetLocalPhotos(); /// /// Gets the local videos. /// /// IEnumerable<LocalFileInfo>. - IEnumerable GetLocalVideos(); + Task> GetLocalVideos(); /// /// Uploads the file. /// diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index 4ccbc28825..4547960ed6 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -523,7 +523,7 @@ namespace MediaBrowser.Server.Implementations.Connect using (var stream = (await _httpClient.Post(options).ConfigureAwait(false)).Content) { } - + return new UserLinkResult { IsNewUserInvitation = true, @@ -922,7 +922,7 @@ namespace MediaBrowser.Server.Implementations.Connect { var user = e.Argument; - //await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false); + await TryUploadUserPreferences(user, CancellationToken.None).ConfigureAwait(false); } private async Task TryUploadUserPreferences(User user, CancellationToken cancellationToken) @@ -937,7 +937,7 @@ namespace MediaBrowser.Server.Implementations.Connect } var obj = ConnectUserPreferences.FromUserConfiguration(user.Configuration); - var json = _json.SerializeToString(obj); + var json = _json.SerializeToString(new UserPreferencesDto { data = obj }); var url = GetConnectUrl("user/preferences"); url += "?userId=" + user.ConnectUserId; @@ -968,7 +968,7 @@ namespace MediaBrowser.Server.Implementations.Connect private async Task DownloadUserPreferences(User user, CancellationToken cancellationToken) { - + } } } diff --git a/MediaBrowser.Server.Implementations/Connect/Responses.cs b/MediaBrowser.Server.Implementations/Connect/Responses.cs index dd9e140a88..ff2825d732 100644 --- a/MediaBrowser.Server.Implementations/Connect/Responses.cs +++ b/MediaBrowser.Server.Implementations/Connect/Responses.cs @@ -72,4 +72,9 @@ namespace MediaBrowser.Server.Implementations.Connect } } + + public class UserPreferencesDto + { + public T data { get; set; } + } } diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index ff67b9c1fe..23d51c9f57 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.500 + 3.0.501 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 1c7e36e813..41a81d8169 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.500 + 3.0.501 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index 845fb5c4e4..afd9c64a7c 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Model.Signed - 3.0.500 + 3.0.501 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 491c7263ea..5e9b013d03 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.500 + 3.0.501 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 - +