fix: potential bug after adding excluded directories (#94)
* Revert "fix: missing parameter (#93)" This reverts commitc2406a1fd1. * Revert "feat: add exclude scan model types (#92)" This reverts commit40a1a7f43a. * feat: add exclude scan model types * fix: potential bug after adding excluded directories
This commit is contained in:
@@ -41,6 +41,10 @@ declare module 'hooks/store' {
|
||||
}
|
||||
}
|
||||
|
||||
export const configSetting = {
|
||||
excludeScanTypes: 'ModelManager.Scan.excludeScanTypes',
|
||||
}
|
||||
|
||||
function useAddConfigSettings(store: import('hooks/store').StoreProvider) {
|
||||
const { toast } = useToast()
|
||||
const { t } = useI18n()
|
||||
@@ -191,7 +195,7 @@ function useAddConfigSettings(store: import('hooks/store').StoreProvider) {
|
||||
})
|
||||
|
||||
app.ui?.settings.addSetting({
|
||||
id: 'ModelManager.Scan.excludeScanTypes',
|
||||
id: configSetting.excludeScanTypes,
|
||||
category: [t('modelManager'), t('setting.scan'), 'ExcludeScanTypes'],
|
||||
name: t('setting.excludeScanTypes'),
|
||||
defaultValue: undefined,
|
||||
|
||||
@@ -20,6 +20,7 @@ import {
|
||||
unref,
|
||||
} from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import { configSetting } from './config'
|
||||
|
||||
type ModelFolder = Record<string, string[]>
|
||||
|
||||
@@ -56,8 +57,20 @@ export const useModels = defineStore('models', (store) => {
|
||||
const refreshAllModels = async (force = false) => {
|
||||
const forceRefresh = force ? refreshFolders() : Promise.resolve()
|
||||
models.value = {}
|
||||
const excludeScanTypes = app.ui?.settings.getSettingValue<string>(
|
||||
configSetting.excludeScanTypes,
|
||||
)
|
||||
const customBlackList =
|
||||
excludeScanTypes
|
||||
?.split(',')
|
||||
.map((type) => type.trim())
|
||||
.filter(Boolean) ?? []
|
||||
return forceRefresh.then(() =>
|
||||
Promise.allSettled(Object.keys(folders.value).map(refreshModels)),
|
||||
Promise.allSettled(
|
||||
Object.keys(folders.value)
|
||||
.filter((folder) => !customBlackList.includes(folder))
|
||||
.map(refreshModels),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user