fix: sftp error when dir already exists (#4024)

when the dir exists, sftp.mkdir() would raise an error and ends the for loop.

fix: sftp error when dir already exists (#4024)
1dc97424 · Rainshaw · GitHub · 54505976 · 1dc97424
Unverified Commit 1dc97424 authored Sep 15, 2021 by Rainshaw Committed by GitHub Sep 14, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

storage.js server/modules/storage/sftp/storage.js +6 -1

No files found.
--- a/server/modules/storage/sftp/storage.js
+++ b/server/modules/storage/sftp/storage.js
@@ -155,7 +155,12 @@ module.exports = {
        const folderPaths = _.dropRight(filePath.split('/'))
        for (let i = 1; i <= folderPaths.length; i++) {
          const folderSection = _.take(folderPaths, i).join('/')
-          await this.sftp.mkdir(path.posix.join(this.config.basePath, folderSection))
+          const folderDir = path.posix.join(this.config.basePath, folderSection)
+          try {
+            await this.sftp.readdir(folderDir)
+          } catch (err) {
+            await this.sftp.mkdir(folderDir)
+          }
        }
      } catch (err) {}
    }