v1.5.6

历史历史错误信息使用tooltip展示
fix:解决当搜索结果过多导致页面卡顿问题

.vscode/settings.json

@@ -31,8 +31,8 @@
   "volar.preview.port": 3000,
   "volar.completion.preferredTagNameCase": "pascal",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.fixAll.stylelint": true
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll.stylelint": "explicit"
   },
   "eslint.alwaysShowStatus": true,
   "eslint.format.enable": true,

package.json

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

src/@core/utils/dom.ts

@@ -0,0 +1,21 @@
+export function removeEl(selector: string) {
+  if (selector) {
+    const el = document.querySelector(selector)
+    el?.parentNode?.removeChild(el)
+  }
+}
+
+export function useDefer(maxFrameCount = 1) {
+  const frameCount = ref(0)
+  const refreshFrameCount = () => {
+    requestAnimationFrame(() => {
+      frameCount.value++
+      if (frameCount.value < maxFrameCount)
+        refreshFrameCount()
+    })
+  }
+  refreshFrameCount()
+  return function (showInFrameCount: number) {
+    return frameCount.value >= showInFrameCount
+  }
+}

src/@core/utils/formatters.ts

@@ -109,3 +109,41 @@ export function formatBytes(bytes: number, decimals = 2) {
 
   return `${parseFloat((bytes / k ** i).toFixed(dm))} ${sizes[i]}`
 }
+
+// 格式化剧集列表
+export function formatEp(nums: number[]): string {
+  if (!nums.length)
+    return ''
+
+  if (nums.length === 1)
+    return nums[0].toString()
+
+  // 将数组升序排序
+  nums.sort((a, b) => a - b)
+  const formattedRanges: string[] = []
+  let start = nums[0]
+  let end = nums[0]
+
+  for (let i = 1; i < nums.length; i++) {
+    if (nums[i] === end + 1) {
+      end = nums[i]
+    }
+    else {
+      if (start === end)
+        formattedRanges.push(start.toString())
+
+      else
+        formattedRanges.push(`${start.toString()}-${end.toString()}`)
+
+      start = end = nums[i]
+    }
+  }
+
+  if (start === end)
+    formattedRanges.push(start.toString())
+
+  else
+    formattedRanges.push(`${start.toString()}-${end.toString()}`)
+
+  return formattedRanges.join('、')
+}

src/@core/utils/index.ts

@@ -33,7 +33,7 @@ export function isToday(date: Date) {
   )
 }
 
-// 计算时间差，返回xx天xx小时xx分钟
+// 计算时间差，返回xx天/xx小时/xx分钟/xx秒
 export function calculateTimeDifference(inputTime: string): string {
   if (!inputTime)
     return ''
@@ -64,6 +64,38 @@ export function calculateTimeDifference(inputTime: string): string {
   }
 }
 
