Merge pull request #589 from Hi-Windom/huge_merge

Huge merge

.editorconfig

@@ -7,7 +7,7 @@ root = true
 charset = utf-8
 end_of_line = lf
 indent_size = 2
-indent_style = tab
+indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = false
 

README.md → .github/README.md

@@ -12,21 +12,21 @@
 
 <p align="center">
 <br><br>
-<a href="README_zh_CN.md">思源（SiYuan）</a>&emsp;|&emsp;<a href="README_Sillot.md">汐洛（Sillot）</a>
+<a href="../README_zh_CN.md">思源（SiYuan）</a> | <a href="README_Sillot.md">汐洛（Sillot）</a>
 </p>
 
 <p align="center">
 <br><br><br><br><br>
-<img alt="split" src="./.github/split.png"/>
+<img alt="split" src="./split.png"/>
 </p>
 
 ## 浏览器兼容性
 
-<img src="screenshots/sillot/es2022.png"/>
+<img src="../screenshots/sillot/es2022.png"/>
 
 <p align="center">
 <br><br><br><br><br>
-<img alt="split" src="./.github/split.png"/>
+<img alt="split" src="./split.png"/>
 </p>
 
 ## 🛠️ Contributors
@@ -37,7 +37,7 @@
 
 <p align="center">
 <br><br><br><br><br>
-<img alt="split" src="./.github/split.png"/>
+<img alt="split" src="./split.png"/>
 </p>
 
 ## 🔭 Roadmap

README_Sillot.md → .github/README_Sillot.md

@@ -1,9 +1,9 @@
 <p align="center">
-<img alt="Sillot" src="./app/stage/icon.png">
+<img alt="Sillot" src="../app/stage/icon.png">
 </p>
 
 <p align="center">
-<a href="README_zh_CN.md">思源（SiYuan）</a> | 汐洛（Sillot）
+<a href="../README_zh_CN.md">思源（SiYuan）</a> | 汐洛（Sillot）
 
 </p>
 
@@ -33,7 +33,7 @@
 汐洛始终代表先进恣产力，始终拥护全球先进开源力量，坚定不移推动新彖乄面向未来持续发展。
 
 <p align="center">
-<img alt="framework" src="./screenshots/sillot/framework.png">
+<img alt="framework" src="../screenshots/sillot/framework.png">
 </p>
 
 ## 极致优雅
@@ -45,7 +45,7 @@
 汐洛始终坚持精品路线，从不在任何一个细节上妥协。专注于为目标用户提供最好的使用体验，这是实现极致优雅的必由之路。汐洛尊重非目标用户的声音，但并不关心。
 
 <p align="center">
-<img alt="framework" src="./screenshots/sillot/booting1.png">
+<img alt="framework" src="../screenshots/sillot/booting1.png">
 </p>
 
 ## 开发者友好
@@ -64,13 +64,12 @@ go install github.com/ofabry/go-callvis
 
 然后在新终端 `go-callvis main.go`
 
-
 ### 合并冲突
 
 注意事项：
 
 1. tpl 模板直接合并冲突没有作用，汐洛是通过 JS 生成的 tpl ，因此需要修改 genTPLData.js 等 JS 文件
 
 <p align="center">
-<img alt="split" src="./.github/split.png">
+<img alt="split" src="./split.png">
 </p>

.github/about.readme.md

@@ -0,0 +1,3 @@
+# [REF](https://docs.github.com/zh/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-readmes)
+
+如果存储库包含多个自述文件，则按以下顺序从各位置中选择显示的文件：.github 目录，然后是存储库的根目录，最后是 docs 目录。

.github/workflows/Codecov.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: ${{ github.workspace }}/go/src/github.com/Hi-Windom/Sillot
       - name: Set up Node 18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
       - name: Install Node pnpm

.github/workflows/aci.yml

@@ -16,8 +16,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    # - uses: actions/checkout@v3
-    # - uses: actions/setup-node@v3
+    # - uses: actions/checkout@v4
+    # - uses: actions/setup-node@v4
     #   with:
     #       node-version: 16
     - name: Get Latest Release Assets
@@ -64,4 +64,4 @@ jobs:
           upload_url: ${{ steps.latest_release.outputs.result }}
           asset_path: ./Assets_SHA256_Sum.txt
           asset_name: Assets_SHA256_Sum.txt
-          asset_content_type: text/plain
+          asset_content_type: text/plain

.github/workflows/cd.yml

@@ -36,6 +36,12 @@ jobs:
         with:
           cmd: "jq .syv app/package.json -r"
 
