github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-15 01:23:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: Additional information when Lidarr is unable to access a path during import

Browse source 
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2019-09-10 22:07:41 -04:00
parent c872f47d92
commit 3fff67a75d
1 changed files with 31 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/NzbDrone.Core/MediaFiles/DownloadedTracksImportService.cs
View file

@ -5,6 +5,7 @@ using System.IO.Abstractions;
using System.Linq; using System.Linq;
using NLog; using NLog;
using NzbDrone.Common.Disk; using NzbDrone.Common.Disk;
using NzbDrone.Common.EnvironmentInfo;
using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.DecisionEngine;
using NzbDrone.Core.Download; using NzbDrone.Core.Download;
using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.MediaFiles.Events;
@ -32,6 +33,7 @@ namespace NzbDrone.Core.MediaFiles
private readonly IMakeImportDecision _importDecisionMaker; private readonly IMakeImportDecision _importDecisionMaker;
private readonly IImportApprovedTracks _importApprovedTracks; private readonly IImportApprovedTracks _importApprovedTracks;
private readonly IEventAggregator _eventAggregator; private readonly IEventAggregator _eventAggregator;
private readonly IRuntimeInfo _runtimeInfo;
private readonly Logger _logger; private readonly Logger _logger;
public DownloadedTracksImportService(IDiskProvider diskProvider, public DownloadedTracksImportService(IDiskProvider diskProvider,
@ -41,6 +43,7 @@ namespace NzbDrone.Core.MediaFiles
IMakeImportDecision importDecisionMaker, IMakeImportDecision importDecisionMaker,
IImportApprovedTracks importApprovedTracks, IImportApprovedTracks importApprovedTracks,
IEventAggregator eventAggregator, IEventAggregator eventAggregator,
IRuntimeInfo runtimeInfo,
Logger logger) Logger logger)
{ {
_diskProvider = diskProvider; _diskProvider = diskProvider;
@ -50,6 +53,7 @@ namespace NzbDrone.Core.MediaFiles
_importDecisionMaker = importDecisionMaker; _importDecisionMaker = importDecisionMaker;
_importApprovedTracks = importApprovedTracks; _importApprovedTracks = importApprovedTracks;
_eventAggregator = eventAggregator; _eventAggregator = eventAggregator;
_runtimeInfo = runtimeInfo;
_logger = logger; _logger = logger;
} }
@ -98,7 +102,7 @@ namespace NzbDrone.Core.MediaFiles
return ProcessFile(fileInfo, importMode, artist, downloadClientItem); return ProcessFile(fileInfo, importMode, artist, downloadClientItem);
} }
_logger.Error("Import failed, path does not exist or is not accessible by Lidarr: {0}", path); LogInaccessiblePathError(path);
_eventAggregator.PublishEvent(new TrackImportFailedEvent(null, null, true, downloadClientItem)); _eventAggregator.PublishEvent(new TrackImportFailedEvent(null, null, true, downloadClientItem));
return new List<ImportResult>(); return new List<ImportResult>();
@ -280,5 +284,31 @@ namespace NzbDrone.Core.MediaFiles
return new ImportResult(new ImportDecision<LocalTrack>(localTrack, new Rejection("Unknown Artist")), message); return new ImportResult(new ImportDecision<LocalTrack>(localTrack, new Rejection("Unknown Artist")), message);
} }
private void LogInaccessiblePathError(string path)
{
if (_runtimeInfo.IsWindowsService)
{
var mounts = _diskProvider.GetMounts();
var mount = mounts.FirstOrDefault(m => m.RootDirectory == Path.GetPathRoot(path));
if (mount.DriveType == DriveType.Network)
{
_logger.Error("Import failed, path does not exist or is not accessible by Lidarr: {0}. It's recommended to avoid mapped network drives when running as a Windows service. See the FAQ for more info", path);
return;
}
}
if (OsInfo.IsWindows)
{
if (path.StartsWith(@"\\"))
{
_logger.Error("Import failed, path does not exist or is not accessible by Lidarr: {0}. Ensure the user running Lidarr has access to the network share", path);
return;
}
}
_logger.Error("Import failed, path does not exist or is not accessible by Lidarr: {0}. Ensure the path exists and the user running Lidarr has the correct permissions to access this file/folder", path);
}
} }
} }