kristianjbf/dendrite.daemon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14 from KristianJBorgwarth/ref/clean-up-handler

Browse source 
chore: clean up create note handler
This commit is contained in:
Kristian 2026-04-06 23:11:26 +02:00 • committed by GitHub
commit 586c7dd9c6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 91 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/file_handling/doc.go Normal file
View file

@ -0,0 +1,2 @@
// Package filehandling provides utilities for handling files, including reading, writing, and manipulating file contents.
package filehandling

15
core/frontmatter/parser.go → core/file_handling/frontmatter_parser.go
View file

@ -1,9 +1,8 @@
package frontmatter
package filehandling
import (
"bytes"
"errors"
"log/slog"
"gopkg.in/yaml.v3"
)
@ -16,16 +15,7 @@ type FrontMatter struct {
Author string `yaml:"author"`
}
func ParseTags(file []byte) ([]string, error) {
fm, err := parseFrontMatter(file)
if err != nil {
return nil, err
}
slog.Debug("parsed front matter", "fm", fm)
return fm.Tags, nil
}
func parseFrontMatter(file []byte) (*FrontMatter, error) {
func ParseFrontMatter(file []byte) (*FrontMatter, error) {
content := bytes.TrimSpace(file)
if bytes.HasPrefix(content, []byte("---")) {
content = bytes.TrimSpace(content[3:])
@ -36,7 +26,6 @@ func parseFrontMatter(file []byte) (*FrontMatter, error) {
if idx := bytes.Index(content, []byte("---")); idx != -1 {
content = bytes.TrimSpace(content[:idx])
}
slog.Debug("yaml content to parse", "content", string(content))
var fm FrontMatter
if err := yaml.Unmarshal(content, &fm); err != nil {

2
core/frontmatter/slug.go → core/file_handling/slug.go
View file

@ -1,4 +1,4 @@
package frontmatter
package filehandling
import (
"bytes"

73
core/file_handling/template.go Normal file
View file

@ -0,0 +1,73 @@
package filehandling
import (
"os"
"strings"
"time"
"github.com/KristianJBorgwarth/dendrite.daemon/persistence/store"
)
type Template struct {
Content []byte
Title string
Slug string
FrontMatter *FrontMatter
}
func NewTemplate(templateName string, title string) (*Template, error) {
var templatePath string
if templateName != "" {
templatePath = store.GetVaultStore().GetTemplatePath(templateName)
}
slug := Slugify(title)
content, err := renderTemplate(templatePath, title, slug)
if err != nil {
return nil, err
}
fm, err := ParseFrontMatter(content)
if err != nil {
return nil, err
}
return &Template{
Content: content,
Title: title,
Slug: slug,
FrontMatter: fm,
}, nil
}
func renderTemplate(templatePath string, title string, slug string) ([]byte, error) {
template, err := readTemplate(templatePath, title)
if err != nil {
return nil, err
}
r := strings.NewReplacer(
"{{title}}", title,
"{{date}}", time.Now().Format("2006-01-02"),
"{{slug}}", slug,
"{{file}}", slug+".md",
)
return []byte(r.Replace(string(template))), nil
}
func readTemplate(templatePath string, title string) ([]byte, error) {
if templatePath == "" {
return createDefaultTemplate(title), nil
}
template, err := os.ReadFile(templatePath)
if err != nil {
return nil, err
}
return template, nil
}
func createDefaultTemplate(title string) []byte {
return []byte("---\ntitle: " + title + "\ndate: " + time.Now().Format("2006-01-02") + "\n---\n")
}

2
core/frontmatter/doc.go
View file

@ -1,2 +0,0 @@
// Package frontmatter contains utilities for parsing front matter from documents.
package frontmatter

27
core/handlers/create_note_handler.go
View file

@ -5,9 +5,8 @@ import (
"encoding/json"
"path/filepath"
"github.com/KristianJBorgwarth/dendrite.daemon/core/frontmatter"
filehandling "github.com/KristianJBorgwarth/dendrite.daemon/core/file_handling"
"github.com/KristianJBorgwarth/dendrite.daemon/core/models"
"github.com/KristianJBorgwarth/dendrite.daemon/core/template"
"github.com/KristianJBorgwarth/dendrite.daemon/core/utils"
"github.com/KristianJBorgwarth/dendrite.daemon/persistence/repositories"
"github.com/KristianJBorgwarth/dendrite.daemon/persistence/store"
@ -34,24 +33,12 @@ func (h *CreateNoteHandler) Handle(ctx context.Context, raw json.RawMessage) (an
return nil, err
}
slug := frontmatter.Slugify(cmd.Title)
var templatePath string
if cmd.TemplateName != "" {
templatePath = store.GetVaultStore().GetTemplatePath(cmd.TemplateName)
}
notePath := filepath.Join(store.GetVaultStore().Config.VaultPath(), cmd.Directory, slug+".md")
data, err := template.RenderTemplate(templatePath, cmd.Title, slug)
template, err := filehandling.NewTemplate(cmd.TemplateName, cmd.Title)
if err != nil {
return nil, err
}
tags, err := frontmatter.ParseTags(data)
if err != nil {
return nil, err
}
notePath := filepath.Join(store.GetVaultStore().Config.VaultPath(), cmd.Directory, template.Slug+".md")
tx, err := h.uow.Begin()
if err != nil {
@ -63,12 +50,12 @@ func (h *CreateNoteHandler) Handle(ctx context.Context, raw json.RawMessage) (an
tagRepo := repositories.NewTagRepository(tx)
noteRepo := repositories.NewNoteRepository(tx)
dbTags, err := tagRepo.GetByNames(ctx, tags)
dbTags, err := tagRepo.GetByNames(ctx, template.FrontMatter.Tags)
if err != nil {
return nil, err
}
newTags := utils.Filter(tags, func(name string) bool {
newTags := utils.Filter(template.FrontMatter.Tags, func(name string) bool {
for _, t := range dbTags {
if t.Name() == name {
return false
@ -88,7 +75,7 @@ func (h *CreateNoteHandler) Handle(ctx context.Context, raw json.RawMessage) (an
tagModels = append(tagModels, dbTags...)
note := models.CreateNote(notePath, cmd.Title, slug)
note := models.CreateNote(notePath, cmd.Title, template.Slug)
if err = noteRepo.Upsert(ctx, note); err != nil {
return nil, err
@ -98,7 +85,7 @@ func (h *CreateNoteHandler) Handle(ctx context.Context, raw json.RawMessage) (an
return nil, err
}
h.uow.FileStore.Stage(notePath, data)
h.uow.FileStore.Stage(notePath, template.Content)
if err = h.uow.Commit(); err != nil {
return nil, err

2
core/template/doc.go
View file

@ -1,2 +0,0 @@
// Package template provides implementations for generating notes from templates
package template

40
core/template/templater.go
View file

@ -1,40 +0,0 @@
package template
import (
"os"
"strings"
"time"
)
func RenderTemplate(templatePath string, title string, slug string) ([]byte, error) {
template, err := readTemplate(templatePath, title)
if err != nil {
return nil, err
}
r := strings.NewReplacer(
"{{title}}", title,
"{{date}}", time.Now().Format("2006-01-02"),
"{{slug}}", slug,
"{{file}}", slug+".md",
)
return []byte(r.Replace(string(template))), nil
}
func readTemplate(templatePath string, title string) ([]byte, error) {
if templatePath == "" {
return createDefaultTemplate(title), nil
}
template, err := os.ReadFile(templatePath)
if err != nil {
return nil, err
}
return template, nil
}
func createDefaultTemplate(title string) []byte {
return []byte("---\ntitle: " + title + "\ndate: " + time.Now().Format("2006-01-02") + "\n---\n")
}

11
test/test_unit/frontmatter_test.go
View file

@ -1,9 +1,9 @@
package frontmatter_test
package filehandling
import (
"testing"
"github.com/KristianJBorgwarth/dendrite.daemon/core/frontmatter"
filehandling "github.com/KristianJBorgwarth/dendrite.daemon/core/file_handling"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@ -15,10 +15,11 @@ tags: ["test", "note"]
---
This is the content of the note.`
result, err := frontmatter.ParseTags([]byte(input))
result, err := filehandling.ParseFrontMatter([]byte(input))
require.NoError(t, err)
assert.Equal(t, []string{"test", "note"}, result)
assert.Equal(t, "My Note", result.Title)
assert.Equal(t, []string{"test", "note"}, result.Tags)
}
func TestParseTags_MissingDelimiter_ReturnsError(t *testing.T) {
@ -26,7 +27,7 @@ func TestParseTags_MissingDelimiter_ReturnsError(t *testing.T) {
tags: ["test", "note"]
This is the content of the note.`
_, err := frontmatter.ParseTags([]byte(input))
_, err := filehandling.ParseFrontMatter([]byte(input))
assert.ErrorContains(t, err, "missing front matter delimiter")
}