From 7e8bcc4f629aeac96b60a4adb523aa9921ff9bb7 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 2 Sep 2022 10:32:24 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E9=9B=86=E5=B8=82=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=B7=B2=E5=AE=89=E8=A3=85=E7=9A=84=E5=8C=85=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=20https://github.com/siyuan-note/siyuan/issu?= =?UTF-8?q?es/5678?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/bazaar/icon.go | 4 ++-- kernel/bazaar/package.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index 799aaa36c..ff2bb2501 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -96,9 +96,9 @@ func Icons() (icons []*Icon) { func InstalledIcons() (ret []*Icon) { ret = []*Icon{} - dir, err := os.Open(filepath.Join(util.DataDir, "icons")) + dir, err := os.Open(filepath.Join(util.AppearancePath, "icons")) if nil != err { - logging.LogWarnf("open icons folder [%s] failed: %s", util.ThemesPath, err) + logging.LogWarnf("open icons folder failed: %s", err) return } iconDirs, err := dir.Readdir(-1) diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index f43692fd9..0de1247d3 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -107,7 +107,7 @@ func IconJSON(iconDirName string) (ret map[string]interface{}, err error) { } func TemplateJSON(templateDirName string) (ret map[string]interface{}, err error) { - p := filepath.Join(util.DataDir, templateDirName, "template.json") + p := filepath.Join(util.DataDir, "templates", templateDirName, "template.json") if !gulu.File.IsExist(p) { err = os.ErrNotExist return