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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-09-03 23:34:11 +08:00
commit fcfbab3652
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/bazaar/package.go
View file

@ -178,7 +178,7 @@ func isOutdatedTheme(theme *Theme, bazaarThemes []*Theme) bool {
}
for _, pkg := range bazaarThemes {
if theme.URL == pkg.URL && theme.Version != pkg.Version {
if theme.URL == pkg.URL && theme.Name == pkg.Name && theme.Author == pkg.Author && theme.Version != pkg.Version {
theme.RepoHash = pkg.RepoHash
return true
}
@ -192,7 +192,7 @@ func isOutdatedIcon(icon *Icon, bazaarIcons []*Icon) bool {
}
for _, pkg := range bazaarIcons {
if icon.URL == pkg.URL && icon.Version != pkg.Version {
if icon.URL == pkg.URL && icon.Name == pkg.Name && icon.Author == pkg.Author && icon.Version != pkg.Version {
icon.RepoHash = pkg.RepoHash
return true
}
@ -206,7 +206,7 @@ func isOutdatedWidget(widget *Widget, bazaarWidgets []*Widget) bool {
}
for _, pkg := range bazaarWidgets {
if widget.URL == pkg.URL && widget.Version != pkg.Version {
if widget.URL == pkg.URL && widget.Name == pkg.Name && widget.Author == pkg.Author && widget.Version != pkg.Version {
widget.RepoHash = pkg.RepoHash
return true
}
@ -220,7 +220,7 @@ func isOutdatedTemplate(template *Template, bazaarTemplates []*Template) bool {
}
for _, pkg := range bazaarTemplates {
if template.URL == pkg.URL && template.Version != pkg.Version {
if template.URL == pkg.URL && template.Name == pkg.Name && template.Author == pkg.Author && template.Version != pkg.Version {
template.RepoHash = pkg.RepoHash
return true
}