github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-19 02:21:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Improve S3/WebDAV data sync error message Fix https://github.com/siyuan-note/siyuan/issues/9626

Browse Source
This commit is contained in:
Daniel 2023-11-10 23:00:17 +08:00
parent 22f78326f2
commit eb6f892a47
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
8 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/appearance/langs/en_US.json
View File

@ -1317,6 +1317,7 @@
"215": "Save failed: The target file is being used by another program",
"216": "Rebuilding asset content data index, please wait...",
"217": "[%d/%d] Created asset content data index",
"218": "Too many snapshots of the data repo have been detected, which slows down program startup and data sync. Please consider executing [Settings - About - Data repo purge]"
"218": "Too many snapshots of the data repo have been detected, which slows down program startup and data sync. Please consider executing [Settings - About - Data repo purge]",
"219": "The cloud storage service is unavailable, please try again later"
}
}

3
app/appearance/langs/es_ES.json
View File

@ -1317,6 +1317,7 @@
"215": "Error al guardar: el archivo de destino está siendo utilizado por otro programa",
"216": "Reconstruyendo el índice de datos de contenido de recursos, espere...",
"217": "[%d/%d] Índice de datos de contenido de activos creado",
"218": "Se han detectado demasiadas instantáneas del repositorio de datos, lo que ralentiza el inicio del programa y la sincronización de datos. Considere ejecutar [Configuración - Acerca de - Purga del repositorio de datos]"
"218": "Se han detectado demasiadas instantáneas del repositorio de datos, lo que ralentiza el inicio del programa y la sincronización de datos. Considere ejecutar [Configuración - Acerca de - Purga del repositorio de datos]",
"219": "El servicio de almacenamiento en la nube no está disponible, inténtalo de nuevo más tarde"
}
}

3
app/appearance/langs/fr_FR.json
View File

@ -1317,6 +1317,7 @@
"215": "Échec de l'enregistrement : le fichier de destination est utilisé par un autre programme",
"216": "Reconstruction de l'index des données du contenu des ressources, veuillez patienter...",
"217": "[%d/%d] Création d'un index de données de contenu d'actif",
"218": "Trop d'instantanés du référentiel de données ont été détectés, ce qui ralentit le démarrage du programme et la synchronisation des données. Veuillez envisager d'exécuter [Paramètres - À propos - Purge du référentiel de données]"
"218": "Trop d'instantanés du référentiel de données ont été détectés, ce qui ralentit le démarrage du programme et la synchronisation des données. Veuillez envisager d'exécuter [Paramètres - À propos - Purge du référentiel de données]",
"219": "Le service de stockage cloud n'est pas disponible, veuillez réessayer plus tard"
}
}

3
app/appearance/langs/zh_CHT.json
View File

@ -1317,6 +1317,7 @@
"215": "保存失敗：目標文件正在被其他程序佔用",
"216": "正在重建資源文件內容數據索引，請稍等...",
"217": "[%d/%d] 已經創建資源文件內容數據索引",
"218": "偵測到資料倉儲快照過多，降低了程式啟動和資料同步速度，請考慮執行 [設定 - 關於 - 資料倉儲清理]"
"218": "偵測到資料倉儲快照過多，降低了程式啟動和資料同步速度，請考慮執行 [設定 - 關於 - 資料倉儲清理]",
"219": "雲端儲存服務不可用，請稍後再試"
}
}

3
app/appearance/langs/zh_CN.json
View File

@ -1317,6 +1317,7 @@
"215": "保存失败：目标文件并且正在被其他程序占用",
"216": "正在重建资源文件内容数据索引，请稍等...",
"217": "[%d/%d] 已经创建资源文件内容数据索引",
"218": "检测到数据仓库快照过多，降低了程序启动和数据同步速度，请考虑执行 [设置 - 关于 - 数据仓库清理]"
"218": "检测到数据仓库快照过多，降低了程序启动和数据同步速度，请考虑执行 [设置 - 关于 - 数据仓库清理]",
"219": "云端存储服务不可用，请稍后再试"
}
}

2
kernel/go.mod
View File

@ -49,7 +49,7 @@ require (
github.com/radovskyb/watcher v1.0.7
github.com/sashabaranov/go-openai v1.17.5
github.com/shirou/gopsutil/v3 v3.23.10
github.com/siyuan-note/dejavu v0.0.0-20231110140645-e32f6a32cffa
github.com/siyuan-note/dejavu v0.0.0-20231110145452-59dbd8bb6c2f
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80
github.com/siyuan-note/filelock v0.0.0-20231107122348-6ed75b0b525a

2
kernel/go.sum
View File

@ -354,6 +354,8 @@ github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05Ut
github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
github.com/siyuan-note/dejavu v0.0.0-20231110140645-e32f6a32cffa h1:m7+UGC/nVyLKGy3NxWFJ1cT1sJDLUJ+D0sO/8cyN+xo=
github.com/siyuan-note/dejavu v0.0.0-20231110140645-e32f6a32cffa/go.mod h1:6RdIofCDZP8vL0qYnVZfB12NhK7cUgh1ooUxRvRdlmI=
github.com/siyuan-note/dejavu v0.0.0-20231110145452-59dbd8bb6c2f h1:sq/GK4HappFB+VID9YphmZ1oVtj+Cc/4l6ZPSUy8r/g=
github.com/siyuan-note/dejavu v0.0.0-20231110145452-59dbd8bb6c2f/go.mod h1:6RdIofCDZP8vL0qYnVZfB12NhK7cUgh1ooUxRvRdlmI=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80 h1:XghjHKJd+SiL0DkGYFVC+UGUDFtnR4v9gkAbPeh9Eq8=

2
kernel/model/sync.go
View File

@ -534,6 +534,8 @@ func formatRepoErrorMsg(err error) string {
msg = Conf.Language(212)
} else if errors.Is(err, cloud.ErrCloudCheckFailed) {
msg = Conf.Language(213)
} else if errors.Is(err, cloud.ErrCloudServiceUnavailable) {
msg = Conf.language(219)
} else {
msgLowerCase := strings.ToLower(msg)
if strings.Contains(msgLowerCase, "permission denied") || strings.Contains(msg, "access is denied") {