+// 计算时间差，返回xx天xx小时xx分钟
+export function calculateTimeDiff(inputTime: string): string {
+  if (!inputTime)
+    return ''
+
+  // 使用当前时区
+  const inputDate = new Date(inputTime)
+  const currentDate = new Date()
+
+  const timeDifference = currentDate.getTime() - inputDate.getTime()
+  const secondsDifference = Math.floor(timeDifference / 1000)
+
+  const days = Math.floor(secondsDifference / 86400)
+  const hours = Math.floor(secondsDifference % 86400 / 3600)
+  const minutes = Math.floor(secondsDifference % 86400 % 3600 / 60)
+  const secones = Math.floor(secondsDifference % 60)
+
+  if (days > 0)
+    return `${days}天${hours}小时${minutes}分钟`
+
+  else if (hours > 0)
+    return `${hours}小时${minutes}分钟`
+
+  else if (minutes > 0)
+    return `${minutes}分钟`
+
+  else if (secones > 0)
+    return `${secones}秒`
+
+  return ''
+}
+
 // 判断一个数组subArray是不是在另一个数组mainArray中
 export function isContained(subArray: any[], mainArray: any[]): boolean {
   return subArray.every(element => mainArray.includes(element))

src/api/types.ts

@@ -82,6 +82,9 @@ export interface Subscribe {
 
   // 当前优先级
   current_priority: number
+
+  // 保存目录
+  save_path: string
 }
 
 // 历史记录
@@ -648,6 +651,13 @@ export interface TorrentInfo {
 
   // 促销描述
   volume_factor: string
+
+  // 免费时间
+  freedate: string
+
+  // 剩余免费时间
+  freedate_diff: string
+
 }
 
 // 识别元数据

src/components/FileBrowser.vue

@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import type { Axios } from 'axios'
 import axios from 'axios'
+import List from './filebrowser/List.vue'
 
 import Toolbar from './filebrowser/Toolbar.vue'
 import Tree from './filebrowser/Tree.vue'
-import List from './filebrowser/List.vue'
 import type { EndPoints } from '@/api/types'
 
 // 输入参数
@@ -70,10 +70,12 @@ const storagesArray = computed(() => {
 
 // 方法
 function loadingChanged(loading: number) {
-  if (loading)
+  if (loading) {
     loading++
-  else if (loading > 0)
+  }
+  else if (loading > 0) {
     loading--
+  }
 }
 
 function storageChanged(storage: string) {
@@ -92,56 +94,58 @@ function sortChanged(s: string) {
 }
 
 // 初始化
-onBeforeMount(() => {
+onMounted(() => {
   activeStorage.value = props.storage ?? 'local'
   axiosInstance.value = props.axios ?? axios.create(props.axiosconfig)
 })
 </script>
 
 <template>
-  <VCard class="mx-auto" :loading="loading > 0">
-    <Toolbar
-      :path="props.path"
-      :storages="storagesArray"
-      :storage="activeStorage"
-      :endpoints="props.endpoints"
-      :axios="axiosInstance"
-      @storagechanged="storageChanged"
-      @pathchanged="pathChanged"
-      @foldercreated="refreshPending = true"
-      @sortchanged="sortChanged"
-    />
-    <VRow no-gutters>
-      <VCol v-if="tree" sm="auto" class="d-none d-md-block">
-        <Tree
-          :path="props.path"
-          :storage="activeStorage"
-          :icons="fileIcons"
-          :endpoints="endpoints"
-          :axios="axiosInstance"
-          :refreshpending="refreshPending"
-          @pathchanged="pathChanged"
-          @loading="loadingChanged"
-          @refreshed="refreshPending = false"
-        />
-      </VCol>
-      <VDivider v-if="tree" vertical />
-      <VCol>
-        <List
-          :path="props.path"
-          :storage="activeStorage"
-          :icons="fileIcons"
-          :endpoints="endpoints"
-          :axios="axiosInstance"
-          :refreshpending="refreshPending"
-          :sort="sort"
-          @pathchanged="pathChanged"
-          @loading="loadingChanged"
-          @refreshed="refreshPending = false"
-          @filedeleted="refreshPending = true"
-          @renamed="refreshPending = true"
-        />
-      </VCol>
-    </VRow>
+  <VCard class="mx-auto" :loading="loading > 0 || !path">
+    <div v-if="path">
+      <Toolbar
+        :path="path"
+        :storages="storagesArray"
+        :storage="activeStorage"
+        :endpoints="endpoints"
+        :axios="axiosInstance"
+        @storagechanged="storageChanged"
+        @pathchanged="pathChanged"
+        @foldercreated="refreshPending = true"
+        @sortchanged="sortChanged"
+      />
+      <VRow no-gutters>
+        <VCol v-if="tree" sm="auto" class="d-none d-md-block">
+          <Tree
+            :path="path"
+            :storage="activeStorage"
+            :icons="fileIcons"
+            :endpoints="endpoints"
+            :axios="axiosInstance"
+            :refreshpending="refreshPending"
+            @pathchanged="pathChanged"
+            @loading="loadingChanged"
+            @refreshed="refreshPending = false"
+          />
+        </VCol>
+        <VDivider v-if="tree" vertical />
+        <VCol>
+          <List
+            :path="path"
+            :storage="activeStorage"
+            :icons="fileIcons"
+            :endpoints="endpoints"
+            :axios="axiosInstance"
+            :refreshpending="refreshPending"
+            :sort="sort"
+            @pathchanged="pathChanged"
+            @loading="loadingChanged"
+            @refreshed="refreshPending = false"
+            @filedeleted="refreshPending = true"
+            @renamed="refreshPending = true"
+          />
+        </VCol>
+      </VRow>
+    </div>
   </VCard>
 </template>

src/components/cards/SiteCard.vue

@@ -412,6 +412,23 @@ onMounted(() => {
             <div class="text-sm my-1">
               {{ item.raw.description }}
             </div>
+            <VChip
+              v-if="item.raw?.hit_and_run"
+              variant="elevated"
+              size="small"
+              class="me-1 mb-1 text-white bg-black"
+            >
+              H&R
+            </VChip>
+            <VChip
+              v-if="item.raw?.freedate_diff"
+              variant="elevated"
+              color="secondary"
+              size="small"
+              class="me-1 mb-1"
+            >
+              {{ item.raw?.freedate_diff }}
+            </VChip>
             <VChip
               v-for="(label, index) in item.raw?.labels"
               :key="index"

src/components/cards/TorrentCard.vue

@@ -195,6 +195,23 @@ onMounted(() => {
       v-if="torrent?.labels"
       class="pb-3 pt-0 pe-12"
     >
+      <VChip
+        v-if="torrent?.hit_and_run"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-black"
+      >
+        H&R
+      </VChip>
+      <VChip
+        v-if="torrent?.freedate_diff"
+        variant="elevated"
+        color="secondary"
+        size="small"
+        class="me-1 mb-1"
+      >
+        {{ torrent?.freedate_diff }}
+      </VChip>
       <VChip
         v-for="(label, index) in torrent?.labels"
         :key="index"

src/components/cards/TorrentItem.vue

@@ -150,6 +150,23 @@ onMounted(() => {
       v-if="torrent?.labels"
       class="pt-2"
     >
+      <VChip
+        v-if="torrent?.hit_and_run"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-black"
+      >
+        H&R
+      </VChip>
+      <VChip
+        v-if="torrent?.freedate_diff"
+        variant="elevated"
+        color="secondary"
+        size="small"
+        class="me-1 mb-1"
+      >
+        {{ torrent?.freedate_diff }}
+      </VChip>
       <VChip
         v-for="(label, index) in torrent?.labels"
         :key="index"

src/components/form/SiteAddEditForm.vue

@@ -199,7 +199,7 @@ async function updateSiteInfo() {
               md="4"
             >
               <VTextField
-                v-model="siteForm.limit_seconds"
+                v-model="siteForm.limit_count"
                 label="访问次数"
                 :rules="[numberValidator]"
               />

src/components/form/SubscribeEditForm.vue

@@ -39,6 +39,7 @@ const subscribeForm = ref<Subscribe>({
   last_update: '',
   username: '',
   current_priority: 0,
+  save_path: '',
 })
 
 // 提示框
@@ -322,6 +323,17 @@ watchEffect(() => {
               />
             </VCol>
           </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VTextField
+                v-model="subscribeForm.save_path"
+                label="保存路径"
+              />
+            </VCol>
+          </VRow>
           <VRow>
             <VCol
               cols="12"

src/main.ts

@@ -2,6 +2,7 @@ import { createApp } from 'vue'
 import '@/@iconify/icons-bundle'
 import ToastPlugin from 'vue-toast-notification'
 import VuetifyUseDialog from 'vuetify-use-dialog'
+import { removeEl } from './@core/utils/dom'
 import App from '@/App.vue'
 import vuetify from '@/plugins/vuetify'
 import { loadFonts } from '@/plugins/webfontloader'
@@ -11,7 +12,6 @@ import '@core/scss/template/index.scss'
 import '@layouts/styles/index.scss'
 import '@styles/styles.scss'
 import 'vue-toast-notification/dist/theme-bootstrap.css'
-import { removeEl } from '@/util'
 
 loadFonts()
 

src/plugins/vuetify/defaults.ts

@@ -31,7 +31,7 @@ export default {
     elevation: 0,
   },
   VList: {
-    activeColor: 'primary',
+    color: 'primary',
   },
   VPagination: {
     activeColor: 'primary',

src/util/dom.ts

@@ -1,6 +0,0 @@
-export function removeEl(selector: string) {
-  if (selector) {
-    const el = document.querySelector(selector)
-    el?.parentNode?.removeChild(el)
-  }
-}

src/util/index.ts

@@ -1 +0,0 @@
-export * from './dom'

src/views/discover/TorrentCardListView.vue

@@ -1,8 +1,10 @@
 <script lang="ts" setup>
-import { ref } from 'vue'
 import _ from 'lodash'
+import type { Ref } from 'vue'
+import { ref } from 'vue'
 import type { Context } from '@/api/types'
 import TorrentCard from '@/components/cards/TorrentCard.vue'
+import { useDefer } from '@/@core/utils/dom'
 
 interface SearchTorrent extends Context {
   more?: Array<Context>
@@ -48,7 +50,7 @@ const editionFilterOptions = ref<Array<string>>([])
 const resolutionFilterOptions = ref<Array<string>>([])
 
 // 数据列表
-const dataList = ref <Array<SearchTorrent>>([])
+const dataList = ref<Array<SearchTorrent>>([])
 
 // 分组后的数据列表
 const groupedDataList = ref<Map<string, Context[]>>()
@@ -69,7 +71,7 @@ function initOptions(data: Context) {
 }
 
 // 计算分组后的列表
-watchEffect(() => {
+onMounted(() => {
   // 数据分组
   const groupMap = new Map<string, Context[]>()
   // 遍历数据
@@ -92,10 +94,12 @@ watchEffect(() => {
   groupedDataList.value = groupMap
 })
 
+const defer: Ref<Function> = ref(() => true)
+
 // 计算过滤后的列表
 watchEffect(() => {
   // 清空列表
-  dataList.value.splice(0)
+  dataList.value = []
   // 匹配过滤函数
   const match = (filter: Array<string>, value: string | undefined) =>
     filter.length === 0 || (value && filter.includes(value))
@@ -126,10 +130,12 @@ watchEffect(() => {
         const firstData = _.cloneDeepWith(matchData[0]) as SearchTorrent
         if (matchData.length > 1)
           firstData.more = matchData.slice(1)
+
         dataList.value.push(firstData)
       }
     }
   })
+  defer.value = useDefer(dataList.value.length)
 })
 </script>
 
@@ -216,12 +222,9 @@ watchEffect(() => {
     </VRow>
   </VCard>
   <div class="grid gap-3 grid-torrent-card items-start">
-    <TorrentCard
-      v-for="(item, index) in dataList"
-      :key="`${index}_${item.torrent_info.title}_${item.torrent_info.site}`"
-      :torrent="item"
-      :more="item.more"
-    />
+    <div v-for="(item, index) in dataList" :key="`${index}_${item.torrent_info.title}_${item.torrent_info.site}`">
+      <TorrentCard v-if="defer(index)" :torrent="item" :more="item.more" />
+    </div>
   </div>
 </template>
 

src/views/discover/TorrentRowListView.vue

@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { ref } from 'vue'
 import type { Context } from '@/api/types'
 import TorrentItem from '@/components/cards/TorrentItem.vue'
 
@@ -27,7 +28,7 @@ const filterForm = reactive({
 })
 
 // 数据列表
-const dataList = ref <Array<Context>>([])
+const dataList = ref<Array<Context>>([])
 
 // 获取站点过滤选项
 const siteFilterOptions = ref<Array<string>>([])
@@ -62,7 +63,7 @@ function initOptions(data: Context) {
 // 计算过滤后的列表
 watchEffect(() => {
   // 清空列表
-  dataList.value.splice(0)
+  dataList.value = []
   // 匹配过滤函数
   const match = (filter: Array<string>, value: string | undefined) =>
     filter.length === 0 || (value && filter.includes(value))
@@ -72,18 +73,18 @@ watchEffect(() => {
     if (
       // 站点过滤
       match(filterForm.site, torrent_info.site_name)
-        // 促销状态过滤
-        && match(filterForm.freeState, torrent_info.volume_factor)
-        // 季过滤
-        && match(filterForm.season, meta_info.season_episode)
-        // 制作组过滤
-        && match(filterForm.releaseGroup, meta_info.resource_team)
-        // 视频编码过滤
-        && match(filterForm.videoCode, meta_info.video_encode)
-        // 分辨率过滤
-        && match(filterForm.resolution, meta_info.resource_pix)
-        // 质量过滤
-        && match(filterForm.edition, meta_info.edition)
+      // 促销状态过滤
+      && match(filterForm.freeState, torrent_info.volume_factor)
+      // 季过滤
+      && match(filterForm.season, meta_info.season_episode)
+      // 制作组过滤
+      && match(filterForm.releaseGroup, meta_info.resource_team)
+      // 视频编码过滤
+      && match(filterForm.videoCode, meta_info.video_encode)
+      // 分辨率过滤
+      && match(filterForm.resolution, meta_info.resource_pix)
+      // 质量过滤
+      && match(filterForm.edition, meta_info.edition)
     )
       dataList.value.push(data)
   })
@@ -100,25 +101,18 @@ onMounted(() => {
 <template>
   <VRow>
     <VCol>
-      <VList
-        lines="three"
-        class="rounded"
-      >
-        <TorrentItem
-          v-for="(item, index) in dataList"
-          :key="`${index}_${item.torrent_info.title}_${item.torrent_info.site}`"
-          :torrent="item"
-        />
-        <VListItem v-if="dataList.length === 0">
+      <VList v-if="dataList.length === 0" lines="three" class="rounded">
+        <VListItem>
           <VListItemTitle>没有附合当前过滤条件的资源。</VListItemTitle>
         </VListItem>
       </VList>
+      <TorrentItem
+        v-for="(item, index) in dataList"
+        :key="`${index}_${item.torrent_info.title}_${item.torrent_info.site}`"
+        :torrent="item"
+      />
     </VCol>
-    <VCol
-      xl="2"
-      md="3"
-      class="d-none d-md-block"
-    >
+    <VCol xl="2" md="3" class="d-none d-md-block">
       <VList lines="one" class="rounded">
         <VListSubheader v-if="siteFilterOptions.length > 0">
           站点

src/views/reorganize/FileBrowserView.vue

@@ -3,42 +3,79 @@ import api from '@/api'
 import FileBrowser from '@/components/FileBrowser.vue'
 
 const endpoints = {
-  list: { url: '/filebrowser/list?path={path}&sort={sort}', method: 'get' },
-  mkdir: { url: '/filebrowser/mkdir?path={path}', method: 'get' },
-  delete: { url: '/filebrowser/delete?path={path}', method: 'get' },
-  download: { url: '/filebrowser/download?path={path}', method: 'get' },
-  image: { url: '/filebrowser/image?path={path}', method: 'get' },
-  rename: { url: '/filebrowser/rename?path={path}&new_name={newname}', method: 'get' },
+  list: {
+    url: '/filebrowser/list?path={path}&sort={sort}',
+    method: 'get',
+  },
+  mkdir: {
+    url: '/filebrowser/mkdir?path={path}',
+    method: 'get',
+  },
+  delete: {
+    url: '/filebrowser/delete?path={path}',
+    method: 'get',
+  },
+  download: {
+    url: '/filebrowser/download?path={path}',
+    method: 'get',
+  },
+  image: {
+    url: '/filebrowser/image?path={path}',
+    method: 'get',
+  },
+  rename: {
+    url: '/filebrowser/rename?path={path}&new_name={newname}',
+    method: 'get',
+  },
 }
 
 // 读取下载目录
-const path = ref('/')
+const path: Ref<string | undefined> = ref()
 
 // 调用API，加载当前系统环境设置
-async function loadSystemSettings() {
-  try {
-    const result: { [key: string]: any } = await api.get('system/env')
-    if (result.success)
-      path.value = result.data?.DOWNLOAD_PATH || '/'
-    if (path.value && !path.value.endsWith('/'))
-      path.value += '/'
-  }
-  catch (error) {
-    console.log(error)
-  }
+function loadSystemSettings(): Promise<string> {
+  return new Promise((resolve, reject) => {
+    api
+      .get('system/env')
+      .then((result: any) => {
+        let path = '/'
+        if (result.success)
+          path = result.data?.DOWNLOAD_PATH || '/'
+
+        if (!path.endsWith('/'))
+          path += '/'
+
+        resolve(path)
+      })
+      .catch(error => reject(error))
+  })
 }
 
 function pathChanged(_path: string) {
   path.value = _path
 }
 
-onBeforeMount(async () => {
-  await loadSystemSettings()
+onMounted(() => {
+  loadSystemSettings()
+    .then((res) => {
+      path.value = res
+    })
+    .catch((error) => {
+      console.error(error)
+      path.value = '/'
+    })
 })
 </script>
 
 <template>
   <div>
-    <FileBrowser storages="local" :tree="false" :path="path" :endpoints="endpoints" :axios="api" @pathchanged="pathChanged" />
+    <FileBrowser
+      storages="local"
+      :tree="false"
+      :path="path"
+      :endpoints="endpoints"
+      :axios="api"
+      @pathchanged="pathChanged"
+    />
   </div>
 </template>

src/views/reorganize/TransferHistoryView.vue

@@ -25,20 +25,43 @@ const selected = ref<TransferHistory[]>([])
 
 // 表头
 const headers = [
-  { title: '标题', key: 'title', sortable: false },
-  { title: '目录', key: 'src', sortable: false },
-  { title: '转移方式', key: 'mode', sortable: false },
-  { title: '时间', key: 'date', sortable: false },
-  { title: '状态', key: 'status', sortable: false },
-  { title: '失败原因', key: 'errmsg', sortable: false },
-  { title: '', key: 'actions', sortable: false },
+  {
+    title: '标题',
+    key: 'title',
+    sortable: false,
+  },
+  {
+    title: '目录',
+    key: 'src',
+    sortable: false,
+  },
+  {
+    title: '转移方式',
+    key: 'mode',
+    sortable: false,
+  },
+  {
+    title: '时间',
+    key: 'date',
+    sortable: false,
+  },
+  {
+    title: '状态',
+    key: 'status',
+    sortable: false,
+  },
+  {
+    title: '',
+    key: 'actions',
+    sortable: false,
+  },
 ]
 
 // 数据列表
 const dataList = ref<TransferHistory[]>([])
 
 // 搜索
-const search = ref('')
+const search = ref()
 
 // 搜索提示词列表
 const searchHintList = ref<string[]>([])
@@ -71,13 +94,7 @@ const deleteConfirmDialog = ref(false)
 const confirmTitle = ref('')
 
 // 获取订阅列表数据
-async function fetchData({
-  page,
-  itemsPerPage,
-}: {
-  page: number
-  itemsPerPage: number
-}) {
+async function fetchData({ page, itemsPerPage }: { page: number; itemsPerPage: number }) {
   loading.value = true
   try {
     currentPage.value = page
@@ -92,7 +109,9 @@ async function fetchData({
 
     dataList.value = result.data.list
     totalItems.value = result.data.total
-    searchHintList.value = [...new Set(dataList.value.map(item => item.title || ''))].filter(title => title !== '')
+    searchHintList.value = ['失败', '成功', ...new Set(dataList.value.map(item => item.title || ''))].filter(
+      title => title !== '',
+    )
   }
   catch (error) {
     console.error(error)
@@ -110,11 +129,6 @@ function getIcon(type: string) {
     return 'mdi-help-circle'
 }
 
-// 计算颜色
-function getStatusColor(status: boolean) {
-  return status ? 'success' : 'error'
-}
-
 // 转移方式字典
 const TransferDict: { [key: string]: string } = {
   copy: '复制',
@@ -136,7 +150,9 @@ async function removeHistory(item: TransferHistory) {
 async function remove(item: TransferHistory, deleteSrc: boolean, deleteDest: boolean) {
   try {
     // 调用删除API
-    const result: { [key: string]: any } = await api.delete(`history/transfer?deletesrc=${deleteSrc}&deletedest=${deleteDest}`, {
+    const result: {
+      [key: string]: any
+    } = await api.delete(`history/transfer?deletesrc=${deleteSrc}&deletedest=${deleteDest}`, {
       data: item,
     })
 
@@ -154,6 +170,7 @@ async function removeSingle(deleteSrc: boolean, deleteDest: boolean) {
   deleteConfirmDialog.value = false
   if (!currentHistory.value)
     return
+
   // 删除
   await remove(currentHistory.value, deleteSrc, deleteDest)
   // 刷新
@@ -171,6 +188,7 @@ async function removeBatch(deleteSrc: boolean, deleteDest: boolean) {
   const total = selected.value.length
   if (total === 0)
     return
+
   // 已处理条数
   let handled = 0
   // 显示进度条
@@ -182,7 +200,7 @@ async function removeBatch(deleteSrc: boolean, deleteDest: boolean) {
     await remove(item, deleteSrc, deleteDest)
     // 删除完成
     handled++
-    progressValue.value = handled / total * 100
+    progressValue.value = (handled / total) * 100
   }
   // 清空选中项
   selected.value = []
@@ -207,6 +225,7 @@ async function deleteConfirmHandler(deleteSrc: boolean, deleteDest: boolean) {
 async function removeHistoryBatch() {
   if (selected.value.length === 0)
     return
+
   // 清空当前操作记录
   currentHistory.value = undefined
   confirmTitle.value = `确认删除 ${selected.value.length} 条记录 ?`
@@ -214,19 +233,47 @@ async function removeHistoryBatch() {
   deleteConfirmDialog.value = true
 }
 
+// 计算根路径
+function getRootPath(path: string, type: string, category: string) {
+  if (!path)
+    return ''
+
+  let index = -2
+  if (type !== '电影')
+    index = -3
+
+  if (category)
+    index -= 1
+
+  if (path.includes('/'))
+    return path.split('/').slice(0, index).join('/')
+  else
+    return path.split('\\').slice(0, index).join('\\')
+}
+
 // 批量重新整理
 async function retransferBatch() {
   if (selected.value.length === 0)
     return
+
   // 清空当前操作记录
   currentHistory.value = undefined
   // 重新整理IDS
   redoIds.value = selected.value.map(item => item.id)
   // 重新整理target
-  if (selected.value.length === 1)
-    redoTarget.value = selected.value[0].dest ?? ''
-  else
+  if (selected.value.length === 1) {
+    // 目的目录
+    const dest = selected.value[0].dest ?? ''
+    // 类型
+    const mediaType = selected.value[0].type ?? ''
+    // 分类
+    const category = selected.value[0].category ?? ''
+    // 计算根路径
+    redoTarget.value = getRootPath(dest, mediaType, category)
+  }
+  else {
     redoTarget.value = ''
+  }
   // 打开识别弹窗
   redoDialog.value = true
 }
@@ -240,7 +287,7 @@ const dropdownItems = ref([
       prependIcon: 'mdi-redo-variant',
       click: (item: TransferHistory) => {
         redoIds.value = [item.id]
-        redoTarget.value = item.dest ?? ''
+        redoTarget.value = getRootPath(item.dest ?? '', item.type ?? '', item.category ?? '')
         redoDialog.value = true
       },
     },
@@ -264,15 +311,17 @@ const dropdownItems = ref([
     <VCardItem>
       <VCardTitle>
         <VRow>
-          <VCol> 历史记录 </VCol>
-          <VCol>
+          <VCol cols="4" md="6">
+            历史记录
+          </VCol>
+          <VCol cols="8" md="6">
             <VCombobox
               key="search_navbar"
               v-model="search"
               :items="searchHintList"
               class="text-disabled"
               density="compact"
-              label="搜索"
+              label="搜索标题、状态"
               append-inner-icon="mdi-magnify"
               variant="solo-filled"
               single-line
@@ -303,58 +352,52 @@ const dropdownItems = ref([
       @update:options="fetchData"
     >
       <template #item.title="{ item }">
-        <div class="d-flex">
-          <VAvatar><VIcon :icon="getIcon(item.raw.type || '')" /></VAvatar>
+        <div class="d-flex align-center">
+          <VAvatar>
+            <VIcon :icon="getIcon(item.value.type || '')" />
+          </VAvatar>
           <div class="d-flex flex-column ms-1">
             <span class="d-block whitespace-nowrap text-high-emphasis">
-              {{ item.raw.title }} {{ item.raw.seasons }}{{ item.raw.episodes }}
+              {{ item.value.title }} {{ item.value.seasons }}{{ item.value.episodes }}
             </span>
-            <small>{{ item.raw.category }}</small>
+            <small>{{ item.value.category }}</small>
           </div>
         </div>
       </template>
       <template #item.src="{ item }">
-        <small>{{ item.raw.src }} <br>=> {{ item.raw.dest }}</small>
+        <small>{{ item.value.src }} <br>=> {{ item.value.dest }}</small>
       </template>
       <template #item.mode="{ item }">
-        <VChip
-          variant="outlined"
-          color="primary"
-          size="small"
-        >
-          {{
-            TransferDict[item.raw.mode]
-          }}
+        <VChip variant="outlined" color="primary" size="small">
+          {{ TransferDict[item.value.mode] }}
         </VChip>
       </template>
       <template #item.status="{ item }">
-        <VChip
-          :color="getStatusColor(item.raw.status)"
-          size="small"
-        >
-          {{ item.raw.status ? "成功" : "失败" }}
+        <VChip v-if="item.value.status" color="success" size="small">
+          成功
         </VChip>
+        <v-tooltip v-else :text="item.value.errmsg">
+          <template #activator="{ props }">
+            <VChip v-bind="props" color="error" size="small">
+              失败
+            </VChip>
+          </template>
+        </v-tooltip>
       </template>
       <template #item.date="{ item }">
-        <small>{{ item.raw.date }}</small>
-      </template>
-      <template #item.errmsg="{ item }">
-        <small class="text-error">{{ item.raw.errmsg }}</small>
+        <small>{{ item.value.date }}</small>
       </template>
       <template #item.actions="{ item }">
         <IconBtn>
           <VIcon icon="mdi-dots-vertical" />
-          <VMenu
-            activator="parent"
-            close-on-content-click
-          >
+          <VMenu activator="parent" close-on-content-click>
             <VList>
               <VListItem
                 v-for="(menu, i) in dropdownItems"
                 :key="i"
                 variant="plain"
                 :base-color="menu.props.color"
-                @click="menu.props.click(item.raw)"
+                @click="menu.props.click(item.value)"
               >
                 <template #prepend>
                   <VIcon :icon="menu.props.prependIcon" />
@@ -371,23 +414,9 @@ const dropdownItems = ref([
     </VDataTableServer>
   </VCard>
   <!-- 底部操作按钮 -->
-  <span
-    v-if="selected.length > 0"
-    class="fixed right-5 bottom-5"
-  >
-    <VBtn
-      icon="mdi-redo-variant"
-      class="me-2"
-      color="primary"
-      size="x-large"
-      @click="retransferBatch"
-    />
-    <VBtn
-      icon="mdi-trash-can-outline"
-      color="error"
-      size="x-large"
-      @click="removeHistoryBatch"
-    />
+  <span v-if="selected.length > 0" class="fixed right-5 bottom-5">
+    <VBtn icon="mdi-redo-variant" class="me-2" color="primary" size="x-large" @click="retransferBatch" />
+    <VBtn icon="mdi-trash-can-outline" color="error" size="x-large" @click="removeHistoryBatch" />
   </span>
   <!-- 底部弹窗 -->
   <VBottomSheet v-model="deleteConfirmDialog" inset>
@@ -396,33 +425,17 @@ const dropdownItems = ref([
       <VCardTitle class="pe-10">
         {{ confirmTitle }}
       </VCardTitle>
-      <div class="d-flex  flex-column flex-lg-row justify-center my-3">
-        <VBtn
-          color="primary"
-          class="mb-2 mx-2"
-          @click="deleteConfirmHandler(false, false)"
-        >
+      <div class="d-flex flex-column flex-lg-row justify-center my-3">
+        <VBtn color="primary" class="mb-2 mx-2" @click="deleteConfirmHandler(false, false)">
           仅删除历史记录
         </VBtn>
-        <VBtn
-          color="warning"
-          class="mb-2 mx-2"
-          @click="deleteConfirmHandler(true, false)"
-        >
+        <VBtn color="warning" class="mb-2 mx-2" @click="deleteConfirmHandler(true, false)">
           删除历史记录和源文件
         </VBtn>
-        <VBtn
-          color="info"
-          class="mb-2 mx-2"
-          @click="deleteConfirmHandler(false, true)"
-        >
+        <VBtn color="info" class="mb-2 mx-2" @click="deleteConfirmHandler(false, true)">
           删除历史记录和媒体库文件
         </VBtn>
-        <VBtn
-          color="error"
-          class="mb-2 mx-2"
-          @click="deleteConfirmHandler(true, true)"
-        >
+        <VBtn color="error" class="mb-2 mx-2" @click="deleteConfirmHandler(true, true)">
           删除历史记录、源文件和媒体库文件
         </VBtn>
       </div>
@@ -433,17 +446,19 @@ const dropdownItems = ref([
     v-model="redoDialog"
     :logids="redoIds"
     :target="redoTarget"
-    @done="() => {
-      redoDialog = false
-      // 清空当前操作记录
-      currentHistory = undefined
-      selected = []
-      // 刷新
-      fetchData({
-        page: currentPage,
-        itemsPerPage,
-      })
-    }"
+    @done="
+      () => {
+        redoDialog = false
+        // 清空当前操作记录
+        currentHistory = undefined
+        selected = []
+        // 刷新
+        fetchData({
+          page: currentPage,
+          itemsPerPage,
+        })
+      }
+    "
     @close="redoDialog = false"
   />
 </template>

src/views/subscribe/FullCalendarView.vue

@@ -1,13 +1,13 @@
-<script lang="ts" setup>
+<script lang='ts' setup>
 import type { CalendarOptions, EventSourceInput } from '@fullcalendar/core'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
 import timeGridPlugin from '@fullcalendar/timegrid'
 import FullCalendar from '@fullcalendar/vue3'
 import type { Ref } from 'vue'
-import type { MediaInfo, Rss, Subscribe, TmdbEpisode } from '@/api/types'
+import type { MediaInfo, Subscribe, TmdbEpisode } from '@/api/types'
 import api from '@/api'
-import { parseDate } from '@/@core/utils/formatters'
+import { formatEp, parseDate } from '@/@core/utils/formatters'
 
 // 日历属性
 const calendarOptions: Ref<CalendarOptions> = ref({
@@ -33,7 +33,7 @@ const calendarOptions: Ref<CalendarOptions> = ref({
   events: [],
 })
 
-async function eventsHander(subscribe: Subscribe | Rss) {
+async function eventsHander(subscribe: Subscribe) {
   // 如果是电影直接返回
   if (subscribe.type === '电影') {
     // 调用API查询TMDB详情
@@ -48,24 +48,52 @@ async function eventsHander(subscribe: Subscribe | Rss) {
       allDay: false,
       posterPath: subscribe.poster,
       mediaType: subscribe.type,
+      len: 1,
     }
   }
   else {
     // 调用API查询集信息
     const episodes: TmdbEpisode[] = await api.get(
-            `tmdb/${subscribe.tmdbid}/${subscribe.season}`,
+      `tmdb/${subscribe.tmdbid}/${subscribe.season}`,
     )
 
-    return episodes.map((episode) => {
-      return {
-        title: subscribe.name,
-        subtitle: `第 ${episode.episode_number} 集`,
-        start: parseDate(episode.air_date || ''),
-        allDay: false,
-        posterPath: subscribe.poster,
-        mediaType: subscribe.type,
+    interface EpisodeInfo {
+      title: string
+      subtitle: string
+      start: Date | null
+      allDay: boolean
+      posterPath: string | undefined
+      mediaType: string
+      len: number
+    }
+
+    interface EpisodesDictionary {
+      [key: string]: EpisodeInfo
+    }
+
+    const dictEpisode: EpisodesDictionary = {}
+    episodes.forEach((episode: TmdbEpisode) => {
+      const air_date = episode.air_date ?? ''
+      if (dictEpisode[air_date]) {
+        dictEpisode[air_date].subtitle += `,${episode.episode_number}`
+        dictEpisode[air_date].len++
+      }
+      else {
+        dictEpisode[air_date] = {
+          title: subscribe.name,
+          subtitle: `${episode.episode_number}`,
+          start: parseDate(episode.air_date || ''),
+          allDay: false,
+          posterPath: subscribe.poster,
+          mediaType: subscribe.type,
+          len: 1,
+        }
       }
     })
+    for (const key in dictEpisode)
+      dictEpisode[key].subtitle = formatEp(dictEpisode[key].subtitle.split(',').map(Number))
+
+    return Object.values(dictEpisode)
   }
 }
 
@@ -115,11 +143,11 @@ onMounted(() => {
               </VImg>
             </div>
             <div>
-              <VCardSubtitle class="pa-2 font-bold break-words whitespace-break-spaces">
+              <VCardSubtitle class="pa-1 px-2 font-bold break-words whitespace-break-spaces">
                 {{ arg.event.title }}
               </VCardSubtitle>
-              <VCardText class="pa-0 px-2">
-                {{ arg.event.extendedProps.subtitle }}
+              <VCardText v-if="arg.event.extendedProps.subtitle" class="pa-0 px-2 break-words">
+                第{{ arg.event.extendedProps.subtitle }}集
               </VCardText>
             </div>
           </div>
@@ -142,6 +170,15 @@ onMounted(() => {
                   <VSkeletonLoader class="object-cover aspect-w-2 aspect-h-3" />
                 </div>
               </template>
+              <VChip
+                v-if="arg.event.extendedProps.len > 1"
+                variant="elevated"
+                color="primary"
+                size="x-small"
+                class="absolute right-0 top-0"
+              >
+                {{ arg.event.extendedProps.len }}
+              </VChip>
             </VImg>
           </template>
         </VTooltip>
@@ -150,7 +187,7 @@ onMounted(() => {
   </FullCalendar>
 </template>
 
-<style lang="scss">
+<style lang='scss'>
 .v-application .fc {
   --fc-today-bg-color: rgba(var(--v-theme-on-surface), 0.04);
   --fc-border-color: rgba(var(--v-border-color), var(--v-border-opacity));
@@ -253,10 +290,10 @@ onMounted(() => {
 .v-application .fc .fc-toolbar-chunk .fc-button-group .fc-button-primary,
 .v-application .fc .fc-toolbar-chunk .fc-button-group .fc-button-primary:hover,
 .v-application
-  .fc
-  .fc-toolbar-chunk
-  .fc-button-group
-  .fc-button-primary:not(.disabled):active {
+.fc
+.fc-toolbar-chunk
+.fc-button-group
+.fc-button-primary:not(.disabled):active {
   border-color: transparent;
   background-color: transparent;
   color: rgba(var(--v-theme-on-surface), var(--v-high-emphasis-opacity));
@@ -281,19 +318,18 @@ onMounted(() => {
 }
 
 .v-application
-  .fc
-  .fc-toolbar-chunk:last-child
-  .fc-button-group
-  .fc-button:not(:last-child) {
-  border-inline-end: 0.0625rem solid
-    rgba(var(--v-theme-primary), var(--v-overlay-scrim-opacity));
+.fc
+.fc-toolbar-chunk:last-child
+.fc-button-group
+.fc-button:not(:last-child) {
+  border-inline-end: 0.0625rem solid rgba(var(--v-theme-primary), var(--v-overlay-scrim-opacity));
 }
 
 .v-application
-  .fc
-  .fc-toolbar-chunk:last-child
-  .fc-button-group
-  .fc-button.fc-button-active {
+.fc
+.fc-toolbar-chunk:last-child
+.fc-button-group
+.fc-button.fc-button-active {
   background-color: rgba(var(--v-theme-primary), var(--v-activated-opacity));
   color: rgb(var(--v-theme-primary));
 }
@@ -359,8 +395,8 @@ onMounted(() => {
 .v-application .fc .fc-popover {
   border-radius: 6px;
   box-shadow: 0 4px 14px -4px var(--v-shadow-key-umbra-opacity),
-    0 4px 8px -4px var(--v-shadow-key-penumbra-opacity),
-    0 4px 8px -4px var(--v-shadow-key-ambient-opacity);
+  0 4px 8px -4px var(--v-shadow-key-penumbra-opacity),
+  0 4px 8px -4px var(--v-shadow-key-ambient-opacity);
 }
 
 .v-application .fc .fc-popover .fc-popover-header,
@@ -400,11 +436,11 @@ onMounted(() => {
 }
 
 .v-theme--dark
-  .v-application
-  .fc
-  .fc-toolbar-chunk
-  .fc-button-group
-  .fc-drawerToggler-button {
+.v-application
+.fc
+.fc-toolbar-chunk
+.fc-button-group
+.fc-drawerToggler-button {
   background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' stroke='rgba(232,232,241,0.68)' stroke-width='2' fill='none' stroke-linecap='round' stroke-linejoin='round' class='css-i6dzq1'%3E%3Cpath d='M3 12h18M3 6h18M3 18h18'/%3E%3C/svg%3E");
 }