diff --git a/build-electron/app.jsc b/build-electron/app.jsc
index 7f51dec..a195902 100644
Binary files a/build-electron/app.jsc and b/build-electron/app.jsc differ
diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts
index abd2a6e..c42471c 100644
--- a/desktop-app/src/app/adb-client.service.ts
+++ b/desktop-app/src/app/adb-client.service.ts
@@ -904,7 +904,8 @@ 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-z]{1,}.[A-z]{1,}.[A-z]{1,}).obb/)[1];
+ let packageId = filename.match(/main.[0-9]{1,}.([A-z0-9.]{1,}).obb/)[1];
+ console.log(packageId);
const showTotal = number && total ? '(' + number + '/' + total + ') ' : '';
if (!task) this.spinnerService.showLoader();
let p = this.runAdbCommand('adb push "' + filepath + '" /sdcard/Android/obb/' + packageId + '/' + filename);
diff --git a/desktop-app/src/app/electron.service.ts b/desktop-app/src/app/electron.service.ts
index 6b9ce05..7c8456c 100644
--- a/desktop-app/src/app/electron.service.ts
+++ b/desktop-app/src/app/electron.service.ts
@@ -134,6 +134,7 @@ export class ElectronService {
setupIPC() {
this.appService.electron.ipcRenderer.on('pre-open-url', (event, data) => {
+ console.log('here', data);
this.spinnerService.showLoader();
this.spinnerService.setMessage('Do you want to install this file? ' + data.name);
this.spinnerService.setupConfirm().then(() => {
diff --git a/desktop-app/src/app/files/files.component.css b/desktop-app/src/app/files/files.component.css
index 9be7e64..38ae7af 100644
--- a/desktop-app/src/app/files/files.component.css
+++ b/desktop-app/src/app/files/files.component.css
@@ -1,6 +1,10 @@
.breadcrumb-wrapper{
position: fixed;
- top: 200px;
+ top: 165px;
+ width: 100%;
+ height: auto;
+ z-index: 1;
+ line-height: 40px;
}
.drag-indicator{
diff --git a/desktop-app/src/app/files/files.component.html b/desktop-app/src/app/files/files.component.html
index 5d3cc5b..7fde349 100644
--- a/desktop-app/src/app/files/files.component.html
+++ b/desktop-app/src/app/files/files.component.html
@@ -1,15 +1,14 @@
-
-
+
-
+
@@ -54,12 +53,13 @@
class="btn-floating blue">folder
folder
-
0" mz-tooltip position="left" tooltip="Delete selected items"
- (click)="filesToBeDeleted = selectedFiles; confirmModal.openModal()">delete
get_app
+
0" class="divider">
+
0" mz-tooltip position="left" tooltip="Delete selected items"
+ (click)="filesToBeDeleted = selectedFiles; confirmModal.openModal()">delete
0" mz-tooltip position="left" tooltip="Save selected items to computer"
(click)="filesToBeSaved = selectedFiles; filesModal.openModal()">
get_app
@@ -149,7 +149,7 @@
-
WARNING: This cannot be undone!!
+ WARNING: This cannot be undone!!
Close
diff --git a/desktop-app/src/app/files/files.component.ts b/desktop-app/src/app/files/files.component.ts
index e08b5f2..27feefd 100644
--- a/desktop-app/src/app/files/files.component.ts
+++ b/desktop-app/src/app/files/files.component.ts
@@ -33,6 +33,7 @@ export class FilesComponent implements OnInit {
isOpen: boolean = false;
currentPath: string;
folderName: string;
+ folderSize: string;
currentFile: FileFolderListing;
quickSaveModels: string[] = ['Quest', 'Go'];
constructor(
@@ -296,11 +297,10 @@ export class FilesComponent implements OnInit {
this.breadcrumbs.push({ path, name });
}
open(path: string) {
- //this.spinnerService.showLoader();
- //this.spinnerService.setMessage('Loading files...');
this.currentPath = path;
this.breadcrumbs = [];
this.selectedFiles.length = 0;
+ this.files.length = 0;
this.getCrumb(
this.currentPath
.split('/')
@@ -318,7 +318,6 @@ export class FilesComponent implements OnInit {
return textA < textB ? -1 : textA > textB ? 1 : 0;
});
this.files = this.files.filter(d => d.icon === 'folder').concat(this.files.filter(d => d.icon !== 'folder'));
- //this.spinnerService.hideLoader();
});
}
openSaveLocation() {
@@ -326,6 +325,16 @@ export class FilesComponent implements OnInit {
}
async readdir(path: String) {
let dirContents: FileFolderListing[];
+ let isRoot = ['/sdcard/', 'sdcard', 'sdcard/', '/sdcard'].indexOf(path) > -1;
+ if (isRoot) {
+ this.folderSize = null;
+ } else {
+ this.folderSize = await this.adbService.adbCommand('shell', {
+ serial: this.adbService.deviceSerial,
+ command: 'du -sh "' + path + '"',
+ });
+ this.folderSize = this.folderSize.split('\t')[0];
+ }
await this.adbService.adbCommand('readdir', { serial: this.adbService.deviceSerial, path }).then(files => {
dirContents = files.map(file => {
const name = file.name;
diff --git a/desktop-app/src/app/header/header.component.html b/desktop-app/src/app/header/header.component.html
index 732c391..87282af 100644
--- a/desktop-app/src/app/header/header.component.html
+++ b/desktop-app/src/app/header/header.component.html
@@ -21,8 +21,8 @@
- Manage the files on your headset. Drag and drop to move
- files onto your headset.
+
+
Manage the apps on your headset. Click Show All to
see all apps including system apps.
Manage settings on your headset.
@@ -353,6 +353,7 @@
Stop & Close
+ Stop Only
ADB Logcat
@@ -574,7 +575,7 @@
- TO use ScrCpy on Linux you will need to install snap package manager with sudo snap install scrcpy
+ To use ScrCpy on Linux you will need to install snap package manager with sudo snap install scrcpy
diff --git a/desktop-app/src/app/packages/packages.component.html b/desktop-app/src/app/packages/packages.component.html
index 25a5aaa..40e995a 100644
--- a/desktop-app/src/app/packages/packages.component.html
+++ b/desktop-app/src/app/packages/packages.component.html
@@ -57,6 +57,25 @@
{{currentPackage.package.packageName}}
Version: {{currentPackage.versionCode}}
+
+ Game Data Backups
+ Backup data files from your SD Card for this app/game.
+ Backup Game Data
+
+
+
+
+ {{showBackupFileName(backup)}}
+
+
+
+
APK Backups
Backup your APK file from your device.
- Game Data Backups
- Backup data files from your SD Card for this app/game.
- Backup Game Data
-
-
-
-
- {{showBackupFileName(backup)}}
-
-
-
-
diff --git a/desktop-app/src/app/process-bucket.service.ts b/desktop-app/src/app/process-bucket.service.ts
index 6feee25..f570694 100644
--- a/desktop-app/src/app/process-bucket.service.ts
+++ b/desktop-app/src/app/process-bucket.service.ts
@@ -12,6 +12,7 @@ export interface ProcessTask {
failed?: boolean;
succeeded?: boolean;
cancelled?: boolean;
+ reported?: boolean;
resolve: (task: ProcessTask) => Promise;
}
@Injectable({
@@ -105,7 +106,8 @@ export class ProcessBucketService {
});
this.tasks = this.tasks.filter(t => t !== task);
} else {
- let failed = this.tasks.filter(t => t.failed);
+ let failed = this.tasks.filter(t => t.failed && !t.reported);
+ failed.forEach(f => (f.reported = true));
this.failed_length = failed.length;
let hasFailed = !!this.failed_length;
if (this.is_running) {
diff --git a/electron/app.ts b/electron/app.ts
index 94362ed..b2c36a1 100644
--- a/electron/app.ts
+++ b/electron/app.ts
@@ -13,12 +13,14 @@ const request = require('request');
const progress = require('request-progress');
const Readable = require('stream').Readable;
import { SetPropertiesCommand } from './setproperties';
-
+let has_port = process.argv.indexOf('--port');
+let valid_port = has_port > -1 && process.argv[has_port + 1] && Number.isInteger(Number(process.argv[has_port + 1]));
class ADB {
client;
_logcat;
setupAdb(adbPath, cb, ecb) {
if (this.client) return;
+ let port = valid_port ? Number(process.argv[has_port + 1]) : process.env.ANDROID_ADB_SERVER_PORT || 5037;
this.client = adb.createClient({
bin: adbPath,
});
@@ -427,7 +429,10 @@ function createWindow() {
mainWindow.webContents.session.on('will-download', (_evt, item, _webContents) => {
let url = item.getURL();
+ let urls = item.getURLChain();
+ let name = item.getFilename();
let etx = path.extname(url.split('?')[0]).toLowerCase();
+ let etx2 = urls.length ? path.extname(urls[0].split('?')[0]).toLowerCase() : etx;
if (~url.indexOf('https://beatsaver.com/cdn')) {
// beat saber mods /songs
mainWindow.webContents.send('open-url', 'sidequest://bsaber/#' + url);
@@ -440,12 +445,14 @@ function createWindow() {
} else if (etx === '.audica') {
// audica custom song format
mainWindow.webContents.send('open-url', 'sidequest://audica/#' + url);
- } else if (etx === '.apk') {
+ } else if (etx === '.apk' || etx2 === '.apk') {
// any file ending with apk.
- mainWindow.webContents.send('pre-open-url', url);
+ mainWindow.webContents.send('pre-open-url', { url, name });
+ BrowserWindow.getAllWindows()
+ .filter(b => b !== mainWindow)
+ .forEach(b => b.close());
} else if (~url.indexOf('ssl.hwcdn.net/') || ~url.indexOf('patreonusercontent.com/')) {
//itch.io & patreon
- let name = item.getFilename();
mainWindow.webContents.send('pre-open-url', { url, name });
BrowserWindow.getAllWindows()
.filter(b => b !== mainWindow)