From 91674399d8fa7fb4742e9d5a6e58aec6f0bd4dee Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 21:27:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?:bug:=20=E6=A0=A1=E9=AA=8C=E7=B4=A2?= =?UTF-8?q?=E5=BC=95=E7=94=9F=E6=88=90=E5=86=97=E4=BD=99=E7=9A=84=20Untitl?= =?UTF-8?q?ed=20=E7=88=B6=E6=96=87=E6=A1=A3=20Fix=20https://github.com/siy?= =?UTF-8?q?uan-note/siyuan/issues/7394?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/index_fix.go | 37 +++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/kernel/model/index_fix.go b/kernel/model/index_fix.go index cd4d08ca9..5fd59cec6 100644 --- a/kernel/model/index_fix.go +++ b/kernel/model/index_fix.go @@ -126,6 +126,7 @@ func resetDuplicateBlocksOnFileSys() { } boxPath := filepath.Join(util.DataDir, box.ID) + var duplicatedTrees []*parse.Tree filepath.Walk(boxPath, func(path string, info os.FileInfo, err error) error { if info.IsDir() { if boxPath == path { @@ -190,10 +191,9 @@ func resetDuplicateBlocksOnFileSys() { // 存在重复的块 ID if ast.NodeDocument == n.Type { - // 如果是文档根节点，则直接重置这颗树 - logging.LogWarnf("exist more than one tree with the same id [%s], reset it", box.ID+p) - recreateTree(tree, path) - needRefreshUI = true + // 如果是文档根节点，则重置这颗树 + // 这里不能在迭代中重置，因为如果这个文档存在子文档的话，重置时会重命名子文档文件夹，后续迭代可能会导致子文档 ID 重复 + duplicatedTrees = append(duplicatedTrees, tree) return ast.WalkStop } @@ -213,6 +213,13 @@ func resetDuplicateBlocksOnFileSys() { } return nil }) + + for _, tree := range duplicatedTrees { + absPath := filepath.Join(boxPath, tree.Path) + logging.LogWarnf("exist more than one tree with the same id [%s], reset it", absPath) + recreateTree(tree, absPath) + needRefreshUI = true + } } if needRefreshUI { @@ -225,16 +232,30 @@ func resetDuplicateBlocksOnFileSys() { } func recreateTree(tree *parse.Tree, absPath string) { + // 删除关于该树的所有块树数据，后面会调用 fixBlockTreeByFileSys() 进行订正补全 + treenode.RemoveBlockTreesByPathPrefix(strings.TrimSuffix(tree.Path, ".sy")) + treenode.RemoveBlockTreesByRootID(tree.ID) + resetTree(tree, "") - createTreeTx(tree) + if err := filesys.WriteTree(tree); nil != err { + logging.LogWarnf("write tree [%s] failed: %s", tree.Path, err) + return + } + if gulu.File.IsDir(strings.TrimSuffix(absPath, ".sy")) { // 重命名子文档文件夹 - if renameErr := os.Rename(strings.TrimSuffix(absPath, ".sy"), filepath.Join(filepath.Dir(absPath), tree.ID)); nil != renameErr { - logging.LogWarnf("rename [%s] failed: %s", absPath, renameErr) + from := strings.TrimSuffix(absPath, ".sy") + to := filepath.Join(filepath.Dir(absPath), tree.ID) + if renameErr := os.Rename(from, to); nil != renameErr { + logging.LogWarnf("rename [%s] failed: %s", from, renameErr) return } } - os.RemoveAll(absPath) + + if err := os.RemoveAll(absPath); nil != err { + logging.LogWarnf("remove [%s] failed: %s", absPath, err) + return + } } // fixBlockTreeByFileSys 通过文件系统订正块树。 From fa1ee8f4a104e3cb31ed658e8a21b87221d80d29 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:13:48 +0800 Subject: [PATCH 2/8] =?UTF-8?q?:art:=20=E9=87=8D=E5=BB=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=B4=A2=E5=BC=95=E9=81=AE=E7=BD=A9=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/zh_CHT.json | 2 +- kernel/model/history.go | 11 +++++++++-- kernel/sql/queue_history.go | 26 ++++++++++++++------------ 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 7bb5976eb..9542807b7 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1091,6 +1091,6 @@ "188": "鎖定雲端同步目錄失敗，請稍後再試", "189": "雲端同步目錄還在被其他設備鎖定，請稍後再試", "190": "校驗索引時發現一個問題，已經自動修復", - "191": "[%d/%d] 已经建立条历史数据索引" + "191": "[%d/%d] 已經建立條歷史數據索引" } } diff --git a/kernel/model/history.go b/kernel/model/history.go index 8182aa88d..e9a9a1441 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -19,6 +19,7 @@ package model import ( "encoding/json" "fmt" + "github.com/siyuan-note/eventbus" "io/fs" "math" "os" @@ -575,13 +576,15 @@ func ReindexHistory() (err error) { sql.InitHistoryDatabase(true) lutEngine := util.NewLute() + + context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBarAndProgress} for _, historyDir := range historyDirs { if !historyDir.IsDir() { continue } name := historyDir.Name() - indexHistoryDir(name, lutEngine) + indexHistoryDirWithContext(name, lutEngine, context) } sql.WaitForWritingHistoryDatabase() @@ -597,6 +600,10 @@ const ( ) func indexHistoryDir(name string, luteEngine *lute.Lute) { + indexHistoryDirWithContext(name, luteEngine, map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}) +} + +func indexHistoryDirWithContext(name string, luteEngine *lute.Lute, context map[string]interface{}) { defer logging.Recover() op := name[strings.LastIndex(name, "-")+1:] @@ -660,7 +667,7 @@ func indexHistoryDir(name string, luteEngine *lute.Lute) { }) } - sql.IndexHistoriesQueue(histories) + sql.IndexHistoriesQueue(histories, context) return } diff --git a/kernel/sql/queue_history.go b/kernel/sql/queue_history.go index 998933387..64900dd7c 100644 --- a/kernel/sql/queue_history.go +++ b/kernel/sql/queue_history.go @@ -20,11 +20,11 @@ import ( "database/sql" "errors" "fmt" + "github.com/siyuan-note/eventbus" "runtime/debug" "sync" "time" - "github.com/siyuan-note/eventbus" "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/task" "github.com/siyuan-note/siyuan/kernel/util" @@ -39,7 +39,8 @@ var ( type historyDBQueueOperation struct { inQueueTime time.Time - action string // index/deletePathPrefix + action string // index/deletePathPrefix + context map[string]interface{} // 消息推送上下文 histories []*History // index pathPrefix string // deletePathPrefix @@ -59,7 +60,6 @@ func FlushHistoryQueue() { defer txLock.Unlock() start := time.Now() - context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBarAndProgress} total := len(ops) for i, op := range ops { if util.IsExiting { @@ -71,9 +71,9 @@ func FlushHistoryQueue() { return } - context["current"] = i - context["total"] = total - if err = execHistoryOp(op, tx, context); nil != err { + op.context["current"] = i + op.context["total"] = total + if err = execHistoryOp(op, tx); nil != err { tx.Rollback() logging.LogErrorf("queue operation failed: %s", err) continue @@ -99,12 +99,12 @@ func FlushHistoryQueue() { } } -func execHistoryOp(op *historyDBQueueOperation, tx *sql.Tx, context map[string]interface{}) (err error) { +func execHistoryOp(op *historyDBQueueOperation, tx *sql.Tx) (err error) { switch op.action { case "index": - err = insertHistories(tx, op.histories, context) + err = insertHistories(tx, op.histories, op.context) case "deletePathPrefix": - err = deleteHistoriesByPathPrefix(tx, op.pathPrefix, context) + err = deleteHistoriesByPathPrefix(tx, op.pathPrefix, op.context) default: msg := fmt.Sprintf("unknown history operation [%s]", op.action) logging.LogErrorf(msg) @@ -117,15 +117,17 @@ func DeleteHistoriesByPathPrefixQueue(pathPrefix string) { historyDBQueueLock.Lock() defer historyDBQueueLock.Unlock() - newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "deletePathPrefix", pathPrefix: pathPrefix} + newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "deletePathPrefix", pathPrefix: pathPrefix, + context: map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}} historyOperationQueue = append(historyOperationQueue, newOp) } -func IndexHistoriesQueue(histories []*History) { +func IndexHistoriesQueue(histories []*History, context map[string]interface{}) { historyDBQueueLock.Lock() defer historyDBQueueLock.Unlock() - newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "index", histories: histories} + newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "index", histories: histories, + context: context} historyOperationQueue = append(historyOperationQueue, newOp) } From d5999b26d8547fa4102b113ffc11f9ac3598c3e1 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:29:12 +0800 Subject: [PATCH 3/8] =?UTF-8?q?:art:=20=E9=87=8D=E5=BB=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=B4=A2=E5=BC=95=E9=81=AE=E7=BD=A9=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/model/history.go | 16 ++++------------ kernel/sql/database.go | 5 ++--- kernel/sql/queue_history.go | 24 +++++++++++------------- 3 files changed, 17 insertions(+), 28 deletions(-) diff --git a/kernel/model/history.go b/kernel/model/history.go index e9a9a1441..b89d0d832 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -19,7 +19,6 @@ package model import ( "encoding/json" "fmt" - "github.com/siyuan-note/eventbus" "io/fs" "math" "os" @@ -571,23 +570,20 @@ func ReindexHistory() (err error) { return } - util.PushEndlessProgress(Conf.Language(35)) - defer util.PushClearProgress() - + util.PushMsg(Conf.Language(35), 7*1000) sql.InitHistoryDatabase(true) lutEngine := util.NewLute() - context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBarAndProgress} for _, historyDir := range historyDirs { if !historyDir.IsDir() { continue } name := historyDir.Name() - indexHistoryDirWithContext(name, lutEngine, context) + indexHistoryDir(name, lutEngine) } - sql.WaitForWritingHistoryDatabase() + util.ReloadUI() return } @@ -600,10 +596,6 @@ const ( ) func indexHistoryDir(name string, luteEngine *lute.Lute) { - indexHistoryDirWithContext(name, luteEngine, map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}) -} - -func indexHistoryDirWithContext(name string, luteEngine *lute.Lute, context map[string]interface{}) { defer logging.Recover() op := name[strings.LastIndex(name, "-")+1:] @@ -667,7 +659,7 @@ func indexHistoryDirWithContext(name string, luteEngine *lute.Lute, context map[ }) } - sql.IndexHistoriesQueue(histories, context) + sql.IndexHistoriesQueue(histories) return } diff --git a/kernel/sql/database.go b/kernel/sql/database.go index 610c13eba..0187e20cd 100644 --- a/kernel/sql/database.go +++ b/kernel/sql/database.go @@ -214,7 +214,7 @@ func initHistoryDBConnection() { historyDB.Close() } - dsn := util.HistoryDBPath + "?_journal_mode=OFF" + + dsn := util.DBPath + "?_journal_mode=WAL" + "&_synchronous=OFF" + "&_mmap_size=2684354560" + "&_secure_delete=OFF" + @@ -223,8 +223,7 @@ func initHistoryDBConnection() { "&_busy_timeout=7000" + "&_ignore_check_constraints=ON" + "&_temp_store=MEMORY" + - "&_case_sensitive_like=OFF" + - "&_locking_mode=EXCLUSIVE" + "&_case_sensitive_like=OFF" var err error historyDB, err = sql.Open("sqlite3_extended", dsn) if nil != err { diff --git a/kernel/sql/queue_history.go b/kernel/sql/queue_history.go index 64900dd7c..e47ad7885 100644 --- a/kernel/sql/queue_history.go +++ b/kernel/sql/queue_history.go @@ -39,8 +39,7 @@ var ( type historyDBQueueOperation struct { inQueueTime time.Time - action string // index/deletePathPrefix - context map[string]interface{} // 消息推送上下文 + action string // index/deletePathPrefix histories []*History // index pathPrefix string // deletePathPrefix @@ -71,9 +70,10 @@ func FlushHistoryQueue() { return } - op.context["current"] = i - op.context["total"] = total - if err = execHistoryOp(op, tx); nil != err { + context := map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar} + context["current"] = i + context["total"] = total + if err = execHistoryOp(op, tx, context); nil != err { tx.Rollback() logging.LogErrorf("queue operation failed: %s", err) continue @@ -99,12 +99,12 @@ func FlushHistoryQueue() { } } -func execHistoryOp(op *historyDBQueueOperation, tx *sql.Tx) (err error) { +func execHistoryOp(op *historyDBQueueOperation, tx *sql.Tx, context map[string]interface{}) (err error) { switch op.action { case "index": - err = insertHistories(tx, op.histories, op.context) + err = insertHistories(tx, op.histories, context) case "deletePathPrefix": - err = deleteHistoriesByPathPrefix(tx, op.pathPrefix, op.context) + err = deleteHistoriesByPathPrefix(tx, op.pathPrefix, context) default: msg := fmt.Sprintf("unknown history operation [%s]", op.action) logging.LogErrorf(msg) @@ -117,17 +117,15 @@ func DeleteHistoriesByPathPrefixQueue(pathPrefix string) { historyDBQueueLock.Lock() defer historyDBQueueLock.Unlock() - newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "deletePathPrefix", pathPrefix: pathPrefix, - context: map[string]interface{}{eventbus.CtxPushMsg: eventbus.CtxPushMsgToStatusBar}} + newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "deletePathPrefix", pathPrefix: pathPrefix} historyOperationQueue = append(historyOperationQueue, newOp) } -func IndexHistoriesQueue(histories []*History, context map[string]interface{}) { +func IndexHistoriesQueue(histories []*History) { historyDBQueueLock.Lock() defer historyDBQueueLock.Unlock() - newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "index", histories: histories, - context: context} + newOp := &historyDBQueueOperation{inQueueTime: time.Now(), action: "index", histories: histories} historyOperationQueue = append(historyOperationQueue, newOp) } From ae474833325d999237772c2136681d8c350bc6d2 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:29:42 +0800 Subject: [PATCH 4/8] =?UTF-8?q?:art:=20=E9=87=8D=E5=BB=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=B4=A2=E5=BC=95=E9=81=AE=E7=BD=A9=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/sql/queue_history.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/sql/queue_history.go b/kernel/sql/queue_history.go index e47ad7885..b707c5be8 100644 --- a/kernel/sql/queue_history.go +++ b/kernel/sql/queue_history.go @@ -20,11 +20,11 @@ import ( "database/sql" "errors" "fmt" - "github.com/siyuan-note/eventbus" "runtime/debug" "sync" "time" + "github.com/siyuan-note/eventbus" "github.com/siyuan-note/logging" "github.com/siyuan-note/siyuan/kernel/task" "github.com/siyuan-note/siyuan/kernel/util" From e1375fd4f543260b9e2db479eda4d5acff06923e Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:36:39 +0800 Subject: [PATCH 5/8] =?UTF-8?q?:art:=20=E9=87=8D=E5=BB=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=B4=A2=E5=BC=95=E9=81=AE=E7=BD=A9=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/appearance/langs/en_US.json | 3 ++- app/appearance/langs/es_ES.json | 3 ++- app/appearance/langs/fr_FR.json | 3 ++- app/appearance/langs/zh_CHT.json | 3 ++- app/appearance/langs/zh_CN.json | 3 ++- kernel/model/history.go | 5 +---- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index f5389a3a0..59df96da2 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1091,6 +1091,7 @@ "188": "Failed to lock the cloud sync directory, please try again later", "189": "Cloud sync directory is still locked by other devices, please try again later", "190": "A problem was found while validating the index, which has been automatically fixed", - "191": "[%d/%d] Created historical data index" + "191": "[%d/%d] Created historical data index", + "192": "Rebuilding historical data index, please wait..." } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 003d733a9..4ac6554f0 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1091,6 +1091,7 @@ "188": "Error al bloquear el directorio de sincronizaci\u00f3n en la nube, int\u00e1ntelo de nuevo m\u00e1s tarde", "189": "El directorio de sincronización en la nube todavía está bloqueado por otros dispositivos, inténtalo de nuevo más tarde", "190": "Se encontro un problema al validar el indice, el cual se soluciono automaticamente", - "191": "[%d/%d] Índice de datos históricos creado" + "191": "[%d/%d] Índice de datos históricos creado", + "192": "Reconstruyendo el índice de datos históricos, espere..." } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 08e5e592f..8831550a7 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1091,6 +1091,7 @@ "188": "Échec du verrouillage du répertoire de synchronisation cloud, veuillez réessayer plus tard", "189": "Le répertoire de synchronisation cloud est toujours verrouillé par d'autres appareils, veuillez réessayer plus tard", "190": "Un problème a été trouvé lors de la validation de l'index, qui a été automatiquement corrigé", - "191": "[%d/%d] Création d'un index de données historiques" + "191": "[%d/%d] Création d'un index de données historiques", + "192": "Reconstruction de l'index des données historiques, veuillez patienter..." } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 9542807b7..d71e06eb8 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1091,6 +1091,7 @@ "188": "鎖定雲端同步目錄失敗，請稍後再試", "189": "雲端同步目錄還在被其他設備鎖定，請稍後再試", "190": "校驗索引時發現一個問題，已經自動修復", - "191": "[%d/%d] 已經建立條歷史數據索引" + "191": "[%d/%d] 已經建立條歷史數據索引", + "192": "正在重建歷史數據索引，請稍等..." } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 75411f457..4ad3d1e69 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1091,6 +1091,7 @@ "188": "锁定云端同步目录失败，请稍后再试", "189": "云端同步目录还在被其他设备锁定，请稍后再试", "190": "校验索引时发现一个问题，已经自动修复", - "191": "[%d/%d] 已经建立条历史数据索引" + "191": "[%d/%d] 已经建立条历史数据索引", + "192": "正在重建历史数据索引，请稍等..." } } diff --git a/kernel/model/history.go b/kernel/model/history.go index b89d0d832..2b39efd4d 100644 --- a/kernel/model/history.go +++ b/kernel/model/history.go @@ -570,10 +570,9 @@ func ReindexHistory() (err error) { return } - util.PushMsg(Conf.Language(35), 7*1000) + util.PushMsg(Conf.Language(192), 7*1000) sql.InitHistoryDatabase(true) lutEngine := util.NewLute() - for _, historyDir := range historyDirs { if !historyDir.IsDir() { continue @@ -582,8 +581,6 @@ func ReindexHistory() (err error) { name := historyDir.Name() indexHistoryDir(name, lutEngine) } - - util.ReloadUI() return } From aa47da6ad0ff6293624ac40dfffa689dec8a5106 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:41:41 +0800 Subject: [PATCH 6/8] =?UTF-8?q?:art:=20=E9=87=8D=E5=BB=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=B4=A2=E5=BC=95=E9=81=AE=E7=BD=A9=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/history/history.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/history/history.ts b/app/src/history/history.ts index 197adb944..5fb625172 100644 --- a/app/src/history/history.ts +++ b/app/src/history/history.ts @@ -606,9 +606,8 @@ export const openHistory = () => { renderDoc(firstPanelElement, type === "docprevious" ? currentPage - 1 : currentPage + 1); break; } else if (type === "rebuildIndex") { - fetchPost("/api/history/reindexHistory", {}, () => { - renderDoc(firstPanelElement, 1); - }); + fetchPost("/api/history/reindexHistory", {}); + dialog.destroy(); break; } else if (type === "compare") { showDiff(JSON.parse(target.getAttribute("data-ids") || "[]")); From 3cd634d8d038a55834bf9e3bd9db9e9f30416d55 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:42:38 +0800 Subject: [PATCH 7/8] =?UTF-8?q?:art:=20=E9=87=8D=E5=BB=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=B4=A2=E5=BC=95=E9=81=AE=E7=BD=A9=20https://github.?= =?UTF-8?q?com/siyuan-note/siyuan/issues/7386?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/history/history.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/history/history.ts b/app/src/history/history.ts index 5fb625172..d1c2b5c3b 100644 --- a/app/src/history/history.ts +++ b/app/src/history/history.ts @@ -606,7 +606,7 @@ export const openHistory = () => { renderDoc(firstPanelElement, type === "docprevious" ? currentPage - 1 : currentPage + 1); break; } else if (type === "rebuildIndex") { - fetchPost("/api/history/reindexHistory", {}); + fetchPost("/api/history/reindexHistory"); dialog.destroy(); break; } else if (type === "compare") { From 392a0420ee0d614793c41e16a1f006fd49fb7d55 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Fri, 17 Feb 2023 22:49:30 +0800 Subject: [PATCH 8/8] =?UTF-8?q?:arrow=5Fup:=20=E6=9B=B4=E6=96=B0=E5=86=85?= =?UTF-8?q?=E6=A0=B8=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/go.mod | 24 ++++++++++-------------- kernel/go.sum | 52 +++++++++++++++++++-------------------------------- 2 files changed, 29 insertions(+), 47 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index a82ea5603..eee1302d0 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -9,6 +9,7 @@ require ( github.com/88250/lute v1.7.6-0.20230214102328-e0c90a284170 github.com/88250/pdfcpu v0.3.13 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 + github.com/ClarkThan/ahocorasick v0.0.0-20230216061320-bccdb98581a3 github.com/ConradIrwin/font v0.0.0-20210318200717-ce8d41cc0732 github.com/Masterminds/sprig/v3 v3.2.3 github.com/PuerkitoBio/goquery v1.8.0 @@ -51,25 +52,20 @@ require ( github.com/studio-b12/gowebdav v0.0.0-20230203202212-3282f94193f2 github.com/vmihailenco/msgpack/v5 v5.3.5 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 - golang.org/x/image v0.3.0 + golang.org/x/image v0.5.0 golang.org/x/mobile v0.0.0-20220722155234-aaac322e2105 golang.org/x/text v0.7.0 ) require ( dmitri.shuralyov.com/font/woff2 v0.0.0-20180220214647-957792cbbdab // indirect - github.com/BobuSumisu/aho-corasick v1.0.3 // indirect - github.com/ClarkThan/ahocorasick v0.0.0-20230216061320-bccdb98581a3 // indirect github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver/v3 v3.2.0 // indirect github.com/alecthomas/chroma v0.10.0 // indirect github.com/andybalholm/cascadia v1.3.1 // indirect - github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0 // indirect - github.com/anknown/darts v0.0.0-20151216065714-83ff685239e6 // indirect github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect - github.com/aws/aws-sdk-go v1.44.199 // indirect + github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184 // indirect github.com/dlclark/regexp2 v1.8.0 // indirect github.com/dsnet/compress v0.0.1 // indirect github.com/gin-contrib/sse v0.1.0 // indirect @@ -99,13 +95,13 @@ require ( github.com/juju/errors v1.0.0 // indirect github.com/klauspost/compress v1.15.15 // indirect github.com/leodido/go-urn v1.2.1 // indirect - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/onsi/ginkgo/v2 v2.8.0 // indirect + github.com/onsi/ginkgo/v2 v2.8.1 // indirect github.com/open-spaced-repetition/go-fsrs v0.1.0 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/pkg/errors v0.9.1 // indirect @@ -113,8 +109,8 @@ require ( github.com/qiniu/go-sdk/v7 v7.14.0 // indirect github.com/quic-go/qpack v0.4.0 // indirect github.com/quic-go/qtls-go1-18 v0.2.0 // indirect - github.com/quic-go/qtls-go1-19 v0.2.0 // indirect - github.com/quic-go/qtls-go1-20 v0.1.0 // indirect + github.com/quic-go/qtls-go1-19 v0.2.1 // indirect + github.com/quic-go/qtls-go1-20 v0.1.1 // indirect github.com/quic-go/quic-go v0.32.0 // indirect github.com/restic/chunker v0.4.0 // indirect github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect @@ -122,15 +118,15 @@ require ( github.com/spf13/cast v1.5.0 // indirect github.com/tklauser/go-sysconf v0.3.11 // indirect github.com/tklauser/numcpus v0.6.0 // indirect - github.com/ugorji/go/codec v1.2.8 // indirect + github.com/ugorji/go/codec v1.2.9 // indirect github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/crypto v0.6.0 // indirect - golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab // indirect + golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb // indirect golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.6.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.5.0 // indirect golang.org/x/tools v0.6.0 // indirect diff --git a/kernel/go.sum b/kernel/go.sum index 75efa4f74..d2ba88458 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -8,16 +8,12 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798 h1:sR/s/Y9wyl79ZRCUERwLPo9zqaB3KhNRodCMTJ4ozEU= github.com/88250/gulu v1.2.3-0.20221117052724-cd06804db798/go.mod h1:I1qBzsksFL2ciGSuqDE7R3XW4BUMrfDgOvSXEk7FsAI= -github.com/88250/lute v1.7.6-0.20230212103910-a5da0bd24ec4 h1:2txqEs36VH3kmJSX/SmFdOVQmiSRAtWvuOchGeQu/Vk= -github.com/88250/lute v1.7.6-0.20230212103910-a5da0bd24ec4/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA= github.com/88250/lute v1.7.6-0.20230214102328-e0c90a284170 h1:YEAogpLQpFuqs5aNWkjZpfE/AByL80Hxq/kBYCzCmHk= github.com/88250/lute v1.7.6-0.20230214102328-e0c90a284170/go.mod h1:cEoBGi0zArPqAsp0MdG9SKinvH/xxZZWXU7sRx8vHSA= github.com/88250/pdfcpu v0.3.13 h1:touMWMZkCGalMIbEg9bxYp7rETM+zwb9hXjwhqi4I7Q= github.com/88250/pdfcpu v0.3.13/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY= github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1/go.mod h1:U3pckKQIgxxkmZjV5yXQjHdGxQK0o/vEZeZ6cQsxfHw= -github.com/BobuSumisu/aho-corasick v1.0.3 h1:uuf+JHwU9CHP2Vx+wAy6jcksJThhJS9ehR8a+4nPE9g= -github.com/BobuSumisu/aho-corasick v1.0.3/go.mod h1:hm4jLcvZKI2vRF2WDU1N4p/jpWtpOzp3nLmi9AzX/XE= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ClarkThan/ahocorasick v0.0.0-20230216061320-bccdb98581a3 h1:JsUUbdK1JdhsJt2ebcQFFfeO3jpzh6Vv7pmCph6qeik= github.com/ClarkThan/ahocorasick v0.0.0-20230216061320-bccdb98581a3/go.mod h1:a3CzWIqeRxiODAscAIfZ4wbFRXxywBrdCwTENVAWB2g= @@ -37,21 +33,15 @@ github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbf github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= -github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0 h1:onfun1RA+KcxaMk1lfrRnwCd1UUuOjJM/lri5eM1qMs= -github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0/go.mod h1:4yg+jNTYlDEzBjhGS96v+zjyA3lfXlFd5CiTLIkPBLI= -github.com/anknown/darts v0.0.0-20151216065714-83ff685239e6 h1:HblK3eJHq54yET63qPCTJnks3loDse5xRmmqHgHzwoI= -github.com/anknown/darts v0.0.0-20151216065714-83ff685239e6/go.mod h1:pbiaLIeYLUbgMY1kwEAdwO6UKD5ZNwdPGQlwokS9fe8= github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA= github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM= github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII= -github.com/aws/aws-sdk-go v1.44.199 h1:hYuQmS4zLMJR9v2iOp2UOD6Vi/0V+nwyR/Uhrkrtlbc= -github.com/aws/aws-sdk-go v1.44.199/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.203 h1:pcsP805b9acL3wUqa4JR2vg1k2wnItkDYNvfmcy6F+U= +github.com/aws/aws-sdk-go v1.44.203/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184 h1:8yL+85JpbwrIc6m+7N1iYrjn/22z68jwrTIBOJHNe4k= -github.com/cloudflare/ahocorasick v0.0.0-20210425175752-730270c3e184/go.mod h1:tGWUZLZp9ajsxUOnHmFFLnqnlKXsCn6GReG4jAD59H0= github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be h1:J5BL2kskAlV9ckgEsNQXscjIaLiOYiZ75d4e94E6dcQ= github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be/go.mod h1:mk5IQ+Y0ZeO87b858TlA645sVcEcbiX6YqP98kt+7+w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -200,8 +190,9 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de h1:V53FWzU6KAZVi1tPp5UIsMoUWJ2/PNwYIDXnu7QuBCE= +github.com/lufia/plan9stats v0.0.0-20230110061619-bbe2e5e100de/go.mod h1:JKx41uQRwqlTZabZc+kILPrO/3jlKnQ2Z8b7YiVw5cE= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -223,9 +214,9 @@ github.com/mssola/user_agent v0.5.3 h1:lBRPML9mdFuIZgI2cmlQ+atbpJdLdeVl2IDodjBR5 github.com/mssola/user_agent v0.5.3/go.mod h1:TTPno8LPY3wAIEKRpAtkdMT0f8SE24pLRGPahjCH4uw= github.com/olahol/melody v1.1.1 h1:amgBhR7pDY0rA0JHWprgLF0LnVztognAwEQgf/WYLVM= github.com/olahol/melody v1.1.1/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4= -github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= -github.com/onsi/ginkgo/v2 v2.8.0/go.mod h1:6JsQiECmxCa3V5st74AL/AmsV482EDdVrGaVW6z3oYU= -github.com/onsi/gomega v1.25.0 h1:Vw7br2PCDYijJHSfBOWhov+8cAnUf8MfMaIOV323l6Y= +github.com/onsi/ginkgo/v2 v2.8.1 h1:xFTEVwOFa1D/Ty24Ws1npBWkDYEV9BqZrsDxVrVkrrU= +github.com/onsi/ginkgo/v2 v2.8.1/go.mod h1:N1/NbDngAFcSLdyZ+/aYTYGSlq9qMCS/cNKGJjy+csc= +github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= github.com/open-spaced-repetition/go-fsrs v0.1.0 h1:6H1nCuxuR9p/GmKji0zET1uT5KDwOmW++k7jgr8L0Gk= github.com/open-spaced-repetition/go-fsrs v0.1.0/go.mod h1:H07GOB0A1OBeu3401x8qWKGaa43QjfrDoWy9nba7QCc= github.com/panjf2000/ants/v2 v2.7.1 h1:qBy5lfSdbxvrR0yUnZfaEDjf0FlCw4ufsbcsxmE7r+M= @@ -252,10 +243,10 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= github.com/quic-go/qtls-go1-18 v0.2.0 h1:5ViXqBZ90wpUcZS0ge79rf029yx0dYB0McyPJwqqj7U= github.com/quic-go/qtls-go1-18 v0.2.0/go.mod h1:moGulGHK7o6O8lSPSZNoOwcLvJKJ85vVNc7oJFD65bc= -github.com/quic-go/qtls-go1-19 v0.2.0 h1:Cvn2WdhyViFUHoOqK52i51k4nDX8EwIh5VJiVM4nttk= -github.com/quic-go/qtls-go1-19 v0.2.0/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= -github.com/quic-go/qtls-go1-20 v0.1.0 h1:d1PK3ErFy9t7zxKsG3NXBJXZjp/kMLoIb3y/kV54oAI= -github.com/quic-go/qtls-go1-20 v0.1.0/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= +github.com/quic-go/qtls-go1-19 v0.2.1 h1:aJcKNMkH5ASEJB9FXNeZCyTEIHU1J7MmHyz1Q1TSG1A= +github.com/quic-go/qtls-go1-19 v0.2.1/go.mod h1:ySOI96ew8lnoKPtSqx2BlI5wCpUVPT05RMAlajtnyOI= +github.com/quic-go/qtls-go1-20 v0.1.1 h1:KbChDlg82d3IHqaj2bn6GfKRj84Per2VGf5XV3wSwQk= +github.com/quic-go/qtls-go1-20 v0.1.1/go.mod h1:JKtK6mjbAVcUTN/9jZpvLbGxvdWIKS8uT7EiStoU1SM= github.com/quic-go/quic-go v0.32.0 h1:lY02md31s1JgPiiyfqJijpu/UX/Iun304FI3yUqX7tA= github.com/quic-go/quic-go v0.32.0/go.mod h1:/fCsKANhQIeD5l76c2JFU+07gVE3KaA0FP+0zMWwfwo= github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE= @@ -280,10 +271,6 @@ github.com/siyuan-note/dejavu v0.0.0-20230212031819-32964d704bd2 h1:H+57dsGkLA5b github.com/siyuan-note/dejavu v0.0.0-20230212031819-32964d704bd2/go.mod h1:RGGfMTYCp7iNdAu2x/fjj+svQqD0PKaRgxfOWtYnkHo= 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-20230203085647-fb624740be03 h1:W7nGGluE6sBrFSVkmucGsh2NruleOPsQle7fcAW115o= -github.com/siyuan-note/eventbus v0.0.0-20230203085647-fb624740be03/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI= -github.com/siyuan-note/eventbus v0.0.0-20230216101534-15f8e2f2fb12 h1:DjZa4jP3J+cZK9BuCXXzY4kr37QXXaCX+IHt8JP8UXQ= -github.com/siyuan-note/eventbus v0.0.0-20230216101534-15f8e2f2fb12/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI= github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b h1:828lTUW2C0uNiolODqoACu7J8sDUzswD4Xo04mUombg= github.com/siyuan-note/eventbus v0.0.0-20230216103454-41885eac6c2b/go.mod h1:Sqo4FYX5lAXu7gWkbEdJF0e6P57tNNVV4WDKYDctokI= github.com/siyuan-note/filelock v0.0.0-20221117095924-e1947438a35e h1:i3RKrdrddr4AuaHJtoWYAEVNuR7Y9wIsEqPmuFFbJC4= @@ -324,8 +311,8 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= -github.com/ugorji/go/codec v1.2.8 h1:sgBJS6COt0b/P40VouWKdseidkDgHxYGm0SAglUHfP0= -github.com/ugorji/go/codec v1.2.8/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc= @@ -352,14 +339,14 @@ golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4 golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab h1:628ME69lBm9C6JY2wXhAph/yjN3jezx1z7BIDLUwxjo= -golang.org/x/exp v0.0.0-20230210204819-062eb4c674ab/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb h1:PaBZQdo+iSDyHT053FjUCgZQ/9uqVwPOcl7KSWhKn6w= +golang.org/x/exp v0.0.0-20230213192124-5e25df0256eb/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20190823064033-3a9bac650e44/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= -golang.org/x/image v0.3.0 h1:HTDXbdK9bjfSWkPzDJIw89W8CAtfFGduujWs33NLLsg= -golang.org/x/image v0.3.0/go.mod h1:fXd9211C/0VTlYuAcOhW8dY/RtEJqODXOWBDpmYBf+A= +golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI= +golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20220722155234-aaac322e2105 h1:3vUV5x5+3LfQbgk7paCM6INOaJG9xXQbn79xoNkwfIk= golang.org/x/mobile v0.0.0-20220722155234-aaac322e2105/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ= @@ -380,8 +367,8 @@ golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -424,7 +411,6 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=