Fixed: Refresh scene naming exceptions on series add to help first-use scenario

This commit is contained in:
Taloth Saldono 2021-02-20 19:59:11 +01:00
parent 23047623ee
commit e289c428c6
1 changed files with 24 additions and 3 deletions

View File

@ -1,14 +1,14 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using NLog; using NLog;
using NzbDrone.Common.Cache; using NzbDrone.Common.Cache;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Commands;
using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Messaging.Events;
using NzbDrone.Core.Parser; using NzbDrone.Core.Parser;
using System.Collections.Generic;
using NzbDrone.Core.Tv.Events; using NzbDrone.Core.Tv.Events;
using System.Text.RegularExpressions;
namespace NzbDrone.Core.DataAugmentation.Scene namespace NzbDrone.Core.DataAugmentation.Scene
{ {
@ -23,6 +23,8 @@ namespace NzbDrone.Core.DataAugmentation.Scene
public class SceneMappingService : ISceneMappingService, public class SceneMappingService : ISceneMappingService,
IHandle<SeriesRefreshStartingEvent>, IHandle<SeriesRefreshStartingEvent>,
IHandle<SeriesAddedEvent>,
IHandle<SeriesImportedEvent>,
IExecute<UpdateSceneMappingCommand> IExecute<UpdateSceneMappingCommand>
{ {
private readonly ISceneMappingRepository _repository; private readonly ISceneMappingRepository _repository;
@ -31,6 +33,7 @@ namespace NzbDrone.Core.DataAugmentation.Scene
private readonly Logger _logger; private readonly Logger _logger;
private readonly ICachedDictionary<List<SceneMapping>> _getTvdbIdCache; private readonly ICachedDictionary<List<SceneMapping>> _getTvdbIdCache;
private readonly ICachedDictionary<List<SceneMapping>> _findByTvdbIdCache; private readonly ICachedDictionary<List<SceneMapping>> _findByTvdbIdCache;
private bool _updatedAfterStartup;
public SceneMappingService(ISceneMappingRepository repository, public SceneMappingService(ISceneMappingRepository repository,
ICacheManager cacheManager, ICacheManager cacheManager,
@ -124,6 +127,8 @@ namespace NzbDrone.Core.DataAugmentation.Scene
{ {
_logger.Info("Updating Scene mappings"); _logger.Info("Updating Scene mappings");
_updatedAfterStartup = true;
foreach (var sceneMappingProvider in _sceneMappingProviders) foreach (var sceneMappingProvider in _sceneMappingProviders)
{ {
try try
@ -268,7 +273,23 @@ namespace NzbDrone.Core.DataAugmentation.Scene
public void Handle(SeriesRefreshStartingEvent message) public void Handle(SeriesRefreshStartingEvent message)
{ {
if (message.ManualTrigger && _findByTvdbIdCache.IsExpired(TimeSpan.FromMinutes(1))) if (message.ManualTrigger && (_findByTvdbIdCache.IsExpired(TimeSpan.FromMinutes(1)) || !_updatedAfterStartup))
{
UpdateMappings();
}
}
public void Handle(SeriesAddedEvent message)
{
if (!_updatedAfterStartup)
{
UpdateMappings();
}
}
public void Handle(SeriesImportedEvent message)
{
if (!_updatedAfterStartup)
{ {
UpdateMappings(); UpdateMappings();
} }