From 4cea235f9f776e9a0a6b8528d976d92f5948824d Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Tue, 13 Dec 2022 10:45:44 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E9=9B=86=E5=B8=82=E5=8C=85=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E8=BF=9B=E5=BA=A6=E6=B2=A1=E6=9C=89=E5=B1=95=E7=8E=B0?= =?UTF-8?q?=20https://github.com/siyuan-note/siyuan/issues/6862?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/bazaar/package.go | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/kernel/bazaar/package.go b/kernel/bazaar/package.go index d69d57eef..e220abbfc 100644 --- a/kernel/bazaar/package.go +++ b/kernel/bazaar/package.go @@ -305,22 +305,21 @@ func downloadPackage(repoURLHash string, pushProgress bool, systemID string) (da repoURLHash = strings.TrimPrefix(repoURLHash, "https://github.com/") u := util.BazaarOSSServer + "/package/" + repoURLHash buf := &bytes.Buffer{} - resp, err := httpclient.NewBrowserRequest().SetOutput(buf).SetDownloadCallback(func(info req.DownloadInfo) { + resp, err := req.C(). + SetUserAgent(util.UserAgent). + SetTimeout(30 * time.Second). + DisableInsecureSkipVerify(). + R().SetRetryCount(1). + SetOutput(buf).SetDownloadCallback(func(info req.DownloadInfo) { if pushProgress { - util.PushDownloadProgress(pushID, float32(info.DownloadedSize)/float32(info.Response.ContentLength)) + progress := float32(info.DownloadedSize) / float32(info.Response.ContentLength) + logging.LogDebugf("downloading bazaar package [%d]", progress) + util.PushDownloadProgress(pushID, progress) } }).Get(u) if nil != err { - u = util.BazaarOSSServer + "/package/" + repoURLHash - resp, err = httpclient.NewBrowserRequest().SetOutput(buf).SetDownloadCallback(func(info req.DownloadInfo) { - if pushProgress { - util.PushDownloadProgress(pushID, float32(info.DownloadedSize)/float32(info.Response.ContentLength)) - } - }).Get(u) - if nil != err { - logging.LogErrorf("get bazaar package [%s] failed: %s", u, err) - return nil, errors.New("get bazaar package failed") - } + logging.LogErrorf("get bazaar package [%s] failed: %s", u, err) + return nil, errors.New("get bazaar package failed") } if 200 != resp.StatusCode { logging.LogErrorf("get bazaar package [%s] failed: %d", u, resp.StatusCode)