standardize check of DontFetchMeta within provider manager

This commit is contained in:
Luke Pulverenti 2013-05-19 16:19:30 -04:00
parent d7791db5b3
commit 40a2af83c9
5 changed files with 8 additions and 19 deletions

View File

@ -204,8 +204,6 @@ namespace MediaBrowser.Controller.Providers
throw new ArgumentNullException("providerInfo"); throw new ArgumentNullException("providerInfo");
} }
if (item.DontFetchMeta && RequiresInternet) return false;
if (CompareDate(item) > providerInfo.LastRefreshed) if (CompareDate(item) > providerInfo.LastRefreshed)
{ {
return true; return true;

View File

@ -244,8 +244,6 @@ namespace MediaBrowser.Controller.Providers.Movies
protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo) protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo)
{ {
if (item.DontFetchMeta) return false;
if (HasAltMeta(item)) if (HasAltMeta(item))
return false; //never refresh if has meta from other source return false; //never refresh if has meta from other source
@ -278,22 +276,10 @@ namespace MediaBrowser.Controller.Providers.Movies
SetLastRefreshed(item, DateTime.UtcNow); SetLastRefreshed(item, DateTime.UtcNow);
return true; return true;
} }
if (item.DontFetchMeta)
{
Logger.Info("MovieDbProvider - Not fetching because requested to ignore " + item.Name);
return false;
}
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
if (!ConfigurationManager.Configuration.SaveLocalMeta || !HasLocalMeta(item) || (force && !HasLocalMeta(item)))
{
await FetchMovieData(item, cancellationToken).ConfigureAwait(false); await FetchMovieData(item, cancellationToken).ConfigureAwait(false);
}
else
{
Logger.Debug("MovieDBProvider not fetching because local meta exists for " + item.Name);
}
SetLastRefreshed(item, DateTime.UtcNow); SetLastRefreshed(item, DateTime.UtcNow);
return true; return true;

View File

@ -115,7 +115,7 @@ namespace MediaBrowser.Controller.Providers.TV
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var episode = (Episode)item; var episode = (Episode)item;
if (!item.DontFetchMeta && !HasLocalMeta(episode)) if (!HasLocalMeta(episode))
{ {
var seriesId = episode.Series != null ? episode.Series.GetProviderId(MetadataProviders.Tvdb) : null; var seriesId = episode.Series != null ? episode.Series.GetProviderId(MetadataProviders.Tvdb) : null;

View File

@ -148,7 +148,7 @@ namespace MediaBrowser.Controller.Providers.TV
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var series = (Series)item; var series = (Series)item;
if (!item.DontFetchMeta && !HasLocalMeta(series)) if (!HasLocalMeta(series))
{ {
var path = item.Path ?? ""; var path = item.Path ?? "";
var seriesId = Path.GetFileName(path).GetAttributeValue("tvdbid") ?? await GetSeriesId(series, cancellationToken); var seriesId = Path.GetFileName(path).GetAttributeValue("tvdbid") ?? await GetSeriesId(series, cancellationToken);

View File

@ -191,6 +191,11 @@ namespace MediaBrowser.Server.Implementations.Providers
continue; continue;
} }
if (provider.RequiresInternet && item.DontFetchMeta)
{
continue;
}
currentTasks.Add(FetchAsync(provider, item, force, cancellationToken)); currentTasks.Add(FetchAsync(provider, item, force, cancellationToken));
currentPriority = provider.Priority; currentPriority = provider.Priority;
} }