+      - name: Extract SiYuan version from package.json
+        uses: sergeysova/jq-action@v2
+        id: sypv
+        with:
+            cmd: "jq .sypv app/package.json -r"
+
       - id: thislatestR
         uses: pozetroninc/github-action-get-latest-release@master
         with:
@@ -56,18 +62,22 @@ jobs:
         run: |
           echo "release_title=$(git show --format=%s --no-patch | head -1)" >> $GITHUB_OUTPUT
           echo "release_version=v${{ steps.version.outputs.value }}_$(TZ=Asia/Shanghai date +'%Y%m%d')_syv${{ steps.syv.outputs.value }}" >> $GITHUB_OUTPUT
-          changelog=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} -b ${{ steps.thislatestR.outputs.release }} Hi-Windom/Sillot)
+          changelog1=$(python scripts/parse-changelog-HEAD.py -t ${{ github.ref }} -b ${{ steps.thislatestR.outputs.release }} Hi-Windom/Sillot)
+          changelog2=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} Hi-Windom/Sillot)
+          changelog3=$(python scripts/parse-changelog-sillot.py -t ${{ github.ref }} Hi-Windom/Sillot-android)
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           echo "release_body_sillot<<$EOF" >> $GITHUB_ENV
-          echo "$changelog" >> $GITHUB_ENV
+          echo "$changelog1" >> $GITHUB_ENV
+          echo "$changelog2" >> $GITHUB_ENV
+          echo "$changelog3" >> $GITHUB_ENV
           echo "$EOF" >> $GITHUB_ENV
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Gather SiYuan Release Information
         id: release_info_siyuan
         run: |
-          changelog=$(python scripts/parse-changelog.py -t v${{ steps.syv.outputs.value }} siyuan-note/siyuan)
+          changelog=$(python scripts/parse-changelog.py -t v${{ steps.syv.outputs.value }} -b v${{ steps.sypv.outputs.value }} siyuan-note/siyuan)
           EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
           echo "release_body_siyuan<<$EOF" >> $GITHUB_ENV
           echo "$changelog" >> $GITHUB_ENV
@@ -155,7 +165,7 @@ jobs:
         working-directory: ${{ github.workspace }}
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version: "1.21"
 
@@ -171,7 +181,7 @@ jobs:
           GOARCH: ${{ matrix.config.goarch }}
 
       - name: Set up Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 20
 
@@ -278,9 +288,11 @@ jobs:
           distribution: 'zulu'
           overwrite-settings: true
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v2
+        uses: android-actions/setup-android@v3.2.0
+        if: contains( matrix.config.goos, 'windows')
       - name: Install Android NDK
         uses: nttld/setup-ndk@v1
+        if: contains( matrix.config.goos, 'windows')
         with:
           ndk-version: r25b
           add-to-path: true

.github/workflows/codeql.yml

@@ -48,7 +48,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/dockerimage.yml

@@ -36,7 +36,7 @@ jobs:
           swap-storage: true
 
       - name: Checkout repository and submodules
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: dev
           submodules: recursive

app/appearance/langs/en_US.json

@@ -1,4 +1,11 @@
 {
+  "video": "Video",
+  "audio": "Audio",
+  "updateAll": "Update all",
+  "confirmUpdateAll": "Are you sure you want to update all?",
+  "confirmUpdate": "Are you sure you want to update?",
+  "insertRowBefore": "Insert rows ${x} above",
+  "insertRowAfter": "Insert rows ${x} below",
   "setDueTime": "Set expiration time",
   "showCardDay": "After how many days do you want to show the card?",
   "forgetCount": "Forget to count",
@@ -313,14 +320,6 @@
   "aiContinueWrite": "Continue writing",
   "aiTranslate": "Translate",
   "aiExtractSummary": "Extract summary",
-  "aiTranslate_zh_Hans": "Simplified Chinese",
-  "aiTranslate_zh_Hant": "Traditional Chinese",
-  "aiTranslate_ja_JP": "Japanese",
-  "aiTranslate_ko_KR": "Korean",
-  "aiTranslate_en_US": "English",
-  "aiTranslate_es_ES": "Spanish",
-  "aiTranslate_fr_FR": "French",
-  "aiTranslate_de_DE": "German",
   "aiBrainStorm": "Brainstorm",
   "aiFixGrammarSpell": "Fix grammar, spelling and typos",
   "aiCustomAction": "Custom action...",
@@ -1446,6 +1445,10 @@
     "231": "Deleting unreferenced data objects in cloud storage...",
     "232": "The cloud data storage has been purged. [%d] snapshots and [%d] data objects have been deleted, and a total of [%s] disk space has been released",
     "233": "Closing user guide...",
-    "234": "[%d/%d] Updated [%d] of readable paths of doc [%s]"
+    "234": "[%d/%d] Updated [%d] of readable paths of doc [%s]",
+    "235": "[%d/%d] is updating the marketplace package...",
+    "236": "[%d/%d] is updating the marketplace package [%s]...",
+    "237": "[%d] marketplace packages have all been updated successfully",
+    "238": "Marketplace package [%s] update failed, please try again later"
   }
 }

