From a097d89d6846901e08188149db2e2acc1fb5a9c5 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 21 Nov 2024 10:26:12 +0800
Subject: [PATCH] =?UTF-8?q?feat(DownloadSettings):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=99=A8=E8=AE=BE=E7=BD=AEAPI=EF=BC=8C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E8=BD=BD=E5=99=A8=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialog/AddDownloadDialog.vue   | 13 ++++++------
 src/components/dialog/SiteAddEditDialog.vue   |  5 ++---
 src/components/dialog/SubscribeEditDialog.vue |  5 ++---
 src/pages/downloading.vue                     | 21 +++++++------------
 4 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/components/dialog/AddDownloadDialog.vue b/src/components/dialog/AddDownloadDialog.vue
index 881bd12f..7c252d7b 100644
--- a/src/components/dialog/AddDownloadDialog.vue
+++ b/src/components/dialog/AddDownloadDialog.vue
@@ -13,6 +13,9 @@ const props = defineProps({
   torrent: Object as PropType<TorrentInfo>,
 })
 
+// 定义成功和失败事件
+const emit = defineEmits(['done', 'error', 'close'])
+
 // 提示框
 const $toast = useToast()
 
@@ -22,8 +25,8 @@ const selectedDownloader = ref<string | null>(null)
 // 选择的保存目录
 const selectedDirectory = ref<string | null>(null)
 
-// 定义成功和失败事件
-const emit = defineEmits(['done', 'error', 'close'])
+// 下载器
+const downloaders = ref<DownloaderConf[]>([])
 
 // 所有目录设置
 const directories = ref<TransferDirectoryConf[]>([])
@@ -53,14 +56,10 @@ const targetDirectories = computed(() => {
   return [...new Set(downloadDirectories)]
 })
 
-// 下载器
-const downloaders = ref<DownloaderConf[]>([])
-
 // 调用API查询下载器设置
 async function loadDownloaderSetting() {
   try {
-    const result: { [key: string]: any } = await api.get('system/setting/Downloaders')
-    downloaders.value = result.data?.value ?? []
+    downloaders.value = await api.get('download/clients')
   } catch (error) {
     console.log(error)
   }
diff --git a/src/components/dialog/SiteAddEditDialog.vue b/src/components/dialog/SiteAddEditDialog.vue
index 6c180e3c..f3330cde 100644
--- a/src/components/dialog/SiteAddEditDialog.vue
+++ b/src/components/dialog/SiteAddEditDialog.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useToast } from 'vue-toast-notification'
-import type { Site } from '@/api/types'
+import type { DownloaderConf, Site } from '@/api/types'
 import { doneNProgress, startNProgress } from '@/api/nprogress'
 import { numberValidator, requiredValidator } from '@/@validators'
 import api from '@/api'
@@ -65,8 +65,7 @@ const downloaderOptions = ref<{ title: string; value: string }[]>([])
 
 async function loadDownloaderSetting() {
   try {
-    const result: { [key: string]: any } = await api.get('system/setting/Downloaders')
-    const downloaders = result.data?.value ?? []
+    const downloaders: DownloaderConf[] = await api.get('download/clients')
     downloaderOptions.value = [
       { title: '默认', value: null },
       ...downloaders.map((item: { name: any }) => ({
diff --git a/src/components/dialog/SubscribeEditDialog.vue b/src/components/dialog/SubscribeEditDialog.vue
index c585c486..0a6755cf 100644
--- a/src/components/dialog/SubscribeEditDialog.vue
+++ b/src/components/dialog/SubscribeEditDialog.vue
@@ -2,7 +2,7 @@
 import { useToast } from 'vue-toast-notification'
 import { numberValidator } from '@/@validators'
 import api from '@/api'
-import type { FilterRuleGroup, Site, Subscribe, TransferDirectoryConf } from '@/api/types'
+import type { DownloaderConf, FilterRuleGroup, Site, Subscribe, TransferDirectoryConf } from '@/api/types'
 import { useDisplay } from 'vuetify'
 import { useConfirm } from 'vuetify-use-dialog'
 import { VTextarea, VTextField } from 'vuetify/lib/components/index.mjs'
@@ -63,8 +63,7 @@ const downloaderOptions = ref<{ title: string; value: string }[]>([])
 
 async function loadDownloaderSetting() {
   try {
-    const result: { [key: string]: any } = await api.get('system/setting/Downloaders')
-    const downloaders = result.data?.value ?? []
+    const downloaders: DownloaderConf[] = await api.get('download/clients')
     downloaderOptions.value = [
       { title: '默认', value: '' },
       ...downloaders.map((item: { name: any }) => ({
diff --git a/src/pages/downloading.vue b/src/pages/downloading.vue
index c6c20df2..4b32dd11 100644
--- a/src/pages/downloading.vue
+++ b/src/pages/downloading.vue
@@ -11,17 +11,12 @@ const activeTab = ref(route.query.tab)
 // 下载器
 const downloaders = ref<DownloaderConf[]>([])
 
-// 获取启用的下载器
-const enabledDownloaders = computed(() => downloaders.value.filter(item => item.enabled))
-
 // 调用API查询下载器设置
 async function loadDownloaderSetting() {
   try {
-    const result: { [key: string]: any } = await api.get('system/setting/Downloaders')
-    if (result.data?.value && result.data.value.length > 0) {
-      downloaders.value = result.data?.value ?? []
-      if (!activeTab.value) activeTab.value = downloaders.value[0].name
-    }
+    downloaders.value = await api.get('download/clients')
+    if (downloaders.value && downloaders.value.length > 0 && !activeTab.value)
+      activeTab.value = downloaders.value[0].name
   } catch (error) {
     console.log(error)
   }
@@ -31,21 +26,21 @@ function jumpTab(tab: string) {
   router.push('/subscribe/movie?tab=' + tab)
 }
 
-onMounted(() => {
-  loadDownloaderSetting()
+onMounted(async () => {
+  await loadDownloaderSetting()
 })
 </script>
 
 <template>
-  <div v-if="enabledDownloaders.length > 0">
+  <div v-if="downloaders.length > 0">
     <VTabs v-model="activeTab">
-      <VTab v-for="item in enabledDownloaders" :value="item.name" @to="jumpTab(item.name)">
+      <VTab v-for="item in downloaders" :value="item.name" @to="jumpTab(item.name)">
         <span class="mx-5">{{ item.name }}</span>
       </VTab>
     </VTabs>
 
     <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
-      <VWindowItem v-for="item in enabledDownloaders" :value="item.name">
+      <VWindowItem v-for="item in downloaders" :value="item.name">
         <transition name="fade-slide" appear>
           <DownloadingListView :name="item.name" />
         </transition>