Run prettier

This commit is contained in:
Rubikscraft 2022-12-27 16:05:53 +01:00
parent 8999e69f26
commit adc58476ff
No known key found for this signature in database
GPG key ID: 3570A2BB18A63D9F
44 changed files with 88 additions and 82 deletions

View file

@ -3,17 +3,20 @@ import { InjectRepository } from '@nestjs/typeorm';
import { import {
DecodedSysPref, DecodedSysPref,
PrefValueType, PrefValueType,
PrefValueTypeStrings PrefValueTypeStrings,
} from 'picsur-shared/dist/dto/preferences.dto'; } from 'picsur-shared/dist/dto/preferences.dto';
import { import {
SysPreference, SysPreference,
SysPreferenceList, SysPreferenceList,
SysPreferenceValidators, SysPreferenceValidators,
SysPreferenceValueTypes SysPreferenceValueTypes,
} from 'picsur-shared/dist/dto/sys-preferences.enum'; } from 'picsur-shared/dist/dto/sys-preferences.enum';
import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types'; import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { ESysPreferenceBackend, ESysPreferenceSchema } from '../../database/entities/system/sys-preference.entity'; import {
ESysPreferenceBackend,
ESysPreferenceSchema,
} from '../../database/entities/system/sys-preference.entity';
import { MutexFallBack } from '../../util/mutex-fallback'; import { MutexFallBack } from '../../util/mutex-fallback';
import { PreferenceCommonService } from './preference-common.service'; import { PreferenceCommonService } from './preference-common.service';
import { PreferenceDefaultsService } from './preference-defaults.service'; import { PreferenceDefaultsService } from './preference-defaults.service';

View file

@ -3,19 +3,19 @@ import { InjectRepository } from '@nestjs/typeorm';
import { import {
DecodedUsrPref, DecodedUsrPref,
PrefValueType, PrefValueType,
PrefValueTypeStrings PrefValueTypeStrings,
} from 'picsur-shared/dist/dto/preferences.dto'; } from 'picsur-shared/dist/dto/preferences.dto';
import { import {
UsrPreference, UsrPreference,
UsrPreferenceList, UsrPreferenceList,
UsrPreferenceValidators, UsrPreferenceValidators,
UsrPreferenceValueTypes UsrPreferenceValueTypes,
} from 'picsur-shared/dist/dto/usr-preferences.enum'; } from 'picsur-shared/dist/dto/usr-preferences.enum';
import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types'; import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';
import { Repository } from 'typeorm'; import { Repository } from 'typeorm';
import { import {
EUsrPreferenceBackend, EUsrPreferenceBackend,
EUsrPreferenceSchema EUsrPreferenceSchema,
} from '../../database/entities/system/usr-preference.entity'; } from '../../database/entities/system/usr-preference.entity';
import { MutexFallBack } from '../../util/mutex-fallback'; import { MutexFallBack } from '../../util/mutex-fallback';
import { PreferenceCommonService } from './preference-common.service'; import { PreferenceCommonService } from './preference-common.service';

View file

@ -7,7 +7,7 @@ import { ERoleBackend } from '../../database/entities/users/role.entity';
import { import {
ImmutableRolesList, ImmutableRolesList,
SystemRoleDefaults, SystemRoleDefaults,
SystemRolesList SystemRolesList,
} from '../../models/constants/roles.const'; } from '../../models/constants/roles.const';
import { RoleDbService } from './role-db.service'; import { RoleDbService } from './role-db.service';

View file

