From a81284b7b55370dd2c61f3ee303b1ec2de667113 Mon Sep 17 00:00:00 2001 From: ElonH Date: Tue, 2 Jun 2020 16:35:36 +0800 Subject: [PATCH] fix(core-stats-flow): some properties is option --- src/app/@dataflow/rclone/core-stats-flow.ts | 12 ++++++------ .../components/speed-chart/speed-chart.component.ts | 6 ++++-- src/app/components/summary/summary.component.ts | 4 +++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/app/@dataflow/rclone/core-stats-flow.ts b/src/app/@dataflow/rclone/core-stats-flow.ts index aa2d4c7..cac03da 100644 --- a/src/app/@dataflow/rclone/core-stats-flow.ts +++ b/src/app/@dataflow/rclone/core-stats-flow.ts @@ -10,14 +10,14 @@ export interface CoreStatsFlowParamsNode { export interface CoreStatsFlowInNode extends CoreStatsFlowParamsNode, IRcloneServer {} export interface ITransferring { - bytes: number; - eta: number; - group: string; + bytes?: number; + eta?: number; + group?: string; name: string; - percentage: number; + percentage?: number; size: number; - speed: number; - speedAvg: number; + speed?: number; + speedAvg?: number; } export interface CoreStatsFlowOutItemNode { diff --git a/src/app/components/speed-chart/speed-chart.component.ts b/src/app/components/speed-chart/speed-chart.component.ts index 9c44252..18e41f3 100644 --- a/src/app/components/speed-chart/speed-chart.component.ts +++ b/src/app/components/speed-chart/speed-chart.component.ts @@ -188,8 +188,10 @@ export class RngSpeedChartComponent implements OnInit { let speed = 0; let avg = 0; if (node[0]['core-stats'].transferring) { - node[0]['core-stats'].transferring.forEach(x => (avg += x.speedAvg)); - node[0]['core-stats'].transferring.forEach(x => (speed += x.speed)); + node[0]['core-stats'].transferring.forEach(x => { + if (x.speed) speed += x.speed; + if (x.speedAvg) avg += x.speedAvg; + }); } const speedData = this.lineChartData[0].data as ChartPoint[]; const avgData = this.lineChartData[1].data as ChartPoint[]; diff --git a/src/app/components/summary/summary.component.ts b/src/app/components/summary/summary.component.ts index 5920dbd..2b4549f 100644 --- a/src/app/components/summary/summary.component.ts +++ b/src/app/components/summary/summary.component.ts @@ -61,7 +61,9 @@ export class RngSummaryComponent implements OnInit { if (err.length !== 0) return; let speed = 0; if (this.values.transferring) { - this.values.transferring.forEach(y => (speed += y.speed)); + this.values.transferring.forEach(y => { + if (y.speed) speed += y.speed; + }); } this.values = JSON.parse(JSON.stringify(x['core-stats'])); this.values.bytesHumanReadable = FormatBytes(this.values.bytes, 4);