aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs')
-rw-r--r--MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs320
1 files changed, 65 insertions, 255 deletions
diff --git a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
index 2b4337ed1c..5137b4c2d5 100644
--- a/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
@@ -1,40 +1,32 @@
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;
-using System.Xml;
using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Dto;
using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.IO;
using MediaBrowser.Model.Providers;
-using MediaBrowser.Model.Xml;
+using Microsoft.Extensions.Logging;
+using TvDbSharper;
+using TvDbSharper.Dto;
+using RatingType = MediaBrowser.Model.Dto.RatingType;
+using Series = MediaBrowser.Controller.Entities.TV.Series;
namespace MediaBrowser.Providers.TV.TheTVDB
{
public class TvdbSeriesImageProvider : IRemoteImageProvider, IHasOrder
{
- private readonly IServerConfigurationManager _config;
private readonly IHttpClient _httpClient;
- private readonly CultureInfo _usCulture = new CultureInfo("en-US");
- private readonly IFileSystem _fileSystem;
- private readonly IXmlReaderSettingsFactory _xmlReaderSettingsFactory;
+ private readonly ILogger _logger;
+ private readonly TvDbClientManager _tvDbClientManager;
- public TvdbSeriesImageProvider(IServerConfigurationManager config, IHttpClient httpClient, IFileSystem fileSystem, IXmlReaderSettingsFactory xmlReaderSettingsFactory)
+ public TvdbSeriesImageProvider(IHttpClient httpClient, ILogger logger, TvDbClientManager tvDbClientManager)
{
- _config = config;
_httpClient = httpClient;
- _fileSystem = fileSystem;
- _xmlReaderSettingsFactory = xmlReaderSettingsFactory;
+ _logger = logger;
+ _tvDbClientManager = tvDbClientManager;
}
public string Name => ProviderName;
@@ -58,273 +50,91 @@ namespace MediaBrowser.Providers.TV.TheTVDB
public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
{
- if (TvdbSeriesProvider.IsValidSeries(item.ProviderIds))
+ if (!TvdbSeriesProvider.IsValidSeries(item.ProviderIds))
{
- var language = item.GetPreferredMetadataLanguage();
-
- var seriesDataPath = await TvdbSeriesProvider.Current.EnsureSeriesInfo(item.ProviderIds, item.Name, item.ProductionYear, language, cancellationToken).ConfigureAwait(false);
+ return new RemoteImageInfo[] { };
+ }
- if (string.IsNullOrEmpty(seriesDataPath))
+ var language = item.GetPreferredMetadataLanguage();
+ var remoteImages = new List<RemoteImageInfo>();
+ var keyTypes = new[] { KeyType.Poster, KeyType.Series, KeyType.Fanart };
+ var tvdbId = Convert.ToInt32(item.GetProviderId(MetadataProviders.Tvdb));
+ foreach (KeyType keyType in keyTypes)
+ {
+ var imageQuery = new ImagesQuery
{
- return new RemoteImageInfo[] { };
- }
-
- var path = Path.Combine(seriesDataPath, "banners.xml");
-
+ KeyType = keyType
+ };
try
{
- return GetImages(path, language, cancellationToken);
- }
- catch (FileNotFoundException)
- {
- // No tvdb data yet. Don't blow up
+ var imageResults =
+ await _tvDbClientManager.GetImagesAsync(tvdbId, imageQuery, language, cancellationToken);
+
+ remoteImages.AddRange(GetImages(imageResults.Data, language));
}
- catch (IOException)
+ catch (TvDbServerException)
{
- // No tvdb data yet. Don't blow up
+ _logger.LogDebug("No images of type {KeyType} exist for series {TvDbId}", keyType,
+ tvdbId);
}
}
-
- return new RemoteImageInfo[] { };
+ return remoteImages;
}
- private IEnumerable<RemoteImageInfo> GetImages(string xmlPath, string preferredLanguage, CancellationToken cancellationToken)
+ private IEnumerable<RemoteImageInfo> GetImages(Image[] images, string preferredLanguage)
{
- var settings = _xmlReaderSettingsFactory.Create(false);
-
- settings.CheckCharacters = false;
- settings.IgnoreProcessingInstructions = true;
- settings.IgnoreComments = true;
-
var list = new List<RemoteImageInfo>();
+ var languages = _tvDbClientManager.GetLanguagesAsync(CancellationToken.None).Result.Data;
- using (var fileStream = _fileSystem.GetFileStream(xmlPath, FileOpenMode.Open, FileAccessMode.Read, FileShareMode.Read))
+ foreach (Image image in images)
{
- using (var streamReader = new StreamReader(fileStream, Encoding.UTF8))
+ var imageInfo = new RemoteImageInfo
{
- // Use XmlReader for best performance
- using (var reader = XmlReader.Create(streamReader, settings))
- {
- reader.MoveToContent();
- reader.Read();
-
- // Loop through each element
- while (!reader.EOF && reader.ReadState == ReadState.Interactive)
- {
- cancellationToken.ThrowIfCancellationRequested();
+ RatingType = RatingType.Score,
+ CommunityRating = (double?)image.RatingsInfo.Average,
+ VoteCount = image.RatingsInfo.Count,
+ Url = TvdbUtils.BannerUrl + image.FileName,
+ ProviderName = Name,
+ Language = languages.FirstOrDefault(lang => lang.Id == image.LanguageId)?.Abbreviation,
+ ThumbnailUrl = TvdbUtils.BannerUrl + image.Thumbnail
+ };
- if (reader.NodeType == XmlNodeType.Element)
- {
- switch (reader.Name)
- {
- case "Banner":
- {
- if (reader.IsEmptyElement)
- {
- reader.Read();
- continue;
- }
- using (var subtree = reader.ReadSubtree())
- {
- AddImage(subtree, list);
- }
- break;
- }
- default:
- reader.Skip();
- break;
- }
- }
- else
- {
- reader.Read();
- }
- }
- }
+ var resolution = image.Resolution.Split('x');
+ if (resolution.Length == 2)
+ {
+ imageInfo.Width = Convert.ToInt32(resolution[0]);
+ imageInfo.Height = Convert.ToInt32(resolution[1]);
}
- }
+ imageInfo.Type = TvdbUtils.GetImageTypeFromKeyType(image.KeyType);
+ list.Add(imageInfo);
+ }
var isLanguageEn = string.Equals(preferredLanguage, "en", StringComparison.OrdinalIgnoreCase);
return list.OrderByDescending(i =>
- {
- if (string.Equals(preferredLanguage, i.Language, StringComparison.OrdinalIgnoreCase))
- {
- return 3;
- }
- if (!isLanguageEn)
{
- if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
+ if (string.Equals(preferredLanguage, i.Language, StringComparison.OrdinalIgnoreCase))
{
- return 2;
+ return 3;
}
- }
- if (string.IsNullOrEmpty(i.Language))
- {
- return isLanguageEn ? 3 : 2;
- }
- return 0;
- })
- .ThenByDescending(i => i.CommunityRating ?? 0)
- .ThenByDescending(i => i.VoteCount ?? 0);
- }
-
- private void AddImage(XmlReader reader, List<RemoteImageInfo> images)
- {
- reader.MoveToContent();
- string bannerType = null;
- string url = null;
- int? bannerSeason = null;
- int? width = null;
- int? height = null;
- string language = null;
- double? rating = null;
- int? voteCount = null;
- string thumbnailUrl = null;
-
- reader.MoveToContent();
- reader.Read();
-
- // Loop through each element
- while (!reader.EOF && reader.ReadState == ReadState.Interactive)
- {
- if (reader.NodeType == XmlNodeType.Element)
- {
- switch (reader.Name)
+ if (!isLanguageEn)
{
- case "Rating":
- {
- var val = reader.ReadElementContentAsString() ?? string.Empty;
-
- if (double.TryParse(val, NumberStyles.Any, _usCulture, out var rval))
- {
- rating = rval;
- }
-
- break;
- }
-
- case "RatingCount":
- {
- var val = reader.ReadElementContentAsString() ?? string.Empty;
-
- if (int.TryParse(val, NumberStyles.Integer, _usCulture, out var rval))
- {
- voteCount = rval;
- }
-
- break;
- }
-
- case "Language":
- {
- language = reader.ReadElementContentAsString() ?? string.Empty;
- break;
- }
-
- case "ThumbnailPath":
- {
- thumbnailUrl = reader.ReadElementContentAsString() ?? string.Empty;
- break;
- }
-
- case "BannerType":
- {
- bannerType = reader.ReadElementContentAsString() ?? string.Empty;
-
- break;
- }
-
- case "BannerPath":
- {
- url = reader.ReadElementContentAsString() ?? string.Empty;
- break;
- }
-
- case "BannerType2":
- {
- var bannerType2 = reader.ReadElementContentAsString() ?? string.Empty;
-
- // Sometimes the resolution is stuffed in here
- var resolutionParts = bannerType2.Split('x');
-
- if (resolutionParts.Length == 2)
- {
- if (int.TryParse(resolutionParts[0], NumberStyles.Integer, _usCulture, out var rval))
- {
- width = rval;
- }
-
- if (int.TryParse(resolutionParts[1], NumberStyles.Integer, _usCulture, out rval))
- {
- height = rval;
- }
-
- }
-
- break;
- }
-
- case "Season":
- {
- var val = reader.ReadElementContentAsString();
-
- if (!string.IsNullOrWhiteSpace(val))
- {
- bannerSeason = int.Parse(val);
- }
- break;
- }
-
-
- default:
- reader.Skip();
- break;
+ if (string.Equals("en", i.Language, StringComparison.OrdinalIgnoreCase))
+ {
+ return 2;
+ }
}
- }
- else
- {
- reader.Read();
- }
- }
- if (!string.IsNullOrEmpty(url) && !bannerSeason.HasValue)
- {
- var imageInfo = new RemoteImageInfo
- {
- RatingType = RatingType.Score,
- CommunityRating = rating,
- VoteCount = voteCount,
- Url = TVUtils.BannerUrl + url,
- ProviderName = Name,
- Language = language,
- Width = width,
- Height = height
- };
-
- if (!string.IsNullOrEmpty(thumbnailUrl))
- {
- imageInfo.ThumbnailUrl = TVUtils.BannerUrl + thumbnailUrl;
- }
-
- if (string.Equals(bannerType, "poster", StringComparison.OrdinalIgnoreCase))
- {
- imageInfo.Type = ImageType.Primary;
- images.Add(imageInfo);
- }
- else if (string.Equals(bannerType, "series", StringComparison.OrdinalIgnoreCase))
- {
- imageInfo.Type = ImageType.Banner;
- images.Add(imageInfo);
- }
- else if (string.Equals(bannerType, "fanart", StringComparison.OrdinalIgnoreCase))
- {
- imageInfo.Type = ImageType.Backdrop;
- images.Add(imageInfo);
- }
- }
+ if (string.IsNullOrEmpty(i.Language))
+ {
+ return isLanguageEn ? 3 : 2;
+ }
+ return 0;
+ })
+ .ThenByDescending(i => i.CommunityRating ?? 0)
+ .ThenByDescending(i => i.VoteCount ?? 0);
}
public int Order => 0;
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-02 23:21:10 +0000