From 9677187a98570d676f784fb313cb2e7b171a2c54 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Sun, 28 Apr 2024 20:56:32 +0800 Subject: [PATCH] :art: Clean code --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- kernel/main.go | 2 +- kernel/mobile/kernel.go | 2 +- kernel/model/history.go | 10 +++++++--- kernel/task/queue.go | 4 ++-- 9 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 2ebb723fc..e9faa651e 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1224,7 +1224,7 @@ "task.database.index.ref": "Execute database index reference", "task.database.index.fix": "Execute database index fix", "task.ocr.image": "Execute image OCR to extract text", - "task.history.generateDoc": "Execute history database generate doc", + "task.history.generateFile": "Execute history database generate doc", "task.history.database.index.full": "Execute history database rebuild index", "task.history.database.index.commit": "Execute history database index commit", "task.database.index.embedBlock": "Execute database index embed block", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index cd98ebaba..7e381a7f0 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1224,7 +1224,7 @@ "task.database.index.ref": "Ejecutar referencia de índice de base de datos", "task.database.index.fix": "Ejecutar corrección del índice de la base de datos", "task.ocr.image": "Ejecutar OCR de imagen para extraer texto", - "task.history.generateDoc": "Ejecutar base de datos de historial generar doc", + "task.history.generateFile": "Ejecutar base de datos de historial generar doc", "task.history.database.index.full": "Ejecutar el índice de reconstrucción de la base de datos del historial", "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", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index f26ada006..79c9d33bb 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1224,7 +1224,7 @@ "task.database.index.ref": "Exécuter la référence d'index de la base de données", "task.database.index.fix": "Effectuer la correction de l'index de la base de données", "task.ocr.image": "Exécute l'OCR d'image pour extraire le texte", - "task.history.generateDoc": "Exécuter la base de données historique générer doc", + "task.history.generateFile": "Exécuter la base de données historique générer doc", "task.history.database.index.full": "Exécuter l'index de reconstruction de la base de données de l'historique", "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", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 9cc584088..ff24e2f24 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1224,7 +1224,7 @@ "task.database.index.ref": "執行資料庫索引引用", "task.database.index.fix": "執行資料庫索引訂正", "task.ocr.image": "執行圖片 OCR 提取文字", - "task.history.generateDoc": "執行生成文件歷史", + "task.history.generateFile": "執行生成文件歷史", "task.history.database.index.full": "執行歷史資料庫重建索引", "task.history.database.index.commit": "執行歷史資料庫索引提交", "task.database.index.embedBlock": "執行資料庫索引嵌入塊", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1b0a1e527..b79c94990 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1224,7 +1224,7 @@ "task.database.index.ref": "执行数据库索引引用", "task.database.index.fix": "执行数据库索引订正", "task.ocr.image": "执行图片 OCR 提取文本", - "task.history.generateDoc": "执行生成文件历史", + "task.history.generateFile": "执行生成文件历史", "task.history.database.index.full": "执行历史数据库重建索引", "task.history.database.index.commit": "执行历史数据库索引提交", "task.database.index.embedBlock": "执行数据库索引嵌入块", diff --git a/kernel/main.go b/kernel/main.go index a1021717a..7f018c110 100644 --- a/kernel/main.go +++ b/kernel/main.go @@ -48,7 +48,7 @@ func main() { util.PushClearAllMsg() job.StartCron() - go model.AutoGenerateDocHistory() + go model.AutoGenerateFileHistory() go cache.LoadAssets() go util.CheckFileSysStatus() diff --git a/kernel/mobile/kernel.go b/kernel/mobile/kernel.go index 38804f48c..7c6b0c7db 100644 --- a/kernel/mobile/kernel.go +++ b/kernel/mobile/kernel.go @@ -64,7 +64,7 @@ func StartKernel(container, appDir, workspaceBaseDir, timezoneID, localIPs, lang util.PushClearAllMsg() job.StartCron() - go model.AutoGenerateDocHistory() + go model.AutoGenerateFileHistory() go cache.LoadAssets() }() } diff --git a/kernel/model/history.go b/kernel/model/history.go index 07e036163..bd66e0207 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -47,15 +47,15 @@ import ( var historyTicker = time.NewTicker(time.Minute * 10) -func AutoGenerateDocHistory() { +func AutoGenerateFileHistory() { ChangeHistoryTick(Conf.Editor.GenerateHistoryInterval) for { <-historyTicker.C - task.AppendTask(task.HistoryGenerateDoc, generateDocHistory) + task.AppendTask(task.HistoryGenerateFile, generateFileHistory) } } -func generateDocHistory() { +func generateFileHistory() { defer logging.Recover() if 1 > Conf.Editor.GenerateHistoryInterval { @@ -63,10 +63,14 @@ func generateDocHistory() { } WaitForWritingFiles() + + // 生成文档历史 for _, box := range Conf.GetOpenedBoxes() { box.generateDocHistory0() } + // 目前没有生成资源文件历史 https://github.com/siyuan-note/siyuan/issues/11177 + historyDir := util.HistoryDir clearOutdatedHistoryDir(historyDir) diff --git a/kernel/task/queue.go b/kernel/task/queue.go index fb3028e0b..f92244dee 100644 --- a/kernel/task/queue.go +++ b/kernel/task/queue.go @@ -92,7 +92,7 @@ const ( DatabaseIndexRef = "task.database.index.ref" // 数据库索引引用 DatabaseIndexFix = "task.database.index.fix" // 数据库索引订正 OCRImage = "task.ocr.image" // 图片 OCR 提取文本 - HistoryGenerateDoc = "task.history.generateDoc" // 生成文件历史 + HistoryGenerateFile = "task.history.generateFile" // 生成文件历史 HistoryDatabaseIndexFull = "task.history.database.index.full" // 历史数据库重建索引 HistoryDatabaseIndexCommit = "task.history.database.index.commit" // 历史数据库索引提交 DatabaseIndexEmbedBlock = "task.database.index.embedBlock" // 数据库索引嵌入块 @@ -107,7 +107,7 @@ var uniqueActions = []string{ DatabaseIndexFull, DatabaseIndexCommit, OCRImage, - HistoryGenerateDoc, + HistoryGenerateFile, HistoryDatabaseIndexFull, HistoryDatabaseIndexCommit, AssetContentDatabaseIndexFull,