Update:Library folder browser to also work for debian and windows

server/controllers/FileSystemController.js

@@ -1,31 +1,69 @@
 const Path = require('path')
 const Logger = require('../Logger')
-const Database = require('../Database')
 const fs = require('../libs/fsExtra')
+const { toNumber } = require('../utils/index')
+const fileUtils = require('../utils/fileUtils')
 
 class FileSystemController {
   constructor() { }
 
+  /**
+   * 
+   * @param {import('express').Request} req 
+   * @param {import('express').Response} res 
+   */
   async getPaths(req, res) {
     if (!req.user.isAdminOrUp) {
       Logger.error(`[FileSystemController] Non-admin user attempting to get filesystem paths`, req.user)
       return res.sendStatus(403)
     }
 
-    const excludedDirs = ['node_modules', 'client', 'server', '.git', 'static', 'build', 'dist', 'metadata', 'config', 'sys', 'proc'].map(dirname => {
-      return Path.sep + dirname
-    })
+    const relpath = req.query.path
+    const level = toNumber(req.query.level, 0)
 
-    // Do not include existing mapped library paths in response
-    const libraryFoldersPaths = await Database.libraryFolderModel.getAllLibraryFolderPaths()
-    libraryFoldersPaths.forEach((path) => {
-      let dir = path || ''
-      if (dir.includes(global.appRoot)) dir = dir.replace(global.appRoot, '')
-      excludedDirs.push(dir)
+    // Validate path. Must be absolute
+    if (relpath && (!Path.isAbsolute(relpath) || !await fs.pathExists(relpath))) {
+      Logger.error(`[FileSystemController] Invalid path in query string "${relpath}"`)
+      return res.status(400).send('Invalid "path" query string')
+    }
+    Logger.debug(`[FileSystemController] Getting file paths at ${relpath || 'root'} (${level})`)
+
+    let directories = []
+
+    // Windows returns drives first
+    if (global.isWin) {
+      if (relpath) {
+        directories = await fileUtils.getDirectoriesInPath(relpath, level)
+      } else {
+        const drives = await fileUtils.getWindowsDrives().catch((error) => {
+          Logger.error(`[FileSystemController] Failed to get windows drives`, error)
+          return []
+        })
+        if (drives.length) {
+          directories = drives.map(d => {
+            return {
+              path: d,
+              dirname: d,
+              level: 0
+            }
+          })
+        }
+      }
+    } else {
+      directories = await fileUtils.getDirectoriesInPath(relpath || '/', level)
+    }
+
+    // Exclude some dirs from this project to be cleaner in Docker
+    const excludedDirs = ['node_modules', 'client', 'server', '.git', 'static', 'build', 'dist', 'metadata', 'config', 'sys', 'proc', '.devcontainer', '.nyc_output', '.github', '.vscode'].map(dirname => {
+      return fileUtils.filePathToPOSIX(Path.join(global.appRoot, dirname))
+    })
+    directories = directories.filter(dir => {
+      return !excludedDirs.includes(dir.path)
     })
 
     res.json({
-      directories: await this.getDirectories(global.appRoot, '/', excludedDirs)
+      posix: !global.isWin,
+      directories
     })
   }
 

server/routers/ApiRouter.js

@@ -320,35 +320,6 @@ class ApiRouter {
     this.router.get('/stats/year/:year', MiscController.getAdminStatsForYear.bind(this))
   }
 
-  async getDirectories(dir, relpath, excludedDirs, level = 0) {
-    try {
-      const paths = await fs.readdir(dir)
-
-      let dirs = await Promise.all(paths.map(async dirname => {
-        const fullPath = Path.join(dir, dirname)
-        const path = Path.join(relpath, dirname)
-
-        const isDir = (await fs.lstat(fullPath)).isDirectory()
-        if (isDir && !excludedDirs.includes(path) && dirname !== 'node_modules') {
-          return {
-            path,
-            dirname,
-            fullPath,
-            level,
-            dirs: level < 4 ? (await this.getDirectories(fullPath, path, excludedDirs, level + 1)) : []
-          }
-        } else {
-          return false
-        }
-      }))
-      dirs = dirs.filter(d => d)
-      return dirs
-    } catch (error) {
-      Logger.error('Failed to readdir', dir, error)
-      return []
-    }
-  }
-
   //
   // Helper Methods
   //

server/utils/fileUtils.js

@@ -1,6 +1,7 @@
 const axios = require('axios')
 const Path = require('path')
 const ssrfFilter = require('ssrf-req-filter')
+const exec = require('child_process').exec
 const fs = require('../libs/fsExtra')
 const rra = require('../libs/recursiveReaddirAsync')
 const Logger = require('../Logger')
@@ -378,3 +379,65 @@ module.exports.isWritable = async (directory) => {
   }
 }
 
+/**
+ * Get Windows drives as array e.g. ["C:/", "F:/"]
+ * 
+ * @returns {Promise<string[]>}
+ */
+module.exports.getWindowsDrives = async () => {
+  if (!global.isWin) {
+    return []
+  }
+  return new Promise((resolve, reject) => {
+    exec('wmic logicaldisk get name', async (error, stdout, stderr) => {
+      if (error) {
+        reject(error)
+        return
+      }
+      let drives = stdout?.split(/\r?\n/).map(line => line.trim()).filter(line => line).slice(1)
+      const validDrives = []
+      for (const drive of drives) {
+        let drivepath = drive + '/'
+        if (await fs.pathExists(drivepath)) {
+          validDrives.push(drivepath)
+        } else {
+          Logger.error(`Invalid drive ${drivepath}`)
+        }
+      }
+      resolve(validDrives)
+    })
+  })
+}
+
+/**
+ * Get array of directory paths in a directory
+ * 
+ * @param {string} dirPath 
+ * @param {number} level
+ * @returns {Promise<{ path:string, dirname:string, level:number }[]>}
+ */
+module.exports.getDirectoriesInPath = async (dirPath, level) => {
+  try {
+    const paths = await fs.readdir(dirPath)
+    let dirs = await Promise.all(paths.map(async dirname => {
+      const fullPath = Path.join(dirPath, dirname)
+
+      const lstat = await fs.lstat(fullPath).catch((error) => {
+        Logger.debug(`Failed to lstat "${fullPath}"`, error)
+        return null
+      })
+      if (!lstat?.isDirectory()) return null
+
+      return {
+        path: this.filePathToPOSIX(fullPath),
+        dirname,
+        level
+      }
+    }))
+    dirs = dirs.filter(d => d)
+    return dirs
+  } catch (error) {
+    Logger.error('Failed to readdir', dirPath, error)
+    return []
+  }
+}