commit
3672f080e0
|
@ -173,10 +173,12 @@
|
||||||
<Compile Include="TV\FanArtSeasonProvider.cs" />
|
<Compile Include="TV\FanArtSeasonProvider.cs" />
|
||||||
<Compile Include="TV\FanartSeriesProvider.cs" />
|
<Compile Include="TV\FanartSeriesProvider.cs" />
|
||||||
<Compile Include="TV\MissingEpisodeProvider.cs" />
|
<Compile Include="TV\MissingEpisodeProvider.cs" />
|
||||||
|
<Compile Include="TV\MovieDbProviderBase.cs" />
|
||||||
<Compile Include="TV\MovieDbEpisodeImageProvider.cs" />
|
<Compile Include="TV\MovieDbEpisodeImageProvider.cs" />
|
||||||
<Compile Include="TV\MovieDbSeasonProvider.cs" />
|
<Compile Include="TV\MovieDbSeasonProvider.cs" />
|
||||||
<Compile Include="TV\MovieDbSeriesImageProvider.cs" />
|
<Compile Include="TV\MovieDbSeriesImageProvider.cs" />
|
||||||
<Compile Include="TV\MovieDbSeriesProvider.cs" />
|
<Compile Include="TV\MovieDbSeriesProvider.cs" />
|
||||||
|
<Compile Include="TV\MovieDbEpisodeProvider.cs" />
|
||||||
<Compile Include="TV\OmdbEpisodeProvider.cs" />
|
<Compile Include="TV\OmdbEpisodeProvider.cs" />
|
||||||
<Compile Include="TV\SeriesMetadataService.cs" />
|
<Compile Include="TV\SeriesMetadataService.cs" />
|
||||||
<Compile Include="TV\TvdbEpisodeImageProvider.cs" />
|
<Compile Include="TV\TvdbEpisodeImageProvider.cs" />
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
using MediaBrowser.Common.IO;
|
using CommonIO;
|
||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
|
@ -6,37 +6,26 @@ using MediaBrowser.Controller.Localization;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
using MediaBrowser.Model.Providers;
|
using MediaBrowser.Model.Providers;
|
||||||
using MediaBrowser.Model.Serialization;
|
using MediaBrowser.Model.Serialization;
|
||||||
using MediaBrowser.Providers.Movies;
|
using MediaBrowser.Providers.Movies;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CommonIO;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Providers.TV
|
namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
public class MovieDbEpisodeImageProvider : IRemoteImageProvider, IHasOrder
|
public class MovieDbEpisodeImageProvider :
|
||||||
|
MovieDbProviderBase,
|
||||||
|
IRemoteImageProvider,
|
||||||
|
IHasOrder
|
||||||
{
|
{
|
||||||
private const string GetTvInfo3 = @"http://api.themoviedb.org/3/tv/{0}/season/{1}/episode/{2}?api_key={3}&append_to_response=images,external_ids,credits,videos";
|
public MovieDbEpisodeImageProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILogManager logManager)
|
||||||
private readonly IHttpClient _httpClient;
|
: base(httpClient, configurationManager, jsonSerializer, fileSystem, localization, logManager)
|
||||||
private readonly IServerConfigurationManager _configurationManager;
|
{}
|
||||||
private readonly IJsonSerializer _jsonSerializer;
|
|
||||||
private readonly IFileSystem _fileSystem;
|
|
||||||
private readonly ILocalizationManager _localization;
|
|
||||||
|
|
||||||
public MovieDbEpisodeImageProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization)
|
|
||||||
{
|
|
||||||
_httpClient = httpClient;
|
|
||||||
_configurationManager = configurationManager;
|
|
||||||
_jsonSerializer = jsonSerializer;
|
|
||||||
_fileSystem = fileSystem;
|
|
||||||
_localization = localization;
|
|
||||||
}
|
|
||||||
|
|
||||||
public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
|
public IEnumerable<ImageType> GetSupportedImages(IHasImages item)
|
||||||
{
|
{
|
||||||
|
@ -124,12 +113,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
|
|
||||||
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
return _httpClient.GetResponse(new HttpRequestOptions
|
return GetResponse(url, cancellationToken);
|
||||||
{
|
|
||||||
CancellationToken = cancellationToken,
|
|
||||||
Url = url,
|
|
||||||
ResourcePool = MovieDbProvider.Current.MovieDbResourcePool
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Name
|
public string Name
|
||||||
|
@ -142,188 +126,6 @@ namespace MediaBrowser.Providers.TV
|
||||||
return item is Controller.Entities.TV.Episode;
|
return item is Controller.Entities.TV.Episode;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<RootObject> GetEpisodeInfo(string seriesTmdbId, int season, int episodeNumber, string preferredMetadataLanguage,
|
|
||||||
CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
await EnsureEpisodeInfo(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage, cancellationToken)
|
|
||||||
.ConfigureAwait(false);
|
|
||||||
|
|
||||||
var dataFilePath = GetDataFilePath(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage);
|
|
||||||
|
|
||||||
return _jsonSerializer.DeserializeFromFile<RootObject>(dataFilePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal Task EnsureEpisodeInfo(string tmdbId, int seasonNumber, int episodeNumber, string language, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(tmdbId))
|
|
||||||
{
|
|
||||||
throw new ArgumentNullException("tmdbId");
|
|
||||||
}
|
|
||||||
if (string.IsNullOrEmpty(language))
|
|
||||||
{
|
|
||||||
throw new ArgumentNullException("language");
|
|
||||||
}
|
|
||||||
|
|
||||||
var path = GetDataFilePath(tmdbId, seasonNumber, episodeNumber, language);
|
|
||||||
|
|
||||||
var fileInfo = _fileSystem.GetFileSystemInfo(path);
|
|
||||||
|
|
||||||
if (fileInfo.Exists)
|
|
||||||
{
|
|
||||||
// If it's recent or automatic updates are enabled, don't re-download
|
|
||||||
if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 3)
|
|
||||||
{
|
|
||||||
return Task.FromResult(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return DownloadEpisodeInfo(tmdbId, seasonNumber, episodeNumber, language, cancellationToken);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal string GetDataFilePath(string tmdbId, int seasonNumber, int episodeNumber, string preferredLanguage)
|
|
||||||
{
|
|
||||||
if (string.IsNullOrEmpty(tmdbId))
|
|
||||||
{
|
|
||||||
throw new ArgumentNullException("tmdbId");
|
|
||||||
}
|
|
||||||
if (string.IsNullOrEmpty(preferredLanguage))
|
|
||||||
{
|
|
||||||
throw new ArgumentNullException("preferredLanguage");
|
|
||||||
}
|
|
||||||
|
|
||||||
var path = MovieDbSeriesProvider.GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
|
|
||||||
|
|
||||||
var filename = string.Format("season-{0}-episode-{1}-{2}.json",
|
|
||||||
seasonNumber.ToString(CultureInfo.InvariantCulture),
|
|
||||||
episodeNumber.ToString(CultureInfo.InvariantCulture),
|
|
||||||
preferredLanguage);
|
|
||||||
|
|
||||||
return Path.Combine(path, filename);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal async Task DownloadEpisodeInfo(string id, int seasonNumber, int episodeNumber, string preferredMetadataLanguage, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var mainResult = await FetchMainResult(id, seasonNumber, episodeNumber, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
var dataFilePath = GetDataFilePath(id, seasonNumber, episodeNumber, preferredMetadataLanguage);
|
|
||||||
|
|
||||||
_fileSystem.CreateDirectory(Path.GetDirectoryName(dataFilePath));
|
|
||||||
_jsonSerializer.SerializeToFile(mainResult, dataFilePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal async Task<RootObject> FetchMainResult(string id, int seasonNumber, int episodeNumber, string language, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var url = string.Format(GetTvInfo3, id, seasonNumber.ToString(CultureInfo.InvariantCulture), episodeNumber, MovieDbProvider.ApiKey);
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(language))
|
|
||||||
{
|
|
||||||
url += string.Format("&language={0}", language);
|
|
||||||
}
|
|
||||||
|
|
||||||
var includeImageLanguageParam = MovieDbProvider.GetImageLanguagesParam(language);
|
|
||||||
// Get images in english and with no language
|
|
||||||
url += "&include_image_language=" + includeImageLanguageParam;
|
|
||||||
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
|
|
||||||
{
|
|
||||||
Url = url,
|
|
||||||
CancellationToken = cancellationToken,
|
|
||||||
AcceptHeader = MovieDbProvider.AcceptHeader
|
|
||||||
|
|
||||||
}).ConfigureAwait(false))
|
|
||||||
{
|
|
||||||
return _jsonSerializer.DeserializeFromStream<RootObject>(json);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Still
|
|
||||||
{
|
|
||||||
public double aspect_ratio { get; set; }
|
|
||||||
public string file_path { get; set; }
|
|
||||||
public int height { get; set; }
|
|
||||||
public string id { get; set; }
|
|
||||||
public object iso_639_1 { get; set; }
|
|
||||||
public double vote_average { get; set; }
|
|
||||||
public int vote_count { get; set; }
|
|
||||||
public int width { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Images
|
|
||||||
{
|
|
||||||
public List<Still> stills { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class ExternalIds
|
|
||||||
{
|
|
||||||
public string imdb_id { get; set; }
|
|
||||||
public object freebase_id { get; set; }
|
|
||||||
public string freebase_mid { get; set; }
|
|
||||||
public int tvdb_id { get; set; }
|
|
||||||
public int tvrage_id { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Cast
|
|
||||||
{
|
|
||||||
public string character { get; set; }
|
|
||||||
public string credit_id { get; set; }
|
|
||||||
public int id { get; set; }
|
|
||||||
public string name { get; set; }
|
|
||||||
public string profile_path { get; set; }
|
|
||||||
public int order { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Crew
|
|
||||||
{
|
|
||||||
public int id { get; set; }
|
|
||||||
public string credit_id { get; set; }
|
|
||||||
public string name { get; set; }
|
|
||||||
public string department { get; set; }
|
|
||||||
public string job { get; set; }
|
|
||||||
public string profile_path { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class GuestStar
|
|
||||||
{
|
|
||||||
public int id { get; set; }
|
|
||||||
public string name { get; set; }
|
|
||||||
public string credit_id { get; set; }
|
|
||||||
public string character { get; set; }
|
|
||||||
public int order { get; set; }
|
|
||||||
public string profile_path { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Credits
|
|
||||||
{
|
|
||||||
public List<Cast> cast { get; set; }
|
|
||||||
public List<Crew> crew { get; set; }
|
|
||||||
public List<GuestStar> guest_stars { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class Videos
|
|
||||||
{
|
|
||||||
public List<object> results { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class RootObject
|
|
||||||
{
|
|
||||||
public string air_date { get; set; }
|
|
||||||
public int episode_number { get; set; }
|
|
||||||
public string name { get; set; }
|
|
||||||
public string overview { get; set; }
|
|
||||||
public int id { get; set; }
|
|
||||||
public object production_code { get; set; }
|
|
||||||
public int season_number { get; set; }
|
|
||||||
public string still_path { get; set; }
|
|
||||||
public double vote_average { get; set; }
|
|
||||||
public int vote_count { get; set; }
|
|
||||||
public Images images { get; set; }
|
|
||||||
public ExternalIds external_ids { get; set; }
|
|
||||||
public Credits credits { get; set; }
|
|
||||||
public Videos videos { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public int Order
|
public int Order
|
||||||
{
|
{
|
||||||
get
|
get
|
||||||
|
|
152
MediaBrowser.Providers/TV/MovieDbEpisodeProvider.cs
Normal file
152
MediaBrowser.Providers/TV/MovieDbEpisodeProvider.cs
Normal file
|
@ -0,0 +1,152 @@
|
||||||
|
using CommonIO;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
|
using MediaBrowser.Controller.Configuration;
|
||||||
|
using MediaBrowser.Controller.Entities;
|
||||||
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
|
using MediaBrowser.Controller.Localization;
|
||||||
|
using MediaBrowser.Controller.Providers;
|
||||||
|
using MediaBrowser.Model.Entities;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MediaBrowser.Model.Net;
|
||||||
|
using MediaBrowser.Model.Providers;
|
||||||
|
using MediaBrowser.Model.Serialization;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Net;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Providers.TV
|
||||||
|
{
|
||||||
|
class MovieDbEpisodeProvider :
|
||||||
|
MovieDbProviderBase,
|
||||||
|
IRemoteMetadataProvider<Episode, EpisodeInfo>,
|
||||||
|
IHasOrder
|
||||||
|
{
|
||||||
|
public MovieDbEpisodeProvider(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILogManager logManager)
|
||||||
|
: base(httpClient, configurationManager, jsonSerializer, fileSystem, localization, logManager)
|
||||||
|
{ }
|
||||||
|
|
||||||
|
public Task<IEnumerable<RemoteSearchResult>> GetSearchResults(EpisodeInfo searchInfo, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
return Task.FromResult<IEnumerable<RemoteSearchResult>>(new List<RemoteSearchResult>());
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<MetadataResult<Episode>> GetMetadata(EpisodeInfo info, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var result = new MetadataResult<Episode>();
|
||||||
|
|
||||||
|
string seriesTmdbId;
|
||||||
|
info.SeriesProviderIds.TryGetValue(MetadataProviders.Tmdb.ToString(), out seriesTmdbId);
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(seriesTmdbId))
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
var seasonNumber = info.ParentIndexNumber;
|
||||||
|
var episodeNumber = info.IndexNumber;
|
||||||
|
|
||||||
|
if (!seasonNumber.HasValue || !episodeNumber.HasValue)
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var response = await GetEpisodeInfo(seriesTmdbId, seasonNumber.Value, episodeNumber.Value, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
result.HasMetadata = true;
|
||||||
|
|
||||||
|
var item = new Episode();
|
||||||
|
result.Item = item;
|
||||||
|
|
||||||
|
item.Name = info.Name;
|
||||||
|
item.IndexNumber = info.IndexNumber;
|
||||||
|
item.ParentIndexNumber = info.ParentIndexNumber;
|
||||||
|
item.IndexNumberEnd = info.IndexNumberEnd;
|
||||||
|
|
||||||
|
if (response.external_ids.tvdb_id > 0)
|
||||||
|
{
|
||||||
|
item.SetProviderId(MetadataProviders.Tvdb, response.external_ids.tvdb_id.ToString(CultureInfo.InvariantCulture));
|
||||||
|
}
|
||||||
|
|
||||||
|
item.PremiereDate = response.air_date;
|
||||||
|
item.ProductionYear = result.Item.PremiereDate.Value.Year;
|
||||||
|
|
||||||
|
item.Name = response.name;
|
||||||
|
item.Overview = response.overview;
|
||||||
|
|
||||||
|
item.CommunityRating = (float)response.vote_average;
|
||||||
|
item.VoteCount = response.vote_count;
|
||||||
|
|
||||||
|
result.ResetPeople();
|
||||||
|
|
||||||
|
var credits = response.credits;
|
||||||
|
if (credits != null)
|
||||||
|
{
|
||||||
|
//Actors, Directors, Writers - all in People
|
||||||
|
//actors come from cast
|
||||||
|
if (credits.cast != null)
|
||||||
|
{
|
||||||
|
foreach (var actor in credits.cast.OrderBy(a => a.order))
|
||||||
|
{
|
||||||
|
result.AddPerson(new PersonInfo { Name = actor.name.Trim(), Role = actor.character, Type = PersonType.Actor, SortOrder = actor.order });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// guest stars
|
||||||
|
if (credits.guest_stars != null)
|
||||||
|
{
|
||||||
|
foreach (var guest in credits.guest_stars.OrderBy(a => a.order))
|
||||||
|
{
|
||||||
|
result.AddPerson(new PersonInfo { Name = guest.name.Trim(), Role = guest.character, Type = PersonType.GuestStar, SortOrder = guest.order });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//and the rest from crew
|
||||||
|
if (credits.crew != null)
|
||||||
|
{
|
||||||
|
foreach (var person in credits.crew)
|
||||||
|
{
|
||||||
|
result.AddPerson(new PersonInfo { Name = person.name.Trim(), Role = person.job, Type = person.department });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (HttpException ex)
|
||||||
|
{
|
||||||
|
Logger.Error("No metadata found for {0}", seasonNumber.Value);
|
||||||
|
|
||||||
|
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.NotFound)
|
||||||
|
{
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Task<HttpResponseInfo> GetImageResponse(string url, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
return GetResponse(url, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
public int Order
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
// After TheTvDb
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public string Name
|
||||||
|
{
|
||||||
|
get { return "TheMovieDb"; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
234
MediaBrowser.Providers/TV/MovieDbProviderBase.cs
Normal file
234
MediaBrowser.Providers/TV/MovieDbProviderBase.cs
Normal file
|
@ -0,0 +1,234 @@
|
||||||
|
using CommonIO;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
|
using MediaBrowser.Controller.Configuration;
|
||||||
|
using MediaBrowser.Controller.Localization;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MediaBrowser.Model.Serialization;
|
||||||
|
using MediaBrowser.Providers.Movies;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.IO;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Providers.TV
|
||||||
|
{
|
||||||
|
public abstract class MovieDbProviderBase
|
||||||
|
{
|
||||||
|
private const string EpisodeUrlPattern = @"http://api.themoviedb.org/3/tv/{0}/season/{1}/episode/{2}?api_key={3}&append_to_response=images,external_ids,credits,videos";
|
||||||
|
private readonly IHttpClient _httpClient;
|
||||||
|
private readonly IServerConfigurationManager _configurationManager;
|
||||||
|
private readonly IJsonSerializer _jsonSerializer;
|
||||||
|
private readonly IFileSystem _fileSystem;
|
||||||
|
private readonly ILocalizationManager _localization;
|
||||||
|
private readonly ILogger _logger;
|
||||||
|
|
||||||
|
public MovieDbProviderBase(IHttpClient httpClient, IServerConfigurationManager configurationManager, IJsonSerializer jsonSerializer, IFileSystem fileSystem, ILocalizationManager localization, ILogManager logManager)
|
||||||
|
{
|
||||||
|
_httpClient = httpClient;
|
||||||
|
_configurationManager = configurationManager;
|
||||||
|
_jsonSerializer = jsonSerializer;
|
||||||
|
_fileSystem = fileSystem;
|
||||||
|
_localization = localization;
|
||||||
|
_logger = logManager.GetLogger(GetType().Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected ILogger Logger
|
||||||
|
{
|
||||||
|
get { return _logger; }
|
||||||
|
}
|
||||||
|
|
||||||
|
protected async Task<RootObject> GetEpisodeInfo(string seriesTmdbId, int season, int episodeNumber, string preferredMetadataLanguage,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
await EnsureEpisodeInfo(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage, cancellationToken)
|
||||||
|
.ConfigureAwait(false);
|
||||||
|
|
||||||
|
var dataFilePath = GetDataFilePath(seriesTmdbId, season, episodeNumber, preferredMetadataLanguage);
|
||||||
|
|
||||||
|
return _jsonSerializer.DeserializeFromFile<RootObject>(dataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal Task EnsureEpisodeInfo(string tmdbId, int seasonNumber, int episodeNumber, string language, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(tmdbId))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("tmdbId");
|
||||||
|
}
|
||||||
|
if (string.IsNullOrEmpty(language))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("language");
|
||||||
|
}
|
||||||
|
|
||||||
|
var path = GetDataFilePath(tmdbId, seasonNumber, episodeNumber, language);
|
||||||
|
|
||||||
|
var fileInfo = _fileSystem.GetFileSystemInfo(path);
|
||||||
|
|
||||||
|
if (fileInfo.Exists)
|
||||||
|
{
|
||||||
|
// If it's recent or automatic updates are enabled, don't re-download
|
||||||
|
if ((DateTime.UtcNow - _fileSystem.GetLastWriteTimeUtc(fileInfo)).TotalDays <= 3)
|
||||||
|
{
|
||||||
|
return Task.FromResult(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return DownloadEpisodeInfo(tmdbId, seasonNumber, episodeNumber, language, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal string GetDataFilePath(string tmdbId, int seasonNumber, int episodeNumber, string preferredLanguage)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(tmdbId))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("tmdbId");
|
||||||
|
}
|
||||||
|
if (string.IsNullOrEmpty(preferredLanguage))
|
||||||
|
{
|
||||||
|
throw new ArgumentNullException("preferredLanguage");
|
||||||
|
}
|
||||||
|
|
||||||
|
var path = MovieDbSeriesProvider.GetSeriesDataPath(_configurationManager.ApplicationPaths, tmdbId);
|
||||||
|
|
||||||
|
var filename = string.Format("season-{0}-episode-{1}-{2}.json",
|
||||||
|
seasonNumber.ToString(CultureInfo.InvariantCulture),
|
||||||
|
episodeNumber.ToString(CultureInfo.InvariantCulture),
|
||||||
|
preferredLanguage);
|
||||||
|
|
||||||
|
return Path.Combine(path, filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal async Task DownloadEpisodeInfo(string id, int seasonNumber, int episodeNumber, string preferredMetadataLanguage, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var mainResult = await FetchMainResult(EpisodeUrlPattern, id, seasonNumber, episodeNumber, preferredMetadataLanguage, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
var dataFilePath = GetDataFilePath(id, seasonNumber, episodeNumber, preferredMetadataLanguage);
|
||||||
|
|
||||||
|
_fileSystem.CreateDirectory(Path.GetDirectoryName(dataFilePath));
|
||||||
|
_jsonSerializer.SerializeToFile(mainResult, dataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal async Task<RootObject> FetchMainResult(string urlPattern, string id, int seasonNumber, int episodeNumber, string language, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var url = string.Format(urlPattern, id, seasonNumber.ToString(CultureInfo.InvariantCulture), episodeNumber, MovieDbProvider.ApiKey);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(language))
|
||||||
|
{
|
||||||
|
url += string.Format("&language={0}", language);
|
||||||
|
}
|
||||||
|
|
||||||
|
var includeImageLanguageParam = MovieDbProvider.GetImageLanguagesParam(language);
|
||||||
|
// Get images in english and with no language
|
||||||
|
url += "&include_image_language=" + includeImageLanguageParam;
|
||||||
|
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
|
||||||
|
{
|
||||||
|
Url = url,
|
||||||
|
CancellationToken = cancellationToken,
|
||||||
|
AcceptHeader = MovieDbProvider.AcceptHeader
|
||||||
|
|
||||||
|
}).ConfigureAwait(false))
|
||||||
|
{
|
||||||
|
return _jsonSerializer.DeserializeFromStream<RootObject>(json);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected Task<HttpResponseInfo> GetResponse(string url, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
return _httpClient.GetResponse(new HttpRequestOptions
|
||||||
|
{
|
||||||
|
CancellationToken = cancellationToken,
|
||||||
|
Url = url,
|
||||||
|
ResourcePool = MovieDbProvider.Current.MovieDbResourcePool
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Still
|
||||||
|
{
|
||||||
|
public double aspect_ratio { get; set; }
|
||||||
|
public string file_path { get; set; }
|
||||||
|
public int height { get; set; }
|
||||||
|
public string id { get; set; }
|
||||||
|
public object iso_639_1 { get; set; }
|
||||||
|
public double vote_average { get; set; }
|
||||||
|
public int vote_count { get; set; }
|
||||||
|
public int width { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Images
|
||||||
|
{
|
||||||
|
public List<Still> stills { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class ExternalIds
|
||||||
|
{
|
||||||
|
public string imdb_id { get; set; }
|
||||||
|
public object freebase_id { get; set; }
|
||||||
|
public string freebase_mid { get; set; }
|
||||||
|
public int tvdb_id { get; set; }
|
||||||
|
public int tvrage_id { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Cast
|
||||||
|
{
|
||||||
|
public string character { get; set; }
|
||||||
|
public string credit_id { get; set; }
|
||||||
|
public int id { get; set; }
|
||||||
|
public string name { get; set; }
|
||||||
|
public string profile_path { get; set; }
|
||||||
|
public int order { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Crew
|
||||||
|
{
|
||||||
|
public int id { get; set; }
|
||||||
|
public string credit_id { get; set; }
|
||||||
|
public string name { get; set; }
|
||||||
|
public string department { get; set; }
|
||||||
|
public string job { get; set; }
|
||||||
|
public string profile_path { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class GuestStar
|
||||||
|
{
|
||||||
|
public int id { get; set; }
|
||||||
|
public string name { get; set; }
|
||||||
|
public string credit_id { get; set; }
|
||||||
|
public string character { get; set; }
|
||||||
|
public int order { get; set; }
|
||||||
|
public string profile_path { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Credits
|
||||||
|
{
|
||||||
|
public List<Cast> cast { get; set; }
|
||||||
|
public List<Crew> crew { get; set; }
|
||||||
|
public List<GuestStar> guest_stars { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class Videos
|
||||||
|
{
|
||||||
|
public List<object> results { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class RootObject
|
||||||
|
{
|
||||||
|
public DateTime air_date { get; set; }
|
||||||
|
public int episode_number { get; set; }
|
||||||
|
public string name { get; set; }
|
||||||
|
public string overview { get; set; }
|
||||||
|
public int id { get; set; }
|
||||||
|
public object production_code { get; set; }
|
||||||
|
public int season_number { get; set; }
|
||||||
|
public string still_path { get; set; }
|
||||||
|
public double vote_average { get; set; }
|
||||||
|
public int vote_count { get; set; }
|
||||||
|
public Images images { get; set; }
|
||||||
|
public ExternalIds external_ids { get; set; }
|
||||||
|
public Credits credits { get; set; }
|
||||||
|
public Videos videos { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -128,7 +128,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
|
|
||||||
string[] queries = {
|
string[] queries = {
|
||||||
|
|
||||||
"create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID)",
|
"create table if not exists TypedBaseItems (guid GUID primary key, type TEXT, data BLOB, ParentId GUID, Path TEXT)",
|
||||||
"create index if not exists idx_TypedBaseItems on TypedBaseItems(guid)",
|
"create index if not exists idx_TypedBaseItems on TypedBaseItems(guid)",
|
||||||
"create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)",
|
"create index if not exists idx_PathTypedBaseItems on TypedBaseItems(Path)",
|
||||||
"create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)",
|
"create index if not exists idx_ParentIdTypedBaseItems on TypedBaseItems(ParentId)",
|
||||||
|
|
|
@ -374,6 +374,7 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
var migrations = new List<IVersionMigration>
|
var migrations = new List<IVersionMigration>
|
||||||
{
|
{
|
||||||
new OmdbEpisodeProviderMigration(ServerConfigurationManager),
|
new OmdbEpisodeProviderMigration(ServerConfigurationManager),
|
||||||
|
new MovieDbEpisodeProviderMigration(ServerConfigurationManager),
|
||||||
new DbMigration(ServerConfigurationManager, TaskManager)
|
new DbMigration(ServerConfigurationManager, TaskManager)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -73,6 +73,7 @@
|
||||||
<Compile Include="MbLinkShortcutHandler.cs" />
|
<Compile Include="MbLinkShortcutHandler.cs" />
|
||||||
<Compile Include="Migrations\IVersionMigration.cs" />
|
<Compile Include="Migrations\IVersionMigration.cs" />
|
||||||
<Compile Include="Migrations\DbMigration.cs" />
|
<Compile Include="Migrations\DbMigration.cs" />
|
||||||
|
<Compile Include="Migrations\MovieDbEpisodeProviderMigration.cs" />
|
||||||
<Compile Include="Migrations\OmdbEpisodeProviderMigration.cs" />
|
<Compile Include="Migrations\OmdbEpisodeProviderMigration.cs" />
|
||||||
<Compile Include="Migrations\RenameXmlOptions.cs" />
|
<Compile Include="Migrations\RenameXmlOptions.cs" />
|
||||||
<Compile Include="NativeEnvironment.cs" />
|
<Compile Include="NativeEnvironment.cs" />
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
using MediaBrowser.Controller.Configuration;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Server.Startup.Common.Migrations
|
||||||
|
{
|
||||||
|
class MovieDbEpisodeProviderMigration : IVersionMigration
|
||||||
|
{
|
||||||
|
private readonly IServerConfigurationManager _config;
|
||||||
|
private const string _providerName = "TheMovieDb";
|
||||||
|
|
||||||
|
public MovieDbEpisodeProviderMigration(IServerConfigurationManager config)
|
||||||
|
{
|
||||||
|
_config = config;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Run()
|
||||||
|
{
|
||||||
|
var migrationKey = this.GetType().FullName;
|
||||||
|
var migrationKeyList = _config.Configuration.Migrations.ToList();
|
||||||
|
|
||||||
|
if (!migrationKeyList.Contains(migrationKey))
|
||||||
|
{
|
||||||
|
foreach (var metaDataOption in _config.Configuration.MetadataOptions)
|
||||||
|
{
|
||||||
|
if (metaDataOption.ItemType == "Episode")
|
||||||
|
{
|
||||||
|
var disabledFetchers = metaDataOption.DisabledMetadataFetchers.ToList();
|
||||||
|
if (!disabledFetchers.Contains(_providerName))
|
||||||
|
{
|
||||||
|
disabledFetchers.Add(_providerName);
|
||||||
|
metaDataOption.DisabledMetadataFetchers = disabledFetchers.ToArray();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
migrationKeyList.Add(migrationKey);
|
||||||
|
_config.Configuration.Migrations = migrationKeyList.ToArray();
|
||||||
|
_config.SaveConfiguration();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user