Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-05 02:22:31 +01:00
Code Issues Releases Wiki Activity

Added: Include APFS disks in disk space calculation.

Browse Source
This commit is contained in:
Leonardo Galli 2017-12-12 22:46:00 +01:00
parent f36716135b
commit 948af901da
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/NzbDrone.Mono/Disk/DiskProvider.cs
View File

@ -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;
@ -116,21 +116,14 @@ public override void SetPermissions(string path, string mask, string user, strin
public override List<IMount> GetMounts() public override List<IMount> GetMounts()
{ {
var mounts = GetDriveInfoMounts().Select(d => new DriveInfoMount(d, FindDriveType.Find(d.DriveFormat))) return _procMountProvider.GetMounts()
.Where(d => d.DriveType == DriveType.Fixed || d.DriveType == DriveType.Network || d.DriveType == DriveType.Removable); .Concat(GetDriveInfoMounts()
.Select(d => new DriveInfoMount(d, FindDriveType.Find(d.DriveFormat)))
.Where(d => d.DriveType == DriveType.Fixed ||
d.DriveType == DriveType.Network ||
var procMounts = _procMountProvider.GetMounts(); d.DriveType == DriveType.Removable))
.DistinctBy(v => v.RootDirectory)
if (procMounts != null) .ToList();
{
return mounts.Concat(procMounts).DistinctBy(v => v.RootDirectory)
.ToList();
}
return mounts.Cast<IMount>().DistinctBy(v => v.RootDirectory)
.ToList();
} }
public override long? GetTotalSize(string path) public override long? GetTotalSize(string path)

3
src/NzbDrone.Mono/Disk/FindDriveType.cs
View File

@ -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 @@ public static class FindDriveType
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 }
}; };