diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-21 09:43:34 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-06-21 09:43:34 -0400 |
| commit | 43c9ab9cdca7671ef23e8ec5e66e00f5425ca0c2 (patch) | |
| tree | c27e4db108d4f3b138c120ff3915d631b664f9fd | |
| parent | b9c1113df98439b6877a170618a1d1929bde1df2 (diff) | |
replace comparison data with comparedate
| -rw-r--r-- | MediaBrowser.Providers/Movies/FanArtMovieProvider.cs | 22 | ||||
| -rw-r--r-- | MediaBrowser.Providers/Music/FanArtArtistProvider.cs | 20 | ||||
| -rw-r--r-- | MediaBrowser.Providers/TV/FanArtTVProvider.cs | 21 | ||||
| -rw-r--r-- | MediaBrowser.Providers/TV/RemoteSeriesProvider.cs | 32 |
4 files changed, 20 insertions, 75 deletions
diff --git a/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs index b34a692d3..be105b63a 100644 --- a/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs +++ b/MediaBrowser.Providers/Movies/FanArtMovieProvider.cs @@ -148,22 +148,13 @@ namespace MediaBrowser.Providers.Movies return false; } - // Refresh if tmdb id has changed - if (providerInfo.Data != GetComparisonData(item.GetProviderId(MetadataProviders.Tmdb))) - { - return true; - } - return base.NeedsRefreshInternal(item, providerInfo); } - /// <summary> - /// Gets the comparison data. - /// </summary> - /// <param name="id">The id.</param> - /// <returns>Guid.</returns> - private Guid GetComparisonData(string id) + protected override DateTime CompareDate(BaseItem item) { + var id = item.GetProviderId(MetadataProviders.Tmdb); + if (!string.IsNullOrEmpty(id)) { // Process images @@ -171,16 +162,16 @@ namespace MediaBrowser.Providers.Movies var files = new DirectoryInfo(path) .EnumerateFiles("*.xml", SearchOption.TopDirectoryOnly) - .Select(i => i.FullName + i.LastWriteTimeUtc.Ticks) + .Select(i => i.LastWriteTimeUtc) .ToArray(); if (files.Length > 0) { - return string.Join(string.Empty, files).GetMD5(); + return files.Max(); } } - return Guid.Empty; + return base.CompareDate(item); } /// <summary> @@ -253,7 +244,6 @@ namespace MediaBrowser.Providers.Movies await FetchFromXml(item, xmlPath, cancellationToken).ConfigureAwait(false); } - data.Data = GetComparisonData(item.GetProviderId(MetadataProviders.Tmdb)); SetLastRefreshed(item, DateTime.UtcNow); return true; } diff --git a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs index b92d4ad0e..1685846d6 100644 --- a/MediaBrowser.Providers/Music/FanArtArtistProvider.cs +++ b/MediaBrowser.Providers/Music/FanArtArtistProvider.cs @@ -132,20 +132,10 @@ namespace MediaBrowser.Providers.Music return false; } - if (GetComparisonData(item) != providerInfo.Data) - { - return true; - } - return base.NeedsRefreshInternal(item, providerInfo); } - /// <summary> - /// Gets the comparison data. - /// </summary> - /// <param name="item">The item.</param> - /// <returns>Guid.</returns> - private Guid GetComparisonData(BaseItem item) + protected override DateTime CompareDate(BaseItem item) { var musicBrainzId = item.GetProviderId(MetadataProviders.Musicbrainz); @@ -156,16 +146,16 @@ namespace MediaBrowser.Providers.Music var files = new DirectoryInfo(path) .EnumerateFiles("*.xml", SearchOption.TopDirectoryOnly) - .Select(i => i.FullName + i.LastWriteTimeUtc.Ticks) + .Select(i => i.LastWriteTimeUtc) .ToArray(); if (files.Length > 0) { - return string.Join(string.Empty, files).GetMD5(); + return files.Max(); } } - return Guid.Empty; + return base.CompareDate(item); } /// <summary> @@ -249,8 +239,6 @@ namespace MediaBrowser.Providers.Music item.ProviderData[Id] = data; } - data.Data = GetComparisonData(item); - SetLastRefreshed(item, DateTime.UtcNow); return true; } diff --git a/MediaBrowser.Providers/TV/FanArtTVProvider.cs b/MediaBrowser.Providers/TV/FanArtTVProvider.cs index ea0a1c128..878cd26e2 100644 --- a/MediaBrowser.Providers/TV/FanArtTVProvider.cs +++ b/MediaBrowser.Providers/TV/FanArtTVProvider.cs @@ -1,5 +1,4 @@ using MediaBrowser.Common.Configuration; -using MediaBrowser.Common.Extensions; using MediaBrowser.Common.IO; using MediaBrowser.Common.Net; using MediaBrowser.Controller.Configuration; @@ -79,21 +78,14 @@ namespace MediaBrowser.Providers.TV { return false; } - - if (providerInfo.Data != GetComparisonData(item.GetProviderId(MetadataProviders.Tvdb))) - { - return true; - } return base.NeedsRefreshInternal(item, providerInfo); } - /// <summary> - /// Gets the comparison data. - /// </summary> - /// <returns>Guid.</returns> - private Guid GetComparisonData(string id) + protected override DateTime CompareDate(BaseItem item) { + var id = item.GetProviderId(MetadataProviders.Tvdb); + if (!string.IsNullOrEmpty(id)) { // Process images @@ -101,16 +93,16 @@ namespace MediaBrowser.Providers.TV var files = new DirectoryInfo(path) .EnumerateFiles("*.xml", SearchOption.TopDirectoryOnly) - .Select(i => i.FullName + i.LastWriteTimeUtc.Ticks) + .Select(i => i.LastWriteTimeUtc) .ToArray(); if (files.Length > 0) { - return string.Join(string.Empty, files).GetMD5(); + return files.Max(); } } - return Guid.Empty; + return base.CompareDate(item); } /// <summary> @@ -202,7 +194,6 @@ namespace MediaBrowser.Providers.TV await FetchFromXml(item, xmlPath, cancellationToken).ConfigureAwait(false); } - data.Data = GetComparisonData(item.GetProviderId(MetadataProviders.Tvdb)); SetLastRefreshed(item, DateTime.UtcNow); return true; diff --git a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs index ae11da68f..6bf0a00d9 100644 --- a/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs +++ b/MediaBrowser.Providers/TV/RemoteSeriesProvider.cs @@ -162,29 +162,7 @@ namespace MediaBrowser.Providers.TV } } - /// <summary> - /// Needses the refresh internal. - /// </summary> - /// <param name="item">The item.</param> - /// <param name="providerInfo">The provider info.</param> - /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns> - protected override bool NeedsRefreshInternal(BaseItem item, BaseProviderInfo providerInfo) - { - // Refresh even if local metadata exists because we need episode infos - if (GetComparisonData(item) != providerInfo.Data) - { - return true; - } - - return base.NeedsRefreshInternal(item, providerInfo); - } - - /// <summary> - /// Gets the comparison data. - /// </summary> - /// <param name="item">The item.</param> - /// <returns>Guid.</returns> - private Guid GetComparisonData(BaseItem item) + protected override DateTime CompareDate(BaseItem item) { var seriesId = item.GetProviderId(MetadataProviders.Tvdb); @@ -195,16 +173,16 @@ namespace MediaBrowser.Providers.TV var files = new DirectoryInfo(path) .EnumerateFiles("*.xml", SearchOption.TopDirectoryOnly) - .Select(i => i.FullName + i.LastWriteTimeUtc.Ticks) + .Select(i => i.LastWriteTimeUtc) .ToArray(); if (files.Length > 0) { - return string.Join(string.Empty, files).GetMD5(); + return files.Max(); } } - return Guid.Empty; + return base.CompareDate(item); } /// <summary> @@ -245,8 +223,6 @@ namespace MediaBrowser.Providers.TV item.ProviderData[Id] = data; } - data.Data = GetComparisonData(item); - SetLastRefreshed(item, DateTime.UtcNow); return true; } |
