mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-09-22 00:20:47 +02:00
🎨 集市支持已安装的包单独显示 https://github.com/siyuan-note/siyuan/issues/5678
This commit is contained in:
parent
3750ca12cc
commit
a563861ab8
5 changed files with 106 additions and 25 deletions
|
@ -19,10 +19,12 @@ package bazaar
|
|||
import (
|
||||
"errors"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strings"
|
||||
"sync"
|
||||
|
||||
"github.com/88250/gulu"
|
||||
"github.com/dustin/go-humanize"
|
||||
ants "github.com/panjf2000/ants/v2"
|
||||
"github.com/siyuan-note/httpclient"
|
||||
|
@ -129,6 +131,73 @@ func Themes() (ret []*Theme) {
|
|||
return
|
||||
}
|
||||
|
||||
func InstalledThemes() (ret []*Theme) {
|
||||
dir, err := os.Open(util.ThemesPath)
|
||||
if nil != err {
|
||||
logging.LogWarnf("open appearance themes folder [%s] failed: %s", util.ThemesPath, err)
|
||||
return
|
||||
}
|
||||
themeDirs, err := dir.Readdir(-1)
|
||||
if nil != err {
|
||||
logging.LogWarnf("read appearance themes folder failed: %s", err)
|
||||
return
|
||||
}
|
||||
dir.Close()
|
||||
|
||||
for _, themeDir := range themeDirs {
|
||||
if !themeDir.IsDir() {
|
||||
continue
|
||||
}
|
||||
dirName := themeDir.Name()
|
||||
if isBuiltInTheme(dirName) {
|
||||
continue
|
||||
}
|
||||
|
||||
themeConf, parseErr := ThemeJSON(dirName)
|
||||
if nil != parseErr || nil == themeConf {
|
||||
continue
|
||||
}
|
||||
|
||||
theme := &Theme{}
|
||||
theme.Name = themeConf["name"].(string)
|
||||
theme.Author = themeConf["author"].(string)
|
||||
theme.URL = themeConf["url"].(string)
|
||||
theme.Version = themeConf["version"].(string)
|
||||
theme.Modes = make([]string, 0, len(themeConf["modes"].([]interface{})))
|
||||
theme.RepoURL = theme.URL
|
||||
theme.PreviewURL = "/appearance/themes/" + dirName + "/preview.png"
|
||||
theme.PreviewURLThumb = "/appearance/themes/" + dirName + "/preview.png"
|
||||
theme.Updated = themeDir.ModTime().Format("2006-01-02 15:04:05")
|
||||
theme.Size = themeDir.Size()
|
||||
theme.HSize = humanize.Bytes(uint64(theme.Size))
|
||||
theme.HUpdated = formatUpdated(theme.Updated)
|
||||
readme, readErr := os.ReadFile(filepath.Join(util.ThemesPath, dirName, "README.md"))
|
||||
if nil != readErr {
|
||||
logging.LogWarnf("read install theme README.md failed: %s", readErr)
|
||||
continue
|
||||
}
|
||||
theme.README = gulu.Str.FromBytes(readme)
|
||||
|
||||
if !existThemes(ret, theme) {
|
||||
ret = append(ret, theme)
|
||||
}
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func isBuiltInTheme(dirName string) bool {
|
||||
return "daylight" == dirName || "midnight" == dirName
|
||||
}
|
||||
|
||||
func existThemes(themes []*Theme, theme *Theme) bool {
|
||||
for _, t := range themes {
|
||||
if t.Name == theme.Name {
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
func InstallTheme(repoURL, repoHash, installPath string, systemID string) error {
|
||||
repoURLHash := repoURL + "@" + repoHash
|
||||
data, err := downloadPackage(repoURLHash, true, systemID)
|
||||
|
@ -146,3 +215,25 @@ func UninstallTheme(installPath string) error {
|
|||
//logging.Logger.Infof("uninstalled theme [%s]", installPath)
|
||||
return nil
|
||||
}
|
||||
|
||||
func ThemeJSON(themeName string) (ret map[string]interface{}, err error) {
|
||||
p := filepath.Join(util.ThemesPath, themeName, "theme.json")
|
||||
if !gulu.File.IsExist(p) {
|
||||
err = os.ErrNotExist
|
||||
return
|
||||
}
|
||||
data, err := os.ReadFile(p)
|
||||
if nil != err {
|
||||
logging.LogErrorf("read theme.json [%s] failed: %s", p, err)
|
||||
return
|
||||
}
|
||||
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
|
||||
logging.LogErrorf("parse theme.json [%s] failed: %s", p, err)
|
||||
return
|
||||
}
|
||||
if 5 > len(ret) {
|
||||
logging.LogWarnf("invalid theme.json [%s]", p)
|
||||
return nil, errors.New("invalid theme.json")
|
||||
}
|
||||
return
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue