Merge pull request #19 from thofx/thofx_fix

src/@layouts/styles/_default-layout.scss

@@ -38,7 +38,7 @@ body,
   overflow: hidden;
   // TODO: Use grid gutter variable here
   padding-block: 1.5rem;
-  padding-top: calc(env(safe-area-inset-top) + 70px);
+  padding-top: calc(env(safe-area-inset-top) + 65px);
   // display: flex;
 
 

src/components/cards/SiteCard.vue

@@ -354,6 +354,11 @@ onMounted(() => {
       </VTooltip>
     </VCardText>
 
+    <VDivider
+      class="opacity-75"
+      style="border-color: rgba(var(--v-theme-on-background), var(--v-selected-opacity))"
+    />
+
     <VCardActions>
       <VBtn
         v-if="!cardProps.site?.public"
@@ -579,10 +584,10 @@ onMounted(() => {
           page-text="{0}-{1} 共 {2} 条"
         >
           <template #item.title="{ item }">
-            <div class="text-high-emphasis">
+            <div class="text-high-emphasis pt-1">
               {{ item.raw.title }}
             </div>
-            <div class="text-sm">
+            <div class="text-sm my-1">
               {{ item.raw.description }}
             </div>
             <VChip

src/styles/styles.scss

@@ -88,11 +88,25 @@
 }
 
 @media (min-width: 640px){
-.slider-title {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    font-size: 1.5rem;
-    line-height: 2.25rem;
+  .slider-title {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      font-size: 1.5rem;
+      line-height: 2.25rem;
+  }
 }
+
+// 美化滚动条
+::-webkit-scrollbar {
+  width: 8px;
+  height: 8px;
+}
+::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: rgb(var(--v-theme-perfect-scrollbar-thumb));
+  -webkit-box-shadow: inset 0 0 10px rgba(0,0,0,0.2);
+  &:hover{
+    background: #a1a1a1;
+  }
 }

src/views/discover/TorrentCardListView.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { isIntersected } from '@/@core/utils'
+import { ref } from 'vue'
 import api from '@/api'
 import type { Context } from '@/api/types'
 import TorrentCard from '@/components/cards/TorrentCard.vue'
@@ -15,13 +15,15 @@ const props = defineProps({
   type: String,
 })
 
+interface SearchTorrent extends Context {
+  more?: Array<Context>
+}
+
 // 数据列表
-const dataList = ref<Context[]>([])
+const dataList = ref <Array<SearchTorrent>>([])
 
 // 分组后的数据列表
-const groupedDataList = computed(() => {
-  return groupByTitleAndSize(dataList.value)
-})
+const groupedDataList = ref<Map<string, Context[]>>()
 
 // 是否刷新过
 const isRefreshed = ref(false)
@@ -60,171 +62,78 @@ const filterForm = reactive({
 })
 
 // 获取站点过滤选项
-const getSiteFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (data.torrent_info?.site_name && !options.includes(data.torrent_info?.site_name))
-      options.push(data.torrent_info?.site_name)
-  })
-
-  return options
-})
-
+const siteFilterOptions = ref<Array<string>>([])
 // 获取季过滤选项
-const getSeasonFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (
-      data.meta_info.season_episode
-      && !options.includes(data.meta_info.season_episode)
-    )
-      options.push(data.meta_info.season_episode)
-  })
-
-  return options
-})
-
+const seasonFilterOptions = ref<Array<string>>([])
 // 获取制作组过滤选项
-const getReleaseGroupFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (data.meta_info.resource_team && !options.includes(data.meta_info.resource_team))
-      options.push(data.meta_info.resource_team)
-  })
-
-  return options
-})
-
+const releaseGroupFilterOptions = ref<Array<string>>([])
 // 获取视频编码过滤选项
-const getVideoCodeFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (data.meta_info.video_encode && !options.includes(data.meta_info.video_encode))
-      options.push(data.meta_info.video_encode)
-  })
-
-  return options
-})
-
+const videoCodeFilterOptions = ref<Array<string>>([])
 // 获取促销状态过滤选项
-const getFreeStateFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (
-      data.torrent_info.volume_factor
-      && !options.includes(data.torrent_info.volume_factor)
-    )
-      options.push(data.torrent_info.volume_factor)
-  })
-
-  return options
-})
-
+const freeStateFilterOptions = ref<Array<string>>([])
 // 获取质量过滤选项
-const getEditionFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (data.meta_info.edition && !options.includes(data.meta_info.edition))
-      options.push(data.meta_info.edition)
-  })
-
-  return options
-})
-
+const editionFilterOptions = ref<Array<string>>([])
 // 获取分辨率过滤选项
