pull/4346/head
filip mertens 1 year ago
parent 1f760d673b
commit 7817878719
  1. 12
      apps/remixdesktop/src/plugins/compilerLoader.ts
  2. 11
      apps/remixdesktop/src/plugins/configPlugin.ts
  3. 31
      apps/remixdesktop/src/utils/config.ts

@ -133,19 +133,19 @@ class CompilerLoaderPluginClient extends ElectronBasePluginClient {
this.solJsonBinData = { this.solJsonBinData = {
baseURLWasm: 'http://localhost:' + (server.address() as any).port + '/compilers', baseURLWasm: 'http://localhost:' + (server.address() as any).port + '/compilers',
baseURLBin: 'http://localhost:' + (server.address() as any).port + '/compilers', baseURLBin: 'http://localhost:' + (server.address() as any).port + '/compilers',
wasmList: lists.wasmData, wasmList: lists.wasmData || [],
binList: lists.binData, binList: lists.binData || [],
} }
console.log('emit', Date.now()) console.log('emit', Date.now())
const localCompilers = await this.listCompilers() const localCompilers = await this.listCompilers()
this.solJsonBinData.wasmList = this.solJsonBinData.wasmList.map((item) => { this.solJsonBinData.wasmList && (this.solJsonBinData.wasmList = this.solJsonBinData.wasmList.map((item) => {
localCompilers.includes(item.path) ? (item.wasmURL = 'http://localhost:' + (server.address() as any).port + '/compilers/') && (item.isDownloaded=true) : (item.wasmURL = baseURLWasm) && (item.isDownloaded = false) localCompilers.includes(item.path) ? (item.wasmURL = 'http://localhost:' + (server.address() as any).port + '/compilers/') && (item.isDownloaded=true) : (item.wasmURL = baseURLWasm) && (item.isDownloaded = false)
return item return item
}) }))
this.solJsonBinData.binList = this.solJsonBinData.binList.map((item) => { this.solJsonBinData.binList && (this.solJsonBinData.binList = this.solJsonBinData.binList.map((item) => {
localCompilers.includes(item.path) ? (item.binURL = 'http://localhost:' + (server.address() as any).port + '/compilers/') && (item.isDownloaded=true) : (item.binURL = baseURLBin) && (item.isDownloaded = false) localCompilers.includes(item.path) ? (item.binURL = 'http://localhost:' + (server.address() as any).port + '/compilers/') && (item.isDownloaded=true) : (item.binURL = baseURLBin) && (item.isDownloaded = false)
return item return item
}) }))
this.emit('jsonBinDataLoaded', this.solJsonBinData) this.emit('jsonBinDataLoaded', this.solJsonBinData)
} }

@ -42,17 +42,6 @@ class ConfigPluginClient extends ElectronBasePluginClient {
} }
async onActivation(): Promise<void> {
//utilityProcess.fork('/Users/filipmertens/Documents/GitHub/remix-project/apps/remixdesktop/node_modules/yarn/bin/yarn.js')
/*const child = utilityProcess.fork(path.join(__dirname, 'utility.js'), [app.getPath('userData')])
this.call('terminal' as any, 'log', JSON.stringify(process.env))
child.on('message', (data) => {
console.log('message from child', data)
this.call('terminal', 'log', data)
})
*/
}
async writeConfig(data: any): Promise<void> { async writeConfig(data: any): Promise<void> {
writeConfig(data) writeConfig(data)
} }

@ -6,19 +6,25 @@ export const cacheDir = path.join(os.homedir(), '.cache_remix_ide')
console.log('cacheDir', cacheDir) console.log('cacheDir', cacheDir)
try { export const createDefaultConfigLocations = async() => {
if (!fs.existsSync(cacheDir)) { try {
fs.mkdirSync(cacheDir) console.log('mdkir', cacheDir, fs.existsSync(cacheDir))
} if (!fs.existsSync(cacheDir)) {
if (!fs.existsSync(cacheDir + '/compilers')) { fs.mkdirSync(cacheDir)
fs.mkdirSync(cacheDir + '/compilers') }
} if (!fs.existsSync(cacheDir + '/compilers')) {
if(!fs.existsSync(cacheDir + '/remixdesktop.json')) { fs.mkdirSync(cacheDir + '/compilers')
fs.writeFileSync(cacheDir + '/remixdesktop.json', JSON.stringify({})) }
if (!fs.existsSync(cacheDir + '/remixdesktop.json')) {
fs.writeFileSync(cacheDir + '/remixdesktop.json', JSON.stringify({}))
}
} catch (e) {
console.log(e)
} }
} catch (e) {
} }
export const writeConfig = (data: any) => {
export const writeConfig = async (data: any) => {
await createDefaultConfigLocations()
const cache = readConfig() const cache = readConfig()
try { try {
fs.writeFileSync(cacheDir + '/remixdesktop.json', JSON.stringify({ ...cache, ...data })) fs.writeFileSync(cacheDir + '/remixdesktop.json', JSON.stringify({ ...cache, ...data }))
@ -27,7 +33,8 @@ export const writeConfig = (data: any) => {
} }
} }
export const readConfig = () => { export const readConfig = async () => {
await createDefaultConfigLocations()
if (fs.existsSync(cacheDir + '/remixdesktop.json')) { if (fs.existsSync(cacheDir + '/remixdesktop.json')) {
try { try {
// read the cache file // read the cache file

Loading…
Cancel
Save