mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-03-26 10:21:52 +00:00
wiz error handling
This commit is contained in:
committed by
Aiden McClelland
parent
e6518097f2
commit
e527aa9a5f
@@ -93,6 +93,7 @@ export class EmbassyPage {
|
||||
try {
|
||||
this.stateService.torAddress = (await this.stateService.setupEmbassy()).torAddress
|
||||
} catch (e) {
|
||||
this.errorToastService.present(`${e.message}: ${e.details}`)
|
||||
console.error(e.message)
|
||||
console.error(e.details)
|
||||
} finally {
|
||||
|
||||
@@ -39,7 +39,7 @@ export class RecoverPage {
|
||||
try {
|
||||
this.recoveryDrives = (await this.apiService.getDrives()).filter(d => !!d['embassy_os'])
|
||||
} catch (e) {
|
||||
this.errorToastService.present(e.message)
|
||||
this.errorToastService.present(`${e.message}: ${e.data}`)
|
||||
} finally {
|
||||
this.loading = false
|
||||
}
|
||||
|
||||
@@ -30,7 +30,6 @@ export class SuccessPage {
|
||||
|
||||
async goToEmbassy () {
|
||||
window.location.reload()
|
||||
// await this.navCtrl.navigateForward(`/recover`, { animationDirection: 'forward' })
|
||||
}
|
||||
|
||||
async copyToClipboard (str: string): Promise<boolean> {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { Injectable } from '@angular/core'
|
||||
import { BehaviorSubject } from 'rxjs';
|
||||
import { ApiService, DiskInfo } from './api/api.service'
|
||||
import { ErrorToastService } from './error-toast.service';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
@@ -19,7 +20,8 @@ export class StateService {
|
||||
torAddress: string
|
||||
|
||||
constructor(
|
||||
private readonly apiService: ApiService
|
||||
private readonly apiService: ApiService,
|
||||
private errorToastService: ErrorToastService
|
||||
) {}
|
||||
|
||||
async pollDataTransferProgress(callback?: () => void) {
|
||||
@@ -30,15 +32,23 @@ export class StateService {
|
||||
this.dataTransferProgress?.totalBytes &&
|
||||
this.dataTransferProgress.bytesTransfered === this.dataTransferProgress.totalBytes
|
||||
) {return }
|
||||
|
||||
const progress = await this.apiService.getDataTransferProgress()
|
||||
this.dataTransferProgress = {
|
||||
bytesTransfered: progress['bytes-transfered'],
|
||||
totalBytes: progress['total-bytes']
|
||||
|
||||
|
||||
let progress
|
||||
try {
|
||||
progress =await this.apiService.getDataTransferProgress()
|
||||
} catch (e) {
|
||||
this.errorToastService.present(`${e.message}: ${e.details}`)
|
||||
}
|
||||
if (this.dataTransferProgress.totalBytes) {
|
||||
this.dataProgress = this.dataTransferProgress.bytesTransfered / this.dataTransferProgress.totalBytes
|
||||
this.dataProgSubject.next(this.dataProgress)
|
||||
if (progress) {
|
||||
this.dataTransferProgress = {
|
||||
bytesTransfered: progress['bytes-transfered'],
|
||||
totalBytes: progress['total-bytes']
|
||||
}
|
||||
if (this.dataTransferProgress.totalBytes) {
|
||||
this.dataProgress = this.dataTransferProgress.bytesTransfered / this.dataTransferProgress.totalBytes
|
||||
this.dataProgSubject.next(this.dataProgress)
|
||||
}
|
||||
}
|
||||
this.pollDataTransferProgress(callback)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user