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

Address review comments

Browse Source
pull/776/head
Claus Vium 6 years ago
parent cb6d2cbd2d
commit 1f30a50f4a
4 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File

34
MediaBrowser.Providers/TV/MissingEpisodeProvider.cs
Unescape View File

@ -64,11 +64,11 @@ namespace MediaBrowser.Providers.TV
DateTime.TryParse(i.FirstAired, out var firstAired); DateTime.TryParse(i.FirstAired, out var firstAired);
var seasonNumber = i.AiredSeason.GetValueOrDefault(-1); var seasonNumber = i.AiredSeason.GetValueOrDefault(-1);
var episodeNumber = i.AiredEpisodeNumber.GetValueOrDefault(-1); var episodeNumber = i.AiredEpisodeNumber.GetValueOrDefault(-1);
return (SeasonNumber: seasonNumber, EpisodeNumber: episodeNumber, firstAired: firstAired); return (seasonNumber: seasonNumber, episodeNumber: episodeNumber, firstAired: firstAired);
}) })
.Where(i => i.SeasonNumber != -1 && i.EpisodeNumber != -1) .Where(i => i.seasonNumber != -1 && i.episodeNumber != -1)
.OrderBy(i => i.SeasonNumber) .OrderBy(i => i.seasonNumber)
.ThenBy(i => i.EpisodeNumber) .ThenBy(i => i.episodeNumber)
.ToList(); .ToList();
var allRecursiveChildren = series.GetRecursiveChildren(); var allRecursiveChildren = series.GetRecursiveChildren();
@ -133,18 +133,18 @@ namespace MediaBrowser.Providers.TV
Series series, Series series,
IEnumerable<BaseItem> allItems, IEnumerable<BaseItem> allItems,
bool addMissingEpisodes, bool addMissingEpisodes,
IReadOnlyCollection<(int SeasonNumber, int Episodenumber, DateTime FirstAired)> episodeLookup, IReadOnlyCollection<(int seasonNumber, int episodenumber, DateTime firstAired)> episodeLookup,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var existingEpisodes = allItems.OfType<Episode>().ToList(); var existingEpisodes = allItems.OfType<Episode>().ToList();
var seasonCounts = episodeLookup.GroupBy(e => e.SeasonNumber).ToDictionary(g => g.Key, g => g.Count()); var seasonCounts = episodeLookup.GroupBy(e => e.seasonNumber).ToDictionary(g => g.Key, g => g.Count());
var hasChanges = false; var hasChanges = false;
foreach (var tuple in episodeLookup) foreach (var tuple in episodeLookup)
{ {
if (tuple.SeasonNumber <= 0 || tuple.Episodenumber <= 0) if (tuple.seasonNumber <= 0 || tuple.episodenumber <= 0)
{ {
// Ignore episode/season zeros // Ignore episode/season zeros
continue; continue;
@ -157,15 +157,15 @@ namespace MediaBrowser.Providers.TV
continue; continue;
} }
var airDate = tuple.FirstAired; var airDate = tuple.firstAired;
var now = DateTime.UtcNow.AddDays(-UnairedEpisodeThresholdDays); var now = DateTime.UtcNow.AddDays(-UnairedEpisodeThresholdDays);
if (airDate < now && addMissingEpisodes || airDate > now) if (airDate < now && addMissingEpisodes || airDate > now)
{ {
// tvdb has a lot of nearly blank episodes // tvdb has a lot of nearly blank episodes
_logger.LogInformation("Creating virtual missing/unaired episode {0} {1}x{2}", series.Name, tuple.SeasonNumber, tuple.Episodenumber); _logger.LogInformation("Creating virtual missing/unaired episode {0} {1}x{2}", series.Name, tuple.seasonNumber, tuple.episodenumber);
await AddEpisode(series, tuple.SeasonNumber, tuple.Episodenumber, cancellationToken).ConfigureAwait(false); await AddEpisode(series, tuple.seasonNumber, tuple.episodenumber, cancellationToken).ConfigureAwait(false);
hasChanges = true; hasChanges = true;
} }
@ -179,7 +179,7 @@ namespace MediaBrowser.Providers.TV
/// </summary> /// </summary>
private bool RemoveObsoleteOrMissingEpisodes( private bool RemoveObsoleteOrMissingEpisodes(
IEnumerable<BaseItem> allRecursiveChildren, IEnumerable<BaseItem> allRecursiveChildren,
IEnumerable<(int SeasonNumber, int EpisodeNumber, DateTime FirstAired)> episodeLookup, IEnumerable<(int seasonNumber, int episodeNumber, DateTime firstAired)> episodeLookup,
bool allowMissingEpisodes) bool allowMissingEpisodes)
{ {
var existingEpisodes = allRecursiveChildren.OfType<Episode>(); var existingEpisodes = allRecursiveChildren.OfType<Episode>();
@ -218,7 +218,7 @@ namespace MediaBrowser.Providers.TV
} }
// If the episode no longer exists in the remote lookup, delete it // If the episode no longer exists in the remote lookup, delete it
if (!episodeLookup.Any(e => e.SeasonNumber == seasonNumber && e.EpisodeNumber == episodeNumber)) if (!episodeLookup.Any(e => e.seasonNumber == seasonNumber && e.episodeNumber == episodeNumber))
{ {
return true; return true;
} }
@ -252,7 +252,7 @@ namespace MediaBrowser.Providers.TV
/// <param name="episodeLookup">The episode lookup.</param> /// <param name="episodeLookup">The episode lookup.</param>
/// <returns>Task{System.Boolean}.</returns> /// <returns>Task{System.Boolean}.</returns>
private bool RemoveObsoleteOrMissingSeasons(IList<BaseItem> allRecursiveChildren, private bool RemoveObsoleteOrMissingSeasons(IList<BaseItem> allRecursiveChildren,
IEnumerable<(int SeasonNumber, int EpisodeNumber, DateTime FirstAired)> episodeLookup) IEnumerable<(int seasonNumber, int episodeNumber, DateTime firstAired)> episodeLookup)
{ {
var existingSeasons = allRecursiveChildren.OfType<Season>().ToList(); var existingSeasons = allRecursiveChildren.OfType<Season>().ToList();
@ -286,7 +286,7 @@ namespace MediaBrowser.Providers.TV
} }
// If the season no longer exists in the remote lookup, delete it, but only if an existing episode doesn't require it // If the season no longer exists in the remote lookup, delete it, but only if an existing episode doesn't require it
return episodeLookup.All(e => e.SeasonNumber != seasonNumber) && allEpisodes.All(s => s.ParentIndexNumber != seasonNumber || s.IsInSeasonFolder); return episodeLookup.All(e => e.seasonNumber != seasonNumber) && allEpisodes.All(s => s.ParentIndexNumber != seasonNumber || s.IsInSeasonFolder);
} }
// Season does not have a number // Season does not have a number
@ -354,10 +354,10 @@ namespace MediaBrowser.Providers.TV
/// <param name="seasonCounts"></param> /// <param name="seasonCounts"></param>
/// <param name="episodeTuple"></param> /// <param name="episodeTuple"></param>
/// <returns>Episode.</returns> /// <returns>Episode.</returns>
private Episode GetExistingEpisode(IList<Episode> existingEpisodes, IReadOnlyDictionary<int, int> seasonCounts, (int SeasonNumber, int EpisodeNumber, DateTime FirstAired) episodeTuple) private Episode GetExistingEpisode(IList<Episode> existingEpisodes, IReadOnlyDictionary<int, int> seasonCounts, (int seasonNumber, int episodeNumber, DateTime firstAired) episodeTuple)
{ {
var seasonNumber = episodeTuple.SeasonNumber; var seasonNumber = episodeTuple.seasonNumber;
var episodeNumber = episodeTuple.EpisodeNumber; var episodeNumber = episodeTuple.episodeNumber;
while (true) while (true)
{ {

22
MediaBrowser.Providers/TV/TheTVDB/TvDbClientManager.cs
Unescape View File

@ -16,16 +16,16 @@ namespace MediaBrowser.Providers.TV.TheTVDB
{ {
private readonly SemaphoreSlim _cacheWriteLock = new SemaphoreSlim(1, 1); private readonly SemaphoreSlim _cacheWriteLock = new SemaphoreSlim(1, 1);
private readonly IMemoryCache _cache; private readonly IMemoryCache _cache;
private readonly TvDbClient tvDbClient; private readonly TvDbClient _tvDbClient;
private DateTime tokenCreatedAt; private DateTime _tokenCreatedAt;
private const string DefaultLanguage = "en"; private const string DefaultLanguage = "en";
public TvDbClientManager(IMemoryCache memoryCache) public TvDbClientManager(IMemoryCache memoryCache)
{ {
_cache = memoryCache; _cache = memoryCache;
tvDbClient = new TvDbClient(); _tvDbClient = new TvDbClient();
tvDbClient.Authentication.AuthenticateAsync(TvdbUtils.TvdbApiKey); _tvDbClient.Authentication.AuthenticateAsync(TvdbUtils.TvdbApiKey);
tokenCreatedAt = DateTime.Now; _tokenCreatedAt = DateTime.Now;
} }
public TvDbClient TvDbClient public TvDbClient TvDbClient
@ -33,21 +33,21 @@ namespace MediaBrowser.Providers.TV.TheTVDB
get get
{ {
// Refresh if necessary // Refresh if necessary
if (tokenCreatedAt > DateTime.Now.Subtract(TimeSpan.FromHours(20))) if (_tokenCreatedAt > DateTime.Now.Subtract(TimeSpan.FromHours(20)))
{ {
try try
{ {
tvDbClient.Authentication.RefreshTokenAsync(); _tvDbClient.Authentication.RefreshTokenAsync();
} }
catch catch
{ {
tvDbClient.Authentication.AuthenticateAsync(TvdbUtils.TvdbApiKey); _tvDbClient.Authentication.AuthenticateAsync(TvdbUtils.TvdbApiKey);
} }
tokenCreatedAt = DateTime.Now; _tokenCreatedAt = DateTime.Now;
} }
return tvDbClient; return _tvDbClient;
} }
} }
@ -197,7 +197,7 @@ namespace MediaBrowser.Providers.TV.TheTVDB
return cachedValue; return cachedValue;
} }
tvDbClient.AcceptedLanguage = TvdbUtils.NormalizeLanguage(language) ?? DefaultLanguage; _tvDbClient.AcceptedLanguage = TvdbUtils.NormalizeLanguage(language) ?? DefaultLanguage;
var result = await resultFactory.Invoke(); var result = await resultFactory.Invoke();
_cache.Set(key, result, TimeSpan.FromHours(1)); _cache.Set(key, result, TimeSpan.FromHours(1));
return result; return result;

5
MediaBrowser.Providers/TV/TheTVDB/TvdbSeasonImageProvider.cs
Unescape View File

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -19,8 +18,6 @@ namespace MediaBrowser.Providers.TV.TheTVDB
{ {
public class TvdbSeasonImageProvider : IRemoteImageProvider, IHasOrder public class TvdbSeasonImageProvider : IRemoteImageProvider, IHasOrder
{ {
private static readonly CultureInfo UsCulture = new CultureInfo("en-US");
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly TvDbClientManager _tvDbClientManager; private readonly TvDbClientManager _tvDbClientManager;
@ -66,7 +63,7 @@ namespace MediaBrowser.Providers.TV.TheTVDB
var language = item.GetPreferredMetadataLanguage(); var language = item.GetPreferredMetadataLanguage();
var remoteImages = new List<RemoteImageInfo>(); var remoteImages = new List<RemoteImageInfo>();
var keyTypes = new[] {KeyType.Season, KeyType.Seasonwide, KeyType.Fanart}; var keyTypes = new[] { KeyType.Season, KeyType.Seasonwide, KeyType.Fanart };
foreach (var keyType in keyTypes) foreach (var keyType in keyTypes)
{ {
var imageQuery = new ImagesQuery var imageQuery = new ImagesQuery

2
MediaBrowser.Providers/TV/TheTVDB/TvdbSeriesImageProvider.cs
Unescape View File

@ -57,7 +57,7 @@ namespace MediaBrowser.Providers.TV.TheTVDB
var language = item.GetPreferredMetadataLanguage(); var language = item.GetPreferredMetadataLanguage();
var remoteImages = new List<RemoteImageInfo>(); var remoteImages = new List<RemoteImageInfo>();
var keyTypes = new[] {KeyType.Poster, KeyType.Series, KeyType.Fanart}; var keyTypes = new[] { KeyType.Poster, KeyType.Series, KeyType.Fanart };
var tvdbId = Convert.ToInt32(item.GetProviderId(MetadataProviders.Tvdb)); var tvdbId = Convert.ToInt32(item.GetProviderId(MetadataProviders.Tvdb));
foreach (KeyType keyType in keyTypes) foreach (KeyType keyType in keyTypes)
{ {

Write Preview
Loading…
Cancel
Save