From 3950c7a528ded1e086237cfd41b24b12cf2af6cb Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Fri, 24 May 2019 23:54:51 +0800
Subject: [PATCH] show verifying percent when task status is verifying

---
 src/langs/zh_Hans.txt                    | 1 +
 src/langs/zh_Hant.txt                    | 1 +
 src/scripts/config/defaultLanguage.js    | 1 +
 src/scripts/filters/taskStatus.js        | 2 +-
 src/scripts/services/aria2TaskService.js | 6 ++++++
 src/views/list.html                      | 4 ++--
 src/views/task-detail.html               | 2 +-
 7 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt
index 230b4a6..f7ae5de 100644
--- a/src/langs/zh_Hans.txt
+++ b/src/langs/zh_Hans.txt
@@ -296,6 +296,7 @@ requires.aria2-version=需要 aria2 v{{version}} 或更高版本
 task.new.download-links=下载链接 ({{count}} 个链接):
 task.pieceinfo=已完成: {{completed}}, 共计: {{total}} 块
 task.error-occurred=发生错误 ({{errorcode}})
+task.verifying-percent=正在验证 ({{verifiedPercent}}%)
 settings.file-count=({{count}} 个文件)
 settings.total-count=(共计: {{count}}个)
 debug.latest-logs=最近 {{count}} 条日志
diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt
index cb0fbaa..c560af4 100644
--- a/src/langs/zh_Hant.txt
+++ b/src/langs/zh_Hant.txt
@@ -296,6 +296,7 @@ requires.aria2-version=需要 aria2 v{{version}} 或更高版本
 task.new.download-links=下載連結 ({{count}} 个連結):
 task.pieceinfo=已完成: {{completed}}, 共計: {{total}} 塊
 task.error-occurred=發生錯誤 ({{errorcode}})
+task.verifying-percent=正在驗證 ({{verifiedPercent}}%)
 settings.file-count=({{count}} 個檔案)
 settings.total-count=(共計: {{count}}個)
 debug.latest-logs=最近 {{count}} 條記錄
diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js
index 56911e5..eeeac0f 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -300,6 +300,7 @@
                 'task.new.download-links': 'Download Links ({{count}} Links):',
                 'task.pieceinfo': 'Completed: {{completed}}, Total: {{total}}',
                 'task.error-occurred': 'Error Occurred ({{errorcode}})',
+                'task.verifying-percent': 'Verifying ({{verifiedPercent}}%)',
                 'settings.file-count': '({{count}} Files)',
                 'settings.total-count': '(Total Count: {{count}})',
                 'debug.latest-logs': 'Latest {{count}} Logs'
diff --git a/src/scripts/filters/taskStatus.js b/src/scripts/filters/taskStatus.js
index b95108c..e82d1ff 100644
--- a/src/scripts/filters/taskStatus.js
+++ b/src/scripts/filters/taskStatus.js
@@ -11,7 +11,7 @@
                 if (task.verifyIntegrityPending) {
                     return 'Pending Verification';
                 } else if (task.verifiedLength) {
-                    return 'Verifying';
+                    return (task.verifiedPercent ? 'format.task.verifying-percent' : 'Verifying');
                 } else if (task.seeder === true || task.seeder === 'true') {
                     return 'Seeding';
                 } else {
diff --git a/src/scripts/services/aria2TaskService.js b/src/scripts/services/aria2TaskService.js
index 73624b3..9437f19 100644
--- a/src/scripts/services/aria2TaskService.js
+++ b/src/scripts/services/aria2TaskService.js
@@ -294,6 +294,12 @@
             task.remainTime = calculateDownloadRemainTime(task.remainLength, task.downloadSpeed);
             task.seeder = (task.seeder === true || task.seeder === 'true');
 
+            if (task.verifiedLength && task.totalLength) {
+                task.verifiedPercent = parseInt(task.verifiedLength / task.totalLength * 100);
+            } else {
+                task.verifiedPercent = undefined;
+            }
+
             var taskNameResult = getTaskName(task);
             task.taskName = taskNameResult.name;
             task.hasTaskName = taskNameResult.success;
diff --git a/src/views/list.html b/src/views/list.html
index a1459bd..bb7ec45 100644
--- a/src/views/list.html
+++ b/src/views/list.html
@@ -65,13 +65,13 @@
                         <span class="task-last-time"
                               ng-bind="task.status === 'waiting' ? '--:--:--' : (task.status === 'paused' ? '' : (task.status === 'active' ? ((0 <= task.remainTime && task.remainTime < 86400) ? (task.remainTime | dateDuration: 'second': 'HH:mm:ss') : ('More Than One Day' | translate)) : ''))"></span>
                         <span class="task-download-speed visible-xs-inline pull-right"
-                              ng-bind="(task.status === 'active' && !task.verifyIntegrityPending && !task.verifiedLength ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode}))"></span>
+                              ng-bind="(task.status === 'active' && !task.verifyIntegrityPending && !task.verifiedLength ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode, verifiedPercent: task.verifiedPercent}))"></span>
                         <span class="task-seeders pull-right" ng-bind="task.status === 'active' ? ((task.numSeeders ? (task.numSeeders + '/') : '') + task.connections) : ''"></span>
                     </div>
                 </div>
                 <div class="col-md-2 col-sm-2 hidden-xs">
                     <span class="task-download-speed" title="{{task.status === 'active' ? (('Download Speed' | translate) + ': ' + (task.downloadSpeed | readableVolume) + '/s') + (task.bittorrent ? ', ' + ('Upload Speed' | translate) + ': ' + (task.uploadSpeed | readableVolume) + '/s' : '') : ''}}"
-                          ng-bind="(task.status === 'active' && !task.verifyIntegrityPending && !task.verifiedLength ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode}))"></span>
+                          ng-bind="(task.status === 'active' && !task.verifyIntegrityPending && !task.verifiedLength ? (!task.seeder || task.downloadSpeed > 0 ? (task.downloadSpeed | readableVolume) + '/s' : '-') : (task | taskStatus: true | translate: {errorcode: task.errorCode, verifiedPercent: task.verifiedPercent}))"></span>
                 </div>
                 <div class="task-right-arrow visible-md visible-lg">
                     <a ng-href="#!/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}">
diff --git a/src/views/task-detail.html b/src/views/task-detail.html
index 261c591..2f2368e 100644
--- a/src/views/task-detail.html
+++ b/src/views/task-detail.html
@@ -48,7 +48,7 @@
                             <span translate>Task Status</span>
                         </div>
                         <div class="setting-value col-sm-8">
-                            <span ng-bind="task | taskStatus | translate: {errorcode: task.errorCode}"></span>
+                            <span ng-bind="task | taskStatus | translate: {errorcode: task.errorCode, verifiedPercent: task.verifiedPercent}"></span>
                             <i class="icon-primary fa fa-question-circle" ng-if="task.errorCode && task.errorCode != '0' && task.errorMessage"
                                   ng-tooltip="{{task.errorMessage}}" ng-tooltip-container="body" ng-tooltip-placement="top"></i>
                         </div>