更新 package.json

fix bugs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "1.9.8-2",
+  "version": "1.9.13",
   "private": true,
   "bin": "dist/service.js",
   "scripts": {
@@ -101,4 +101,4 @@
   "resolutions": {
     "postcss": "8"
   }
-}
+}

src/ace-config.ts

@@ -10,6 +10,8 @@ import modeYamlUrl from 'ace-builds/src-noconflict/mode-yaml?url'
 
 import modeCssUrl from 'ace-builds/src-noconflict/mode-css?url'
 
+import modePythonUrl from 'ace-builds/src-noconflict/mode-python?url'
+
 import themeGithubUrl from 'ace-builds/src-noconflict/theme-github?url'
 
 import themeChromeUrl from 'ace-builds/src-noconflict/theme-chrome?url'
@@ -38,6 +40,8 @@ import snippetsJsonUrl from 'ace-builds/src-noconflict/snippets/json?url'
 
 import snippertsCssUrl from 'ace-builds/src-noconflict/snippets/css?url'
 
+import snippetsPythonUrl from 'ace-builds/src-noconflict/snippets/python?url'
+
 import 'ace-builds/src-noconflict/ext-language_tools'
 
 ace.config.setModuleUrl('ace/mode/json', modeJsonUrl)
@@ -45,6 +49,7 @@ ace.config.setModuleUrl('ace/mode/javascript', modeJavascriptUrl)
 ace.config.setModuleUrl('ace/mode/html', modeHtmlUrl)
 ace.config.setModuleUrl('ace/mode/yaml', modeYamlUrl)
 ace.config.setModuleUrl('ace/mode/css', modeCssUrl)
+ace.config.setModuleUrl('ace/mode/python', modePythonUrl)
 ace.config.setModuleUrl('ace/theme/github', themeGithubUrl)
 ace.config.setModuleUrl('ace/theme/chrome', themeChromeUrl)
 ace.config.setModuleUrl('ace/theme/monokai', themeMonokaiUrl)
@@ -59,5 +64,6 @@ ace.config.setModuleUrl('ace/snippets/javascript', snippetsJsUrl)
 ace.config.setModuleUrl('ace/snippets/javascript', snippetsYamlUrl)
 ace.config.setModuleUrl('ace/snippets/json', snippetsJsonUrl)
 ace.config.setModuleUrl('ace/snippets/css', snippertsCssUrl)
+ace.config.setModuleUrl('ace/snippets/python', snippetsPythonUrl)
 
 ace.require('ace/ext/language_tools')

src/components/cards/FilterRuleCard.vue

@@ -21,6 +21,14 @@ function filtersChanged(value: string[]) {
   emit('changed', props.pri, value)
 }
 
