From dd6107d1fd793fef7942e27ad98d78ec8023eb28 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sun, 30 Jan 2022 17:15:11 +0100 Subject: [PATCH 1/5] Refactor error logging Signed-off-by: trivernis --- mediarepo-ui/src/app/app.component.scss | 10 ++++ mediarepo-ui/src/app/app.component.ts | 58 +++++++++++++++--- .../repositories-tab.component.ts | 10 ++-- .../file-action-base.component.ts | 4 +- .../content-viewer.component.ts | 8 +-- .../file-context-menu.component.ts | 4 +- .../file-multiview.component.ts | 4 +- .../add-repository-dialog.component.ts | 30 ++++------ .../edit-repository-dialog.component.ts | 32 +++++----- .../filesystem-import.component.ts | 12 ++-- .../file-search/file-search.component.ts | 8 +-- .../sidebar/tag-edit/tag-edit.component.ts | 6 +- .../error-broker/error-broker.service.ts | 53 ---------------- .../src/app/services/logging/LogEntry.ts | 24 ++++++++ .../logging.service.spec.ts} | 6 +- .../app/services/logging/logging.service.ts | 60 +++++++++++++++++++ .../services/repository/repository.service.ts | 24 ++++---- mediarepo-ui/src/colors.scss | 4 ++ 18 files changed, 218 insertions(+), 139 deletions(-) delete mode 100644 mediarepo-ui/src/app/services/error-broker/error-broker.service.ts create mode 100644 mediarepo-ui/src/app/services/logging/LogEntry.ts rename mediarepo-ui/src/app/services/{error-broker/error-broker.service.spec.ts => logging/logging.service.spec.ts} (62%) create mode 100644 mediarepo-ui/src/app/services/logging/logging.service.ts diff --git a/mediarepo-ui/src/app/app.component.scss b/mediarepo-ui/src/app/app.component.scss index 8b79f48..a48a9a2 100644 --- a/mediarepo-ui/src/app/app.component.scss +++ b/mediarepo-ui/src/app/app.component.scss @@ -1,3 +1,5 @@ +@import "src/colors"; + ::ng-deep .mat-button-wrapper > ng-icon { font-size: 26px; } @@ -5,3 +7,11 @@ ::ng-deep ng-icon { font-size: 24px; } + +::ng-deep .app-warn { + background-color: $warn-chill; +} + +::ng-deep .app-error { + background-color: $warn; +} diff --git a/mediarepo-ui/src/app/app.component.ts b/mediarepo-ui/src/app/app.component.ts index 3885fcc..af0801f 100644 --- a/mediarepo-ui/src/app/app.component.ts +++ b/mediarepo-ui/src/app/app.component.ts @@ -1,7 +1,9 @@ import {Component, OnInit} from "@angular/core"; import {RepositoryService} from "./services/repository/repository.service"; import {MatSnackBar} from "@angular/material/snack-bar"; -import {ErrorBrokerService} from "./services/error-broker/error-broker.service"; +import {LoggingService} from "./services/logging/logging.service"; +import {LogEntry, LogLevel} from "./services/logging/LogEntry"; +import {environment} from "../environments/environment"; @Component({ selector: "app-root", @@ -13,21 +15,39 @@ export class AppComponent implements OnInit { constructor( private snackBar: MatSnackBar, - private errorBroker: ErrorBrokerService, + private logger: LoggingService, private repoService: RepositoryService, ) { } async ngOnInit() { - this.errorBroker.errorCb = (err: { message: string }) => this.showError( - err); - this.errorBroker.infoCb = (info: string) => this.showInfo(info); + this.logger.logs.subscribe(entry => { + this.logEntry(entry); + switch (entry.getLevel()) { + case LogLevel.Info: + this.showInfo(entry.getMessage()); + break; + case LogLevel.Warn: + this.showWarning(entry.getMessage()); + break; + case LogLevel.Error: + this.showError(entry.getMessage()); + break; + } + }); await this.repoService.loadRepositories(); } - private showError(err: { message: string }) { - this.snackBar.open(err.message, undefined, { - panelClass: "warn", + private showError(err: string) { + this.snackBar.open(err, undefined, { + panelClass: "app-error", + duration: 2000, + }); + } + + private showWarning(err: string) { + this.snackBar.open(err, undefined, { + panelClass: "app-warn", duration: 2000, }); } @@ -38,4 +58,26 @@ export class AppComponent implements OnInit { duration: 2000, }); } + + private logEntry(entry: LogEntry) { + if (!environment.production) { + switch (entry.getLevel()) { + case LogLevel.Trace: + console.trace(entry.getMessage(), entry); + break; + case LogLevel.Debug: + console.debug(entry.getMessage(), entry); + break; + case LogLevel.Info: + console.info(entry.getMessage(), entry); + break; + case LogLevel.Warn: + console.warn(entry.getMessage(), entry); + break; + } + } + if (entry.getLevel() == LogLevel.Error) { + console.error(entry.getMessage(), entry.getError(), entry); + } + } } diff --git a/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.ts b/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.ts index c98d9ae..cd88052 100644 --- a/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.ts +++ b/mediarepo-ui/src/app/components/core/repositories-tab/repositories-tab.component.ts @@ -6,7 +6,7 @@ import {DownloadDaemonDialogComponent} from "./download-daemon-dialog/download-d import { AddRepositoryDialogComponent } from "../../shared/repository/repository/add-repository-dialog/add-repository-dialog.component"; -import {ErrorBrokerService} from "../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../services/logging/logging.service"; import {BehaviorSubject} from "rxjs"; import {BusyDialogComponent} from "../../shared/app-common/busy-dialog/busy-dialog.component"; import {JobService} from "../../../services/job/job.service"; @@ -24,7 +24,7 @@ export class RepositoriesTabComponent implements OnInit, AfterViewInit { public selectedRepository?: Repository; constructor( - private errorBroker: ErrorBrokerService, + private logger: LoggingService, private repoService: RepositoryService, private jobService: JobService, private stateService: StateService, @@ -60,8 +60,8 @@ export class RepositoriesTabComponent implements OnInit, AfterViewInit { }); } await this.selectRepository(repository, dialogContext); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.logger.error(err); } } @@ -75,7 +75,7 @@ export class RepositoriesTabComponent implements OnInit, AfterViewInit { await this.repoService.loadRepositories(); dialogContext.dialog.close(true); } catch (err: any) { - this.errorBroker.showError(err); + this.logger.error(err); dialogContext.message.next( "Failed to open repository: " + err.toString()); await this.forceCloseRepository(); diff --git a/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts b/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts index 1063fc6..e912a41 100644 --- a/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts +++ b/mediarepo-ui/src/app/components/shared/app-base/file-action-base/file-action-base.component.ts @@ -9,7 +9,7 @@ import {BehaviorSubject} from "rxjs"; import {BusyDialogComponent} from "../../app-common/busy-dialog/busy-dialog.component"; import {ConfirmDialogComponent, ConfirmDialogData} from "../../app-common/confirm-dialog/confirm-dialog.component"; import {MatDialog, MatDialogConfig, MatDialogRef} from "@angular/material/dialog"; -import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../services/logging/logging.service"; type ProgressDialogContext = { dialog: MatDialogRef, @@ -22,7 +22,7 @@ type ProgressDialogContext = { template: "

Do not use

", }) export class FileActionBaseComponent { - constructor(private dialog: MatDialog, private errorBroker: ErrorBrokerService, private fileService: FileService) { + constructor(private dialog: MatDialog, private errorBroker: LoggingService, private fileService: FileService) { } public async copyFileContentDescriptor(file: File): Promise { diff --git a/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts index 2f52ce5..cc83300 100644 --- a/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/content-viewer/content-viewer.component.ts @@ -12,7 +12,7 @@ import {SafeResourceUrl} from "@angular/platform-browser"; import {File} from "../../../../../api/models/File"; import {FileService} from "../../../../services/file/file.service"; import {FileHelper} from "../../../../services/file/file.helper"; -import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../services/logging/logging.service"; import {BusyIndicatorComponent} from "../../app-common/busy-indicator/busy-indicator.component"; type ContentType = "image" | "video" | "audio" | "other"; @@ -33,7 +33,7 @@ export class ContentViewerComponent implements AfterViewInit, OnChanges, OnDestr @ViewChild(BusyIndicatorComponent) busyIndicator!: BusyIndicatorComponent; constructor( - private errorBroker: ErrorBrokerService, + private errorBroker: LoggingService, private fileService: FileService ) { } @@ -70,8 +70,8 @@ export class ContentViewerComponent implements AfterViewInit, OnChanges, OnDestr if (path) { try { await this.fileService.saveFile(this.file, path); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.errorBroker.error(err); } } } diff --git a/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts index 83040bc..ebf0cf1 100644 --- a/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-context-menu/file-context-menu.component.ts @@ -2,7 +2,7 @@ import {Component, EventEmitter, OnChanges, Output, SimpleChanges, ViewChild} fr import {File} from "../../../../../api/models/File"; import {ContextMenuComponent} from "../../app-common/context-menu/context-menu.component"; import {FileService} from "../../../../services/file/file.service"; -import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../services/logging/logging.service"; import {MatDialog, MatDialogRef} from "@angular/material/dialog"; import {BusyDialogComponent} from "../../app-common/busy-dialog/busy-dialog.component"; import {BehaviorSubject} from "rxjs"; @@ -34,7 +34,7 @@ export class FileContextMenuComponent extends FileActionBaseComponent implements @Output() fileDeleted = new EventEmitter(); @Output() fileStatusChange = new EventEmitter(); - constructor(fileService: FileService, errorBroker: ErrorBrokerService, dialog: MatDialog) { + constructor(fileService: FileService, errorBroker: LoggingService, dialog: MatDialog) { super(dialog, errorBroker, fileService); } diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts index a521a74..37f4fed 100644 --- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-multiview.component.ts @@ -4,7 +4,7 @@ import {FileGalleryComponent} from "./file-gallery/file-gallery.component"; import {FileGridComponent} from "./file-grid/file-grid.component"; import {FileActionBaseComponent} from "../../app-base/file-action-base/file-action-base.component"; import {MatDialog} from "@angular/material/dialog"; -import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../services/logging/logging.service"; import {FileService} from "../../../../services/file/file.service"; import {TabState} from "../../../../models/TabState"; @@ -29,7 +29,7 @@ export class FileMultiviewComponent extends FileActionBaseComponent implements A public selectedFiles: File[] = []; @Input() public preselectedFile: File | undefined; - constructor(dialog: MatDialog, errorBroker: ErrorBrokerService, fileService: FileService) { + constructor(dialog: MatDialog, errorBroker: LoggingService, fileService: FileService) { super(dialog, errorBroker, fileService); } diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.ts b/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.ts index 1e18048..d89cf87 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/repository/repository/add-repository-dialog/add-repository-dialog.component.ts @@ -1,14 +1,8 @@ import {Component, Inject, ViewChild} from "@angular/core"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; -import { - RepositoryFormComponent -} from "../repository-form/repository-form.component"; -import { - RepositoryService -} from "../../../../../services/repository/repository.service"; -import { - ErrorBrokerService -} from "../../../../../services/error-broker/error-broker.service"; +import {RepositoryFormComponent} from "../repository-form/repository-form.component"; +import {RepositoryService} from "../../../../../services/repository/repository.service"; +import {LoggingService} from "../../../../../services/logging/logging.service"; @Component({ selector: "app-add-repository-dialog", @@ -21,9 +15,10 @@ export class AddRepositoryDialogComponent { constructor( public repoService: RepositoryService, - public errorBroker: ErrorBrokerService, + public errorBroker: LoggingService, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) data: any) { + @Inject(MAT_DIALOG_DATA) data: any + ) { } public async checkLocalRepoExists() { @@ -35,22 +30,23 @@ export class AddRepositoryDialogComponent { const path = this.repositoryForm.formGroup.value.path; try { await this.repoService.initRepository(path); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.errorBroker.error(err); } await this.checkLocalRepoExists(); } public async addRepository() { - let {name, repositoryType, path, address} = this.repositoryForm.formGroup.value; + let { name, repositoryType, path, address } = this.repositoryForm.formGroup.value; path = repositoryType === "local" ? path : undefined; address = repositoryType === "remote" ? address : undefined; try { await this.repoService.addRepository(name, path, address, - repositoryType === "local"); + repositoryType === "local" + ); this.dialogRef.close(); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.errorBroker.error(err); } } diff --git a/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.ts b/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.ts index 406115b..a53b338 100644 --- a/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.ts +++ b/mediarepo-ui/src/app/components/shared/repository/repository/edit-repository-dialog/edit-repository-dialog.component.ts @@ -1,13 +1,7 @@ import {Component, Inject, ViewChild} from "@angular/core"; -import { - RepositoryFormComponent -} from "../repository-form/repository-form.component"; -import { - RepositoryService -} from "../../../../../services/repository/repository.service"; -import { - ErrorBrokerService -} from "../../../../../services/error-broker/error-broker.service"; +import {RepositoryFormComponent} from "../repository-form/repository-form.component"; +import {RepositoryService} from "../../../../../services/repository/repository.service"; +import {LoggingService} from "../../../../../services/logging/logging.service"; import {MAT_DIALOG_DATA, MatDialogRef} from "@angular/material/dialog"; import {Repository} from "../../../../../../api/models/Repository"; @@ -25,9 +19,10 @@ export class EditRepositoryDialogComponent { constructor( public repoService: RepositoryService, - public errorBroker: ErrorBrokerService, + public errorBroker: LoggingService, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) data: any) { + @Inject(MAT_DIALOG_DATA) data: any + ) { this.selectedRepository = data.repository; this.originalName = this.selectedRepository.name; } @@ -41,14 +36,14 @@ export class EditRepositoryDialogComponent { const path = this.repositoryForm.formGroup.value.path; try { await this.repoService.initRepository(path); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.errorBroker.error(err); } await this.checkLocalRepoExists(); } public async addRepository() { - let {name, repositoryType, path, address} = this.repositoryForm.formGroup.value; + let { name, repositoryType, path, address } = this.repositoryForm.formGroup.value; path = repositoryType === "local" ? path : undefined; address = repositoryType === "remote" ? address : undefined; @@ -61,12 +56,13 @@ export class EditRepositoryDialogComponent { await this.repoService.removeRepository(this.originalName); } await this.repoService.addRepository(name, path, address, - repositoryType === "local"); - this.selectedRepository.update({name, local: repositoryType === "local", path, address}); + repositoryType === "local" + ); + this.selectedRepository.update({ name, local: repositoryType === "local", path, address }); this.dialogRef.close(); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.errorBroker.error(err); } } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts index 35e7767..3fcac4d 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-import/filesystem-import/filesystem-import.component.ts @@ -1,6 +1,6 @@ import {Component, EventEmitter, Output} from "@angular/core"; import {ImportService} from "../../../../../services/import/import.service"; -import {ErrorBrokerService} from "../../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../../services/logging/logging.service"; import {AddFileOptions} from "../../../../../models/AddFileOptions"; import {File} from "../../../../../../api/models/File"; import {DialogFilter} from "@tauri-apps/api/dialog"; @@ -36,7 +36,7 @@ export class FilesystemImportComponent { public importing = false; public importingProgress = 0; - constructor(private errorBroker: ErrorBrokerService, private importService: ImportService) { + constructor(private errorBroker: LoggingService, private importService: ImportService) { } public async setSelectedPaths(paths: string[]) { @@ -44,9 +44,9 @@ export class FilesystemImportComponent { try { this.files = await this.importService.resolvePathsToFiles(paths); this.fileCount = this.files.length; - } catch (err) { + } catch (err: any) { console.log(err); - this.errorBroker.showError(err); + this.errorBroker.error(err); } this.resolving = false; } @@ -64,9 +64,9 @@ export class FilesystemImportComponent { this.importOptions ); this.fileImported.emit(resultFile); - } catch (err) { + } catch (err: any) { console.log(err); - this.errorBroker.showError(err); + this.errorBroker.error(err); } count++; this.importingProgress = (count / this.fileCount) * 100; diff --git a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts index 48ee968..065c974 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/file-search/file-search.component.ts @@ -12,7 +12,7 @@ import { import {SortKey} from "../../../../models/SortKey"; import {MatDialog} from "@angular/material/dialog"; import {SortDialogComponent} from "./sort-dialog/sort-dialog.component"; -import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../services/logging/logging.service"; import {FilterDialogComponent} from "./filter-dialog/filter-dialog.component"; import {Tag} from "../../../../../api/models/Tag"; import {clipboard} from "@tauri-apps/api"; @@ -57,7 +57,7 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { private needsScroll = false; constructor( - private errorBroker: ErrorBrokerService, + private logger: LoggingService, public dialog: MatDialog ) { this.assignDisplayedFilters(); @@ -85,8 +85,8 @@ export class FileSearchComponent implements AfterViewChecked, OnInit { this.searchStartEvent.emit(); try { await this.state.findFiles(); - } catch (err) { - this.errorBroker.showError(err); + } catch (err: any) { + this.logger.error(err); } this.searchEndEvent.emit(); } diff --git a/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts b/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts index d6f61dc..37c9538 100644 --- a/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts +++ b/mediarepo-ui/src/app/components/shared/sidebar/tag-edit/tag-edit.component.ts @@ -13,7 +13,7 @@ import {File} from "../../../../../api/models/File"; import {Tag} from "../../../../../api/models/Tag"; import {CdkVirtualScrollViewport} from "@angular/cdk/scrolling"; import {TagService} from "../../../../services/tag/tag.service"; -import {ErrorBrokerService} from "../../../../services/error-broker/error-broker.service"; +import {LoggingService} from "../../../../services/logging/logging.service"; import {BusyIndicatorComponent} from "../../app-common/busy-indicator/busy-indicator.component"; @Component({ @@ -36,7 +36,7 @@ export class TagEditComponent implements AfterViewInit, OnChanges { private fileTags: { [key: number]: Tag[] } = {}; constructor( - private errorBroker: ErrorBrokerService, + private errorBroker: LoggingService, private tagService: TagService, ) { } @@ -180,7 +180,7 @@ export class TagEditComponent implements AfterViewInit, OnChanges { try { return cb(); } catch (err: any) { - this.errorBroker.showError(err); + this.errorBroker.error(err); return undefined; } } else { diff --git a/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts b/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts deleted file mode 100644 index c53adc8..0000000 --- a/mediarepo-ui/src/app/services/error-broker/error-broker.service.ts +++ /dev/null @@ -1,53 +0,0 @@ -import {Injectable} from "@angular/core"; -import {listen} from "@tauri-apps/api/event"; - -@Injectable({ - providedIn: "root" -}) -export class ErrorBrokerService { - - errorCb: Function | undefined; - infoCb: Function | undefined; - - constructor() { - this.registerListener().catch(err => console.error(err)); - } - - async registerListener() { - const _unlisten = await listen("error", event => { - const payload: any = event.payload; - if (payload.message) { - this.showError(payload); - } else { - this.showError(payload.toString()); - } - }); - } - - async try(fn: () => Promise): Promise { - try { - return await fn(); - } catch (err) { - this.showError(err); - return; - } - } - - showInfo(info: string) { - console.log(info); - if (this.infoCb) { - this.infoCb(info); - } - } - - showError(error: { message: string } | any) { - console.error(error); - if (this.errorCb) { - if (!error.message) { - this.errorCb({ message: error }); - } else { - this.errorCb({ ...error }); - } - } - } -} diff --git a/mediarepo-ui/src/app/services/logging/LogEntry.ts b/mediarepo-ui/src/app/services/logging/LogEntry.ts new file mode 100644 index 0000000..957c54d --- /dev/null +++ b/mediarepo-ui/src/app/services/logging/LogEntry.ts @@ -0,0 +1,24 @@ +export enum LogLevel { + Trace, + Debug, + Info, + Warn, + Error, +} + +export class LogEntry { + constructor(private message: string, private level: LogLevel, private error?: Error) { + } + + public getMessage(): string { + return this.message; + } + + public getLevel(): LogLevel { + return this.level; + } + + public getError(): Error | undefined { + return this.error; + } +} diff --git a/mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts b/mediarepo-ui/src/app/services/logging/logging.service.spec.ts similarity index 62% rename from mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts rename to mediarepo-ui/src/app/services/logging/logging.service.spec.ts index c9f3d45..88df782 100644 --- a/mediarepo-ui/src/app/services/error-broker/error-broker.service.spec.ts +++ b/mediarepo-ui/src/app/services/logging/logging.service.spec.ts @@ -1,13 +1,13 @@ import {TestBed} from "@angular/core/testing"; -import {ErrorBrokerService} from "./error-broker.service"; +import {LoggingService} from "./logging.service"; describe("ErrorBrokerService", () => { - let service: ErrorBrokerService; + let service: LoggingService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(ErrorBrokerService); + service = TestBed.inject(LoggingService); }); it("should be created", () => { diff --git a/mediarepo-ui/src/app/services/logging/logging.service.ts b/mediarepo-ui/src/app/services/logging/logging.service.ts new file mode 100644 index 0000000..20afad8 --- /dev/null +++ b/mediarepo-ui/src/app/services/logging/logging.service.ts @@ -0,0 +1,60 @@ +import {Injectable} from "@angular/core"; +import {listen} from "@tauri-apps/api/event"; +import {BehaviorSubject} from "rxjs"; +import {LogEntry, LogLevel} from "./LogEntry"; + +@Injectable({ + providedIn: "root" +}) +export class LoggingService { + + logs = new BehaviorSubject(new LogEntry("Log initialized", LogLevel.Trace)); + + constructor() { + this.registerListener().catch(err => console.error(err)); + } + + async registerListener() { + const _unlisten = await listen("error", event => { + const payload: any = event.payload; + if (payload.message) { + this.error(payload); + } else { + this.error(payload.toString()); + } + }); + } + + async try(fn: () => Promise): Promise { + try { + return await fn(); + } catch (err: any) { + this.error(err); + return; + } + } + + trace(message: string) { + this.log(LogLevel.Trace, message); + } + + debug(message: string) { + this.log(LogLevel.Debug, message); + } + + info(message: string) { + this.log(LogLevel.Info, message); + } + + warn(message: string) { + this.log(LogLevel.Warn, message); + } + + error(error: Error, message?: string) { + this.log(LogLevel.Error, message ?? error.message ?? error.toString(), error); + } + + public log(level: LogLevel, message: string, error?: Error) { + this.logs.next(new LogEntry(message, level, error)); + } +} diff --git a/mediarepo-ui/src/app/services/repository/repository.service.ts b/mediarepo-ui/src/app/services/repository/repository.service.ts index f47fc77..aeae63b 100644 --- a/mediarepo-ui/src/app/services/repository/repository.service.ts +++ b/mediarepo-ui/src/app/services/repository/repository.service.ts @@ -3,7 +3,7 @@ import {Repository} from "../../../api/models/Repository"; import {BehaviorSubject} from "rxjs"; import {listen} from "@tauri-apps/api/event"; import {Info} from "../../models/Info"; -import {ErrorBrokerService} from "../error-broker/error-broker.service"; +import {LoggingService} from "../logging/logging.service"; import {RepositoryMetadata} from "../../models/RepositoryMetadata"; import {MediarepoApi} from "../../../api/Api"; import {mapMany, mapNew, mapOptional,} from "../../../api/models/adaptors"; @@ -17,7 +17,7 @@ export class RepositoryService { public selectedRepository = new BehaviorSubject( undefined); - constructor(private errorBroker: ErrorBrokerService) { + constructor(private errorBroker: LoggingService) { this.registerListener().catch(err => console.error(err)); } @@ -25,7 +25,7 @@ export class RepositoryService { async registerListener() { await listen("info", (event: { payload: Info }) => { const message = `Connected to ${event.payload.name}, Version: ${event.payload.version}`; - this.errorBroker.showInfo(message); + this.errorBroker.info(message); }); } @@ -68,7 +68,7 @@ export class RepositoryService { console.warn(err); } } - await MediarepoApi.selectRepository({name: repo.name}); + await MediarepoApi.selectRepository({ name: repo.name }); } /** @@ -98,7 +98,7 @@ export class RepositoryService { * @returns {Promise} */ public async addRepository(name: string, path: string | undefined, address: string | undefined, local: boolean) { - let repos = await MediarepoApi.addRepository({name, path, address, local}).then(mapMany(mapNew(Repository))); + let repos = await MediarepoApi.addRepository({ name, path, address, local }).then(mapMany(mapNew(Repository))); this.repositories.next(repos); } @@ -108,7 +108,7 @@ export class RepositoryService { * @returns {Promise} */ public async checkDaemonRunning(address: string): Promise { - return MediarepoApi.checkDaemonRunning({address}); + return MediarepoApi.checkDaemonRunning({ address }); } /** @@ -117,7 +117,7 @@ export class RepositoryService { * @returns {Promise} */ public async checkLocalRepositoryExists(path: string): Promise { - return await MediarepoApi.checkLocalRepositoryExists({path}); + return await MediarepoApi.checkLocalRepositoryExists({ path }); } /** @@ -126,7 +126,7 @@ export class RepositoryService { * @returns {Promise} */ public async removeRepository(name: string): Promise { - await MediarepoApi.removeRepository({name}); + await MediarepoApi.removeRepository({ name }); await this.loadRepositories(); } @@ -136,7 +136,7 @@ export class RepositoryService { * @returns {Promise} */ public async deleteRepository(name: string): Promise { - await MediarepoApi.deleteRepository({name}); + await MediarepoApi.deleteRepository({ name }); await this.removeRepository(name); } @@ -146,7 +146,7 @@ export class RepositoryService { * @returns {Promise} */ public async startDaemon(repoPath: string): Promise { - return MediarepoApi.startDaemon({repoPath}); + return MediarepoApi.startDaemon({ repoPath }); } /** @@ -155,7 +155,7 @@ export class RepositoryService { * @returns {Promise} */ public async initRepository(repoPath: string): Promise { - return MediarepoApi.initRepository({repoPath}); + return MediarepoApi.initRepository({ repoPath }); } /** @@ -172,7 +172,7 @@ export class RepositoryService { * @param sizeType */ public async getSize(sizeType: SizeType): Promise { - return MediarepoApi.getSize({sizeType}); + return MediarepoApi.getSize({ sizeType }); } async loadSelectedRepository() { diff --git a/mediarepo-ui/src/colors.scss b/mediarepo-ui/src/colors.scss index f6d6f20..08316df 100644 --- a/mediarepo-ui/src/colors.scss +++ b/mediarepo-ui/src/colors.scss @@ -13,6 +13,10 @@ $primary-darker-30: darken($primary, 30%); $accent: mat.get-color-from-palette($accent-pallette, 'text'); $accent-lighter-10: lighten($accent, 10%); +$warn: mat.get-color-from-palette($warn-palette); +$warn-lighter: lighten($warn, 10%); +$warn-chill: #fcd349; + $text: #FFF; $text-darker-10: darken($text, 10%); From bb676ba9724e973a9bde4c385eeabced76931a80 Mon Sep 17 00:00:00 2001 From: trivernis Date: Sun, 30 Jan 2022 17:40:32 +0100 Subject: [PATCH 2/5] Fix tag selection not showing tags for multiple files TG-76 #closed Signed-off-by: trivernis --- .../app/components/core/files-tab/files-tab.component.ts | 1 + .../file-multiview/file-grid/file-grid.component.html | 6 ++++-- .../file/file-multiview/file-grid/file-grid.component.ts | 8 +++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.ts b/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.ts index a64a857..7a588f3 100644 --- a/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.ts +++ b/mediarepo-ui/src/app/components/core/files-tab/files-tab.component.ts @@ -30,6 +30,7 @@ export class FilesTabComponent implements OnInit { } else { this.state.selectedCD.next(undefined); } + console.debug(this.selectedFiles); } public getStateSelectedFile(): File | undefined { diff --git a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html index 13dafcc..be22ac3 100644 --- a/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html +++ b/mediarepo-ui/src/app/components/shared/file/file-multiview/file-grid/file-grid.component.html @@ -5,7 +5,7 @@ class="file-gallery-inner"> -
+
- +