From 18d778a1cc0758a55be009b99fef067a5bf6a4ff Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Sun, 2 Jun 2024 19:50:28 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=81=9A=E5=90=88=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=94=AF=E6=8C=81=E8=AE=A2=E9=98=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                              |  2 +-
 src/api/types.ts                          |  2 +
 src/components/cards/SubscribeCard.vue    |  8 +++
 src/pages/subscribe-movie.vue             |  7 ++-
 src/pages/subscribe-tv.vue                |  7 ++-
 src/views/subscribe/SubscribeListView.vue | 16 ++++-
 src/views/system/SearchBarView.vue        | 74 +++++++++++++++++++++--
 7 files changed, 104 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index a6299633..82e409ff 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.9.3",
+  "version": "1.9.3-1",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
diff --git a/src/api/types.ts b/src/api/types.ts
index 7b97c0aa..3d8d575a 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -63,6 +63,8 @@ export interface Subscribe {
   date: string
   // 编辑框设置项
   show_edit_dialog: boolean
+  // 编辑框打开状态
+  page_open?: boolean
 }
 
 // 历史记录
diff --git a/src/components/cards/SubscribeCard.vue b/src/components/cards/SubscribeCard.vue
index 9ce79b55..57a97acb 100644
--- a/src/components/cards/SubscribeCard.vue
+++ b/src/components/cards/SubscribeCard.vue
@@ -133,6 +133,14 @@ const dropdownItems = ref([
     },
   },
 ])
+
+// 监听插件窗口状态变化
+watch(
+  () => props.media?.page_open,
+  (newOpenState, _) => {
+    if (newOpenState) editSubscribeDialog()
+  },
+)
 </script>
 
 <template>
diff --git a/src/pages/subscribe-movie.vue b/src/pages/subscribe-movie.vue
index 3c243a7a..7639f0d2 100644
--- a/src/pages/subscribe-movie.vue
+++ b/src/pages/subscribe-movie.vue
@@ -6,6 +6,9 @@ import { SubscribeMovieTabs } from '@/router/menu'
 
 const route = useRoute()
 
+// 订阅ID参数
+const subId = ref(route.query.id as string)
+
 // 当前标签
 const activeTab = ref(route.query.tab)
 
