open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes #281 - Metadata images incomplete

Browse Source
pull/702/head
Luke Pulverenti 12 years ago
parent 4cd7030248
commit 4c971ed161
3 changed files with 71 additions and 143 deletions
Show Stats Download Patch File Download Diff File

7
MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
Unescape View File

@ -91,12 +91,13 @@ namespace MediaBrowser.Controller.Providers
} }
// Only validate paths from the same directory - need to copy to a list because we are going to potentially modify the collection below // Only validate paths from the same directory - need to copy to a list because we are going to potentially modify the collection below
var deletedKeys = item.Images.Keys.Where(image => var deletedKeys = item.Images.ToList().Where(image =>
{ {
var path = item.Images[image]; var path = image.Value;
return IsInMetaLocation(item, path) && item.ResolveArgs.GetMetaFileByPath(path) == null; return IsInMetaLocation(item, path) && item.ResolveArgs.GetMetaFileByPath(path) == null;
}).ToList();
}).Select(i => i.Key).ToList();
// Now remove them from the dictionary // Now remove them from the dictionary
foreach (var key in deletedKeys) foreach (var key in deletedKeys)

50
MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
Unescape View File

@ -46,11 +46,11 @@ namespace MediaBrowser.Controller.Providers.TV
/// <summary> /// <summary>
/// The episode query /// The episode query
/// </summary> /// </summary>
private const string episodeQuery = "http://www.thetvdb.com/api/{0}/series/{1}/default/{2}/{3}/{4}.xml"; private const string EpisodeQuery = "http://www.thetvdb.com/api/{0}/series/{1}/default/{2}/{3}/{4}.xml";
/// <summary> /// <summary>
/// The abs episode query /// The abs episode query
/// </summary> /// </summary>
private const string absEpisodeQuery = "http://www.thetvdb.com/api/{0}/series/{1}/absolute/{2}/{3}.xml"; private const string AbsEpisodeQuery = "http://www.thetvdb.com/api/{0}/series/{1}/absolute/{2}/{3}.xml";
/// <summary> /// <summary>
/// Supportses the specified item. /// Supportses the specified item.
@ -179,25 +179,19 @@ namespace MediaBrowser.Controller.Providers.TV
seasonNumber = "0"; // Specials seasonNumber = "0"; // Specials
} }
var url = string.Format(episodeQuery, TVUtils.TvdbApiKey, seriesId, seasonNumber, episodeNumber, ConfigurationManager.Configuration.PreferredMetadataLanguage); var url = string.Format(EpisodeQuery, TVUtils.TvdbApiKey, seriesId, seasonNumber, episodeNumber, ConfigurationManager.Configuration.PreferredMetadataLanguage);
var doc = new XmlDocument(); var doc = new XmlDocument();
try using (var result = await HttpClient.Get(new HttpRequestOptions
{ {
using (var result = await HttpClient.Get(new HttpRequestOptions Url = url,
{ ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool,
Url = url, CancellationToken = cancellationToken,
ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool, EnableResponseCache = true
CancellationToken = cancellationToken,
EnableResponseCache = true
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{
doc.Load(result);
}
}
catch (HttpException)
{ {
doc.Load(result);
} }
//episode does not exist under this season, try absolute numbering. //episode does not exist under this season, try absolute numbering.
@ -205,25 +199,19 @@ namespace MediaBrowser.Controller.Providers.TV
//this is basicly just for anime. //this is basicly just for anime.
if (!doc.HasChildNodes && Int32.Parse(seasonNumber) == 1) if (!doc.HasChildNodes && Int32.Parse(seasonNumber) == 1)
{ {
url = string.Format(absEpisodeQuery, TVUtils.TvdbApiKey, seriesId, episodeNumber, ConfigurationManager.Configuration.PreferredMetadataLanguage); url = string.Format(AbsEpisodeQuery, TVUtils.TvdbApiKey, seriesId, episodeNumber, ConfigurationManager.Configuration.PreferredMetadataLanguage);
try using (var result = await HttpClient.Get(new HttpRequestOptions
{ {
using (var result = await HttpClient.Get(new HttpRequestOptions Url = url,
{ ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool,
Url = url, CancellationToken = cancellationToken,
ResourcePool = RemoteSeriesProvider.Current.TvDbResourcePool, EnableResponseCache = true
CancellationToken = cancellationToken,
EnableResponseCache = true
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{
if (result != null) doc.Load(result);
usingAbsoluteData = true;
}
}
catch (HttpException)
{ {
if (result != null) doc.Load(result);
usingAbsoluteData = true;
} }
} }

155
MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
Unescape View File

@ -1,5 +1,4 @@
using System.Globalization; using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Common.Net; using MediaBrowser.Common.Net;
using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
@ -11,6 +10,7 @@ using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net; using MediaBrowser.Model.Net;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Text; using System.Text;
@ -142,8 +142,7 @@ namespace MediaBrowser.Controller.Providers.TV
if (item.DontFetchMeta) return false; if (item.DontFetchMeta) return false;
return !HasLocalMeta(item) && (ConfigurationManager.Configuration.MetadataRefreshDays != -1 && return !HasLocalMeta(item) && base.NeedsRefreshInternal(item, providerInfo);
DateTime.UtcNow.Subtract(downloadDate).TotalDays > ConfigurationManager.Configuration.MetadataRefreshDays);
} }
/// <summary> /// <summary>
@ -165,15 +164,16 @@ namespace MediaBrowser.Controller.Providers.TV
cancellationToken.ThrowIfCancellationRequested(); cancellationToken.ThrowIfCancellationRequested();
var status = ProviderRefreshStatus.Success;
if (!string.IsNullOrEmpty(seriesId)) if (!string.IsNullOrEmpty(seriesId))
{ {
series.SetProviderId(MetadataProviders.Tvdb, seriesId); series.SetProviderId(MetadataProviders.Tvdb, seriesId);
if (!HasCompleteMetadata(series))
{ status = await FetchSeriesData(series, seriesId, cancellationToken).ConfigureAwait(false);
await FetchSeriesData(series, seriesId, cancellationToken).ConfigureAwait(false);
}
} }
SetLastRefreshed(item, DateTime.UtcNow);
SetLastRefreshed(item, DateTime.UtcNow, status);
return true; return true;
} }
Logger.Info("Series provider not fetching because local meta exists or requested to ignore: " + item.Name); Logger.Info("Series provider not fetching because local meta exists or requested to ignore: " + item.Name);
@ -188,11 +188,9 @@ namespace MediaBrowser.Controller.Providers.TV
/// <param name="seriesId">The series id.</param> /// <param name="seriesId">The series id.</param>
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{System.Boolean}.</returns> /// <returns>Task{System.Boolean}.</returns>
private async Task<bool> FetchSeriesData(Series series, string seriesId, CancellationToken cancellationToken) private async Task<ProviderRefreshStatus> FetchSeriesData(Series series, string seriesId, CancellationToken cancellationToken)
{ {
var success = false; var status = ProviderRefreshStatus.Success;
var name = series.Name;
if (!string.IsNullOrEmpty(seriesId)) if (!string.IsNullOrEmpty(seriesId))
{ {
@ -200,22 +198,16 @@ namespace MediaBrowser.Controller.Providers.TV
string url = string.Format(seriesGet, TVUtils.TvdbApiKey, seriesId, ConfigurationManager.Configuration.PreferredMetadataLanguage); string url = string.Format(seriesGet, TVUtils.TvdbApiKey, seriesId, ConfigurationManager.Configuration.PreferredMetadataLanguage);
var doc = new XmlDocument(); var doc = new XmlDocument();
try using (var xml = await HttpClient.Get(new HttpRequestOptions
{ {
using (var xml = await HttpClient.Get(new HttpRequestOptions Url = url,
{ ResourcePool = TvDbResourcePool,
Url = url, CancellationToken = cancellationToken,
ResourcePool = TvDbResourcePool, EnableResponseCache = true
CancellationToken = cancellationToken,
EnableResponseCache = true
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{
doc.Load(xml);
}
}
catch (HttpException)
{ {
doc.Load(xml);
} }
if (doc.HasChildNodes) if (doc.HasChildNodes)
@ -224,8 +216,6 @@ namespace MediaBrowser.Controller.Providers.TV
var actorTask = FetchActors(series, seriesId, doc, cancellationToken); var actorTask = FetchActors(series, seriesId, doc, cancellationToken);
var imageTask = FetchImages(series, seriesId, cancellationToken); var imageTask = FetchImages(series, seriesId, cancellationToken);
success = true;
series.Name = doc.SafeGetString("//SeriesName"); series.Name = doc.SafeGetString("//SeriesName");
series.Overview = doc.SafeGetString("//Overview"); series.Overview = doc.SafeGetString("//Overview");
series.CommunityRating = doc.SafeGetSingle("//Rating", 0, 10); series.CommunityRating = doc.SafeGetSingle("//Rating", 0, 10);
@ -268,8 +258,15 @@ namespace MediaBrowser.Controller.Providers.TV
} }
} }
//wait for other tasks try
await Task.WhenAll(actorTask, imageTask).ConfigureAwait(false); {
//wait for other tasks
await Task.WhenAll(actorTask, imageTask).ConfigureAwait(false);
}
catch (HttpException)
{
status = ProviderRefreshStatus.CompletedWithErrors;
}
if (ConfigurationManager.Configuration.SaveLocalMeta) if (ConfigurationManager.Configuration.SaveLocalMeta)
{ {
@ -281,9 +278,7 @@ namespace MediaBrowser.Controller.Providers.TV
} }
} }
return status;
return success;
} }
/// <summary> /// <summary>
@ -299,22 +294,16 @@ namespace MediaBrowser.Controller.Providers.TV
string urlActors = string.Format(getActors, TVUtils.TvdbApiKey, seriesId); string urlActors = string.Format(getActors, TVUtils.TvdbApiKey, seriesId);
var docActors = new XmlDocument(); var docActors = new XmlDocument();
try using (var actors = await HttpClient.Get(new HttpRequestOptions
{ {
using (var actors = await HttpClient.Get(new HttpRequestOptions Url = urlActors,
{ ResourcePool = TvDbResourcePool,
Url = urlActors, CancellationToken = cancellationToken,
ResourcePool = TvDbResourcePool, EnableResponseCache = true
CancellationToken = cancellationToken,
EnableResponseCache = true
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{
docActors.Load(actors);
}
}
catch (HttpException)
{ {
docActors.Load(actors);
} }
if (docActors.HasChildNodes) if (docActors.HasChildNodes)
@ -380,22 +369,16 @@ namespace MediaBrowser.Controller.Providers.TV
string url = string.Format("http://www.thetvdb.com/api/" + TVUtils.TvdbApiKey + "/series/{0}/banners.xml", seriesId); string url = string.Format("http://www.thetvdb.com/api/" + TVUtils.TvdbApiKey + "/series/{0}/banners.xml", seriesId);
var images = new XmlDocument(); var images = new XmlDocument();
try using (var imgs = await HttpClient.Get(new HttpRequestOptions
{ {
using (var imgs = await HttpClient.Get(new HttpRequestOptions Url = url,
{ ResourcePool = TvDbResourcePool,
Url = url, CancellationToken = cancellationToken,
ResourcePool = TvDbResourcePool, EnableResponseCache = true
CancellationToken = cancellationToken,
EnableResponseCache = true
}).ConfigureAwait(false)) }).ConfigureAwait(false))
{
images.Load(imgs);
}
}
catch (HttpException)
{ {
images.Load(imgs);
} }
if (images.HasChildNodes) if (images.HasChildNodes)
@ -408,17 +391,7 @@ namespace MediaBrowser.Controller.Providers.TV
n = n.SelectSingleNode("./BannerPath"); n = n.SelectSingleNode("./BannerPath");
if (n != null) if (n != null)
{ {
try series.PrimaryImagePath = await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + n.InnerText, "folder" + Path.GetExtension(n.InnerText), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken).ConfigureAwait(false);
{
series.PrimaryImagePath = await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + n.InnerText, "folder" + Path.GetExtension(n.InnerText), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken).ConfigureAwait(false);
}
catch (HttpException)
{
}
catch (IOException)
{
}
} }
} }
} }
@ -431,19 +404,9 @@ namespace MediaBrowser.Controller.Providers.TV
n = n.SelectSingleNode("./BannerPath"); n = n.SelectSingleNode("./BannerPath");
if (n != null) if (n != null)
{ {
try var bannerImagePath = await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + n.InnerText, "banner" + Path.GetExtension(n.InnerText), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken);
{
var bannerImagePath = await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + n.InnerText, "banner" + Path.GetExtension(n.InnerText), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken);
series.SetImage(ImageType.Banner, bannerImagePath);
}
catch (HttpException)
{
}
catch (IOException)
{
} series.SetImage(ImageType.Banner, bannerImagePath);
} }
} }
} }
@ -460,17 +423,7 @@ namespace MediaBrowser.Controller.Providers.TV
var bdName = "backdrop" + (bdNo > 0 ? bdNo.ToString(UsCulture) : ""); var bdName = "backdrop" + (bdNo > 0 ? bdNo.ToString(UsCulture) : "");
if (ConfigurationManager.Configuration.RefreshItemImages || !series.HasLocalImage(bdName)) if (ConfigurationManager.Configuration.RefreshItemImages || !series.HasLocalImage(bdName))
{ {
try series.BackdropImagePaths.Add(await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + p.InnerText, bdName + Path.GetExtension(p.InnerText), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken).ConfigureAwait(false));
{
series.BackdropImagePaths.Add(await _providerManager.DownloadAndSaveImage(series, TVUtils.BannerUrl + p.InnerText, bdName + Path.GetExtension(p.InnerText), ConfigurationManager.Configuration.SaveLocalMeta, TvDbResourcePool, cancellationToken).ConfigureAwait(false));
}
catch (HttpException)
{
}
catch (IOException)
{
}
} }
bdNo++; bdNo++;
if (bdNo >= ConfigurationManager.Configuration.MaxBackdrops) break; if (bdNo >= ConfigurationManager.Configuration.MaxBackdrops) break;
@ -480,18 +433,6 @@ namespace MediaBrowser.Controller.Providers.TV
} }
} }
/// <summary>
/// Determines whether [has complete metadata] [the specified series].
/// </summary>
/// <param name="series">The series.</param>
/// <returns><c>true</c> if [has complete metadata] [the specified series]; otherwise, <c>false</c>.</returns>
private bool HasCompleteMetadata(Series series)
{
return (series.HasImage(ImageType.Banner)) && (series.CommunityRating != null)
&& (series.Overview != null) && (series.Name != null) && (series.People != null)
&& (series.Genres != null) && (series.OfficialRating != null);
}
/// <summary> /// <summary>
/// Determines whether [has local meta] [the specified item]. /// Determines whether [has local meta] [the specified item].
/// </summary> /// </summary>
@ -499,9 +440,7 @@ namespace MediaBrowser.Controller.Providers.TV
/// <returns><c>true</c> if [has local meta] [the specified item]; otherwise, <c>false</c>.</returns> /// <returns><c>true</c> if [has local meta] [the specified item]; otherwise, <c>false</c>.</returns>
private bool HasLocalMeta(BaseItem item) private bool HasLocalMeta(BaseItem item)
{ {
//need at least the xml and folder.jpg/png return item.ResolveArgs.ContainsMetaFileByName(LOCAL_META_FILE_NAME);
return item.ResolveArgs.ContainsMetaFileByName(LOCAL_META_FILE_NAME) && (item.ResolveArgs.ContainsMetaFileByName("folder.jpg") ||
item.ResolveArgs.ContainsMetaFileByName("folder.png"));
} }
/// <summary> /// <summary>

Write Preview
Loading…
Cancel
Save