fix bug

fix customization

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: Build moviepilot frontend
+name: Build Moviepilot-Frontend
 
 on:
   workflow_dispatch:

package.json

@@ -1,7 +1,8 @@
 {
   "name": "moviepilot",
-  "version": "1.2.5",
+  "version": "1.3.2-2",
   "private": true,
+  "bin": "dist/service.js",
   "scripts": {
     "dev": "vite --host",
     "build": "vite build",
@@ -9,7 +10,13 @@
     "typecheck": "vue-tsc --noEmit",
     "lint": "eslint . -c .eslintrc.js --fix --ext .ts,.js,.vue,.tsx,.jsx",
     "build:icons": "tsc -b src/@iconify && node src/@iconify/build-icons.js",
-    "postinstall": "npm run build:icons"
+    "postinstall": "npm run build:icons",
+    "pkg": "pkg . -t node18-win-x64 -o MoviePilot-Frontend.exe"
+  },
+  "pkg": {
+    "assets": [
+      "dist/**/*"
+    ]
   },
   "dependencies": {
     "@casl/ability": "^6.2.0",
@@ -21,6 +28,8 @@
     "axios": "1.4.0",
     "axios-mock-adapter": "^1.21.4",
     "chart.js": "^4.1.2",
+    "express": "^4.18.2",
+    "express-http-proxy": "^2.0.0",
     "jwt-decode": "^3.1.2",
     "nprogress": "^0.2.0",
     "postcss-purgecss": "^5.0.0",

public/nginx.conf

@@ -0,0 +1,86 @@
+worker_processes auto;
+
+events {
+    worker_connections 1024;
+}
+
+
+http {
+
+    sendfile on;
+
+    keepalive_timeout 3600;
+
+    server {
+
+        include mime.types;
+        default_type application/octet-stream;
+
+        listen 3000;
+        listen [::]:3000;
+        server_name moviepilot;
+
+        location / {
+            # 主目录
+            expires off;
+            add_header Cache-Control "no-cache, no-store, must-revalidate";
+            root html;
+            try_files $uri $uri/ /index.html;
+        }
+
+        location /assets {
+            # 静态资源
+            expires 7d;
+            add_header Cache-Control "public";
+            root html;
+        }
+
+        location ~ ^/api/v1/system/(message|progress/) {
+            # SSE MIME类型设置
+            default_type text/event-stream;
+
+            # 禁用缓存
+            add_header Cache-Control no-cache;
+            add_header X-Accel-Buffering no;
+            proxy_buffering off;
+            proxy_cache off;
+
+            # 代理设置
+            proxy_pass http://backend_api;
+            proxy_http_version 1.1;
+            proxy_set_header Connection "";
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            # 超时设置
+            proxy_read_timeout 3600s;
+        }
+
+        location /api {
+            # 后端API
+            proxy_pass http://backend_api;
+            rewrite ^.+mock-server/?(.*)$ /$1 break;
+            proxy_http_version 1.1;
+            proxy_buffering off;
+            proxy_cache off;
+            proxy_redirect off;
+            proxy_set_header Connection "";
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Nginx-Proxy true;
+
+            # 超时设置
+            proxy_read_timeout 600s;
+        }
+    }
+
+    upstream backend_api {
+        # 后端API的地址和端口
+        server 127.0.0.1:3001;
+        # 可以添加更多后端服务器作为负载均衡
+    }
+
+}

public/service.js

@@ -0,0 +1,36 @@
+const path = require('node:path')
+const express = require('express')
+const proxy = require('express-http-proxy')
+
+const app = express()
+const port = process.env.NGINX_PORT || 3000
+
+// 后端 API 地址
+const proxyConfig = {
+  URL: '127.0.0.1',
+  PORT: process.env.PORT || 3001
+}
+
+// 静态文件服务目录
+app.use(express.static(__dirname))
+
+// 配置代理中间件将请求转发给后端API
+app.use(
+  '/api',
+  proxy(`${proxyConfig.URL}:${proxyConfig.PORT}`, {
+    // 路径加上 /api 前缀
+    proxyReqPathResolver: (req) => {
+      return `/api${req.url}`
+    }
+  })
+);
+
+
+// 处理根路径的请求
+app.get('/', (req, res) => {
+  res.sendFile(path.join(__dirname, 'index.html')) // 指向你的前端入口文件
+})
+
+app.listen(port, () => {
+  console.log(`Server is running on port ${port}`)
+})

src/api/types.ts

@@ -44,6 +44,15 @@ export interface Subscribe {
   // 排除
   exclude?: string
 
+  // 质量
+  quality?: string
+
+  // 分辨率
+  resolution?: string
+
+  // 特效
+  effect?: string
+
   // 总集数
   total_episode?: number
 
@@ -87,7 +96,7 @@ export interface TransferHistory {
   // 目的目录
   dest?: string
 
-  // 转移模式link/copy/move/softlink
+  // 转移模式link/copy/move/softlink/rclone_copy/rclone_move
   mode?: string
 
   // 类型：电影、电视剧

src/components/cards/FilterRuleCard.vue

@@ -2,19 +2,30 @@
 // 输入参数
 const props = defineProps({
   pri: String,
+  maxpri: String,
   rules: Array as PropType<string[]>,
   width: String,
   height: String,
 })
 
 // 定义触发的自定义事件
-const emit = defineEmits(['close', 'changed'])
+const emit = defineEmits(['close', 'changed', 'levelup', 'leveldown'])
 
 // 按钮点击
 function onClose() {
   emit('close')
 }
 
+// 上升优先级
+function onLevelUp() {
+  emit('levelup', props.pri)
+}
+
+// 下降优先级
+function onLevelDown() {
+  emit('leveldown', props.pri)
+}
+
 // 选项变化
 function filtersChanged(value: string[]) {
   emit('changed', props.pri, value)
@@ -38,12 +49,16 @@ const selectFilterOptions = ref<{ [key: string]: string }[]>([
   { title: '排除: REMUX', value: ' !REMUX ' },
   { title: '质量: WEB-DL', value: ' WEBDL ' },
   { title: '排除: WEB-DL', value: ' !WEBDL ' },
+  { title: '质量: 60fps', value: '60FPS' },
+  { title: '排除: 60fps', value: '!60FPS' },
   { title: '编码: H265', value: ' H265 ' },
   { title: '排除: H265', value: ' !H265 ' },
   { title: '编码: H264', value: ' H264 ' },
   { title: '排除: H264', value: ' !H264 ' },
   { title: '效果: 杜比视界', value: ' DOLBY ' },
   { title: '排除: 杜比视界', value: ' !DOLBY ' },
+  { title: '效果: 杜比全景声', value: ' ATMOS ' },
+  { title: '排除: 杜比全景声', value: ' !ATMOS ' },
   { title: '效果: HDR', value: ' HDR ' },
   { title: '排除: HDR', value: ' !HDR ' },
   { title: '国语配音', value: ' CNVOI ' },
@@ -54,6 +69,20 @@ const selectFilterOptions = ref<{ [key: string]: string }[]>([
 
 <template>
   <VCard variant="tonal" :width="props.width" :height="props.height">
+    <span class="absolute top-3 right-14">
+      <IconBtn
+        v-if="props.pri !== '1'"
+        @click.stop="onLevelUp"
+      >
+        <VIcon icon="mdi-arrow-up" />
+      </IconBtn>
+      <IconBtn
+        v-if="props.pri !== props.maxpri"
+        @click.stop="onLevelDown"
+      >
+        <VIcon icon="mdi-arrow-down" />
+      </IconBtn>
+    </span>
     <DialogCloseBtn @click="onClose" />
     <VCardItem>
       <VCardTitle>优先级 {{ props.pri }}</VCardTitle>

src/components/cards/PluginAppCard.vue

@@ -57,7 +57,7 @@ async function installPlugin() {
         :class="{ shadow: isImageLoaded }"
       >
         <VImg
-          :src="`/plugin/${props.plugin?.plugin_icon}`"
+          :src="`/plugin_icon/${props.plugin?.plugin_icon}`"
           aspect-ratio="4/3"
           cover
           @load="isImageLoaded = true"

src/components/cards/PluginCard.vue

@@ -216,7 +216,7 @@ const dropdownItems = ref([
         :class="{ shadow: isImageLoaded }"
       >
         <VImg
-          :src="`/plugin/${props.plugin?.plugin_icon}`"
+          :src="`/plugin_icon/${props.plugin?.plugin_icon}`"
           aspect-ratio="4/3"
           cover
           :class="{ shadow: isImageLoaded }"

src/components/cards/SiteCard.vue

@@ -654,7 +654,7 @@ onMounted(() => {
                       <template #prepend>
                         <VIcon icon="mdi-download" />
                       </template>
-                      <VListItemTitle>下载种子</VListItemTitle>
+                      <VListItemTitle>下载种子文件</VListItemTitle>
                     </VListItem>
                   </VList>
                 </VMenu>

src/components/cards/SubscribeCard.vue

@@ -196,6 +196,90 @@ const dropdownItems = ref([
     },
   },
 ])
+
+// 质量选择框数据
+const qualityOptions = ref([
+  {
+    title: '全部',
+    value: '',
+  },
+  {
+    title: '蓝光原盘',
+    value: 'Blu-?Ray.+VC-?1|Blu-?Ray.+AVC|UHD.+blu-?ray.+HEVC|MiniBD',
+  },
+  {
+    title: 'Remux',
+    value: 'Remux',
+  },
+  {
+    title: 'BluRay',
+    value: 'Blu-?Ray',
+  },
+  {
+    title: 'UHD',
+    value: 'UHD|UltraHD',
+  },
+  {
+    title: 'WEB-DL',
+    value: 'WEB-?DL|WEB-?RIP',
+  },
+  {
+    title: 'HDTV',
+    value: 'HDTV',
+  },
+  {
+    title: 'H265',
+    value: '[Hx].?265|HEVC',
+  },
+  {
+    title: 'H264',
+    value: '[Hx].?264|AVC',
+  },
+])
+
+// 分辨率选择框数据
+const resolutionOptions = ref([
+  {
+    title: '全部',
+    value: '',
+  },
+  {
+    title: '8K',
+    value: '8K|4320p|x4320',
+  },
+  {
+    title: '4k',
+    value: '4K|2160p|x2160',
+  },
+  {
+    title: '1080p',
+    value: '1080[pi]|x1080',
+  },
+  {
+    title: '720p',
+    value: '720[pi]|x720',
+  },
+])
+
+// 特效选择框数据
+const effectOptions = ref([
+  {
+    title: '全部',
+    value: '',
+  },
+  {
+    title: '杜比视界',
+    value: 'Dolby[\\s.]+Vision|DOVI|[\\s.]+DV[\\s.]+',
+  },
+  {
+    title: '杜比全景声',
+    value: 'Dolby[\\s.]*\\+?Atmos|Atmos',
+  },
+  {
+    title: 'HDR',
+    value: '[\\s.]+HDR[\\s.]+|HDR10|HDR10\\+',
+  },
+])
 </script>
 
 <template>
@@ -332,6 +416,7 @@ const dropdownItems = ref([
     <!-- Dialog Content -->
     <VCard :title="`订阅 - ${props.media?.name}`">
       <VCardText class="pt-2">
+        <DialogCloseBtn @click="subscribeInfoDialog = false" />
         <VForm @submit.prevent="() => {}">
           <VRow>
             <VCol
@@ -366,6 +451,38 @@ const dropdownItems = ref([
               />
             </VCol>
           </VRow>
+          <VRow>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.quality"
+                label="质量"
+                :items="qualityOptions"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.resolution"
+                label="分辨率"
+                :items="resolutionOptions"
+              />
+            </VCol>
+            <VCol
+              cols="12"
+              md="4"
+            >
+              <VSelect
+                v-model="subscribeForm.effect"
+                label="特效"
+                :items="effectOptions"
+              />
+            </VCol>
+          </VRow>
           <VRow>
             <VCol
               cols="12"

src/components/cards/TorrentCard.vue

@@ -176,7 +176,7 @@ onMounted(() => {
                   <template #prepend>
                     <VIcon icon="mdi-download" />
                   </template>
-                  <VListItemTitle>下载种子</VListItemTitle>
+                  <VListItemTitle>下载种子文件</VListItemTitle>
                 </VListItem>
               </VList>
             </VMenu>

src/components/cards/TorrentItem.vue

@@ -0,0 +1,248 @@
+<script lang="ts" setup>
+import type { PropType } from 'vue'
+import { useToast } from 'vue-toast-notification'
+import { useConfirm } from 'vuetify-use-dialog'
+import { formatFileSize } from '@/@core/utils/formatters'
+import api from '@/api'
+import { doneNProgress, startNProgress } from '@/api/nprogress'
+import type { Context } from '@/api/types'
+
+// 输入参数
+const props = defineProps({
+  torrent: Object as PropType<Context>,
+})
+
+// 提示框
+const $toast = useToast()
+
+// 确认框
+const createConfirm = useConfirm()
+
+// 更多来源界面
+const showMoreTorrents = ref(false)
+
+// 种子信息
+const torrent = ref(props.torrent?.torrent_info)
+
+// 媒体信息
+const media = ref(props.torrent?.media_info)
+
+// 识别元数据
+const meta = ref(props.torrent?.meta_info)
+
+// 站点图标
+const siteIcon = ref('')
+
+// 查询站点图标
+async function getSiteIcon() {
+  try {
+    siteIcon.value = (await api.get(`site/icon/${torrent?.value?.site}`)).data.icon
+  }
+  catch (error) {
+    console.error(error)
+  }
+}
+
+// 询问并添加下载
+async function handleAddDownload(_site: any = undefined,
+  _media: any = undefined,
+  _torrent: any = undefined) {
+  if (!_media || !_torrent || !_site) {
+    _site = torrent.value?.site_name
+    _media = media.value
+    _torrent = torrent.value
+  }
+
+  const isConfirmed = await createConfirm({
+    title: '确认',
+    content: `是否确认下载【${_site}】${_torrent?.title} ?`,
+    confirmationText: '确认',
+    cancellationText: '取消',
+    dialogProps: {
+      maxWidth: '50rem',
+    },
+  })
+
+  if (!isConfirmed)
+    return
+
+  addDownload(_media, _torrent)
+}
+
+// 添加下载
+async function addDownload(_media: any, _torrent: any) {
+  startNProgress()
+  try {
+    const result: { [key: string]: any } = await api.post('download/', {
+      media_in: _media,
+      torrent_in: _torrent,
+    })
+
+    if (result.success) {
+      // 添加下载成功
+      $toast.success(`${_torrent?.site_name} ${_torrent?.title} 添加下载成功！`)
+    }
+    else {
+      // 添加下载失败
+      $toast.error(`${_torrent?.site_name} ${_torrent?.title} 添加下载失败！`)
+    }
+  }
+  catch (error) {
+    console.error(error)
+  }
+  doneNProgress()
+}
+
+// 打开种子详情页面
+function openTorrentDetail() {
+  window.open(torrent.value?.page_url, '_blank')
+}
+
+// 下载种子文件
+async function downloadTorrentFile() {
+  window.open(torrent.value?.enclosure, '_blank')
+}
+
+// 促销Chip类
+function getVolumeFactorClass(downloadVolume: number, uploadVolume: number) {
+  if (downloadVolume === 0)
+    return 'text-white bg-lime-500'
+  else if (downloadVolume < 1)
+    return 'text-white bg-green-500'
+  else if (uploadVolume !== 1)
+    return 'text-white bg-sky-500'
+  else
+    return 'text-white bg-gray-500'
+}
+
+// 装载时查询站点图标
+onMounted(() => {
+  getSiteIcon()
+})
+</script>
+
+<template>
+  <VListItem @click="handleAddDownload">
+    <template
+      v-if="!showMoreTorrents"
+      #prepend
+    >
+      <VAvatar
+        class="rounded"
+        variant="flat"
+        @click.stop="openTorrentDetail"
+      >
+        <VImg :src="siteIcon" />
+      </VAvatar>
+    </template>
+    <VListItemTitle class="break-words overflow-visible whitespace-break-spaces">
+      {{ torrent?.title }}
+      <span class="text-green-700 ms-2 text-sm">↑{{ torrent?.seeders }}</span>
+      <span class="text-orange-700 ms-2 text-sm">↓{{ torrent?.peers }}</span>
+    </VListItemTitle>
+    <VListItemSubtitle>
+      {{ torrent?.description }}
+    </VListItemSubtitle>
+    <div
+      v-if="torrent?.labels"
+      class="pt-2"
+    >
+      <VChip
+        v-for="(label, index) in torrent?.labels"
+        :key="index"
+        variant="elevated"
+        size="small"
+        color="primary"
+        class="me-1 mb-1"
+      >
+        {{ label }}
+      </VChip>
+      <VChip
+        v-if="meta?.edition"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-red-500"
+      >
+        {{ meta?.edition }}
+      </VChip>
+      <VChip
+        v-if="meta?.resource_pix"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-red-500"
+      >
+        {{ meta?.resource_pix }}
+      </VChip>
+      <VChip
+        v-if="meta?.video_encode"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-orange-500"
+      >
+        {{ meta?.video_encode }}
+      </VChip>
+      <VChip
+        v-if="torrent?.size"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-yellow-500"
+      >
+        {{ formatFileSize(torrent?.size) }}
+      </VChip>
+      <VChip
+        v-if="meta?.resource_team"
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1 text-white bg-cyan-500"
+      >
+        {{ meta?.resource_team }}
+      </VChip>
+      <VChip
+        v-if="torrent?.downloadvolumefactor !== 1 || torrent?.uploadvolumefactor !== 1"
+        :class="
+          getVolumeFactorClass(torrent?.downloadvolumefactor, torrent?.uploadvolumefactor)
+        "
+        variant="elevated"
+        size="small"
+        class="me-1 mb-1"
+      >
+        {{ torrent?.volume_factor }}
+      </VChip>
+    </div>
+    <template #append>
+      <div class="me-n3">
+        <IconBtn>
+          <VIcon
+            icon="mdi-dots-vertical"
+          />
+          <VMenu
+            activator="parent"
+            close-on-content-click
+          >
+            <VList>
+              <VListItem
+                variant="plain"
+                @click="openTorrentDetail()"
+              >
+                <template #prepend>
+                  <VIcon icon="mdi-information" />
+                </template>
+                <VListItemTitle>查看详情</VListItemTitle>
+              </VListItem>
+              <VListItem
+                v-if="props.torrent?.torrent_info?.enclosure?.startsWith('http')"
+                variant="plain"
+                @click="downloadTorrentFile()"
+              >
+                <template #prepend>
+                  <VIcon icon="mdi-download" />
+                </template>
+                <VListItemTitle>下载种子文件</VListItemTitle>
+              </VListItem>
+            </VList>
+          </VMenu>
+        </IconBtn>
+      </div>
+    </template>
+  </VListItem>
+</template>

src/components/filebrowser/List.vue

@@ -622,6 +622,7 @@ onMounted(() => {
       </IconBtn>
     </template>
     <VCard :title="`文件整理 - ${currentItem?.name}`">
+      <DialogCloseBtn @click="transferPopper = false" />
       <VCardText class="pt-2">
         <VForm @submit.prevent="() => {}">
           <VRow>
@@ -648,6 +649,8 @@ onMounted(() => {
                   { title: '复制', value: 'copy' },
                   { title: '硬链接', value: 'link' },
                   { title: '软链接', value: 'softlink' },
+                  { title: 'Rclone复制', value: 'rclone_copy' },
+                  { title: 'Rclone移动', value: 'rclone_move' },
                 ]"
               />
             </VCol>
@@ -669,6 +672,7 @@ onMounted(() => {
             >
               <VTextField
                 v-model="transferForm.tmdbid"
+                :disabled="transferForm.type_name === ''"
                 label="TMDBID"
                 placeholder="留空自动识别"
                 :rules="[numberValidator]"

src/components/render/FormRender.vue

@@ -5,6 +5,7 @@ import { type PropType, ref } from 'vue'
 interface RenderProps {
   component: string
   text: string
+  html: string
   content?: any
   props?: any
 }
@@ -16,9 +17,10 @@ const elementProps = defineProps({
 })
 
 // 配置元素
-const formItem = ref<RenderProps>(elementProps.config || {
+const formItem = ref<RenderProps>(elementProps.config ?? {
   component: 'div',
   text: '',
+  html: '',
   props: {},
   content: [],
 })
@@ -30,6 +32,7 @@ const formData = ref<any>(elementProps.form || {})
 <template>
   <Component
     :is="formItem.component"
+    v-if="!formItem.html"
     v-bind="formItem.props"
     v-model="formData[formItem.props?.model || '']"
   >
@@ -42,4 +45,10 @@ const formData = ref<any>(elementProps.form || {})
       :form="formData"
     />
   </Component>
+  <Component
+    :is="formItem.component"
+    v-if="formItem.html"
+    v-bind="formItem.props"
+    v-html="formItem.html"
+  />
 </template>

src/components/render/PageRender.vue

@@ -13,11 +13,10 @@ interface RenderProps {
 // 输入参数
 const elementProps = defineProps({
   config: Object as PropType<RenderProps>,
-  handler: Boolean,
 })
 
 // 配置元素
-const formItem = ref<RenderProps>(elementProps.config || {
+const formItem = ref<RenderProps>(elementProps.config ?? {
   component: 'div',
   text: '',
   html: '',

src/layouts/components/SearchBar.vue

@@ -8,6 +8,9 @@ const searchWord = ref<string>('')
 // 搜索弹窗
 const searchDialog = ref(false)
 
+// ref
+const searchWordInput = ref<HTMLElement | null>(null)
+
 // Search
 function search() {
   if (!searchWord.value)
@@ -21,6 +24,14 @@ function search() {
     },
   })
 }
+
+// 打开搜索弹窗
+function openSearchDialog() {
+  searchDialog.value = true
+  nextTick(() => {
+    searchWordInput.value?.focus()
+  })
+}
 </script>
 
 <template>
@@ -34,23 +45,16 @@ function search() {
       max-width="50rem"
       transition="dialog-top-transition"
     >
-      <!-- Dialog Activator -->
-      <template #activator="{ props }">
-        <IconBtn
-          class="d-lg-none"
-          v-bind="props"
-        >
-          <VIcon icon="mdi-magnify" />
-        </IconBtn>
-      </template>
       <!-- Dialog Content -->
       <VCard title="搜索">
         <VCardText>
           <VRow>
             <VCol cols="12">
               <VTextField
+                ref="searchWordInput"
                 v-model="searchWord"
                 label="电影、电视剧名称"
+                @keydown.enter="search"
               />
             </VCol>
           </VRow>
@@ -60,7 +64,6 @@ function search() {
           <VSpacer />
           <VBtn
             @click="search"
-            @keydown.enter="search"
           >
             搜索
           </VBtn>
@@ -68,7 +71,13 @@ function search() {
       </VCard>
     </VDialog>
   </div>
-
+  <!-- 👉 Search Icon -->
+  <IconBtn
+    class="d-lg-none"
+    @click="openSearchDialog"
+  >
+    <VIcon icon="mdi-magnify" />
+  </IconBtn>
   <!-- 👉 Search Textfield -->
   <span class="w-1/5">
     <VTextField

src/main.ts

@@ -10,7 +10,7 @@ import store from '@/store'
 import '@core/scss/template/index.scss'
 import '@layouts/styles/index.scss'
 import '@styles/styles.scss'
-import 'vue-toast-notification/dist/theme-default.css'
+import 'vue-toast-notification/dist/theme-bootstrap.css'
 import { removeEl } from '@/util'
 
 loadFonts()

src/pages/ranking.vue

@@ -28,6 +28,12 @@ import MediaCardSlideView from '@/views/discover/MediaCardSlideView.vue'
       title="热门电视剧"
     />
 
+    <MediaCardSlideView
+      apipath="douban/tv_animation"
+      linkurl="/browse/douban/tv_animation?title=热门动漫"
+      title="热门动漫"
+    />
+
     <MediaCardSlideView
       apipath="douban/movies"
       linkurl="/browse/douban/movies?title=最新电影"

src/pages/resource.vue

@@ -1,5 +1,9 @@
 <script setup lang="ts">
+import api from '@/api'
+import type { Context } from '@/api/types'
+import store from '@/store'
 import TorrentCardListView from '@/views/discover/TorrentCardListView.vue'
+import TorrentRowListView from '@/views/discover/TorrentRowListView.vue'
 
 // 路由参数
 const route = useRoute()
@@ -12,14 +16,128 @@ const type = route.query?.type?.toString() ?? ''
 
 // 搜索字段
 const area = route.query?.area?.toString() ?? ''
+
+// 视图类型，从localStorage中读取
+const viewType = ref<string>(localStorage.getItem('MPTorrentsViewType') ?? 'card')
+
+// 数据列表
+const dataList = ref<Array<Context>>([])
+
+// 是否刷新过
+const isRefreshed = ref(false)
+
+// 加载进度文本
+const progressText = ref('')
+
+// 加载进度
+const progressValue = ref(0)
+
+// 加载进度SSE
+const progressEventSource = ref<EventSource>()
+
+// 使用SSE监听加载进度
+function startLoadingProgress() {
+  progressText.value = '正在搜索，请稍候...'
+
+  const token = store.state.auth.token
+
+  progressEventSource.value = new EventSource(
+    `${import.meta.env.VITE_API_BASE_URL}system/progress/search?token=${token}`,
+  )
+  progressEventSource.value.onmessage = (event) => {
+    const progress = JSON.parse(event.data)
+    if (progress) {
+      progressText.value = progress.text
+      progressValue.value = progress.value
+    }
+  }
+}
+
+// 停止监听加载进度
+function stopLoadingProgress() {
+  progressEventSource.value?.close()
+}
+
+// 设置视图类型
+function setViewType(type: string) {
+  localStorage.setItem('MPTorrentsViewType', type)
+  viewType.value = type
+}
+
+// 获取搜索列表数据
+async function fetchData() {
+  try {
+    if (!keyword) {
+      // 查询上次搜索结果
+      dataList.value = await api.get('search/last')
+    }
+    else {
+      startLoadingProgress()
+      // 优先按TMDBID精确查询
+      if (keyword?.startsWith('tmdb:') || keyword?.startsWith('douban:')) {
+        dataList.value = await api.get(`search/media/${keyword}`, {
+          params: {
+            mtype: type,
+            area,
+          },
+        })
+      }
+      else {
+        // 按标题模糊查询
+        dataList.value = await api.get(`search/title/${keyword}`)
+      }
+      stopLoadingProgress()
+    }
+    // 标记已刷新
+    isRefreshed.value = true
+  }
+  catch (error) {
+    console.error(error)
+    return Promise.reject(error)
+  }
+}
+
+// 加载数据
+onMounted(() => {
+  fetchData()
+})
 </script>
 
 <template>
-  <div>
+  <div v-if="!isRefreshed" class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center">
+    <VProgressCircular v-if="!keyword" size="48" indeterminate color="primary" />
+    <VProgressCircular v-if="keyword" class="mb-3" color="primary" :model-value="progressValue" size="64" />
+    <span>{{ progressText }}</span>
+  </div>
+  <NoDataFound
+    v-if="dataList.length === 0 && isRefreshed"
+    error-code="404"
+    error-title="没有资源"
+    error-description="没有搜索到符合条件的资源。"
+  />
+  <div v-if="dataList.length > 0">
+    <TorrentRowListView
+      v-if="viewType === 'list'"
+      :items="dataList"
+    />
     <TorrentCardListView
-      :keyword="keyword"
+      v-else
-      :type="type"
+      :items="dataList"
-      :area="area"
     />
   </div>
+  <!-- 视图切换 -->
+  <span v-if="dataList.length > 0" class="fixed right-5 bottom-5">
+    <VBtn
+      v-if="viewType === 'list'"
+      icon="mdi-view-grid"
+      color="primary"
+      @click="setViewType('card')"
+    />
+    <VBtn
+      v-else
+      icon="mdi-view-list"
+      color="primary"
+      @click="setViewType('list')"
+    />
+  </span>
 </template>

src/router/index.ts

@@ -103,6 +103,7 @@ const router = createRouter({
           component: () => import('../pages/browse.vue'),
           props: true,
           meta: {
+            keepAlive: true,
             requiresAuth: true,
           },
         },
@@ -111,6 +112,7 @@ const router = createRouter({
           component: () => import('../pages/credits.vue'),
           props: true,
           meta: {
+            keepAlive: true,
             requiresAuth: true,
           },
         },

src/views/discover/TorrentCardListView.vue

@@ -1,66 +1,33 @@
 <script lang="ts" setup>
 import { ref } from 'vue'
 import _ from 'lodash'
-import api from '@/api'
 import type { Context } from '@/api/types'
 import TorrentCard from '@/components/cards/TorrentCard.vue'
-import NoDataFound from '@/components/NoDataFound.vue'
-import store from '@/store'
-
-// 定义输入参数
-const props = defineProps({
-  // 关键字或TMDBID
-  keyword: String,
-
-  // 类型
-  type: String,
-
-  // 搜索字段
-  area: String,
-})
 
 interface SearchTorrent extends Context {
   more?: Array<Context>
 }
 
-// 数据列表
+// 定义输入参数
-const dataList = ref <Array<SearchTorrent>>([])
+const props = defineProps({
-
+  // 数据列表
-// 分组后的数据列表
+  items: Array as PropType<SearchTorrent[]>,
-const groupedDataList = ref<Map<string, Context[]>>()
+})
-
-// 是否刷新过
-const isRefreshed = ref(false)
-
-// 加载进度文本
-const progressText = ref('')
-
-// 加载进度
-const progressValue = ref(0)
-
-// 加载进度SSE
-const progressEventSource = ref<EventSource>()
 
 // 过滤表单
 const filterForm = reactive({
   // 站点
   site: [] as string[],
-
   // 季
   season: [] as string[],
-
   // 制作组
   releaseGroup: [] as string[],
-
   // 视频编码
   videoCode: [] as string[],
-
   // 促销状态
   freeState: [] as string[],
-
   // 质量
   edition: [] as string[],
-
   // 分辨率
   resolution: [] as string[],
 })
@@ -80,110 +47,13 @@ const editionFilterOptions = ref<Array<string>>([])
 // 获取分辨率过滤选项
 const resolutionFilterOptions = ref<Array<string>>([])
 
-// 按过滤项过滤卡片
+// 数据列表
-watchEffect(() => {
+const dataList = ref <Array<SearchTorrent>>([])
-  // 清空数据
-  dataList.value.splice(0)
 
-  const match = (filter: Array<string>, value: string | undefined) =>
+// 分组后的数据列表
-    filter.length === 0 || (value && filter.includes(value))
+const groupedDataList = ref<Map<string, Context[]>>()
-
-  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 = _.cloneDeepWith(matchData[0]) as SearchTorrent
-        if (matchData.length > 1)
-          firstData.more = matchData.slice(1)
-
-        dataList.value.push(firstData)
-      }
-    }
-  })
-})
-
-// 获取订阅列表数据
-async function fetchData(): Promise<Array<Context>> {
-  try {
-    let searchData: Array<Context>
-    const keyword = props.keyword ?? ''
-    const mtype = props.type ?? ''
-    const area = props.area ?? ''
-    if (!keyword) {
-      // 查询上次搜索结果
-      searchData = await api.get('search/last')
-    }
-    else {
-      startLoadingProgress()
-      // 优先按TMDBID精确查询
-      if (props.keyword?.startsWith('tmdb:') || props.keyword?.startsWith('douban:')) {
-        searchData = await api.get(`search/media/${props.keyword}`, {
-          params: {
-            mtype,
-            area,
-          },
-        })
-      }
-      else {
-        // 按标题模糊查询
-        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 initData() {
-  // load data
-  fetchData().then((data) => {
-    const groupMap = new Map<string, Context[]>()
-
-    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
-  })
-}
 
+// 初始化过滤选项
 function initOptions(data: Context) {
   const { torrent_info, meta_info } = data
   const optionValue = (options: Array<string>, value: string | undefined) => {
@@ -198,31 +68,69 @@ function initOptions(data: Context) {
   optionValue(resolutionFilterOptions.value, meta_info?.resource_pix)
 }
 
-// 使用SSE监听加载进度
+// 计算分组后的列表
-function startLoadingProgress() {
+watchEffect(() => {
-  progressText.value = '正在搜索，请稍候...'
+  // 数据分组
-
+  const groupMap = new Map<string, Context[]>()
-  const token = store.state.auth.token
+  // 遍历数据
-
+  props.items?.forEach((item) => {
-  progressEventSource.value = new EventSource(
+    const { torrent_info } = item
-    `${import.meta.env.VITE_API_BASE_URL}system/progress/search?token=${token}`,
+    // init options
-  )
+    initOptions(item)
-  progressEventSource.value.onmessage = (event) => {
+    // group data
-    const progress = JSON.parse(event.data)
+    const key = `${torrent_info.title}_${torrent_info.size}`
-    if (progress) {
+    if (groupMap.has(key)) {
-      progressText.value = progress.text
+      // 已存在相同标题和大小的分组，将当前上下文信息添加到分组中
-      progressValue.value = progress.value
+      const group = groupMap.get(key)
+      group?.push(item)
     }
-  }
+    else {
-}
+      // 创建新的分组，并将当前上下文信息添加到分组中
+      groupMap.set(key, [item])
+    }
+  })
+  groupedDataList.value = groupMap
+})
 
-// 停止监听加载进度
+// 计算过滤后的列表
-function stopLoadingProgress() {
+watchEffect(() => {
-  progressEventSource.value?.close()
+  // 清空列表
-}
+  dataList.value.splice(0)
+  // 匹配过滤函数
+  const match = (filter: Array<string>, value: string | undefined) =>
+    filter.length === 0 || (value && filter.includes(value))
 
-// 加载时获取数据
+  groupedDataList.value?.forEach((value) => {
-onMounted(initData)
+    if (value.length > 0) {
+      const matchData = value.filter((data) => {
+        const { meta_info, torrent_info } = data
+        // 季、制作组、视频编码
+        return (
+          // 站点过滤
+          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)
+        )
+      })
+      if (matchData.length > 0) {
+        const firstData = _.cloneDeepWith(matchData[0]) as SearchTorrent
+        if (matchData.length > 1)
+          firstData.more = matchData.slice(1)
+        dataList.value.push(firstData)
+      }
+    }
+  })
+})
 </script>
 
 <template>
@@ -307,20 +215,14 @@ onMounted(initData)
       </VCol>
     </VRow>
   </VCard>
-  <div v-if="!isRefreshed" class="mt-12 w-full text-center text-gray-500 text-sm flex flex-col items-center">
+  <div class="grid gap-3 grid-torrent-card items-start">
-    <VProgressCircular v-if="!props.keyword" size="48" indeterminate color="primary" />
+    <TorrentCard
-    <VProgressCircular v-if="props.keyword" class="mb-3" color="primary" :model-value="progressValue" size="64" />
+      v-for="(item, index) in dataList"
-    <span>{{ progressText }}</span>
+      :key="`${index}_${item.torrent_info.title}_${item.torrent_info.site}`"
+      :torrent="item"
+      :more="item.more"
+    />
   </div>
-  <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_name}_${data.torrent_info.page_url}`" :torrent="data" :more="data.more" />
-  </div>
-  <NoDataFound
-    v-if="dataList.length === 0 && isRefreshed"
-    error-code="404"
-    error-title="没有资源"
-    error-description="没有搜索到符合条件的资源。"
-  />
 </template>
 
 <style lang="scss">

src/views/discover/TorrentRowListView.vue

@@ -0,0 +1,245 @@
+<script lang="ts" setup>
+import type { Context } from '@/api/types'
+import TorrentItem from '@/components/cards/TorrentItem.vue'
+
+// 定义输入参数
+const props = defineProps({
+  // 数据列表
+  items: Array as PropType<Context[]>,
+})
+
+// 过滤表单
+const filterForm = reactive({
+  // 站点
+  site: [] as string[],
+  // 季
+  season: [] as string[],
+  // 制作组
+  releaseGroup: [] as string[],
+  // 视频编码
+  videoCode: [] as string[],
+  // 促销状态
+  freeState: [] as string[],
+  // 质量
+  edition: [] as string[],
+  // 分辨率
+  resolution: [] as string[],
+})
+
+// 数据列表
+const dataList = ref <Array<Context>>([])
+
+// 获取站点过滤选项
+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>>([])
+
+// 初始化过滤选项
+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)
+}
+
+// 计算过滤后的列表
+watchEffect(() => {
+  // 清空列表
+  dataList.value.splice(0)
+  // 匹配过滤函数
+  const match = (filter: Array<string>, value: string | undefined) =>
+    filter.length === 0 || (value && filter.includes(value))
+
+  props.items?.forEach((data) => {
+    const { meta_info, torrent_info } = data
+    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)
+    )
+      dataList.value.push(data)
+  })
+})
+
+// 初始化过滤选项
+onMounted(() => {
+  props.items?.forEach((item) => {
+    initOptions(item)
+  })
+})
+</script>
+
+<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">
+          <VListItemTitle>没有附合当前过滤条件的资源。</VListItemTitle>
+        </VListItem>
+      </VList>
+    </VCol>
+    <VCol
+      xl="2"
+      md="3"
+      class="d-none d-md-block"
+    >
+      <VList lines="one" class="rounded">
+        <VListSubheader v-if="siteFilterOptions.length > 0">
+          站点
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.site" column multiple>
+            <VChip
+              v-for="site in siteFilterOptions"
+              :key="site"
+              :color="filterForm.site.includes(site) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="site"
+            >
+              {{ site }}
+            </VChip>
+          </VChipGroup>
+        </VListItem>
+        <VListSubheader v-if="editionFilterOptions.length > 0">
+          质量
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.edition" column multiple>
+            <VChip
+              v-for="edition in editionFilterOptions"
+              :key="edition"
+              :color="filterForm.edition.includes(edition) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="edition"
+            >
+              {{ edition }}
+            </VChip>
+          </VChipGroup>
+        </VListItem>
+        <VListSubheader v-if="resolutionFilterOptions.length > 0">
+          分辨率
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.resolution" column multiple>
+            <VChip
+              v-for="resolution in resolutionFilterOptions"
+              :key="resolution"
+              :color="filterForm.resolution.includes(resolution) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="resolution"
+            >
+              {{ resolution }}
+            </VChip>
+          </vchipgroup>
+        </VListItem>
+        <VListSubheader v-if="releaseGroupFilterOptions.length > 0">
+          制作组
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.releaseGroup" column multiple>
+            <VChip
+              v-for="releaseGroup in releaseGroupFilterOptions"
+              :key="releaseGroup"
+              :color="filterForm.releaseGroup.includes(releaseGroup) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="releaseGroup"
+            >
+              {{ releaseGroup }}
+            </VChip>
+          </vchipgroup>
+        </VListItem>
+        <VListSubheader v-if="videoCodeFilterOptions.length > 0">
+          视频编码
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.videoCode" column multiple>
+            <VChip
+              v-for="videoCode in videoCodeFilterOptions"
+              :key="videoCode"
+              :color="filterForm.videoCode.includes(videoCode) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="videoCode"
+            >
+              {{ videoCode }}
+            </VChip>
+          </vchipgroup>
+        </VListItem>
+        <VListSubheader v-if="freeStateFilterOptions.length > 0">
+          促销状态
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.freeState" column multiple>
+            <VChip
+              v-for="freeState in freeStateFilterOptions"
+              :key="freeState"
+              :color="filterForm.freeState.includes(freeState) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="freeState"
+            >
+              {{ freeState }}
+            </VChip>
+          </vchipgroup>
+        </VListItem>
+        <VListSubheader v-if="seasonFilterOptions.length > 0">
+          季集
+        </VListSubheader>
+        <VListItem>
+          <VChipGroup v-model="filterForm.season" column multiple>
+            <VChip
+              v-for="season in seasonFilterOptions"
+              :key="season"
+              :color="filterForm.season.includes(season) ? 'primary' : ''"
+              filter
+              variant="outlined"
+              :value="season"
+            >
+              {{ season }}
+            </VChip>
+          </VChipGroup>
+        </VListItem>
+      </VList>
+    </VCol>
+  </VRow>
+</template>

src/views/reorganize/TransferHistoryView.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
-import { numberValidator, requiredValidator } from '@/@validators'
+import { numberValidator } from '@/@validators'
 import api from '@/api'
 import type { TransferHistory } from '@/api/types'
 import TmdbSelectorCard from '@/components/cards/TmdbSelectorCard.vue'
@@ -20,6 +20,7 @@ const redoType = ref('电影')
 
 // 类型下拉框：电影、电视剧
 const redoTypeItems = ref([
+  { title: '自动', value: '' },
   { title: '电影', value: '电影' },
   { title: '电视剧', value: '电视剧' },
 ])
@@ -127,6 +128,8 @@ const TransferDict: { [key: string]: string } = {
   move: '移动',
   link: '硬链接',
   softlink: '软链接',
+  rclone_copy: 'Rclone复制',
+  rclone_move: 'Rclone移动',
 }
 
 // 删除历史记录
@@ -211,32 +214,35 @@ async function deleteConfirmHandler(deleteSrc: boolean, deleteDest: boolean) {
 async function removeHistoryBatch() {
   if (selected.value.length === 0)
     return
+  // 清空当前操作记录
   currentHistory.value = undefined
   confirmTitle.value = `确认删除 ${selected.value.length} 条记录 ?`
+  // 打开确认弹窗
   deleteConfirmDialog.value = true
 }
 
-// 重新整理
+// 批量重新整理
-async function rehandleHistory() {
+async function retransferBatch() {
+  if (selected.value.length === 0)
+    return
+  // 清空当前操作记录
+  currentHistory.value = undefined
+  // 打开识别弹窗
+  redoType.value = ''
+  redoTmdbId.value = ''
+  redoDialog.value = true
+}
+
+// 调API重新整理
+async function retransfer(item: TransferHistory, redoType = '', redoTmdbId = 0) {
   try {
-    if (!redoTmdbId.value || !redoType.value)
-      return
-
-    redoDialog.value = false
-    $toast.info(`正在重新整理 ${currentHistory.value?.title} ...`)
-
-    // 调用API接口重新转移
-    const requestData = {
-      ...currentHistory.value,
-    }
-
     const result: { [key: string]: any } = await api.post(
       'history/transfer',
-      requestData,
+      item,
       {
         params: {
-          mtype: redoType.value,
+          mtype: redoType,
-          new_tmdbid: parseInt(redoTmdbId.value),
+          new_tmdbid: redoTmdbId,
         },
       },
     )
@@ -256,6 +262,50 @@ async function rehandleHistory() {
   }
 }
 
+// 重新整理
+async function rehandleHistory() {
+  try {
+    // 关闭弹窗
+    redoDialog.value = false
+
+    let tmdbid = 0
+
+    if (redoTmdbId.value)
+      tmdbid = parseInt(redoTmdbId.value)
+
+    // 转移当前选中记录
+    if (currentHistory.value) {
+      $toast.info(`正在重新整理 ${currentHistory.value?.title} ...`)
+      await retransfer(currentHistory.value, redoType.value, tmdbid)
+    }
+    else if (selected.value.length > 0) {
+      // 总条数
+      const total = selected.value.length
+      if (total === 0)
+        return
+      // 已处理条数
+      let handled = 0
+      // 显示进度条
+      progressDialog.value = true
+      for (const item of selected.value) {
+        progressText.value = `正在重新整理 ${item.src} ...`
+        await retransfer(item, redoType.value, tmdbid)
+        handled++
+        progressValue.value = handled / total * 100
+      }
+      // 清空选中项
+      selected.value = []
+      // 隐藏进度条
+      progressDialog.value = false
+    }
+    // 批量转移
+    else { $toast.error('没有选中任何记录！') }
+  }
+  catch (e) {
+    console.log(e)
+  }
+}
+
 // 弹出菜单
 const dropdownItems = ref([
   {
@@ -264,6 +314,8 @@ const dropdownItems = ref([
     props: {
       prependIcon: 'mdi-redo-variant',
       click: (item: TransferHistory) => {
+        redoTmdbId.value = ''
+        redoType.value = ''
         redoDialog.value = true
         currentHistory.value = item
       },
@@ -404,7 +456,6 @@ const dropdownItems = ref([
             <VSelect
               v-model="redoType"
               label="类型"
-              :rules="[requiredValidator]"
               :items="redoTypeItems"
             />
           </VCol>
@@ -412,6 +463,8 @@ const dropdownItems = ref([
             <VTextField
               v-model="redoTmdbId"
               label="TMDB编号"
+              placeholder="留空自动识别"
+              :disabled="redoType === ''"
               :rules="[numberValidator]"
               append-inner-icon="mdi-magnify"
               @click:append-inner.stop="tmdbSelectorDialog = true"
@@ -432,6 +485,13 @@ const dropdownItems = ref([
     </VCard>
   </VDialog>
   <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"
@@ -476,9 +536,9 @@ const dropdownItems = ref([
       <VCardTitle class="pe-10">
         {{ confirmTitle }}
       </VCardTitle>
-      <div class="d-flex  flex-column flex-md-row justify-center my-3">
+      <div class="d-flex  flex-column flex-lg-row justify-center my-3">
         <VBtn
-          color="info"
+          color="primary"
           class="mb-2 mx-2"
           @click="deleteConfirmHandler(false, false)"
         >
@@ -487,6 +547,13 @@ const dropdownItems = ref([
         <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)"
         >
           删除历史记录和媒体库文件

src/views/setting/AccountSettingSearch.vue

@@ -148,6 +148,48 @@ async function saveSelectedSites() {
   }
 }
 
+// 上调优先级
+function onLevelUp(pri: string) {
+  // 找到当前卡片
+  const card = filterCards.value.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的上一张卡片
+  const prevCard = filterCards.value.find(card => card.pri === (parseInt(pri) - 1).toString())
+  if (!prevCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = prevCard.pri
+  prevCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.value.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
+// 下调优先级
+function onLevelDown(pri: string) {
+  // 找到当前卡片
+  const card = filterCards.value.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的下一张卡片
+  const nextCard = filterCards.value.find(card => card.pri === (parseInt(pri) + 1).toString())
+  if (!nextCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = nextCard.pri
+  nextCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.value.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
 onMounted(() => {
   queryCustomFilters()
   querySites()
@@ -191,9 +233,12 @@ onMounted(() => {
               v-for="(card, index) in filterCards"
               :key="index"
               :pri="card.pri"
+              :maxpri="filterCards.length.toString()"
               :rules="card.rules"
               @changed="updateFilterCardValue"
               @close="filterCardClose(card.pri)"
+              @leveldown="onLevelDown"
+              @levelup="onLevelUp"
             />
           </div>
         </VCardItem>

src/views/setting/AccountSettingService.vue

@@ -40,8 +40,6 @@ function getSchedulerColor(status: string) {
 
 // 执行命令
 function runCommand(id: string) {
-  // 取id|前面的命令
-  id = id.split('|')[0]
   try {
     // 异步提交
     api.get('system/runscheduler', {
@@ -115,7 +113,7 @@ onUnmounted(() => {
           </td>
           <td>
             <VBtn
-              small
+              size="small"
               :disabled="scheduler.status === '正在运行'"
               @click="runCommand(scheduler.id)"
             >

src/views/setting/AccountSettingSubscribe.vue

@@ -165,6 +165,48 @@ function addFilterCard(ruleType: string) {
   cards.value.push(newCard)
 }
 
+// 上调优先级
+function onLevelUp(filterCards: FilterCard[], pri: string) {
+  // 找到当前卡片
+  const card = filterCards.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的上一张卡片
+  const prevCard = filterCards.find(card => card.pri === (parseInt(pri) - 1).toString())
+  if (!prevCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = prevCard.pri
+  prevCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
+// 下调优先级
+function onLevelDown(filterCards: FilterCard[], pri: string) {
+  // 找到当前卡片
+  const card = filterCards.find(card => card.pri === pri)
+  if (!card)
+    return
+
+  // 找到当前卡片的下一张卡片
+  const nextCard = filterCards.find(card => card.pri === (parseInt(pri) + 1).toString())
+  if (!nextCard)
+    return
+
+  // 交换两张卡片的优先级
+  const temp = card.pri
+  card.pri = nextCard.pri
+  nextCard.pri = temp
+
+  // 卡片重新按优先级排序
+  filterCards.sort((a, b) => parseInt(a.pri) - parseInt(b.pri))
+}
+
 onMounted(() => {
   querySites()
   queryCustomFilters('SubscribeFilterRules')
@@ -209,9 +251,12 @@ onMounted(() => {
               v-for="(card, index) in subscribeFilterCards"
               :key="index"
               :pri="card.pri"
+              :maxpri="subscribeFilterCards.length.toString()"
               :rules="card.rules"
               @changed="updateFilterCardValue"
               @close="filterCardClose('SubscribeFilterRules', card.pri)"
+              @leveldown="onLevelDown(subscribeFilterCards, card.pri)"
+              @levelup="onLevelUp(subscribeFilterCards, card.pri)"
             />
           </div>
         </VCardItem>
@@ -242,9 +287,12 @@ onMounted(() => {
               v-for="(card, index) in bestVersionFilterCards"
               :key="index"
               :pri="card.pri"
+              :maxpri="bestVersionFilterCards.length.toString()"
               :rules="card.rules"
               @changed="updateFilterCardValue2"
               @close="filterCardClose('BestVersionFilterRules', card.pri)"
+              @leveldown="onLevelDown(bestVersionFilterCards, card.pri)"
+              @levelup="onLevelUp(bestVersionFilterCards, card.pri)"
             />
           </div>
         </VCardItem>

src/views/setting/AccountSettingWords.vue

@@ -11,6 +11,9 @@ const customIdentifiers = ref('')
 // 自定义制作组
 const customReleaseGroups = ref('')
 
+// 自定义占位符
+const customization = ref('')
+
 // 文件整理屏蔽词
 const transferExcludeWords = ref('')
 
@@ -42,6 +45,20 @@ async function queryCustomReleaseGroups() {
   }
 }
 
+// 查询已设置的自定义占位符
+async function queryCustomization() {
+  try {
+    const result: { [key: string]: any } = await api.get(
+      'system/setting/Customization',
+    )
+
+    customization.value = result.data?.value.join('\n')
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
 // 查询已设置的屏蔽词
 async function queryTransferExcludeWords() {
   try {
@@ -94,6 +111,25 @@ async function saveCustomReleaseGroups() {
   }
 }
 
+// 保存自定义占位符
+async function saveCustomization() {
+  try {
+    // 用户名密码
+    const result: { [key: string]: any } = await api.post(
+      'system/setting/Customization',
+      customization.value.split('\n'),
+    )
+
+    if (result.success)
+      $toast.success('自定义占位符保存成功')
+    else
+      $toast.error('自定义占位符保存失败！')
+  }
+  catch (error) {
+    console.log(error)
+  }
+}
+
 // 保存文件整理屏蔽词
 async function saveTransferExcludeWords() {
   try {
@@ -116,6 +152,7 @@ async function saveTransferExcludeWords() {
 onMounted(() => {
   queryCustomIdentifiers()
   queryCustomReleaseGroups()
+  queryCustomization()
   queryTransferExcludeWords()
 })
 </script>
@@ -166,6 +203,26 @@ onMounted(() => {
         </VCardItem>
       </VCard>
     </VCol>
+    <VCol cols="12">
+      <VCard title="自定义占位符">
+        <VCardSubtitle> 添加自定义占位符识别正则，重命名格式中添加{customization}使用。 </VCardSubtitle>
+        <VCardItem>
+          <VTextarea
+            v-model="customization"
+            auto-grow
+            placeholder="多个匹配对象请换行分隔，支持正则表达式，特殊字符注意转义"
+          />
+        </VCardItem>
+        <VCardItem>
+          <VBtn
+            type="submit"
+            @click="saveCustomization"
+          >
+            保存
+          </VBtn>
+        </VCardItem>
+      </VCard>
+    </VCol>
     <VCol cols="12">
       <VCard title="文件整理屏蔽词">
         <VCardSubtitle> 目录名或文件名中包含屏蔽词时不进行整理。 </VCardSubtitle>

tailwind.config.js

@@ -12,7 +12,6 @@ module.exports = {
   },
   plugins: [
     require('@tailwindcss/aspect-ratio'),
-
     // ...
   ],
 }

yarn.lock

@@ -2409,6 +2409,14 @@
   dependencies:
     vue-demi ">=0.14.0"
 
+accepts@~1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+  dependencies:
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
+
 acorn-jsx@^5.2.0, acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
@@ -2506,6 +2514,11 @@ array-buffer-byte-length@^1.0.0:
     call-bind "^1.0.2"
     is-array-buffer "^3.0.1"
 
+array-flatten@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
+
 array-includes@^3.1.6:
   version "3.1.6"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f"
@@ -2648,6 +2661,24 @@ binary-extensions@^2.0.0:
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.4"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
 boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
@@ -2717,6 +2748,11 @@ builtins@^5.0.1:
   dependencies:
     semver "^7.0.0"
 
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
@@ -2764,20 +2800,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503:
-  version "1.0.30001481"
+  version "1.0.30001546"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001481.tgz#f58a717afe92f9e69d0e35ff64df596bfad93912"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001546.tgz"
-  integrity sha512-KCqHwRnaa1InZBtqXzP98LPg0ajCVujMKjqKDhZEthIpAsJl/YEIa3YvXjGXPVqzZVguccuu7ga9KOE1J9rKPQ==
+  integrity sha512-zvtSJwuQFpewSyRrI3AsftF6rM0X80mZkChIt1spBGEvRglCrjTniXvinc8JKRoqTwXAgvqTImaN9igfSMtUBw==
-
-caniuse-lite@^1.0.30001464:
-  version "1.0.30001509"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001509.tgz#2b7ad5265392d6d2de25cd8776d1ab3899570d14"
-  integrity sha512-2uDDk+TRiTX5hMcUYT/7CSyzMZxjfGu0vAUjS2g0LSD8UoXOv0LtpH4LxGMemsiPq6LCVIUjNwVM0erkOkGCDA==
-
-caniuse-lite@^1.0.30001503:
-  version "1.0.30001507"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001507.tgz#fae53f6286e7564783eadea9b447819410a59534"
-  integrity sha512-SFpUDoSLCaE5XYL2jfqe9ova/pbQHEmbheDf5r4diNwbAgR3qxM9NQtfsiSscjqoya5K7kFcHPUQ+VsUkIJR4A==
 
 chalk@^2.0.0:
   version "2.4.2"
@@ -2951,11 +2977,33 @@ confusing-browser-globals@^1.0.10:
   resolved "https://registry.yarnpkg.com/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz#ae40e9b57cdd3915408a2805ebd3a5585608dc81"
   integrity sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==
 
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
+  dependencies:
+    safe-buffer "5.2.1"
+
+content-type@~1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
 convert-source-map@^1.7.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.9.0.tgz#7faae62353fb4213366d0ca98358d22e8368b05f"
   integrity sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==
 
+cookie-signature@1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
+
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
+
 core-js-compat@^3.30.1, core-js-compat@^3.30.2:
   version "3.31.0"
   resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.31.0.tgz#4030847c0766cc0e803dcdfb30055d7ef2064bf1"
@@ -3127,7 +3175,14 @@ de-indent@^1.0.2:
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
   integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
 
-debug@^3.2.7:
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@^3.0.1, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -3206,6 +3261,16 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
+
 didyoumean@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/didyoumean/-/didyoumean-1.2.2.tgz#989346ffe9e839b4555ecf5666edea0d3e8ad037"
@@ -3292,6 +3357,11 @@ domutils@^3.0.1:
     domelementtype "^2.3.0"
     domhandler "^5.0.3"
 
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
+
 ejs@^3.1.6:
   version "3.1.9"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.9.tgz#03c9e8777fe12686a9effcef22303ca3d8eeb361"
@@ -3314,6 +3384,11 @@ emoji-regex@^8.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
+
 end-of-stream@^1.1.0:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -3426,6 +3501,11 @@ es-to-primitive@^1.2.1:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
+es6-promise@^4.1.1:
+  version "4.2.8"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
+  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+
 esbuild@^0.17.5:
   version "0.17.18"
   resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.17.18.tgz#f4f8eb6d77384d68cd71c53eb6601c7efe05e746"
@@ -3459,6 +3539,11 @@ escalade@^3.1.1:
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
+
 escape-string-regexp@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -3900,6 +3985,11 @@ esutils@^2.0.2:
   resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+etag@~1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
+
 execa@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -3915,6 +4005,52 @@ execa@^5.1.1:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+express-http-proxy@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/express-http-proxy/-/express-http-proxy-2.0.0.tgz#c47f4d8b53e8d9c2b9a2f1d158eedf6eb84828a5"
+  integrity sha512-TXxcPFTWVUMSEmyM6iX2sT/JtmqhqngTq29P+eXTVFdtxZrTmM8THUYK59rUXiln0FfPGvxEpGRnVrgvHksXDw==
+  dependencies:
+    debug "^3.0.1"
+    es6-promise "^4.1.1"
+    raw-body "^2.3.0"
+
+express@^4.18.2:
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
+  dependencies:
+    accepts "~1.3.8"
+    array-flatten "1.1.1"
+    body-parser "1.20.1"
+    content-disposition "0.5.4"
+    content-type "~1.0.4"
+    cookie "0.5.0"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "2.0.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.2.0"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.7"
+    qs "6.11.0"
+    range-parser "~1.2.1"
+    safe-buffer "5.2.1"
+    send "0.18.0"
+    serve-static "1.15.0"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    type-is "~1.6.18"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extract-comments@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/extract-comments/-/extract-comments-1.1.0.tgz#b90bca033a056bd69b8ba1c6b6b120fc2ee95c18"
@@ -4000,6 +4136,19 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    statuses "2.0.1"
+    unpipe "~1.0.0"
+
 find-cache-dir@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
@@ -4073,11 +4222,21 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
+
 fraction.js@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
+fresh@0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
+
 fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
@@ -4391,11 +4550,29 @@ htmlparser2@^8.0.0, htmlparser2@^8.0.1:
     domutils "^3.0.1"
     entities "^4.4.0"
 
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+  dependencies:
+    depd "2.0.0"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    toidentifier "1.0.1"
+
 human-signals@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
+iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
 idb@^7.0.1:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b"
@@ -4442,7 +4619,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2:
+inherits@2, inherits@2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
@@ -4461,6 +4638,11 @@ internal-slot@^1.0.3, internal-slot@^1.0.4, internal-slot@^1.0.5:
     has "^1.0.3"
     side-channel "^1.0.4"
 
+ipaddr.js@1.9.1:
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
+
 is-alphabetical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
@@ -5051,6 +5233,11 @@ mdn-data@2.0.30:
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
   integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
 
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
+
 meow@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-9.0.0.tgz#cd9510bc5cac9dee7d03c73ee1f9ad959f4ea364"
@@ -5069,6 +5256,11 @@ meow@^9.0.0:
     type-fest "^0.18.0"
     yargs-parser "^20.2.3"
 
+merge-descriptors@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
+
 merge-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -5079,6 +5271,11 @@ merge2@^1.3.0, merge2@^1.4.1:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
+methods@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
+
 micromark@~2.11.0:
   version "2.11.4"
   resolved "https://registry.yarnpkg.com/micromark/-/micromark-2.11.4.tgz#d13436138eea826383e822449c9a5c50ee44665a"
@@ -5100,13 +5297,18 @@ mime-db@1.52.0:
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
-mime-types@^2.1.12:
+mime-types@^2.1.12, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
     mime-db "1.52.0"
 
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -5194,12 +5396,17 @@ mlly@^1.1.1, mlly@^1.2.0:
     pkg-types "^1.0.2"
     ufo "^1.1.1"
 
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.1.1:
+ms@2.1.3, ms@^2.1.1:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -5238,6 +5445,11 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
 node-fetch@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
@@ -5365,6 +5577,13 @@ object.values@^1.1.6:
     define-properties "^1.1.4"
     es-abstract "^1.20.4"
 
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
+  dependencies:
+    ee-first "1.1.1"
+
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -5494,6 +5713,11 @@ parse5@^7.0.0:
   dependencies:
     entities "^4.4.0"
 
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -5514,6 +5738,11 @@ path-parse@^1.0.7:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-to-regexp@0.1.7:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
+
 path-type@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
@@ -5929,6 +6158,14 @@ prismjs@^1.29.0:
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
   integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
 
+proxy-addr@~2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
+  dependencies:
+    forwarded "0.2.0"
+    ipaddr.js "1.9.1"
+
 proxy-from-env@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
@@ -5962,6 +6199,13 @@ purgecss@^5.0.0:
     postcss "^8.4.4"
     postcss-selector-parser "^6.0.7"
 
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -5979,6 +6223,31 @@ randombytes@^2.1.0:
   dependencies:
     safe-buffer "^5.1.0"
 
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+raw-body@^2.3.0:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -6161,7 +6430,7 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-safe-buffer@^5.1.0:
+safe-buffer@5.2.1, safe-buffer@^5.1.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -6182,6 +6451,11 @@ safe-regex@^2.1.1:
   dependencies:
     regexp-tree "~0.1.1"
 
+"safer-buffer@>= 2.1.2 < 3":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
 sass@^1.59.3:
   version "1.62.1"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.62.1.tgz#caa8d6bf098935bc92fc73fa169fb3790cacd029"
@@ -6213,6 +6487,25 @@ semver@^7.0.0, semver@^7.3.4, semver@^7.3.5, semver@^7.3.6, semver@^7.3.7, semve
   dependencies:
     lru-cache "^6.0.0"
 
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
+  dependencies:
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    fresh "0.5.2"
+    http-errors "2.0.0"
+    mime "1.6.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
+    range-parser "~1.2.1"
+    statuses "2.0.1"
+
 serialize-javascript@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
@@ -6220,6 +6513,21 @@ serialize-javascript@^4.0.0:
   dependencies:
     randombytes "^2.1.0"
 
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
+  dependencies:
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    parseurl "~1.3.3"
+    send "0.18.0"
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -6339,6 +6647,11 @@ stable@^0.1.8:
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
 stop-iteration-iterator@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz#6a60be0b4ee757d1ed5254858ec66b10c49285e4"
@@ -6816,6 +7129,11 @@ to-regex-range@^5.0.1:
   dependencies:
     is-number "^7.0.0"
 
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
 tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -6909,6 +7227,14 @@ type-fest@^3.10.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-3.10.0.tgz#d75f17a22be8816aea6315ab2739fe1c0c211863"
   integrity sha512-hmAPf1datm+gt3c2mvu0sJyhFy6lTkIGf0GzyaZWxRLnabQfPUqg6tF95RPg6sLxKI7nFLGdFxBcf2/7+GXI+A==
 
+type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
 typed-array-length@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -6997,6 +7323,11 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+
 unplugin-auto-import@^0.15.1:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/unplugin-auto-import/-/unplugin-auto-import-0.15.3.tgz#abf5f1bf42f8c181e9dd1067bd5645aad727df6e"
@@ -7075,6 +7406,11 @@ util-deprecate@^1.0.2:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
+
 v8-compile-cache@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
@@ -7088,6 +7424,11 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
+vary@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
+
 vite-plugin-pages@^0.29.0:
   version "0.29.0"
   resolved "https://registry.yarnpkg.com/vite-plugin-pages/-/vite-plugin-pages-0.29.0.tgz#8a7352cbbbc463fd2a725d67e221af8de8992c2f"