Merge pull request #980 from dicarne/master

fix: tasks list has old wrong items and add switch for auto download torrent
agalwood · Jun 19, 2021 · 3245bbd · 3245bbd
2 parents 509c799 + 6016151
commit 3245bbd
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 2 deletions.
diff --git a/src/main/core/ConfigManager.js b/src/main/core/ConfigManager.js
@@ -59,6 +59,8 @@ export default class ConfigManager {
         'dht-file-path6': getDhtPath(IP_VERSION.V6),
         'dht-listen-port': 26701,
         'dir': getUserDownloadsPath(),
+        'follow-metalink': false,
+        'follow-torrent': false,
         'listen-port': 21301,
         'max-concurrent-downloads': 5,
         'max-connection-per-server': getMaxConnectionPerServer(),

diff --git a/src/renderer/components/Preference/Basic.vue b/src/renderer/components/Preference/Basic.vue
@@ -183,6 +183,20 @@
               :label="$t('preferences.seed-time')">
             </el-input-number>
           </el-col>
+          <el-col class="form-item-sub" :span="24">
+            <el-switch
+              v-model="form.followMetalink"
+              :active-text="$t('preferences.follow-metalink')"
+            >
+            </el-switch>
+          </el-col>
+          <el-col class="form-item-sub" :span="24">
+            <el-switch
+              v-model="form.followTorrent"
+              :active-text="$t('preferences.follow-torrent')"
+            >
+            </el-switch>
+          </el-col>
           <div class="el-form-item__info" style="margin-top: 8px;">
           </div>
         </el-form-item>
@@ -271,6 +285,8 @@
       btSaveMetadata,
       dir,
       engineMaxConnectionPerServer,
+      followMetalink,
+      followTorrent,
       hideAppMenu,
       keepSeeding,
       keepWindowState,
@@ -296,6 +312,8 @@
       continue: config.continue,
       dir,
       engineMaxConnectionPerServer,
+      followMetalink,
+      followTorrent,
       hideAppMenu,
       keepSeeding,
       keepWindowState,

diff --git a/src/renderer/components/TaskDetail/Index.vue b/src/renderer/components/TaskDetail/Index.vue
@@ -168,7 +168,6 @@
           }
         })
         merge(cached.files, result)
-
         return cached.files
       },
       selectedFileList () {
@@ -185,6 +184,11 @@
       window.removeEventListener('resize', this.handleAppResize)
       cached.files = []
     },
+    watch: {
+      gid () {
+        cached.files = []
+      }
+    },
     methods: {
       handleClose (done) {
         window.removeEventListener('resize', this.handleAppResize)

diff --git a/src/renderer/utils/task.js b/src/renderer/utils/task.js
@@ -14,6 +14,8 @@ export const initTaskForm = state => {
     allProxy,
     dir,
     engineMaxConnectionPerServer,
+    followMetalink,
+    followTorrent,
     maxConnectionPerServer,
     newTaskShowDownloading,
     split
@@ -23,6 +25,8 @@ export const initTaskForm = state => {
     cookie: '',
     dir,
     engineMaxConnectionPerServer,
+    followMetalink,
+    followTorrent,
     maxConnectionPerServer,
     newTaskShowDownloading,
     out: '',
@@ -93,6 +97,9 @@ export const buildOption = (type, form) => {
   if (!isEmpty(header)) {
     result.header = header
   }
+
+  result.pauseMetadata = !form.followMetalink
+  result.followTorrent = !!form.followTorrent
   return result
 }
 

diff --git a/src/shared/locales/zh-CN/preferences.js b/src/shared/locales/zh-CN/preferences.js
@@ -77,5 +77,7 @@ export default {
   'baidu-exporter-help': '点此查看使用说明',
   'auto-update': '自动更新',
   'auto-check-update': '自动检查更新',
-  'last-check-update-time': '上次检查更新时间'
+  'last-check-update-time': '上次检查更新时间',
+  'follow-metalink': '自动开始下载磁力链接、种子内的文件',
+  'follow-torrent': '种子下载完后自动下载种子内容'
 }