@ -6,7 +6,7 @@ import {
Fail, Fail,
FT, FT,
HasFailed, HasFailed,
HasSuccess HasSuccess,
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { makeUnique } from 'picsur-shared/dist/util/unique'; import { makeUnique } from 'picsur-shared/dist/util/unique';
import { In, Repository } from 'typeorm'; import { In, Repository } from 'typeorm';
@ -14,7 +14,7 @@ import { ERoleBackend } from '../../database/entities/users/role.entity';
import { Permissions } from '../../models/constants/permissions.const'; import { Permissions } from '../../models/constants/permissions.const';
import { import {
ImmutableRolesList, ImmutableRolesList,
UndeletableRolesList UndeletableRolesList,
} from '../../models/constants/roles.const'; } from '../../models/constants/roles.const';
@Injectable() @Injectable()

View file

@ -7,7 +7,7 @@ import {
Fail, Fail,
FT, FT,
HasFailed, HasFailed,
HasSuccess HasSuccess,
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { FindResult } from 'picsur-shared/dist/types/find-result'; import { FindResult } from 'picsur-shared/dist/types/find-result';
import { makeUnique } from 'picsur-shared/dist/util/unique'; import { makeUnique } from 'picsur-shared/dist/util/unique';
@ -16,12 +16,12 @@ import { EUserBackend } from '../../database/entities/users/user.entity';
import { Permissions } from '../../models/constants/permissions.const'; import { Permissions } from '../../models/constants/permissions.const';
import { import {
DefaultRolesList, DefaultRolesList,
SoulBoundRolesList SoulBoundRolesList,
} from '../../models/constants/roles.const'; } from '../../models/constants/roles.const';
import { import {
ImmutableUsersList, ImmutableUsersList,
LockedLoginUsersList, LockedLoginUsersList,
UndeletableUsersList UndeletableUsersList,
} from '../../models/constants/special-users.const'; } from '../../models/constants/special-users.const';
import { GetCols } from '../../util/collection'; import { GetCols } from '../../util/collection';
import { SysPreferenceDbService } from '../preference-db/sys-preference-db.service'; import { SysPreferenceDbService } from '../preference-db/sys-preference-db.service';

View file

@ -22,7 +22,7 @@ import { TypeOrmConfigService } from './type-orm.config.service';
HostConfigService, HostConfigService,
AuthConfigService, AuthConfigService,
MultipartConfigService, MultipartConfigService,
RedisConfigService RedisConfigService,
], ],
exports: [ exports: [
ConfigModule, ConfigModule,
@ -32,7 +32,7 @@ import { TypeOrmConfigService } from './type-orm.config.service';
HostConfigService, HostConfigService,
AuthConfigService, AuthConfigService,
MultipartConfigService, MultipartConfigService,
RedisConfigService RedisConfigService,
], ],
}) })
export class EarlyConfigModule {} export class EarlyConfigModule {}

View file

@ -4,7 +4,7 @@ import {
Entity, Entity,
Index, Index,
ManyToOne, ManyToOne,
PrimaryGeneratedColumn PrimaryGeneratedColumn,
} from 'typeorm'; } from 'typeorm';
import { z } from 'zod'; import { z } from 'zod';
import { EUserBackend } from './users/user.entity'; import { EUserBackend } from './users/user.entity';

View file

@ -5,7 +5,7 @@ import {
JoinColumn, JoinColumn,
ManyToOne, ManyToOne,
PrimaryGeneratedColumn, PrimaryGeneratedColumn,
Unique Unique,
} from 'typeorm'; } from 'typeorm';
import { EImageBackend } from './image.entity'; import { EImageBackend } from './image.entity';

View file

@ -6,7 +6,7 @@ import {
JoinColumn, JoinColumn,
ManyToOne, ManyToOne,
PrimaryGeneratedColumn, PrimaryGeneratedColumn,
Unique Unique,
} from 'typeorm'; } from 'typeorm';
import z from 'zod'; import z from 'zod';
import { EUserBackend } from '../users/user.entity'; import { EUserBackend } from '../users/user.entity';

View file

@ -4,7 +4,7 @@ import {
Entity, Entity,
Index, Index,
OneToMany, OneToMany,
PrimaryGeneratedColumn PrimaryGeneratedColumn,
} from 'typeorm'; } from 'typeorm';
import { z } from 'zod'; import { z } from 'zod';
import { EApiKeyBackend } from '../apikey.entity'; import { EApiKeyBackend } from '../apikey.entity';

View file

@ -4,4 +4,5 @@ import { MultiPartPipe } from './postfiles.pipe';
export const PostFile = () => InjectRequest(PostFilePipe); export const PostFile = () => InjectRequest(PostFilePipe);
export const PostFiles = (maxFiles?: number) => InjectRequest(maxFiles, MultiPartPipe); export const PostFiles = (maxFiles?: number) =>
InjectRequest(maxFiles, MultiPartPipe);

View file

