An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作
TypeScript agentic-aiai-agentknowledge-baselocal-firstmarkdownmcpmindmapnote-takingself-hostedsiyuanworkspace
:bug: Propagate template database copy save failures https://github.com/siyuan-note/siyuan/issues/21001
Danielda1735c3f2bd
diff --git a/kernel/model/template.go b/kernel/model/template.goindex d51a107f26..ac73add3fd 100644--- a/kernel/model/template.go+++ b/kernel/model/template.go@@ -826,7 +826,7 @@ func prepareTemplateAttributeViews(tree *parse.Tree, preview bool) (plans map[*areturn}-func saveTemplateAttributeViewCopies(copies []*templateAttributeViewCopy, boxID string) {+func saveTemplateAttributeViewCopies(copies []*templateAttributeViewCopy, boxID string) error {for _, copied := range copies {if "" != boxID {av.SetAVBoxID(copied.target.ID, boxID)@@ -836,9 +836,10 @@ func saveTemplateAttributeViewCopies(copies []*templateAttributeViewCopy, boxIDav.SetAVBoxID(copied.target.ID, "")}if nil != err {- logging.LogErrorf("save attribute view [%s] failed: %s", copied.target.ID, err)+ return fmt.Errorf("save attribute view [%s] failed: %w", copied.target.ID, err)}}+ return nil}func applyTemplateAttributeViewPlan(node *ast.Node, plan *templateAttributeViewPlan) (*av.View, error) {@@ -1144,7 +1145,9 @@ func renderTemplateSourceAt(p, id string, mode TemplateRenderMode, content *strireturn}if !preview {- saveTemplateAttributeViewCopies(attributeViewCopies, templateAttributeViewBoxID(tree))+ if err = saveTemplateAttributeViewCopies(attributeViewCopies, templateAttributeViewBoxID(tree)); nil != err {+ return+ }}restoreTabsSelection()diff --git a/kernel/model/template_test.go b/kernel/model/template_test.goindex 504788f373..2efb4bfac7 100644--- a/kernel/model/template_test.go+++ b/kernel/model/template_test.go@@ -383,6 +383,105 @@ func TestTemplateDatabaseCopyClonesSharedDatabaseOnce(t *testing.T) {}}+func TestTemplateDatabaseCopySaveFailureDoesNotReturnDOM(t *testing.T) {+ fixture := setupFileOperationTest(t)+ first := addTemplateAttributeViewTestFixture(t, fixture, "20260904000500-avfail1")+ second := addTemplateAttributeViewTestFixture(t, fixture, "20260904000501-avfail2")+ tree, err := LoadTreeByBlockID(fixture.sourceID)+ if err != nil {+ t.Fatal(err)+ }+ for _, node := range first.nodes {+ tree.Root.AppendChild(node)+ }+ if _, err = filesys.WriteTree(tree); err != nil {+ t.Fatal(err)+ }+ treenode.UpsertBlockTree(tree)+ if _, err = DocSaveAsTemplate(fixture.sourceID, "save-failure", false); err != nil {+ t.Fatal(err)+ }+ avDir := filepath.Join(util.DataDir, "storage", "av")+ backup := avDir + "-backup"+ before := map[string]string{}+ for _, database := range []*templateAttributeViewTestFixture{first, second} {+ data, readErr := os.ReadFile(av.GetAttributeViewDataPath(database.attrView.ID))+ if readErr != nil {+ t.Fatal(readErr)+ }+ before[database.attrView.ID] = string(data)+ }+ originalSaved := av.AttributeViewSaved+ blocked := false+ var savedID string+ restore := func() {+ av.AttributeViewSaved = originalSaved+ if blocked {+ if err := os.Remove(avDir); err != nil {+ t.Fatal(err)+ }+ if err := os.Rename(backup, avDir); err != nil {+ t.Fatal(err)+ }+ blocked = false+ }+ }+ t.Cleanup(restore)+ av.AttributeViewSaved = func(id, boxID string) {+ savedID = id+ if err := os.Rename(avDir, backup); err != nil {+ t.Fatal(err)+ }+ blocked = true+ if err := os.WriteFile(avDir, []byte("block new database files"), 0600); err != nil {+ t.Fatal(err)+ }+ }+ _, dom, summary, err := RenderTemplateWithMode(filepath.Join(util.DataDir, "templates", "save-failure.md"),+ fixture.targetID, TemplateRenderModeContent)+ if err == nil || dom != "" || summary != nil {+ t.Errorf("failed database copy returned successful content: err=%v, dom=%q, summary=%+v", err, dom, summary)+ }+ restore()+ if savedID == "" || savedID == first.attrView.ID || savedID == second.attrView.ID {+ t.Fatal("the first independent copy was not saved before the injected failure")+ }+ if _, err := os.Stat(av.GetAttributeViewDataPath(savedID)); err != nil {+ t.Fatalf("successfully saved copy was removed: %v", err)+ }+ for id, expected := range before {+ data, err := os.ReadFile(av.GetAttributeViewDataPath(id))+ if err != nil || string(data) != expected {+ t.Fatalf("source database %s changed: %v", id, err)+ }+ }+}++func TestSaveTemplateAttributeViewCopiesStopsOnFirstFailure(t *testing.T) {+ fixture := setupFileOperationTest(t)+ addTemplateAttributeViewTestFixture(t, fixture, "20260904000502-avfail3")+ first, second := av.NewAttributeView(ast.NewNodeID()), av.NewAttributeView(ast.NewNodeID())+ markRuntimeEncryptedBox(fixture.box.ID)+ t.Cleanup(func() { forgetRuntimeEncryptedBox(fixture.box.ID) })+ originalAcquire := av.AVLockAcquire+ attempts := 0+ av.AVLockAcquire = func(boxID string) {+ attempts+++ originalAcquire(boxID)+ }+ t.Cleanup(func() { av.AVLockAcquire = originalAcquire })+ err := saveTemplateAttributeViewCopies([]*templateAttributeViewCopy{{target: first}, {target: second}}, fixture.box.ID)+ if err == nil || !strings.Contains(err.Error(), first.ID) || !strings.Contains(err.Error(), "locked") {+ t.Fatalf("save error was not propagated with the failed database ID: %v", err)+ }+ if attempts != 1 {+ t.Fatalf("continued saving after the first copy failed: attempts=%d", attempts)+ }+ if av.GetAVBoxID(first.ID) != "" || av.GetAVBoxID(second.ID) != "" {+ t.Fatal("failed save retained the pending notebook mapping")+ }+}+func TestTemplateDatabaseReferenceValidatesExistenceViewsAndEncryptionBoundary(t *testing.T) {fixture := setupFileOperationTest(t)database := addTemplateAttributeViewTestFixture(t, fixture, "20260904000200-avtmpl3")