Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-29 19:56:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

♻️ 重构内核代理设置 Fix https://github.com/siyuan-note/siyuan/issues/5380

Browse source
This commit is contained in:
Liang Ding 2022-07-09 11:22:51 +08:00
parent 2880222bc6
commit 70b8a7d8eb
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
16 changed files with 89 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/bazaar/theme.go
View file

@ -55,17 +55,17 @@ type Theme struct {
Downloads int `json:"downloads"`
}
func Themes(proxyURL string) (ret []*Theme) {
func Themes() (ret []*Theme) {
ret = []*Theme{}
result, err := util.GetRhyResult(false, proxyURL)
result, err := util.GetRhyResult(false)
if nil != err {
return
}
bazaarIndex := getBazaarIndex(proxyURL)
bazaarIndex := getBazaarIndex()
bazaarHash := result["bazaar"].(string)
result = map[string]interface{}{}
request := httpclient.NewBrowserRequest(proxyURL)
request := httpclient.NewBrowserRequest()
u := util.BazaarOSSServer + "/bazaar@" + bazaarHash + "/stage/themes.json"
resp, reqErr := request.SetResult(&result).Get(u)
if nil != reqErr {
@ -88,7 +88,7 @@ func Themes(proxyURL string) (ret []*Theme) {
theme := &Theme{}
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/theme.json"
innerResp, innerErr := httpclient.NewBrowserRequest(proxyURL).SetResult(theme).Get(innerU)
innerResp, innerErr := httpclient.NewBrowserRequest().SetResult(theme).Get(innerU)
if nil != innerErr {
util.LogErrorf("get bazaar package [%s] failed: %s", innerU, innerErr)
return
@ -128,9 +128,9 @@ func Themes(proxyURL string) (ret []*Theme) {
return
}
func InstallTheme(repoURL, repoHash, installPath, proxyURL string, chinaCDN bool, systemID string) error {
func InstallTheme(repoURL, repoHash, installPath string, chinaCDN bool, systemID string) error {
repoURLHash := repoURL + "@" + repoHash
data, err := downloadPackage(repoURLHash, proxyURL, chinaCDN, true, systemID)
data, err := downloadPackage(repoURLHash, chinaCDN, true, systemID)
if nil != err {
return err
}