From 7e8bcc4f629aeac96b60a4adb523aa9921ff9bb7 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 2 Sep 2022 10:32:24 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20=E9=9B=86=E5=B8=82=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=B7=B2=E5=AE=89=E8=A3=85=E7=9A=84=E5=8C=85=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E6=98=BE=E7=A4=BA=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/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 From 22cf11f229a2d2ef23f1eb211cc991399c21a13f Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 2 Sep 2022 10:36:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20=E9=9B=86=E5=B8=82=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=B7=B2=E5=AE=89=E8=A3=85=E7=9A=84=E5=8C=85=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E6=98=BE=E7=A4=BA=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/5678?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/bazaar/icon.go | 2 +- kernel/bazaar/package.go | 2 +- kernel/server/serve.go | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index ff2bb2501..ae177074f 100644 --- a/kernel/bazaar/icon.go +++ b/kernel/bazaar/icon.go @@ -151,7 +151,7 @@ func InstalledIcons() (ret []*Icon) { } func isBuiltInIcon(dirName string) bool { - return "and" == dirName || "material" == dirName + return "ant" == dirName || "material" == dirName } func InstallIcon(repoURL, repoHash, installPath string, systemID string) error { diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index 0de1247d3..e5af3bdcc 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -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, iconDirName, "icon.json") + p := filepath.Join(util.ThemesPath, "icons", iconDirName, "icon.json") if !gulu.File.IsExist(p) { err = os.ErrNotExist return diff --git a/kernel/server/serve.go b/kernel/server/serve.go index b56b22983..1701e2088 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -67,6 +67,7 @@ func Serve(fastMode bool) { serveExport(ginServer) serveWidgets(ginServer) serveEmojis(ginServer) + serveTemplates(ginServer) api.ServeAPI(ginServer) var addr string From 19396e87a7524971d00de8ad9315d59d9edfbe8c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 2 Sep 2022 10:41:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:art:=20=E9=9B=86=E5=B8=82=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E5=B7=B2=E5=AE=89=E8=A3=85=E7=9A=84=E5=8C=85=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E6=98=BE=E7=A4=BA=20https://github.com/siyuan-note/si?= =?UTF-8?q?yuan/issues/5678?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/bazaar/icon.go | 2 +- kernel/bazaar/package.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/bazaar/icon.go b/kernel/bazaar/icon.go index ae177074f..c8d40860c 100644 --- a/kernel/bazaar/icon.go +++ b/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 diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index e5af3bdcc..93749cb20 100644 --- a/kernel/bazaar/package.go +++ b/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