From 815bb6c82593c39ad6bedbd0ec6195918b462ccb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Apr 2013 00:24:52 -0400 Subject: [PATCH 1/4] added IsPremium filter to GetPackages api method --- MediaBrowser.Api/PackageService.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MediaBrowser.Api/PackageService.cs b/MediaBrowser.Api/PackageService.cs index ccfcc1255..e9e243ec8 100644 --- a/MediaBrowser.Api/PackageService.cs +++ b/MediaBrowser.Api/PackageService.cs @@ -42,6 +42,9 @@ namespace MediaBrowser.Api [ApiMember(Name = "TargetSystems", Description = "Optional. Filter by target system type. Allows multiple, comma delimited.", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "GET", AllowMultiple = true)] public string TargetSystems { get; set; } + + [ApiMember(Name = "IsPremium", Description = "Optiona. Filter by premium status", IsRequired = false, DataType = "boolean", ParameterType = "query", Verb = "GET")] + public bool? IsPremium { get; set; } } /// @@ -175,6 +178,11 @@ namespace MediaBrowser.Api packages = packages.Where(p => apps.Contains(p.targetSystem)); } + if (request.IsPremium.HasValue) + { + packages = packages.Where(p => p.isPremium == request.IsPremium.Value); + } + return ToOptimizedResult(packages.ToList()); } From 953bf75275edb2924abb1628015e12379c30c1b7 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Apr 2013 00:40:28 -0400 Subject: [PATCH 2/4] fixed MBTheater typo --- MediaBrowser.WebDashboard/ApiClient.js | 7 +++++-- MediaBrowser.WebDashboard/packages.config | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.WebDashboard/ApiClient.js b/MediaBrowser.WebDashboard/ApiClient.js index 8380dc8e5..5ac4ecd8f 100644 --- a/MediaBrowser.WebDashboard/ApiClient.js +++ b/MediaBrowser.WebDashboard/ApiClient.js @@ -572,9 +572,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) { /** * Gets a list of plugins that are available to be installed */ - self.getAvailablePlugins = function () { + self.getAvailablePlugins = function (options) { - var url = self.getUrl("Packages", { PackageType: "UserInstalled" }); + options = $.extend({}, options || {}); + options.PackageType = "UserInstalled"; + + var url = self.getUrl("Packages", options); return self.ajax({ type: "GET", diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index 42d7b089c..e8181f609 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file From d889cf1f5781e5d9b446a280ce048e48a74d2aaa Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Apr 2013 00:50:06 -0400 Subject: [PATCH 3/4] remove library copying when setting up a custom library. we'll add a separate button to do it later. --- MediaBrowser.Controller/Entities/User.cs | 25 ------------------------ 1 file changed, 25 deletions(-) diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs index 849b9cfee..690f97605 100644 --- a/MediaBrowser.Controller/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -397,31 +397,6 @@ namespace MediaBrowser.Controller.Entities { _rootFolderPath = null; RootFolder = null; - - if (config.UseCustomLibrary) - { - CopyDefaultLibraryPathsIfNeeded(); - } - } - } - - /// - /// Copies the default library paths if needed. - /// - private void CopyDefaultLibraryPathsIfNeeded() - { - var userPath = RootFolderPath; - - var defaultPath = ConfigurationManager.ApplicationPaths.DefaultUserViewsPath; - - if (userPath.Equals(defaultPath, StringComparison.OrdinalIgnoreCase)) - { - return; - } - - if (!Directory.EnumerateFileSystemEntries(userPath, "*.lnk", SearchOption.AllDirectories).Any()) - { - FileSystem.CopyAll(defaultPath, userPath); } } } From e8d03d49f21f2a17cc22204899eb10a4beb600bb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 4 Apr 2013 01:06:46 -0400 Subject: [PATCH 4/4] update to servicestack 3.9.43 --- MediaBrowser.Api/MediaBrowser.Api.csproj | 15 +++++---- MediaBrowser.Api/packages.config | 4 +-- ...MediaBrowser.Common.Implementations.csproj | 4 +-- .../packages.config | 2 +- .../MediaBrowser.Common.csproj | 15 +++++---- MediaBrowser.Common/packages.config | 4 +-- .../MediaBrowser.Installer.csproj | 4 +-- MediaBrowser.Installer/packages.config | 2 +- ...MediaBrowser.Server.Implementations.csproj | 32 +++++++++---------- .../packages.config | 12 +++---- .../MediaBrowser.ServerApplication.csproj | 15 +++++---- .../packages.config | 4 +-- .../MediaBrowser.WebDashboard.csproj | 12 +++---- MediaBrowser.WebDashboard/packages.config | 4 +-- 14 files changed, 69 insertions(+), 60 deletions(-) diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index a46fe0601..792a4e309 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -39,14 +39,17 @@ ..\packages\morelinq.1.0.15631-beta\lib\net35\MoreLinq.dll - - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll + + False + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll - - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll + + False + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll - - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + + False + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config index b45320b0e..b8e4a6333 100644 --- a/MediaBrowser.Api/packages.config +++ b/MediaBrowser.Api/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj index ee0e6022e..f5b6ab56c 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -44,9 +44,9 @@ ..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll - + False - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll ..\packages\SimpleInjector.2.0.0-beta5\lib\net40-client\SimpleInjector.dll diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index 0b5dd5b79..0aa68c75c 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index b2553ce22..22d1e1221 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -38,14 +38,17 @@ - - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll + + False + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll - - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll + + False + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll - - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + + False + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index 46c46de10..b5e4f0321 100644 --- a/MediaBrowser.Common/packages.config +++ b/MediaBrowser.Common/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/MediaBrowser.Installer/MediaBrowser.Installer.csproj b/MediaBrowser.Installer/MediaBrowser.Installer.csproj index a72fccfd4..eccada0f5 100644 --- a/MediaBrowser.Installer/MediaBrowser.Installer.csproj +++ b/MediaBrowser.Installer/MediaBrowser.Installer.csproj @@ -82,9 +82,9 @@ False ..\packages\DotNetZip.1.9.1.8\lib\net20\Ionic.Zip.dll - + False - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Installer/packages.config b/MediaBrowser.Installer/packages.config index 2f1b5c8aa..8d0ce68b4 100644 --- a/MediaBrowser.Installer/packages.config +++ b/MediaBrowser.Installer/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 0ce5a7f44..043ef0845 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -51,45 +51,45 @@ ..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll - + False - ..\packages\ServiceStack.3.9.42\lib\net35\ServiceStack.dll + ..\packages\ServiceStack.3.9.43\lib\net35\ServiceStack.dll - + False - ..\packages\ServiceStack.Api.Swagger.3.9.42\lib\net35\ServiceStack.Api.Swagger.dll + ..\packages\ServiceStack.Api.Swagger.3.9.43\lib\net35\ServiceStack.Api.Swagger.dll - + False - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll False ..\packages\ServiceStack.Logging.NLog.1.0.8.0\lib\net35\ServiceStack.Logging.NLog.dll - + False - ..\packages\ServiceStack.OrmLite.SqlServer.3.9.42\lib\ServiceStack.OrmLite.dll + ..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.dll False - ..\packages\ServiceStack.OrmLite.SqlServer.3.9.42\lib\ServiceStack.OrmLite.SqlServer.dll + ..\packages\ServiceStack.OrmLite.SqlServer.3.9.43\lib\ServiceStack.OrmLite.SqlServer.dll - + False - ..\packages\ServiceStack.Redis.3.9.42\lib\net35\ServiceStack.Redis.dll + ..\packages\ServiceStack.Redis.3.9.43\lib\net35\ServiceStack.Redis.dll False - ..\packages\ServiceStack.3.9.42\lib\net35\ServiceStack.ServiceInterface.dll + ..\packages\ServiceStack.3.9.43\lib\net35\ServiceStack.ServiceInterface.dll - + False - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index e985b782f..d975326f2 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -8,13 +8,13 @@ - - - + + + - - - + + + \ No newline at end of file diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index cc71d5df6..808b8637a 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -135,14 +135,17 @@ False ..\packages\MediaBrowser.IsoMounting.3.0.51\lib\net45\pfmclrapi.dll - - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll + + False + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll - - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll + + False + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll - - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + + False + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll False diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 1dcbfc4c0..690801cdf 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -4,8 +4,8 @@ - - + + \ No newline at end of file diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 072f04012..33f89cd23 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -35,17 +35,17 @@ Always - + False - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.42\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.43\lib\net35\ServiceStack.Interfaces.dll - + False - ..\packages\ServiceStack.Text.3.9.42\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.43\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index e8181f609..30a541990 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file