diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt index 30c2179..230b4a6 100644 --- a/src/langs/zh_Hans.txt +++ b/src/langs/zh_Hans.txt @@ -54,6 +54,8 @@ Filters=过滤器 Download=下载 Upload=上传 Downloading=正在下载 +Pending Verification=等待验证 +Verifying=正在验证 Seeding=正在做种 Waiting=正在等待 Paused=已暂停 diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt index cb449b2..cb0fbaa 100644 --- a/src/langs/zh_Hant.txt +++ b/src/langs/zh_Hant.txt @@ -54,6 +54,8 @@ Filters=篩選器 Download=下載 Upload=上傳 Downloading=正在下載 +Pending Verification=等待驗證 +Verifying=正在驗證 Seeding=正在做種 Waiting=正在等待 Paused=已暫停 diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js index fdccc89..56911e5 100644 --- a/src/scripts/config/defaultLanguage.js +++ b/src/scripts/config/defaultLanguage.js @@ -58,6 +58,8 @@ 'Download': 'Download', 'Upload': 'Upload', 'Downloading': 'Downloading', + 'Pending Verification': 'Pending Verification', + 'Verifying': 'Verifying', 'Seeding': 'Seeding', 'Waiting': 'Waiting', 'Paused': 'Paused', diff --git a/src/scripts/controllers/list.js b/src/scripts/controllers/list.js index eebe4dc..0e3fde8 100644 --- a/src/scripts/controllers/list.js +++ b/src/scripts/controllers/list.js @@ -32,6 +32,14 @@ $rootScope.taskContext.list = taskList; needRequestWholeInfo = false; } 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')) { needRequestWholeInfo = false; } else { diff --git a/src/scripts/filters/taskStatus.js b/src/scripts/filters/taskStatus.js index 7c33368..b95108c 100644 --- a/src/scripts/filters/taskStatus.js +++ b/src/scripts/filters/taskStatus.js @@ -8,7 +8,11 @@ } 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'; } else { return 'Downloading'; diff --git a/src/scripts/services/aria2RpcService.js b/src/scripts/services/aria2RpcService.js index 99cac20..1cc88b6 100644 --- a/src/scripts/services/aria2RpcService.js +++ b/src/scripts/services/aria2RpcService.js @@ -280,7 +280,9 @@ 'numSeeders', 'seeder', 'status', - 'errorCode' + 'errorCode', + 'verifiedLength', + 'verifyIntegrityPending' ]; }, getFullTaskParams: function () { diff --git a/src/views/list.html b/src/views/list.html index 3a244d4..a1459bd 100644 --- a/src/views/list.html +++ b/src/views/list.html @@ -65,13 +65,13 @@ + 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}))">