From 52d692271384e72a6dec310d143e7865ab3a18d3 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 15 Jun 2020 17:35:09 +0100 Subject: [PATCH] fixed parsing of obb filenames to include patch as well as main --- build-electron/app.jsc | Bin 65192 -> 65192 bytes desktop-app/src/app/adb-client.service.ts | 2 +- package.json | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index 97a761a82b651254371f9a28bce5335d88193581..41bde0423a5e32c348ac05dc29959317bf161584 100644 GIT binary patch delta 4491 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 delta 4491 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 Mi#m*5Hs~PufAo64b^rhX diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 59e2778..283ccf4 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -887,7 +887,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]; + let packageId = filename.match(/[a-z]{4,5}.[0-9]{1,}.([A-z0-9.]{1,}).obb/)[1]; name = name || packageId; const showTotal = number && total ? '(' + number + '/' + total + ') ' : ''; if (!task) this.spinnerService.showLoader(); diff --git a/package.json b/package.json index 0fddcb3..4823e8a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "SideQuest", "productName": "SideQuest", - "version": "0.10.8", + "version": "0.10.9", "description": "A open app store for mobile android based VR devices such as the Levovo Mirage, Oculus Go, Oculus Quest, Vive Focus.", "repository": "https://github.com/the-expanse/SideQuest.git", "license": "UNLICENCED",