Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

update xmltv parsing

Browse Source
This commit is contained in:
Luke Pulverenti 2017-02-09 18:25:10 -05:00
parent 1879999fd3
commit 6405f6c0c7
4 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Emby.Common.Implementations/HttpClientManager/HttpClientManager.cs
View File

@ -458,15 +458,22 @@ namespace Emby.Common.Implementations.HttpClientManager
!string.IsNullOrEmpty(options.RequestContent) || !string.IsNullOrEmpty(options.RequestContent) ||
string.Equals(httpMethod, "post", StringComparison.OrdinalIgnoreCase)) string.Equals(httpMethod, "post", StringComparison.OrdinalIgnoreCase))
{ {
var bytes = options.RequestContentBytes ?? try
Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty); {
var bytes = options.RequestContentBytes ??
Encoding.UTF8.GetBytes(options.RequestContent ?? string.Empty);
httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded"; httpWebRequest.ContentType = options.RequestContentType ?? "application/x-www-form-urlencoded";
#if NET46 #if NET46
httpWebRequest.ContentLength = bytes.Length; httpWebRequest.ContentLength = bytes.Length;
#endif #endif
(await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length); (await httpWebRequest.GetRequestStreamAsync().ConfigureAwait(false)).Write(bytes, 0, bytes.Length);
}
catch (Exception ex)
{
throw new HttpException(ex.Message) { IsTimedOut = true };
}
} }
if (options.ResourcePool != null) if (options.ResourcePool != null)

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

@ -309,8 +309,8 @@
<Project>{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}</Project> <Project>{4f26d5d8-a7b0-42b3-ba42-7cb7d245934e}</Project>
<Name>SocketHttpListener.Portable</Name> <Name>SocketHttpListener.Portable</Name>
</ProjectReference> </ProjectReference>
<Reference Include="Emby.XmlTv, Version=1.0.6241.4924, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Emby.XmlTv, Version=1.0.6249.32870, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Emby.XmlTv.1.0.5\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath> <HintPath>..\packages\Emby.XmlTv.1.0.6\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="MediaBrowser.Naming, Version=1.0.6201.24431, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MediaBrowser.Naming, Version=1.0.6201.24431, Culture=neutral, processorArchitecture=MSIL">

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

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="Emby.XmlTv" version="1.0.5" targetFramework="portable45-net45+win8" /> <package id="Emby.XmlTv" version="1.0.6" targetFramework="portable45-net45+win8" />
<package id="MediaBrowser.Naming" version="1.0.4" 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" />

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

@ -385,10 +385,11 @@ namespace MediaBrowser.Providers.Omdb
{ {
T item = itemResult.Item; T item = itemResult.Item;
var isConfiguredForEnglish = IsConfiguredForEnglish(item);
// Grab series genres because imdb data is better than tvdb. Leave movies alone // Grab series genres because imdb data is better than tvdb. Leave movies alone
// But only do it if english is the preferred language because this data will not be localized // But only do it if english is the preferred language because this data will not be localized
if (ShouldFetchGenres(item) && if (isConfiguredForEnglish && !string.IsNullOrWhiteSpace(result.Genre))
!string.IsNullOrWhiteSpace(result.Genre))
{ {
item.Genres.Clear(); item.Genres.Clear();
@ -418,8 +419,11 @@ namespace MediaBrowser.Providers.Omdb
hasAwards.AwardSummary = WebUtility.HtmlDecode(result.Awards); hasAwards.AwardSummary = WebUtility.HtmlDecode(result.Awards);
} }
// Imdb plots are usually pretty short if (isConfiguredForEnglish)
item.Overview = result.Plot; {
// Omdb is currently english only, so for other languages skip this and let secondary providers fill it in
item.Overview = result.Plot;
}
//if (!string.IsNullOrWhiteSpace(result.Director)) //if (!string.IsNullOrWhiteSpace(result.Director))
//{ //{
@ -462,7 +466,7 @@ namespace MediaBrowser.Providers.Omdb
//} //}
} }
private bool ShouldFetchGenres(BaseItem item) private bool IsConfiguredForEnglish(BaseItem item)
{ {
var lang = item.GetPreferredMetadataLanguage(); var lang = item.GetPreferredMetadataLanguage();