mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-02 22:21:28 +08:00
🎨 Improve marketplace package loading https://github.com/siyuan-note/siyuan/issues/13950
This commit is contained in:
parent
5e88631c1b
commit
c1b70e4515
@ -47,6 +47,11 @@ func Icons() (icons []*Icon) {
|
||||
return
|
||||
}
|
||||
bazaarIndex := getBazaarIndex()
|
||||
if 1 > len(bazaarIndex) {
|
||||
return
|
||||
}
|
||||
|
||||
requestFailed := false
|
||||
waitGroup := &sync.WaitGroup{}
|
||||
lock := &sync.Mutex{}
|
||||
p, _ := ants.NewPoolWithFunc(2, func(arg interface{}) {
|
||||
@ -62,15 +67,21 @@ func Icons() (icons []*Icon) {
|
||||
return
|
||||
}
|
||||
|
||||
if requestFailed {
|
||||
return
|
||||
}
|
||||
|
||||
icon := &Icon{}
|
||||
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/icon.json"
|
||||
innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(icon).Get(innerU)
|
||||
if nil != innerErr {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %s", repoURL, innerErr)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
if 200 != innerResp.StatusCode {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %d", innerU, innerResp.StatusCode)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -49,7 +49,11 @@ func Plugins(frontend string) (plugins []*Plugin) {
|
||||
return
|
||||
}
|
||||
bazaarIndex := getBazaarIndex()
|
||||
if 1 > len(bazaarIndex) {
|
||||
return
|
||||
}
|
||||
|
||||
requestFailed := false
|
||||
waitGroup := &sync.WaitGroup{}
|
||||
lock := &sync.Mutex{}
|
||||
p, _ := ants.NewPoolWithFunc(8, func(arg interface{}) {
|
||||
@ -65,15 +69,21 @@ func Plugins(frontend string) (plugins []*Plugin) {
|
||||
return
|
||||
}
|
||||
|
||||
if requestFailed {
|
||||
return
|
||||
}
|
||||
|
||||
plugin := &Plugin{}
|
||||
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/plugin.json"
|
||||
innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(plugin).Get(innerU)
|
||||
if nil != innerErr {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %s", repoURL, innerErr)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
if 200 != innerResp.StatusCode {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %d", innerU, innerResp.StatusCode)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -48,6 +48,11 @@ func Templates() (templates []*Template) {
|
||||
return
|
||||
}
|
||||
bazaarIndex := getBazaarIndex()
|
||||
if 1 > len(bazaarIndex) {
|
||||
return
|
||||
}
|
||||
|
||||
requestFailed := false
|
||||
waitGroup := &sync.WaitGroup{}
|
||||
lock := &sync.Mutex{}
|
||||
p, _ := ants.NewPoolWithFunc(2, func(arg interface{}) {
|
||||
@ -63,15 +68,21 @@ func Templates() (templates []*Template) {
|
||||
return
|
||||
}
|
||||
|
||||
if requestFailed {
|
||||
return
|
||||
}
|
||||
|
||||
template := &Template{}
|
||||
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/template.json"
|
||||
innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(template).Get(innerU)
|
||||
if nil != innerErr {
|
||||
logging.LogErrorf("get community template [%s] failed: %s", repoURL, innerErr)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
if 200 != innerResp.StatusCode {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %d", innerU, innerResp.StatusCode)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -49,6 +49,11 @@ func Themes() (ret []*Theme) {
|
||||
return
|
||||
}
|
||||
bazaarIndex := getBazaarIndex()
|
||||
if 1 > len(bazaarIndex) {
|
||||
return
|
||||
}
|
||||
|
||||
requestFailed := false
|
||||
waitGroup := &sync.WaitGroup{}
|
||||
lock := &sync.Mutex{}
|
||||
p, _ := ants.NewPoolWithFunc(8, func(arg interface{}) {
|
||||
@ -64,15 +69,21 @@ func Themes() (ret []*Theme) {
|
||||
return
|
||||
}
|
||||
|
||||
if requestFailed {
|
||||
return
|
||||
}
|
||||
|
||||
theme := &Theme{}
|
||||
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/theme.json"
|
||||
innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(theme).Get(innerU)
|
||||
if nil != innerErr {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %s", innerU, innerErr)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
if 200 != innerResp.StatusCode {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %d", innerU, innerResp.StatusCode)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
|
||||
|
@ -47,7 +47,11 @@ func Widgets() (widgets []*Widget) {
|
||||
return
|
||||
}
|
||||
bazaarIndex := getBazaarIndex()
|
||||
if 1 > len(bazaarIndex) {
|
||||
return
|
||||
}
|
||||
|
||||
requestFailed := false
|
||||
waitGroup := &sync.WaitGroup{}
|
||||
lock := &sync.Mutex{}
|
||||
p, _ := ants.NewPoolWithFunc(8, func(arg interface{}) {
|
||||
@ -63,15 +67,21 @@ func Widgets() (widgets []*Widget) {
|
||||
return
|
||||
}
|
||||
|
||||
if requestFailed {
|
||||
return
|
||||
}
|
||||
|
||||
widget := &Widget{}
|
||||
innerU := util.BazaarOSSServer + "/package/" + repoURL + "/widget.json"
|
||||
innerResp, innerErr := httpclient.NewBrowserRequest().SetSuccessResult(widget).Get(innerU)
|
||||
if nil != innerErr {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %s", repoURL, innerErr)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
if 200 != innerResp.StatusCode {
|
||||
logging.LogErrorf("get bazaar package [%s] failed: %d", innerU, innerResp.StatusCode)
|
||||
requestFailed = true
|
||||
return
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user