diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-03 02:58:48 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-03 02:58:48 -0500 |
| commit | 68772e7d9b5273766e3a0e13c60ebec07254a924 (patch) | |
| tree | 61bbe0dd963fc43656dcbbf4a17e687eff8e6b75 /MediaBrowser.Model | |
| parent | 4a9c77c32713ed0a52597f9abb7313062ef1872f (diff) | |
update details
Diffstat (limited to 'MediaBrowser.Model')
4 files changed, 13 insertions, 25 deletions
diff --git a/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs b/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs deleted file mode 100644 index 8564d5b5b4..0000000000 --- a/MediaBrowser.Model/Configuration/PeopleMetadataOptions.cs +++ /dev/null @@ -1,19 +0,0 @@ -namespace MediaBrowser.Model.Configuration -{ - public class PeopleMetadataOptions - { - public bool DownloadActorMetadata { get; set; } - public bool DownloadDirectorMetadata { get; set; } - public bool DownloadProducerMetadata { get; set; } - public bool DownloadWriterMetadata { get; set; } - public bool DownloadComposerMetadata { get; set; } - public bool DownloadOtherPeopleMetadata { get; set; } - public bool DownloadGuestStarMetadata { get; set; } - - public PeopleMetadataOptions() - { - DownloadActorMetadata = true; - DownloadDirectorMetadata = true; - } - } -}
\ No newline at end of file diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 64225ae76c..520cc97018 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -181,8 +181,6 @@ namespace MediaBrowser.Model.Configuration public string UICulture { get; set; } - public PeopleMetadataOptions PeopleMetadataOptions { get; set; } - public bool SaveMetadataHidden { get; set; } public NameValuePair[] ContentTypes { get; set; } @@ -260,8 +258,6 @@ namespace MediaBrowser.Model.Configuration UICulture = "en-us"; - PeopleMetadataOptions = new PeopleMetadataOptions(); - MetadataOptions = new[] { new MetadataOptions(1, 1280) {ItemType = "Book"}, diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index abdebba4ed..85f475ca25 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -118,7 +118,9 @@ namespace MediaBrowser.Model.Entities private string AddLanguageIfNeeded(string title) { - if (!string.IsNullOrEmpty(Language) && !string.Equals(Language, "und", StringComparison.OrdinalIgnoreCase) && title.IndexOf(Language, StringComparison.OrdinalIgnoreCase) == -1) + if (!string.IsNullOrEmpty(Language) && + !string.Equals(Language, "und", StringComparison.OrdinalIgnoreCase) && + !IsLanguageInTitle(title, Language)) { title = StringHelper.FirstToUpper(Language) + " " + title; } @@ -126,6 +128,16 @@ namespace MediaBrowser.Model.Entities return title; } + private bool IsLanguageInTitle(string title, string language) + { + if (title.IndexOf(Language, StringComparison.OrdinalIgnoreCase) != -1) + { + return true; + } + + return false; + } + public string NalLengthSize { get; set; } /// <summary> diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index 64472ca3a2..f36519e27b 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -84,7 +84,6 @@ <Compile Include="Configuration\FanartOptions.cs" /> <Compile Include="Configuration\LibraryOptions.cs" /> <Compile Include="Configuration\MetadataConfiguration.cs" /> - <Compile Include="Configuration\PeopleMetadataOptions.cs" /> <Compile Include="Configuration\XbmcMetadataOptions.cs" /> <Compile Include="Configuration\SubtitlePlaybackMode.cs" /> <Compile Include="Connect\ConnectAuthenticationExchangeResult.cs" /> |