From 6a0d69cfef97408a41aff32548473f0c9d0f5ee7 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 2 Jan 2023 21:49:58 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E5=88=86=E4=BA=AB=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=88=B0=E9=93=BE=E6=BB=B4=20https://github.com/siyua?= =?UTF-8?q?n-note/siyuan/issues/2004?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/assets.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/kernel/model/assets.go b/kernel/model/assets.go index f7c50786e..c13262647 100644 --- a/kernel/model/assets.go +++ b/kernel/model/assets.go @@ -34,6 +34,7 @@ import ( "github.com/88250/gulu" "github.com/88250/lute/ast" "github.com/88250/lute/parse" + "github.com/dustin/go-humanize" "github.com/gabriel-vasile/mimetype" "github.com/siyuan-note/filelock" "github.com/siyuan-note/httpclient" @@ -327,13 +328,20 @@ func uploadCloud(sqlAssets []*sql.Asset) (err error) { return } + limitSize := uint64(3 * 1024 * 1024) // 3MB + if IsSubscriber() { + limitSize = 10 * 1024 * 1024 // 10MB + } var completedUploadAssets []string for _, absAsset := range uploadAbsAssets { - if fi, statErr := os.Stat(absAsset); nil != statErr { + fi, statErr := os.Stat(absAsset) + if nil != statErr { logging.LogErrorf("stat file [%s] failed: %s", absAsset, statErr) return statErr - } else if 10*1024*1024 <= fi.Size() { - logging.LogWarnf("file [%s] larger than 10MB, ignore uploading it", absAsset) + } + + if limitSize < uint64(fi.Size()) { + logging.LogWarnf("file [%s] larger than limit size [%s], ignore uploading it", humanize.IBytes(limitSize), absAsset) continue }