Commit 734f5741 authored by LianaHus's avatar LianaHus Committed by ioedeveloper

cleanup

parent bf40a9e5
...@@ -499,22 +499,18 @@ class FileManager extends Plugin { ...@@ -499,22 +499,18 @@ class FileManager extends Plugin {
const dirPaths = [] const dirPaths = []
const collectList = (path) => { const collectList = (path) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.isDirectory(path)) { this.readdir(path).then((ls) => {
this.readdir(path).then((ls) => { const promises = Object.keys(ls).map((item, index) => {
const promises = Object.keys(ls).map((item, index) => { const root = (path.indexOf('/') === -1) ? path : path.substr(0, path.indexOf('/'))
const root = (path.indexOf('/') === -1) ? path : path.substr(0, path.indexOf('/')) const curPath = `${root}/${item}` // adding 'browser' or 'localhost'
const curPath = `${root}/${item}` // adding 'browser' or 'localhost' if (ls[item].isDirectory && !dirPaths.includes(curPath)) {
if (ls[item].isDirectory && !dirPaths.includes(curPath)) { dirPaths.push(curPath)
dirPaths.push(curPath) resolve(dirPaths)
resolve(dirPaths) }
} return new Promise((resolve, reject) => { resolve() })
return new Promise((resolve, reject) => { resolve() })
})
Promise.all(promises).then(() => { resolve(dirPaths) })
}) })
} else { Promise.all(promises).then(() => { resolve(dirPaths) })
resolve(dirPaths) })
}
}) })
} }
return collectList(path) return collectList(path)
...@@ -524,39 +520,7 @@ class FileManager extends Plugin { ...@@ -524,39 +520,7 @@ class FileManager extends Plugin {
return this.appManager.isActive('remixd') return this.appManager.isActive('remixd')
} }
allPaths () {
const dirPaths = []
const findPaths = (path) => {
return new Promise((resolve, reject) => {
if (this.isDirectory(path)) {
if (!dirPaths.includes(path)) {
dirPaths.push(path)
}
this.readdir(path).then((ls) => {
const promises = Object.keys(ls).map((item, index) => {
const root = (path.indexOf('/') === -1) ? path : path.substr(0, path.indexOf('/'))
const curPath = `${root}/${item}` // adding 'browser' or 'localhost'
if (ls[item].isDirectory) {
return findPaths(curPath)
} else {
return new Promise((resolve, reject) => { resolve() })
}
})
Promise.all(promises).then(() => { resolve(dirPaths) })
})
} else {
resolve(dirPaths)
}
})
}
const roots = []
roots.push(findPaths('browser'))
if (this.appManager.isActive('remixd')) roots.push(findPaths('localhost'))
return Promise.all(roots)
}
saveCurrentFile () { saveCurrentFile () {
var currentFile = this._deps.config.get('currentFile') var currentFile = this._deps.config.get('currentFile')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment