From 8afc8214da764f9b6ff2f4b049a49ba9b359e25d Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 23 Apr 2020 09:56:38 +0100 Subject: [PATCH] latest --- build-electron/app.jsc | Bin 63568 -> 63520 bytes desktop-app/src/app/adb-client.service.ts | 41 ++++++++---------- .../src/app/header/header.component.html | 6 +-- .../src/app/header/header.component.ts | 8 +--- .../src/app/packages/packages.component.css | 3 ++ .../src/app/packages/packages.component.html | 12 ++--- desktop-app/src/app/process-bucket.service.ts | 7 +++ package.json | 2 +- 8 files changed, 39 insertions(+), 40 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index ede22c2669cddded5f8eef0bb2af918c16686811..fe787ec57cf4ff0e693543c7080784524214be6b 100644 GIT binary patch delta 10656 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 this.spinnerService.hideLoader()); - } else { - return Promise.reject('Invalid OBB'); - } + return this.processService.addItem('file_install', async task => { + task.status = 'Transferring OBB file...'; + return this.installLocalObb(filepath, false, null, 0, 0, task); + }); case '.zip': return this.processService.addItem('file_install', async task => { return this.installLocalZip(filepath, false, () => this.spinnerService.hideLoader(), task, true); @@ -518,22 +516,19 @@ export class AdbClientService { task => { name = name ? name + ': ' : ''; if (this.deviceStatus !== ConnectionStatus.CONNECTED) { - return Promise.reject(name + 'Apk install failed - No device connected! ' + filePath); + return Promise.reject(name + 'Apk install failed - No device connected!'); } const showTotal = number && total ? '(' + number + '/' + total + ') ' : ''; task.app_name = name; task.status = name + showTotal + 'Installing Apk... '; return this.adbCommand('install', { serial: this.deviceSerial, path: filePath, isLocal: !!isLocal }, status => { task.status = - (status.percent === 1 - ? name + showTotal + 'Installing Apk... ' - : name + showTotal + 'Downloading APK... ' + Math.round(status.percent * 100) + '% ') + - ' ' + - filePath + - ''; + status.percent === 1 + ? name + showTotal + 'Installing Apk...' + : name + showTotal + 'Downloading APK... ' + Math.round(status.percent * 100) + '% '; }) .then(r => { - task.status = name + 'APK file installed ok!! ' + filePath; + task.status = name + 'APK file installed ok!!'; if (deleteAfter) { this.appService.fs.unlink(filePath, err => {}); } @@ -559,7 +554,11 @@ export class AdbClientService { if (deleteAfter) { this.appService.fs.unlink(filePath, err => {}); } - return Promise.reject(e.message ? e.message : e.code ? e.code : e.toString() + ' ' + filePath); + let er = e.message ? e.message : e.code ? e.code : e.toString(); + if (er === 'SAFESIDE') { + this.appService.headerComponent.safeModal.openModal(); + } + return Promise.reject(er); }); }, name @@ -905,7 +904,7 @@ export class AdbClientService { installLocalObb(filepath: string, dontCatchError = false, cb = null, number?: number, total?: number, task?, name?: string) { let filename = this.appService.path.basename(filepath); let packageId = filename.match(/main.[0-9]{1,}.([A-z0-9.]{1,}).obb/)[1]; - console.log(packageId); + name = name || packageId; const showTotal = number && total ? '(' + number + '/' + total + ') ' : ''; if (!task) this.spinnerService.showLoader(); let p = this.runAdbCommand('adb push "' + filepath + '" /sdcard/Android/obb/' + packageId + '/' + filename); @@ -914,7 +913,7 @@ export class AdbClientService { } p = p.then(() => { if (task) { - task.status = name + 'File transferred successfully! ' + filepath; + task.status = name + ' File transferred successfully! '; } else { this.statusService.showStatus('File transferred successfully!'); } @@ -923,7 +922,7 @@ export class AdbClientService { p = p.catch(e => { if (task) { task.failed = true; - task.status = name + 'Failed to transfer file!! - ' + filepath; + task.status = name + ' Failed to transfer file!!'; } else { this.spinnerService.hideLoader(); this.statusService.showStatus(e.toString(), true); @@ -940,7 +939,7 @@ export class AdbClientService { '.obb': filepath => { if (this.appService.path.basename(filepath).match(/main.[0-9]{1,}.[a-z]{1,}.[A-z]{1,}.[A-z]{1,}.obb/)) { this.processService.addItem('file_install', async task => { - return this.installLocalObb(filepath, false, null, 1, 1, task).then(() => { + return this.installLocalObb(filepath, false, null, 1, 1, task, '').then(() => { if (deleteAfter) { this.appService.fs.unlink(filepath, err => {}); } @@ -951,8 +950,6 @@ export class AdbClientService { } }, }; - - //this.cleanUpFolder(); return new Promise(resolve => { if (task) { task.status = 'Extracting zip file download...'; diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html index 87282af..6bc1810 100644 --- a/desktop-app/src/app/header/header.component.html +++ b/desktop-app/src/app/header/header.component.html @@ -353,7 +353,7 @@ - +

ADB Logcat

@@ -425,8 +425,7 @@ Thank you and have a great day! - - +
@@ -586,7 +585,6 @@ - diff --git a/desktop-app/src/app/header/header.component.ts b/desktop-app/src/app/header/header.component.ts index 7f387ba..a6e2db4 100644 --- a/desktop-app/src/app/header/header.component.ts +++ b/desktop-app/src/app/header/header.component.ts @@ -39,11 +39,8 @@ export class HeaderComponent implements OnInit { @ViewChild('beatOnModal', { static: false }) beatOnModal; @ViewChild('mainLogo', { static: false }) mainLogo; @ViewChild('safeModal', { static: false }) safeModal; - safeResolve: any = val => val; folder = FolderType; - addrepoUrl: string = ''; - isAlive: boolean = true; - isAliveChecking: boolean = false; + isAlive = true; replaceText: ReplaceText[] = []; adbCommandToRun: string; osPlatform: string; @@ -97,11 +94,8 @@ export class HeaderComponent implements OnInit { public webService: WebviewService, public spinnerService: LoadingSpinnerService, public statusService: StatusBarService, - public repoService: RepoService, public beatonService: BeatOnService, public dragAndDropService: DragAndDropService, - // private dragulaService: DragulaService, - public router: Router, public processService: ProcessBucketService ) { this.osPlatform = this.appService.os.platform(); diff --git a/desktop-app/src/app/packages/packages.component.css b/desktop-app/src/app/packages/packages.component.css index dc0b27f..e68ab96 100644 --- a/desktop-app/src/app/packages/packages.component.css +++ b/desktop-app/src/app/packages/packages.component.css @@ -16,3 +16,6 @@ #SearchPackage{ color: white!important; } +.backup-name{ + line-height: 30px; +} diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html index 40e995a..e678f83 100644 --- a/desktop-app/src/app/packages/packages.component.html +++ b/desktop-app/src/app/packages/packages.component.html @@ -63,14 +63,14 @@ Backup Game Data

-
+
sync
-
-
+
+
{{showBackupFileName(backup)}}
@@ -83,14 +83,14 @@ Open Backups

-
+
sync
-
-
+
+
{{showBackupFileName(backup)}}
diff --git a/desktop-app/src/app/process-bucket.service.ts b/desktop-app/src/app/process-bucket.service.ts index f570694..1fc483c 100644 --- a/desktop-app/src/app/process-bucket.service.ts +++ b/desktop-app/src/app/process-bucket.service.ts @@ -20,6 +20,7 @@ export interface ProcessTask { }) export class ProcessBucketService { tasks: ProcessTask[]; + currentTask: ProcessTask; is_running: boolean; left_length: number; failed_length: number; @@ -84,12 +85,14 @@ export class ProcessBucketService { if (objects.length) { this.is_running = true; let task = objects[0]; + this.currentTask = task; task.running = true; await task .resolve(task) .then(() => { task.running = false; task.succeeded = true; + this.currentTask = null; if (!task.cancelled) { return timeout.then(() => this.processBucket()); } @@ -99,6 +102,7 @@ export class ProcessBucketService { task.status = (task.app_name ? task.app_name + ': ' : '') + (e.message ? e.message : e.code ? e.code : e.toString()); task.failed = true; + this.currentTask = null; this.statusService.showStatus(task.status, true); if (!task.cancelled) { return timeout.then(() => this.processBucket()); @@ -151,6 +155,9 @@ export class ProcessBucketService { this.tasks = this.tasks.filter(t => !t.failed); } clearAll() { + if (this.currentTask) { + this.skipCurrent(this.currentTask); + } this.tasks = []; } } diff --git a/package.json b/package.json index 994bdb2..cae6504 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "main": "build-electron/boot.js", "scripts": { "concurrently": "concurrently", - "start": "concurrently \"yarn electron-build && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"", + "start": "concurrently \"yarn electron-build && yarn platform-tools && wait-on http-get://localhost:4205/ && cross-env NODE_ENV=dev electron .\" \"cd desktop-app && ng serve --port 4205\"", "postinstall": "electron-builder install-app-deps && cd desktop-app && yarn install", "dist": "yarn electron-build && yarn platform-tools && yarn app-build && electron-builder", "angular": "cd desktop-app && ng serve --port 4205",