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

This commit is contained in:
Liang Ding 2022-09-01 19:37:33 +08:00
parent a563861ab8
commit 29021c8d02
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
6 changed files with 109 additions and 35 deletions

View file

@ -19,11 +19,13 @@ package bazaar
import (
"errors"
"os"
"path/filepath"
"sort"
"strings"
"sync"
"time"
"github.com/88250/gulu"
"github.com/dustin/go-humanize"
"github.com/panjf2000/ants/v2"
"github.com/siyuan-note/httpclient"
@ -130,6 +132,53 @@ func Templates() (templates []*Template) {
return
}
func InstalledTemplates() (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)
return
}
templateDirs, err := dir.Readdir(-1)
if nil != err {
logging.LogWarnf("read templates folder failed: %s", err)
return
}
dir.Close()
for _, templateDir := range templateDirs {
if !templateDir.IsDir() {
continue
}
dirName := templateDir.Name()
templateConf, parseErr := TemplateJSON(dirName)
if nil != parseErr || nil == templateConf {
continue
}
template := &Template{}
template.Name = templateConf["name"].(string)
template.Author = templateConf["author"].(string)
template.URL = templateConf["url"].(string)
template.Version = templateConf["version"].(string)
template.RepoURL = template.URL
template.PreviewURL = "/templates/" + dirName + "/preview.png"
template.PreviewURLThumb = "/templates/" + dirName + "/preview.png"
template.Updated = templateDir.ModTime().Format("2006-01-02 15:04:05")
template.Size = templateDir.Size()
template.HSize = humanize.Bytes(uint64(template.Size))
template.HUpdated = formatUpdated(template.Updated)
readme, readErr := os.ReadFile(filepath.Join(util.DataDir, "templates", dirName, "README.md"))
if nil != readErr {
logging.LogWarnf("read install template README.md failed: %s", readErr)
continue
}
template.README = gulu.Str.FromBytes(readme)
ret = append(ret, template)
}
return
}
func InstallTemplate(repoURL, repoHash, installPath string, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, true, systemID)