Added: Allow folders without trailing slashes in file browser

Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>

frontend/src/Components/FileBrowser/FileBrowserModalContent.js

@@ -143,22 +143,22 @@ class FileBrowserModalContent extends Component {
                   <TableBody>
                     {
                       emptyParent &&
-                      <FileBrowserRow
+                        <FileBrowserRow
-                        type="computer"
+                          type="computer"
-                        name="My Computer"
+                          name="My Computer"
-                        path={parent}
+                          path={parent}
-                        onPress={this.onRowPress}
+                          onPress={this.onRowPress}
-                      />
+                        />
                     }
 
                     {
                       !emptyParent && parent &&
-                      <FileBrowserRow
+                        <FileBrowserRow
-                        type="parent"
+                          type="parent"
-                        name="..."
+                          name="..."
-                        path={parent}
+                          path={parent}
-                        onPress={this.onRowPress}
+                          onPress={this.onRowPress}
-                      />
+                        />
                     }
 
                     {

frontend/src/Components/FileBrowser/FileBrowserModalContentConnector.js

@@ -48,14 +48,20 @@ class FileBrowserModalContentConnector extends Component {
   // Lifecycle
 
   componentDidMount() {
-    this.props.fetchPaths({ path: this.props.value });
+    this.props.fetchPaths({
+      path: this.props.value,
+      allowFoldersWithoutTrailingSlashes: true
+    });
   }
 
   //
   // Listeners
 
   onFetchPaths = (path) => {
-    this.props.fetchPaths({ path });
+    this.props.fetchPaths({
+      path,
+      allowFoldersWithoutTrailingSlashes: true
+    });
   }
 
   onClearPaths = () => {

frontend/src/Store/Actions/pathActions.js

@@ -44,15 +44,21 @@ export const actionHandlers = handleThunks({
   [FETCH_PATHS]: function(getState, payload, dispatch) {
     dispatch(set({ section, isFetching: true }));
 
+    const {
+      path,
+      allowFoldersWithoutTrailingSlashes = false
+    } = payload;
+
     const promise = $.ajax({
       url: '/filesystem',
       data: {
-        path: payload.path
+        path,
+        allowFoldersWithoutTrailingSlashes
       }
     });
 
     promise.done((data) => {
-      dispatch(updatePaths({ path: payload.path, ...data }));
+      dispatch(updatePaths({ path, ...data }));
 
       dispatch(set({
         section,

src/Lidarr.Api.V1/FileSystem/FileSystemModule.cs

@@ -32,9 +32,9 @@ namespace Lidarr.Api.V1.FileSystem
         {
             var pathQuery = Request.Query.path;
             var includeFiles = Request.GetBooleanQueryParameter("includeFiles");
+            var allowFoldersWithoutTrailingSlashes = Request.GetBooleanQueryParameter("allowFoldersWithoutTrailingSlashes");
 
-
+            return _fileSystemLookupService.LookupContents((string)pathQuery.Value, includeFiles, allowFoldersWithoutTrailingSlashes).AsResponse();
-            return _fileSystemLookupService.LookupContents((string)pathQuery.Value, includeFiles).AsResponse();
         }
 
         private Response GetEntityType()

src/NzbDrone.Common.Test/DiskTests/DirectoryLookupServiceFixture.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using FluentAssertions;
@@ -49,7 +49,7 @@ namespace NzbDrone.Common.Test.DiskTests
                 .Setup(s => s.GetDirectoryInfos(It.IsAny<string>()))
                 .Returns(_folders);
 
-            Subject.LookupContents(root, false).Directories.Should().NotContain(Path.Combine(root, RECYCLING_BIN));
+            Subject.LookupContents(root, false, false).Directories.Should().NotContain(Path.Combine(root, RECYCLING_BIN));
         }
 
         [Test]
@@ -62,7 +62,7 @@ namespace NzbDrone.Common.Test.DiskTests
                 .Setup(s => s.GetDirectoryInfos(It.IsAny<string>()))
                 .Returns(_folders);
 
-            Subject.LookupContents(root, false).Directories.Should().NotContain(Path.Combine(root, SYSTEM_VOLUME_INFORMATION));
+            Subject.LookupContents(root, false, false).Directories.Should().NotContain(Path.Combine(root, SYSTEM_VOLUME_INFORMATION));
         }
 
         [Test]
@@ -75,8 +75,8 @@ namespace NzbDrone.Common.Test.DiskTests
                 .Setup(s => s.GetDirectoryInfos(It.IsAny<string>()))
                 .Returns(_folders);
 
-            var result = Subject.LookupContents(root, false);
+            var result = Subject.LookupContents(root, false, false);
-            
+
             result.Directories.Should().HaveCount(_folders.Count - 3);
 
             result.Directories.Should().NotContain(f => f.Name == RECYCLING_BIN);

src/NzbDrone.Common/Disk/FileSystemLookupService.cs

@@ -9,7 +9,7 @@ namespace NzbDrone.Common.Disk
 {
     public interface IFileSystemLookupService
     {
-        FileSystemResult LookupContents(string query, bool includeFiles);
+        FileSystemResult LookupContents(string query, bool includeFiles, bool allowFoldersWithoutTrailingSlashes);
     }
 
     public class FileSystemLookupService : IFileSystemLookupService
@@ -51,14 +51,13 @@ namespace NzbDrone.Common.Disk
             _diskProvider = diskProvider;
         }
 
-        public FileSystemResult LookupContents(string query, bool includeFiles)
+        public FileSystemResult LookupContents(string query, bool includeFiles, bool allowFoldersWithoutTrailingSlashes)
         {
-            var result = new FileSystemResult();
-
             if (query.IsNullOrWhiteSpace())
             {
                 if (OsInfo.IsWindows)
                 {
+                    var result = new FileSystemResult();
                     result.Directories = GetDrives();
 
                     return result;
@@ -67,41 +66,23 @@ namespace NzbDrone.Common.Disk
                 query = "/";
             }
 
+            if (
+                allowFoldersWithoutTrailingSlashes &&
+                query.IsPathValid() &&
+                _diskProvider.FolderExists(query))
+            {
+                return GetResult(query, includeFiles);
+            }
+
             var lastSeparatorIndex = query.LastIndexOf(Path.DirectorySeparatorChar);
             var path = query.Substring(0, lastSeparatorIndex + 1);
 
             if (lastSeparatorIndex != -1)
             {
-                try
+                return GetResult(path, includeFiles);
-                {
-                    result.Parent = GetParent(path);
-                    result.Directories = GetDirectories(path);
-
-                    if (includeFiles)
-                    {
-                        result.Files = GetFiles(path);
-                    }
-                }
-
-                catch (DirectoryNotFoundException)
-                {
-                    return new FileSystemResult { Parent = GetParent(path) };
-                }
-                catch (ArgumentException)
-                {
-                    return new FileSystemResult();
-                }
-                catch (IOException)
-                {
-                    return new FileSystemResult { Parent = GetParent(path) };
-                }
-                catch (UnauthorizedAccessException)
-                {
-                    return new FileSystemResult { Parent = GetParent(path) };
-                }
             }
 
-            return result;
+            return new FileSystemResult();
         }
 
         private List<FileSystemModel> GetDrives()
@@ -117,6 +98,41 @@ namespace NzbDrone.Common.Disk
                                 .ToList();
         }
 
+        private FileSystemResult GetResult(string path, bool includeFiles)
+        {
+            var result = new FileSystemResult();
+
+            try
+            {
+                result.Parent = GetParent(path);
+                result.Directories = GetDirectories(path);
+
+                if (includeFiles)
+                {
+                    result.Files = GetFiles(path);
+                }
+            }
+
+            catch (DirectoryNotFoundException)
+            {
+                return new FileSystemResult { Parent = GetParent(path) };
+            }
+            catch (ArgumentException)
+            {
+                return new FileSystemResult();
+            }
+            catch (IOException)
+            {
+                return new FileSystemResult { Parent = GetParent(path) };
+            }
+            catch (UnauthorizedAccessException)
+            {
+                return new FileSystemResult { Parent = GetParent(path) };
+            }
+
+            return result;
+        }
+
         private List<FileSystemModel> GetDirectories(string path)
         {
             var directories = _diskProvider.GetDirectoryInfos(path)