From 620f5b99a8e9244fdebc56937c15902afadee421 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Sun, 21 Oct 2018 23:22:05 +0800
Subject: [PATCH] support setting action after restarting task

---
 src/langs/zh_Hans.txt                        |  3 +++
 src/langs/zh_Hant.txt                        |  3 +++
 src/scripts/config/constants.js              |  1 +
 src/scripts/config/defaultLanguage.js        |  3 +++
 src/scripts/controllers/main.js              | 15 ++++++++++++---
 src/scripts/controllers/settings-ariang.js   |  4 ++++
 src/scripts/services/ariaNgSettingService.js |  6 ++++++
 src/views/settings-ariang.html               | 13 +++++++++++++
 8 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/langs/zh_Hans.txt b/src/langs/zh_Hans.txt
index bc5a8d1..79c3b57 100644
--- a/src/langs/zh_Hans.txt
+++ b/src/langs/zh_Hans.txt
@@ -157,6 +157,9 @@ Action After Creating New Tasks=创建新任务后执行操作
 Removing Old Task After Restarting=重试任务后删除原任务
 Navigate to Task List Page=转到任务列表页面
 Navigate to Task Detail Page=转到任务详情页面
+Action After Restarting Task=重试任务后执行操作
+Navigate to Downloading Task List Page=转到正在下载任务列表页面
+Stay on Current Page=留在当前页面
 RPC List Display Order=RPC 列表显示顺序
 Recently Used=最近使用
 RPC Alias=RPC 别名
diff --git a/src/langs/zh_Hant.txt b/src/langs/zh_Hant.txt
index 5936955..8b72a4c 100644
--- a/src/langs/zh_Hant.txt
+++ b/src/langs/zh_Hant.txt
@@ -157,6 +157,9 @@ Action After Creating New Tasks=建立新工作後執行操作
 Removing Old Task After Restarting=重試工作後刪除原工作
 Navigate to Task List Page=轉到工作清單頁面
 Navigate to Task Detail Page=轉到工作詳情頁面
+Action After Restarting Task=重試工作後執行操作
+Navigate to Downloading Task List Page=轉到正在下載工作清單頁面
+Stay on Current Page=留在目前頁面
 RPC List Display Order=RPC 清單顯示順序
 Recently Used=最近使用
 RPC Alias=RPC 別名
diff --git a/src/scripts/config/constants.js b/src/scripts/config/constants.js
index 7d347fb..725e156 100644
--- a/src/scripts/config/constants.js
+++ b/src/scripts/config/constants.js
@@ -38,6 +38,7 @@
         rpcListDisplayOrder: 'recentlyUsed',
         afterCreatingNewTask: 'task-list',
         removeOldTaskAfterRestarting: false,
+        afterRestartingTask: 'task-list-downloading',
         displayOrder: 'default:asc',
         fileListDisplayOrder: 'default:asc',
         peerListDisplayOrder: 'default:asc'
diff --git a/src/scripts/config/defaultLanguage.js b/src/scripts/config/defaultLanguage.js
index eae294b..298019f 100644
--- a/src/scripts/config/defaultLanguage.js
+++ b/src/scripts/config/defaultLanguage.js
@@ -161,6 +161,9 @@
             'Removing Old Task After Restarting': 'Removing Old Task After Restarting',
             'Navigate to Task List Page': 'Navigate to Task List Page',
             'Navigate to Task Detail Page': 'Navigate to Task Detail Page',
+            'Action After Restarting Task': 'Action After Restarting Task',
+            'Navigate to Downloading Task List Page': 'Navigate to Downloading Task List Page',
+            'Stay on Current Page': 'Stay on Current Page',
             'RPC List Display Order': 'RPC List Display Order',
             'Recently Used': 'Recently Used',
             'RPC Alias': 'RPC Alias',
diff --git a/src/scripts/controllers/main.js b/src/scripts/controllers/main.js
index 4689f67..2dd7043 100644
--- a/src/scripts/controllers/main.js
+++ b/src/scripts/controllers/main.js
@@ -148,9 +148,18 @@
 
                     refreshGlobalStat(true);
 
-                    if (response.success) {
-                        if ($location.path() !== '/downloading') {
-                            $location.path('/downloading');
+                    var actionAfterRestartingTask = ariaNgSettingService.getAfterRestartingTask();
+
+                    if (response.success && response.data) {
+                        console.log(response);
+                        if (actionAfterRestartingTask === 'task-list-downloading') {
+                            if ($location.path() !== '/downloading') {
+                                $location.path('/downloading');
+                            } else {
+                                $route.reload();
+                            }
+                        } else if (actionAfterRestartingTask === 'task-detail') {
+                            $location.path('/task/detail/' + response.data);
                         } else {
                             $route.reload();
                         }
diff --git a/src/scripts/controllers/settings-ariang.js b/src/scripts/controllers/settings-ariang.js
index b0cd1ca..d3cd128 100644
--- a/src/scripts/controllers/settings-ariang.js
+++ b/src/scripts/controllers/settings-ariang.js
@@ -173,6 +173,10 @@
             ariaNgSettingService.setRemoveOldTaskAfterRestarting(value);
         };
 
+        $scope.setAfterRestartingTask = function (value) {
+            ariaNgSettingService.setAfterRestartingTask(value);
+        };
+
         $scope.showImportSettingsModal = function () {
             $scope.context.importSettings = null;
             angular.element('#import-settings-modal').modal();
diff --git a/src/scripts/services/ariaNgSettingService.js b/src/scripts/services/ariaNgSettingService.js
index 5fbb84a..8a4b8de 100644
--- a/src/scripts/services/ariaNgSettingService.js
+++ b/src/scripts/services/ariaNgSettingService.js
@@ -366,6 +366,12 @@
             setRemoveOldTaskAfterRestarting: function (value) {
                 setOption('removeOldTaskAfterRestarting', value);
             },
+            getAfterRestartingTask: function () {
+                return getOption('afterRestartingTask');
+            },
+            setAfterRestartingTask: function (value) {
+                setOption('afterRestartingTask', value);
+            },
             getCurrentRpcDisplayName: function () {
                 var options = getOptions();
 
diff --git a/src/views/settings-ariang.html b/src/views/settings-ariang.html
index fc10660..784d052 100644
--- a/src/views/settings-ariang.html
+++ b/src/views/settings-ariang.html
@@ -151,6 +151,19 @@
                             </select>
                         </div>
                     </div>
+                    <div class="row">
+                        <div class="setting-key setting-key-without-desc col-sm-4">
+                            <span translate>Action After Restarting Task</span>
+                        </div>
+                        <div class="setting-value col-sm-8">
+                            <select class="form-control" style="width: 100%;" ng-model="context.settings.afterRestartingTask"
+                                    ng-change="setAfterRestartingTask(context.settings.afterRestartingTask)">
+                                <option value="task-list-downloading" translate>Navigate to Downloading Task List Page</option>
+                                <option value="task-detail" translate>Navigate to Task Detail Page</option>
+                                <option value="stay-on-current" translate>Stay on Current Page</option>
+                            </select>
+                        </div>
+                    </div>
                     <div class="row">
                         <div class="setting-key setting-key-without-desc col-sm-4">
                             <span translate>Import / Export AriaNg Settings</span>