@ -12,7 +12,7 @@ export class PostFilePipe implements PipeTransform {
private readonly multipartConfigService: MultipartConfigService, private readonly multipartConfigService: MultipartConfigService,
) {} ) {}
async transform({ request, data }: { data: any; request: FastifyRequest },) { async transform({ request, data }: { data: any; request: FastifyRequest }) {
if (!request.isMultipart()) throw Fail(FT.UsrValidation, 'Invalid file'); if (!request.isMultipart()) throw Fail(FT.UsrValidation, 'Invalid file');
// Only one file is allowed // Only one file is allowed

View file

@ -4,7 +4,7 @@ import {
Injectable, Injectable,
Logger, Logger,
PipeTransform, PipeTransform,
Scope Scope,
} from '@nestjs/common'; } from '@nestjs/common';
import { FastifyRequest } from 'fastify'; import { FastifyRequest } from 'fastify';
import { Fail, FT } from 'picsur-shared/dist/types'; import { Fail, FT } from 'picsur-shared/dist/types';

View file

@ -6,10 +6,12 @@ import { PicsurThrottlerGuard } from './throttler/PicsurThrottler.guard';
import { ZodValidationPipe } from './validate/zod-validator.pipe'; import { ZodValidationPipe } from './validate/zod-validator.pipe';
@Module({ @Module({
imports: [ThrottlerModule.forRoot({ imports: [
ttl: 60, ThrottlerModule.forRoot({
limit: 60, ttl: 60,
})], limit: 60,
}),
],
providers: [ providers: [
PicsurThrottlerGuard, PicsurThrottlerGuard,
MainExceptionFilter, MainExceptionFilter,

View file

@ -6,7 +6,7 @@ import {
Logger, Logger,
MethodNotAllowedException, MethodNotAllowedException,
NotFoundException, NotFoundException,
UnauthorizedException UnauthorizedException,
} from '@nestjs/common'; } from '@nestjs/common';
import { FastifyReply, FastifyRequest } from 'fastify'; import { FastifyReply, FastifyRequest } from 'fastify';
import { ApiErrorResponse } from 'picsur-shared/dist/dto/api/api.dto'; import { ApiErrorResponse } from 'picsur-shared/dist/dto/api/api.dto';
@ -14,7 +14,7 @@ import {
Fail, Fail,
Failure, Failure,
FT, FT,
IsFailure IsFailure,
} from 'picsur-shared/dist/types/failable'; } from 'picsur-shared/dist/types/failable';
// This will catch any exception that is made in any request // This will catch any exception that is made in any request

View file

@ -4,7 +4,7 @@ import {
Injectable, Injectable,
Logger, Logger,
NestInterceptor, NestInterceptor,
Optional Optional,
} from '@nestjs/common'; } from '@nestjs/common';
import { Reflector } from '@nestjs/core'; import { Reflector } from '@nestjs/core';
import { FastifyReply } from 'fastify'; import { FastifyReply } from 'fastify';

View file

@ -4,7 +4,7 @@ import fastifyReplyFrom from '@fastify/reply-from';
import { NestFactory } from '@nestjs/core'; import { NestFactory } from '@nestjs/core';
import { import {
FastifyAdapter, FastifyAdapter,
NestFastifyApplication NestFastifyApplication,
} from '@nestjs/platform-fastify'; } from '@nestjs/platform-fastify';
import { AppModule } from './app.module'; import { AppModule } from './app.module';
import { HostConfigService } from './config/early/host.config.service'; import { HostConfigService } from './config/early/host.config.service';

View file

@ -3,7 +3,7 @@ import ms from 'ms';
import { ImageRequestParams } from 'picsur-shared/dist/dto/api/image.dto'; import { ImageRequestParams } from 'picsur-shared/dist/dto/api/image.dto';
import { import {
FileType, FileType,
SupportedFileTypeCategory SupportedFileTypeCategory,
} from 'picsur-shared/dist/dto/mimes.dto'; } from 'picsur-shared/dist/dto/mimes.dto';
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum'; import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types'; import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';

View file

@ -2,7 +2,7 @@ import { Injectable } from '@nestjs/common';
import { import {
FileType, FileType,
ImageFileType, ImageFileType,
SupportedFileTypeCategory SupportedFileTypeCategory,
} from 'picsur-shared/dist/dto/mimes.dto'; } from 'picsur-shared/dist/dto/mimes.dto';
import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types'; import { AsyncFailable, Fail, FT, HasFailed } from 'picsur-shared/dist/types';

View file

@ -7,7 +7,7 @@ import {
AnimFileType, AnimFileType,
FileType, FileType,
ImageFileType, ImageFileType,
Mime2FileType Mime2FileType,
} from 'picsur-shared/dist/dto/mimes.dto'; } from 'picsur-shared/dist/dto/mimes.dto';
import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum'; import { SysPreference } from 'picsur-shared/dist/dto/sys-preferences.enum';
import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.enum'; import { UsrPreference } from 'picsur-shared/dist/dto/usr-preferences.enum';

View file

@ -9,14 +9,14 @@ import {
ApiKeyListRequest, ApiKeyListRequest,
ApiKeyListResponse, ApiKeyListResponse,
ApiKeyUpdateRequest, ApiKeyUpdateRequest,
ApiKeyUpdateResponse ApiKeyUpdateResponse,
} from 'picsur-shared/dist/dto/api/apikeys.dto'; } from 'picsur-shared/dist/dto/api/apikeys.dto';
import { Permission } from 'picsur-shared/dist/dto/permissions.enum'; import { Permission } from 'picsur-shared/dist/dto/permissions.enum';
import { ThrowIfFailed } from 'picsur-shared/dist/types'; import { ThrowIfFailed } from 'picsur-shared/dist/types';
import { ApiKeyDbService } from '../../../collections/apikey-db/apikey-db.service'; import { ApiKeyDbService } from '../../../collections/apikey-db/apikey-db.service';
import { import {
HasPermission, HasPermission,
RequiredPermissions RequiredPermissions,
} from '../../../decorators/permissions.decorator'; } from '../../../decorators/permissions.decorator';
import { ReqUserID } from '../../../decorators/request-user.decorator'; import { ReqUserID } from '../../../decorators/request-user.decorator';
import { Returns } from '../../../decorators/returns.decorator'; import { Returns } from '../../../decorators/returns.decorator';

View file

@ -4,7 +4,7 @@ import {
GetPreferenceResponse, GetPreferenceResponse,
MultiplePreferencesResponse, MultiplePreferencesResponse,
UpdatePreferenceRequest, UpdatePreferenceRequest,
UpdatePreferenceResponse UpdatePreferenceResponse,
} from 'picsur-shared/dist/dto/api/pref.dto'; } from 'picsur-shared/dist/dto/api/pref.dto';
import { ThrowIfFailed } from 'picsur-shared/dist/types'; import { ThrowIfFailed } from 'picsur-shared/dist/types';
import { SysPreferenceDbService } from '../../../collections/preference-db/sys-preference-db.service'; import { SysPreferenceDbService } from '../../../collections/preference-db/sys-preference-db.service';

View file

@ -4,7 +4,7 @@ import {
GetPreferenceResponse, GetPreferenceResponse,
MultiplePreferencesResponse, MultiplePreferencesResponse,
UpdatePreferenceRequest, UpdatePreferenceRequest,
UpdatePreferenceResponse UpdatePreferenceResponse,
} from 'picsur-shared/dist/dto/api/pref.dto'; } from 'picsur-shared/dist/dto/api/pref.dto';
import { ThrowIfFailed } from 'picsur-shared/dist/types'; import { ThrowIfFailed } from 'picsur-shared/dist/types';
import { UsrPreferenceDbService } from '../../../collections/preference-db/usr-preference-db.service'; import { UsrPreferenceDbService } from '../../../collections/preference-db/usr-preference-db.service';

