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

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

Browse source
This commit is contained in:
Vanessa 2022-09-02 10:42:33 +08:00
commit 0f13f79ce4
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/bazaar/icon.go
View file

@ -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)
@ -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
@ -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 {

6
kernel/bazaar/package.go
View file

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

1
kernel/server/serve.go
View file

@ -67,6 +67,7 @@ func Serve(fastMode bool) {
serveExport(ginServer)
serveWidgets(ginServer)
serveEmojis(ginServer)
serveTemplates(ginServer)
api.ServeAPI(ginServer)
var addr string