Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

finalizing bug fix

Browse Source
This commit is contained in:
Drew Ansbacher
2021-12-01 14:49:14 -07:00
committed by Aiden McClelland
parent 82602af601
commit 6c3e99f3e1
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
View File

@@ -109,7 +109,9 @@
<ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 1" color="warning">Update Available</ion-text> <ion-text *ngIf="(pkg.manifest.version | compareEmver : localPkg.manifest.version) === 1" color="warning">Update Available</ion-text>
</p> </p>
<p *ngIf="[PackageState.Installing, PackageState.Updating] | includes : localPkg.state"> <p *ngIf="[PackageState.Installing, PackageState.Updating] | includes : localPkg.state">
<ion-text color="primary">{{ localPkg.state | titlecase }}...{{ (localPkg['install-progress'] | installState).totalProgress }}%</ion-text> <ion-text color="primary">{{ localPkg.state | titlecase }}...
<span>{{ (localPkg['install-progress'] | installState).display }}</span>
</ion-text>
</p> </p>
<p *ngIf="localPkg.state === PackageState.Removing"> <p *ngIf="localPkg.state === PackageState.Removing">
<ion-text color="warning">{{ localPkg.state | titlecase }}</ion-text> <ion-text color="warning">{{ localPkg.state | titlecase }}</ion-text>

2
ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
View File

@@ -32,7 +32,7 @@
</p> </p>
<!-- installing, updating --> <!-- installing, updating -->
<p *ngIf="[PackageState.Installing, PackageState.Updating] | includes : localPkg.state"> <p *ngIf="[PackageState.Installing, PackageState.Updating] | includes : localPkg.state">
<ion-text color="primary">{{ localPkg.state | titlecase }}...{{ (localPkg['install-progress'] | installState).totalProgress }}%</ion-text> <ion-text color="primary">{{ localPkg.state | titlecase }}...{{ (localPkg['install-progress'] | installState).display }}</ion-text>
</p> </p>
<!-- removing --> <!-- removing -->
<p *ngIf="localPkg.state === PackageState.Removing"> <p *ngIf="localPkg.state === PackageState.Removing">

6
ui/src/app/util/package-loading-progress.ts
View File

@@ -31,13 +31,14 @@ export function packageLoadingProgress (
const denominator = Math.floor( const denominator = Math.floor(
size * (downloadWeight + validateWeight + unpackWeight), size * (downloadWeight + validateWeight + unpackWeight),
) )
const totalProgress = Math.floor(100 * numerator / denominator)
return { return {
totalProgress: Math.floor((100 * numerator) / denominator), totalProgress,
downloadProgress: Math.floor((100 * downloaded) / size), downloadProgress: Math.floor((100 * downloaded) / size),
validateProgress: Math.floor((100 * validated) / size), validateProgress: Math.floor((100 * validated) / size),
unpackProgress: Math.floor((100 * unpacked) / size), unpackProgress: Math.floor((100 * unpacked) / size),
isComplete: downloadComplete && validationComplete && unpackComplete, isComplete: downloadComplete && validationComplete && unpackComplete,
display: totalProgress > 98 ? 'Finalizing' : `${totalProgress}%`,
} }
} }
@@ -47,4 +48,5 @@ export interface ProgressData {
validateProgress: number validateProgress: number
unpackProgress: number unpackProgress: number
isComplete: boolean isComplete: boolean
display: string
} }