github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 04:59:35 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Revert "Fixed: Prevent false notification for moving artist when editing"

Browse source 
This reverts commit 0133f4331b.
This commit is contained in:
Bogdan 2023-12-03 22:16:43 +02:00
commit 0655a9aa72
5 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Lidarr.Api.V1/Artist/ArtistController.cs
View file

@ -167,19 +167,17 @@ namespace Lidarr.Api.V1.Artist
{ {
var artist = _artistService.GetArtist(artistResource.Id); var artist = _artistService.GetArtist(artistResource.Id);
if (moveFiles) var sourcePath = artist.Path;
{ var destinationPath = artistResource.Path;
var sourcePath = artist.Path;
var destinationPath = artistResource.Path;
_commandQueueManager.Push(new MoveArtistCommand _commandQueueManager.Push(new MoveArtistCommand
{ {
ArtistId = artist.Id, ArtistId = artist.Id,
SourcePath = sourcePath, SourcePath = sourcePath,
DestinationPath = destinationPath, DestinationPath = destinationPath,
Trigger = CommandTrigger.Manual MoveFiles = moveFiles,
}); Trigger = CommandTrigger.Manual
} });
var model = artistResource.ToModel(artist); var model = artistResource.ToModel(artist);

5
src/Lidarr.Api.V1/Artist/ArtistEditorController.cs
View file

@ -79,12 +79,13 @@ namespace Lidarr.Api.V1.Artist
} }
} }
if (resource.MoveFiles && artistToMove.Any()) if (artistToMove.Any())
{ {
_commandQueueManager.Push(new BulkMoveArtistCommand _commandQueueManager.Push(new BulkMoveArtistCommand
{ {
DestinationRootFolder = resource.RootFolderPath, DestinationRootFolder = resource.RootFolderPath,
Artist = artistToMove Artist = artistToMove,
MoveFiles = resource.MoveFiles
}); });
} }

1
src/NzbDrone.Core/Music/Commands/BulkMoveArtistCommand.cs
View file

@ -8,6 +8,7 @@ namespace NzbDrone.Core.Music.Commands
{ {
public List<BulkMoveArtist> Artist { get; set; } public List<BulkMoveArtist> Artist { get; set; }
public string DestinationRootFolder { get; set; } public string DestinationRootFolder { get; set; }
public bool MoveFiles { get; set; }
public override bool SendUpdatesToClient => true; public override bool SendUpdatesToClient => true;
public override bool RequiresDiskAccess => true; public override bool RequiresDiskAccess => true;

1
src/NzbDrone.Core/Music/Commands/MoveArtistCommand.cs
View file

@ -7,6 +7,7 @@ namespace NzbDrone.Core.Music.Commands
public int ArtistId { get; set; } public int ArtistId { get; set; }
public string SourcePath { get; set; } public string SourcePath { get; set; }
public string DestinationPath { get; set; } public string DestinationPath { get; set; }
public bool MoveFiles { get; set; }
public override bool SendUpdatesToClient => true; public override bool SendUpdatesToClient => true;
public override bool RequiresDiskAccess => true; public override bool RequiresDiskAccess => true;

21
src/NzbDrone.Core/Music/Services/MoveArtistService.cs
View file

@ -38,7 +38,7 @@ namespace NzbDrone.Core.Music
_logger = logger; _logger = logger;
} }
private void MoveSingleArtist(Artist artist, string sourcePath, string destinationPath, int? index = null, int? total = null) private void MoveSingleArtist(Artist artist, string sourcePath, string destinationPath, bool moveFiles, int? index = null, int? total = null)
{ {
if (!_diskProvider.FolderExists(sourcePath)) if (!_diskProvider.FolderExists(sourcePath))
{ {
@ -57,14 +57,17 @@ namespace NzbDrone.Core.Music
try try
{ {
_rootFolderWatchingService.ReportFileSystemChangeBeginning(sourcePath, destinationPath); if (moveFiles)
{
_rootFolderWatchingService.ReportFileSystemChangeBeginning(sourcePath, destinationPath);
// Ensure the parent of the artist folder exists, this will often just be the root folder, but // Ensure the parent of the artist folder exists, this will often just be the root folder, but
// in cases where people are using subfolders for first letter (etc) it may not yet exist. // in cases where people are using subfolders for first letter (etc) it may not yet exist.
_diskProvider.CreateFolder(new DirectoryInfo(destinationPath).Parent.FullName); _diskProvider.CreateFolder(new DirectoryInfo(destinationPath).Parent.FullName);
_diskTransferService.TransferFolder(sourcePath, destinationPath, TransferMode.Move); _diskTransferService.TransferFolder(sourcePath, destinationPath, TransferMode.Move);
_logger.ProgressInfo("{0} moved successfully to {1}", artist.Name, destinationPath); _logger.ProgressInfo("{0} moved successfully to {1}", artist.Name, destinationPath);
}
_eventAggregator.PublishEvent(new ArtistMovedEvent(artist, sourcePath, destinationPath)); _eventAggregator.PublishEvent(new ArtistMovedEvent(artist, sourcePath, destinationPath));
} }
@ -88,7 +91,7 @@ namespace NzbDrone.Core.Music
{ {
var artist = _artistService.GetArtist(message.ArtistId); var artist = _artistService.GetArtist(message.ArtistId);
MoveSingleArtist(artist, message.SourcePath, message.DestinationPath); MoveSingleArtist(artist, message.SourcePath, message.DestinationPath, message.MoveFiles);
} }
public void Execute(BulkMoveArtistCommand message) public void Execute(BulkMoveArtistCommand message)
@ -104,7 +107,7 @@ namespace NzbDrone.Core.Music
var artist = _artistService.GetArtist(s.ArtistId); var artist = _artistService.GetArtist(s.ArtistId);
var destinationPath = Path.Combine(destinationRootFolder, _filenameBuilder.GetArtistFolder(artist)); var destinationPath = Path.Combine(destinationRootFolder, _filenameBuilder.GetArtistFolder(artist));
MoveSingleArtist(artist, s.SourcePath, destinationPath, index, artistToMove.Count); MoveSingleArtist(artist, s.SourcePath, destinationPath, message.MoveFiles, index, artistToMove.Count);
} }
_logger.ProgressInfo("Finished moving {0} artist to '{1}'", artistToMove.Count, destinationRootFolder); _logger.ProgressInfo("Finished moving {0} artist to '{1}'", artistToMove.Count, destinationRootFolder);