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

🎨 集市支持已安装的包单独显示 https://github.com/siyuan-note/siyuan/issues/5678

Browse source
This commit is contained in:
Liang Ding 2022-09-02 10:41:03 +08:00
parent 22cf11f229
commit 19396e87a7
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
kernel/bazaar/icon.go
View file

@ -137,7 +137,7 @@ func InstalledIcons() (ret []*Icon) {
icon.Size = iconDir.Size() icon.Size = iconDir.Size()
icon.HSize = humanize.Bytes(uint64(icon.Size)) icon.HSize = humanize.Bytes(uint64(icon.Size))
icon.HUpdated = formatUpdated(icon.Updated) icon.HUpdated = formatUpdated(icon.Updated)
readme, readErr := os.ReadFile(filepath.Join(util.DataDir, "icons", dirName, "README.md")) readme, readErr := os.ReadFile(filepath.Join(util.AppearancePath, "icons", dirName, "README.md"))
if nil != readErr { if nil != readErr {
logging.LogWarnf("read install icon README.md failed: %s", readErr) logging.LogWarnf("read install icon README.md failed: %s", readErr)
continue continue

4
kernel/bazaar/package.go
View file

@ -63,7 +63,7 @@ type Package struct {
} }
func WidgetJSON(widgetDirName string) (ret map[string]interface{}, err error) { func WidgetJSON(widgetDirName string) (ret map[string]interface{}, err error) {
p := filepath.Join(util.DataDir, widgetDirName, "widget.json") p := filepath.Join(util.DataDir, "widgets", widgetDirName, "widget.json")
if !gulu.File.IsExist(p) { if !gulu.File.IsExist(p) {
err = os.ErrNotExist err = os.ErrNotExist
return return
@ -85,7 +85,7 @@ func WidgetJSON(widgetDirName string) (ret map[string]interface{}, err error) {
} }
func IconJSON(iconDirName string) (ret map[string]interface{}, err error) { func IconJSON(iconDirName string) (ret map[string]interface{}, err error) {
p := filepath.Join(util.ThemesPath, "icons", iconDirName, "icon.json") p := filepath.Join(util.AppearancePath, "icons", iconDirName, "icon.json")
if !gulu.File.IsExist(p) { if !gulu.File.IsExist(p) {
err = os.ErrNotExist err = os.ErrNotExist
return return