lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update naming project

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-23 14:35:05 -05:00
parent e1da7b80f4
commit d90494f204
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -312,8 +312,8 @@
<HintPath>..\packages\Emby.XmlTv.1.0.3\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath> <HintPath>..\packages\Emby.XmlTv.1.0.3\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="MediaBrowser.Naming, Version=1.0.6178.4191, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MediaBrowser.Naming, Version=1.0.6201.24431, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MediaBrowser.Naming.1.0.3\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath> <HintPath>..\packages\MediaBrowser.Naming.1.0.4\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="SQLitePCL.pretty, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="SQLitePCL.pretty, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

2
Emby.Server.Implementations/packages.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Emby.XmlTv" version="1.0.3" targetFramework="portable45-net45+win8" /> <package id="Emby.XmlTv" version="1.0.3" targetFramework="portable45-net45+win8" />
<package id="MediaBrowser.Naming" version="1.0.3" targetFramework="portable45-net45+win8" /> <package id="MediaBrowser.Naming" version="1.0.4" targetFramework="portable45-net45+win8" />
<package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" /> <package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
<package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="portable45-net45+win8" /> <package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="portable45-net45+win8" />
<package id="UniversalDetector" version="1.0.1" targetFramework="portable45-net45+win8" /> <package id="UniversalDetector" version="1.0.1" targetFramework="portable45-net45+win8" />

10
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -462,11 +462,9 @@ namespace MediaBrowser.Model.Configuration
Type = ImageType.Art Type = ImageType.Art
}, },
// Don't download this by default
// Generally not used
new ImageOption new ImageOption
{ {
Limit = 0, Limit = 1,
Type = ImageType.Logo Type = ImageType.Logo
} }
}, },
@ -556,7 +554,7 @@ namespace MediaBrowser.Model.Configuration
Type = ImageType.Thumb Type = ImageType.Thumb
} }
}, },
DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" } DisabledMetadataFetchers = new []{ "TheMovieDb" }
}, },
new MetadataOptions(0, 1280) new MetadataOptions(0, 1280)
@ -577,8 +575,8 @@ namespace MediaBrowser.Model.Configuration
Type = ImageType.Primary Type = ImageType.Primary
} }
}, },
DisabledMetadataFetchers = new []{ "The Open Movie Database" }, DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" },
DisabledImageFetchers = new []{ "TheMovieDb" } DisabledImageFetchers = new []{ "The Open Movie Database", "TheMovieDb" }
} }
}; };
} }

6
MediaBrowser.Providers/Omdb/OmdbProvider.cs
View File

@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Omdb
T item = itemResult.Item; T item = itemResult.Item;
var result = await GetRootObject(imdbId, cancellationToken); var result = await GetRootObject(imdbId, cancellationToken).ConfigureAwait(false);
// Only take the name and rating if the user's language is set to english, since Omdb has no localization // Only take the name and rating if the user's language is set to english, since Omdb has no localization
if (string.Equals(language, "en", StringComparison.OrdinalIgnoreCase)) if (string.Equals(language, "en", StringComparison.OrdinalIgnoreCase))
@ -221,7 +221,7 @@ namespace MediaBrowser.Providers.Omdb
internal async Task<RootObject> GetRootObject(string imdbId, CancellationToken cancellationToken) internal async Task<RootObject> GetRootObject(string imdbId, CancellationToken cancellationToken)
{ {
var path = await EnsureItemInfo(imdbId, cancellationToken); var path = await EnsureItemInfo(imdbId, cancellationToken).ConfigureAwait(false);
string resultString; string resultString;
@ -240,7 +240,7 @@ namespace MediaBrowser.Providers.Omdb
internal async Task<SeasonRootObject> GetSeasonRootObject(string imdbId, int seasonId, CancellationToken cancellationToken) internal async Task<SeasonRootObject> GetSeasonRootObject(string imdbId, int seasonId, CancellationToken cancellationToken)
{ {
var path = await EnsureSeasonInfo(imdbId, seasonId, cancellationToken); var path = await EnsureSeasonInfo(imdbId, seasonId, cancellationToken).ConfigureAwait(false);
string resultString; string resultString;