-const getResolutionFilterOptions = computed(() => {
-  const options: string[] = []
-
-  dataList.value.forEach((data) => {
-    if (data.meta_info.resource_pix && !options.includes(data.meta_info.resource_pix))
-      options.push(data.meta_info.resource_pix)
-  })
-
-  return options
-})
+const resolutionFilterOptions = ref<Array<string>>([])
 
 // 按过滤项过滤卡片
-// eslint-disable-next-line sonarjs/cognitive-complexity
-function filterTorrentsCard(data: Context) {
-  // 当前分组的所有数据
-  const items: Context[]
-    = groupedDataList.value.get(`${data.torrent_info.title}_${data.torrent_info.size}`)
-    ?? []
+watchEffect(() => {
+  // 清空数据
+  dataList.value.splice(0)
 
-  // 站点名称、促销状态
-  const site_names = []
-  const volume_factors = []
-  for (const { torrent_info } of items) {
-    site_names.push(torrent_info.site_name)
-    volume_factors.push(torrent_info.volume_factor)
-  }
+  const match = (filter: Array<string>, value: string | undefined) =>
+    filter.length === 0 || (value && filter.includes(value))
 
-  const { meta_info } = data
+  groupedDataList.value?.forEach((value) => {
+    if (value.length > 0) {
+      const matchData = value.filter((data) => {
+        const { meta_info, torrent_info } = data
+        // 季、制作组、视频编码
+        const { season_episode, resource_team, video_encode } = meta_info
+        return (
+          // 站点过滤
+          match(filterForm.site, torrent_info.site_name)
+          // 促销状态过滤
+          && match(filterForm.freeState, torrent_info.volume_factor)
+          // 季过滤
+          && match(filterForm.season, season_episode)
+          // 制作组过滤
+          && match(filterForm.releaseGroup, resource_team)
+          // 视频编码过滤
+          && match(filterForm.videoCode, video_encode)
+          // 分辨率过滤
+          && match(filterForm.resolution, meta_info.resource_pix)
+          // 质量过滤
+          && match(filterForm.edition, meta_info.edition)
+        )
+      })
+      if (matchData.length > 0) {
+        const firstData = matchData[0] as SearchTorrent
+        if (matchData.length > 1)
+          firstData.more = matchData.slice(1)
 
-  // 季、制作组、视频编码
-  const { season_episode, resource_team, video_encode } = meta_info
-
-  // 站点过滤
-  if (filterForm.site.length > 0 && !isIntersected(filterForm.site, site_names))
-    return false
-
-  // 促销状态过滤
-  if (
-    filterForm.freeState.length > 0
-    && !isIntersected(filterForm.freeState, volume_factors)
-  )
-    return false
-
-  // 季过滤
-  if (filterForm.season.length > 0 && !filterForm.season.includes(season_episode))
-    return false
-
-  // 制作组过滤
-  if (
-    filterForm.releaseGroup.length > 0
-    && !filterForm.releaseGroup.includes(resource_team || '')
-  )
-    return false
-
-  // 视频编码过滤
-  if (
-    filterForm.videoCode.length > 0
-    && !filterForm.videoCode.includes(video_encode || '')
-  )
-    return false
-
-  // 分辨率过滤
-  if (
-    filterForm.resolution.length > 0
-    && !filterForm.resolution.includes(meta_info.resource_pix || '')
-  )
-    return false
-
-  // 质量过滤
-  return !(filterForm.edition.length > 0 && !filterForm.edition.includes(meta_info.edition))
-}
+        dataList.value.push(firstData)
+      }
+    }
+  })
+})
 
 // 获取订阅列表数据
