From 4588bc4a7e9809cfa735068128020a6e19588a6d Mon Sep 17 00:00:00 2001
From: Bogdan <mynameisbogdan@users.noreply.github.com>
Date: Thu, 3 Oct 2024 14:47:13 +0300
Subject: [PATCH] Fixed: Manual importing to nested artist folders

---
 .../MediaFiles/TrackFileMovingService.cs         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs
index fe48b4d6d..68bc6c21d 100644
--- a/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs
+++ b/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs
@@ -4,6 +4,7 @@ using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
 using NzbDrone.Common.EnsureThat;
+using NzbDrone.Common.Extensions;
 using NzbDrone.Core.Configuration;
 using NzbDrone.Core.MediaFiles.Events;
 using NzbDrone.Core.MediaFiles.TrackImport;
@@ -11,6 +12,7 @@ using NzbDrone.Core.Messaging.Events;
 using NzbDrone.Core.Music;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Parser.Model;
+using NzbDrone.Core.RootFolders;
 
 namespace NzbDrone.Core.MediaFiles
 {
@@ -31,6 +33,7 @@ namespace NzbDrone.Core.MediaFiles
         private readonly IDiskProvider _diskProvider;
         private readonly IRootFolderWatchingService _rootFolderWatchingService;
         private readonly IMediaFileAttributeService _mediaFileAttributeService;
+        private readonly IRootFolderService _rootFolderService;
         private readonly IEventAggregator _eventAggregator;
         private readonly IConfigService _configService;
         private readonly Logger _logger;
@@ -43,6 +46,7 @@ namespace NzbDrone.Core.MediaFiles
                                       IDiskProvider diskProvider,
                                       IRootFolderWatchingService rootFolderWatchingService,
                                       IMediaFileAttributeService mediaFileAttributeService,
+                                      IRootFolderService rootFolderService,
                                       IEventAggregator eventAggregator,
                                       IConfigService configService,
                                       Logger logger)
@@ -55,6 +59,7 @@ namespace NzbDrone.Core.MediaFiles
             _diskProvider = diskProvider;
             _rootFolderWatchingService = rootFolderWatchingService;
             _mediaFileAttributeService = mediaFileAttributeService;
+            _rootFolderService = rootFolderService;
             _eventAggregator = eventAggregator;
             _configService = configService;
             _logger = logger;
@@ -148,11 +153,16 @@ namespace NzbDrone.Core.MediaFiles
         {
             var trackFolder = Path.GetDirectoryName(filePath);
             var artistFolder = artist.Path;
-            var rootFolder = new OsPath(artistFolder).Directory.FullPath;
+            var rootFolder = _rootFolderService.GetBestRootFolder(artistFolder);
 
-            if (!_diskProvider.FolderExists(rootFolder))
+            if (rootFolder == null || rootFolder.Path.IsNullOrWhiteSpace())
             {
-                throw new RootFolderNotFoundException(string.Format("Root folder '{0}' was not found.", rootFolder));
+                throw new RootFolderNotFoundException($"Root folder was not found, '{artistFolder}' is not a subdirectory of a defined root folder.");
+            }
+
+            if (!_diskProvider.FolderExists(rootFolder.Path))
+            {
+                throw new RootFolderNotFoundException($"Root folder '{rootFolder.Path}' was not found.");
             }
 
             var changed = false;