alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-26 10:36:57 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

3.0.5306.16273

Browse Source
This commit is contained in:
Luke Pulverenti
2014-07-12 10:05:51 -04:00
parent b68da51921
commit 862cb87f0f
53 changed files with 667 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Providers/Movies/MovieDbSearch.cs
View File

@@ -147,7 +147,7 @@ namespace MediaBrowser.Providers.Movies
Name = i.title ?? i.original_title ?? i.name,
ImageUrl = string.IsNullOrWhiteSpace(i.poster_path) ? null : baseImageUrl + i.poster_path
};
if (!string.IsNullOrWhiteSpace(i.release_date))
{
DateTime r;

47
MediaBrowser.Providers/Omdb/OmdbItemProvider.cs
View File

@@ -57,22 +57,27 @@ namespace MediaBrowser.Providers.Omdb
Item = new Series()
};
var imdbId = info.GetProviderId(MetadataProviders.Imdb);
var searchResult = await GetSeriesImdbId(info, cancellationToken).ConfigureAwait(false);
result.Item.Name = searchResult.Item3;
result.Item.Name = searchResult.Item4;
if (string.IsNullOrEmpty(imdbId))
if (!string.IsNullOrEmpty(searchResult.Item1))
{
imdbId = searchResult.Item1;
if (!string.IsNullOrEmpty(searchResult.Item2))
{
result.Item.SetProviderId(MetadataProviders.Tvdb, searchResult.Item2);
}
result.Item.SetProviderId(MetadataProviders.Imdb, searchResult.Item1);
}
if (!string.IsNullOrEmpty(imdbId))
if (!string.IsNullOrEmpty(searchResult.Item2))
{
result.Item.SetProviderId(MetadataProviders.Tmdb, searchResult.Item2);
}
if (!string.IsNullOrEmpty(searchResult.Item3))
{
result.Item.SetProviderId(MetadataProviders.Tvdb, searchResult.Item3);
}
var imdbId = result.Item.GetProviderId(MetadataProviders.Imdb);
if (!string.IsNullOrEmpty(info.GetProviderId(MetadataProviders.Imdb)))
{
result.Item.SetProviderId(MetadataProviders.Imdb, imdbId);
result.HasMetadata = true;
@@ -148,16 +153,26 @@ namespace MediaBrowser.Providers.Omdb
return new Tuple<string, string, string>(imdb, tmdb, name);
}
private async Task<Tuple<string, string, string>> GetSeriesImdbId(SeriesInfo info, CancellationToken cancellationToken)
private async Task<Tuple<string, string, string, string>> GetSeriesImdbId(SeriesInfo info, CancellationToken cancellationToken)
{
var result = await TvdbSeriesProvider.Current.GetMetadata(info, cancellationToken)
.ConfigureAwait(false);
//var result = await TvdbSeriesProvider.Current.GetMetadata(info, cancellationToken)
// .ConfigureAwait(false);
//var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
//var tvdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tvdb) : null;
//var name = result.HasMetadata ? result.Item.Name : null;
//return new Tuple<string, string, string>(imdb, tvdb, name);
var result = await MovieDbSeriesProvider.Current.GetMetadata(info, cancellationToken)
.ConfigureAwait(false);
var imdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Imdb) : null;
var tmdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tmdb) : null;
var tvdb = result.HasMetadata ? result.Item.GetProviderId(MetadataProviders.Tvdb) : null;
var name = result.HasMetadata ? result.Item.Name : null;
return new Tuple<string, string, string>(imdb, tvdb, name);
return new Tuple<string, string, string, string>(imdb, tmdb, tvdb, name);
}
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)