From 20ab5d9edc079753199984da7e4733f77203fcdd Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 28 Sep 2022 11:45:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:zap:=20=E6=8F=90=E5=8D=87=E6=A1=8C?= =?UTF-8?q?=E9=9D=A2=E7=AB=AF=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=96=B0=E5=AE=89?= =?UTF-8?q?=E8=A3=85=E5=8C=85=E4=B8=8B=E8=BD=BD=E9=80=9F=E5=BA=A6=20Fix=20?= =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/5997?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/updater.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/model/updater.go b/kernel/model/updater.go index 37eb39e16..7dffef0b9 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -147,7 +147,7 @@ func downloadInstallPkg(pkgURL, checksum string) { logging.LogInfof("downloading install package [%s]", pkgURL) client := req.C().SetTimeout(60 * time.Minute) - err := client.NewParallelDownload(pkgURL).SetConcurrency(8).SetSegmentSize(1024 * 1024 * 4). + err := client.NewParallelDownload(pkgURL).SetConcurrency(8).SetSegmentSize(1024 * 1024 * 2). SetOutputFile(savePath).Do() if nil != err { logging.LogErrorf("download install package failed: %s", err) From 7884a5ebf787f351caf88eb136de83c891e0f588 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Wed, 28 Sep 2022 12:10:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:art:=20=E6=89=8B=E5=8A=A8=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E6=9B=B4=E6=96=B0=E6=97=B6=E8=87=AA=E5=8A=A8=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85=E5=8C=85=20Fix=20?= =?UTF-8?q?https://github.com/siyuan-note/siyuan/issues/5998?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 5 ++--- app/appearance/langs/es_ES.json | 5 ++--- app/appearance/langs/fr_FR.json | 5 ++--- app/appearance/langs/zh_CHT.json | 5 ++--- app/appearance/langs/zh_CN.json | 5 ++--- kernel/model/updater.go | 10 +++++++++- 6 files changed, 19 insertions(+), 16 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index c908b8d60..535490ea3 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -302,7 +302,6 @@ "searchCaseSensitive1": "After enabling, all search-related functions will be case sensitive", "toggleWin": "Hide/Show Window", "customSort": "Custom Sorting", - "downloadingUpdate": "Downloading the update package, please wait...", "collapse": "Collapse", "blockEmbed": "Embed Block", "gutterTip": "Drag to move position
Click Open the menu
⌘Click Zoom In
⌥Click Expand/Collapse
⇧Click Update attribute", @@ -883,8 +882,8 @@ "100": "Cleaning data...", "101": "Done setting reminder [%s]", "102": "Processing completed", - "103": "TODO", - "104": "TODO", + "103": "The update installation package has been automatically downloaded in the background. When exiting, you will be asked whether to install the new version", + "104": "The update installation package failed to download, please check the network connection", "105": "TODO", "106": "TODO", "107": "Moving document [%s]", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 4d5d88e83..2ac72c87f 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -302,7 +302,6 @@ "searchCaseSensitive1": "Después de habilitarlo, todas las funciones relacionadas con la búsqueda distinguirán entre mayúsculas y minúsculas", "toggleWin": "Ocultar/Mostrar Ventana", "customSort": "Clasificación personalizada", - "downloadingUpdate": "Descargando el paquete de actualización, por favor espere...", "collapse": "Colapsar", "blockEmbed": "Integrar Bloque", "gutterTip": "Arrastre para mover de posición
Clic para abrir el menú
⌘Clic para Ampliar
⌥Clic para Expandir/Contraer
⇧Clic para Actualizar atributo", @@ -883,8 +882,8 @@ "100": "Limpieza de datos...", "101": "El recordatorio de configuración [%s] se ha completado", "102": "Procesamiento completado", - "103": "TODO", - "104": "TODO", + "103": "El paquete de instalación de la actualización se ha descargado automáticamente en segundo plano. Al salir, se le preguntará si desea instalar la nueva versión", + "104": "El paquete de instalación de la actualización no se pudo descargar, verifique la conexión de red", "105": "TODO", "106": "TODO", "107": "Moviendo documento [%s]", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index f2effa630..3e6c28e2c 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -302,7 +302,6 @@ "searchCaseSensitive1": "Après l'activation, toutes les fonctions liées à la recherche seront sensibles à la casse.", "toggleWin": "Masquer/afficher fenêtres", "customSort": "Tri personnalisé", - "downloadingUpdate": "Téléchargement du paquet de mise à jour, veuillez patienter...", "collapse": "Collapse", "blockEmbed": "incorporer le bloc", "gutterTip": "Faites glisser pour déplacer la position
Cliquez pour ouvrir le Menu
⌘Click Accès
⌥Click Élargir/Collapse
⇧Click Modifier les attribut", @@ -883,8 +882,8 @@ "100": "Nettoyage des données...", "101": "Rappel de réglage terminé [%s]", "102": "Traitement terminé", - "103": "TODO", - "104": "TODO", + "103": "Le package d'installation de la mise à jour a été automatiquement téléchargé en arrière-plan. En quittant, il vous sera demandé si vous souhaitez installer la nouvelle version", + "104": "Le package d'installation de la mise à jour n'a pas pu être téléchargé, veuillez vérifier la connexion réseau", "105": "TODO", "106": "TODO", "107": "Déplacement du document [%s]", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index c9885cee9..1b5a36cde 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -302,7 +302,6 @@ "searchCaseSensitive1": "啟用後所有搜索相關功能將區分大小寫", "toggleWin": "隱藏/顯示視窗", "customSort": "自訂排序", - "downloadingUpdate": "正在下載更新包，請稍等...", "collapse": "摺疊", "blockEmbed": "嵌入塊", "gutterTip": "拖拽 移動位置
點擊 打開菜單
⌘Click 進入
⌥Click 摺疊/展開
⇧Click 修改屬性", @@ -883,8 +882,8 @@ "100": "正在清理數據...", "101": "設置提醒完畢 [%s]", "102": "處理完畢", - "103": "TODO", - "104": "TODO", + "103": "已經在後台開始自動下載更新安裝包，退出時將詢問是否安裝新版本", + "104": "更新安裝包下載失敗，請檢查網絡連接", "105": "TODO", "106": "TODO", "107": "正在移動文檔 [%s]", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 74b86139f..139c91fdf 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -302,7 +302,6 @@ "searchCaseSensitive1": "启用后所有搜索相关功能将区分大小写", "toggleWin": "隐藏/显示窗口", "customSort": "自定义排序", - "downloadingUpdate": "正在下载更新包，请稍等...", "collapse": "折叠", "blockEmbed": "嵌入块", "gutterTip": "拖拽 移动位置
点击 打开菜单
⌘Click 进入
⌥Click 折叠/展开
⇧Click 修改属性", @@ -883,8 +882,8 @@ "100": "正在清理数据...", "101": "设置提醒完毕 [%s]", "102": "处理完毕", - "103": "TODO", - "104": "TODO", + "103": "已经在后台开始自动下载更新安装包，退出时将询问是否安装新版本", + "104": "更新安装包下载失败，请检查网络连接", "105": "TODO", "106": "TODO", "107": "正在移动文档 [%s]", diff --git a/kernel/model/updater.go b/kernel/model/updater.go index 7dffef0b9..f3914e5ce 100644 --- a/kernel/model/updater.go +++ b/kernel/model/updater.go @@ -146,11 +146,13 @@ func downloadInstallPkg(pkgURL, checksum string) { } logging.LogInfof("downloading install package [%s]", pkgURL) - client := req.C().SetTimeout(60 * time.Minute) + msgId := util.PushMsg(Conf.Language(103), 60*1000*10) + client := req.C().SetTLSHandshakeTimeout(7 * time.Second).SetTimeout(10 * time.Minute) err := client.NewParallelDownload(pkgURL).SetConcurrency(8).SetSegmentSize(1024 * 1024 * 2). SetOutputFile(savePath).Do() if nil != err { logging.LogErrorf("download install package failed: %s", err) + util.PushUpdateMsg(msgId, Conf.Language(104), 7000) return } @@ -237,6 +239,12 @@ func CheckUpdate(showMsg bool) { } if showMsg { util.PushMsg(msg, timeout) + go func() { + checkDownloadInstallPkg() + if "" != getNewVerInstallPkgPath() { + util.PushMsg(Conf.Language(62), 0) + } + }() } }