-async function fetchData() {
+async function fetchData(): Promise<Array<Context>> {
   try {
+    let searchData: Array<Context>
     const keyword = props.keyword ?? ''
     const mtype = props.type ?? ''
     if (!keyword) {
       // 查询上次搜索结果
-      dataList.value = await api.get('search/last')
+      searchData = await api.get('search/last')
     }
     else {
       startLoadingProgress()
-
+      const qualify = props.keyword?.startsWith('tmdb:') || props.keyword?.startsWith('douban:')
       // 优先按TMDBID精确查询
-      if (props.keyword?.startsWith('tmdb:') || props.keyword?.startsWith('douban:')) {
-        dataList.value = await api.get(`search/media/${props.keyword}`, {
+      if (qualify) {
+        searchData = await api.get(`search/media/${props.keyword}`, {
           params: {
             mtype,
           },
@@ -232,51 +141,57 @@ async function fetchData() {
       }
       else {
         // 按标题模糊查询
-        dataList.value = await api.get(`search/title/${props.keyword}`)
+        searchData = await api.get(`search/title/${props.keyword}`)
       }
       stopLoadingProgress()
     }
     isRefreshed.value = true
+    return Promise.resolve(searchData)
   }
   catch (error) {
     console.error(error)
+    return Promise.reject(error)
   }
 }
 
-// 按标题和大小分组
-function groupByTitleAndSize(contextArray: Context[]): Map<string, Context[]> {
-  const groupMap = new Map<string, Context[]>()
+function initData() {
+  // load data
+  fetchData().then((data) => {
+    const groupMap = new Map<string, Context[]>()
 
-  for (const context of contextArray) {
-    const { torrent_info } = context
-    const key = `${torrent_info.title}_${torrent_info.size}`
-
-    if (groupMap.has(key)) {
-      // 已存在相同标题和大小的分组，将当前上下文信息添加到分组中
-      const group = groupMap.get(key)
-
-      group?.push(context)
-    }
-    else {
-      // 创建新的分组，并将当前上下文信息添加到分组中
-      groupMap.set(key, [context])
-    }
-  }
-
-  return groupMap
-}
-
-// 获取每个分组的第一个数据
-const getFirstContexts = computed(() => {
-  const firstContexts: Context[] = []
-
-  groupedDataList.value.forEach((group) => {
-    if (group.length > 0)
-      firstContexts.push(group[0])
+    data.forEach((item) => {
+      const { torrent_info } = item
+      // init options
+      initOptions(item)
+      // group data
+      const key = `${torrent_info.title}_${torrent_info.size}`
+      if (groupMap.has(key)) {
+        // 已存在相同标题和大小的分组，将当前上下文信息添加到分组中
+        const group = groupMap.get(key)
+        group?.push(item)
+      }
+      else {
+        // 创建新的分组，并将当前上下文信息添加到分组中
+        groupMap.set(key, [item])
+      }
+    })
+    groupedDataList.value = groupMap
   })
+}
 
-  return firstContexts
-})
+function initOptions(data: Context) {
+  const { torrent_info, meta_info } = data
+  const optionValue = (options: Array<string>, value: string | undefined) => {
+    value && !options.includes(value) && options.push(value)
+  }
+  optionValue(siteFilterOptions.value, torrent_info?.site_name)
+  optionValue(seasonFilterOptions.value, meta_info?.season_episode)
+  optionValue(releaseGroupFilterOptions.value, meta_info?.resource_team)
+  optionValue(videoCodeFilterOptions.value, meta_info?.video_encode)
+  optionValue(freeStateFilterOptions.value, torrent_info?.volume_factor)
+  optionValue(editionFilterOptions.value, meta_info?.edition)
+  optionValue(resolutionFilterOptions.value, meta_info?.resource_pix)
+}
 
 // 使用SSE监听加载进度
 function startLoadingProgress() {
@@ -302,20 +217,16 @@ function stopLoadingProgress() {
 }
 
 // 加载时获取数据
-onBeforeMount(fetchData)
+onMounted(initData)
 </script>
 
 <template>
   <VCard class="bg-transparent mb-3 pt-2 shadow-none">
     <VRow>
-      <VCol
-        v-if="getSiteFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="siteFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.site"
-          :items="getSiteFilterOptions"
+          :items="siteFilterOptions"
           size="small"
           density="compact"
           chips
@@ -323,14 +234,10 @@ onBeforeMount(fetchData)
           multiple
         />
       </VCol>
-      <VCol
-        v-if="getSeasonFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="seasonFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.season"
-          :items="getSeasonFilterOptions"
+          :items="seasonFilterOptions"
           size="small"
           density="compact"
           chips
@@ -338,14 +245,10 @@ onBeforeMount(fetchData)
           multiple
         />
       </VCol>
-      <VCol
-        v-if="getReleaseGroupFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="releaseGroupFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.releaseGroup"
-          :items="getReleaseGroupFilterOptions"
+          :items="releaseGroupFilterOptions"
           size="small"
           density="compact"
           chips
@@ -353,14 +256,10 @@ onBeforeMount(fetchData)
           multiple
         />
       </VCol>
-      <VCol
-        v-if="getEditionFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="editionFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.edition"
-          :items="getEditionFilterOptions"
+          :items="editionFilterOptions"
           size="small"
           density="compact"
           chips
@@ -368,14 +267,10 @@ onBeforeMount(fetchData)
           multiple
         />
       </VCol>
-      <VCol
-        v-if="getResolutionFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="resolutionFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.resolution"
-          :items="getResolutionFilterOptions"
+          :items="resolutionFilterOptions"
           size="small"
           density="compact"
           chips
@@ -383,14 +278,10 @@ onBeforeMount(fetchData)
           multiple
         />
       </VCol>
-      <VCol
-        v-if="getVideoCodeFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="videoCodeFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.videoCode"
-          :items="getVideoCodeFilterOptions"
+          :items="videoCodeFilterOptions"
           size="small"
           density="compact"
           chips
@@ -398,14 +289,10 @@ onBeforeMount(fetchData)
           multiple
         />
       </VCol>
-      <VCol
-        v-if="getFreeStateFilterOptions.length > 0"
-        cols="6"
-        md=""
-      >
+      <VCol v-if="freeStateFilterOptions.length > 0" cols="6" md="">
         <VSelect
           v-model="filterForm.freeState"
-          :items="getFreeStateFilterOptions"
+          :items="freeStateFilterOptions"
           size="small"
           density="compact"
           chips
@@ -415,40 +302,13 @@ onBeforeMount(fetchData)
       </VCol>
     </VRow>
   </VCard>
-  <div
-    v-if="!isRefreshed"
-    class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center"
-  >
-    <VProgressCircular
-      v-if="!props.keyword"
-      size="48"
-      indeterminate
-      color="primary"
-    />
-    <VProgressCircular
-      v-if="props.keyword"
-      class="mb-3"
-      color="primary"
-      :model-value="progressValue"
-      size="64"
-    />
+  <div v-if="!isRefreshed" class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center">
+    <VProgressCircular v-if="!props.keyword" size="48" indeterminate color="primary" />
+    <VProgressCircular v-if="props.keyword" class="mb-3" color="primary" :model-value="progressValue" size="64" />
     <span>{{ progressText }}</span>
   </div>
-  <div
-    v-if="dataList.length > 0"
-    class="grid gap-3 grid-torrent-card items-start"
-  >
-    <TorrentCard
-      v-for="data in getFirstContexts"
-      v-show="filterTorrentsCard(data)"
-      :key="data.torrent_info.title"
-      :torrent="data"
-      :more="
-        groupedDataList
-          .get(`${data.torrent_info.title}_${data.torrent_info.size}`)
-          ?.slice(1)
-      "
-    />
+  <div v-if="dataList.length > 0" class="grid gap-3 grid-torrent-card items-start">
+    <TorrentCard v-for="data in dataList" :key="`${data.torrent_info.title}_${data.torrent_info.site}`" :torrent="data" :more="data.more" />
   </div>
   <NoDataFound
     v-if="dataList.length === 0 && isRefreshed"

src/views/setting/AccountSettingSite.vue

@@ -51,10 +51,7 @@ async function querySelectedSites() {
 async function saveSelectedSites() {
   try {
     // 用户名密码
-    const result: { [key: string]: any } = await api.post(
-      'system/setting/IndexerSites',
-      selectedSites.value,
-    )
+    const result: { [key: string]: any } = await api.post('system/setting/IndexerSites', selectedSites.value)
 
     if (result.success)
       $toast.success('索引站点保存成功')
@@ -97,17 +94,14 @@ onMounted(() => {
   <VRow>
     <VCol cols="12">
       <VCard title="索引站点">
-        <VCardSubtitle> 只有选中的站点才会在搜索和订阅中使用 </VCardSubtitle>
+        <VCardSubtitle> 只有选中的站点才会在搜索和订阅中使用</VCardSubtitle>
 
         <VCardItem>
-          <VChipGroup
-            v-model="selectedSites"
-            column
-            multiple
-          >
+          <VChipGroup v-model="selectedSites" column multiple>
             <VChip
               v-for="site in allSites"
               :key="site.id"
+              :color="selectedSites.includes(site.id) ? 'primary' : ''"
               filter
               variant="outlined"
               :value="site.id"
@@ -118,10 +112,7 @@ onMounted(() => {
         </VCardItem>
 
         <VCardItem>
-          <VBtn
-            type="submit"
-            @click="saveSelectedSites"
-          >
+          <VBtn type="submit" @click="saveSelectedSites">
             保存
           </VBtn>
         </VCardItem>
@@ -131,18 +122,10 @@ onMounted(() => {
       <VCard title="站点重置">
         <VCardText>
           <div>
-            <VCheckbox
-              v-model="isConfirmResetSites"
-              label="确认删除所有站点数据并重新同步"
-            />
+            <VCheckbox v-model="isConfirmResetSites" label="确认删除所有站点数据并重新同步" />
           </div>
 
-          <VBtn
-            :disabled="!isConfirmResetSites || resetSitesDisabled"
-            color="error"
-            class="mt-3"
-            @click="resetSites"
-          >
+          <VBtn :disabled="!isConfirmResetSites || resetSitesDisabled" color="error" class="mt-3" @click="resetSites">
             {{ resetSitesText }}
           </VBtn>
         </VCardText>