add verifying and pending verification status

This commit is contained in:
MaysWind 2019-04-23 00:44:45 +08:00
parent 1b3067c0c4
commit 0c5a6ce76b
7 changed files with 24 additions and 4 deletions

View file

@ -54,6 +54,8 @@ Filters=过滤器
Download=下载 Download=下载
Upload=上传 Upload=上传
Downloading=正在下载 Downloading=正在下载
Pending Verification=等待验证
Verifying=正在验证
Seeding=正在做种 Seeding=正在做种
Waiting=正在等待 Waiting=正在等待
Paused=已暂停 Paused=已暂停

View file

@ -54,6 +54,8 @@ Filters=篩選器
Download=下載 Download=下載
Upload=上傳 Upload=上傳
Downloading=正在下載 Downloading=正在下載
Pending Verification=等待驗證
Verifying=正在驗證
Seeding=正在做種 Seeding=正在做種
Waiting=正在等待 Waiting=正在等待
Paused=已暫停 Paused=已暫停

View file

@ -58,6 +58,8 @@
'Download': 'Download', 'Download': 'Download',
'Upload': 'Upload', 'Upload': 'Upload',
'Downloading': 'Downloading', 'Downloading': 'Downloading',
'Pending Verification': 'Pending Verification',
'Verifying': 'Verifying',
'Seeding': 'Seeding', 'Seeding': 'Seeding',
'Waiting': 'Waiting', 'Waiting': 'Waiting',
'Paused': 'Paused', 'Paused': 'Paused',

View file

@ -32,6 +32,14 @@
$rootScope.taskContext.list = taskList; $rootScope.taskContext.list = taskList;
needRequestWholeInfo = false; needRequestWholeInfo = false;
} else { } else {
if ($rootScope.taskContext.list && $rootScope.taskContext.list.length > 0) {
for (var i = 0; i < $rootScope.taskContext.list.length; i++) {
var task = $rootScope.taskContext.list[i];
delete task.verifiedLength;
delete task.verifyIntegrityPending;
}
}
if (ariaNgCommonService.extendArray(taskList, $rootScope.taskContext.list, 'gid')) { if (ariaNgCommonService.extendArray(taskList, $rootScope.taskContext.list, 'gid')) {
needRequestWholeInfo = false; needRequestWholeInfo = false;
} else { } else {

View file

@ -8,7 +8,11 @@
} }
if (task.status === 'active') { if (task.status === 'active') {
if (task.seeder === true || task.seeder === 'true') { if (task.verifyIntegrityPending) {
return 'Pending Verification';
} else if (task.verifiedLength) {
return 'Verifying';
} else if (task.seeder === true || task.seeder === 'true') {
return 'Seeding'; return 'Seeding';
} else { } else {
return 'Downloading'; return 'Downloading';

View file

@ -280,7 +280,9 @@
'numSeeders', 'numSeeders',
'seeder', 'seeder',
'status', 'status',
'errorCode' 'errorCode',
'verifiedLength',
'verifyIntegrityPending'
]; ];
}, },
getFullTaskParams: function () { getFullTaskParams: function () {

View file

@ -65,13 +65,13 @@
<span class="task-last-time" <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> 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" <span class="task-download-speed visible-xs-inline pull-right"
ng-bind="(task.status === 'active' ? (!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}))"></span>
<span class="task-seeders pull-right" ng-bind="task.status === 'active' ? ((task.numSeeders ? (task.numSeeders + '/') : '') + task.connections) : ''"></span> <span class="task-seeders pull-right" ng-bind="task.status === 'active' ? ((task.numSeeders ? (task.numSeeders + '/') : '') + task.connections) : ''"></span>
</div> </div>
</div> </div>
<div class="col-md-2 col-sm-2 hidden-xs"> <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' : '') : ''}}" <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.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}))"></span>
</div> </div>
<div class="task-right-arrow visible-md visible-lg"> <div class="task-right-arrow visible-md visible-lg">
<a ng-href="#!/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}"> <a ng-href="#!/task/detail/{{task.gid}}" title="{{'Click to view task detail' | translate}}">