View file

@ -10,7 +10,7 @@ import {
RoleListResponse, RoleListResponse,
RoleUpdateRequest, RoleUpdateRequest,
RoleUpdateResponse, RoleUpdateResponse,
SpecialRolesResponse SpecialRolesResponse,
} from 'picsur-shared/dist/dto/api/roles.dto'; } from 'picsur-shared/dist/dto/api/roles.dto';
import { Fail, FT, ThrowIfFailed } from 'picsur-shared/dist/types'; import { Fail, FT, ThrowIfFailed } from 'picsur-shared/dist/types';
import { RoleDbService } from '../../../collections/role-db/role-db.service'; import { RoleDbService } from '../../../collections/role-db/role-db.service';
@ -22,7 +22,7 @@ import {
DefaultRolesList, DefaultRolesList,
ImmutableRolesList, ImmutableRolesList,
SoulBoundRolesList, SoulBoundRolesList,
UndeletableRolesList UndeletableRolesList,
} from '../../../models/constants/roles.const'; } from '../../../models/constants/roles.const';
import { isPermissionsArray } from '../../../models/validators/permissions.validator'; import { isPermissionsArray } from '../../../models/validators/permissions.validator';

View file

@ -11,7 +11,7 @@ import {
UserListRequest, UserListRequest,
UserListResponse, UserListResponse,
UserUpdateRequest, UserUpdateRequest,
UserUpdateResponse UserUpdateResponse,
} from 'picsur-shared/dist/dto/api/user-manage.dto'; } from 'picsur-shared/dist/dto/api/user-manage.dto';
import { ThrowIfFailed } from 'picsur-shared/dist/types'; import { ThrowIfFailed } from 'picsur-shared/dist/types';
import { UserDbService } from '../../../collections/user-db/user-db.service'; import { UserDbService } from '../../../collections/user-db/user-db.service';
@ -21,7 +21,7 @@ import { Permission } from '../../../models/constants/permissions.const';
import { import {
ImmutableUsersList, ImmutableUsersList,
LockedLoginUsersList, LockedLoginUsersList,
UndeletableUsersList UndeletableUsersList,
} from '../../../models/constants/special-users.const'; } from '../../../models/constants/special-users.const';
import { EUserBackend2EUser } from '../../../models/transformers/user.transformer'; import { EUserBackend2EUser } from '../../../models/transformers/user.transformer';

