New: Include APFS disks in disk space

Closes #2261
pull/2334/head
Mark McDowall 7 years ago
parent 32309260b9
commit 0a690eb4d8
No known key found for this signature in database
GPG Key ID: D4CEFA9A718052E0

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@ -81,8 +81,8 @@ namespace NzbDrone.Mono.Disk
.Concat(GetDriveInfoMounts() .Concat(GetDriveInfoMounts()
.Select(d => new DriveInfoMount(d, FindDriveType.Find(d.DriveFormat))) .Select(d => new DriveInfoMount(d, FindDriveType.Find(d.DriveFormat)))
.Where(d => d.DriveType == DriveType.Fixed || .Where(d => d.DriveType == DriveType.Fixed ||
d.DriveType == DriveType.Network || d.DriveType == d.DriveType == DriveType.Network ||
DriveType.Removable)) d.DriveType == DriveType.Removable))
.DistinctBy(v => v.RootDirectory) .DistinctBy(v => v.RootDirectory)
.ToList(); .ToList();
} }

@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using NzbDrone.Common.Extensions; using NzbDrone.Common.Extensions;
@ -9,6 +9,7 @@ namespace NzbDrone.Mono.Disk
private static readonly Dictionary<string, DriveType> DriveTypeMap = new Dictionary<string, DriveType> private static readonly Dictionary<string, DriveType> DriveTypeMap = new Dictionary<string, DriveType>
{ {
{ "afpfs", DriveType.Network }, { "afpfs", DriveType.Network },
{ "apfs", DriveType.Fixed },
{ "zfs", DriveType.Fixed } { "zfs", DriveType.Fixed }
}; };

Loading…
Cancel
Save