From 1f812a52585310e3f22f3542af976344f482c78b Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Thu, 6 Feb 2025 08:30:27 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=87=8D=E6=9E=84=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=80=89=E9=A1=B9=E9=80=BB=E8=BE=91=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=BF=87=E6=BB=A4=E8=A1=A8=E5=8D=95=E5=92=8C=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/styles.scss                    |   3 +-
 src/views/torrent/TorrentCardListView.vue | 138 +++++++------------
 src/views/torrent/TorrentRowListView.vue  | 154 +++++++++++++++++++++-
 3 files changed, 200 insertions(+), 95 deletions(-)

diff --git a/src/styles/styles.scss b/src/styles/styles.scss
index fe0b703f..b3671c10 100644
--- a/src/styles/styles.scss
+++ b/src/styles/styles.scss
@@ -14,8 +14,9 @@ html.v-overlay-scroll-blocked {
 }
 
 #nprogress .peg {
+  width: 5px;
   box-shadow: 0 0 10px rgb(var(--v-theme-primary)), 0 0 5px rgb(var(--v-theme-primary)) !important;
-      transform: rotate(0deg) translate(0, -1px);
+      transform: rotate(0deg) translate(0, -2px);
 }
 
 .v-toast--bottom {
diff --git a/src/views/torrent/TorrentCardListView.vue b/src/views/torrent/TorrentCardListView.vue
index aea64c54..448634cc 100644
--- a/src/views/torrent/TorrentCardListView.vue
+++ b/src/views/torrent/TorrentCardListView.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 })
 
 // 过滤表单
