From c30c0751ef1c17abd7362048de4eddddfce10a7d Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 23 May 2016 23:28:32 +0800
Subject: [PATCH] refactor code

---
 app/scripts/controllers/list.js | 30 +-----------------------------
 app/scripts/core/utils.js       | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app/scripts/controllers/list.js b/app/scripts/controllers/list.js
index ebe31f1..521910e 100644
--- a/app/scripts/controllers/list.js
+++ b/app/scripts/controllers/list.js
@@ -21,34 +21,6 @@
             }
         };
 
-        var calculateDownloadRemainTime = function (remainBytes, downloadSpeed) {
-            if (downloadSpeed == 0) {
-                return 0;
-            }
-
-            return remainBytes / downloadSpeed;
-        };
-
-        var processDownloadTask = function (task) {
-            task.totalLength = parseInt(task.totalLength);
-            task.completedLength = parseInt(task.completedLength);
-            task.uploadSpeed = parseInt(task.uploadSpeed);
-            task.downloadSpeed = parseInt(task.downloadSpeed);
-            task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0);
-            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 = utils.getFileNameFromPath(task.files[0].path);
-            } else {
-                task.taskName = translateFilter('Unknown');
-            }
-        };
-
         var refreshDownloadTask = function () {
             var invokeMethod = null;
             var params = [];
@@ -82,7 +54,7 @@
                     callback: function (result) {
                         if (result && result.length > 0) {
                             for (var i = 0; i < result.length; i++) {
-                                processDownloadTask(result[i]);
+                                utils.processDownloadTask(result[i]);
                             }
                         }
 
diff --git a/app/scripts/core/utils.js b/app/scripts/core/utils.js
index f53f4a0..569624f 100644
--- a/app/scripts/core/utils.js
+++ b/app/scripts/core/utils.js
@@ -2,6 +2,14 @@
     'use strict';
 
     angular.module('ariaNg').factory('utils', ['$location', '$timeout', '$base64', 'SweetAlert', 'translateFilter', 'ariaNgConstants', function ($location, $timeout, $base64, SweetAlert, translateFilter, ariaNgConstants) {
+        var calculateDownloadRemainTime = function (remainBytes, downloadSpeed) {
+            if (downloadSpeed == 0) {
+                return 0;
+            }
+
+            return remainBytes / downloadSpeed;
+        };
+
         return {
             generateUniqueId: function () {
                 var sourceId = ariaNgConstants.appPrefix + '_' + Math.round(new Date().getTime() / 1000) + '_' + Math.random();
@@ -47,6 +55,31 @@
 
                 return path.substring(index + 1);
             },
+            processDownloadTask: function (task) {
+                if (!task) {
+                    return task;
+                }
+
+                task.totalLength = parseInt(task.totalLength);
+                task.completedLength = parseInt(task.completedLength);
+                task.uploadSpeed = parseInt(task.uploadSpeed);
+                task.downloadSpeed = parseInt(task.downloadSpeed);
+                task.completePercent = (task.totalLength > 0 ? task.completedLength / task.totalLength * 100 : 0);
+                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');
+                }
+
+                return task;
+            },
             isUrlMatchUrl2: function (url, url2) {
                 if (url === url2) {
                     return true;