0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2022-09-28 12:13:27 +08:00
commit 51414491e7
6 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/appearance/langs/en_US.json
View file

@ -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<br>Click Open the menu<br>⌘Click Zoom In<br>⌥Click Expand/Collapse<br>⇧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]",

5
app/appearance/langs/es_ES.json
View file

@ -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<br>Clic para abrir el menú<br>⌘Clic para Ampliar<br>⌥Clic para Expandir/Contraer<br>⇧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]",

5
app/appearance/langs/fr_FR.json
View file

@ -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<br>Cliquez pour ouvrir le Menu<br>⌘Click Accès<br>⌥Click Élargir/Collapse<br>⇧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]",

5
app/appearance/langs/zh_CHT.json
View file

@ -302,7 +302,6 @@
"searchCaseSensitive1": "啟用後所有搜索相關功能將區分大小寫",
"toggleWin": "隱藏/顯示視窗",
"customSort": "自訂排序",
"downloadingUpdate": "正在下載更新包，請稍等...",
"collapse": "摺疊",
"blockEmbed": "嵌入塊",
"gutterTip": "拖拽 移動位置<br>點擊 打開菜單<br>⌘Click 進入<br>⌥Click 摺疊/展開<br>⇧Click 修改屬性",
@ -883,8 +882,8 @@
"100": "正在清理數據...",
"101": "設置提醒完畢 [%s]",
"102": "處理完畢",
"103": "TODO",
"104": "TODO",
"103": "已經在後台開始自動下載更新安裝包，退出時將詢問是否安裝新版本",
"104": "更新安裝包下載失敗，請檢查網絡連接",
"105": "TODO",
"106": "TODO",
"107": "正在移動文檔 [%s]",

5
app/appearance/langs/zh_CN.json
View file

@ -302,7 +302,6 @@
"searchCaseSensitive1": "启用后所有搜索相关功能将区分大小写",
"toggleWin": "隐藏/显示窗口",
"customSort": "自定义排序",
"downloadingUpdate": "正在下载更新包，请稍等...",
"collapse": "折叠",
"blockEmbed": "嵌入块",
"gutterTip": "拖拽 移动位置<br>点击 打开菜单<br>⌘Click 进入<br>⌥Click 折叠/展开<br>⇧Click 修改属性",
@ -883,8 +882,8 @@
"100": "正在清理数据...",
"101": "设置提醒完毕 [%s]",
"102": "处理完毕",
"103": "TODO",
"104": "TODO",
"103": "已经在后台开始自动下载更新安装包，退出时将询问是否安装新版本",
"104": "更新安装包下载失败，请检查网络连接",
"105": "TODO",
"106": "TODO",
"107": "正在移动文档 [%s]",

12
kernel/model/updater.go
View file

@ -146,11 +146,13 @@ 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).
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)
}
}()
}
}