diff --git a/desktop-app/src/app/adb-client.service.ts b/desktop-app/src/app/adb-client.service.ts index 8c98d68..7271332 100644 --- a/desktop-app/src/app/adb-client.service.ts +++ b/desktop-app/src/app/adb-client.service.ts @@ -30,7 +30,7 @@ export class AdbClientService { lastConnectionCheck: number; deviceStatus: ConnectionStatus = ConnectionStatus.UNAUTHORIZED; deviceStatusMessage: string = 'Connecting...'; - pollInterval: number = 1000 * 5; + pollInterval: number = 1000 * 2; savePath: string; isTransferring: boolean; adbResolves: any; diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 0f70353..b239a56 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -197,31 +197,31 @@ export class AppService { openFolder(folder: FolderType, packageName?: string) { switch (folder) { case FolderType.MAIN: - this.electron.shell.openPath(this.appData); + this.electron.shell.openItem(this.appData); break; case FolderType.BSABER: - this.electron.shell.openPath(this.path.join(this.appData, 'bsaber')); + this.electron.shell.openItem(this.path.join(this.appData, 'bsaber')); break; case FolderType.BSABER_BACKUPS: - this.electron.shell.openPath(this.path.join(this.appData, 'bsaber-backups')); + this.electron.shell.openItem(this.path.join(this.appData, 'bsaber-backups')); break; case FolderType.ADB: - this.electron.shell.openPath(this.path.join(this.appData, 'platform-tools')); + this.electron.shell.openItem(this.path.join(this.appData, 'platform-tools')); break; case FolderType.APK_BACKUPS: - this.electron.shell.openPath(this.path.join(this.appData, 'backups')); + this.electron.shell.openItem(this.path.join(this.appData, 'backups')); break; case FolderType.DATA_BACKUPS: - this.electron.shell.openPath(this.path.join(this.appData, 'bsaber-data-backups')); + this.electron.shell.openItem(this.path.join(this.appData, 'bsaber-data-backups')); break; case FolderType.QUEST_SABER_PATCH: - this.electron.shell.openPath(this.path.join(this.appData, 'saber-quest-patch', 'questsaberpatch')); + this.electron.shell.openItem(this.path.join(this.appData, 'saber-quest-patch', 'questsaberpatch')); break; case FolderType.APP_BACKUP: - this.electron.shell.openPath(this.path.join(this.backupPath, packageName)); + this.electron.shell.openItem(this.path.join(this.backupPath, packageName)); break; case FolderType.SONG_FOLDER: - this.electron.shell.openPath(this.path.join(this.appData, 'bsaber', packageName)); + this.electron.shell.openItem(this.path.join(this.appData, 'bsaber', packageName)); break; } } diff --git a/desktop-app/src/app/files/files.component.html b/desktop-app/src/app/files/files.component.html index 456d7a0..bea3960 100644 --- a/desktop-app/src/app/files/files.component.html +++ b/desktop-app/src/app/files/files.component.html @@ -12,7 +12,7 @@

- No device connected...

+ No device connected yet...
@@ -20,6 +20,7 @@

No files here...

+
{{this.currentPath}}
Please enter a folder name.
- +
diff --git a/desktop-app/src/app/files/files.component.ts b/desktop-app/src/app/files/files.component.ts index 4cded8e..35a0710 100644 --- a/desktop-app/src/app/files/files.component.ts +++ b/desktop-app/src/app/files/files.component.ts @@ -25,6 +25,7 @@ export class FilesComponent implements OnInit { @ViewChild('filesModal', { static: false }) filesModal; @ViewChild('fixedAction', { static: false }) fixedAction; @ViewChild('downloadMediaModal', { static: false }) downloadMediaModal; + @ViewChild('mkDirModal', { static: true }) mkDirModal; files: FileFolderListing[] = []; selectedFiles: FileFolderListing[] = []; filesToBeSaved: FileFolderListing[]; @@ -64,8 +65,8 @@ export class FilesComponent implements OnInit { return this.statusService.showStatus('A folder already exists with that name!!', true); } else { await this.adbService.makeDirectory(this.appService.path.posix.join(this.currentPath, this.folderName)).then(r => { + this.open(this.appService.path.posix.join(this.currentPath, this.folderName)); this.folderName = ''; - this.open(this.currentPath); }); } } @@ -298,6 +299,12 @@ export class FilesComponent implements OnInit { } this.breadcrumbs.push({ path, name }); } + autoReturn(event, callback) { + if (event.keyCode === 13) { + callback(); + this.mkDirModal.closeModal(); + } + } open(path: string) { this.currentPath = path; this.breadcrumbs = []; @@ -323,7 +330,7 @@ export class FilesComponent implements OnInit { }); } openSaveLocation() { - this.appService.electron.remote.shell.openPath(this.adbService.savePath); + this.appService.electron.remote.shell.openItem(this.adbService.savePath); } async readdir(path: string) { let dirContents: FileFolderListing[]; diff --git a/electron/app.ts b/electron/app.ts index bffa24d..bad3e63 100644 --- a/electron/app.ts +++ b/electron/app.ts @@ -490,7 +490,7 @@ function createWindow() { if (error) console.error('Failed to register protocol'); } ); - + mainWindow.webContents.on('did-fail-load', () => mainWindow.loadURL(mainWindow.webContents.getURL())); mainWindow.webContents.session.on('will-download', (_evt, item, _webContents) => { let url = item.getURL(); let urls = item.getURLChain(); diff --git a/yarn.lock b/yarn.lock index bf689d7..0d70de7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1009,10 +1009,10 @@ electron-updater@^4.1.2: pako "^1.0.10" semver "^6.2.0" -electron@9.4.0: - version "9.4.0" - resolved "https://registry.yarnpkg.com/electron/-/electron-9.4.0.tgz#c3c607e3598226ddbaaff8babcdffa8bb2210936" - integrity sha512-hOC4q0jkb+UDYZRy8vrZ1IANnq+jznZnbkD62OEo06nU+hIbp2IrwDRBNuSLmQ3cwZMVir0WSIA1qEVK0PkzGA== +electron@7.2.4: + version "7.2.4" + resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9" + integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12"