Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-31 22:08:48 +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/icon.go
View file

@ -54,17 +54,17 @@ type Icon struct {
Downloads int `json:"downloads"`
}
func Icons(proxyURL string) (icons []*Icon) {
func Icons() (icons []*Icon) {
icons = []*Icon{}
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/icons.json"
resp, err := request.SetResult(&result).Get(u)
if nil != err {
@ -86,7 +86,7 @@ func Icons(proxyURL string) (icons []*Icon) {
icon := &Icon{}
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/icon.json"
innerResp, innerErr := httpclient.NewBrowserRequest(proxyURL).SetResult(icon).Get(innerU)
innerResp, innerErr := httpclient.NewBrowserRequest().SetResult(icon).Get(innerU)
if nil != innerErr {
util.LogErrorf("get bazaar package [%s] failed: %s", repoURL, innerErr)
return
@ -126,9 +126,9 @@ func Icons(proxyURL string) (icons []*Icon) {
return
}
func InstallIcon(repoURL, repoHash, installPath, proxyURL string, chinaCDN bool, systemID string) error {
func InstallIcon(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
}