github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-14 18:57:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Directory lookup will not include some folders at base of drive

Browse source
This commit is contained in:
Mark McDowall 2013-08-02 20:01:16 -07:00
commit 1c5e30bbd0
8 changed files with 202 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

33
NzbDrone.Api/Directories/DirectoryModule.cs
View file

@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using Nancy;
using NzbDrone.Api.Extensions;
using NzbDrone.Common;
@ -8,12 +10,12 @@ namespace NzbDrone.Api.Directories
{
public class DirectoryModule : NzbDroneApiModule
{
private readonly IDiskProvider _diskProvider;
private readonly IDirectoryLookupService _directoryLookupService;
public DirectoryModule(IDiskProvider diskProvider)
public DirectoryModule(IDirectoryLookupService directoryLookupService)
: base("/directories")
{
_diskProvider = diskProvider;
_directoryLookupService = directoryLookupService;
Get["/"] = x => GetDirectories();
}
@ -24,30 +26,7 @@ namespace NzbDrone.Api.Directories
string query = Request.Query.query.Value;
IEnumerable<String> dirs = null;
try
{
//Windows (Including UNC)
var windowsSep = query.LastIndexOf('\\');
if (windowsSep > -1)
{
dirs = _diskProvider.GetDirectories(query.Substring(0, windowsSep + 1));
}
//Unix
var index = query.LastIndexOf('/');
if (index > -1)
{
dirs = _diskProvider.GetDirectories(query.Substring(0, index + 1));
}
}
catch (Exception)
{
//Swallow the exceptions so proper JSON is returned to the client (Empty results)
return new List<string>().AsResponse();
}
var dirs = _directoryLookupService.LookupSubDirectories(query);
if (dirs == null)
throw new Exception("A valid path was not provided");