github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-20 11:00:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Liang Ding 2022-09-01 21:48:50 +08:00
parent af96e48589
commit 0c6a486fa2
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/bazaar/icon.go
View File

@ -96,6 +96,7 @@ func Icons() (icons []*Icon) {
} }
func InstalledIcons() (ret []*Icon) { func InstalledIcons() (ret []*Icon) {
ret = []*Icon{}
dir, err := os.Open(filepath.Join(util.DataDir, "icons")) dir, err := os.Open(filepath.Join(util.DataDir, "icons"))
if nil != err { if nil != err {
logging.LogWarnf("open icons folder [%s] failed: %s", util.ThemesPath, err) logging.LogWarnf("open icons folder [%s] failed: %s", util.ThemesPath, err)

1
kernel/bazaar/template.go
View File

@ -99,6 +99,7 @@ func Templates() (templates []*Template) {
} }
func InstalledTemplates() (ret []*Template) { func InstalledTemplates() (ret []*Template) {
ret = []*Template{}
dir, err := os.Open(filepath.Join(util.DataDir, "templates")) dir, err := os.Open(filepath.Join(util.DataDir, "templates"))
if nil != err { if nil != err {
logging.LogWarnf("open templates folder [%s] failed: %s", util.ThemesPath, err) logging.LogWarnf("open templates folder [%s] failed: %s", util.ThemesPath, err)

1
kernel/bazaar/theme.go
View File

@ -98,6 +98,7 @@ func Themes() (ret []*Theme) {
} }
func InstalledThemes() (ret []*Theme) { func InstalledThemes() (ret []*Theme) {
ret = []*Theme{}
dir, err := os.Open(util.ThemesPath) dir, err := os.Open(util.ThemesPath)
if nil != err { if nil != err {
logging.LogWarnf("open appearance themes folder [%s] failed: %s", util.ThemesPath, err) logging.LogWarnf("open appearance themes folder [%s] failed: %s", util.ThemesPath, err)

35
kernel/bazaar/widget.go
View File

@ -96,7 +96,8 @@ func Widgets() (widgets []*Widget) {
return return
} }
func InstalledWidgets() (ret []*Icon) { func InstalledWidgets() (ret []*Widget) {
ret = []*Widget{}
dir, err := os.Open(filepath.Join(util.DataDir, "widgets")) dir, err := os.Open(filepath.Join(util.DataDir, "widgets"))
if nil != err { if nil != err {
logging.LogWarnf("open widgets folder [%s] failed: %s", util.ThemesPath, err) logging.LogWarnf("open widgets folder [%s] failed: %s", util.ThemesPath, err)
@ -122,26 +123,26 @@ func InstalledWidgets() (ret []*Icon) {
continue continue
} }
icon := &Icon{} widget := &Widget{}
icon.Name = widgetConf["name"].(string) widget.Name = widgetConf["name"].(string)
icon.Author = widgetConf["author"].(string) widget.Author = widgetConf["author"].(string)
icon.URL = widgetConf["url"].(string) widget.URL = widgetConf["url"].(string)
icon.Version = widgetConf["version"].(string) widget.Version = widgetConf["version"].(string)
icon.RepoURL = icon.URL widget.RepoURL = widget.URL
icon.PreviewURL = "/widgets/" + dirName + "/preview.png" widget.PreviewURL = "/widgets/" + dirName + "/preview.png"
icon.PreviewURLThumb = "/widgets/" + dirName + "/preview.png" widget.PreviewURLThumb = "/widgets/" + dirName + "/preview.png"
icon.Updated = widgetDir.ModTime().Format("2006-01-02 15:04:05") widget.Updated = widgetDir.ModTime().Format("2006-01-02 15:04:05")
icon.Size = widgetDir.Size() widget.Size = widgetDir.Size()
icon.HSize = humanize.Bytes(uint64(icon.Size)) widget.HSize = humanize.Bytes(uint64(widget.Size))
icon.HUpdated = formatUpdated(icon.Updated) widget.HUpdated = formatUpdated(widget.Updated)
readme, readErr := os.ReadFile(filepath.Join(util.DataDir, "widgets", dirName, "README.md")) readme, readErr := os.ReadFile(filepath.Join(util.DataDir, "widgets", dirName, "README.md"))
if nil != readErr { if nil != readErr {
logging.LogWarnf("read install icon README.md failed: %s", readErr) logging.LogWarnf("read install widget README.md failed: %s", readErr)
continue continue
} }
icon.README = gulu.Str.FromBytes(readme) widget.README = gulu.Str.FromBytes(readme)
icon.Outdated = isOutdatedWidget(icon.URL, icon.Version, bazaarWidgets) widget.Outdated = isOutdatedWidget(widget.URL, widget.Version, bazaarWidgets)
ret = append(ret, icon) ret = append(ret, widget)
} }
return return
} }