Parcourir la source

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

Liang Ding il y a 2 ans
Parent
commit
0c6a486fa2
4 fichiers modifiés avec 21 ajouts et 17 suppressions
  1. 1 0
      kernel/bazaar/icon.go
  2. 1 0
      kernel/bazaar/template.go
  3. 1 0
      kernel/bazaar/theme.go
  4. 18 17
      kernel/bazaar/widget.go

+ 1 - 0
kernel/bazaar/icon.go

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

+ 1 - 0
kernel/bazaar/template.go

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

+ 1 - 0
kernel/bazaar/theme.go

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

+ 18 - 17
kernel/bazaar/widget.go

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