Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
22200687
Commit
22200687
authored
Jun 16, 2020
by
yann300
Committed by
ioedeveloper
Jul 13, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make sure "remove" return a promise
parent
c8fc7c97
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
26 deletions
+31
-26
fileProvider.js
apps/remix-ide/src/app/files/fileProvider.js
+27
-25
remixDProvider.js
apps/remix-ide/src/app/files/remixDProvider.js
+4
-1
No files found.
apps/remix-ide/src/app/files/fileProvider.js
View file @
22200687
...
@@ -157,35 +157,37 @@ class FileProvider {
...
@@ -157,35 +157,37 @@ class FileProvider {
* @param {*} path is the folder to be removed
* @param {*} path is the folder to be removed
*/
*/
remove
(
path
)
{
remove
(
path
)
{
path
=
this
.
removePrefix
(
path
)
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
window
.
remixFileSystem
.
existsSync
(
path
))
{
path
=
this
.
removePrefix
(
path
)
const
stat
=
window
.
remixFileSystem
.
statSync
(
path
)
if
(
window
.
remixFileSystem
.
existsSync
(
path
))
{
try
{
const
stat
=
window
.
remixFileSystem
.
statSync
(
path
)
if
(
!
stat
.
isDirectory
())
{
try
{
return
this
.
removeFile
(
path
)
if
(
!
stat
.
isDirectory
())
{
}
else
{
resolve
(
this
.
removeFile
(
path
))
const
items
=
window
.
remixFileSystem
.
readdirSync
(
path
)
if
(
items
.
length
!==
0
)
{
items
.
forEach
((
item
,
index
)
=>
{
const
curPath
=
`
${
path
}
/
${
item
}
`
if
(
window
.
remixFileSystem
.
statSync
(
curPath
).
isDirectory
())
{
// delete folder
this
.
remove
(
curPath
)
}
else
{
// delete file
this
.
removeFile
(
curPath
)
}
})
if
(
window
.
remixFileSystem
.
readdirSync
(
path
).
length
===
0
)
window
.
remixFileSystem
.
rmdirSync
(
path
,
console
.
log
)
}
else
{
}
else
{
// folder is empty
const
items
=
window
.
remixFileSystem
.
readdirSync
(
path
)
window
.
remixFileSystem
.
rmdirSync
(
path
,
console
.
log
)
if
(
items
.
length
!==
0
)
{
items
.
forEach
((
item
,
index
)
=>
{
const
curPath
=
`
${
path
}
/
${
item
}
`
if
(
window
.
remixFileSystem
.
statSync
(
curPath
).
isDirectory
())
{
// delete folder
this
.
remove
(
curPath
)
}
else
{
// delete file
this
.
removeFile
(
curPath
)
}
})
if
(
window
.
remixFileSystem
.
readdirSync
(
path
).
length
===
0
)
window
.
remixFileSystem
.
rmdirSync
(
path
,
console
.
log
)
}
else
{
// folder is empty
window
.
remixFileSystem
.
rmdirSync
(
path
,
console
.
log
)
}
}
}
}
catch
(
e
)
{
console
.
log
(
e
)
return
resolve
(
false
)
}
}
}
catch
(
e
)
{
console
.
log
(
e
)
return
false
}
}
}
return
resolve
(
true
)
return
true
})
}
}
removeFile
(
path
)
{
removeFile
(
path
)
{
...
...
apps/remix-ide/src/app/files/remixDProvider.js
View file @
22200687
...
@@ -130,19 +130,22 @@ module.exports = class RemixDProvider {
...
@@ -130,19 +130,22 @@ module.exports = class RemixDProvider {
}
}
remove
(
path
)
{
remove
(
path
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
unprefixedpath
=
this
.
removePrefix
(
path
)
const
unprefixedpath
=
this
.
removePrefix
(
path
)
this
.
_appManager
.
call
(
'remixd'
,
'remove'
,
{
path
:
unprefixedpath
})
this
.
_appManager
.
call
(
'remixd'
,
'remove'
,
{
path
:
unprefixedpath
})
.
then
(
result
=>
{
.
then
(
result
=>
{
console
.
log
(
'result: '
,
result
)
console
.
log
(
'result: '
,
result
)
const
path
=
this
.
type
+
'/'
+
unprefixedpath
const
path
=
this
.
type
+
'/'
+
unprefixedpath
delete
this
.
filesContent
[
path
]
delete
this
.
filesContent
[
path
]
resolve
(
true
)
this
.
init
(()
=>
{
this
.
init
(()
=>
{
this
.
event
.
trigger
(
'fileRemoved'
,
[
path
])
this
.
event
.
trigger
(
'fileRemoved'
,
[
path
])
})
})
}).
catch
(
error
=>
{
}).
catch
(
error
=>
{
if
(
error
)
console
.
log
(
error
)
if
(
error
)
console
.
log
(
error
)
resolve
(
false
)
})
})
})
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment