mirror of https://github.com/lidarr/Lidarr
Fixed: Getting root folders with invalid paths
This commit is contained in:
parent
55383502ca
commit
1dec725941
|
@ -29,6 +29,7 @@ namespace NzbDrone.Core.RootFolders
|
||||||
private readonly IDiskProvider _diskProvider;
|
private readonly IDiskProvider _diskProvider;
|
||||||
private readonly ISeriesRepository _seriesRepository;
|
private readonly ISeriesRepository _seriesRepository;
|
||||||
private readonly IConfigService _configService;
|
private readonly IConfigService _configService;
|
||||||
|
private readonly Logger _logger;
|
||||||
|
|
||||||
private static readonly HashSet<string> SpecialFolders = new HashSet<string> { "$recycle.bin", "system volume information", "recycler", "lost+found" };
|
private static readonly HashSet<string> SpecialFolders = new HashSet<string> { "$recycle.bin", "system volume information", "recycler", "lost+found" };
|
||||||
|
|
||||||
|
@ -36,12 +37,14 @@ namespace NzbDrone.Core.RootFolders
|
||||||
public RootFolderService(IRootFolderRepository rootFolderRepository,
|
public RootFolderService(IRootFolderRepository rootFolderRepository,
|
||||||
IDiskProvider diskProvider,
|
IDiskProvider diskProvider,
|
||||||
ISeriesRepository seriesRepository,
|
ISeriesRepository seriesRepository,
|
||||||
IConfigService configService)
|
IConfigService configService,
|
||||||
|
Logger logger)
|
||||||
{
|
{
|
||||||
_rootFolderRepository = rootFolderRepository;
|
_rootFolderRepository = rootFolderRepository;
|
||||||
_diskProvider = diskProvider;
|
_diskProvider = diskProvider;
|
||||||
_seriesRepository = seriesRepository;
|
_seriesRepository = seriesRepository;
|
||||||
_configService = configService;
|
_configService = configService;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<RootFolder> All()
|
public List<RootFolder> All()
|
||||||
|
@ -57,7 +60,7 @@ namespace NzbDrone.Core.RootFolders
|
||||||
|
|
||||||
rootFolders.ForEach(folder =>
|
rootFolders.ForEach(folder =>
|
||||||
{
|
{
|
||||||
if (_diskProvider.FolderExists(folder.Path))
|
if (folder.Path.IsPathValid() && _diskProvider.FolderExists(folder.Path))
|
||||||
{
|
{
|
||||||
folder.FreeSpace = _diskProvider.GetAvailableSpace(folder.Path);
|
folder.FreeSpace = _diskProvider.GetAvailableSpace(folder.Path);
|
||||||
folder.UnmappedFolders = GetUnmappedFolders(folder.Path);
|
folder.UnmappedFolders = GetUnmappedFolders(folder.Path);
|
||||||
|
|
Loading…
Reference in New Issue