An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:sparkles: Support searching local snapshots by ID https://github.com/siyuan-note/siyuan/issues/19905
Daniel4b35d1778c8a
diff --git a/app/appearance/langs/ar.json b/app/appearance/langs/ar.jsonindex 4dea0099de..f56c997e04 100644--- a/app/appearance/langs/ar.json+++ b/app/appearance/langs/ar.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "البحث بمعرّف اللقطة","calendarWeekLabel": "أ","conditionalColors": "ألوان شرطية","conditionalColorItem": "العنصر بالكامل",diff --git a/app/appearance/langs/de.json b/app/appearance/langs/de.jsonindex 31db6d517a..9f375181a8 100644--- a/app/appearance/langs/de.json+++ b/app/appearance/langs/de.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Nach Schnappschuss-ID suchen","calendarWeekLabel": "KW","conditionalColors": "Bedingte Farben","conditionalColorItem": "Gesamter Eintrag",diff --git a/app/appearance/langs/en.json b/app/appearance/langs/en.jsonindex 8473e45a2c..9101228289 100644--- a/app/appearance/langs/en.json+++ b/app/appearance/langs/en.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Search snapshot ID","calendarWeekLabel": "W","conditionalColors": "Conditional colors","conditionalColorItem": "Entire item",diff --git a/app/appearance/langs/es.json b/app/appearance/langs/es.jsonindex 52a492efe8..de24a253ec 100644--- a/app/appearance/langs/es.json+++ b/app/appearance/langs/es.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Buscar por ID de instantánea","calendarWeekLabel": "S","conditionalColors": "Colores condicionales","conditionalColorItem": "Elemento completo",diff --git a/app/appearance/langs/fr.json b/app/appearance/langs/fr.jsonindex 08cfd8558f..dfff9f5698 100644--- a/app/appearance/langs/fr.json+++ b/app/appearance/langs/fr.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Rechercher par ID d’instantané","calendarWeekLabel": "S","conditionalColors": "Couleurs conditionnelles","conditionalColorItem": "Élément entier",diff --git a/app/appearance/langs/he.json b/app/appearance/langs/he.jsonindex 1e6109f369..d759380a67 100644--- a/app/appearance/langs/he.json+++ b/app/appearance/langs/he.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "חיפוש לפי מזהה תמונת מצב","calendarWeekLabel": "ש","conditionalColors": "צבעים מותנים","conditionalColorItem": "הפריט כולו",diff --git a/app/appearance/langs/hi.json b/app/appearance/langs/hi.jsonindex da1449bd2c..d99bbe68b9 100644--- a/app/appearance/langs/hi.json+++ b/app/appearance/langs/hi.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "स्नैपशॉट ID से खोजें","calendarWeekLabel": "स.","conditionalColors": "सशर्त रंग","conditionalColorItem": "पूरा आइटम",diff --git a/app/appearance/langs/id.json b/app/appearance/langs/id.jsonindex cc1feb1cee..390edf6dab 100644--- a/app/appearance/langs/id.json+++ b/app/appearance/langs/id.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Cari ID snapshot","calendarWeekLabel": "M","conditionalColors": "Warna bersyarat","conditionalColorItem": "Seluruh item",diff --git a/app/appearance/langs/it.json b/app/appearance/langs/it.jsonindex 95742feea0..6e6e27bd85 100644--- a/app/appearance/langs/it.json+++ b/app/appearance/langs/it.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Cerca per ID istantanea","calendarWeekLabel": "S","conditionalColors": "Colori condizionali","conditionalColorItem": "Intero elemento",diff --git a/app/appearance/langs/ja.json b/app/appearance/langs/ja.jsonindex 7f3725be6e..5c93efcfe2 100644--- a/app/appearance/langs/ja.json+++ b/app/appearance/langs/ja.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "スナップショット ID で検索","calendarWeekLabel": "週","conditionalColors": "条件付きの色","conditionalColorItem": "項目全体",diff --git a/app/appearance/langs/ko.json b/app/appearance/langs/ko.jsonindex 1b40edfc9f..708116fa7f 100644--- a/app/appearance/langs/ko.json+++ b/app/appearance/langs/ko.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "스냅샷 ID로 검색","calendarWeekLabel": "주","conditionalColors": "조건부 색상","conditionalColorItem": "항목 전체",diff --git a/app/appearance/langs/nl.json b/app/appearance/langs/nl.jsonindex 74d5821b1d..ef40ba2f42 100644--- a/app/appearance/langs/nl.json+++ b/app/appearance/langs/nl.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Zoeken op snapshot-ID","calendarWeekLabel": "W","conditionalColors": "Voorwaardelijke kleuren","conditionalColorItem": "Geheel item",diff --git a/app/appearance/langs/pl.json b/app/appearance/langs/pl.jsonindex e8a0c64b13..36a3157aa0 100644--- a/app/appearance/langs/pl.json+++ b/app/appearance/langs/pl.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Szukaj według ID migawki","calendarWeekLabel": "T","conditionalColors": "Kolory warunkowe","conditionalColorItem": "Cały element",diff --git a/app/appearance/langs/pt-BR.json b/app/appearance/langs/pt-BR.jsonindex c878343824..3407ffd7cd 100644--- a/app/appearance/langs/pt-BR.json+++ b/app/appearance/langs/pt-BR.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Pesquisar por ID do instantâneo","calendarWeekLabel": "S","conditionalColors": "Cores condicionais","conditionalColorItem": "Item inteiro",diff --git a/app/appearance/langs/ru.json b/app/appearance/langs/ru.jsonindex d72ac8592e..710679583b 100644--- a/app/appearance/langs/ru.json+++ b/app/appearance/langs/ru.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Поиск по ID снимка","calendarWeekLabel": "Н","conditionalColors": "Условные цвета","conditionalColorItem": "Вся запись",diff --git a/app/appearance/langs/sk.json b/app/appearance/langs/sk.jsonindex 71af199301..c002716116 100644--- a/app/appearance/langs/sk.json+++ b/app/appearance/langs/sk.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Hľadať podľa ID snímky","calendarWeekLabel": "T","conditionalColors": "Podmienené farby","conditionalColorItem": "Celá položka",diff --git a/app/appearance/langs/sr.json b/app/appearance/langs/sr.jsonindex cba34199ba..7828152778 100644--- a/app/appearance/langs/sr.json+++ b/app/appearance/langs/sr.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Претрага по ID снимка","calendarWeekLabel": "Н","conditionalColors": "Условне боје","conditionalColorItem": "Цела ставка",diff --git a/app/appearance/langs/th.json b/app/appearance/langs/th.jsonindex 5bb452635c..c5b1c0da21 100644--- a/app/appearance/langs/th.json+++ b/app/appearance/langs/th.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "ค้นหาด้วย ID สแนปช็อต","calendarWeekLabel": "สัป.","conditionalColors": "สีตามเงื่อนไข","conditionalColorItem": "ทั้งรายการ",diff --git a/app/appearance/langs/tr.json b/app/appearance/langs/tr.jsonindex 03e61e555b..ce80d06a87 100644--- a/app/appearance/langs/tr.json+++ b/app/appearance/langs/tr.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Anlık görüntü kimliğiyle ara","calendarWeekLabel": "H","conditionalColors": "Koşullu renkler","conditionalColorItem": "Öğenin tamamı",diff --git a/app/appearance/langs/uk.json b/app/appearance/langs/uk.jsonindex f8cd240d40..57e698ea22 100644--- a/app/appearance/langs/uk.json+++ b/app/appearance/langs/uk.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "Пошук за ID знімка","calendarWeekLabel": "Т","conditionalColors": "Умовні кольори","conditionalColorItem": "Увесь запис",diff --git a/app/appearance/langs/zh-CN.json b/app/appearance/langs/zh-CN.jsonindex 1ac11fce08..1f5f5aecd3 100644--- a/app/appearance/langs/zh-CN.json+++ b/app/appearance/langs/zh-CN.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "按快照 ID 搜索","calendarWeekLabel": "周","conditionalColors": "条件颜色","conditionalColorItem": "整个条目",diff --git a/app/appearance/langs/zh-TW.json b/app/appearance/langs/zh-TW.jsonindex 0847acdceb..00b3be7a2a 100644--- a/app/appearance/langs/zh-TW.json+++ b/app/appearance/langs/zh-TW.json@@ -1,4 +1,5 @@{+ "searchSnapshotID": "依快照 ID 搜尋","calendarWeekLabel": "週","conditionalColors": "條件顏色","conditionalColorItem": "整個條目",diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.syindex 5e148597c7..4d0be85318 100644--- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy+++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-xaduj2o/20210615213222-vs5tzbd.sy@@ -6,7 +6,7 @@"id": "20210615213222-vs5tzbd","title": "Data history","type": "doc",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1102,7 +1102,7 @@"HeadingLevel": 2,"Properties": {"id": "20220615120602-drz9hwc",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1498,7 +1498,7 @@"HeadingLevel": 3,"Properties": {"id": "20220615120602-nzrp6gt",- "updated": "20260914101605"+ "updated": "20260927191121"},"Children": [{@@ -1589,6 +1589,20 @@}]},+ {+ "ID": "20260927191121-n45rqtj",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927191121-n45rqtj",+ "updated": "20260927191121"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "To locate a local snapshot using an ID supplied by a plugin or another source, switch the search mode to Search snapshot ID, paste the full 40-character ID, and search. Matching is case-insensitive. The result keeps the usual snapshot actions, including rollback. Clear the search text to return to the full list, or switch back to file-name search to find files within snapshots."+ }+ ]+ },{"ID": "20260914101605-wf8t6ol","Type": "NodeHeading",diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.syindex 5daa2a546a..b60c08f454 100644--- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy+++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180321-hbvl5c2/20210615211733-v6rzowm.sy@@ -6,7 +6,7 @@"id": "20210615211733-v6rzowm","title": "数据历史","type": "doc",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1086,7 +1086,7 @@"HeadingLevel": 2,"Properties": {"id": "20220615112531-5yos96d",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1488,7 +1488,7 @@"HeadingLevel": 3,"Properties": {"id": "20220615114301-099icf4",- "updated": "20260914101605"+ "updated": "20260927191121"},"Children": [{@@ -1579,6 +1579,20 @@}]},+ {+ "ID": "20260927191121-grjxhnz",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927191121-grjxhnz",+ "updated": "20260927191121"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "如需根据插件等来源提供的 ID 定位本地快照,可将搜索方式切换为按快照 ID 搜索,粘贴完整的 40 位 ID 后搜索,字母不区分大小写。结果保留回滚等常规快照操作。清空搜索内容可返回完整列表,也可切换回按文件名搜索以查找快照内的文件。"+ }+ ]+ },{"ID": "20260914101605-oj55v9o","Type": "NodeHeading",diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.syindex 88df61e398..acc7b9036c 100644--- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy+++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226121203-rjjngpz/20211226122707-8cr09co.sy@@ -6,7 +6,7 @@"id": "20211226122707-8cr09co","title": "資料歷史","type": "doc",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1078,7 +1078,7 @@"HeadingLevel": 2,"Properties": {"id": "20220615120134-cdqs2gt",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1474,7 +1474,7 @@"HeadingLevel": 3,"Properties": {"id": "20220615120134-kbof9pl",- "updated": "20260914101605"+ "updated": "20260927191121"},"Children": [{@@ -1565,6 +1565,20 @@}]},+ {+ "ID": "20260927191121-zbh8b1u",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927191121-zbh8b1u",+ "updated": "20260927191121"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "如需依據外掛程式等來源提供的 ID 尋找本機快照,可將搜尋方式切換為依快照 ID 搜尋,貼上完整的 40 位 ID 後搜尋,字母不區分大小寫。結果保留回滾等一般快照操作。清空搜尋內容可返回完整清單,也可切換回依檔案名稱搜尋以尋找快照內的檔案。"+ }+ ]+ },{"ID": "20260914101605-jp3prni","Type": "NodeHeading",diff --git a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-txrc7z1.sy b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-txrc7z1.syindex 64613ef34a..9b546d86d8 100644--- a/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-txrc7z1.sy+++ b/app/guide/20240530133126-axarxgx/20240530101000-4qitucx/20240530101000-g3ugxml/20240530101000-txrc7z1.sy@@ -7,7 +7,7 @@"id": "20240530101000-txrc7z1","title": "データ履歴","type": "doc",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1173,7 +1173,7 @@"Properties": {"ID": "20240530101000-b78egg3","id": "20240530101000-sy5cmkg",- "updated": "20260914102430"+ "updated": "20260927191121"},"Children": [{@@ -1626,7 +1626,7 @@"Properties": {"ID": "20240530101000-yn8i3sj","id": "20240530101000-bhs49zm",- "updated": "20260914101605"+ "updated": "20260927191121"},"Children": [{@@ -1714,6 +1714,20 @@}]},+ {+ "ID": "20260927191121-kt5hlo6",+ "Type": "NodeParagraph",+ "Properties": {+ "id": "20260927191121-kt5hlo6",+ "updated": "20260927191121"+ },+ "Children": [+ {+ "Type": "NodeText",+ "Data": "プラグインなどが提示した ID でローカルスナップショットを探すには、検索方法をスナップショット ID で検索に切り替え、40 桁の完全な ID を貼り付けて検索します。英字の大文字と小文字は区別されません。結果ではロールバックなどの通常の操作を利用できます。検索文字列を消すと一覧に戻ります。スナップショット内のファイルを探す場合は、ファイル名検索に切り替えてください。"+ }+ ]+ },{"ID": "20260914101605-9l0hxqv","Type": "NodeHeading",diff --git a/app/src/history/history.ts b/app/src/history/history.tsindex 89c8ab19b9..c40a90e424 100644--- a/app/src/history/history.ts+++ b/app/src/history/history.ts@@ -387,7 +387,9 @@ const renderRepo = async (element: Element, currentPage: number) => {const selectValue = getRepoSnapshotType(element);const searchInputElement = element.querySelector<HTMLInputElement>(".b3-text-field");const keyword = searchInputElement.value.trim();- const searching = Boolean(keyword && selectValue === "getRepoSnapshots");+ const searchModeElement = element.querySelector<HTMLSelectElement>('[data-type="repoSearchMode"]');+ const searchSnapshot = Boolean(keyword && selectValue === "getRepoSnapshots" && searchModeElement.value === "id");+ const searching = Boolean(keyword && selectValue === "getRepoSnapshots" && !searchSnapshot);const tagged = selectValue === "getRepoTagSnapshots" || selectValue === "getCloudRepoTagSnapshots";const listElement = element.querySelector('[data-type="repoList"]');const pageBtn = element.querySelector('button[data-type="jumpRepoPage"]');@@ -401,6 +403,7 @@ const renderRepo = async (element: Element, currentPage: number) => {element.setAttribute("data-page", String(currentPage));pageBtn.textContent = String(currentPage);searchInputElement.parentElement.classList.toggle("fn__none", selectValue !== "getRepoSnapshots");+ searchModeElement.classList.toggle("fn__none", selectValue !== "getRepoSnapshots");searchButton.disabled = true;[previousElement, nextElement, pageBtn].forEach(button => {button.classList.toggle("fn__none", tagged);@@ -409,7 +412,9 @@ const renderRepo = async (element: Element, currentPage: number) => {pageElement.classList.add("fn__none");let response: IWebSocketData;try {- if (searching) {+ if (searchSnapshot) {+ response = await fetchSyncPost("/api/repo/getRepoSnapshots", {id: keyword, page: 1}, undefined, false);+ } else if (searching) {response = await fetchSyncPost("/api/repo/searchRepoFile", {keyword, page: currentPage}, undefined, false);} else if (tagged) {response = await fetchSyncPost(`/api/repo/${selectValue}`, {}, undefined, false);@@ -580,6 +585,10 @@ export const openHistory = (app: App, tab: "doc" | "notebook" | "repo" = "doc")<span class="ft__on-surface fn__flex-shrink ft__selectnone fn__none">${window.siyuan.languages.pageCountAndSnapshotCount}</span><span class="fn__space"></span><div class="fn__flex-1"></div>+ <select class="b3-select fn__none" data-type="repoSearchMode" aria-label="${window.siyuan.languages.search}">+ <option value="file">${window.siyuan.languages.searchFileName}</option>+ <option value="id">${window.siyuan.languages.searchSnapshotID}</option>+ </select><div class="b3-form__icon fn__none"><svg class="b3-form__icon-icon"><use xlink:href="#iconSearch"></use></svg><input class="b3-text-field b3-form__icon-input fn__size200" style="padding-right: 44px;" spellcheck="false" placeholder="${window.siyuan.languages.searchFileName}">@@ -707,6 +716,12 @@ const bindEvent = (app: App, element: Element, dialog?: Dialog) => {itemElement.classList.add("b3-list-item--focus");};const searchFileElement = repoElement.querySelector<HTMLInputElement>(".b3-text-field");+ const searchModeElement = repoElement.querySelector<HTMLSelectElement>('[data-type="repoSearchMode"]');+ searchModeElement.addEventListener("change", () => {+ searchFileElement.placeholder = searchModeElement.value === "id" ?+ window.siyuan.languages.searchSnapshotID : window.siyuan.languages.searchFileName;+ renderRepo(repoElement, 1);+ });searchFileElement.nextElementSibling.addEventListener("click", () => {renderRepo(repoElement, 1);});diff --git a/app/src/history/repoSearch.test.ts b/app/src/history/repoSearch.test.tsnew file mode 100644index 0000000000..591b8a57d1--- /dev/null+++ b/app/src/history/repoSearch.test.ts@@ -0,0 +1,56 @@+import {it} from "node:test";+import * as assert from "node:assert/strict";+import {readFileSync} from "node:fs";+import {join} from "node:path";+import {ScriptTarget, transpileModule} from "typescript";++it("keeps snapshot ID lookup separate from file search and normal pagination", async () => {+ const source = readFileSync(join(__dirname, "history.ts"), "utf8");+ const code = source.slice(source.indexOf("const renderRepo ="), source.indexOf("const renderRmNotebook ="));+ for (const test of [+ {mode: "id", keyword: " abc ", path: "getRepoSnapshots", body: {id: "abc", page: 1}, files: false},+ {mode: "file", keyword: "abc", path: "searchRepoFile", body: {keyword: "abc", page: 3}, files: true},+ {mode: "id", keyword: " ", path: "getRepoSnapshots", body: {page: 3}, files: false},+ ]) {+ const noop = () => {};+ const node = () => ({classList: {contains: () => false, toggle: noop, add: noop, remove: noop},+ setAttribute: noop, removeAttribute: noop, textContent: "", innerHTML: "", disabled: false});+ const searchButton = node();+ const searchInput = {...node(), value: test.keyword, parentElement: node(), nextElementSibling: searchButton};+ const next = {...node(), nextElementSibling: {nextElementSibling: node()}};+ const nodes: Record<string, unknown> = {+ ".b3-text-field": searchInput,+ '[data-type="repoSearchMode"]': {...node(), value: test.mode},+ '[data-type="repoList"]': node(),+ 'button[data-type="jumpRepoPage"]': node(),+ '[data-type="previous"]': node(),+ '[data-type="next"]': next,+ };+ const pane = {...node(), isConnected: true, querySelector: (selector: string) => nodes[selector]};+ const requests: unknown[] = [];+ const rendered: string[] = [];+ let fileLayout: boolean;+ const dependencies = {+ repoRequests: new WeakMap(),+ getRepoSnapshotType: () => "getRepoSnapshots",+ setRepoSearchLayout: (_element: Element, files: boolean) => { fileLayout = files; },+ updateRepoSelection: noop,+ fetchSyncPost: async (path: string, body: unknown) => {+ requests.push({path, body});+ return {code: 0, data: {pageCount: 1, totalCount: 0}};+ },+ renderRepoSearchResult: () => rendered.push("files"),+ renderRepoItem: () => rendered.push("snapshots"),+ escapeHtml: String,+ window: {siyuan: {languages: {pageCountAndSnapshotCount: "${x} ${y}"}}},+ };+ const renderRepo = new Function(...Object.keys(dependencies), transpileModule(code, {+ compilerOptions: {target: ScriptTarget.ES2021},+ }).outputText + "\nreturn renderRepo;")(...Object.values(dependencies));+ await renderRepo(pane, 3);+ assert.deepEqual(requests, [{path: "/api/repo/" + test.path, body: test.body}]);+ assert.deepEqual(rendered, [test.files ? "files" : "snapshots"]);+ assert.equal(fileLayout, test.files);+ assert.equal(searchButton.disabled, false);+ }+});diff --git a/app/src/types/api/index.d.ts b/app/src/types/api/index.d.tsindex e56780d33b..207980583b 100644--- a/app/src/types/api/index.d.ts+++ b/app/src/types/api/index.d.ts@@ -1140,7 +1140,7 @@ export type GetRepoDocHistoryRequestInput = { "id": string; "page": number; };export type GetRepoFileRequestInput = { "id": string; };-export type GetRepoSnapshotsRequestInput = { "page": number; };+export type GetRepoSnapshotsRequestInput = { "id"?: string; "page": number; };export type GetSnippetRequestInput = { "enabled": number; "keyword"?: string | null; "type": string; };diff --git a/kernel/api/contract_repo_test.go b/kernel/api/contract_repo_test.goindex 13dbf1837a..5f2a78a7d1 100644--- a/kernel/api/contract_repo_test.go+++ b/kernel/api/contract_repo_test.go@@ -621,6 +621,56 @@ func TestRepoContractHTTPFailures(t *testing.T) {}}+func TestRepoSnapshotIDContractHTTP(t *testing.T) {+ root, _ := setupArchiveWorkspace(t)+ previousConf, previousRepo, previousTemp := model.Conf, util.RepoDir, util.TempDir+ model.Conf = model.NewAppConf()+ model.Conf.Repo = conf.NewRepo()+ model.Conf.Sync = conf.NewSync()+ model.Conf.System = &conf.System{ID: "contract-device", Name: "contract-device", OS: "test"}+ model.Conf.Repo.Key = bytes.Repeat([]byte{1}, 32)+ util.RepoDir, util.TempDir = filepath.Join(root, "repo"), filepath.Join(root, "temp")+ t.Cleanup(func() { model.Conf, util.RepoDir, util.TempDir = previousConf, previousRepo, previousTemp })+ store, err := dejavu.NewStore(util.RepoDir, model.Conf.Repo.Key)+ if err != nil {+ t.Fatal(err)+ }+ id := fmt.Sprintf("%040x", 19905)+ if err = store.PutIndex(&entity.Index{ID: id, Memo: "snapshot lookup", Created: 1790000000000}); err != nil {+ t.Fatal(err)+ }+ bundle, err := apicontract.BuildBundle()+ if err != nil {+ t.Fatal(err)+ }+ engine := gin.New()+ const endpoint = "/api/repo/getRepoSnapshots"+ engine.POST(endpoint, getRepoSnapshots)+ for _, test := range []struct {+ id string+ code int+ count int+ }{{" " + strings.ToUpper(id) + " ", 0, 1}, {strings.Repeat("0", 40), 0, 0}, {"../invalid", -1, 0}} {+ recorder := httptest.NewRecorder()+ engine.ServeHTTP(recorder, httptest.NewRequest(http.MethodPost, endpoint,+ strings.NewReader(fmt.Sprintf(`{"page":99,"id":%q}`, test.id))))+ if err = bundle.ValidateResponse(http.MethodPost, endpoint, recorder.Body.Bytes()); err != nil {+ t.Fatal(err)+ }+ var response struct {+ Code int `json:"code"`+ Data apicontract.RepoSnapshotsData `json:"data"`+ }+ if err = json.Unmarshal(recorder.Body.Bytes(), &response); err != nil || response.Code != test.code ||+ len(response.Data.Snapshots) != test.count || response.Data.TotalCount != test.count || response.Data.PageCount != test.count {+ t.Fatalf("snapshot lookup: %s, %v", recorder.Body.String(), err)+ }+ if test.count == 1 && response.Data.Snapshots[0].ID != id {+ t.Fatalf("unexpected snapshot: %s", recorder.Body.String())+ }+ }+}+func TestRepoContractLockedFileAdmission(t *testing.T) {root, boxID := setupArchiveWorkspace(t)previousConf, previousRepo, previousTemp := model.Conf, util.RepoDir, util.TempDirdiff --git a/kernel/api/repo.go b/kernel/api/repo.goindex dbc1727ec5..e1433c10fc 100644--- a/kernel/api/repo.go+++ b/kernel/api/repo.go@@ -164,7 +164,14 @@ var uploadCloudSnapshot = contractHandler(apicontract.UploadCloudSnapshot, func(})var getRepoSnapshots = contractHandler(apicontract.GetRepoSnapshots, func(c *gin.Context, request apicontract.GetRepoSnapshotsRequest) apicontract.Response[apicontract.RepoSnapshotsData] {- snapshots, pageCount, totalCount, err := model.GetRepoSnapshots(int(request.Page))+ var snapshots []*model.Snapshot+ var pageCount, totalCount int+ var err error+ if request.ID != "" {+ snapshots, pageCount, totalCount, err = model.SearchRepoSnapshot(request.ID)+ } else {+ snapshots, pageCount, totalCount, err = model.GetRepoSnapshots(int(request.Page))+ }if err != nil {return apicontract.Failure[apicontract.RepoSnapshotsData](-1, err.Error())}diff --git a/kernel/apicontract/repo.go b/kernel/apicontract/repo.goindex 30ac3f503b..0c9276d520 100644--- a/kernel/apicontract/repo.go+++ b/kernel/apicontract/repo.go@@ -59,6 +59,9 @@ type UploadCloudSnapshotRequest struct {}type GetRepoSnapshotsRequest struct {Page float64 `json:"page"`+ // ID 可选,去除首尾空白后按完整的 40 位十六进制快照 ID 查询本地仓库,忽略分页。+ // 省略或留空时保留分页列表;未找到返回空列表,格式错误及仓库读取失败返回错误。+ ID string `json:"id" api:"optional"`}type SearchRepoFileRequest struct {Keyword string `json:"keyword" api:"trim"`@@ -320,6 +323,10 @@ func init() {if request.Page, err = legacyField[float64](fields, "page", "Number", true); err != nil {return request, err}+ if request.ID, err = legacyField[string](fields, "id", "String", false); err != nil {+ return request, err+ }+ request.ID = strings.TrimSpace(request.ID)return request, nil}SearchRepoFile.decodeRequest = func(reader io.Reader) (request SearchRepoFileRequest, err error) {diff --git a/kernel/apicontract/repo_test.go b/kernel/apicontract/repo_test.goindex 1e56df1bca..46235766da 100644--- a/kernel/apicontract/repo_test.go+++ b/kernel/apicontract/repo_test.go@@ -6,6 +6,24 @@ import ("testing")+func TestRepoSnapshotIDContract(t *testing.T) {+ for _, body := range []string{`{"page":1}`, `{"page":1,"id":""}`, `{"page":1,"id":null}`} {+ request, err := GetRepoSnapshots.Decode(strings.NewReader(body))+ if err != nil || request.ID != "" {+ t.Fatalf("optional ID: %s %v", body, err)+ }+ }+ request, err := GetRepoSnapshots.Decode(strings.NewReader(`{"page":2.75,"id":" abc "}`))+ if err != nil || request.ID != "abc" || request.Page != 2.75 {+ t.Fatalf("ID trimming and page compatibility: %+v %v", request, err)+ }+ for _, body := range []string{`{"page":1,"id":123}`, `{"page":1,"id":[]}`, `{"id":"abc"}`} {+ if _, err := GetRepoSnapshots.Decode(strings.NewReader(body)); err == nil {+ t.Fatalf("invalid request accepted: %s", body)+ }+ }+}+func TestSnapshotContracts(t *testing.T) {for _, body := range []string{`{}`, `{"memo":""}`, `{"memo":"note"}`} {if _, err := CreateSnapshot.Decode(strings.NewReader(body)); err != nil {diff --git a/kernel/apicontract/schema.json b/kernel/apicontract/schema.jsonindex 9cec85a5d8..e6929ba53e 100644--- a/kernel/apicontract/schema.json+++ b/kernel/apicontract/schema.json@@ -26465,6 +26465,9 @@"GetRepoSnapshotsRequestInput": {"type": "object","properties": {+ "id": {+ "type": "string"+ },"page": {"type": "number"}diff --git a/kernel/model/repository.go b/kernel/model/repository.goindex f05b9986fb..237c13457c 100644--- a/kernel/model/repository.go+++ b/kernel/model/repository.go@@ -23,6 +23,7 @@ import ("crypto/sha1""crypto/sha256""encoding/base64"+ "encoding/hex""errors""fmt""math"@@ -988,6 +989,42 @@ type TypeCount struct {Count int `json:"count"`}+// SearchRepoSnapshot 按完整 ID 读取本地快照,复用列表的元数据和下载状态计算。+func SearchRepoSnapshot(id string) (ret []*Snapshot, pageCount, totalCount int, err error) {+ ret = []*Snapshot{}+ id = strings.ToLower(strings.TrimSpace(id))+ decoded, decodeErr := hex.DecodeString(id)+ if decodeErr != nil || len(decoded) != sha1.Size {+ return ret, 0, 0, errors.New("invalid snapshot ID")+ }+ if len(Conf.Repo.Key) == 0 {+ return ret, 0, 0, errors.New(Conf.Language(26))+ }+ repo, err := newRepository()+ if err != nil {+ return+ }+ index, err := repo.GetIndex(id)+ if os.IsNotExist(err) || errors.Is(err, dejavu.ErrNotFoundIndex) {+ return ret, 0, 0, nil+ }+ if err != nil {+ return+ }+ files, err := repo.GetFiles(index)+ if err != nil {+ return+ }+ ret = buildSnapshots([]*dejavu.Log{{+ ID: index.ID, Memo: index.Memo, Created: index.Created,+ HCreated: time.UnixMilli(index.Created).Format("2006-01-02 15:04:05"),+ Files: files, Count: index.Count, Size: index.Size,+ HSize: humanize.BytesCustomCeil(uint64(index.Size), 2),+ SystemID: index.SystemID, SystemName: index.SystemName, SystemOS: index.SystemOS,+ }})+ return ret, 1, 1, nil+}+func GetRepoSnapshots(page int) (ret []*Snapshot, pageCount, totalCount int, err error) {ret = []*Snapshot{}if 1 > len(Conf.Repo.Key) {diff --git a/kernel/model/repository_snapshot_test.go b/kernel/model/repository_snapshot_test.goindex b23dafad99..69977b2a9a 100644--- a/kernel/model/repository_snapshot_test.go+++ b/kernel/model/repository_snapshot_test.go@@ -1,13 +1,74 @@package modelimport (+ "bytes"+ "encoding/json""os""path/filepath"+ "strings""testing"+ "github.com/siyuan-note/dejavu""github.com/siyuan-note/siyuan/kernel/util")+func TestSearchRepoSnapshot(t *testing.T) {+ _, partial, _ := prepareAssetDownloadRepoTest(t)+ index, err := partial.Latest()+ if err != nil {+ t.Fatal(err)+ }+ listed, _, _, err := GetRepoSnapshots(1)+ if err != nil {+ t.Fatal(err)+ }+ for _, id := range []string{index.ID, " \n" + strings.ToUpper(index.ID) + "\t"} {+ found, pages, total, searchErr := SearchRepoSnapshot(id)+ if searchErr != nil || len(found) != 1 || pages != 1 || total != 1 {+ t.Fatalf("search %q: %v %d %d %v", id, found, pages, total, searchErr)+ }+ var expected *Snapshot+ for _, item := range listed {+ if item.ID == index.ID {+ expected = item+ }+ }+ want, _ := json.Marshal(expected)+ got, _ := json.Marshal(found[0])+ if expected == nil || !bytes.Equal(want, got) {+ t.Fatalf("metadata mismatch: %s / %s", want, got)+ }+ }+ missing := strings.Repeat("0", 40)+ if found, pages, total, err := SearchRepoSnapshot(missing); err != nil || len(found) != 0 || pages != 0 || total != 0 {+ t.Fatalf("missing snapshot: %v %d %d %v", found, pages, total, err)+ }+ for _, id := range []string{"", "short", "../../outside", strings.Repeat("z", 40)} {+ if _, _, _, err := SearchRepoSnapshot(id); err == nil {+ t.Fatalf("invalid ID accepted: %q", id)+ }+ }+ store, err := dejavu.NewStore(util.RepoDir, Conf.Repo.Key)+ if err != nil {+ t.Fatal(err)+ }+ corruptID := strings.Repeat("1", 40)+ dir, file := store.IndexAbsPath(corruptID)+ if err = os.MkdirAll(dir, 0755); err != nil {+ t.Fatal(err)+ }+ corrupt := []byte("corrupt snapshot index")+ if err = os.WriteFile(file, corrupt, 0644); err != nil {+ t.Fatal(err)+ }+ if _, _, _, err = SearchRepoSnapshot(corruptID); err == nil {+ t.Fatal("corrupt snapshot returned as missing")+ }+ if unchanged, err := os.ReadFile(file); err != nil || !bytes.Equal(unchanged, corrupt) {+ t.Fatal("corrupt source was modified")+ }+}+func TestSnapshotMemoDefaults(t *testing.T) {for _, memo := range []string{"", " \n\t", "\u200b\u200c"} {if got := normalizeSnapshotMemo(memo); got != "Create manually" {