mirror
/
remix-project
mirror of https://github.com/ethereum/remix-project.git
2
0
Fork 0
Code Issues Releases Wiki Activity

add indexeddb

Browse Source
github
bunsenstraat 3 years ago
parent f021dd5f21
commit 9de52d7d27
6 changed files with 194 additions and 105 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      apps/remix-ide/src/app/files/dgitProvider.js
  2. 5
      apps/remix-ide/src/app/files/fileManager.js
  3. 165
      apps/remix-ide/src/app/files/fileProvider.js
  4. 29
      apps/remix-ide/src/assets/js/fileSystem.js
  5. 1
      apps/remix-ide/src/assets/js/lightning-fs.min.js
  6. 41
      apps/remix-ide/src/index.html

24
apps/remix-ide/src/app/files/dgitProvider.js
Unescape View File

@ -51,8 +51,8 @@ class DGitProvider extends Plugin {
async getGitConfig () {
const workspace = await this.call('filePanel', 'getCurrentWorkspace')
return {
fs: window.remixFileSystem,
dir: workspace.absolutePath
fs: window.remixFileSystemCallback,
dir: addSlash(workspace.absolutePath) + '/'
}
}
@ -82,10 +82,11 @@ class DGitProvider extends Plugin {
...await this.getGitConfig(),
...cmd
})
console.log("STATUS", status, await this.getGitConfig())
return status
}
async add (cmd) {
async add(cmd) {
await git.add({
...await this.getGitConfig(),
...cmd
@ -299,7 +300,7 @@ class DGitProvider extends Plugin {
const files = await this.getDirectory('/')
this.filesToSend = []
for (const file of files) {
const c = window.remixFileSystem.readFileSync(`${workspace.absolutePath}/${file}`)
const c = await window.remixFileSystem.readFile(addSlash(`${workspace.absolutePath}/${file}`))
const ob = {
path: file,
content: c
@ -320,7 +321,7 @@ class DGitProvider extends Plugin {
const data = new FormData()
files.forEach(async (file) => {
const c = window.remixFileSystem.readFileSync(`${workspace.absolutePath}/${file}`)
const c = window.remixFileSystem.readFileSync(addSlash(`${workspace.absolutePath}/${file}`))
data.append('file', new Blob([c]), `base/${file}`)
})
// get last commit data
@ -431,7 +432,7 @@ class DGitProvider extends Plugin {
this.createDirectories(`${workspace.absolutePath}/${dir}`)
} catch (e) { throw new Error(e) }
try {
window.remixFileSystem.writeFileSync(`${workspace.absolutePath}/${file.path}`, Buffer.concat(content) || new Uint8Array())
await window.remixFileSystem.writeFile(addSlash(`${workspace.absolutePath}/${file.path}`, Buffer.concat(content) || new Uint8Array()))
} catch (e) { throw new Error(e) }
}
} catch (e) {
@ -495,7 +496,7 @@ class DGitProvider extends Plugin {
const files = await this.getDirectory('/')
this.filesToSend = []
for (const file of files) {
const c = window.remixFileSystem.readFileSync(`${workspace.absolutePath}/${file}`)
const c = await window.remixFileSystem.readFile(addSlash(`${workspace.absolutePath}/${file}`))
zip.file(file, c)
}
await zip.generateAsync({
@ -515,8 +516,8 @@ class DGitProvider extends Plugin {
if (i > 0) previouspath = '/' + directories.slice(0, i).join('/')
const finalPath = previouspath + '/' + directories[i]
try {
if (!window.remixFileSystem.existsSync(finalPath)) {
window.remixFileSystem.mkdirSync(finalPath)
if (!await window.remixFileSystem.exists(addSlash(finalPath))) {
await window.remixFileSystem.mkdir(addSlash(finalPath))
}
} catch (e) {
console.log(e)
@ -547,6 +548,11 @@ class DGitProvider extends Plugin {
}
}
const addSlash = (file) => {
if (!file.startsWith('/'))file = '/' + file
return file
}
const normalize = (filesList) => {
const folders = []
const files = []

5
apps/remix-ide/src/app/files/fileManager.js
Unescape View File

@ -148,10 +148,9 @@ class FileManager extends Plugin {
* @param {string} path path of the directory or file
* @returns {boolean} true if path is a file.
*/
isFile (path) {
async isFile (path) {
const provider = this.fileProviderOf(path)
const result = provider.isFile(path)
const result = await provider.isFile(path)
return result
}

165
apps/remix-ide/src/app/files/fileProvider.js
Unescape View File

@ -72,48 +72,50 @@ class FileProvider {
async exists (path) {
// todo check the type (directory/file) as well #2386
// currently it is not possible to have a file and folder with same path
const ret = this._exists(path)
const ret = await this._exists(path)
return ret
}
_exists (path) {
async _exists (path) {
path = this.getPathFromUrl(path) || path // ensure we actually use the normalized path from here
var unprefixedpath = this.removePrefix(path)
return path === this.type ? true : window.remixFileSystem.existsSync(unprefixedpath)
console.log(unprefixedpath)
return path === this.type ? true : await window.remixFileSystem.exists(this.addSlash(unprefixedpath))
}
init (cb) {
cb()
}
get (path, cb) {
cb = cb || function () {}
async get (path, cb) {
path = this.getPathFromUrl(path) || path // ensure we actually use the normalized path from here
var unprefixedpath = this.removePrefix(path)
var exists = window.remixFileSystem.existsSync(unprefixedpath)
if (!exists) return cb(null, null)
window.remixFileSystem.readFile(unprefixedpath, 'utf8', (err, content) => {
cb(err, content)
})
console.log('getting ', unprefixedpath, await window.remixFileSystem.readFile(this.addSlash(unprefixedpath), 'utf8'))
try {
const content = await window.remixFileSystem.readFile(this.addSlash(unprefixedpath), 'utf8')
if (cb) cb(null, content)
return content
} catch (err) {
if (cb) cb(err, null)
throw new Error(err)
}
}
set (path, content, cb) {
cb = cb || function () {}
async set (path, content, cb) {
var unprefixedpath = this.removePrefix(path)
var exists = window.remixFileSystem.existsSync(unprefixedpath)
if (exists && window.remixFileSystem.readFileSync(unprefixedpath, 'utf8') === content) {
cb()
return true
}
if (!exists && unprefixedpath.indexOf('/') !== -1) {
// the last element is the filename and we should remove it
this.createDir(path.substr(0, path.lastIndexOf('/')))
const exists = await window.remixFileSystem.exists(unprefixedpath)
if (exists && await window.remixFileSystem.readFile(unprefixedpath, 'utf8') === content) {
if (cb) cb()
return null
}
await this.createDir(path.substr(0, path.lastIndexOf('/')))
console.log('set file', path, unprefixedpath)
try {
window.remixFileSystem.writeFileSync(unprefixedpath, content)
await window.remixFileSystem.writeFile(this.addSlash(unprefixedpath), content, 'utf8')
} catch (e) {
cb(e)
if (cb) cb(e)
return false
}
if (!exists) {
@ -121,22 +123,26 @@ class FileProvider {
} else {
this.event.emit('fileChanged', this._normalizePath(unprefixedpath))
}
cb()
if (cb) cb()
return true
}
createDir (path, cb) {
async createDir (path, cb) {
const unprefixedpath = this.removePrefix(path)
const paths = unprefixedpath.split('/')
if (paths.length && paths[0] === '') paths.shift()
let currentCheck = ''
paths.forEach((value) => {
for (const value of paths) {
currentCheck = currentCheck + '/' + value
if (!window.remixFileSystem.existsSync(currentCheck)) {
window.remixFileSystem.mkdirSync(currentCheck)
if (!await window.remixFileSystem.exists(currentCheck)) {
try {
await window.remixFileSystem.mkdir(currentCheck)
this.event.emit('folderAdded', this._normalizePath(currentCheck))
} catch (error) {
}
}
}
})
if (cb) cb()
}
@ -150,55 +156,51 @@ class FileProvider {
return false
}
isDirectory (path) {
async isDirectory (path) {
const unprefixedpath = this.removePrefix(path)
return path === this.type ? true : window.remixFileSystem.statSync(unprefixedpath).isDirectory()
return path === this.type ? true : (await window.remixFileSystem.stat(this.addSlash(unprefixedpath))).isDirectory()
}
isFile (path) {
async isFile (path) {
path = this.getPathFromUrl(path) || path // ensure we actually use the normalized path from here
path = this.removePrefix(path)
return window.remixFileSystem.statSync(path).isFile()
return (await window.remixFileSystem.stat(this.addSlash(path))).isFile()
}
/**
* Removes the folder recursively
* @param {*} path is the folder to be removed
*/
remove (path) {
return new Promise((resolve, reject) => {
async remove (path) {
path = this.removePrefix(path)
if (window.remixFileSystem.existsSync(path)) {
const stat = window.remixFileSystem.statSync(path)
if (await window.remixFileSystem.exists(path)) {
const stat = await window.remixFileSystem.stat(path)
try {
if (!stat.isDirectory()) {
resolve(this.removeFile(path))
return (this.removeFile(path))
} else {
const items = window.remixFileSystem.readdirSync(path)
const items = await window.remixFileSystem.readdir(path)
if (items.length !== 0) {
items.forEach((item, index) => {
for (const item of items) {
const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
if (window.remixFileSystem.statSync(curPath).isDirectory()) { // delete folder
if ((await window.remixFileSystem.stat(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)
}
if (await window.remixFileSystem.readdir(path).length === 0) await window.remixFileSystem.rmdir(path)
} else {
// folder is empty
window.remixFileSystem.rmdirSync(path, console.log)
await window.remixFileSystem.rmdirSync(path)
}
this.event.emit('fileRemoved', this._normalizePath(path))
}
} catch (e) {
console.log(e)
return resolve(false)
return false
}
}
return resolve(true)
})
}
/**
@ -207,28 +209,28 @@ class FileProvider {
* @param {Function} visitFile is a function called for each visited files
* @param {Function} visitFolder is a function called for each visited folders
*/
_copyFolderToJsonInternal (path, visitFile, visitFolder) {
visitFile = visitFile || (() => {})
visitFolder = visitFolder || (() => {})
async _copyFolderToJsonInternal (path, visitFile, visitFolder) {
/* visitFile = visitFile || (() => { })
visitFolder = visitFolder || (() => { })
return new Promise((resolve, reject) => {
const json = {}
path = this.removePrefix(path)
if (window.remixFileSystem.existsSync(path)) {
if (window.remixFileSystem.exists(path)) {
try {
const items = window.remixFileSystem.readdirSync(path)
const items = await window.remixFileSystem.readdir(path)
visitFolder({ path })
if (items.length !== 0) {
items.forEach(async (item, index) => {
for (const item of items) {
const file = {}
const curPath = `${path}${path.endsWith('/') ? '' : '/'}${item}`
if (window.remixFileSystem.statSync(curPath).isDirectory()) {
if (await window.remixFileSystem.stat(curPath).isDirectory()) {
file.children = await this._copyFolderToJsonInternal(curPath, visitFile, visitFolder)
} else {
file.content = window.remixFileSystem.readFileSync(curPath, 'utf8')
visitFile({ path: curPath, content: file.content })
}
json[curPath] = file
})
}
}
} catch (e) {
console.log(e)
@ -236,7 +238,7 @@ class FileProvider {
}
}
return resolve(json)
})
}) */
}
/**
@ -245,26 +247,26 @@ class FileProvider {
* @param {Function} visitFile is a function called for each visited files
* @param {Function} visitFolder is a function called for each visited folders
*/
copyFolderToJson (path, visitFile, visitFolder) {
visitFile = visitFile || (() => {})
visitFolder = visitFolder || (() => {})
return this._copyFolderToJsonInternal(path, visitFile, visitFolder)
async copyFolderToJson (path, visitFile, visitFolder) {
visitFile = visitFile || (() => { })
visitFolder = visitFolder || (() => { })
return await this._copyFolderToJsonInternal(path, visitFile, visitFolder)
}
removeFile (path) {
async removeFile (path) {
path = this.removePrefix(path)
if (window.remixFileSystem.existsSync(path) && !window.remixFileSystem.statSync(path).isDirectory()) {
window.remixFileSystem.unlinkSync(path, console.log)
if (await window.remixFileSystem.exists(path) && !(await window.remixFileSystem.stat(path)).isDirectory()) {
await window.remixFileSystem.unlink(path)
this.event.emit('fileRemoved', this._normalizePath(path))
return true
} else return false
}
rename (oldPath, newPath, isFolder) {
async rename (oldPath, newPath, isFolder) {
var unprefixedoldPath = this.removePrefix(oldPath)
var unprefixednewPath = this.removePrefix(newPath)
if (this._exists(unprefixedoldPath)) {
window.remixFileSystem.renameSync(unprefixedoldPath, unprefixednewPath)
if (await this._exists(unprefixedoldPath)) {
await window.remixFileSystem.rename(unprefixedoldPath, unprefixednewPath)
this.event.emit('fileRenamed',
this._normalizePath(unprefixedoldPath),
this._normalizePath(unprefixednewPath),
@ -275,24 +277,37 @@ class FileProvider {
return false
}
resolveDirectory (path, callback) {
async resolveDirectory (path, cb) {
path = this.removePrefix(path)
console.log('resolve', path)
if (path.indexOf('/') !== 0) path = '/' + path
window.remixFileSystem.readdir(path, (error, files) => {
var ret = {}
try {
const files = await window.remixFileSystem.readdir(path)
const ret = {}
if (files) {
files.forEach(element => {
for (let element of files) {
console.log(path, element)
path = path.replace(/^\/|\/$/g, '') // remove first and last slash
element = element.replace(/^\/|\/$/g, '') // remove first and last slash
const absPath = (path === '/' ? '' : path) + '/' + element
ret[absPath.indexOf('/') === 0 ? absPath.substr(1, absPath.length) : absPath] = { isDirectory: window.remixFileSystem.statSync(absPath).isDirectory() }
ret[absPath.indexOf('/') === 0 ? absPath.substr(1, absPath.length) : absPath] = { isDirectory: (await window.remixFileSystem.stat(this.addSlash(absPath))).isDirectory() }
// ^ ret does not accept path starting with '/'
})
console.log(ret)
}
callback(error, ret)
})
}
console.log('FILES', ret, files)
if (cb) cb(null, ret)
return ret
} catch (error) {
if (cb) cb(error, null)
throw new Error(error)
}
}
addSlash (file) {
if (!file.startsWith('/'))file = '/' + file
return file
}
removePrefix (path) {

29
apps/remix-ide/src/assets/js/fileSystem.js
Unescape View File

@ -0,0 +1,29 @@
class remixFileSystem extends LightningFS {
constructor(...t) {
super(...t)
this.promises = {
...this.promises,
exists: async (path) => {
return new Promise((resolve, reject) => {
this.promises.stat(path).then(() => resolve(true)).catch(() => resolve(false))
})
},
statSync: async (path) => {
return new Promise((resolve, reject) => {
console.log("stat", path)
this.promises.stat(path).then((stat) => {
console.log("stat", stat)
resolve({
isDirectory: () => {
return stat.type === 'dir'
},
isFile: () => {
return stat.type === 'file'
},
})
}).catch(() => reject(false))
})
}
}
}
}

1
apps/remix-ide/src/assets/js/lightning-fs.min.js vendored
View File

File diff suppressed because one or more lines are too long

41
apps/remix-ide/src/index.html
Unescape View File

@ -28,6 +28,7 @@
<link rel="icon" type="x-icon" href="assets/img/icon.png">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/intro.js/4.1.0/introjs.min.css">
<script src="assets/js/browserfs.min.js"></script>
<script src="assets/js/lightning-fs.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
<!-- Matomo -->
<script type="text/javascript">
@ -98,7 +99,7 @@
document.head.appendChild(app)
}
window.onload = () => {
BrowserFS.install(window)
/* BrowserFS.install(window)
BrowserFS.configure({
fs: "LocalStorage"
}, function(e) {
@ -107,8 +108,46 @@
app.setAttribute('src', versions[versionToLoad])
document.body.appendChild(app)
window.remixFileSystem = require('fs')
}) */
class remixFileSystem extends LightningFS {
constructor(...t) {
super(...t)
this.superStat = this.promises.stat
this.promises = {
...this.promises,
exists: async (path) => {
return new Promise((resolve, reject) => {
this.superStat(path).then(() => resolve(true)).catch(() => resolve(false))
})
},
stat: async (path) => {
return new Promise((resolve, reject) => {
console.log("stat", path, this)
//return
this.superStat(path).then((stat) => {
console.log("stat", stat)
resolve({
isDirectory: () => {
return stat.type === 'dir'
},
isFile: () => {
return stat.type === 'file'
},
})
}).catch(() => reject(false))
})
}
}
}
}
window.remixFileSystemCallback = new remixFileSystem('RemixFileSystem')
window.remixFileSystem = window.remixFileSystemCallback.promises
console.log(window.remixFileSystem)
let app = document.createElement('script')
app.setAttribute('src', versions[versionToLoad])
document.body.appendChild(app)
}
</script>
<script src="runtime.js" type="module"></script>
<script src="polyfills.js" type="module"></script>

Write Preview
Loading…
Cancel
Save