diff --git a/MediaBrowser.Api/GamesService.cs b/MediaBrowser.Api/GamesService.cs index 7f0521b535..a34f68f35a 100644 --- a/MediaBrowser.Api/GamesService.cs +++ b/MediaBrowser.Api/GamesService.cs @@ -110,7 +110,8 @@ namespace MediaBrowser.Api { var summary = new GameSystemSummary { - Name = system.Name + Name = system.GameSystemName, + DisplayName = system.Name }; var items = user == null ? system.RecursiveChildren : system.GetRecursiveChildren(user); diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj index 70e4e8a9a7..c7cca812fa 100644 --- a/MediaBrowser.Api/MediaBrowser.Api.csproj +++ b/MediaBrowser.Api/MediaBrowser.Api.csproj @@ -40,17 +40,17 @@ False ..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll False - ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 65ece13acb..b69dbaa67c 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -12,7 +12,6 @@ using ServiceStack.ServiceHost; using System; using System.Collections.Generic; using System.Linq; -using System.Threading.Tasks; namespace MediaBrowser.Api.UserLibrary { diff --git a/MediaBrowser.Api/packages.config b/MediaBrowser.Api/packages.config index 49090efc62..c9fec81005 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 ea76984530..a96f2c354b 100644 --- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj +++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj @@ -41,7 +41,7 @@ False - ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll False diff --git a/MediaBrowser.Common.Implementations/packages.config b/MediaBrowser.Common.Implementations/packages.config index 9ca0ca8a63..4be861cceb 100644 --- a/MediaBrowser.Common.Implementations/packages.config +++ b/MediaBrowser.Common.Implementations/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 874020dd58..1611c55da0 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -37,17 +37,17 @@ - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll False - ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Common/packages.config b/MediaBrowser.Common/packages.config index 9e97b9e92c..6969b43c54 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.Controller/Entities/GameSystem.cs b/MediaBrowser.Controller/Entities/GameSystem.cs index 39e95b91de..644405b4d4 100644 --- a/MediaBrowser.Controller/Entities/GameSystem.cs +++ b/MediaBrowser.Controller/Entities/GameSystem.cs @@ -19,5 +19,11 @@ namespace MediaBrowser.Controller.Entities return Id; } } + + /// + /// Gets or sets the game system. + /// + /// The game system. + public string GameSystemName { get; set; } } } diff --git a/MediaBrowser.Model/Dto/GameSystemSummary.cs b/MediaBrowser.Model/Dto/GameSystemSummary.cs index 79f4e73d52..a9931417ae 100644 --- a/MediaBrowser.Model/Dto/GameSystemSummary.cs +++ b/MediaBrowser.Model/Dto/GameSystemSummary.cs @@ -13,6 +13,12 @@ namespace MediaBrowser.Model.Dto /// The name. public string Name { get; set; } + /// + /// Gets or sets the name. + /// + /// The name. + public string DisplayName { get; set; } + /// /// Gets or sets the game count. /// diff --git a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs index 990e791fe0..cea7cf9268 100644 --- a/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs +++ b/MediaBrowser.Providers/Savers/XmlSaverHelpers.cs @@ -563,7 +563,7 @@ namespace MediaBrowser.Providers.Savers if (video != null) { - AddChapters(video, builder, itemRepository); + //AddChapters(video, builder, itemRepository); } } } diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index f84c02c1f8..423f27c4a3 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -49,21 +49,21 @@ False ..\packages\morelinq.1.0.16006\lib\net35\MoreLinq.dll - + False - ..\packages\ServiceStack.3.9.59\lib\net35\ServiceStack.dll + ..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.dll False ..\packages\ServiceStack.Api.Swagger.3.9.59\lib\net35\ServiceStack.Api.Swagger.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll False @@ -73,13 +73,13 @@ False ..\packages\ServiceStack.Redis.3.9.43\lib\net35\ServiceStack.Redis.dll - + False - ..\packages\ServiceStack.3.9.59\lib\net35\ServiceStack.ServiceInterface.dll + ..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.ServiceInterface.dll False - ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config index 14e7ed2f4a..5d94634084 100644 --- a/MediaBrowser.Server.Implementations/packages.config +++ b/MediaBrowser.Server.Implementations/packages.config @@ -7,12 +7,12 @@ - + - + - + \ No newline at end of file diff --git a/MediaBrowser.Server.Implementations/swagger-ui/index.html b/MediaBrowser.Server.Implementations/swagger-ui/index.html index 49f983a723..0fcc069596 100644 --- a/MediaBrowser.Server.Implementations/swagger-ui/index.html +++ b/MediaBrowser.Server.Implementations/swagger-ui/index.html @@ -20,7 +20,7 @@ $(function () { window.swaggerUi = new SwaggerUi({ discoveryUrl: "../resources", - apiKey: "special-key", + apiKey:"special-key", dom_id:"swagger-ui-container", supportHeaderParams: false, supportedSubmitMethods: ['get', 'post', 'put'], diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj index 3dc4faee6e..f19ffe5b01 100644 --- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj +++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj @@ -142,17 +142,17 @@ False ..\packages\MediaBrowser.IsoMounting.3.0.56\lib\net45\pfmclrapi.dll - + False - ..\packages\ServiceStack.3.9.59\lib\net35\ServiceStack.dll + ..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll ..\packages\ServiceStack.OrmLite.SqlServer.3.9.44\lib\ServiceStack.OrmLite.SqlServer.dll @@ -160,13 +160,13 @@ ..\packages\ServiceStack.Redis.3.9.44\lib\net35\ServiceStack.Redis.dll - + False - ..\packages\ServiceStack.3.9.59\lib\net35\ServiceStack.ServiceInterface.dll + ..\packages\ServiceStack.3.9.62\lib\net35\ServiceStack.ServiceInterface.dll False - ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll False diff --git a/MediaBrowser.ServerApplication/packages.config b/MediaBrowser.ServerApplication/packages.config index 24f768a9b7..8c1821ca5f 100644 --- a/MediaBrowser.ServerApplication/packages.config +++ b/MediaBrowser.ServerApplication/packages.config @@ -6,11 +6,11 @@ - - + + - + \ No newline at end of file diff --git a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj index 16cece7597..06f9302382 100644 --- a/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj +++ b/MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj @@ -35,17 +35,17 @@ Always - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Common.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Common.dll - + False - ..\packages\ServiceStack.Common.3.9.59\lib\net35\ServiceStack.Interfaces.dll + ..\packages\ServiceStack.Common.3.9.62\lib\net35\ServiceStack.Interfaces.dll False - ..\packages\ServiceStack.Text.3.9.59\lib\net35\ServiceStack.Text.dll + ..\packages\ServiceStack.Text.3.9.62\lib\net35\ServiceStack.Text.dll diff --git a/MediaBrowser.WebDashboard/packages.config b/MediaBrowser.WebDashboard/packages.config index 08255ca2f0..25b4f7b47c 100644 --- a/MediaBrowser.WebDashboard/packages.config +++ b/MediaBrowser.WebDashboard/packages.config @@ -1,6 +1,6 @@  - - + + \ No newline at end of file