Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Closes #1106
This commit is contained in:
Mark McDowall 2019-05-08 22:56:30 -07:00
parent 0c2331f638
commit 6ea7e785e3
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/NzbDrone.Core/MediaFiles/DownloadedEpisodesImportService.cs
View File

@ -4,6 +4,7 @@ using System.IO;
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.EpisodeImport; using NzbDrone.Core.MediaFiles.EpisodeImport;
@ -29,6 +30,7 @@ namespace NzbDrone.Core.MediaFiles
private readonly IMakeImportDecision _importDecisionMaker; private readonly IMakeImportDecision _importDecisionMaker;
private readonly IImportApprovedEpisodes _importApprovedEpisodes; private readonly IImportApprovedEpisodes _importApprovedEpisodes;
private readonly IDetectSample _detectSample; private readonly IDetectSample _detectSample;
private readonly IRuntimeInfo _runtimeInfo;
private readonly Logger _logger; private readonly Logger _logger;
public DownloadedEpisodesImportService(IDiskProvider diskProvider, public DownloadedEpisodesImportService(IDiskProvider diskProvider,
@ -38,6 +40,7 @@ namespace NzbDrone.Core.MediaFiles
IMakeImportDecision importDecisionMaker, IMakeImportDecision importDecisionMaker,
IImportApprovedEpisodes importApprovedEpisodes, IImportApprovedEpisodes importApprovedEpisodes,
IDetectSample detectSample, IDetectSample detectSample,
IRuntimeInfo runtimeInfo,
Logger logger) Logger logger)
{ {
_diskProvider = diskProvider; _diskProvider = diskProvider;
@ -47,6 +50,7 @@ namespace NzbDrone.Core.MediaFiles
_importDecisionMaker = importDecisionMaker; _importDecisionMaker = importDecisionMaker;
_importApprovedEpisodes = importApprovedEpisodes; _importApprovedEpisodes = importApprovedEpisodes;
_detectSample = detectSample; _detectSample = detectSample;
_runtimeInfo = runtimeInfo;
_logger = logger; _logger = logger;
} }
@ -95,7 +99,7 @@ namespace NzbDrone.Core.MediaFiles
return ProcessFile(fileInfo, importMode, series, downloadClientItem); return ProcessFile(fileInfo, importMode, series, downloadClientItem);
} }
_logger.Error("Import failed, path does not exist or is not accessible by Sonarr: {0}", path); LogInaccessiblePathError(path);
return new List<ImportResult>(); return new List<ImportResult>();
} }
@ -257,5 +261,31 @@ namespace NzbDrone.Core.MediaFiles
return new ImportResult(new ImportDecision(localEpisode, new Rejection("Unknown Series")), message); return new ImportResult(new ImportDecision(localEpisode, new Rejection("Unknown Series")), 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 Sonarr: {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 Sonarr: {0}. Ensure the user running Sonarr has access to the network share", path);
return;
}
}
_logger.Error("Import failed, path does not exist or is not accessible by Sonarr: {0}. Ensure the path exists and the user running Sonarr has the correct permissions to access this file/folder", path);
}
} }
} }