View file

@ -7,7 +7,7 @@ import {
UserMePermissionsResponse, UserMePermissionsResponse,
UserMeResponse, UserMeResponse,
UserRegisterRequest, UserRegisterRequest,
UserRegisterResponse UserRegisterResponse,
} from 'picsur-shared/dist/dto/api/user.dto'; } from 'picsur-shared/dist/dto/api/user.dto';
import type { EUser } from 'picsur-shared/dist/entities/user.entity'; import type { EUser } from 'picsur-shared/dist/entities/user.entity';
import { ThrowIfFailed } from 'picsur-shared/dist/types'; import { ThrowIfFailed } from 'picsur-shared/dist/types';
@ -15,7 +15,7 @@ import { UserDbService } from '../../../collections/user-db/user-db.service';
import { import {
NoPermissions, NoPermissions,
RequiredPermissions, RequiredPermissions,
UseLocalAuth UseLocalAuth,
} from '../../../decorators/permissions.decorator'; } from '../../../decorators/permissions.decorator';
import { ReqUser, ReqUserID } from '../../../decorators/request-user.decorator'; import { ReqUser, ReqUserID } from '../../../decorators/request-user.decorator';
import { Returns } from '../../../decorators/returns.decorator'; import { Returns } from '../../../decorators/returns.decorator';

View file

