From ad2a9e6c7f8c2dac88e0e4eb332a50074c7fdf64 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Wed, 25 May 2016 22:53:41 +0800
Subject: [PATCH] optimize get task name

---
 app/scripts/core/utils.js | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/scripts/core/utils.js b/app/scripts/core/utils.js
index c49f5a1..9a027ea 100644
--- a/app/scripts/core/utils.js
+++ b/app/scripts/core/utils.js
@@ -55,6 +55,27 @@
 
                 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) {
                 if (!task) {
                     return task;
@@ -65,19 +86,12 @@
                 task.uploadSpeed = parseInt(task.uploadSpeed);
                 task.downloadSpeed = parseInt(task.downloadSpeed);
                 task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0);
+                task.taskName = this.getTaskName(task);
                 task.idle = task.downloadSpeed == 0;
 
                 var remainLength = task.totalLength - task.completedLength;
                 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) {
                     for (var i = 0; i < task.files.length; i++) {
                         var file = task.files[i];