-
-
-
- @let manifest = item.manifest;
- @if (manifest) {
- -
-
-diff --git a/src/app/apps/channel/channel.component.ts b/src/app/apps/channel/channel.component.ts index 41e9dcf0..a979d5c4 100644 --- a/src/app/apps/channel/channel.component.ts +++ b/src/app/apps/channel/channel.component.ts @@ -1,32 +1,45 @@ -import {Component, Host, Input, OnInit} from '@angular/core'; +import {Component, Host, Injector, Input, OnInit} from '@angular/core'; import {Observable} from 'rxjs'; -import {AppsRepoService, RepositoryPage} from '../../core/services'; +import {AppsRepoService, RepositoryItem, RepositoryPage} from '../../core/services'; import {AppsComponent} from '../apps.component'; import {RawPackageInfo} from "../../types"; +import {DetailsComponent} from "../details/details.component"; +import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; @Component({ - selector: 'app-channel', - templateUrl: './channel.component.html', - styleUrls: ['./channel.component.scss'] + selector: 'app-channel', + templateUrl: './channel.component.html', + styleUrls: ['./channel.component.scss'] }) export class ChannelComponent implements OnInit { - page = 1; - repoPage$?: Observable{{ item.title }}-{{ manifest.appDescription }}++ @let repoPage = repoPage$ | async; + @if (repoPage) { +- - } - - --
+
-
+ @let manifest = item.manifest;
+ @if (manifest) {
+ +-
+
+{{ item.title }}+{{ manifest.appDescription }}+
--} @else { -- --} + + } + + + ++ } @else { ++ ++ } + ; + page = 1; + repoPage$?: Observable ; - @Input() - installed?: Record ; installedInfo$?: Observable ; - incompatible$: Observable ; @@ -56,12 +54,11 @@ export class DetailsComponent implements OnInit, OnDestroy { constructor( public modal: NgbActiveModal, public item: RepositoryItem, - @Inject('device') public device: Device, private appManager: AppManagerService, private renderer2: Renderer2 ) { this.manifest = item.manifest!; - this.incompatible$ = fromPromise(this.appManager.checkIncompatibility(device, item)); + // this.incompatible$ = fromPromise(this.appManager.checkIncompatibility(device, item)); this.fullDescriptionHtml$ = item.fullDescriptionUrl ? fromPromise(fetch(item.fullDescriptionUrl) .then(resp => resp.text())) : of(''); this.reloadInstalledInfo(); @@ -89,6 +86,6 @@ export class DetailsComponent implements OnInit, OnDestroy { } private reloadInstalledInfo(): void { - this.installedInfo$ = fromPromise(this.appManager.info(this.device, this.item.id)); + // this.installedInfo$ = fromPromise(this.appManager.info(this.device, this.item.id)); } } diff --git a/src/app/apps/installed/details/details.component.html b/src/app/apps/installed/details/details.component.html new file mode 100644 index 00000000..3bc8cae9 --- /dev/null +++ b/src/app/apps/installed/details/details.component.html @@ -0,0 +1,29 @@ + +diff --git a/src/app/apps/installed/details/details.component.scss b/src/app/apps/installed/details/details.component.scss new file mode 100644 index 00000000..d20d912e --- /dev/null +++ b/src/app/apps/installed/details/details.component.scss @@ -0,0 +1,8 @@ +.app-header { + min-height: 64px; +} + +.app-icon { + width: 64px; + height: 64px; +} diff --git a/src/app/apps/installed/details/details.component.spec.ts b/src/app/apps/installed/details/details.component.spec.ts new file mode 100644 index 00000000..82e1a058 --- /dev/null +++ b/src/app/apps/installed/details/details.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DetailsComponent } from './details.component'; + +describe('DetailsComponent', () => { + let component: DetailsComponent; + let fixture: ComponentFixture+++
{{ pkg.title }}
+v{{ pkg.version }}+{{ pkg.appDescription }}
+-
+
- + Launch + +
- + Uninstall + +
-
+ Space used++ @let du = diskUsage$ | async; + @if (!du) { + Calculating... + } @else if (du.error) { + Failed to calculate + } @else if (du.result) { + {{ du.result.total * 1024 | filesize:sizeOptions }} + } ++
+
; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [DetailsComponent] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DetailsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/apps/installed/details/details.component.ts b/src/app/apps/installed/details/details.component.ts new file mode 100644 index 00000000..35694908 --- /dev/null +++ b/src/app/apps/installed/details/details.component.ts @@ -0,0 +1,35 @@ +import {Component, Inject} from '@angular/core'; +import {AsyncResult, Device, PackageInfo} from "../../../types"; +import {AppManagerService, PackageDiskUsage} from "../../../core/services"; +import {fromPromise} from "rxjs/internal/observable/innerFrom"; +import {Observable} from "rxjs"; +import {AsyncPipe} from "@angular/common"; +import {SharedModule} from "../../../shared/shared.module"; +import {FilesizePipe} from "../../../shared/pipes/filesize.pipe"; +import {FileSizeOptions} from "filesize"; + +@Component({ + selector: 'app-details', + standalone: true, + imports: [ + AsyncPipe, + SharedModule, + FilesizePipe + ], + templateUrl: './details.component.html', + styleUrl: './details.component.scss' +}) +export class DetailsComponent { + + diskUsage$: Observable - -} @else if (installed) { --
- @for (pkg of installed; track pkg.id) {
-
-
- - -
-
-{{ pkg.title }}-- v{{ pkg.version }} - @let rpkg = repoPackages && repoPackages[pkg.id]; - @if (rpkg && rpkg.manifest?.hasUpdate(pkg.version)) { - › v{{ rpkg.manifest?.version }} - } +diff --git a/src/app/apps/installed/installed.component.ts b/src/app/apps/installed/installed.component.ts index 82463024..531a7167 100644 --- a/src/app/apps/installed/installed.component.ts +++ b/src/app/apps/installed/installed.component.ts @@ -1,49 +1,39 @@ -import {Component, Host, Input, OnDestroy} from '@angular/core'; +import {Component, Host, Injector, OnDestroy, OnInit} from '@angular/core'; import {AppsComponent} from '../apps.component'; import {Device, PackageInfo} from "../../types"; import {Observable, Subscription} from "rxjs"; -import {AppsRepoService, RepositoryItem} from "../../core/services"; +import {AppManagerService, DeviceManagerService, RepositoryItem} from "../../core/services"; +import {fromPromise} from "rxjs/internal/observable/innerFrom"; +import {DetailsComponent as InstalledDetailsComponent} from "./details/details.component"; +import {NgbModal} from "@ng-bootstrap/ng-bootstrap"; @Component({ selector: 'app-installed', templateUrl: './installed.component.html', styleUrls: ['./installed.component.scss'] }) -export class InstalledComponent implements OnDestroy { +export class InstalledComponent implements OnInit, OnDestroy { - @Input() device: Device | null = null; + devices$?: Observable+ + +++ @let installed = installed$ | async; + @if (installedError) { +- @if (repoPackages?.[pkg.id]?.manifest?.hasUpdate(pkg.version)) { - - } - - } - -} @else { -+ + } @else if (installed) { +-
+ @for (pkg of installed; track pkg.id) {
+
-
+ + +-
+
+{{ pkg.title }}++ v{{ pkg.version }} + @let rpkg = repoPackages && repoPackages[pkg.id]; + @if (rpkg && rpkg.manifest?.hasUpdate(pkg.version)) { + › v{{ rpkg.manifest?.version }} + } +
-} + @if (repoPackages?.[pkg.id]?.manifest?.hasUpdate(pkg.version)) { + + } + + } + + } @else { + + } + { + const appIndex = appDir.indexOf('/usr/palm/applications/'); + if (appIndex < 0) { + throw new Error('Not accepted appDir format: ' + appDir); + } + const installBase = appDir.substring(0, appIndex); + const appId = appDir.substring(appIndex + 23); + const pkgInfo = JSON.parse(await this.file.read(device, `${installBase}/usr/palm/packages/${appId}/packageinfo.json`, undefined, 'utf-8')) as PkgInfo; + const dirs = [appDir]; + pkgInfo.services?.forEach(service => { + const serviceDir = `${installBase}/usr/palm/services/${service}`; + dirs.push(serviceDir); + }); + return await this.cmd.exec(device, `xargs du -d 0 -c`, 'utf-8', dirs.join('\n')) + .then(stdout => (Object.fromEntries(stdout.split('\n').map(line => line.match(/(\d+)\t(.+)/)) + .map((match): [keyof PackageDiskUsage, number] | null => { + if (!match) { + return null; + } + const size = parseInt(match[1] ?? '0'); + const path = match[2] ?? ''; + if (path === 'total') { + return ['total', size]; + } else if (path.includes('/usr/palm/applications')) { + return ['application', size]; + } else if (path.includes('/usr/palm/services')) { + return [path.substring(path.lastIndexOf('/')), size]; + } + return null; + }).filter(v => v) as Iterable<[keyof PackageDiskUsage, number]>) as unknown as PackageDiskUsage)); + } } function mapAppinstalldResponse(v: LunaResponse, expectResult: string | RegExp): boolean { @@ -301,6 +332,10 @@ function mapAppinstalldResponse(v: LunaResponse, expectResult: string | RegExp): return false; } +interface PkgInfo { + services?: string[]; +} + export interface InstallProgressHandler { (progress?: number, statusText?: string): void; } @@ -314,3 +349,10 @@ export class InstallError extends Error { return new InstallError('Can\'t install because of insufficient space', details); } } + +export interface PackageDiskUsage { + application: number; + total: number; + + [service: string]: number; +} diff --git a/src/app/files/files.module.ts b/src/app/files/files.module.ts index 53296b53..9813047f 100644 --- a/src/app/files/files.module.ts +++ b/src/app/files/files.module.ts @@ -15,6 +15,7 @@ import {FilesTableComponent} from './files-table/files-table.component'; import {SharedModule} from "../shared/shared.module"; import {CreateDirectoryMessageComponent} from './create-directory-message/create-directory-message.component'; import {ReactiveFormsModule} from "@angular/forms"; +import {FilesizePipe} from "../shared/pipes/filesize.pipe"; @NgModule({ @@ -24,17 +25,18 @@ import {ReactiveFormsModule} from "@angular/forms"; FilesTableComponent, CreateDirectoryMessageComponent, ], - imports: [ - CommonModule, - FilesRoutingModule, - NgbTooltipModule, - SharedModule, - NgbDropdown, - NgbDropdownItem, - NgbDropdownMenu, - NgbDropdownToggle, - ReactiveFormsModule, - ] + imports: [ + CommonModule, + FilesRoutingModule, + NgbTooltipModule, + SharedModule, + NgbDropdown, + NgbDropdownItem, + NgbDropdownMenu, + NgbDropdownToggle, + ReactiveFormsModule, + FilesizePipe, + ] }) export class FilesModule { } diff --git a/src/app/shared/pipes/filesize.pipe.ts b/src/app/shared/pipes/filesize.pipe.ts index dd4e7b05..34bc576b 100644 --- a/src/app/shared/pipes/filesize.pipe.ts +++ b/src/app/shared/pipes/filesize.pipe.ts @@ -1,12 +1,13 @@ import {Pipe, PipeTransform} from "@angular/core"; -import {filesize, FileSizeOptionsBase} from 'filesize'; +import {filesize, FileSizeOptions} from 'filesize'; @Pipe({ - name: 'filesize' + name: 'filesize', + standalone: true }) export class FilesizePipe implements PipeTransform { - transform(bytes: number, options: Partial ): string { + transform(bytes: number, options: Partial ): string { return filesize(bytes, {output: "string", ...options}); } diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index a95a83d4..45be2a06 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -17,7 +17,6 @@ import {FilesizePipe} from "./pipes/filesize.pipe"; declarations: [ PageNotFoundComponent, TrustUriPipe, - FilesizePipe, MessageDialogComponent, ProgressDialogComponent, MessageTraceComponent, @@ -26,11 +25,10 @@ import {FilesizePipe} from "./pipes/filesize.pipe"; StatStorageInfoComponent, ], imports: [CommonModule, FormsModule, NgbModule, - ExternalLinkDirective], + ExternalLinkDirective, FilesizePipe], exports: [ PageNotFoundComponent, TrustUriPipe, - FilesizePipe, MessageDialogComponent, ProgressDialogComponent, MessageTraceComponent, diff --git a/src/app/types/index.ts b/src/app/types/index.ts index 76b77faf..c908fe04 100644 --- a/src/app/types/index.ts +++ b/src/app/types/index.ts @@ -1,3 +1,8 @@ export * from './device-manager'; export * from './file-session'; export * from './device'; + +export interface AsyncResult -
+
-
+ @let manifest = item.manifest;
+ @if (manifest) {
+