fix path mapping ui

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moviepilot",
-  "version": "2.8.2",
+  "version": "2.8.8",
   "private": true,
   "type": "module",
   "bin": "dist/service.js",

src/App.vue

@@ -38,6 +38,9 @@ const backgroundImages = ref<string[]>([])
 const activeImageIndex = ref(0)
 const isTransparentTheme = computed(() => globalTheme.name.value === 'transparent')
 
+// 心跳检测
+let heartbeatInterval: number | null = null
+
 // ApexCharts 全局配置
 declare global {
   interface Window {
@@ -45,6 +48,33 @@ declare global {
   }
 }
 
+// 启动心跳
+const startHeartbeat = () => {
+  // 如果已经有心跳，则先停止
+  if (heartbeatInterval) {
+    stopHeartbeat()
+  }
+
+  // 开始心跳任务
+  heartbeatInterval = window.setInterval(async () => {
+    try {
+      if (isLogin.value) {
+        await api.get('dashboard/cpu')
+      }
+    } catch (error) {
+      console.warn('Heartbeat request failed:', error)
+    }
+  }, 5 * 60 * 1000)
+}
+
+// 停止心跳
+const stopHeartbeat = () => {
+  if (heartbeatInterval) {
+    window.clearInterval(heartbeatInterval)
+    heartbeatInterval = null
+  }
+}
+
 // 配置 ApexCharts 全局选项
 function configureApexCharts() {
   if (typeof window !== 'undefined' && window.Apex) {
@@ -234,11 +264,15 @@ onMounted(async () => {
   ensureRenderComplete(() => {
     nextTick(removeLoadingWithStateCheck)
   })
+  // 启动心跳
+  startHeartbeat()
 })
 
 onUnmounted(() => {
   // 清除背景轮换定时器
   removeBackgroundTimer('background-rotation')
+  // 停止心跳
+  stopHeartbeat()
 })
 </script>
 

src/api/types.ts

@@ -1084,6 +1084,8 @@ export interface DownloaderConf {
   config: { [key: string]: any }
   // 是否启用
   enabled: boolean
+  // 路径映射
+  path_mapping?: Array<[storagePath: string, downloadPath: string]>
 }
 
 // 通知配置

src/components/FileBrowser.vue

@@ -5,6 +5,11 @@ import FileNavigator from './filebrowser/FileNavigator.vue'
 import type { EndPoints, FileItem, StorageConf } from '@/api/types'
 import { storageIconDict } from '@/api/constants'
 
+// LocalStorage keys
+const SORT_KEY = 'fileBrowser.sort'
+const SHOW_TREE_KEY = 'fileBrowser.showDirTree'
+const NAV_WIDTH_KEY = 'fileBrowser.navigatorWidth'
+
 // 输入参数
 const props = defineProps({
   storages: Array as PropType<StorageConf[]>,
@@ -119,22 +124,33 @@ const fileIcons = {
 
 // 加载次数
 const loading = ref(0)
-// 当前存储
-const activeStorage = ref('local')
+
 // 刷新
 const refreshPending = ref(false)
-// 排序
-const sort = ref('name')
+// 排序 - 从localStorage恢复
+const sort = ref(localStorage.getItem(SORT_KEY) || 'name')
 
-// 是否显示目录树
-const showDirTree = ref(false)
+// 是否显示目录树 - 从localStorage恢复
+const showDirTree = ref(localStorage.getItem(SHOW_TREE_KEY) === 'true')
 
-// 拖动分隔条相关
-const navigatorWidth = ref(280) // 初始宽度
+// 拖动分隔条相关 - 从localStorage恢复宽度
+const navigatorWidth = ref(parseInt(localStorage.getItem(NAV_WIDTH_KEY) || '280'))
 const isDragging = ref(false)
 const dragStartX = ref(0)
 const dragStartWidth = ref(0)
 
+watch(sort, (val) => {
+  localStorage.setItem(SORT_KEY, val)
+})
+
+watch(showDirTree, (val) => {
+  localStorage.setItem(SHOW_TREE_KEY, String(val))
+})
+
+watch(navigatorWidth, (val) => {
+  localStorage.setItem(NAV_WIDTH_KEY, String(val))
+})
+
 // 计算属性
 const storagesArray = computed(() => {
   return props.storages?.map(item => ({
@@ -144,15 +160,15 @@ const storagesArray = computed(() => {
   }))
 })
 
+
 // 方法
-function loadingChanged(loading: number) {
-  if (loading) loading++
-  else if (loading > 0) loading--
+function loadingChanged(isLoading: number) {
+  if (isLoading) loading.value++
+  else if (loading.value > 0) loading.value--
 }
 
 // 存储切换
 async function storageChanged(storage: string) {
-  activeStorage.value = storage
   emit('pathchanged', { storage: storage, path: '/', fileid: 'root' })
 }
 
@@ -235,12 +251,12 @@ function stopDrag() {
 
 <template>
   <div class="mx-auto" :loading="loading > 0">
-    <div v-if="activeStorage && item">
+    <div v-if="item">
       <FileToolbar
+        :sort="sort"
         :item="item"
         :itemstack="itemstack"
         :storages="storagesArray"
-        :storage="activeStorage"
         :endpoints="endpoints"
         :axios="axios"
         @storagechanged="storageChanged"
@@ -251,7 +267,7 @@ function stopDrag() {
       <div class="flex">
         <FileNavigator
           v-if="showDirTree"
-          :storage="activeStorage"
+          :storage="item.storage"
           :currentPath="item.path"
           :items="fileListItems"
           :endpoints="endpoints"
@@ -266,7 +282,6 @@ function stopDrag() {
         </div>
         <FileList
           :item="item"
-          :storage="activeStorage"
           :icons="fileIcons"
           :endpoints="endpoints"
           :axios="axios"

src/components/cards/DownloaderCard.vue

@@ -7,7 +7,7 @@ import type { DownloaderInfo } from '@/api/types'
 import { getLogoUrl } from '@/utils/imageUtils'
 import { cloneDeep } from 'lodash-es'
 import { useI18n } from 'vue-i18n'
-import { downloaderDict } from '@/api/constants'
+import { downloaderDict, storageAttributes } from '@/api/constants'
 import { useDisplay } from 'vuetify'
 import { useBackgroundOptimization } from '@/composables/useBackgroundOptimization'
 
@@ -52,6 +52,54 @@ const download_rate = ref(0)
 // 下载器详情弹窗
 const downloaderInfoDialog = ref(false)
 
+// 表单
+const downloaderForm = ref()
+
+// 路径前缀选项
+const prefixOptions = computed(() => {
+  return storageAttributes.map(item => ({
+    title: t(`storage.${item.type}`),
+    value: item.type,
+  }))
+})
+
+function getStorageType(path: string) {
+  if (!path) return 'local'
+  // 查找匹配的存储类型
+  const storage = storageAttributes.find(s => s.type !== 'local' && path.startsWith(`${s.type}:`))
+  return storage?.type || 'local'
+}
+
+function storage2Prefix(storage: string) {
+  return storage === 'local' ? '' : storage + ':'
+}
+
+// 获取存储路径前后缀
+function parseStoragePath(path: string): [prefix: string, suffix: string] {
+  if (!path) return ['', '']
+  const storage = getStorageType(path)
+  const prefix = storage2Prefix(storage)
+  return [prefix, path.slice(prefix.length)]
+}
+
+// 更新存储路径前缀
+function updateStoragePrefix(row: PathMappingRow, storage: string) {
+  const [, currentSuffix] = parseStoragePath(row.storage)
+  const prefix = storage2Prefix(storage)
+  row.storage = prefix + currentSuffix
+}
+
+// 更新存储路径后缀
+function updateStorageSuffix(row: PathMappingRow, suffix: string) {
+  const [currentPrefix] = parseStoragePath(row.storage)
+  row.storage = currentPrefix + suffix
+}
+
+const pathValidationRules = [
+  (v: string) => !!v || t('downloader.pathMappingRequired'),
+  (v: string) => v.startsWith('/') || t('downloader.pathMappingError'),
+]
+
 // 下载器详情
 const downloaderInfo = ref<DownloaderConf>({
   name: '',
@@ -59,8 +107,24 @@ const downloaderInfo = ref<DownloaderConf>({
   default: false,
   enabled: false,
   config: {},
+  path_mapping: [],
 })
 
+// 路径映射行定义
+interface PathMappingRow {
+  id: string
+  storage: string
+  download: string
+}
+
+// 路径映射行数据
+const pathMappingRows = ref<PathMappingRow[]>([])
+
+// 生成随机ID
+function generateId() {
+  return Math.random().toString(36).substring(2, 9)
+}
+
 // 下载器是否应该刷新数据的计算属性
 const shouldRefresh = computed(() => props.allowRefresh && props.downloader.enabled)
 
@@ -92,11 +156,24 @@ async function loadDownloaderInfo() {
 function openDownloaderInfoDialog() {
   // 深复制
   downloaderInfo.value = cloneDeep(props.downloader)
+  // 初始化路径映射行数据
+  pathMappingRows.value = (downloaderInfo.value.path_mapping || []).map(item => ({
+    id: generateId(),
+    storage: item[0],
+    download: item[1],
+  }))
   downloaderInfoDialog.value = true
 }
 
 // 保存详情数据
-function saveDownloaderInfo() {
+async function saveDownloaderInfo() {
+  // 表单校验
+  const { valid } = await downloaderForm.value?.validate()
+  if (!valid) return
+
+  // 同步路径映射数据
+  downloaderInfo.value.path_mapping = pathMappingRows.value.map(row => [row.storage, row.download])
+
   // 为空不保存，跳出警告框
   if (!downloaderInfo.value.name) {
     $toast.error(t('downloader.nameRequired'))
@@ -134,6 +211,20 @@ const getIcon = computed(() => {
   }
 })
 
+// 添加路径映射
+function addPathMapping() {
+  pathMappingRows.value.push({
+    id: generateId(),
+    storage: '',
+    download: '',
+  })
+}
+
+// 移除路径映射
+function removePathMapping(index: number) {
+  pathMappingRows.value.splice(index, 1)
+}
+
 // 按钮点击
 function onClose() {
   emit('close')
@@ -152,6 +243,7 @@ onUnmounted(() => {
   stopRefresh()
 })
 </script>
+
 <template>
   <div>
     <VHover v-slot="hover">
@@ -212,7 +304,7 @@ onUnmounted(() => {
         <VDialogCloseBtn v-model="downloaderInfoDialog" />
         <VDivider />
         <VCardText>
-          <VForm>
+          <VForm ref="downloaderForm">
             <VRow>
               <VCol cols="12" md="6">
                 <VSwitch v-model="downloaderInfo.enabled" :label="t('downloader.enabled')" />
@@ -373,6 +465,89 @@ onUnmounted(() => {
                 />
               </VCol>
             </VRow>
+            <VRow>
+              <VCol cols="12">
+                <VDivider class="my-2">
+                  <span class="text-body-1 font-weight-medium">{{ t('downloader.pathMapping') }}</span>
+                </VDivider>
+
+                <div v-if="pathMappingRows.length === 0" class="text-center py-2">
+                  <VIcon icon="mdi-folder-network" size="48" class="text-disabled mb-1" />
+                  <div class="text-body-2 text-disabled">{{ t('common.noData') }}</div>
+                </div>
+
+                <VCard v-for="(row, index) in pathMappingRows" :key="row.id" variant="outlined" class="my-2">
+                  <VCardText class="pa-3">
+                    <VRow align="center" no-gutters>
+                      <VCol cols="12" class="mb-2">
+                        <div class="d-flex align-center mb-1">
+                          <VIcon icon="mdi-folder-outline" size="18" class="me-1 text-primary" />
+                          <span class="text-caption text-medium-emphasis">{{ t('downloader.storagePath') }}</span>
+                        </div>
+                        <VRow no-gutters>
+                          <VCol cols="12" sm="4" class="pe-2">
+                            <VSelect
+                              :model-value="getStorageType(row.storage)"
+                              :items="prefixOptions"
+                              density="compact"
+                              variant="outlined"
+                              hide-details
+                              @update:model-value="v => updateStoragePrefix(row, v)"
+                            />
+                          </VCol>
+                          <VCol cols="12" sm="8">
+                            <VTextField
+                              :model-value="parseStoragePath(row.storage)[1]"
+                              :placeholder="'/path/to/storage'"
+                              density="compact"
+                              variant="outlined"
+                              hide-details="auto"
+                              :rules="pathValidationRules"
+                              @update:model-value="v => updateStorageSuffix(row, v)"
+                            />
+                          </VCol>
+                        </VRow>
+                      </VCol>
+
+                      <VCol cols="12" class="mb-1">
+                        <div class="d-flex align-center justify-center my-1">
+                          <VIcon icon="mdi-arrow-down" size="18" class="text-medium-emphasis" />
+                        </div>
+                        <div class="d-flex align-center mb-1">
+                          <VIcon icon="mdi-download-outline" size="18" class="me-1 text-success" />
+                          <span class="text-caption text-medium-emphasis">{{ t('downloader.downloadPath') }}</span>
+                        </div>
+                        <VTextField
+                          v-model="row.download"
+                          :placeholder="'/path/to/download'"
+                          density="compact"
+                          variant="outlined"
+                          hide-details="auto"
+                          :rules="pathValidationRules"
+                        />
+                      </VCol>
+
+                      <VCol cols="12" class="d-flex justify-end pt-1">
+                        <IconBtn variant="text" color="error" size="small" @click="removePathMapping(index)">
+                          <VIcon icon="mdi-delete-outline" />
+                        </IconBtn>
+                      </VCol>
+                    </VRow>
+                  </VCardText>
+                </VCard>
+
+                <VBtn
+                  variant="tonal"
+                  color="primary"
+                  prepend-icon="mdi-plus-circle-outline"
+                  @click="addPathMapping"
+                  class="mt-1"
+                  size="small"
+                >
+                  {{ t('common.add') }} {{ t('downloader.pathMapping') }}
+                </VBtn>
+              </VCol>
+            </VRow>
           </VForm>
         </VCardText>
         <VCardActions class="pt-3">

src/components/dialog/AddDownloadDialog.vue

@@ -6,10 +6,20 @@ import type { DownloaderConf, MediaInfo, TorrentInfo, TransferDirectoryConf } fr
 import { formatFileSize } from '@/@core/utils/formatters'
 import { VCardTitle, VChip } from 'vuetify/lib/components/index.mjs'
 import { useI18n } from 'vue-i18n'
+import MediaIdSelector from '../misc/MediaIdSelector.vue'
+import { numberValidator } from '@/@validators'
+import { useGlobalSettingsStore } from '@/stores'
 
 // 多语言支持
 const { t } = useI18n()
 
+// 从 provide 中获取全局设置
+const globalSettingsStore = useGlobalSettingsStore()
+const globalSettings = globalSettingsStore.globalSettings
+
+// 当前识别类型
+const mediaSource = ref(globalSettings.RECOGNIZE_SOURCE || 'themoviedb')
+
 // 输入参数
 const props = defineProps({
   title: String,
@@ -38,6 +48,18 @@ const directories = ref<TransferDirectoryConf[]>([])
 // 是否正在加载
 const loading = ref(false)
 
+// 是否显示高级选项
+const showAdvancedOptions = ref(false)
+
+// TMDB ID
+const tmdbid = ref<number | undefined>(undefined)
+
+// 豆瓣ID
+const doubanId = ref<string | undefined>(undefined)
+
+// TMDB选择对话框
+const mediaSelectorDialog = ref(false)
+
 // 计算按钮图标
 const icon = computed(() => (loading.value ? 'mdi-progress-download' : 'mdi-download'))
 
@@ -56,9 +78,21 @@ async function loadDirectories() {
   }
 }
 
+function convertToUri(item: TransferDirectoryConf) {
+  if (!item.download_path) {
+    return undefined
+  }
+  if (item.storage === 'local') {
+    return item.download_path
+  }
+  return item.storage + ':' + item.download_path
+}
+
 // 获取保存目录
 const targetDirectories = computed(() => {
-  const downloadDirectories = directories.value.map(item => item.download_path)
+  const downloadDirectories = directories.value
+    .map(item => convertToUri(item))
+    .filter((item): item is string => item !== undefined)
   return [...new Set(downloadDirectories)]
 })
 
@@ -96,6 +130,14 @@ async function addDownload() {
       payload.media_in = props.media
     }
 
+    // 添加媒体ID辅助识别
+    if (tmdbid.value) {
+      payload.tmdbid = tmdbid.value
+    }
+    if (doubanId.value) {
+      payload.doubanid = doubanId.value
+    }
+
     const endpoint = props.media ? 'download/' : 'download/add'
 
     result = await api.post(endpoint, payload)
@@ -202,6 +244,56 @@ onMounted(() => {
             />
           </VCol>
         </VRow>
+        <VRow class="px-5 mt-2">
+          <VCol cols="12">
+            <VBtn
+              variant="text"
+              size="small"
+              :prepend-icon="showAdvancedOptions ? 'mdi-chevron-up' : 'mdi-chevron-down'"
+              @click="showAdvancedOptions = !showAdvancedOptions"
+            >
+              {{
+                showAdvancedOptions
+                  ? t('dialog.addDownload.hideAdvancedOptions')
+                  : t('dialog.addDownload.showAdvancedOptions')
+              }}
+            </VBtn>
+          </VCol>
+        </VRow>
+        <VRow v-show="showAdvancedOptions" class="px-5">
+          <VCol cols="12">
+            <VTextField
+              v-if="mediaSource === 'themoviedb'"
+              v-model="tmdbid"
+              :label="t('dialog.reorganize.tmdbId')"
+              :placeholder="t('dialog.reorganize.mediaIdPlaceholder')"
+              :rules="[numberValidator]"
+              append-inner-icon="mdi-magnify"
+              :hint="t('dialog.reorganize.mediaIdHint')"
+              persistent-hint
+              prepend-inner-icon="mdi-identifier"
+              size="small"
+              variant="underlined"
+              density="comfortable"
+              @click:append-inner="mediaSelectorDialog = true"
+            />
+            <VTextField
+              v-else
+              v-model="doubanId"
+              :label="t('dialog.reorganize.doubanId')"
+              :placeholder="t('dialog.reorganize.mediaIdPlaceholder')"
+              :rules="[numberValidator]"
+              append-inner-icon="mdi-magnify"
+              :hint="t('dialog.reorganize.mediaIdHint')"
+              persistent-hint
+              prepend-inner-icon="mdi-identifier"
+              size="small"
+              variant="underlined"
+              density="comfortable"
+              @click:append-inner="mediaSelectorDialog = true"
+            />
+          </VCol>
+        </VRow>
       </VCardText>
       <VCardText class="text-center">
         <VBtn variant="elevated" :disabled="loading" @click="addDownload" :prepend-icon="icon" class="px-5">
@@ -209,5 +301,15 @@ onMounted(() => {
         </VBtn>
       </VCardText>
     </VCard>
+    <!-- 媒体ID选择器 -->
+    <VDialog v-model="mediaSelectorDialog" width="40rem" scrollable max-height="85vh">
+      <MediaIdSelector
+        v-if="mediaSource === 'themoviedb'"
+        v-model="tmdbid"
+        @close="mediaSelectorDialog = false"
+        :type="mediaSource"
+      />
+      <MediaIdSelector v-else v-model="doubanId" @close="mediaSelectorDialog = false" :type="mediaSource" />
+    </VDialog>
   </VDialog>
 </template>

src/components/filebrowser/FileList.vue

@@ -26,7 +26,6 @@ const { appMode } = usePWA()
 // 输入参数
 const inProps = defineProps({
   icons: Object,
-  storage: String,
   endpoints: Object as PropType<EndPoints>,
   axios: {
     type: Function,
@@ -183,6 +182,8 @@ function changeSelectMode() {
 // 调API加载文件夹内的内容
 async function list_files() {
   loading.value = true
+  const takeURISnapshot = () => [inProps.item.storage, inProps.item.path].join(':/');
+  const prevURI = takeURISnapshot();
   emit('loading', true)
 
   // 参数
@@ -195,7 +196,12 @@ async function list_files() {
   }
 
   // 加载数据
-  items.value = (await inProps.axios.request(config)) ?? []
+  const data = (await inProps.axios.request(config)) ?? []
+  // 如果当前路径已经变化，则放弃此次加载结果
+  if (prevURI !== takeURISnapshot()) {
+    return;
+  }
+  items.value = data
   emit('loading', false)
   loading.value = false
 
@@ -446,9 +452,9 @@ watch(
   },
 )
 
-// 监听item变化或者storage变化
+// 监听item变化
 watch(
-  [() => inProps.item, () => inProps.storage],
+  [() => inProps.item],
   async () => {
     // 清空列表
     items.value = []
@@ -550,7 +556,7 @@ async function scrape(item: FileItem, confirm: boolean = true) {
     progressDialog.value = true
     progressText.value = t('file.scraping', { path: item.path })
 
-    const result: { [key: string]: any } = await api.post(`media/scrape/${inProps.storage}`, item)
+    const result: { [key: string]: any } = await api.post(`media/scrape/${inProps.item.storage}`, item)
 
     // 关闭进度条
     progressDialog.value = false
@@ -808,7 +814,7 @@ onMounted(() => {
       v-if="transferPopper"
       v-model="transferPopper"
       :items="transferItems"
-      :target_storage="inProps.storage"
+      :target_storage="inProps.item.storage"
       @done="transferDone"
       @close="transferPopper = false"
     />

src/components/filebrowser/FileNavigator.vue

@@ -42,7 +42,7 @@ const availableHeight = computed(() => {
 const props = defineProps({
   storage: {
     type: String,
-    default: 'local',
+    required: true,
   },
   currentPath: {
     type: String,
@@ -223,7 +223,7 @@ watch(
 watch(
   () => props.items,
   newItems => {
-    if (newItems && newItems.length > 0) {
+    if (newItems) {
       // 过滤出目录项
       const dirs = newItems.filter(item => item.type === 'dir')
 
@@ -283,9 +283,6 @@ onMounted(async () => {
   await loadRootDirectories()
 })
 
-onActivated(() => {
-  updateHeight()
-})
 </script>
 
 <template>
@@ -309,7 +306,6 @@ onActivated(() => {
           <span>{{ t('file.rootDirectory') }}</span>
         </div>
       </div>
-
       <!-- 加载根目录 -->
       <div v-if="loading['/']" class="tree-loading">
         <VProgressCircular indeterminate size="24" color="primary" class="ma-2" />

src/components/filebrowser/FileToolbar.vue

@@ -13,7 +13,6 @@ const display = useDisplay()
 // 输入参数
 const inProps = defineProps({
   storages: Array as PropType<any[]>,
-  storage: String,
   item: {
     type: Object as PropType<FileItem>,
     required: true,
@@ -27,6 +26,10 @@ const inProps = defineProps({
     type: Function,
     required: true,
   },
+  sort: {
+    type: String,
+    default: 'name',
+  },
 })
 
 // 对外事件
@@ -38,15 +41,10 @@ const newFolderPopper = ref(false)
 // 新建文件名称
 const newFolderName = ref('')
 
-// 排序方式
-const sort = ref('name')
-
 // 调整排序方式
 function changeSort() {
-  if (sort.value === 'name') sort.value = 'time'
-  else sort.value = 'name'
-
-  emit('sortchanged', sort.value)
+  const newSort = inProps.sort === 'name' ? 'time' : 'name'
+  emit('sortchanged', newSort)
 }
 
 // 计算PATH面包屑
@@ -67,12 +65,12 @@ const pathSegments = computed(() => {
 
 // 当前存储
 const storageObject = computed(() => {
-  return inProps.storages?.find(item => item.value === inProps.storage)
+  return inProps.storages?.find(item => item.value === inProps.item.storage)
 })
 
 // 切换存储
 function changeStorage(code: string) {
-  if (inProps.storage !== code) {
+  if (inProps.item.storage!== code) {
     emit('storagechanged', code)
   }
 }
@@ -113,7 +111,7 @@ async function mkdir() {
 
 // 计算排序图标
 const sortIcon = computed(() => {
-  if (sort.value === 'time') return 'mdi-sort-clock-ascending-outline'
+  if (inProps.sort === 'time') return 'mdi-sort-clock-ascending-outline'
   else return 'mdi-sort-alphabetical-ascending'
 })
 </script>

src/locales/en-US.ts

@@ -1256,6 +1256,8 @@ export default {
       llmApiKeyPlaceholder: 'Please enter API key',
       llmBaseUrl: 'LLM Base URL',
       llmBaseUrlHint: 'Base URL for LLM API, used for custom API endpoints',
+      aiAgentGlobal: 'Global AI Assistant',
+      aiAgentGlobalHint: 'Enable global AI assistant functionality, all message conversations will be answered by the AI agent without using the /ai command',
       advancedSettings: 'Advanced Settings',
       advancedSettingsDesc: 'System advanced settings, only need to be adjusted in special cases',
       downloaders: 'Downloaders',
@@ -1914,6 +1916,8 @@ export default {
       startDownload: 'Start Download',
       downloadSuccess: '{site} {title} downloaded successfully!',
       downloadFailed: '{site} {title} download failed: {message}!',
+      showAdvancedOptions: 'Show Advanced Options',
+      hideAdvancedOptions: 'Hide Advanced Options',
     },
     subscribeShare: {
       shareSubscription: 'Share Subscription',
@@ -2672,6 +2676,11 @@ export default {
     hostRequired: 'Host cannot be empty',
     usernameRequired: 'Username cannot be empty',
     passwordRequired: 'Password cannot be empty',
+    pathMapping: 'Path Mapping',
+    pathMappingRequired: 'Path cannot be empty',
+    pathMappingError: 'Must start with /',
+    storagePath: 'Storage Path',
+    downloadPath: 'Download Path',
   },
   filterRule: {
     title: 'Filter Rule',

src/locales/zh-CN.ts

@@ -1252,6 +1252,8 @@ export default {
       llmApiKeyPlaceholder: '请输入API密钥',
       llmBaseUrl: 'LLM基础URL',
       llmBaseUrlHint: 'LLM API的基础URL地址，用于自定义API端点',
+      aiAgentGlobal: '全局智能助手',
+      aiAgentGlobalHint: '启用全局智能助手功能，所有消息对话均使用智能体回答而不用使用/ai命令',
       advancedSettings: '高级设置',
       advancedSettingsDesc: '系统进阶设置，特殊情况下才需要调整',
       downloaders: '下载器',
@@ -1890,6 +1892,8 @@ export default {
       startDownload: '开始下载',
       downloadSuccess: '{site} {title} 下载成功！',
       downloadFailed: '{site} {title} 下载失败：{message}！',
+      showAdvancedOptions: '显示高级选项',
+      hideAdvancedOptions: '隐藏高级选项',
     },
     subscribeShare: {
       shareSubscription: '分享订阅',
@@ -2640,6 +2644,11 @@ export default {
     hostRequired: '地址不能为空',
     usernameRequired: '用户名不能为空',
     passwordRequired: '密码不能为空',
+    pathMapping: '路径映射',
+    pathMappingRequired: '路径不能为空',
+    pathMappingError: '必须以 / 开头',
+    storagePath: '存储路径',
+    downloadPath: '下载路径',
   },
   filterRule: {
     title: '过滤规则',

src/locales/zh-TW.ts

@@ -1240,6 +1240,8 @@ export default {
       llmApiKeyPlaceholder: '請輸入API密鑰',
       llmBaseUrl: 'LLM基礎URL',
       llmBaseUrlHint: 'LLM API的基礎URL地址，用於自定義API端點',
+      aiAgentGlobal: '全局智能助手',
+      aiAgentGlobalHint: '啟用全局智能助手功能，所有消息對話均使用智能體回答而不用使用/ai命令',
       advancedSettings: '高級設置',
       advancedSettingsDesc: '系統進階設置，特殊情況下才需要調整',
       downloaders: '下載器',
@@ -1876,6 +1878,8 @@ export default {
       startDownload: '開始下載',
       downloadSuccess: '{site} {title} 下載成功！',
       downloadFailed: '{site} {title} 下載失敗：{message}！',
+      showAdvancedOptions: '顯示高級選項',
+      hideAdvancedOptions: '隱藏高級選項',
     },
     subscribeShare: {
       shareSubscription: '分享訂閱',
@@ -2626,6 +2630,11 @@ export default {
     hostRequired: '地址不能為空',
     usernameRequired: '用戶名不能為空',
     passwordRequired: '密碼不能為空',
+    pathMapping: '路徑映射',
+    pathMappingRequired: '路徑不能為空',
+    pathMappingError: '必須以 / 開頭',
+    storagePath: '存儲路徑',
+    downloadPath: '下載路徑',
   },
   filterRule: {
     title: '過濾規則',

src/views/reorganize/FileBrowserView.vue

@@ -32,40 +32,13 @@ const endpoints = {
 
 // 所有存储
 const storages = ref<StorageConf[]>([])
-
-// 查询存储
-async function loadStorages() {
-  try {
-    const result: { [key: string]: any } = await api.get('system/setting/Storages')
-
-    storages.value = result.data?.value ?? []
-  } catch (error) {
-    console.log(error)
-  }
-}
+const storageTypes = computed(() => storages.value.map(s => s.type))
 
 // 当前文件项
-const operItem = ref<FileItem>({
-  storage: 'local',
-  type: 'dir',
-  name: '/',
-  path: '/',
-  fileid: 'root',
-})
+const operItem = ref<FileItem | undefined>(undefined)
 
 // fileid的堆栈
-const itemstack = ref<FileItem[]>([
-  {
-    storage: 'local',
-    type: 'dir',
-    name: '/',
-    path: '/',
-    fileid: 'root',
-  },
-])
-
-// 下载目录列表
-const downloadDirectories = ref<TransferDirectoryConf[]>([])
+const itemstack = ref<FileItem[]>([])
 
 // 计算公共路径
 function findCommonPath(paths: string[]): string {
@@ -101,29 +74,97 @@ function findCommonPath(paths: string[]): string {
   return commonPath
 }
 
+const STORAGE_KEY = 'fileBrowserView.activeStorage'
+
+interface BrowserInitialParams {
+  storage: string;
+  path: string;
+  name: string;
+}
+ // determine which entry to select initially
+function determineBrowserInitialParams(downloadDirectories: TransferDirectoryConf[]): BrowserInitialParams {
+  const isAvailable = (storage: string) => storageTypes.value.includes(storage);
+  const buckets = downloadDirectories.reduce<Map<string, string[]>>((dict, item) => { 
+    // filter out directories whose storage is not available
+    if (!isAvailable(item.storage)) {
+      return dict
+    }
+    if (item.download_path == undefined) {
+      return dict
+    }
+    if (!dict.has(item.storage)) {
+      dict.set(item.storage, [item.download_path])
+    } else {
+      dict.get(item.storage)!.push(item.download_path)
+    }
+    return dict
+  }, new Map());
+
+  const cachedStorage = localStorage.getItem(STORAGE_KEY) || '';
+  // if no download directories are configured, fall back to cached storage or first available storage
+  if (buckets.size === 0) {
+    return {
+      storage: isAvailable(cachedStorage)
+        ? cachedStorage
+        : (storageTypes.value[0] || 'local'),
+      path: '/',
+      name: '/',
+    }
+  }
+  let selectedEntry: [string, string[]];
+  if (cachedStorage && buckets.has(cachedStorage)) {
+    selectedEntry = [cachedStorage, buckets.get(cachedStorage)!];
+  } else {
+    // if no storage selected previously, use the most populous one
+    selectedEntry = Array.from(buckets.entries()).reduce((prev, curr) => {
+      return curr[1].length > prev[1].length ? curr : prev;
+    });
+  }
+
+  const path = findCommonPath(selectedEntry[1]);
+  return {
+    storage: selectedEntry[0],
+    path,
+    name: path.split('/').filter(Boolean).pop() ?? '',
+  }
+}
+      
 // 查询下载目录
 async function loadDownloadDirectories() {
   try {
+    // fetch available storages
+    const storageResult: { [key: string]: any } = await api.get('system/setting/Storages')
+    storages.value = storageResult.data?.value ?? []
+
     const result: { [key: string]: any } = await api.get('system/setting/Directories')
     if (result.success && result.data?.value) {
-      downloadDirectories.value = result.data.value
-      const path = findCommonPath(downloadDirectories.value.map(item => item.download_path) as string[])
-      const name = path.split('/').filter(Boolean).pop() ?? ''
+      const { storage, path, name } = determineBrowserInitialParams(result.data.value);
+      // operItem初始化
       operItem.value = {
-        storage: 'local',
         type: 'dir',
+        storage,
         name: name,
         path: path,
       }
+      // itemstack初始化
+      itemstack.value = [
+        {
+          storage: storage,
+          type: 'dir',
+          name: '/',
+          path: '/',
+          fileid: 'root',
+        }
+      ];
       // 将初始数据拆分到堆栈中
       const paths = path.split('/').filter(Boolean)
       paths.map((name, index) => {
         const path = '/' + paths.slice(0, index + 1).join('/') + '/'
         itemstack.value.push({
-          storage: 'local',
+          storage,
           type: 'dir',
-          name: name,
-          path: path,
+          name,
+          path,
         })
       })
     }
@@ -134,6 +175,11 @@ async function loadDownloadDirectories() {
 
 // 目录变化
 function pathChanged(item: FileItem) {
+  // save storage to localStorage
+  if (item.storage !== operItem.value?.storage) {
+    localStorage.setItem(STORAGE_KEY, item.storage)
+  }
+
   operItem.value = item
   if (item.path == '/') {
     itemstack.value = [
@@ -156,16 +202,13 @@ function pathChanged(item: FileItem) {
 }
 
 // 加载初始目录
-onBeforeMount(loadDownloadDirectories)
-
-onMounted(() => {
-  loadStorages()
-})
+onMounted(loadDownloadDirectories)
 </script>
 
 <template>
   <div class="file-browser-view">
     <FileBrowser
+      v-if="operItem"
       :storages="storages"
       :tree="false"
       :itemstack="itemstack"

src/views/setting/AccountSettingSystem.vue

@@ -32,6 +32,7 @@ const SystemSettings = ref<any>({
     OCR_HOST: null,
     CUSTOMIZE_WALLPAPER_API_URL: null,
     AI_AGENT_ENABLE: false,
+    AI_AGENT_GLOBAL: false,
     LLM_PROVIDER: 'deepseek',
     LLM_MODEL: 'deepseek-chat',
     LLM_API_KEY: null,
@@ -119,6 +120,10 @@ const progressDialog = ref(false)
 // 高级设置对话框
 const advancedDialog = ref(false)
 
+// LLM 模型列表
+const llmModels = ref<string[]>([])
+const loadingModels = ref(false)
+
 const activeTab = ref('system')
 
 // 元数据语言
@@ -154,6 +159,30 @@ const logLevelItems = [
 // 安全域名添加变量
 const newSecurityDomain = ref('')
 
+// 加载LLM模型列表
+async function loadLlmModels() {
+  loadingModels.value = true
+  try {
+    const result: { [key: string]: any } = await api.get('system/llm-models', {
+      params: {
+        provider: SystemSettings.value.Basic.LLM_PROVIDER,
+        api_key: SystemSettings.value.Basic.LLM_API_KEY,
+        base_url: SystemSettings.value.Basic.LLM_BASE_URL,
+      },
+    })
+
+    if (result.success) {
+      llmModels.value = result.data
+      if (llmModels.value.length > 0) SystemSettings.value.Basic.LLM_MODEL = llmModels.value[0]
+    } else {
+      $toast.error(result.message)
+    }
+  } catch (error) {
+    console.log(error)
+  }
+  loadingModels.value = false
+}
+
 // 添加安全域名
 function addSecurityDomain() {
   if (
@@ -638,12 +667,12 @@ onDeactivated(() => {
               </VCol>
               <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE" cols="12" md="6">
                 <VTextField
-                  v-model="SystemSettings.Basic.LLM_MODEL"
-                  :label="t('setting.system.llmModel')"
-                  :hint="t('setting.system.llmModelHint')"
-                  placeholder="gpt-3.5-turbo"
+                  v-model="SystemSettings.Basic.LLM_BASE_URL"
+                  :label="t('setting.system.llmBaseUrl')"
+                  :hint="t('setting.system.llmBaseUrlHint')"
+                  placeholder="https://api.deepseek.com"
                   persistent-hint
-                  prepend-inner-icon="mdi-brain"
+                  prepend-inner-icon="mdi-link"
                 />
               </VCol>
               <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE" cols="12" md="6">
@@ -658,13 +687,33 @@ onDeactivated(() => {
                 />
               </VCol>
               <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE" cols="12" md="6">
-                <VTextField
-                  v-model="SystemSettings.Basic.LLM_BASE_URL"
-                  :label="t('setting.system.llmBaseUrl')"
-                  :hint="t('setting.system.llmBaseUrlHint')"
-                  placeholder="https://api.deepseek.com"
+                <VCombobox
+                  v-model="SystemSettings.Basic.LLM_MODEL"
+                  :label="t('setting.system.llmModel')"
+                  :hint="t('setting.system.llmModelHint')"
+                  :placeholder="t('setting.system.llmModelHint')"
+                  persistent-hint
+                  :items="llmModels"
+                  :loading="loadingModels"
+                  prepend-inner-icon="mdi-brain"
+                >
+                  <template #append-inner>
+                    <VBtn
+                      variant="text"
+                      icon="mdi-refresh"
+                      size="small"
+                      @click="loadLlmModels"
+                      :disabled="!SystemSettings.Basic.LLM_API_KEY"
+                    />
+                  </template>
+                </VCombobox>
+              </VCol>
+              <VCol v-if="SystemSettings.Basic.AI_AGENT_ENABLE" cols="12" md="6">
+                <VSwitch
+                  v-model="SystemSettings.Basic.AI_AGENT_GLOBAL"
+                  :label="t('setting.system.aiAgentGlobal')"
+                  :hint="t('setting.system.aiAgentGlobalHint')"
                   persistent-hint
-                  prepend-inner-icon="mdi-link"
                 />
               </VCol>
             </VRow>