simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

optimize get task name

Browse source
This commit is contained in:
MaysWind 2016-05-25 22:53:41 +08:00
parent d901ca123a
commit ad2a9e6c7f
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
app/scripts/core/utils.js
View file

@ -55,6 +55,27 @@
return path.substring(index + 1); return path.substring(index + 1);
}, },
getTaskName: function (task) {
var taskName = "";
if (task.bittorrent && task.bittorrent.info) {
taskName = task.bittorrent.info.name;
}
if (!taskName && task.files && task.files.length >= 1) {
taskName = this.getFileNameFromPath(task.files[0].path);
}
if (!taskName && task.files && task.files.length >= 1 && task.files[0].uris && task.files[0].uris.length >= 1) {
taskName = this.getFileNameFromPath(task.files[0].uris[0].uri);
}
if (!taskName) {
taskName = translateFilter('Unknown');
}
return taskName;
},
processDownloadTask: function (task) { processDownloadTask: function (task) {
if (!task) { if (!task) {
return task; return task;
@ -65,19 +86,12 @@
task.uploadSpeed = parseInt(task.uploadSpeed); task.uploadSpeed = parseInt(task.uploadSpeed);
task.downloadSpeed = parseInt(task.downloadSpeed); task.downloadSpeed = parseInt(task.downloadSpeed);
task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0); task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0);
task.taskName = this.getTaskName(task);
task.idle = task.downloadSpeed == 0; task.idle = task.downloadSpeed == 0;
var remainLength = task.totalLength - task.completedLength; var remainLength = task.totalLength - task.completedLength;
task.remainTime = calculateDownloadRemainTime(remainLength, task.downloadSpeed); task.remainTime = calculateDownloadRemainTime(remainLength, task.downloadSpeed);
if (task.bittorrent && task.bittorrent.info) {
task.taskName = task.bittorrent.info.name;
} else if (task.files && task.files.length >= 1) {
task.taskName = this.getFileNameFromPath(task.files[0].path);
} else {
task.taskName = translateFilter('Unknown');
}
if (task.files) { if (task.files) {
for (var i = 0; i < task.files.length; i++) { for (var i = 0; i < task.files.length; i++) {
var file = task.files[i]; var file = task.files[i];