diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-06 23:03:38 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-10-06 23:03:38 -0400 |
| commit | 28d4c54de8c6402b44da81314435bb70dac63635 (patch) | |
| tree | 2bb6a67e99d21dc1f2ffa5cc03d09e1ded5454d0 | |
| parent | 1cf1ec6b615ec6d8b9fd4181b948dc65de465a58 (diff) | |
updated nuget
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IApiClient.cs | 20 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Movies/MovieDbProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.Internal.nuspec | 4 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Model.Signed.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Server.Core.nuspec | 4 |
7 files changed, 27 insertions, 9 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index 254a7e7e0..9f22de3ac 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -836,6 +836,26 @@ namespace MediaBrowser.Model.ApiClient void ClearAuthenticationInfo(); /// <summary> + /// Changes the server location. + /// </summary> + /// <param name="address">The address.</param> + /// <param name="keepExistingAuth">if set to <c>true</c> [keep existing authentication].</param> + void ChangeServerLocation(string address, bool keepExistingAuth = false); + + /// <summary> + /// Starts the receiving session updates. + /// </summary> + /// <param name="intervalMs">The interval ms.</param> + /// <returns>Task.</returns> + Task StartReceivingSessionUpdates(int intervalMs); + + /// <summary> + /// Stops the receiving session updates. + /// </summary> + /// <returns>Task.</returns> + Task StopReceivingSessionUpdates(); + + /// <summary> /// Gets the image URL. /// </summary> /// <param name="item">The item.</param> diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 5b313edd9..40eb38669 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -187,7 +187,7 @@ namespace MediaBrowser.Providers.Movies internal static string GetMoviesDataPath(IApplicationPaths appPaths) { - var dataPath = Path.Combine(appPaths.CachePath, "tmdb-movies"); + var dataPath = Path.Combine(appPaths.CachePath, "tmdb-movies2"); return dataPath; } diff --git a/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs b/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs index e73738e4e..4ea0a65f0 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/NetListener/HttpListenerServer.cs @@ -161,7 +161,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener /// <returns>Task.</returns> private async Task ProcessWebSocketRequest(HttpListenerContext ctx) { -#if !__MonoCS__ try { var webSocketContext = await ctx.AcceptWebSocketAsync(null).ConfigureAwait(false); @@ -181,7 +180,6 @@ namespace MediaBrowser.Server.Implementations.HttpServer.NetListener ctx.Response.StatusCode = 500; ctx.Response.Close(); } -#endif } private void HandleError(Exception ex, HttpListenerContext context) diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index ef6502a7a..82e865afa 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common.Internal</id> - <version>3.0.462</version> + <version>3.0.463</version> <title>MediaBrowser.Common.Internal</title> <authors>Luke</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.462" /> + <dependency id="MediaBrowser.Common" version="3.0.463" /> <dependency id="NLog" version="3.1.0.0" /> <dependency id="SimpleInjector" version="2.5.2" /> <dependency id="sharpcompress" version="0.10.2" /> diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 75c7439b2..c8c2d69d2 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.462</version> + <version>3.0.463</version> <title>MediaBrowser.Common</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index 027d23a21..5d9637525 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Model.Signed</id> - <version>3.0.462</version> + <version>3.0.463</version> <title>MediaBrowser.Model - Signed Edition</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 326d8214e..724883697 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.462</version> + <version>3.0.463</version> <title>Media Browser.Server.Core</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains core components required to build plugins for Media Browser Server.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.462" /> + <dependency id="MediaBrowser.Common" version="3.0.463" /> </dependencies> </metadata> <files> |
