mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
fixes #587 - Support automatic tmdb updates for movies
This commit is contained in:
parent
a1a36e610a
commit
ed60771cdd
@ -1,6 +1,9 @@
|
|||||||
<Properties>
|
<Properties>
|
||||||
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|x86" />
|
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|x86" />
|
||||||
<MonoDevelop.Ide.Workbench>
|
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mono\Program.cs">
|
||||||
|
<Files>
|
||||||
|
<File FileName="MediaBrowser.Server.Mono\Program.cs" Line="82" Column="4" />
|
||||||
|
</Files>
|
||||||
<Pads>
|
<Pads>
|
||||||
<Pad Id="ProjectPad">
|
<Pad Id="ProjectPad">
|
||||||
<State expanded="True">
|
<State expanded="True">
|
||||||
@ -16,9 +19,8 @@
|
|||||||
</Node>
|
</Node>
|
||||||
<Node name="MediaBrowser.Server.Implementations" expanded="True" />
|
<Node name="MediaBrowser.Server.Implementations" expanded="True" />
|
||||||
<Node name="MediaBrowser.Server.Mono" expanded="True">
|
<Node name="MediaBrowser.Server.Mono" expanded="True">
|
||||||
<Node name="FFMpeg" expanded="True">
|
<Node name="FFMpeg" expanded="True" />
|
||||||
<Node name="FFMpegDownloader.cs" selected="True" />
|
<Node name="Program.cs" selected="True" />
|
||||||
</Node>
|
|
||||||
</Node>
|
</Node>
|
||||||
</State>
|
</State>
|
||||||
</Pad>
|
</Pad>
|
||||||
|
@ -59,6 +59,7 @@
|
|||||||
<Compile Include="MediaInfo\FFProbeVideoInfoProvider.cs" />
|
<Compile Include="MediaInfo\FFProbeVideoInfoProvider.cs" />
|
||||||
<Compile Include="MediaInfo\VideoImageProvider.cs" />
|
<Compile Include="MediaInfo\VideoImageProvider.cs" />
|
||||||
<Compile Include="Movies\BoxSetProviderFromXml.cs" />
|
<Compile Include="Movies\BoxSetProviderFromXml.cs" />
|
||||||
|
<Compile Include="Movies\MovieUpdatesPrescanTask.cs" />
|
||||||
<Compile Include="Movies\MovieXmlParser.cs" />
|
<Compile Include="Movies\MovieXmlParser.cs" />
|
||||||
<Compile Include="Movies\FanArtMovieProvider.cs" />
|
<Compile Include="Movies\FanArtMovieProvider.cs" />
|
||||||
<Compile Include="Movies\FanArtMovieUpdatesPrescanTask.cs" />
|
<Compile Include="Movies\FanArtMovieUpdatesPrescanTask.cs" />
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Configuration;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.Movies;
|
using MediaBrowser.Controller.Entities.Movies;
|
||||||
@ -193,7 +194,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
|
|
||||||
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
|
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
|
||||||
{
|
{
|
||||||
if (HasAltMeta(item))
|
if (HasAltMeta(item) && !ConfigurationManager.Configuration.EnableTmdbUpdates)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
// Boxsets require two passes because we need the children to be refreshed
|
// Boxsets require two passes because we need the children to be refreshed
|
||||||
@ -205,6 +206,53 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
return base.NeedsRefreshInternal(item, providerInfo);
|
return base.NeedsRefreshInternal(item, providerInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override bool NeedsRefreshBasedOnCompareDate(BaseItem item, BaseProviderInfo providerInfo)
|
||||||
|
{
|
||||||
|
var language = ConfigurationManager.Configuration.PreferredMetadataLanguage;
|
||||||
|
|
||||||
|
var path = GetDataFilePath(item, language);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(path))
|
||||||
|
{
|
||||||
|
var fileInfo = new FileInfo(path);
|
||||||
|
|
||||||
|
if (fileInfo.Exists)
|
||||||
|
{
|
||||||
|
return fileInfo.LastWriteTimeUtc > providerInfo.LastRefreshed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return base.NeedsRefreshBasedOnCompareDate(item, providerInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the movie data path.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="appPaths">The app paths.</param>
|
||||||
|
/// <param name="isBoxSet">if set to <c>true</c> [is box set].</param>
|
||||||
|
/// <param name="tmdbId">The TMDB id.</param>
|
||||||
|
/// <returns>System.String.</returns>
|
||||||
|
internal static string GetMovieDataPath(IApplicationPaths appPaths, bool isBoxSet, string tmdbId)
|
||||||
|
{
|
||||||
|
var dataPath = isBoxSet ? GetBoxSetsDataPath(appPaths) : GetMoviesDataPath(appPaths);
|
||||||
|
|
||||||
|
return Path.Combine(dataPath, tmdbId);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static string GetMoviesDataPath(IApplicationPaths appPaths)
|
||||||
|
{
|
||||||
|
var dataPath = Path.Combine(appPaths.DataPath, "tmdb-movies");
|
||||||
|
|
||||||
|
return dataPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static string GetBoxSetsDataPath(IApplicationPaths appPaths)
|
||||||
|
{
|
||||||
|
var dataPath = Path.Combine(appPaths.DataPath, "tmdb-collections");
|
||||||
|
|
||||||
|
return dataPath;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Fetches metadata and returns true or false indicating if any work that requires persistence was done
|
/// Fetches metadata and returns true or false indicating if any work that requires persistence was done
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -216,7 +264,29 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
await FetchMovieData(item, cancellationToken).ConfigureAwait(false);
|
var id = item.GetProviderId(MetadataProviders.Tmdb);
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(id))
|
||||||
|
{
|
||||||
|
id = item.GetProviderId(MetadataProviders.Imdb);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(id))
|
||||||
|
{
|
||||||
|
id = await FindId(item, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(id))
|
||||||
|
{
|
||||||
|
item.SetProviderId(MetadataProviders.Tmdb, id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(id))
|
||||||
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
await FetchMovieData(item, id, force, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
SetLastRefreshed(item, DateTime.UtcNow);
|
SetLastRefreshed(item, DateTime.UtcNow);
|
||||||
return true;
|
return true;
|
||||||
@ -245,40 +315,6 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Fetches the movie data.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="item">The item.</param>
|
|
||||||
/// <param name="cancellationToken"></param>
|
|
||||||
/// <returns>Task.</returns>
|
|
||||||
private async Task FetchMovieData(BaseItem item, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
var id = item.GetProviderId(MetadataProviders.Tmdb);
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(id))
|
|
||||||
{
|
|
||||||
id = item.GetProviderId(MetadataProviders.Imdb);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(id))
|
|
||||||
{
|
|
||||||
id = await FindId(item, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(id))
|
|
||||||
{
|
|
||||||
Logger.Debug("MovieDbProvider - getting movie info with id: " + id);
|
|
||||||
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
await FetchMovieData(item, id, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Logger.Info("MovieDBProvider could not find " + item.Name + ". Check name on themoviedb.org.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Parses the name.
|
/// Parses the name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -453,42 +489,114 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
return WebUtility.UrlEncode(name);
|
return WebUtility.UrlEncode(name);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Fetches the movie data.
|
/// Fetches the movie data.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="item">The item.</param>
|
/// <param name="item">The item.</param>
|
||||||
/// <param name="id">The id.</param>
|
/// <param name="id">The id.</param>
|
||||||
|
/// <param name="isForcedRefresh">if set to <c>true</c> [is forced refresh].</param>
|
||||||
/// <param name="cancellationToken">The cancellation token</param>
|
/// <param name="cancellationToken">The cancellation token</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
protected async Task FetchMovieData(BaseItem item, string id, CancellationToken cancellationToken)
|
private async Task FetchMovieData(BaseItem item, string id, bool isForcedRefresh, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
// Id could be ImdbId or TmdbId
|
||||||
|
|
||||||
if (String.IsNullOrEmpty(id))
|
var language = ConfigurationManager.Configuration.PreferredMetadataLanguage;
|
||||||
|
|
||||||
|
var dataFilePath = GetDataFilePath(item, language);
|
||||||
|
|
||||||
|
var hasAltMeta = HasAltMeta(item);
|
||||||
|
|
||||||
|
var isRefreshingDueToTmdbUpdate = hasAltMeta && !isForcedRefresh;
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(dataFilePath) || !File.Exists(dataFilePath))
|
||||||
{
|
{
|
||||||
Logger.Info("MoviedbProvider: Ignoring " + item.Name + " because ID forced blank.");
|
var isBoxSet = item is BoxSet;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
item.SetProviderId(MetadataProviders.Tmdb, id);
|
var mainResult = await FetchMainResult(id, isBoxSet, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
var mainResult = await FetchMainResult(item, id, cancellationToken).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (mainResult == null) return;
|
if (mainResult == null) return;
|
||||||
|
|
||||||
ProcessMainInfo(item, mainResult);
|
var path = GetMovieDataPath(ConfigurationManager.ApplicationPaths, isBoxSet, mainResult.id.ToString(_usCulture));
|
||||||
|
|
||||||
|
dataFilePath = Path.Combine(path, language + ".json");
|
||||||
|
|
||||||
|
var directory = Path.GetDirectoryName(dataFilePath);
|
||||||
|
|
||||||
|
Directory.CreateDirectory(directory);
|
||||||
|
|
||||||
|
JsonSerializer.SerializeToFile(mainResult, dataFilePath);
|
||||||
|
|
||||||
|
isRefreshingDueToTmdbUpdate = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isForcedRefresh || ConfigurationManager.Configuration.EnableTmdbUpdates || !hasAltMeta)
|
||||||
|
{
|
||||||
|
dataFilePath = GetDataFilePath(item, language);
|
||||||
|
|
||||||
|
var mainResult = JsonSerializer.DeserializeFromFile<CompleteMovieData>(dataFilePath);
|
||||||
|
|
||||||
|
ProcessMainInfo(item, mainResult, isRefreshingDueToTmdbUpdate);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Downloads the movie info.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">The id.</param>
|
||||||
|
/// <param name="isBoxSet">if set to <c>true</c> [is box set].</param>
|
||||||
|
/// <param name="dataPath">The data path.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
internal async Task DownloadMovieInfo(string id, bool isBoxSet, string dataPath, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var language = ConfigurationManager.Configuration.PreferredMetadataLanguage;
|
||||||
|
|
||||||
|
var mainResult = await FetchMainResult(id, isBoxSet, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (mainResult == null) return;
|
||||||
|
|
||||||
|
var dataFilePath = Path.Combine(dataPath, language + ".json");
|
||||||
|
|
||||||
|
Directory.CreateDirectory(dataPath);
|
||||||
|
|
||||||
|
JsonSerializer.SerializeToFile(mainResult, dataFilePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the data file path.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="item">The item.</param>
|
||||||
|
/// <param name="language">The language.</param>
|
||||||
|
/// <returns>System.String.</returns>
|
||||||
|
private string GetDataFilePath(BaseItem item, string language)
|
||||||
|
{
|
||||||
|
var id = item.GetProviderId(MetadataProviders.Tmdb);
|
||||||
|
|
||||||
|
if (string.IsNullOrEmpty(id))
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var path = GetMovieDataPath(ConfigurationManager.ApplicationPaths, item is BoxSet, id);
|
||||||
|
|
||||||
|
path = Path.Combine(path, language + ".json");
|
||||||
|
|
||||||
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Fetches the main result.
|
/// Fetches the main result.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="item">The item.</param>
|
|
||||||
/// <param name="id">The id.</param>
|
/// <param name="id">The id.</param>
|
||||||
|
/// <param name="isBoxSet">if set to <c>true</c> [is box set].</param>
|
||||||
/// <param name="cancellationToken">The cancellation token</param>
|
/// <param name="cancellationToken">The cancellation token</param>
|
||||||
/// <returns>Task{CompleteMovieData}.</returns>
|
/// <returns>Task{CompleteMovieData}.</returns>
|
||||||
protected async Task<CompleteMovieData> FetchMainResult(BaseItem item, string id, CancellationToken cancellationToken)
|
protected async Task<CompleteMovieData> FetchMainResult(string id, bool isBoxSet, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var baseUrl = item is BoxSet ? GetBoxSetInfo3 : GetMovieInfo3;
|
var baseUrl = isBoxSet ? GetBoxSetInfo3 : GetMovieInfo3;
|
||||||
|
|
||||||
string url = string.Format(baseUrl, id, ApiKey, ConfigurationManager.Configuration.PreferredMetadataLanguage);
|
string url = string.Format(baseUrl, id, ApiKey, ConfigurationManager.Configuration.PreferredMetadataLanguage);
|
||||||
CompleteMovieData mainResult;
|
CompleteMovieData mainResult;
|
||||||
@ -529,7 +637,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
|
|
||||||
if (String.IsNullOrEmpty(mainResult.overview))
|
if (String.IsNullOrEmpty(mainResult.overview))
|
||||||
{
|
{
|
||||||
Logger.Error("MovieDbProvider - Unable to find information for " + item.Name + " (id:" + id + ")");
|
Logger.Error("MovieDbProvider - Unable to find information for (id:" + id + ")");
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -542,7 +650,8 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="movie">The movie.</param>
|
/// <param name="movie">The movie.</param>
|
||||||
/// <param name="movieData">The movie data.</param>
|
/// <param name="movieData">The movie data.</param>
|
||||||
protected virtual void ProcessMainInfo(BaseItem movie, CompleteMovieData movieData)
|
/// <param name="isRefreshingDueToTmdbUpdate">if set to <c>true</c> [is refreshing due to TMDB update].</param>
|
||||||
|
protected virtual void ProcessMainInfo(BaseItem movie, CompleteMovieData movieData, bool isRefreshingDueToTmdbUpdate)
|
||||||
{
|
{
|
||||||
if (movie != null && movieData != null)
|
if (movie != null && movieData != null)
|
||||||
{
|
{
|
||||||
@ -582,10 +691,17 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
|
|
||||||
// tmdb appears to have unified their numbers to always report "7.3" regardless of country
|
// tmdb appears to have unified their numbers to always report "7.3" regardless of country
|
||||||
// so I removed the culture-specific processing here because it was not working for other countries -ebr
|
// so I removed the culture-specific processing here because it was not working for other countries -ebr
|
||||||
if (float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out rating))
|
// Don't import this when responding to tmdb updates because we don't want to blow away imdb data
|
||||||
|
if (!isRefreshingDueToTmdbUpdate && float.TryParse(voteAvg, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out rating))
|
||||||
|
{
|
||||||
movie.CommunityRating = rating;
|
movie.CommunityRating = rating;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't import this when responding to tmdb updates because we don't want to blow away imdb data
|
||||||
|
if (!isRefreshingDueToTmdbUpdate)
|
||||||
|
{
|
||||||
movie.VoteCount = movieData.vote_count;
|
movie.VoteCount = movieData.vote_count;
|
||||||
|
}
|
||||||
|
|
||||||
//release date and certification are retrieved based on configured country and we fall back on US if not there and to minimun release date if still no match
|
//release date and certification are retrieved based on configured country and we fall back on US if not there and to minimun release date if still no match
|
||||||
if (movieData.releases != null && movieData.releases.countries != null)
|
if (movieData.releases != null && movieData.releases.countries != null)
|
||||||
@ -668,7 +784,8 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
}
|
}
|
||||||
|
|
||||||
// genres
|
// genres
|
||||||
if (movieData.genres != null && !movie.LockedFields.Contains(MetadataFields.Genres))
|
// Don't import this when responding to tmdb updates because we don't want to blow away imdb data
|
||||||
|
if (movieData.genres != null && !movie.LockedFields.Contains(MetadataFields.Genres) && !isRefreshingDueToTmdbUpdate)
|
||||||
{
|
{
|
||||||
movie.Genres.Clear();
|
movie.Genres.Clear();
|
||||||
|
|
||||||
|
254
MediaBrowser.Providers/Movies/MovieUpdatesPrescanTask.cs
Normal file
254
MediaBrowser.Providers/Movies/MovieUpdatesPrescanTask.cs
Normal file
@ -0,0 +1,254 @@
|
|||||||
|
using MediaBrowser.Common.Net;
|
||||||
|
using MediaBrowser.Common.Progress;
|
||||||
|
using MediaBrowser.Controller.Configuration;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MediaBrowser.Model.Serialization;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Globalization;
|
||||||
|
using System.IO;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Providers.Movies
|
||||||
|
{
|
||||||
|
public class MovieUpdatesPreScanTask : ILibraryPrescanTask
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The updates URL
|
||||||
|
/// </summary>
|
||||||
|
private const string UpdatesUrl = "http://api.themoviedb.org/3/movie/changes?start_date={0}&api_key={1}&page={2}";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// The _HTTP client
|
||||||
|
/// </summary>
|
||||||
|
private readonly IHttpClient _httpClient;
|
||||||
|
/// <summary>
|
||||||
|
/// The _logger
|
||||||
|
/// </summary>
|
||||||
|
private readonly ILogger _logger;
|
||||||
|
/// <summary>
|
||||||
|
/// The _config
|
||||||
|
/// </summary>
|
||||||
|
private readonly IServerConfigurationManager _config;
|
||||||
|
private readonly IJsonSerializer _json;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="MovieUpdatesPreScanTask"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
/// <param name="httpClient">The HTTP client.</param>
|
||||||
|
/// <param name="config">The config.</param>
|
||||||
|
/// <param name="json">The json.</param>
|
||||||
|
public MovieUpdatesPreScanTask(ILogger logger, IHttpClient httpClient, IServerConfigurationManager config, IJsonSerializer json)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpClient = httpClient;
|
||||||
|
_config = config;
|
||||||
|
_json = json;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Runs the specified progress.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
if (!_config.Configuration.EnableInternetProviders || !_config.Configuration.EnableTmdbUpdates)
|
||||||
|
{
|
||||||
|
progress.Report(100);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var innerProgress = new ActionableProgress<double>();
|
||||||
|
innerProgress.RegisterAction(pct => progress.Report(pct * .8));
|
||||||
|
await Run(innerProgress, false, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
progress.Report(80);
|
||||||
|
|
||||||
|
innerProgress = new ActionableProgress<double>();
|
||||||
|
innerProgress.RegisterAction(pct => progress.Report(80 + pct * .2));
|
||||||
|
await Run(innerProgress, true, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
progress.Report(100);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Runs the specified progress.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <param name="runForBoxSets">if set to <c>true</c> [run for box sets].</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
private async Task Run(IProgress<double> progress, bool runForBoxSets, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var path = runForBoxSets ? MovieDbProvider.GetBoxSetsDataPath(_config.CommonApplicationPaths) : MovieDbProvider.GetMoviesDataPath(_config.CommonApplicationPaths);
|
||||||
|
|
||||||
|
Directory.CreateDirectory(path);
|
||||||
|
|
||||||
|
var timestampFile = Path.Combine(path, "time.txt");
|
||||||
|
|
||||||
|
var timestampFileInfo = new FileInfo(timestampFile);
|
||||||
|
|
||||||
|
// Don't check for tvdb updates anymore frequently than 24 hours
|
||||||
|
if (timestampFileInfo.Exists && (DateTime.UtcNow - timestampFileInfo.LastWriteTimeUtc).TotalDays < 1)
|
||||||
|
{
|
||||||
|
//return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Find out the last time we queried tvdb for updates
|
||||||
|
var lastUpdateTime = timestampFileInfo.Exists ? File.ReadAllText(timestampFile, Encoding.UTF8) : string.Empty;
|
||||||
|
|
||||||
|
var existingDirectories = Directory.EnumerateDirectories(path).Select(Path.GetFileName).ToList();
|
||||||
|
|
||||||
|
if (!string.IsNullOrEmpty(lastUpdateTime))
|
||||||
|
{
|
||||||
|
long lastUpdateTicks;
|
||||||
|
|
||||||
|
if (long.TryParse(lastUpdateTime, NumberStyles.Any, UsCulture, out lastUpdateTicks))
|
||||||
|
{
|
||||||
|
var lastUpdateDate = new DateTime(lastUpdateTicks, DateTimeKind.Utc);
|
||||||
|
|
||||||
|
// They only allow up to 14 days of updates
|
||||||
|
if ((DateTime.UtcNow - lastUpdateDate).TotalDays > 13)
|
||||||
|
{
|
||||||
|
lastUpdateDate = DateTime.UtcNow.AddDays(-13);
|
||||||
|
}
|
||||||
|
|
||||||
|
var updatedIds = await GetIdsToUpdate(lastUpdateDate, 1, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
var existingDictionary = existingDirectories.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
var idsToUpdate = updatedIds.Where(i => !string.IsNullOrWhiteSpace(i) && existingDictionary.ContainsKey(i));
|
||||||
|
|
||||||
|
await UpdateMovies(idsToUpdate, runForBoxSets, path, progress, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
File.WriteAllText(timestampFile, DateTime.UtcNow.Ticks.ToString(UsCulture), Encoding.UTF8);
|
||||||
|
progress.Report(100);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the ids to update.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="lastUpdateTime">The last update time.</param>
|
||||||
|
/// <param name="page">The page.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task{IEnumerable{System.String}}.</returns>
|
||||||
|
private async Task<IEnumerable<string>> GetIdsToUpdate(DateTime lastUpdateTime, int page, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
bool hasMorePages;
|
||||||
|
var list = new List<string>();
|
||||||
|
|
||||||
|
// First get last time
|
||||||
|
using (var stream = await _httpClient.Get(new HttpRequestOptions
|
||||||
|
{
|
||||||
|
Url = string.Format(UpdatesUrl, lastUpdateTime.ToString("yyyy-MM-dd"), MovieDbProvider.ApiKey, page),
|
||||||
|
CancellationToken = cancellationToken,
|
||||||
|
EnableHttpCompression = true,
|
||||||
|
ResourcePool = MovieDbProvider.Current.MovieDbResourcePool,
|
||||||
|
AcceptHeader = MovieDbProvider.AcceptHeader
|
||||||
|
|
||||||
|
}).ConfigureAwait(false))
|
||||||
|
{
|
||||||
|
var obj = _json.DeserializeFromStream<RootObject>(stream);
|
||||||
|
|
||||||
|
var data = obj.results.Select(i => i.id.ToString(UsCulture));
|
||||||
|
|
||||||
|
list.AddRange(data);
|
||||||
|
|
||||||
|
hasMorePages = page < obj.total_pages;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hasMorePages)
|
||||||
|
{
|
||||||
|
var more = await GetIdsToUpdate(lastUpdateTime, page + 1, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
list.AddRange(more);
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Updates the movies.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ids">The ids.</param>
|
||||||
|
/// <param name="isBoxSet">if set to <c>true</c> [is box set].</param>
|
||||||
|
/// <param name="moviesDataPath">The movies data path.</param>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
private async Task UpdateMovies(IEnumerable<string> ids, bool isBoxSet, string moviesDataPath, IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var list = ids.ToList();
|
||||||
|
var numComplete = 0;
|
||||||
|
|
||||||
|
foreach (var id in list)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await UpdateMovie(id, isBoxSet, moviesDataPath, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error updating tmdb movie id {0}", ex, id);
|
||||||
|
}
|
||||||
|
|
||||||
|
numComplete++;
|
||||||
|
double percent = numComplete;
|
||||||
|
percent /= list.Count;
|
||||||
|
percent *= 100;
|
||||||
|
|
||||||
|
progress.Report(percent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Updates the movie.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">The id.</param>
|
||||||
|
/// <param name="isBoxSet">if set to <c>true</c> [is box set].</param>
|
||||||
|
/// <param name="dataPath">The data path.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
private Task UpdateMovie(string id, bool isBoxSet, string dataPath, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_logger.Info("Updating movie from tmdb " + id);
|
||||||
|
|
||||||
|
var itemDataPath = Path.Combine(dataPath, id);
|
||||||
|
|
||||||
|
Directory.CreateDirectory(dataPath);
|
||||||
|
|
||||||
|
return MovieDbProvider.Current.DownloadMovieInfo(id, isBoxSet, itemDataPath, cancellationToken);
|
||||||
|
}
|
||||||
|
|
||||||
|
class Result
|
||||||
|
{
|
||||||
|
public int id { get; set; }
|
||||||
|
public bool? adult { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
class RootObject
|
||||||
|
{
|
||||||
|
public List<Result> results { get; set; }
|
||||||
|
public int page { get; set; }
|
||||||
|
public int total_pages { get; set; }
|
||||||
|
public int total_results { get; set; }
|
||||||
|
|
||||||
|
public RootObject()
|
||||||
|
{
|
||||||
|
results = new List<Result>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -80,6 +80,14 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
|
||||||
|
{
|
||||||
|
if (HasAltMeta(item) && !ConfigurationManager.Configuration.EnableTmdbUpdates)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return base.NeedsRefreshInternal(item, providerInfo);
|
||||||
|
}
|
||||||
|
|
||||||
protected override bool NeedsRefreshBasedOnCompareDate(BaseItem item, BaseProviderInfo providerInfo)
|
protected override bool NeedsRefreshBasedOnCompareDate(BaseItem item, BaseProviderInfo providerInfo)
|
||||||
{
|
{
|
||||||
var provderId = item.GetProviderId(MetadataProviders.Tmdb);
|
var provderId = item.GetProviderId(MetadataProviders.Tmdb);
|
||||||
@ -187,7 +195,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected readonly CultureInfo UsCulture = new CultureInfo("en-US");
|
private readonly CultureInfo _usCulture = new CultureInfo("en-US");
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the TMDB id.
|
/// Gets the TMDB id.
|
||||||
@ -211,7 +219,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
searchResult = JsonSerializer.DeserializeFromStream<PersonSearchResults>(json);
|
searchResult = JsonSerializer.DeserializeFromStream<PersonSearchResults>(json);
|
||||||
}
|
}
|
||||||
|
|
||||||
return searchResult != null && searchResult.Total_Results > 0 ? searchResult.Results[0].Id.ToString(UsCulture) : null;
|
return searchResult != null && searchResult.Total_Results > 0 ? searchResult.Results[0].Id.ToString(_usCulture) : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -311,7 +319,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
person.SetProviderId(MetadataProviders.Tmdb, searchResult.id.ToString(UsCulture));
|
person.SetProviderId(MetadataProviders.Tmdb, searchResult.id.ToString(_usCulture));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
using System.Collections.Generic;
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Common.Net;
|
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
@ -9,6 +8,7 @@ using MediaBrowser.Model.Entities;
|
|||||||
using MediaBrowser.Model.Logging;
|
using MediaBrowser.Model.Logging;
|
||||||
using MediaBrowser.Model.Net;
|
using MediaBrowser.Model.Net;
|
||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user