fix #2011

src/components/dialog/ReorganizeDialog.vue

@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useToast } from 'vue-toast-notification'
-import TmdbSelector from '../misc/TmdbSelector.vue'
+import MediaIdSelector from '../misc/MediaIdSelector.vue'
 import store from '@/store'
 import api from '@/api'
 import { numberValidator } from '@/@validators'
@@ -28,11 +28,14 @@ const seasonItems = ref(
   })),
 )
 
+// 当前识别类型
+const mediaSource = ref('themoviedb')
+
 // 提示框
 const $toast = useToast()
 
 // TMDB选择对话框
-const tmdbSelectorDialog = ref(false)
+const mediaSelectorDialog = ref(false)
 
 // 加载进度SSE
 const progressEventSource = ref<EventSource>()
@@ -52,6 +55,7 @@ const transferForm = reactive({
   path: '',
   target: props.target ?? '',
   tmdbid: null,
+  doubanid: null,
   season: null,
   type_name: '',
   transfer_type: '',
@@ -142,6 +146,20 @@ async function transfer() {
   // 重新加载
   emit('done')
 }
+
+// 调用API，加载当前系统环境设置
+async function loadSystemSettings() {
+  try {
+    const result: { [key: string]: any } = await api.get('system/env')
+    if (result) mediaSource.value = result.data?.RECOGNIZE_SOURCE || 'themoviedb'
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+onMounted(() => {
+  loadSystemSettings()
+})
 </script>
 
 <template>
@@ -192,14 +210,26 @@ async function transfer() {
             </VCol>
             <VCol cols="12" md="4">
               <VTextField
+                v-if="mediaSource === 'themoviedb'"
                 v-model="transferForm.tmdbid"
                 :disabled="transferForm.type_name === ''"
-                label="TMDBID"
+                label="TheMovieDb编号"
                 placeholder="留空自动识别"
                 :rules="[numberValidator]"
                 append-inner-icon="mdi-magnify"
                 hint="点击图标按名称搜索，留空将自动重新识别"
-                @click:append-inner="tmdbSelectorDialog = true"
+                @click:append-inner="mediaSelectorDialog = true"
+              />
+              <VTextField
+                v-else
+                v-model="transferForm.doubanid"
+                :disabled="transferForm.type_name === ''"
+                label="豆瓣编号"
+                placeholder="留空自动识别"
+                :rules="[numberValidator]"
+                append-inner-icon="mdi-magnify"
+                hint="点击图标按名称搜索，留空将自动重新识别"
+                @click:append-inner="mediaSelectorDialog = true"
               />
             </VCol>
             <VCol cols="12" md="4">
@@ -265,8 +295,19 @@ async function transfer() {
     <!-- 手动整理进度框 -->
     <ProgressDialog v-if="progressDialog" v-model="progressDialog" :text="progressText" :value="progressValue" />
     <!-- TMDB ID搜索框 -->
-    <VDialog v-model="tmdbSelectorDialog" width="40rem" scrollable max-height="85vh">
+    <VDialog v-model="mediaSelectorDialog" width="40rem" scrollable max-height="85vh">
-      <TmdbSelector v-model="transferForm.tmdbid" @close="tmdbSelectorDialog = false" />
+      <MediaIdSelector
+        v-if="mediaSource === 'themoviedb'"
+        v-model="transferForm.tmdbid"
+        @close="mediaSelectorDialog = false"
+        :type="mediaSource"
+      />
+      <MediaIdSelector
+        v-else
+        v-model="transferForm.doubanid"
+        @close="mediaSelectorDialog = false"
+        :type="mediaSource"
+      />
     </VDialog>
   </VDialog>
 </template>

src/components/misc/MediaIdSelector.vue

@@ -2,10 +2,16 @@
 import api from '@/api'
 import type { MediaInfo } from '@/api/types'
 
+// 定义输入变量
+const props = defineProps({
+  type: String, // 来源 themoviedb | douban
+})
+
 interface TmdbItem {
   title: string
   overview: string
   tmdbid: number
+  doubanid: string
   poster: string
 }
 
@@ -21,25 +27,23 @@ const keyword = ref('')
 const loading = ref(false)
 
 // ref
-const tmdbKeyword = ref<HTMLElement | null>(null)
+const inputKeyword = ref<HTMLElement | null>(null)
 
 // 选中条目
 function selectMedia(item: TmdbItem) {
-  emit('update:modelValue', item.tmdbid)
+  emit('update:modelValue', item.tmdbid || item.doubanid)
   emit('close')
 }
 
 // TMDB图片转换为w500大小
 function getW500Image(url = '') {
-  if (!url)
+  if (!url) return ''
-    return ''
   return url.replace('original', 'w500')
 }
 
 // 搜索词条
 async function searchMedias() {
-  if (!keyword)
+  if (!keyword) return
-    return
 
   // 调用API搜索词条
   try {
@@ -57,16 +61,17 @@ async function searchMedias() {
 
     // 赋值
     for (const item of result) {
+      if (props.type && props.type !== item.source) continue
       items.value.push({
         tmdbid: item.tmdb_id || 0,
+        doubanid: item.douban_id || '',
         poster: getW500Image(item.poster_path),
         title: `${item.title}（${item.year}）`,
         overview: `<span class="text-primary">${item.type}</span> ${item.overview}`,
       })
     }
     loading.value = false
-  }
+  } catch (e) {
-  catch (e) {
     console.error(e)
   }
 }
@@ -75,19 +80,16 @@ async function searchMedias() {
 onMounted(() => {
   // 500ms后聚焦
   setTimeout(() => {
-    tmdbKeyword.value?.focus()
+    inputKeyword.value?.focus()
   }, 500)
 })
 </script>
 
 <template>
-  <VCard
+  <VCard class="mx-auto" width="100%">
-    class="mx-auto"
-    width="100%"
-  >
     <VToolbar flat class="p-0">
       <VTextField
-        ref="tmdbKeyword"
+        ref="inputKeyword"
         v-model="keyword"
         label="输入名称搜索"
         single-line
@@ -101,15 +103,16 @@ onMounted(() => {
         @keydown.enter="searchMedias"
       />
     </VToolbar>
-    <DialogCloseBtn @click="() => { emit('close') }" />
+    <DialogCloseBtn
-    <VList
+      @click="
-      v-if="items.length > 0"
+        () => {
-      lines="three"
+          emit('close')
-    >
+        }
+      "
+    />
+    <VList v-if="items.length > 0" lines="three">
       <template v-for="(item, i) in items" :key="i">
-        <VListItem
+        <VListItem @click="selectMedia(item)">
-          @click="selectMedia(item)"
-        >
           <template #prepend>
             <VImg
               height="75"