app/appearance/langs/es_ES.json

@@ -1,4 +1,11 @@
 {
+  "vídeo": "Vídeo",
+  "audio": "Audio",
+  "updateAll": "Actualizar todo",
+  "confirmUpdateAll": "¿Estás seguro de que deseas actualizar todo?",
+  "confirmUpdate": "¿Estás seguro de que deseas actualizar?",
+  "insertRowBefore": "Insertar filas ${x} arriba",
+  "insertRowAfter": "Insertar filas ${x} debajo",
   "setDueTime": "Establecer tiempo de vencimiento",
   "showCardDay": "¿Después de cuántos días deseas mostrar la tarjeta?",
   "forgetCount": "Olvídate de contar",
@@ -308,19 +315,11 @@
   "apiProviderTip": "Utilice el proveedor de API seleccionado para implementar funciones relacionadas con la IA",
   "skip": "barco",
   "nextRound": "Siguiente ronda",
-  "save": "Ahorrar",
+  "save": "Guardar",
   "ai": "Inteligencia Artificial",
   "aiContinueWrite": "Continuar escribiendo",
   "aiTranslate": "Traducir",
   "aiExtractSummary": "Extraer resumen",
-  "aiTranslate_zh_Hans": "Chino simplificado",
-  "aiTranslate_zh_Hant": "Chino tradicional",
-  "aiTranslate_ja_JP": "Japonés",
-  "aiTranslate_ko_KR": "Coreano",
-  "aiTranslate_en_US": "Inglés",
-  "aiTranslate_es_ES": "Español",
-  "aiTranslate_fr_FR": "Francés",
-  "aiTranslate_de_DE": "Alemán",
   "aiBrainStorm": "Lluvia de ideas",
   "aiFixGrammarSpell": "Corregir gramática, ortografía y errores tipográficos.",
   "aiCustomAction": "Acción personalizada...",
@@ -329,12 +328,12 @@
   "spaceRepetition": "Repetición Espaciada",
   "space": "Espacio",
   "pdfIsLoading": "El PDF se está cargando, inténtalo de nuevo más tarde",
-  "cardShowAnswer": "Afficher la réponse",
+  "cardShowAnswer": "Mostrar la respuesta",
   "cardRatingAgain": "Otra vez",
   "cardRatingHard": "Difícil",
   "cardRatingGood": "Bueno",
   "cardRatingEasy": "Fácil",
-  "addToDeck": "Agregar a la plataforma...",
+  "addToDeck": "Agregar al mazo...",
   "quickMakeCard": "Tarjeta de creación rápida",
   "allAttrs": "Todos los nombres de atributos y valores de atributos",
   "chooseSyncDirection": "Elegir dirección de sincronización",
@@ -1446,6 +1445,10 @@
     "231": "Eliminar objetos de datos no referenciados en el almacenamiento en la nube...",
     "232": "Se ha eliminado el almacenamiento de datos en la nube. Se han eliminado [%d] instantáneas y [%d] objetos de datos, y se ha liberado un total de [%s] espacio en disco",
     "233": "Cerrando la guía del usuario...",
-    "234": "[%d/%d] Actualizado [%d] de rutas legibles del documento [%s]"
+    "234": "[%d/%d] Actualizado [%d] de rutas legibles del documento [%s]",
+    "235": "[%d/%d] está actualizando el paquete del mercado...",
+    "236": "[%d/%d] está actualizando el paquete del mercado [%s]...",
+    "237": "[%d] todos los paquetes del mercado se han actualizado correctamente",
+    "238": "Error en la actualización del paquete Marketplace [%s], inténtalo de nuevo más tarde"
   }
 }

app/appearance/langs/fr_FR.json

