aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/shared-main/account/actor-avatar-info.component.ts8
-rw-r--r--client/src/app/shared/shared-main/angular/bytes.pipe.ts26
-rw-r--r--client/src/app/shared/shared-main/video/video.service.ts3
3 files changed, 8 insertions, 29 deletions
diff --git a/client/src/app/shared/shared-main/account/actor-avatar-info.component.ts b/client/src/app/shared/shared-main/account/actor-avatar-info.component.ts
index 3a86e5b21..5daa54cb5 100644
--- a/client/src/app/shared/shared-main/account/actor-avatar-info.component.ts
+++ b/client/src/app/shared/shared-main/account/actor-avatar-info.component.ts
@@ -1,7 +1,9 @@
1import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core' 1import { Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
2import { Notifier, ServerService } from '@app/core' 2import { Notifier, ServerService } from '@app/core'
3import { Account, BytesPipe, VideoChannel } from '@app/shared/shared-main' 3import { getBytes } from '@root-helpers/bytes'
4import { ServerConfig } from '@shared/models' 4import { ServerConfig } from '@shared/models'
5import { VideoChannel } from '../video-channel/video-channel.model'
6import { Account } from '../account/account.model'
5 7
6@Component({ 8@Component({
7 selector: 'my-actor-avatar-info', 9 selector: 'my-actor-avatar-info',
@@ -18,13 +20,11 @@ export class ActorAvatarInfoComponent implements OnInit {
18 maxSizeText: string 20 maxSizeText: string
19 21
20 private serverConfig: ServerConfig 22 private serverConfig: ServerConfig
21 private bytesPipe: BytesPipe
22 23
23 constructor ( 24 constructor (
24 private serverService: ServerService, 25 private serverService: ServerService,
25 private notifier: Notifier 26 private notifier: Notifier
26 ) { 27 ) {
27 this.bytesPipe = new BytesPipe()
28 this.maxSizeText = $localize`max size` 28 this.maxSizeText = $localize`max size`
29 } 29 }
30 30
@@ -52,7 +52,7 @@ export class ActorAvatarInfoComponent implements OnInit {
52 } 52 }
53 53
54 get maxAvatarSizeInBytes () { 54 get maxAvatarSizeInBytes () {
55 return this.bytesPipe.transform(this.maxAvatarSize) 55 return getBytes(this.maxAvatarSize)
56 } 56 }
57 57
58 get avatarExtensions () { 58 get avatarExtensions () {
diff --git a/client/src/app/shared/shared-main/angular/bytes.pipe.ts b/client/src/app/shared/shared-main/angular/bytes.pipe.ts
index f4f473568..f3f57b825 100644
--- a/client/src/app/shared/shared-main/angular/bytes.pipe.ts
+++ b/client/src/app/shared/shared-main/angular/bytes.pipe.ts
@@ -1,34 +1,12 @@
1import { Pipe, PipeTransform } from '@angular/core' 1import { Pipe, PipeTransform } from '@angular/core'
2import { getBytes } from '@root-helpers/bytes'
2 3
3// Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/ng-pipes/pipes/math/bytes.ts 4// Thanks: https://github.com/danrevah/ngx-pipes/blob/master/src/ng-pipes/pipes/math/bytes.ts
4 5
5@Pipe({ name: 'bytes' }) 6@Pipe({ name: 'bytes' })
6export class BytesPipe implements PipeTransform { 7export class BytesPipe implements PipeTransform {
7 private dictionary: Array<{ max: number; type: string }> = [
8 { max: 1024, type: 'B' },
9 { max: 1048576, type: 'KB' },
10 { max: 1073741824, type: 'MB' },
11 { max: 1.0995116e12, type: 'GB' }
12 ]
13 8
14 transform (value: number, precision?: number | undefined): string | number { 9 transform (value: number, precision?: number | undefined): string | number {
15 const format = this.dictionary.find(d => value < d.max) || this.dictionary[this.dictionary.length - 1] 10 return getBytes(value, precision)
16 const calc = value / (format.max / 1024)
17
18 const num = precision === undefined
19 ? calc
20 : applyPrecision(calc, precision)
21
22 return `${num} ${format.type}`
23 } 11 }
24} 12}
25
26function applyPrecision (num: number, precision: number) {
27 if (precision <= 0) {
28 return Math.round(num)
29 }
30
31 const tho = 10 ** precision
32
33 return Math.round(num * tho) / tho
34}
diff --git a/client/src/app/shared/shared-main/video/video.service.ts b/client/src/app/shared/shared-main/video/video.service.ts
index b01e919aa..48aff82b4 100644
--- a/client/src/app/shared/shared-main/video/video.service.ts
+++ b/client/src/app/shared/shared-main/video/video.service.ts
@@ -21,7 +21,8 @@ import {
21 VideoUpdate 21 VideoUpdate
22} from '@shared/models' 22} from '@shared/models'
23import { environment } from '../../../../environments/environment' 23import { environment } from '../../../../environments/environment'
24import { Account, AccountService } from '../account' 24import { Account } from '../account/account.model'
25import { AccountService } from '../account/account.service'
25import { VideoChannel, VideoChannelService } from '../video-channel' 26import { VideoChannel, VideoChannelService } from '../video-channel'
26import { VideoDetails } from './video-details.model' 27import { VideoDetails } from './video-details.model'
27import { VideoEdit } from './video-edit.model' 28import { VideoEdit } from './video-edit.model'