Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-23 18:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 Improve the fallback logic of the marketplace (#16612)

Browse source
This commit is contained in:
Jeffrey Chen 2025-12-17 07:43:05 +08:00 • committed by GitHub
parent 8d1b761b11
commit dc1be6676f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 42 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

70
kernel/bazaar/package.go
View file

@ -240,19 +240,23 @@ func getPreferredReadme(readme *Readme) string {
ret = readme.ZhCN ret = readme.ZhCN
} }
} }
if "" == strings.TrimSpace(ret) { if "" != strings.TrimSpace(ret) {
defaultReadme := strings.TrimSpace(readme.Default)
if defaultReadme != "" {
ret = defaultReadme
} else if "" != readme.EnUS {
ret = readme.EnUS
} else {
ret = "README.md"
}
}
return ret return ret
} }
defaultReadme := strings.TrimSpace(readme.Default)
if "" != defaultReadme {
return defaultReadme
}
enUSReadme := strings.TrimSpace(readme.EnUS)
if "" != enUSReadme {
return enUSReadme
}
return "README.md"
}
func GetPreferredName(pkg *Package) string { func GetPreferredName(pkg *Package) string {
if nil == pkg.DisplayName { if nil == pkg.DisplayName {
return pkg.Name return pkg.Name
@ -321,19 +325,23 @@ func GetPreferredName(pkg *Package) string {
ret = pkg.DisplayName.ZhCN ret = pkg.DisplayName.ZhCN
} }
} }
if "" == strings.TrimSpace(ret) { if "" != strings.TrimSpace(ret) {
defaultName := strings.TrimSpace(pkg.DisplayName.Default)
if defaultName != "" {
ret = defaultName
} else if "" != pkg.DisplayName.EnUS {
ret = pkg.DisplayName.EnUS
} else {
ret = pkg.Name
}
}
return ret return ret
} }
defaultName := strings.TrimSpace(pkg.DisplayName.Default)
if "" != defaultName {
return defaultName
}
enUSName := strings.TrimSpace(pkg.DisplayName.EnUS)
if "" != enUSName {
return enUSName
}
return pkg.Name
}
func getPreferredDesc(desc *Description) string { func getPreferredDesc(desc *Description) string {
if nil == desc { if nil == desc {
return "" return ""
@ -402,17 +410,23 @@ func getPreferredDesc(desc *Description) string {
ret = desc.ZhCN ret = desc.ZhCN
} }
} }
if "" == strings.TrimSpace(ret) { if "" != strings.TrimSpace(ret) {
defaultDesc := strings.TrimSpace(desc.Default)
if defaultDesc != "" {
ret = defaultDesc
} else if "" != desc.EnUS {
ret = desc.EnUS
}
}
return ret return ret
} }
defaultDesc := strings.TrimSpace(desc.Default)
if "" != defaultDesc {
return defaultDesc
}
enUSDesc := strings.TrimSpace(desc.EnUS)
if "" != enUSDesc {
return enUSDesc
}
return ""
}
func getPreferredFunding(funding *Funding) string { func getPreferredFunding(funding *Funding) string {
if nil == funding { if nil == funding {
return "" return ""