mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Mono returning a drive with an empty path causing disk space check to fail

This commit is contained in:
Mark McDowall 2014-10-19 17:47:23 -07:00
parent 0ed0c5c5db
commit f776aae2c0
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/NzbDrone.Mono/DiskProvider.cs
View File

@ -3,6 +3,7 @@ using System.IO;
using System.Linq; using System.Linq;
using Mono.Unix.Native; using Mono.Unix.Native;
using NLog; using NLog;
using NzbDrone.Common;
using NzbDrone.Common.Disk; using NzbDrone.Common.Disk;
using NzbDrone.Common.EnsureThat; using NzbDrone.Common.EnsureThat;
using NzbDrone.Common.Instrumentation; using NzbDrone.Common.Instrumentation;
@ -34,9 +35,9 @@ namespace NzbDrone.Mono
return driveInfo.AvailableFreeSpace; return driveInfo.AvailableFreeSpace;
} }
catch (InvalidOperationException e) catch (InvalidOperationException ex)
{ {
Logger.ErrorException("Couldn't get free space for " + path, e); Logger.ErrorException("Couldn't get free space for " + path, ex);
} }
return null; return null;
@ -144,10 +145,11 @@ namespace NzbDrone.Mono
var drives = DriveInfo.GetDrives(); var drives = DriveInfo.GetDrives();
return return
drives.Where(drive => drives.Where(drive => drive.IsReady &&
drive.IsReady && path.StartsWith(drive.Name, StringComparison.CurrentCultureIgnoreCase)) drive.Name.IsNotNullOrWhiteSpace() &&
.OrderByDescending(drive => drive.Name.Length) path.StartsWith(drive.Name, StringComparison.CurrentCultureIgnoreCase))
.FirstOrDefault(); .OrderByDescending(drive => drive.Name.Length)
.FirstOrDefault();
} }
} }
} }