Merge branch 'jxxghp:main' into main

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.6.8-1",
+  "version": "1.6.9",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {

src/api/types.ts

@@ -658,6 +658,9 @@ export interface TorrentInfo {
   // 剩余免费时间
   freedate_diff: string
 
+  // 种子类型
+  category: string
+
 }
 
 // 识别元数据

src/views/reorganize/DownloadingListView.vue

@@ -6,10 +6,6 @@ import NoDataFound from '@/components/NoDataFound.vue'
 import DownloadingCard from '@/components/cards/DownloadingCard.vue'
 import store from '@/store'
 
-// 从Vuex Store中获取用户信息
-const superUser = store.state.auth.superUser
-const userName = store.state.auth.userName
-
 // 定时器
 let refreshTimer: NodeJS.Timer | null = null
 
@@ -42,6 +38,9 @@ function onRefresh() {
 
 // 过滤数据，管理员用户显示全部，非管理员只显示自己的订阅
 const filteredDataList = computed(() => {
+  // 从Vuex Store中获取用户信息
+  const superUser = store.state.auth.superUser
+  const userName = store.state.auth.userName
   if (superUser)
     return dataList.value
   else

src/views/subscribe/SubscribeListView.vue

@@ -11,10 +11,6 @@ const props = defineProps({
   type: String,
 })
 
-// 从Vuex Store中获取用户信息
-const superUser = store.state.auth.superUser
-const userName = store.state.auth.userName
-
 // 是否刷新过
 const isRefreshed = ref(false)
 
@@ -47,6 +43,9 @@ function onRefresh() {
 
 // 过滤数据，管理员用户显示全部，非管理员只显示自己的订阅
 const filteredDataList = computed(() => {
+// 从Vuex Store中获取用户信息
+  const superUser = store.state.auth.superUser
+  const userName = store.state.auth.userName
   if (superUser)
     return dataList.value.filter(data => data.type === props.type)
   else