mirror of https://github.com/lidarr/Lidarr
New: Setting to disable disk scan after artist refresh
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
parent
74bd72a836
commit
78a0b5f8b7
|
@ -12,6 +12,17 @@ import FormLabel from 'Components/Form/FormLabel';
|
|||
import FormInputGroup from 'Components/Form/FormInputGroup';
|
||||
import NamingConnector from './Naming/NamingConnector';
|
||||
|
||||
const rescanAfterRefreshOptions = [
|
||||
{ key: 'always', value: 'Always' },
|
||||
{ key: 'afterManual', value: 'After Manual Refresh' },
|
||||
{ key: 'never', value: 'Never' }
|
||||
];
|
||||
|
||||
const fileDateOptions = [
|
||||
{ key: 'none', value: 'None' },
|
||||
{ key: 'albumReleaseDate', value: 'Album Release Date' }
|
||||
];
|
||||
|
||||
class MediaManagement extends Component {
|
||||
|
||||
//
|
||||
|
@ -30,11 +41,6 @@ class MediaManagement extends Component {
|
|||
...otherProps
|
||||
} = this.props;
|
||||
|
||||
const fileDateOptions = [
|
||||
{ key: 'none', value: 'None' },
|
||||
{ key: 'albumReleaseDate', value: 'Album Release Date' }
|
||||
];
|
||||
|
||||
return (
|
||||
<PageContent title="Media Management Settings">
|
||||
<SettingsToolbarConnector
|
||||
|
@ -219,6 +225,23 @@ class MediaManagement extends Component {
|
|||
/>
|
||||
</FormGroup>
|
||||
|
||||
<FormGroup
|
||||
advancedSettings={advancedSettings}
|
||||
isAdvanced={true}
|
||||
>
|
||||
<FormLabel>Rescan Artist Folder after Refresh</FormLabel>
|
||||
|
||||
<FormInputGroup
|
||||
type={inputTypes.SELECT}
|
||||
name="rescanAfterRefresh"
|
||||
helpText="Rescan the artist folder after refreshing the artist"
|
||||
helpTextWarning="Lidarr will not automatically detect changes to files when not set to 'Always'"
|
||||
values={rescanAfterRefreshOptions}
|
||||
onChange={onInputChange}
|
||||
{...settings.rescanAfterRefresh}
|
||||
/>
|
||||
</FormGroup>
|
||||
|
||||
<FormGroup
|
||||
advancedSettings={advancedSettings}
|
||||
isAdvanced={true}
|
||||
|
|
|
@ -12,6 +12,7 @@ namespace Lidarr.Api.V1.Config
|
|||
public bool CreateEmptyArtistFolders { get; set; }
|
||||
public bool DeleteEmptyFolders { get; set; }
|
||||
public FileDateType FileDate { get; set; }
|
||||
public RescanAfterRefreshType RescanAfterRefresh { get; set; }
|
||||
|
||||
public bool SetPermissionsLinux { get; set; }
|
||||
public string FileChmod { get; set; }
|
||||
|
@ -38,6 +39,7 @@ namespace Lidarr.Api.V1.Config
|
|||
CreateEmptyArtistFolders = model.CreateEmptyArtistFolders,
|
||||
DeleteEmptyFolders = model.DeleteEmptyFolders,
|
||||
FileDate = model.FileDate,
|
||||
RescanAfterRefresh = model.RescanAfterRefresh,
|
||||
|
||||
SetPermissionsLinux = model.SetPermissionsLinux,
|
||||
FileChmod = model.FileChmod,
|
||||
|
|
|
@ -216,6 +216,13 @@ namespace NzbDrone.Core.Configuration
|
|||
set { SetValue("ExtraFileExtensions", value); }
|
||||
}
|
||||
|
||||
public RescanAfterRefreshType RescanAfterRefresh
|
||||
{
|
||||
get { return GetValueEnum("RescanAfterRefresh", RescanAfterRefreshType.Always); }
|
||||
|
||||
set { SetValue("RescanAfterRefresh", value); }
|
||||
}
|
||||
|
||||
public bool SetPermissionsLinux
|
||||
{
|
||||
get { return GetValueBoolean("SetPermissionsLinux", false); }
|
||||
|
|
|
@ -33,6 +33,7 @@ namespace NzbDrone.Core.Configuration
|
|||
bool EnableMediaInfo { get; set; }
|
||||
bool ImportExtraFiles { get; set; }
|
||||
string ExtraFileExtensions { get; set; }
|
||||
RescanAfterRefreshType RescanAfterRefresh { get; set; }
|
||||
|
||||
//Permissions (Media Management)
|
||||
bool SetPermissionsLinux { get; set; }
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
namespace NzbDrone.Core.Configuration
|
||||
{
|
||||
public enum RescanAfterRefreshType
|
||||
{
|
||||
Always,
|
||||
AfterManual,
|
||||
Never
|
||||
}
|
||||
}
|
|
@ -30,7 +30,6 @@ namespace NzbDrone.Core.MediaFiles
|
|||
|
||||
public class DiskScanService :
|
||||
IDiskScanService,
|
||||
IHandle<ArtistUpdatedEvent>,
|
||||
IExecute<RescanArtistCommand>
|
||||
{
|
||||
private readonly IDiskProvider _diskProvider;
|
||||
|
@ -209,11 +208,6 @@ namespace NzbDrone.Core.MediaFiles
|
|||
}
|
||||
}
|
||||
|
||||
public void Handle(ArtistUpdatedEvent message)
|
||||
{
|
||||
Scan(message.Artist);
|
||||
}
|
||||
|
||||
public void Execute(RescanArtistCommand message)
|
||||
{
|
||||
if (message.ArtistId.HasValue)
|
||||
|
|
|
@ -18,12 +18,12 @@ namespace NzbDrone.Core.Music
|
|||
|
||||
public void Handle(ArtistAddedEvent message)
|
||||
{
|
||||
_commandQueueManager.Push(new RefreshArtistCommand(message.Artist.Id));
|
||||
_commandQueueManager.Push(new RefreshArtistCommand(message.Artist.Id, true));
|
||||
}
|
||||
|
||||
public void Handle(ArtistsImportedEvent message)
|
||||
{
|
||||
_commandQueueManager.PushMany(message.ArtistIds.Select(s => new RefreshArtistCommand(s)).ToList());
|
||||
_commandQueueManager.PushMany(message.ArtistIds.Select(s => new RefreshArtistCommand(s, true)).ToList());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,7 +19,7 @@ namespace NzbDrone.Core.Music
|
|||
// Refresh Artist is we change AlbumType Preferences
|
||||
if (message.Artist.LanguageProfileId != message.OldArtist.LanguageProfileId)
|
||||
{
|
||||
_commandQueueManager.Push(new RefreshArtistCommand(message.Artist.Id));
|
||||
_commandQueueManager.Push(new RefreshArtistCommand(message.Artist.Id, false));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,14 +5,16 @@ namespace NzbDrone.Core.Music.Commands
|
|||
public class RefreshArtistCommand : Command
|
||||
{
|
||||
public int? ArtistId { get; set; }
|
||||
public bool IsNewArtist { get; set; }
|
||||
|
||||
public RefreshArtistCommand()
|
||||
{
|
||||
}
|
||||
|
||||
public RefreshArtistCommand(int? artistId)
|
||||
public RefreshArtistCommand(int? artistId, bool isNewArtist = false)
|
||||
{
|
||||
ArtistId = artistId;
|
||||
IsNewArtist = isNewArtist;
|
||||
}
|
||||
|
||||
public override bool SendUpdatesToClient => true;
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
using NLog;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Configuration;
|
||||
using NzbDrone.Common.Instrumentation.Extensions;
|
||||
using NzbDrone.Core.Exceptions;
|
||||
using NzbDrone.Core.MediaFiles;
|
||||
|
@ -27,6 +28,7 @@ namespace NzbDrone.Core.Music
|
|||
private readonly IEventAggregator _eventAggregator;
|
||||
private readonly IDiskScanService _diskScanService;
|
||||
private readonly ICheckIfArtistShouldBeRefreshed _checkIfArtistShouldBeRefreshed;
|
||||
private readonly IConfigService _configService;
|
||||
private readonly Logger _logger;
|
||||
|
||||
public RefreshArtistService(IProvideArtistInfo artistInfo,
|
||||
|
@ -38,6 +40,7 @@ namespace NzbDrone.Core.Music
|
|||
IEventAggregator eventAggregator,
|
||||
IDiskScanService diskScanService,
|
||||
ICheckIfArtistShouldBeRefreshed checkIfArtistShouldBeRefreshed,
|
||||
IConfigService configService,
|
||||
Logger logger)
|
||||
{
|
||||
_artistInfo = artistInfo;
|
||||
|
@ -49,6 +52,7 @@ namespace NzbDrone.Core.Music
|
|||
_eventAggregator = eventAggregator;
|
||||
_diskScanService = diskScanService;
|
||||
_checkIfArtistShouldBeRefreshed = checkIfArtistShouldBeRefreshed;
|
||||
_configService = configService;
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
|
@ -153,8 +157,34 @@ namespace NzbDrone.Core.Music
|
|||
return albumsToUpdate;
|
||||
}
|
||||
|
||||
private void RescanArtist(Artist artist)
|
||||
private void RescanArtist(Artist artist, bool isNew, CommandTrigger trigger)
|
||||
{
|
||||
var rescanAfterRefresh = _configService.RescanAfterRefresh;
|
||||
var shouldRescan = true;
|
||||
|
||||
if (isNew)
|
||||
{
|
||||
_logger.Trace("Forcing refresh of {0}. Reason: New artist", artist);
|
||||
shouldRescan = true;
|
||||
}
|
||||
|
||||
else if (rescanAfterRefresh == RescanAfterRefreshType.Never)
|
||||
{
|
||||
_logger.Trace("Skipping refresh of {0}. Reason: never recan after refresh", artist);
|
||||
shouldRescan = false;
|
||||
}
|
||||
|
||||
else if (rescanAfterRefresh == RescanAfterRefreshType.AfterManual && trigger != CommandTrigger.Manual)
|
||||
{
|
||||
_logger.Trace("Skipping refresh of {0}. Reason: not after automatic scans", artist);
|
||||
shouldRescan = false;
|
||||
}
|
||||
|
||||
if (!shouldRescan)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
_diskScanService.Scan(artist);
|
||||
|
@ -167,7 +197,9 @@ namespace NzbDrone.Core.Music
|
|||
|
||||
public void Execute(RefreshArtistCommand message)
|
||||
{
|
||||
_eventAggregator.PublishEvent(new ArtistRefreshStartingEvent(message.Trigger == CommandTrigger.Manual));
|
||||
var trigger = message.Trigger;
|
||||
var isNew = message.IsNewArtist;
|
||||
_eventAggregator.PublishEvent(new ArtistRefreshStartingEvent(trigger == CommandTrigger.Manual));
|
||||
|
||||
if (message.ArtistId.HasValue)
|
||||
{
|
||||
|
@ -176,11 +208,12 @@ namespace NzbDrone.Core.Music
|
|||
try
|
||||
{
|
||||
RefreshArtistInfo(artist, true);
|
||||
RescanArtist(artist, isNew, trigger);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_logger.Error(e, "Couldn't refresh info for {0}", artist);
|
||||
RescanArtist(artist);
|
||||
RescanArtist(artist, isNew, trigger);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
@ -191,6 +224,7 @@ namespace NzbDrone.Core.Music
|
|||
foreach (var artist in allArtists)
|
||||
{
|
||||
var manualTrigger = message.Trigger == CommandTrigger.Manual;
|
||||
|
||||
if (manualTrigger || _checkIfArtistShouldBeRefreshed.ShouldRefresh(artist))
|
||||
{
|
||||
try
|
||||
|
@ -200,14 +234,15 @@ namespace NzbDrone.Core.Music
|
|||
catch (Exception e)
|
||||
{
|
||||
_logger.Error(e, "Couldn't refresh info for {0}", artist);
|
||||
RescanArtist(artist);
|
||||
}
|
||||
|
||||
RescanArtist(artist, false, trigger);
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
_logger.Info("Skipping refresh of artist: {0}", artist.Name);
|
||||
RescanArtist(artist);
|
||||
RescanArtist(artist, false, trigger);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -142,6 +142,7 @@
|
|||
<Compile Include="Configuration\Events\ConfigSavedEvent.cs" />
|
||||
<Compile Include="Configuration\IConfigService.cs" />
|
||||
<Compile Include="Configuration\InvalidConfigFileException.cs" />
|
||||
<Compile Include="Configuration\RescanAfterRefreshType.cs" />
|
||||
<Compile Include="Configuration\ResetApiKeyCommand.cs" />
|
||||
<Compile Include="CustomFilters\CustomFilter.cs" />
|
||||
<Compile Include="CustomFilters\CustomFilterRepository.cs" />
|
||||
|
|
Loading…
Reference in New Issue