From 88d9b3d09dd408845976f26b56e62428a9b4c402 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 26 Jan 2017 15:10:19 -0500 Subject: [PATCH 1/9] remove localized guids --- Emby.Server.Implementations/Library/LibraryManager.cs | 2 +- MediaBrowser.Api/StartupWizardService.cs | 1 - MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index c59a22884..57c9551d5 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -501,7 +501,7 @@ namespace Emby.Server.Implementations.Library throw new ArgumentNullException("type"); } - if (ConfigurationManager.Configuration.EnableLocalizedGuids && key.StartsWith(ConfigurationManager.ApplicationPaths.ProgramDataPath)) + if (key.StartsWith(ConfigurationManager.ApplicationPaths.ProgramDataPath)) { // Try to normalize paths located underneath program-data in an attempt to make them more portable key = key.Substring(ConfigurationManager.ApplicationPaths.ProgramDataPath.Length) diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs index 25a460935..9f89db9c7 100644 --- a/MediaBrowser.Api/StartupWizardService.cs +++ b/MediaBrowser.Api/StartupWizardService.cs @@ -111,7 +111,6 @@ namespace MediaBrowser.Api private void SetWizardFinishValues(ServerConfiguration config) { - config.EnableLocalizedGuids = true; config.EnableStandaloneMusicKeys = true; config.EnableCaseSensitiveItemIds = true; config.EnableFolderView = true; diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index bd0a53cc0..50837292d 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -182,7 +182,6 @@ namespace MediaBrowser.Model.Configuration public bool EnableAnonymousUsageReporting { get; set; } public bool EnableStandaloneMusicKeys { get; set; } - public bool EnableLocalizedGuids { get; set; } public bool EnableFolderView { get; set; } public bool EnableGroupingIntoCollections { get; set; } public bool DisplaySpecialsWithinSeasons { get; set; } @@ -205,7 +204,6 @@ namespace MediaBrowser.Model.Configuration Migrations = new string[] { }; ImageExtractionTimeoutMs = 0; - EnableLocalizedGuids = true; DisplaySpecialsWithinSeasons = true; EnableExternalContentInSuggestions = true; From 3ff216f05a5f31d04c2bd6436774fa6fd94bd30b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 26 Jan 2017 15:27:12 -0500 Subject: [PATCH 2/9] update ShortOverview --- Emby.Dlna/Didl/DidlBuilder.cs | 5 -- Emby.Server.Core/ApplicationHost.cs | 70 +++++++++---------- .../Data/SqliteItemRepository.cs | 13 ---- Emby.Server.Implementations/Dto/DtoService.cs | 5 -- .../LiveTv/EmbyTV/EmbyTV.cs | 7 -- .../LiveTv/EmbyTV/RecordingHelper.cs | 1 - .../LiveTv/Listings/SchedulesDirect.cs | 2 +- .../LiveTv/Listings/XmlTvListingsProvider.cs | 1 - MediaBrowser.Api/ItemUpdateService.cs | 2 - MediaBrowser.Controller/Entities/BaseItem.cs | 6 -- .../Entities/InternalItemsQuery.cs | 1 - MediaBrowser.Controller/LiveTv/TimerInfo.cs | 1 - .../Parsers/BaseItemXmlParser.cs | 12 ---- .../Savers/BaseXmlSaver.cs | 5 -- .../Probing/ProbeResultNormalizer.cs | 9 +-- MediaBrowser.Model/Dto/BaseItemDto.cs | 6 -- MediaBrowser.Model/MediaInfo/MediaInfo.cs | 5 -- MediaBrowser.Model/Querying/ItemFields.cs | 5 -- .../Manager/ProviderUtils.cs | 9 --- .../MediaInfo/FFProbeVideoInfo.cs | 5 -- MediaBrowser.Providers/Omdb/OmdbProvider.cs | 4 +- .../Parsers/BaseNfoParser.cs | 11 --- .../Savers/BaseNfoSaver.cs | 2 +- 23 files changed, 40 insertions(+), 147 deletions(-) diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs index ca4c3b912..d048dcde1 100644 --- a/Emby.Dlna/Didl/DidlBuilder.cs +++ b/Emby.Dlna/Didl/DidlBuilder.cs @@ -646,11 +646,6 @@ namespace Emby.Dlna.Didl { var desc = item.Overview; - if (!string.IsNullOrEmpty(item.ShortOverview)) - { - desc = item.ShortOverview; - } - if (!string.IsNullOrWhiteSpace(desc)) { AddValue(writer, "dc", "description", desc, NS_DC); diff --git a/Emby.Server.Core/ApplicationHost.cs b/Emby.Server.Core/ApplicationHost.cs index b9412d0fb..a3c228a58 100644 --- a/Emby.Server.Core/ApplicationHost.cs +++ b/Emby.Server.Core/ApplicationHost.cs @@ -413,41 +413,41 @@ namespace Emby.Server.Core var result = new JsonSerializer(FileSystemManager, LogManager.GetLogger("JsonSerializer")); - ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; - ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; - ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; - ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "Artists", "AlbumArtists", "ChannelMediaSources", "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; - ServiceStack.Text.JsConfig.ExcludePropertyNames = new[] { "ProviderIds", "ImageInfos", "ProductionLocations", "ThemeSongIds", "ThemeVideoIds", "TotalBitrate", "ShortOverview", "Taglines", "Keywords", "ExtraType" }; - ServiceStack.Text.JsConfig