@@ -26,12 +29,12 @@ function jumpTab(tab: string) {
     <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
       <VWindowItem value="mysub">
         <transition name="fade-slide" appear>
-          <SubscribeListView type="电影" />
+          <SubscribeListView type="电影" :subid="subId" />
         </transition>
       </VWindowItem>
       <VWindowItem value="popular">
         <transition name="fade-slide" appear>
-          <SubscribePopularView type="电影" />
+          <SubscribePopularView type="电影" :subid="subId" />
         </transition>
       </VWindowItem>
     </VWindow>
diff --git a/src/pages/subscribe-tv.vue b/src/pages/subscribe-tv.vue
index 96177335..7dbd562c 100644
--- a/src/pages/subscribe-tv.vue
+++ b/src/pages/subscribe-tv.vue
@@ -8,6 +8,9 @@ const route = useRoute()
 
 const activeTab = ref(route.query.tab)
 
+// 订阅ID参数
+const subId = ref(route.query.id as string)
+
 // 跳转tab
 function jumpTab(tab: string) {
   router.push('/subscribe-tv?tab=' + tab)
@@ -25,12 +28,12 @@ function jumpTab(tab: string) {
     <VWindow v-model="activeTab" class="mt-5 disable-tab-transition" :touch="false">
       <VWindowItem value="mysub">
         <transition name="fade-slide" appear>
-          <SubscribeListView type="电视剧" />
+          <SubscribeListView type="电视剧" :subid="subId" />
         </transition>
       </VWindowItem>
       <VWindowItem value="popular">
         <transition name="fade-slide" appear>
-          <SubscribePopularView type="电视剧" />
+          <SubscribePopularView type="电视剧" :subid="subId" />
         </transition>
       </VWindowItem>
     </VWindow>
diff --git a/src/views/subscribe/SubscribeListView.vue b/src/views/subscribe/SubscribeListView.vue
index 68381acc..52d35113 100644
--- a/src/views/subscribe/SubscribeListView.vue
+++ b/src/views/subscribe/SubscribeListView.vue
@@ -11,6 +11,7 @@ import store from '@/store'
 // 输入参数
 const props = defineProps({
   type: String,
+  subid: String,
 })
 
 // 是否刷新过
@@ -35,9 +36,6 @@ async function fetchData() {
   }
 }
 
-// 加载时获取数据
-onBeforeMount(fetchData)
-
 // 刷新状态
 const loading = ref(false)
 
@@ -56,6 +54,18 @@ const filteredDataList = computed(() => {
   if (superUser) return dataList.value.filter(data => data.type === props.type)
   else return dataList.value.filter(data => data.type === props.type && data.username === userName)
 })
+
+onMounted(async () => {
+  await fetchData()
+  if (props.subid) {
+    // 找到这个订阅
+    const sub = dataList.value.find(sub => sub.id.toString() == props.subid?.toString())
+    if (sub) {
+      // 打开编辑弹窗
+      sub.page_open = true
+    }
+  }
+})
 </script>
 
 <template>
diff --git a/src/views/system/SearchBarView.vue b/src/views/system/SearchBarView.vue
index 2b79758d..027677f2 100644
--- a/src/views/system/SearchBarView.vue
+++ b/src/views/system/SearchBarView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import api from '@/api'
-import type { Plugin } from '@/api/types'
+import type { Plugin, Subscribe } from '@/api/types'
 import {
   SystemNavMenus,
   UserfulMenus,
@@ -84,7 +84,7 @@ function getMenus(): NavMenu[] {
 // 匹配的菜单列表
 const matchedMenuItems = computed(() => {
   if (!searchWord.value) return []
-  const lowerWord = searchWord.value?.toLowerCase()
+  const lowerWord = (searchWord.value as string).toLowerCase()
   const menuItems = getMenus()
   if (menuItems)
     return menuItems.filter(
@@ -114,13 +114,34 @@ async function fetchInstalledPlugins() {
 // 区配的插件列表
 const matchedPluginItems = computed(() => {
   if (!searchWord.value) return []
-  const lowerWord = searchWord.value?.toLowerCase()
+  const lowerWord = (searchWord.value as string).toLowerCase()
   return pluginItems.value.filter((item: Plugin) => {
     if (!item.plugin_name && !item.plugin_desc) return false
     return item.plugin_name?.toLowerCase().includes(lowerWord) || item.plugin_desc?.toLowerCase().includes(lowerWord)
   })
 })
 
+// 所有订阅数据
+const SubscribeItems = ref<Subscribe[]>([])
+
+// 获取电影订阅列表数据
+async function fetchSubscribes() {
+  try {
+    SubscribeItems.value = await api.get('subscribe/')
+  } catch (error) {
+    console.error(error)
+  }
+}
+
+// 匹配的订阅列表
+const matchedSubscribeItems = computed(() => {
+  if (!searchWord.value) return []
+  const lowerWord = (searchWord.value as string).toLowerCase()
+  return SubscribeItems.value.filter((item: Subscribe) => {
+    return item.name.toLowerCase().includes(lowerWord)
+  })
+})
+
 // 跳转媒体搜索页面
 function searchMedia(searchType: string) {
   // 搜索类型 media/person
@@ -154,15 +175,36 @@ function goPage(to: string) {
   emit('close')
 }
 
+// 跳转订阅页面
+function goSubscribe(subscribe: Subscribe) {
+  if (subscribe.type === '电影') {
+    router.push({
+      path: '/subscribe-movie',
+      query: {
+        id: subscribe.id,
+      },
+    })
+  } else {
+    router.push({
+      path: '/subscribe-tv',
+      query: {
+        id: subscribe.id,
+      },
+    })
+  }
+  emit('close')
+}
+
 onMounted(() => {
   setTimeout(() => {
     searchWordInput.value?.focus()
   }, 500)
   fetchInstalledPlugins()
+  fetchSubscribes()
 })
 </script>
 <template>
-  <VDialog max-width="40rem">
+  <VDialog max-width="40rem" scrollable>
     <VCard>
       <VCardText class="pe-12">
         <VCombobox
@@ -222,6 +264,30 @@ onMounted(() => {
               </VListItem>
             </template>
           </VHover>
+          <VListSubheader v-if="matchedSubscribeItems.length > 0"> 订阅 </VListSubheader>
+          <VHover
+            v-if="matchedSubscribeItems.length > 0"
+            v-for="subscribe in matchedSubscribeItems"
+            :key="subscribe.id"
+          >
+            <template #default="hover">
+              <VListItem
+                :prepend-icon="`${subscribe.type === '电影' ? 'mdi-movie-roll' : 'mdi-television-classic'}`"
+                density="compact"
+                link
+                v-bind="hover.props"
+                @click="goSubscribe(subscribe)"
+              >
+                <VListItemTitle>
+                  {{ subscribe.name }}<span v-if="subscribe.season"> 第 {{ subscribe.season }} 季</span>
+                </VListItemTitle>
+                <VListItemSubtitle> {{ subscribe.type }}</VListItemSubtitle>
+                <template #append>
+                  <VIcon v-if="hover.isHovering" icon="ri-corner-down-left-line" />
+                </template>
+              </VListItem>
+            </template>
+          </VHover>
           <VListSubheader v-if="matchedMenuItems.length > 0"> 功能 </VListSubheader>
           <VHover v-if="matchedMenuItems.length > 0" v-for="menu in matchedMenuItems" :key="menu.title">
             <template #default="hover">