Fixed: Root Folder display when free diskspace cannot be determined (FreeBSD)

closes #3275
This commit is contained in:
Taloth Saldono 2019-08-27 23:48:34 +02:00 committed by Qstick
parent f2200f793d
commit 40736336db
5 changed files with 8 additions and 2 deletions

View File

@ -59,6 +59,7 @@ function RootFolders(props) {
key={rootFolder.id}
id={rootFolder.id}
path={rootFolder.path}
accessible={rootFolder.accessible}
freeSpace={rootFolder.freeSpace}
unmappedFolders={rootFolder.unmappedFolders}
/>

View File

@ -52,6 +52,7 @@ namespace NzbDrone.Core.Datastore
Mapper.Entity<Config>().RegisterModel("Config");
Mapper.Entity<RootFolder>().RegisterModel("RootFolders")
.Ignore(r => r.Accessible)
.Ignore(r => r.FreeSpace)
.Ignore(r => r.TotalSpace);

View File

@ -8,6 +8,7 @@ namespace NzbDrone.Core.RootFolders
{
public string Path { get; set; }
public bool Accessible { get; set; }
public long? FreeSpace { get; set; }
public long? TotalSpace { get; set; }

View File

@ -191,12 +191,12 @@ namespace NzbDrone.Core.RootFolders
{
if (_diskProvider.FolderExists(rootFolder.Path))
{
rootFolder.Accessible = true;
rootFolder.FreeSpace = _diskProvider.GetAvailableSpace(rootFolder.Path);
rootFolder.TotalSpace = _diskProvider.GetTotalSize(rootFolder.Path);
rootFolder.UnmappedFolders = GetUnmappedFolders(rootFolder.Path);
}
})
.Wait(5000);
}).Wait(5000);
}
}
}

View File

@ -9,6 +9,7 @@ namespace Radarr.Api.V2.RootFolders
public class RootFolderResource : RestResource
{
public string Path { get; set; }
public bool Accessible { get; set; }
public long? FreeSpace { get; set; }
public List<UnmappedFolder> UnmappedFolders { get; set; }
@ -25,6 +26,7 @@ namespace Radarr.Api.V2.RootFolders
Id = model.Id,
Path = model.Path.GetCleanPath(),
Accessible = model.Accessible,
FreeSpace = model.FreeSpace,
UnmappedFolders = model.UnmappedFolders
};
@ -39,6 +41,7 @@ namespace Radarr.Api.V2.RootFolders
Id = resource.Id,
Path = resource.Path
//Accessible
//FreeSpace
//UnmappedFolders
};