@ -5,7 +5,7 @@ import {
Logger, Logger,
Param, Param,
Post, Post,
Res Res,
} from '@nestjs/common'; } from '@nestjs/common';
import { Throttle } from '@nestjs/throttler'; import { Throttle } from '@nestjs/throttler';
import type { FastifyReply } from 'fastify'; import type { FastifyReply } from 'fastify';
@ -18,7 +18,7 @@ import {
ImageListResponse, ImageListResponse,
ImageUpdateRequest, ImageUpdateRequest,
ImageUpdateResponse, ImageUpdateResponse,
ImageUploadResponse ImageUploadResponse,
} from 'picsur-shared/dist/dto/api/image-manage.dto'; } from 'picsur-shared/dist/dto/api/image-manage.dto';
import { Permission } from 'picsur-shared/dist/dto/permissions.enum'; import { Permission } from 'picsur-shared/dist/dto/permissions.enum';
import { Fail, FT, HasFailed, ThrowIfFailed } from 'picsur-shared/dist/types'; import { Fail, FT, HasFailed, ThrowIfFailed } from 'picsur-shared/dist/types';
@ -26,7 +26,7 @@ import { PostFiles } from '../../decorators/multipart/multipart.decorator';
import type { FileIterator } from '../../decorators/multipart/postfiles.pipe'; import type { FileIterator } from '../../decorators/multipart/postfiles.pipe';
import { import {
HasPermission, HasPermission,
RequiredPermissions RequiredPermissions,
} from '../../decorators/permissions.decorator'; } from '../../decorators/permissions.decorator';
import { ReqUserID } from '../../decorators/request-user.decorator'; import { ReqUserID } from '../../decorators/request-user.decorator';
import { Returns } from '../../decorators/returns.decorator'; import { Returns } from '../../decorators/returns.decorator';
@ -54,7 +54,7 @@ export class ImageManageController {
buffer = await file.toBuffer(); buffer = await file.toBuffer();
} catch (e) { } catch (e) {
throw Fail(FT.Internal, e); throw Fail(FT.Internal, e);
}; }
const image = ThrowIfFailed( const image = ThrowIfFailed(
await this.imagesService.upload( await this.imagesService.upload(

View file

@ -3,7 +3,7 @@ import { SkipThrottle } from '@nestjs/throttler';
import type { FastifyReply } from 'fastify'; import type { FastifyReply } from 'fastify';
import { import {
ImageMetaResponse, ImageMetaResponse,
ImageRequestParams ImageRequestParams,
} from 'picsur-shared/dist/dto/api/image.dto'; } from 'picsur-shared/dist/dto/api/image.dto';
import { ImageEntryVariant } from 'picsur-shared/dist/dto/image-entry-variant.enum'; import { ImageEntryVariant } from 'picsur-shared/dist/dto/image-entry-variant.enum';
import { FileType2Mime } from 'picsur-shared/dist/dto/mimes.dto'; import { FileType2Mime } from 'picsur-shared/dist/dto/mimes.dto';

View file

@ -6,11 +6,7 @@ import { ImageManageController } from './image-manage.controller';
import { ImageController } from './image.controller'; import { ImageController } from './image.controller';
@Module({ @Module({
imports: [ imports: [ImageManagerModule, UserDbModule, DecoratorsModule],
ImageManagerModule,
UserDbModule,
DecoratorsModule,
],
controllers: [ImageController, ImageManageController], controllers: [ImageController, ImageManageController],
}) })
export class ImageModule {} export class ImageModule {}

View file

@ -2,7 +2,7 @@ import { BMPdecode, BMPencode } from 'bmp-img';
import { import {
AnimFileType, AnimFileType,
FileType, FileType,
ImageFileType ImageFileType,
} from 'picsur-shared/dist/dto/mimes.dto'; } from 'picsur-shared/dist/dto/mimes.dto';
import { QOIdecode, QOIencode } from 'qoi-img'; import { QOIdecode, QOIencode } from 'qoi-img';
import sharp, { Sharp, SharpOptions } from 'sharp'; import sharp, { Sharp, SharpOptions } from 'sharp';

View file

@ -6,7 +6,7 @@ import {
Input, Input,
OnChanges, OnChanges,
SimpleChanges, SimpleChanges,
ViewChild ViewChild,
} from '@angular/core'; } from '@angular/core';
import { FileType, ImageFileType } from 'picsur-shared/dist/dto/mimes.dto'; import { FileType, ImageFileType } from 'picsur-shared/dist/dto/mimes.dto';
import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types'; import { AsyncFailable, HasFailed } from 'picsur-shared/dist/types';

View file

@ -11,7 +11,7 @@ import {
merge, merge,
Observable, Observable,
switchMap, switchMap,
timer timer,
} from 'rxjs'; } from 'rxjs';
import { ImageService } from 'src/app/services/api/image.service'; import { ImageService } from 'src/app/services/api/image.service';
import { UserService } from 'src/app/services/api/user.service'; import { UserService } from 'src/app/services/api/user.service';

View file

@ -17,11 +17,11 @@ import { ErrorService } from 'src/app/util/error-manager/error.service';
import { UtilService } from 'src/app/util/util.service'; import { UtilService } from 'src/app/util/util.service';
import { import {
CustomizeDialogComponent, CustomizeDialogComponent,
CustomizeDialogData CustomizeDialogData,
} from '../customize-dialog/customize-dialog.component'; } from '../customize-dialog/customize-dialog.component';
import { import {
EditDialogComponent, EditDialogComponent,
EditDialogData EditDialogData,
} from '../edit-dialog/edit-dialog.component'; } from '../edit-dialog/edit-dialog.component';
@Component({ @Component({

View file

@ -3,7 +3,7 @@ import {
ChangeDetectorRef, ChangeDetectorRef,
Component, Component,
OnDestroy, OnDestroy,
OnInit OnInit,
} from '@angular/core'; } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto'; import { ImageMetaResponse } from 'picsur-shared/dist/dto/api/image.dto';
@ -11,7 +11,7 @@ import { ImageLinks } from 'picsur-shared/dist/dto/image-links.class';
import { import {
AnimFileType, AnimFileType,
ImageFileType, ImageFileType,
SupportedFileTypeCategory SupportedFileTypeCategory,
} from 'picsur-shared/dist/dto/mimes.dto'; } from 'picsur-shared/dist/dto/mimes.dto';
import { EImage } from 'picsur-shared/dist/entities/image.entity'; import { EImage } from 'picsur-shared/dist/entities/image.entity';
import { EUser } from 'picsur-shared/dist/entities/user.entity'; import { EUser } from 'picsur-shared/dist/entities/user.entity';

View file

@ -3,7 +3,7 @@ import { WINDOW } from '@ng-web-apis/common';
import axios, { import axios, {
AxiosRequestConfig, AxiosRequestConfig,
AxiosResponse, AxiosResponse,
AxiosResponseHeaders AxiosResponseHeaders,
} from 'axios'; } from 'axios';
import { ApiResponseSchema } from 'picsur-shared/dist/dto/api/api.dto'; import { ApiResponseSchema } from 'picsur-shared/dist/dto/api/api.dto';
import { FileType2Ext } from 'picsur-shared/dist/dto/mimes.dto'; import { FileType2Ext } from 'picsur-shared/dist/dto/mimes.dto';
@ -13,7 +13,7 @@ import {
Failure, Failure,
FT, FT,
HasFailed, HasFailed,
HasSuccess HasSuccess,
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { ZodDtoStatic } from 'picsur-shared/dist/util/create-zod-dto'; import { ZodDtoStatic } from 'picsur-shared/dist/util/create-zod-dto';
import { ParseMime2FileType } from 'picsur-shared/dist/util/parse-mime'; import { ParseMime2FileType } from 'picsur-shared/dist/util/parse-mime';
@ -237,10 +237,10 @@ export class ApiService {
const result = await axios.request({ const result = await axios.request({
url, url,
onDownloadProgress: (e) => { onDownloadProgress: (e) => {
downloadProgress.next(e.loaded / (e.total ?? 1000000) * 100); downloadProgress.next((e.loaded / (e.total ?? 1000000)) * 100);
}, },
onUploadProgress: (e) => { onUploadProgress: (e) => {
uploadProgress.next(e.loaded / (e.total ?? 1000000) * 100); uploadProgress.next((e.loaded / (e.total ?? 1000000)) * 100);
}, },
signal: abortController.signal, signal: abortController.signal,
...options, ...options,

View file

@ -8,7 +8,7 @@ import {
ApiKeyListRequest, ApiKeyListRequest,
ApiKeyListResponse, ApiKeyListResponse,
ApiKeyUpdateRequest, ApiKeyUpdateRequest,
ApiKeyUpdateResponse ApiKeyUpdateResponse,
} from 'picsur-shared/dist/dto/api/apikeys.dto'; } from 'picsur-shared/dist/dto/api/apikeys.dto';
import { EApiKey } from 'picsur-shared/dist/entities/apikey.entity'; import { EApiKey } from 'picsur-shared/dist/entities/apikey.entity';
import { AsyncFailable } from 'picsur-shared/dist/types'; import { AsyncFailable } from 'picsur-shared/dist/types';

View file

@ -6,11 +6,11 @@ import {
ImageListResponse, ImageListResponse,
ImageUpdateRequest, ImageUpdateRequest,
ImageUpdateResponse, ImageUpdateResponse,
ImageUploadResponse ImageUploadResponse,
} from 'picsur-shared/dist/dto/api/image-manage.dto'; } from 'picsur-shared/dist/dto/api/image-manage.dto';
import { import {
ImageMetaResponse, ImageMetaResponse,
ImageRequestParams ImageRequestParams,
} from 'picsur-shared/dist/dto/api/image.dto'; } from 'picsur-shared/dist/dto/api/image.dto';
import { ImageLinks } from 'picsur-shared/dist/dto/image-links.class'; import { ImageLinks } from 'picsur-shared/dist/dto/image-links.class';
import { FileType2Ext } from 'picsur-shared/dist/dto/mimes.dto'; import { FileType2Ext } from 'picsur-shared/dist/dto/mimes.dto';
@ -21,7 +21,7 @@ import {
FT, FT,
HasFailed, HasFailed,
HasSuccess, HasSuccess,
Open Open,
} from 'picsur-shared/dist/types/failable'; } from 'picsur-shared/dist/types/failable';
import { ImagesUploadRequest } from 'src/app/models/dto/images-upload-request.dto'; import { ImagesUploadRequest } from 'src/app/models/dto/images-upload-request.dto';
import { ImageUploadRequest } from '../../models/dto/image-upload-request.dto'; import { ImageUploadRequest } from '../../models/dto/image-upload-request.dto';

View file

@ -8,7 +8,7 @@ import {
RoleInfoResponse, RoleInfoResponse,
RoleListResponse, RoleListResponse,
RoleUpdateRequest, RoleUpdateRequest,
RoleUpdateResponse RoleUpdateResponse,
} from 'picsur-shared/dist/dto/api/roles.dto'; } from 'picsur-shared/dist/dto/api/roles.dto';
import { ERole } from 'picsur-shared/dist/entities/role.entity'; import { ERole } from 'picsur-shared/dist/entities/role.entity';
import { AsyncFailable, Open } from 'picsur-shared/dist/types'; import { AsyncFailable, Open } from 'picsur-shared/dist/types';

View file

@ -4,19 +4,19 @@ import {
GetPreferenceResponse, GetPreferenceResponse,
MultiplePreferencesResponse, MultiplePreferencesResponse,
UpdatePreferenceRequest, UpdatePreferenceRequest,
UpdatePreferenceResponse UpdatePreferenceResponse,
} from 'picsur-shared/dist/dto/api/pref.dto'; } from 'picsur-shared/dist/dto/api/pref.dto';
import { Permission } from 'picsur-shared/dist/dto/permissions.enum'; import { Permission } from 'picsur-shared/dist/dto/permissions.enum';
import { import {
DecodedPref, DecodedPref,
PrefValueType PrefValueType,
} from 'picsur-shared/dist/dto/preferences.dto'; } from 'picsur-shared/dist/dto/preferences.dto';
import { import {
AsyncFailable, AsyncFailable,
Fail, Fail,
FT, FT,
HasFailed, HasFailed,
Map Map,
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { ErrorService } from 'src/app/util/error-manager/error.service'; import { ErrorService } from 'src/app/util/error-manager/error.service';

View file

@ -9,7 +9,7 @@ import {
UserListRequest, UserListRequest,
UserListResponse, UserListResponse,
UserUpdateRequest, UserUpdateRequest,
UserUpdateResponse UserUpdateResponse,
} from 'picsur-shared/dist/dto/api/user-manage.dto'; } from 'picsur-shared/dist/dto/api/user-manage.dto';
import { EUser } from 'picsur-shared/dist/entities/user.entity'; import { EUser } from 'picsur-shared/dist/entities/user.entity';
import { AsyncFailable } from 'picsur-shared/dist/types'; import { AsyncFailable } from 'picsur-shared/dist/types';

View file

@ -7,7 +7,7 @@ import {
UserLoginResponse, UserLoginResponse,
UserMeResponse, UserMeResponse,
UserRegisterRequest, UserRegisterRequest,
UserRegisterResponse UserRegisterResponse,
} from 'picsur-shared/dist/dto/api/user.dto'; } from 'picsur-shared/dist/dto/api/user.dto';
import { JwtDataSchema } from 'picsur-shared/dist/dto/jwt.dto'; import { JwtDataSchema } from 'picsur-shared/dist/dto/jwt.dto';
import { EUser } from 'picsur-shared/dist/entities/user.entity'; import { EUser } from 'picsur-shared/dist/entities/user.entity';
@ -16,7 +16,7 @@ import {
Fail, Fail,
FT, FT,
HasFailed, HasFailed,
Open Open,
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { Logger } from '../logger/logger.service'; import { Logger } from '../logger/logger.service';

View file

@ -4,19 +4,19 @@ import {
GetPreferenceResponse, GetPreferenceResponse,
MultiplePreferencesResponse, MultiplePreferencesResponse,
UpdatePreferenceRequest, UpdatePreferenceRequest,
UpdatePreferenceResponse UpdatePreferenceResponse,
} from 'picsur-shared/dist/dto/api/pref.dto'; } from 'picsur-shared/dist/dto/api/pref.dto';
import { Permission } from 'picsur-shared/dist/dto/permissions.enum'; import { Permission } from 'picsur-shared/dist/dto/permissions.enum';
import { import {
DecodedPref, DecodedPref,
PrefValueType PrefValueType,
} from 'picsur-shared/dist/dto/preferences.dto'; } from 'picsur-shared/dist/dto/preferences.dto';
import { import {
AsyncFailable, AsyncFailable,
Fail, Fail,
FT, FT,
HasFailed, HasFailed,
Map Map,
} from 'picsur-shared/dist/types'; } from 'picsur-shared/dist/types';
import { BehaviorSubject } from 'rxjs'; import { BehaviorSubject } from 'rxjs';
import { ErrorService } from 'src/app/util/error-manager/error.service'; import { ErrorService } from 'src/app/util/error-manager/error.service';

View file

@ -1,5 +1,8 @@
<div class="dialog-text"> <div class="dialog-text">
<h2>Downloading {{ data.name }}...</h2> <h2>Downloading {{ data.name }}...</h2>
<mat-progress-bar mode="determinate" [value]="progress | async"></mat-progress-bar> <mat-progress-bar
mode="determinate"
[value]="progress | async"
></mat-progress-bar>
</div> </div>
<div class="dialog-buttons"></div> <div class="dialog-buttons"></div>

View file

@ -35,14 +35,15 @@ export class DownloadService {
} }
public async downloadFile(url: string) { public async downloadFile(url: string) {
const request = this.api.getBuffer(url); const request = this.api.getBuffer(url);
const closeDialog = this.showDownloadDialog('image', request.downloadProgress); const closeDialog = this.showDownloadDialog(
'image',
request.downloadProgress,
);
const file = await request.result; const file = await request.result;
if (HasFailed(file)){ if (HasFailed(file)) {
closeDialog(); closeDialog();
return this.errorService.showFailure(file, this.logger); return this.errorService.showFailure(file, this.logger);
} }