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

siyuan-note · Sep 6, 2023 · 28d75b4 · 28d75b4
2 parents 395dc09 + 4eca8c4
commit 28d75b4
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 12 deletions.
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1039,7 +1039,9 @@
     "task.history.database.index.commit": "Execute history database index commit",
     "task.database.index.embedBlock": "Execute database index embed block",
     "task.reload.ui": "Execute reload UI",
-    "task.upgrade.userGuide": "Execute upgrade user guide"
+    "task.upgrade.userGuide": "Execute upgrade user guide",
+    "task.asset.database.index.full": "Execute asset database rebuild index",
+    "task.asset.database.index.commit": "Execute asset database index commit"
   },
   "_trayMenu": {
     "showWindow": "Show Window",

diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json
@@ -1039,7 +1039,9 @@
     "task.history.database.index.commit": "Ejecutar la confirmación del índice de la base de datos del historial",
     "task.database.index.embedBlock": "Ejecutar bloque de incrustación de índice de base de datos",
     "task.reload.ui": "IU de recarga de tareas",
-    "task.upgrade.userGuide": "Ejecutar la guía de usuario de actualización"
+    "task.upgrade.userGuide": "Ejecutar la guía de usuario de actualización",
+    "task.asset.database.index.full": "Ejecutar índice de reconstrucción de base de datos de activos",
+    "task.asset.database.index.commit": "Ejecutar confirmación del índice de la base de datos de activos"
   },
   "_trayMenu": {
     "showWindow": "Mostrar ventana",

diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json
@@ -1039,7 +1039,9 @@
     "task.history.database.index.commit": "Effectuer la validation de l'index de la base de données d'historique",
     "task.database.index.embedBlock": "Exécuter le bloc d'intégration d'index de base de données",
     "task.reload.ui": "Interface utilisateur de rechargement de tâche",
-    "task.upgrade.userGuide": "Mise à niveau de la tâche de guide utilisateur"
+    "task.upgrade.userGuide": "Mise à niveau de la tâche de guide utilisateur",
+    "task.asset.database.index.full": "Exécuter l'index de reconstruction de la base de données d'actifs",
+    "task.asset.database.index.commit": "Exécuter la validation de l'index de la base de données des actifs"
   },
   "_trayMenu": {
     "showWindow": "Afficher la fenêtre principale",

diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json
@@ -1039,7 +1039,9 @@
     "task.history.database.index.commit": "執行歷史資料庫索引提交",
     "task.database.index.embedBlock": "執行資料庫索引嵌入塊",
     "task.reload.ui": "執行重載界面",
-    "task.upgrade.userGuide": "執行升級用戶指南"
+    "task.upgrade.userGuide": "執行升級用戶指南",
+    "task.asset.database.index.full": "執行資源文件數據庫重建索引",
+    "task.asset.database.index.commit": "執行資源文件數據庫索引提交"
   },
   "_trayMenu": {
     "showWindow": "顯示主窗口",

diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json
@@ -1039,7 +1039,9 @@
     "task.history.database.index.commit": "执行历史数据库索引提交",
     "task.database.index.embedBlock": "执行数据库索引嵌入块",
     "task.reload.ui": "执行重载界面",
-    "task.upgrade.userGuide": "执行升级用户指南"
+    "task.upgrade.userGuide": "执行升级用户指南",
+    "task.asset.database.index.full": "执行资源文件数据库重建索引",
+    "task.asset.database.index.commit": "执行资源文件数据库索引提交"
   },
   "_trayMenu": {
     "showWindow": "显示主窗口",

diff --git a/kernel/filesys/json_unmarshal.go b/kernel/filesys/json_unmarshal.go
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-//go:build !(windows && amd64)
+//go:build !amd64
 
 package filesys
 

diff --git a/...l/filesys/json_unmarshal_windows_amd64.go → kernel/filesys/json_unmarshal_amd64.go b/...l/filesys/json_unmarshal_windows_amd64.go → kernel/filesys/json_unmarshal_amd64.go
@@ -18,13 +18,22 @@ package filesys
 
 import (
 	"github.com/bytedance/sonic"
+	"github.com/goccy/go-json"
+	"github.com/siyuan-note/logging"
 )
 
-func unmarshalJSON(data []byte, v interface{}) error {
+func unmarshalJSON(data []byte, v interface{}) (err error) {
 	//now := time.Now()
-	//defer func() {
-	//	elapsed := time.Since(now)
-	//	logging.LogInfof("[sonic] unmarshalJSON took %s", elapsed)
-	//}()
-	return sonic.Unmarshal(data, v)
+	defer func() {
+		if e := recover(); nil != e {
+			logging.LogWarnf("[sonic] unmarshalJSON failed: %s", e)
+			err = json.Unmarshal(data, v)
+		} /*else {
+			elapsed := time.Since(now)
+			logging.LogInfof("[sonic] unmarshalJSON took %s", elapsed)
+		}*/
+	}()
+
+	err = sonic.Unmarshal(data, v)
+	return
 }