Skip to content

Fix can't modify the name of site (#426) #427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sheepzh merged 1 commit into from
Mar 21, 2025
Merged

Fix can't modify the name of site (#426) #427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/background/icon-and-alias-collector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async function collectAlias(key: timer.site.SiteKey, tabTitle: string) {
if (!tabTitle) return
if (isUrl(tabTitle)) return
const siteName = extractSiteName(tabTitle, key.host)
siteName && await siteService.saveAlias(key, siteName)
siteName && await siteService.saveAlias(key, siteName, true)
}

/**
Expand Down
5 changes: 3 additions & 2 deletions src/pages/app/components/SiteManage/SiteManageTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ const _default = defineComponent({
return ElMessage.info("No data")
}
const toSave = new SiteMap<string>()
data.forEach(site => {
const items = await siteService.batchSelect(data)
items.filter(i => !i.alias).forEach(site => {
const newAlias = genInitialAlias(site)
newAlias && toSave.put(site, newAlias)
})
await siteService.batchSaveAlias(toSave)
await siteService.batchSaveAliasNoRewrite(toSave)
ctx.emit('aliasGenerated')
ElMessage.success(t(msg => msg.operation.successMsg))
}
Expand Down
8 changes: 4 additions & 4 deletions src/service/site-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ async function removeAlias(key: timer.site.SiteKey) {
await siteDatabase.save(exist)
}

async function saveAlias(key: timer.site.SiteKey, alias: string) {
async function saveAlias(key: timer.site.SiteKey, alias: string, noRewrite?: boolean) {
const exist = await siteDatabase.get(key)
let toUpdate: timer.site.SiteInfo
if (exist) {
// Can't overwrite if alias is already existed
if (exist.alias) return
if (exist.alias && noRewrite) return
toUpdate = exist
toUpdate.alias = alias
} else {
Expand All @@ -37,7 +37,7 @@ async function saveAlias(key: timer.site.SiteKey, alias: string) {
await siteDatabase.save(toUpdate)
}

async function batchSaveAlias(siteMap: SiteMap<string>): Promise<void> {
async function batchSaveAliasNoRewrite(siteMap: SiteMap<string>): Promise<void> {
if (!siteMap?.count?.()) return
const allSites = await siteDatabase.getBatch(siteMap.keys())
const existMap = new SiteMap<timer.site.SiteInfo>()
Expand Down Expand Up @@ -113,7 +113,7 @@ class SiteService {
}

saveAlias = saveAlias
batchSaveAlias = batchSaveAlias
batchSaveAliasNoRewrite = batchSaveAliasNoRewrite
removeAlias = removeAlias
saveIconUrl = saveIconUrl
removeIconUrl = removeIconUrl
Expand Down