@@ -1,4 +1,11 @@
 {
+  "video": "Vidéo",
+  "audio": "Audio",
+  "updateAll": "Tout mettre à jour",
+  "confirmUpdateAll": "Etes-vous sûr de vouloir tout mettre à jour ?",
+  "confirmUpdate": "Êtes-vous sûr de vouloir mettre à jour ?",
+  "insertRowBefore": "Insérer les lignes ${x} ci-dessus",
+  "insertRowAfter": "Insérer les lignes ${x} ci-dessous",
   "setDueTime": "Définir le délai d'expiration",
   "showCardDay": "Après combien de jours souhaitez-vous montrer la carte ?",
   "forgetCount": "Oublier de compter",
@@ -313,14 +320,6 @@
   "aiContinueWrite": "Continuer à écrire",
   "aiTranslate": "Traduire",
   "aiExtractSummary": "Résumé de l'extrait",
-  "aiTranslate_zh_Hans": "Chinois simplifié",
-  "aiTranslate_zh_Hant": "chinois traditionnel",
-  "aiTranslate_ja_JP": "Japonais",
-  "aiTranslate_ko_KR": "Coréen",
-  "aiTranslate_en_US": "Anglais",
-  "aiTranslate_es_ES": "Espagnol",
-  "aiTranslate_fr_FR": "Français",
-  "aiTranslate_de_DE": "Allemand",
   "aiBrainStorm": "Remue-méninges",
   "aiFixGrammarSpell": "Correction de la grammaire, de l'orthographe et des fautes de frappe",
   "aiCustomAction": "Action personnalisée...",
@@ -1446,6 +1445,10 @@
     "231": "Suppression des objets de données non référencés dans le stockage cloud...",
     "232": "Le stockage de données cloud a été purgé. [%d] instantanés et [%d] objets de données ont été supprimés, et un total de [%s] espace disque a été libéré",
     "233": "Fermeture du guide de l'utilisateur...",
-    "234": "[%d/%d] Mise à jour de [%d] des chemins lisibles du document [%s]"
+    "234": "[%d/%d] Mise à jour de [%d] des chemins lisibles du document [%s]",
+    "235": "[%d/%d] met à jour le package Marketplace...",
+    "236": "[%d/%d] met à jour le package Marketplace [%s]...",
+    "237": "[%d] packages Marketplace ont tous été mis à jour avec succès",
+    "238": "La mise à jour du package Marketplace [%s] a échoué, veuillez réessayer plus tard"
   }
 }

app/appearance/langs/zh_CHT.json

@@ -1,4 +1,11 @@
 {
+  "video": "影片",
+  "audio": "音訊",
+  "updateAll": "全部更新",
+  "confirmUpdateAll": "確定全部更新嗎？",
+  "confirmUpdate": "確定更新嗎？",
+  "insertRowBefore": "在上方插入${x}行",
+  "insertRowAfter": "在下方插入${x}行",
   "setDueTime": "設定到期時間",
   "showCardDay": "要在幾天後顯示卡片？",
   "forgetCount": "遺忘次數",
@@ -313,14 +320,6 @@
   "aiContinueWrite": "續寫",
   "aiTranslate": "翻譯",
   "aiExtractSummary": "提取摘要",
-  "aiTranslate_zh_Hans": "簡體中文",
-  "aiTranslate_zh_Hant": "繁體中文",
-  "aiTranslate_ja_JP": "日文",
-  "aiTranslate_ko_KR": "韓文",
-  "aiTranslate_en_US": "英文",
-  "aiTranslate_es_ES": "西班牙文",
-  "aiTranslate_fr_FR": "法文",
-  "aiTranslate_de_DE": "德文",
   "aiBrainStorm": "頭腦風暴",
   "aiFixGrammarSpell": "修正語法、拼寫和錯別字",
   "aiCustomAction": "自定義操作...",
@@ -1446,6 +1445,10 @@
     "231": "正在刪除雲端儲存未引用資料物件...",
     "232": "雲端資料儲存清理完畢，已刪除 [%d] 個快照和 [%d] 個資料對象，共釋放 [%s] 磁碟空間",
     "233": "正在關閉用戶指南...",
-    "234": "[%d/%d] 已經更新 [%d] 個文件的可讀路徑 [%s]"
+    "234": "[%d/%d] 已經更新 [%d] 個文件的可讀路徑 [%s]",
+    "235": "[%d/%d] 正在更新市集包...",
+    "236": "[%d/%d] 正在更新市集包 [%s]...",
+    "237": "[%d] 個市集包已經全部更新成功",
+    "238": "市集包 [%s] 更新失敗，請稍後再試"
   }
 }