Procházet zdrojové kódy

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

Liang Ding před 2 roky
rodič
revize
19396e87a7
2 změnil soubory, kde provedl 3 přidání a 3 odebrání
  1. 1 1
      kernel/bazaar/icon.go
  2. 2 2
      kernel/bazaar/package.go

+ 1 - 1
kernel/bazaar/icon.go

@@ -137,7 +137,7 @@ func InstalledIcons() (ret []*Icon) {
 		icon.Size = iconDir.Size()
 		icon.HSize = humanize.Bytes(uint64(icon.Size))
 		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 {
 			logging.LogWarnf("read install icon README.md failed: %s", readErr)
 			continue

+ 2 - 2
kernel/bazaar/package.go

@@ -63,7 +63,7 @@ type Package struct {
 }
 
 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) {
 		err = os.ErrNotExist
 		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) {
-	p := filepath.Join(util.ThemesPath, "icons", iconDirName, "icon.json")
+	p := filepath.Join(util.AppearancePath, "icons", iconDirName, "icon.json")
 	if !gulu.File.IsExist(p) {
 		err = os.ErrNotExist
 		return