From 34caadf3b5b10554e26467bbe304b6e51012bd92 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Tue, 21 Apr 2020 22:21:17 +0100 Subject: [PATCH] latest --- build-electron/app.jsc | Bin 62344 -> 62344 bytes desktop-app/src/app/adb-client.service.ts | 2 +- desktop-app/src/app/app.service.ts | 31 ++++++++++++---------- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index 1642796834d8e677589bfce3077eba484f29189c..9f6924bdd8c461865a207f8ee1c190348e7ceed3 100644 GIT binary patch delta 4141 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 BMy>z= delta 4141 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 KkmZ9OqW=PY{xQM; diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 86b9000..abd2a6e 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -347,7 +347,7 @@ export class AdbClientService { } async setupAdb() { if (!this.isAdbDownloaded()) { - this.appService.seedPlatformTools(); + await this.appService.seedPlatformTools(); } this.appService.electron.ipcRenderer.on('adb-command', (event, arg: any) => { if (this.adbResolves[arg.uuid]) { diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index ac4ff59..08ea5d2 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -226,22 +226,25 @@ export class AppService { } } seedPlatformTools() { - if (!this.fs.existsSync(this.path.join(this.appData, 'platform-tools'))) { - let sourcesPath = this.path.join(__dirname, '..', 'platform-tools'); - if (!this.fs.existsSync(sourcesPath)) { - sourcesPath = this.path.join(process.cwd(), 'build', 'platform-tools'); - } - console.log(this.path.join(__dirname, '..', 'platform-tools'), process.cwd(), __dirname); - this.fs.mkdir(this.path.join(this.appData, 'platform-tools'), () => { - this.fs.readdir(sourcesPath, (err, files) => { - files.forEach(file => { - this.fs - .createReadStream(this.path.join(sourcesPath, file)) - .pipe(this.fs.createWriteStream(this.path.join(this.appData, 'platform-tools', file))); + return new Promise(resolve => { + if (!this.fs.existsSync(this.path.join(this.appData, 'platform-tools'))) { + let sourcesPath = this.path.join(__dirname, '..', 'platform-tools'); + if (!this.fs.existsSync(sourcesPath)) { + sourcesPath = this.path.join(process.cwd(), 'build', 'platform-tools'); + } + console.log(this.path.join(__dirname, '..', 'platform-tools'), process.cwd(), __dirname); + this.fs.mkdir(this.path.join(this.appData, 'platform-tools'), () => { + this.fs.readdir(sourcesPath, (err, files) => { + files.forEach(file => { + this.fs + .createReadStream(this.path.join(sourcesPath, file)) + .pipe(this.fs.createWriteStream(this.path.join(this.appData, 'platform-tools', file))); + }); + setTimeout(() => resolve(), 5000); }); }); - }); - } + } + }); } makeFolders() { return this.mkdir(this.appData)