mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
fixes #585 - Use tmdb updates api for people
This commit is contained in:
parent
73aec50dcc
commit
2a44efaa42
@ -166,6 +166,7 @@ namespace MediaBrowser.Controller.Library
|
|||||||
/// <param name="itemComparers">The item comparers.</param>
|
/// <param name="itemComparers">The item comparers.</param>
|
||||||
/// <param name="prescanTasks">The prescan tasks.</param>
|
/// <param name="prescanTasks">The prescan tasks.</param>
|
||||||
/// <param name="postscanTasks">The postscan tasks.</param>
|
/// <param name="postscanTasks">The postscan tasks.</param>
|
||||||
|
/// <param name="peoplePrescanTasks">The people prescan tasks.</param>
|
||||||
/// <param name="savers">The savers.</param>
|
/// <param name="savers">The savers.</param>
|
||||||
void AddParts(IEnumerable<IResolverIgnoreRule> rules,
|
void AddParts(IEnumerable<IResolverIgnoreRule> rules,
|
||||||
IEnumerable<IVirtualFolderCreator> pluginFolders,
|
IEnumerable<IVirtualFolderCreator> pluginFolders,
|
||||||
@ -174,6 +175,7 @@ namespace MediaBrowser.Controller.Library
|
|||||||
IEnumerable<IBaseItemComparer> itemComparers,
|
IEnumerable<IBaseItemComparer> itemComparers,
|
||||||
IEnumerable<ILibraryPrescanTask> prescanTasks,
|
IEnumerable<ILibraryPrescanTask> prescanTasks,
|
||||||
IEnumerable<ILibraryPostScanTask> postscanTasks,
|
IEnumerable<ILibraryPostScanTask> postscanTasks,
|
||||||
|
IEnumerable<IPeoplePrescanTask> peoplePrescanTasks,
|
||||||
IEnumerable<IMetadataSaver> savers);
|
IEnumerable<IMetadataSaver> savers);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
20
MediaBrowser.Controller/Library/IPeoplePrescanTask.cs
Normal file
20
MediaBrowser.Controller/Library/IPeoplePrescanTask.cs
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
using System;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Controller.Library
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Interface IPeoplePrescanTask
|
||||||
|
/// </summary>
|
||||||
|
public interface IPeoplePrescanTask
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Runs the specified progress.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
Task Run(IProgress<double> progress, CancellationToken cancellationToken);
|
||||||
|
}
|
||||||
|
}
|
@ -96,6 +96,7 @@
|
|||||||
<Compile Include="Library\ILibraryPostScanTask.cs" />
|
<Compile Include="Library\ILibraryPostScanTask.cs" />
|
||||||
<Compile Include="Library\ILibraryPrescanTask.cs" />
|
<Compile Include="Library\ILibraryPrescanTask.cs" />
|
||||||
<Compile Include="Library\IMetadataSaver.cs" />
|
<Compile Include="Library\IMetadataSaver.cs" />
|
||||||
|
<Compile Include="Library\IPeoplePrescanTask.cs" />
|
||||||
<Compile Include="Library\ItemUpdateType.cs" />
|
<Compile Include="Library\ItemUpdateType.cs" />
|
||||||
<Compile Include="Library\IUserDataManager.cs" />
|
<Compile Include="Library\IUserDataManager.cs" />
|
||||||
<Compile Include="Library\UserDataSaveEventArgs.cs" />
|
<Compile Include="Library\UserDataSaveEventArgs.cs" />
|
||||||
|
@ -67,6 +67,7 @@
|
|||||||
<Compile Include="Movies\MovieProviderFromXml.cs" />
|
<Compile Include="Movies\MovieProviderFromXml.cs" />
|
||||||
<Compile Include="Movies\OpenMovieDatabaseProvider.cs" />
|
<Compile Include="Movies\OpenMovieDatabaseProvider.cs" />
|
||||||
<Compile Include="Movies\PersonProviderFromXml.cs" />
|
<Compile Include="Movies\PersonProviderFromXml.cs" />
|
||||||
|
<Compile Include="Movies\PersonUpdatesPreScanTask.cs" />
|
||||||
<Compile Include="Movies\TmdbPersonProvider.cs" />
|
<Compile Include="Movies\TmdbPersonProvider.cs" />
|
||||||
<Compile Include="Music\AlbumInfoFromSongProvider.cs" />
|
<Compile Include="Music\AlbumInfoFromSongProvider.cs" />
|
||||||
<Compile Include="Music\ArtistInfoFromSongProvider.cs" />
|
<Compile Include="Music\ArtistInfoFromSongProvider.cs" />
|
||||||
|
@ -31,7 +31,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// The movie db
|
/// The movie db
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private readonly SemaphoreSlim _movieDbResourcePool = new SemaphoreSlim(1, 1);
|
internal readonly SemaphoreSlim MovieDbResourcePool = new SemaphoreSlim(1, 1);
|
||||||
|
|
||||||
internal static MovieDbProvider Current { get; private set; }
|
internal static MovieDbProvider Current { get; private set; }
|
||||||
|
|
||||||
@ -72,7 +72,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
{
|
{
|
||||||
if (dispose)
|
if (dispose)
|
||||||
{
|
{
|
||||||
_movieDbResourcePool.Dispose();
|
MovieDbResourcePool.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -726,7 +726,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
{
|
{
|
||||||
var cancellationToken = options.CancellationToken;
|
var cancellationToken = options.CancellationToken;
|
||||||
|
|
||||||
await _movieDbResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
|
await MovieDbResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@ -746,7 +746,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
{
|
{
|
||||||
_lastRequestDate = DateTime.Now;
|
_lastRequestDate = DateTime.Now;
|
||||||
|
|
||||||
_movieDbResourcePool.Release();
|
MovieDbResourcePool.Release();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,7 +46,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
{
|
{
|
||||||
get
|
get
|
||||||
{
|
{
|
||||||
return "11";
|
return "12";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
227
MediaBrowser.Providers/Movies/PersonUpdatesPreScanTask.cs
Normal file
227
MediaBrowser.Providers/Movies/PersonUpdatesPreScanTask.cs
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
using MediaBrowser.Common.Net;
|
||||||
|
using MediaBrowser.Controller.Configuration;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MediaBrowser.Model.Net;
|
||||||
|
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 PersonUpdatesPreScanTask : IPeoplePrescanTask
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The updates URL
|
||||||
|
/// </summary>
|
||||||
|
private const string UpdatesUrl = "http://api.themoviedb.org/3/person/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="PersonUpdatesPreScanTask"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
/// <param name="httpClient">The HTTP client.</param>
|
||||||
|
/// <param name="config">The config.</param>
|
||||||
|
public PersonUpdatesPreScanTask(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)
|
||||||
|
{
|
||||||
|
progress.Report(100);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var path = TmdbPersonProvider.GetPersonsDataPath(_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);
|
||||||
|
|
||||||
|
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 UpdatePeople(idsToUpdate, 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)
|
||||||
|
{
|
||||||
|
var hasMorePages = false;
|
||||||
|
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 people.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ids">The ids.</param>
|
||||||
|
/// <param name="peopleDataPath">The people data path.</param>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
private async Task UpdatePeople(IEnumerable<string> ids, string peopleDataPath, IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var list = ids.ToList();
|
||||||
|
var numComplete = 0;
|
||||||
|
|
||||||
|
foreach (var id in list)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await UpdatePerson(id, peopleDataPath, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (HttpException ex)
|
||||||
|
{
|
||||||
|
// Already logged at lower levels, but don't fail the whole operation, unless timed out
|
||||||
|
// We have to fail this to make it run again otherwise new episode data could potentially be missing
|
||||||
|
if (ex.IsTimedOut)
|
||||||
|
{
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
numComplete++;
|
||||||
|
double percent = numComplete;
|
||||||
|
percent /= list.Count;
|
||||||
|
percent *= 100;
|
||||||
|
|
||||||
|
progress.Report(percent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Updates the person.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id">The id.</param>
|
||||||
|
/// <param name="peopleDataPath">The people data path.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
private Task UpdatePerson(string id, string peopleDataPath, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
_logger.Info("Updating person from tmdb " + id);
|
||||||
|
|
||||||
|
var personDataPath = Path.Combine(peopleDataPath, id);
|
||||||
|
|
||||||
|
Directory.CreateDirectory(peopleDataPath);
|
||||||
|
|
||||||
|
return TmdbPersonProvider.Current.DownloadPersonInfo(id, personDataPath, 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>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,4 +1,6 @@
|
|||||||
using MediaBrowser.Common.Net;
|
using MediaBrowser.Common.Configuration;
|
||||||
|
using MediaBrowser.Common.IO;
|
||||||
|
using MediaBrowser.Common.Net;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
@ -24,6 +26,8 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
{
|
{
|
||||||
protected readonly IProviderManager ProviderManager;
|
protected readonly IProviderManager ProviderManager;
|
||||||
|
|
||||||
|
internal static TmdbPersonProvider Current { get; private set; }
|
||||||
|
|
||||||
public TmdbPersonProvider(IJsonSerializer jsonSerializer, ILogManager logManager, IServerConfigurationManager configurationManager, IProviderManager providerManager)
|
public TmdbPersonProvider(IJsonSerializer jsonSerializer, ILogManager logManager, IServerConfigurationManager configurationManager, IProviderManager providerManager)
|
||||||
: base(logManager, configurationManager)
|
: base(logManager, configurationManager)
|
||||||
{
|
{
|
||||||
@ -33,6 +37,7 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
}
|
}
|
||||||
JsonSerializer = jsonSerializer;
|
JsonSerializer = jsonSerializer;
|
||||||
ProviderManager = providerManager;
|
ProviderManager = providerManager;
|
||||||
|
Current = this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -75,12 +80,49 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
|
protected override bool NeedsRefreshBasedOnCompareDate(BaseItem item, BaseProviderInfo providerInfo)
|
||||||
{
|
{
|
||||||
if (HasAltMeta(item))
|
var provderId = item.GetProviderId(MetadataProviders.Tmdb);
|
||||||
return false;
|
|
||||||
|
|
||||||
return base.NeedsRefreshInternal(item, providerInfo);
|
if (!string.IsNullOrEmpty(provderId))
|
||||||
|
{
|
||||||
|
// Process images
|
||||||
|
var path = GetPersonDataPath(ConfigurationManager.ApplicationPaths, provderId);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var files = new DirectoryInfo(path)
|
||||||
|
.EnumerateFiles("*.json", SearchOption.TopDirectoryOnly)
|
||||||
|
.Select(i => i.LastWriteTimeUtc)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
if (files.Count > 0)
|
||||||
|
{
|
||||||
|
return files.Max() > providerInfo.LastRefreshed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (DirectoryNotFoundException)
|
||||||
|
{
|
||||||
|
// Don't blow up
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return base.NeedsRefreshBasedOnCompareDate(item, providerInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static string GetPersonDataPath(IApplicationPaths appPaths, string tmdbId)
|
||||||
|
{
|
||||||
|
var seriesDataPath = Path.Combine(GetPersonsDataPath(appPaths), tmdbId);
|
||||||
|
|
||||||
|
return seriesDataPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static string GetPersonsDataPath(IApplicationPaths appPaths)
|
||||||
|
{
|
||||||
|
var dataPath = Path.Combine(appPaths.DataPath, "tmdb-people");
|
||||||
|
|
||||||
|
return dataPath;
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool HasAltMeta(BaseItem item)
|
private bool HasAltMeta(BaseItem item)
|
||||||
@ -181,8 +223,40 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
private async Task FetchInfo(Person person, string id, CancellationToken cancellationToken)
|
private async Task FetchInfo(Person person, string id, CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
string url = string.Format(@"http://api.themoviedb.org/3/person/{1}?api_key={0}&append_to_response=credits,images", MovieDbProvider.ApiKey, id);
|
var personDataPath = GetPersonDataPath(ConfigurationManager.ApplicationPaths, id);
|
||||||
PersonResult searchResult = null;
|
|
||||||
|
Directory.CreateDirectory(personDataPath);
|
||||||
|
|
||||||
|
var files = Directory.EnumerateFiles(personDataPath, "*.json", SearchOption.TopDirectoryOnly)
|
||||||
|
.Select(Path.GetFileName)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
const string dataFileName = "info.json";
|
||||||
|
|
||||||
|
// Only download if not already there
|
||||||
|
// The prescan task will take care of updates so we don't need to re-download here
|
||||||
|
if (!files.Contains(dataFileName, StringComparer.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
await DownloadPersonInfo(id, personDataPath, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
//if (!HasAltMeta(person))
|
||||||
|
{
|
||||||
|
var info = JsonSerializer.DeserializeFromFile<PersonResult>(Path.Combine(personDataPath, dataFileName));
|
||||||
|
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
ProcessInfo(person, info);
|
||||||
|
|
||||||
|
Logger.Debug("TmdbPersonProvider downloaded and saved information for {0}", person.Name);
|
||||||
|
|
||||||
|
await FetchImages(person, info.images, cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal async Task DownloadPersonInfo(string id, string personDataPath, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var url = string.Format(@"http://api.themoviedb.org/3/person/{1}?api_key={0}&append_to_response=credits,images", MovieDbProvider.ApiKey, id);
|
||||||
|
|
||||||
using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
|
using (var json = await MovieDbProvider.Current.GetMovieDbResponse(new HttpRequestOptions
|
||||||
{
|
{
|
||||||
@ -192,18 +266,10 @@ namespace MediaBrowser.Providers.Movies
|
|||||||
|
|
||||||
}).ConfigureAwait(false))
|
}).ConfigureAwait(false))
|
||||||
{
|
{
|
||||||
searchResult = JsonSerializer.DeserializeFromStream<PersonResult>(json);
|
using (var fs = new FileStream(Path.Combine(personDataPath, "info.json"), FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, true))
|
||||||
}
|
{
|
||||||
|
await json.CopyToAsync(fs).ConfigureAwait(false);
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
}
|
||||||
|
|
||||||
if (searchResult != null)
|
|
||||||
{
|
|
||||||
ProcessInfo(person, searchResult);
|
|
||||||
|
|
||||||
Logger.Debug("TmdbPersonProvider downloaded and saved information for {0}", person.Name);
|
|
||||||
|
|
||||||
await FetchImages(person, searchResult.images, cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,7 +15,6 @@ using MediaBrowser.Model.Entities;
|
|||||||
using MediaBrowser.Model.Logging;
|
using MediaBrowser.Model.Logging;
|
||||||
using MediaBrowser.Server.Implementations.Library.Validators;
|
using MediaBrowser.Server.Implementations.Library.Validators;
|
||||||
using MediaBrowser.Server.Implementations.ScheduledTasks;
|
using MediaBrowser.Server.Implementations.ScheduledTasks;
|
||||||
using MoreLinq;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
@ -44,6 +43,12 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
/// <value>The prescan tasks.</value>
|
/// <value>The prescan tasks.</value>
|
||||||
private IEnumerable<ILibraryPrescanTask> PrescanTasks { get; set; }
|
private IEnumerable<ILibraryPrescanTask> PrescanTasks { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the people prescan tasks.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The people prescan tasks.</value>
|
||||||
|
private IEnumerable<IPeoplePrescanTask> PeoplePrescanTasks { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the intro providers.
|
/// Gets the intro providers.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@ -197,6 +202,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
/// <param name="itemComparers">The item comparers.</param>
|
/// <param name="itemComparers">The item comparers.</param>
|
||||||
/// <param name="prescanTasks">The prescan tasks.</param>
|
/// <param name="prescanTasks">The prescan tasks.</param>
|
||||||
/// <param name="postscanTasks">The postscan tasks.</param>
|
/// <param name="postscanTasks">The postscan tasks.</param>
|
||||||
|
/// <param name="peoplePrescanTasks">The people prescan tasks.</param>
|
||||||
/// <param name="savers">The savers.</param>
|
/// <param name="savers">The savers.</param>
|
||||||
public void AddParts(IEnumerable<IResolverIgnoreRule> rules,
|
public void AddParts(IEnumerable<IResolverIgnoreRule> rules,
|
||||||
IEnumerable<IVirtualFolderCreator> pluginFolders,
|
IEnumerable<IVirtualFolderCreator> pluginFolders,
|
||||||
@ -205,6 +211,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
IEnumerable<IBaseItemComparer> itemComparers,
|
IEnumerable<IBaseItemComparer> itemComparers,
|
||||||
IEnumerable<ILibraryPrescanTask> prescanTasks,
|
IEnumerable<ILibraryPrescanTask> prescanTasks,
|
||||||
IEnumerable<ILibraryPostScanTask> postscanTasks,
|
IEnumerable<ILibraryPostScanTask> postscanTasks,
|
||||||
|
IEnumerable<IPeoplePrescanTask> peoplePrescanTasks,
|
||||||
IEnumerable<IMetadataSaver> savers)
|
IEnumerable<IMetadataSaver> savers)
|
||||||
{
|
{
|
||||||
EntityResolutionIgnoreRules = rules;
|
EntityResolutionIgnoreRules = rules;
|
||||||
@ -214,6 +221,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
Comparers = itemComparers;
|
Comparers = itemComparers;
|
||||||
PrescanTasks = prescanTasks;
|
PrescanTasks = prescanTasks;
|
||||||
PostscanTasks = postscanTasks;
|
PostscanTasks = postscanTasks;
|
||||||
|
PeoplePrescanTasks = peoplePrescanTasks;
|
||||||
_savers = savers;
|
_savers = savers;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -771,45 +779,9 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <param name="progress">The progress.</param>
|
/// <param name="progress">The progress.</param>
|
||||||
/// <returns>Task.</returns>
|
/// <returns>Task.</returns>
|
||||||
public async Task ValidatePeople(CancellationToken cancellationToken, IProgress<double> progress)
|
public Task ValidatePeople(CancellationToken cancellationToken, IProgress<double> progress)
|
||||||
{
|
{
|
||||||
var people = RootFolder.GetRecursiveChildren()
|
return new PeopleValidator(this, PeoplePrescanTasks, _logger).ValidatePeople(cancellationToken, progress);
|
||||||
.SelectMany(c => c.People)
|
|
||||||
.DistinctBy(p => p.Name, StringComparer.OrdinalIgnoreCase)
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
var numComplete = 0;
|
|
||||||
|
|
||||||
foreach (var person in people)
|
|
||||||
{
|
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var item = GetPerson(person.Name);
|
|
||||||
|
|
||||||
await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.ErrorException("Error validating IBN entry {0}", ex, person.Name);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Update progress
|
|
||||||
numComplete++;
|
|
||||||
double percent = numComplete;
|
|
||||||
percent /= people.Count;
|
|
||||||
|
|
||||||
progress.Report(100 * percent);
|
|
||||||
}
|
|
||||||
|
|
||||||
progress.Report(100);
|
|
||||||
|
|
||||||
_logger.Info("People validation complete");
|
|
||||||
|
|
||||||
// Bad practice, i know. But we keep a lot in memory, unfortunately.
|
|
||||||
GC.Collect(2, GCCollectionMode.Forced, true);
|
|
||||||
GC.Collect(2, GCCollectionMode.Forced, true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -1153,7 +1125,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
|||||||
private Video ResolveIntro(IntroInfo info)
|
private Video ResolveIntro(IntroInfo info)
|
||||||
{
|
{
|
||||||
Video video = null;
|
Video video = null;
|
||||||
|
|
||||||
if (info.ItemId.HasValue)
|
if (info.ItemId.HasValue)
|
||||||
{
|
{
|
||||||
// Get an existing item by Id
|
// Get an existing item by Id
|
||||||
|
@ -0,0 +1,147 @@
|
|||||||
|
using MediaBrowser.Common.Progress;
|
||||||
|
using MediaBrowser.Controller.Library;
|
||||||
|
using MediaBrowser.Model.Logging;
|
||||||
|
using MoreLinq;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Server.Implementations.Library.Validators
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Class PeopleValidator
|
||||||
|
/// </summary>
|
||||||
|
public class PeopleValidator
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// The _library manager
|
||||||
|
/// </summary>
|
||||||
|
private readonly ILibraryManager _libraryManager;
|
||||||
|
/// <summary>
|
||||||
|
/// The _logger
|
||||||
|
/// </summary>
|
||||||
|
private readonly ILogger _logger;
|
||||||
|
|
||||||
|
private readonly IEnumerable<IPeoplePrescanTask> _prescanTasks;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="PeopleValidator" /> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="libraryManager">The library manager.</param>
|
||||||
|
/// <param name="prescanTasks">The prescan tasks.</param>
|
||||||
|
/// <param name="logger">The logger.</param>
|
||||||
|
public PeopleValidator(ILibraryManager libraryManager, IEnumerable<IPeoplePrescanTask> prescanTasks, ILogger logger)
|
||||||
|
{
|
||||||
|
_libraryManager = libraryManager;
|
||||||
|
_logger = logger;
|
||||||
|
_prescanTasks = prescanTasks;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Validates the people.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
public async Task ValidatePeople(CancellationToken cancellationToken, IProgress<double> progress)
|
||||||
|
{
|
||||||
|
var innerProgress = new ActionableProgress<double>();
|
||||||
|
|
||||||
|
innerProgress.RegisterAction(pct => progress.Report(pct * .15));
|
||||||
|
|
||||||
|
// Run prescan tasks
|
||||||
|
await RunPrescanTasks(innerProgress, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
progress.Report(15);
|
||||||
|
|
||||||
|
var people = _libraryManager.RootFolder.GetRecursiveChildren()
|
||||||
|
.SelectMany(c => c.People)
|
||||||
|
.DistinctBy(p => p.Name, StringComparer.OrdinalIgnoreCase)
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
var numComplete = 0;
|
||||||
|
|
||||||
|
foreach (var person in people)
|
||||||
|
{
|
||||||
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var item = _libraryManager.GetPerson(person.Name);
|
||||||
|
|
||||||
|
await item.RefreshMetadata(cancellationToken).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error validating IBN entry {0}", ex, person.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update progress
|
||||||
|
numComplete++;
|
||||||
|
double percent = numComplete;
|
||||||
|
percent /= people.Count;
|
||||||
|
|
||||||
|
progress.Report(15 + 85 * percent);
|
||||||
|
}
|
||||||
|
|
||||||
|
progress.Report(100);
|
||||||
|
|
||||||
|
_logger.Info("People validation complete");
|
||||||
|
|
||||||
|
// Bad practice, i know. But we keep a lot in memory, unfortunately.
|
||||||
|
GC.Collect(2, GCCollectionMode.Forced, true);
|
||||||
|
GC.Collect(2, GCCollectionMode.Forced, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Runs the prescan tasks.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="progress">The progress.</param>
|
||||||
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
|
/// <returns>Task.</returns>
|
||||||
|
private async Task RunPrescanTasks(IProgress<double> progress, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var tasks = _prescanTasks.ToList();
|
||||||
|
|
||||||
|
var numComplete = 0;
|
||||||
|
var numTasks = tasks.Count;
|
||||||
|
|
||||||
|
foreach (var task in tasks)
|
||||||
|
{
|
||||||
|
var innerProgress = new ActionableProgress<double>();
|
||||||
|
|
||||||
|
// Prevent access to modified closure
|
||||||
|
var currentNumComplete = numComplete;
|
||||||
|
|
||||||
|
innerProgress.RegisterAction(pct =>
|
||||||
|
{
|
||||||
|
double innerPercent = (currentNumComplete * 100) + pct;
|
||||||
|
innerPercent /= numTasks;
|
||||||
|
progress.Report(innerPercent);
|
||||||
|
});
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await task.Run(innerProgress, cancellationToken);
|
||||||
|
}
|
||||||
|
catch (OperationCanceledException)
|
||||||
|
{
|
||||||
|
_logger.Info("Pre-scan task cancelled: {0}", task.GetType().Name);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error running pre-scan task", ex);
|
||||||
|
}
|
||||||
|
|
||||||
|
numComplete++;
|
||||||
|
double percent = numComplete;
|
||||||
|
percent /= numTasks;
|
||||||
|
progress.Report(percent * 100);
|
||||||
|
}
|
||||||
|
|
||||||
|
progress.Report(100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -160,6 +160,7 @@
|
|||||||
<Compile Include="Library\Validators\MusicGenresPostScanTask.cs" />
|
<Compile Include="Library\Validators\MusicGenresPostScanTask.cs" />
|
||||||
<Compile Include="Library\Validators\MusicGenresValidator.cs" />
|
<Compile Include="Library\Validators\MusicGenresValidator.cs" />
|
||||||
<Compile Include="Library\Validators\PeoplePostScanTask.cs" />
|
<Compile Include="Library\Validators\PeoplePostScanTask.cs" />
|
||||||
|
<Compile Include="Library\Validators\PeopleValidator.cs" />
|
||||||
<Compile Include="Library\Validators\StudiosPostScanTask.cs" />
|
<Compile Include="Library\Validators\StudiosPostScanTask.cs" />
|
||||||
<Compile Include="Library\Validators\StudiosValidator.cs" />
|
<Compile Include="Library\Validators\StudiosValidator.cs" />
|
||||||
<Compile Include="LiveTv\LiveTvManager.cs" />
|
<Compile Include="LiveTv\LiveTvManager.cs" />
|
||||||
|
@ -439,6 +439,7 @@ namespace MediaBrowser.ServerApplication
|
|||||||
GetExports<IBaseItemComparer>(),
|
GetExports<IBaseItemComparer>(),
|
||||||
GetExports<ILibraryPrescanTask>(),
|
GetExports<ILibraryPrescanTask>(),
|
||||||
GetExports<ILibraryPostScanTask>(),
|
GetExports<ILibraryPostScanTask>(),
|
||||||
|
GetExports<IPeoplePrescanTask>(),
|
||||||
GetExports<IMetadataSaver>());
|
GetExports<IMetadataSaver>());
|
||||||
|
|
||||||
ProviderManager.AddParts(GetExports<BaseMetadataProvider>());
|
ProviderManager.AddParts(GetExports<BaseMetadataProvider>());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user