+// 清洗规则中的换行符和多余空格，并在前后添加空格
+const cleanedRules = computed(() => {
+  return props.rules.map(rule => {
+    rule = rule ?? ''
+    return ` ${rule.replace(/[\r\n]/g, '').replace(/\s+/g, '')} `
+  })
+})
+
 // 过滤规则下拉框
 const selectFilterOptions = ref<{ [key: string]: string }[]>([
   { title: '特效字幕', value: ' SPECSUB ' },
@@ -77,7 +85,7 @@ const selectFilterOptions = ref<{ [key: string]: string }[]>([
       <VRow>
         <VCol>
           <VSelect
-            v-model="props.rules"
+            v-model="cleanedRules"
             variant="underlined"
             :items="selectFilterOptions"
             chips

src/components/cards/SubscribeCard.vue

@@ -182,6 +182,7 @@ watch(
           'outline-dashed outline-1': props.media?.best_version && imageLoaded,
           'transition transform-cpu duration-300 scale-105 shadow-lg': hover.isHovering,
         }"
+        min-height="170"
         @click="editSubscribeDialog"
       >
         <div class="me-n3 absolute top-1 right-2">

src/components/filebrowser/FileList.vue

@@ -116,7 +116,7 @@ const transferItems = ref<FileItem[]>([])
 
 // 大小控制
 const scrollStyle = computed(() => {
-  return appMode
+  return appMode.value
     ? 'height: calc(100vh - 15.5rem - env(safe-area-inset-bottom) - 3.5rem)'
     : 'height: calc(100vh - 14.5rem - env(safe-area-inset-bottom)'
 })

src/layouts/components/SearchBar.vue

@@ -2,6 +2,7 @@
 import * as Mousetrap from 'mousetrap'
 import SearchBarView from '@/views/system/SearchBarView.vue'
 import { useDisplay } from 'vuetify'
+import { ref, computed } from 'vue'
 
 const display = useDisplay()
 
@@ -15,6 +16,14 @@ function openSearchDialog() {
   searchDialog.value = true
   return false
 }
+
+// 检测操作系统是否是Mac
+function isMac() {
+  return navigator.platform.toUpperCase().indexOf('MAC') >= 0
+}
+
+// 计算属性：根据操作系统显示不同的按键提示
+const metaKey = computed(() => (isMac() ? '⌘+K' : 'Ctrl+K'))
 </script>
 
 <template>
@@ -25,12 +34,13 @@ function openSearchDialog() {
     </IconBtn>
     <span v-if="display.lgAndUp.value" class="flex align-center text-disabled ms-2" @click="openSearchDialog">
       <span class="me-3">搜索</span>
-      <span class="meta-key">⌘K</span>
+      <span class="meta-key">{{ metaKey }}</span>
     </span>
   </div>
   <!-- 搜索弹窗 -->
   <SearchBarView v-model="searchDialog" v-if="searchDialog" @close="searchDialog = false" />
 </template>
+
 <style type="scss" scoped>
 .meta-key {
   border: thin solid rgba(var(--v-border-color), var(--v-border-opacity));
@@ -39,4 +49,4 @@ function openSearchDialog() {
   padding-block: 0.1rem;
   padding-inline: 0.25rem;
 }
-</style>
+</style>

src/views/dashboard/AnalyticsWeeklyOverview.vue

@@ -80,7 +80,13 @@ const options = controlledComputed(
             fontSize: '12px',
           },
 
-          formatter: (value: number) => (value > 999 ? (value / 1000).toFixed(0) : value),
+          formatter: (value: number) => {
+            if (value > 999) {
+              return (value / 1000).toFixed(1) + 'k'
+            } else {
+              return value.toString()
+            }
+          },
         },
       },
     }

src/views/discover/TorrentRowListView.vue

@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import type { Context } from '@/api/types'
 import TorrentItem from '@/components/cards/TorrentItem.vue'
+import { list } from 'postcss'
 import { useDisplay } from 'vuetify'
 
 // 显示器宽度
@@ -35,6 +36,13 @@ const filterForm = reactive({
   resolution: [] as string[],
 })
 
+// 列表样式
+const listStyle = computed(() => {
+  return appMode.value
+    ? 'height: calc(100vh - 7.5rem - env(safe-area-inset-bottom) - 3.5rem)'
+    : 'height: calc(100vh - 6.5rem - env(safe-area-inset-bottom)'
+})
+
 // 排序字段
 const sortField = ref('default')
 
@@ -167,14 +175,7 @@ onMounted(() => {
         </VListItem>
       </VList>
       <VList v-if="dataList.length !== 0" lines="three" class="rounded p-0 torrent-list-vscroll shadow-lg">
-        <VVirtualScroll
-          :items="dataList"
-          :style="
-            appMode
-              ? 'height: calc(100vh - 7.5rem - env(safe-area-inset-bottom) - 3.5rem)'
-              : 'height: calc(100vh - 6.5rem - env(safe-area-inset-bottom)'
-          "
-        >
+        <VVirtualScroll :items="dataList" :style="listStyle">
           <template #default="{ item }">
             <TorrentItem :torrent="item" :key="`${item.torrent_info.page_url}`" />
           </template>
@@ -182,11 +183,7 @@ onMounted(() => {
       </VList>
     </VCol>
     <VCol xl="2" md="3" v-if="display.mdAndUp.value">
-      <VList
-        lines="one"
-        class="rounded shadow-lg"
-        style="block-size: calc(100vh - 6.5rem - env(safe-area-inset-bottom))"
-      >
+      <VList lines="one" class="rounded shadow-lg" :style="listStyle">
         <VListSubheader> 排序 </VListSubheader>
         <VListItem>
           <VChipGroup column v-model="sortField">

src/views/reorganize/TransferHistoryView.vue

@@ -124,6 +124,12 @@ const TransferDict: { [key: string]: string } = {
   rclone_move: 'Rclone移动',
 }
 
+const tableStyle = computed(() => {
+  return appMode.value
+    ? 'height: calc(100vh - 15.5rem - env(safe-area-inset-bottom) - 3.5rem)'
+    : 'height: calc(100vh - 14.5rem - env(safe-area-inset-bottom)'
+})
+
 // 分页提示
 const pageTip = computed(() => {
   const begin = itemsPerPage.value * (currentPage.value - 1) + 1
@@ -142,12 +148,19 @@ const totalPage = computed(() => {
 
 // 切换页签和搜索词
 watch(
-  [() => currentPage.value, () => itemsPerPage.value, () => search.value],
+  [() => currentPage.value, () => itemsPerPage.value],
   debounce(async () => {
     reloadPage()
   }, 1000),
 )
 
+watch(
+  [() => search.value],
+  debounce(async () => {
+    reloadPage(true)
+  }, 1000),
+)
+
 // 获取订阅列表数据
 async function fetchData(page = currentPage.value, count = itemsPerPage.value) {
   loading.value = true
@@ -329,7 +342,7 @@ function addUrlQuery(url: string, name: string, value: any) {
 }
 
 // 重载页面
-function reloadPage() {
+function reloadPage(resetPage = false) {
   let url = '/history'
   if (search.value) {
     url = addUrlQuery(url, 'search', search.value)
@@ -338,7 +351,7 @@ function reloadPage() {
     url = addUrlQuery(url, 'itemsPerPage', itemsPerPage.value)
   }
   if (currentPage.value) {
-    url = addUrlQuery(url, 'currentPage', currentPage.value)
+    url = addUrlQuery(url, 'currentPage', resetPage ? 1 : currentPage.value)
   }
   router.push(url)
 }
@@ -394,11 +407,7 @@ onMounted(fetchData)
       show-select
       loading-text="加载中..."
       hover
-      :style="
-        appMode
-          ? 'height: calc(100vh - 15.5rem - env(safe-area-inset-bottom) - 3.5rem)'
-          : 'height: calc(100vh - 14.5rem - env(safe-area-inset-bottom)'
-      "
+      :style="tableStyle"
     >
       <template #item.title="{ item }">
         <div class="d-flex align-center">

src/views/system/SearchBarView.vue

@@ -1,12 +1,19 @@
 <script setup lang="ts">
 import api from '@/api'
 import type { Plugin, Subscribe } from '@/api/types'
-import { SystemNavMenus, UserfulMenus, PluginTabs, SettingTabs } from '@/router/menu'
+import { SystemNavMenus, UserfulMenus, SettingTabs } from '@/router/menu'
 import { NavMenu } from '@/@layouts/types'
+import store from '@/store'
 
 // 路由
 const router = useRouter()
 
+// 超级用户
+const superUser = store.state.auth.superUser
+
+// 当前用户名
+const userName = store.state.auth.userName
+
 // 定义事件
 const emit = defineEmits(['close'])
 
@@ -74,6 +81,7 @@ function getMenus(): NavMenu[] {
 // 匹配的菜单列表
 const matchedMenuItems = computed(() => {
   if (!searchWord.value) return []
+  if (!superUser) return []
   const lowerWord = (searchWord.value as string).toLowerCase()
   const menuItems = getMenus()
   if (menuItems)
@@ -104,6 +112,7 @@ async function fetchInstalledPlugins() {
 // 区配的插件列表
 const matchedPluginItems = computed(() => {
   if (!searchWord.value) return []
+  if (!superUser) return []
   const lowerWord = (searchWord.value as string).toLowerCase()
   return pluginItems.value.filter((item: Plugin) => {
     if (!item.plugin_name && !item.plugin_desc) return false
@@ -114,7 +123,7 @@ const matchedPluginItems = computed(() => {
 // 所有订阅数据
 const SubscribeItems = ref<Subscribe[]>([])
 
-// 获取电影订阅列表数据
+// 获取订阅列表数据
 async function fetchSubscribes() {
   try {
     SubscribeItems.value = await api.get('subscribe/')
@@ -128,7 +137,7 @@ const matchedSubscribeItems = computed(() => {
   if (!searchWord.value) return []
   const lowerWord = (searchWord.value as string).toLowerCase()
   return SubscribeItems.value.filter((item: Subscribe) => {
-    return item.name.toLowerCase().includes(lowerWord)
+    return (item.name.toLowerCase().includes(lowerWord) && (superUser || userName === item.username)) || false
   })
 })
 
@@ -287,7 +296,7 @@ onMounted(() => {
               </VListItem>
             </template>
           </VHover>
-          <VHover>
+          <VHover v-if="superUser">
             <template #default="hover">
               <VListItem prepend-icon="mdi-history" link v-bind="hover.props" @click="searchHistory">
                 <VListItemTitle class="break-words whitespace-break-spaces">
@@ -382,7 +391,7 @@ onMounted(() => {
                 </div>
               </VCol>
             </VRow>
-            <VRow>
+            <VRow v-if="superUser">
               <VCol cols="12" md="6">
                 <p class="custom-letter-spacing text-sm text-disabled text-uppercase py-2 px-4 mb-0">常用功能</p>
                 <VList lines="one">