-const filterForm = reactive({
+const filterForm: Record<string, string[]> = reactive({
   // 站点
   site: [] as string[],
   // 季
@@ -31,20 +31,36 @@ const filterForm = reactive({
   resolution: [] as string[],
 })
 
-// 获取站点过滤选项
-const siteFilterOptions = ref<Array<string>>([])
-// 获取季过滤选项
-const seasonFilterOptions = ref<Array<string>>([])
-// 获取制作组过滤选项
-const releaseGroupFilterOptions = ref<Array<string>>([])
-// 获取视频编码过滤选项
-const videoCodeFilterOptions = ref<Array<string>>([])
-// 获取促销状态过滤选项
-const freeStateFilterOptions = ref<Array<string>>([])
-// 获取质量过滤选项
-const editionFilterOptions = ref<Array<string>>([])
-// 获取分辨率过滤选项
-const resolutionFilterOptions = ref<Array<string>>([])
+// 过滤项映射（保持中文标题）
+const filterTitles: Record<string, string> = {
+  site: '站点',
+  season: '季集',
+  freeState: '促销状态',
+  videoCode: '视频编码',
+  edition: '质量',
+  resolution: '分辨率',
+  releaseGroup: '制作组',
+}
+
+// 统一存储过滤选项
+const filterOptions: Record<string, string[]> = reactive({
+  site: [] as string[],
+  season: [] as string[],
+  freeState: [] as string[],
+  edition: [] as string[],
+  resolution: [] as string[],
+  videoCode: [] as string[],
+  releaseGroup: [] as string[],
+})
+
+// 非空值的过滤选项
+const filterOptionsNotEmpty = computed(() => {
+  const options: Record<string, string[]> = {}
+  for (const key in filterOptions) {
+    if (filterOptions[key].length > 0) options[key] = filterOptions[key]
+  }
+  return options
+})
 
 // 完整的数据列表
 let dataList: SearchTorrent[]
@@ -60,19 +76,19 @@ function initOptions(data: Context) {
   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)
+  optionValue(filterOptions.site, torrent_info?.site_name)
+  optionValue(filterOptions.season, meta_info?.season_episode)
+  optionValue(filterOptions.releaseGroup, meta_info?.resource_team)
+  optionValue(filterOptions.videoCode, meta_info?.video_encode)
+  optionValue(filterOptions.freeState, torrent_info?.volume_factor)
+  optionValue(filterOptions.edition, meta_info?.edition)
+  optionValue(filterOptions.resolution, meta_info?.resource_pix)
 }
 
 // 对季过滤选项进行排序
 const sortSeasonFilterOptions = computed(() => {
   // 预解析所有选项
-  const parsedOptions = seasonFilterOptions.value.map((option, index) => {
+  const parsedOptions = filterOptions.season.map((option, index) => {
     const parseSeasonEpisode = (str: string) => {
       const match = str.match(/^S(\d+)(?:-S(\d+))?(?:\s*E(\d+)(?:-E(\d+))?)?$/)
 
@@ -268,86 +284,26 @@ function loadMore({ done }: { done: any }) {
 <template>
   <VCard class="bg-transparent mb-3 pt-2 shadow-none">
     <VRow>
-      <VCol v-if="siteFilterOptions.length > 0" cols="6" md="">
+      <VCol v-for="(options, key) in filterOptionsNotEmpty" :key="key" cols="6" md="">
         <VSelect
-          v-model="filterForm.site"
-          :items="siteFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="站点"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="seasonFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.season"
+          v-if="key === 'season'"
+          v-model="filterForm[key]"
           :items="sortSeasonFilterOptions"
           size="small"
           density="compact"
           chips
-          label="季集"
+          :label="filterTitles[key]"
           multiple
           clearable
         />
-      </VCol>
-      <VCol v-if="releaseGroupFilterOptions.length > 0" cols="6" md="">
         <VSelect
-          v-model="filterForm.releaseGroup"
-          :items="releaseGroupFilterOptions"
+          v-else
+          v-model="filterForm[key]"
+          :items="options"
           size="small"
           density="compact"
           chips
-          label="制作组"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="editionFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.edition"
-          :items="editionFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="质量"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="resolutionFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.resolution"
-          :items="resolutionFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="分辨率"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="videoCodeFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.videoCode"
-          :items="videoCodeFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="视频编码"
-          multiple
-          clearable
-        />
-      </VCol>
-      <VCol v-if="freeStateFilterOptions.length > 0" cols="6" md="">
-        <VSelect
-          v-model="filterForm.freeState"
-          :items="freeStateFilterOptions"
-          size="small"
-          density="compact"
-          chips
-          label="促销状态"
+          :label="filterTitles[key]"
           multiple
           clearable
         />
diff --git a/src/views/torrent/TorrentRowListView.vue b/src/views/torrent/TorrentRowListView.vue
index 5b48d5d4..1bb8f8f2 100644
--- a/src/views/torrent/TorrentRowListView.vue
+++ b/src/views/torrent/TorrentRowListView.vue
@@ -18,12 +18,19 @@ const props = defineProps({
 
 // 过滤表单
 const filterForm: Record<string, string[]> = reactive({
+  // 站点
   site: [] as string[],
+  // 季
   season: [] as string[],
+  // 制作组
   releaseGroup: [] as string[],
+  // 视频编码
   videoCode: [] as string[],
+  // 促销状态
   freeState: [] as string[],
+  // 质量
   edition: [] as string[],
+  // 分辨率
   resolution: [] as string[],
 })
 
@@ -66,6 +73,124 @@ const filterOptionsNotEmpty = computed(() => {
   return options
 })
 
+// 对季过滤选项进行排序
+const sortSeasonFilterOptions = computed(() => {
+  // 预解析所有选项
+  const parsedOptions = filterOptions.season.map((option, index) => {
+    const parseSeasonEpisode = (str: string) => {
+      const match = str.match(/^S(\d+)(?:-S(\d+))?(?:\s*E(\d+)(?:-E(\d+))?)?$/)
+
+      if (!match) {
+        // 如果字符串格式不正确，返回默认值
+        return {
+          original: str,
+          seasonStart: 0,
+          seasonEnd: 0,
+          episodeStart: 0,
+          episodeEnd: 0,
+          maxSeason: 0,
+          maxEpisode: 0,
+          index,
+        }
+      }
+
+      const seasonStart = match[1] ? parseInt(match[1], 10) : 0
+      const seasonEnd = match[2] ? parseInt(match[2], 10) : 0
+      const episodeStart = match[3] ? parseInt(match[3], 10) : 0
+      const episodeEnd = match[4] ? parseInt(match[4], 10) : 0
+      const maxSeason = seasonEnd > 0 ? seasonEnd : seasonStart
+      const maxEpisode = episodeEnd > 0 ? episodeEnd : episodeStart
+
+      return {
+        original: str,
+        seasonStart,
+        seasonEnd,
+        episodeStart,
+        episodeEnd,
+        maxSeason,
+        maxEpisode,
+        index,
+      }
+    }
+
+    return parseSeasonEpisode(option)
+  })
+
+  // 定义判断是否为整季或季范围的函数
+  const isWholeSeason = (parsed: (typeof parsedOptions)[0]) =>
+    parsed.seasonStart > 0 &&
+    (parsed.seasonEnd === 0 || parsed.seasonEnd > parsed.seasonStart) &&
+    parsed.episodeStart === 0 &&
+    parsed.episodeEnd === 0
+
+  // 定义判断是否包含集数的函数
+  const hasEpisodes = (parsed: (typeof parsedOptions)[0]) => parsed.episodeStart > 0 || parsed.episodeEnd > 0
+
+  // 排序逻辑
+  parsedOptions.sort((a, b) => {
+    const aIsWhole = isWholeSeason(a)
+    const bIsWhole = isWholeSeason(b)
+    const aHasEpisodes = hasEpisodes(a)
+    const bHasEpisodes = hasEpisodes(b)
+
+    // 优先级1：整季和季范围选项优先于带有集数的选项
+    if (aIsWhole && !bIsWhole) return -1
+    if (!aIsWhole && bIsWhole) return 1
+
+    // 优先级2：如果都是整季或季范围选项，按 maxSeason 降序排列
+    if (aIsWhole && bIsWhole) {
+      if (b.maxSeason !== a.maxSeason) {
+        return b.maxSeason - a.maxSeason
+      }
+      // 如果 maxSeason 相同，则按原始索引
+      return a.index - b.index
+    }
+
+    // 优先级3：如果都是带有集数的选项，先按 maxSeason 降序，再按 maxEpisode 降序
+    if (aHasEpisodes && bHasEpisodes) {
+      if (b.maxSeason !== a.maxSeason) {
+        return b.maxSeason - a.maxSeason
+      }
+      if (b.maxEpisode !== a.maxEpisode) {
+        return b.maxEpisode - a.maxEpisode
+      }
+      // 如果 maxSeason 和 maxEpisode 相同，则按原始索引
+      return a.index - b.index
+    }
+
+    // 优先级4：如果一个有集数，一个没有，优先有集数的选项
+    if (aHasEpisodes && !bHasEpisodes) return -1
+    if (!aHasEpisodes && bHasEpisodes) return 1
+
+    // 优先级5：对于没有集数且不是整季的选项，按 seasonStart 和 seasonEnd 降序排序
+    if (b.seasonStart !== a.seasonStart) {
+      return b.seasonStart - a.seasonStart
+    }
+    if (b.seasonEnd !== a.seasonEnd) {
+      return b.seasonEnd - a.seasonEnd
+    }
+
+    // 优先级6：按 episodeStart 和 episodeEnd 降序排序
+    if (b.episodeStart !== a.episodeStart) {
+      return b.episodeStart - a.episodeStart
+    }
+    if (b.episodeEnd !== a.episodeEnd) {
+      return b.episodeEnd - a.episodeEnd
+    }
+
+    // 优先级7：兜底按字母降序排列
+    if (a.original !== b.original) {
+      return b.original.localeCompare(a.original)
+    }
+
+    // 优先级8：如果所有条件都相同，则按原始索引
+    return a.index - b.index
+  })
+
+  // 返回排序后的原始字符串数组
+  return parsedOptions.map(option => option.original)
+})
+
 // 列表样式
 const listStyle = computed(() => {
   return appMode
@@ -181,7 +306,19 @@ onMounted(() => {
           </FilterOption>
           <!-- 过滤选项 -->
           <FilterOption v-for="(options, key) in filterOptionsNotEmpty" :key="key" :title="filterTitles[key]">
-            <VChipGroup v-model="filterForm[key]" column multiple>
+            <VChipGroup v-if="key === 'season'" v-model="filterForm[key]" column multiple>
+              <VChip
+                v-for="option in sortSeasonFilterOptions"
+                :key="option"
+                :color="filterForm[key].includes(option) ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="option"
+              >
+                {{ option }}
+              </VChip>
+            </VChipGroup>
+            <VChipGroup v-else v-model="filterForm[key]" column multiple>
               <VChip
                 v-for="option in options"
                 :key="option"
@@ -225,10 +362,21 @@ onMounted(() => {
             :key="key"
             :title="filterTitles[key]"
           >
-            <VChipGroup v-model="filterForm[key]" column multiple>
+            <VChipGroup v-if="key === 'season'" v-model="filterForm[key]" column multiple>
+              <VChip
+                v-for="option in sortSeasonFilterOptions"
+                :key="option"
+                :color="filterForm[key].includes(option) ? 'primary' : ''"
+                filter
+                variant="outlined"
+                :value="option"
+              >
+                {{ option }}
+              </VChip>
+            </VChipGroup>
+            <VChipGroup v-else v-model="filterForm[key]" column multiple>
               <VChip
                 v-for="option in options"
-                v-show="options.length > 0"
                 :key="option"
                 :color="filterForm[key].includes(option) ? 'primary' : ''"
                 filter