tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-23 22:25:09 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: File browser ordering and volume name

Browse Source
This commit is contained in:
Mark McDowall
2014-12-20 13:24:29 -08:00
parent d3a35108df
commit 6878804705
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Common/Disk/FileSystemLookupService.cs
+15 -3
View File
@@ -103,12 +103,12 @@ namespace NzbDrone.Common.Disk
private List<FileSystemModel> GetDrives()
{
return _diskProvider.GetFixedDrives()
return _diskProvider.GetDrives()
.Select(d => new FileSystemModel
{
Type = FileSystemEntityType.Drive,
Name = d,
Path = d,
Name = GetVolumeName(d),
Path = d.Name,
LastModified = null
})
.ToList();
@@ -117,6 +117,7 @@ namespace NzbDrone.Common.Disk
private List<FileSystemModel> GetDirectories(string path)
{
var directories = _diskProvider.GetDirectoryInfos(path)
.OrderBy(d => d.Name)
.Select(d => new FileSystemModel
{
Name = d.Name,
@@ -134,6 +135,7 @@ namespace NzbDrone.Common.Disk
private List<FileSystemModel> GetFiles(string path)
{
return _diskProvider.GetFileInfos(path)
.OrderBy(d => d.Name)
.Select(d => new FileSystemModel
{
Name = d.Name,
@@ -155,6 +157,16 @@ namespace NzbDrone.Common.Disk
return path;
}
private string GetVolumeName(DriveInfo driveInfo)
{
if (driveInfo.VolumeLabel.IsNullOrWhiteSpace())
{
return driveInfo.Name;
}
return String.Format("{0} ({1})", driveInfo.Name, driveInfo.VolumeLabel);
}
private string GetParent(string path)
{