lkn
/
denotesrv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support @subdir in /new to specify subdirectory path

This commit is contained in:
Levi Neely 2026-04-08 13:20:59 +02:00
parent 6f8db9e050
commit 29c69397da
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/p9/server/server.go
View File

@ -566,7 +566,7 @@ func (s *server) dispatchWrite(f *fid, tag uint16) *plan9.Fcall {
// Handle writes to /new // Handle writes to /new
if f.path == "/new" { if f.path == "/new" {
// Parse: 'Title' ==signature tag1,tag2,... // Parse: 'Title' ==signature tag1,tag2 @subdir
if !strings.HasPrefix(input, "'") { if !strings.HasPrefix(input, "'") {
return errorFcall(fc, "title must be single-quoted") return errorFcall(fc, "title must be single-quoted")
} }
@ -584,19 +584,27 @@ func (s *server) dispatchWrite(f *fid, tag uint16) *plan9.Fcall {
remainder := strings.TrimSpace(input[closeQuote+2:]) remainder := strings.TrimSpace(input[closeQuote+2:])
var signature string var signature string
var tags []string var tags []string
var subdir string
if remainder != "" { if remainder != "" {
if strings.HasPrefix(remainder, "==") { if strings.HasPrefix(remainder, "==") {
spaceIdx := strings.Index(remainder, " ") spaceIdx := strings.Index(remainder, " ")
if spaceIdx == -1 { if spaceIdx == -1 {
signature = remainder[2:] signature = remainder[2:]
remainder = ""
} else { } else {
signature = remainder[2:spaceIdx] signature = remainder[2:spaceIdx]
remainder = strings.TrimSpace(remainder[spaceIdx+1:]) remainder = strings.TrimSpace(remainder[spaceIdx+1:])
} }
} }
if remainder != "" && !strings.HasPrefix(remainder, "==") { // Extract @subdir if present
if atIdx := strings.LastIndex(remainder, "@"); atIdx != -1 {
subdir = strings.TrimSpace(remainder[atIdx+1:])
remainder = strings.TrimSpace(remainder[:atIdx])
}
if remainder != "" {
tagPattern := regexp.MustCompile(`^([\p{Ll}\p{Nd}]+,)*[\p{Ll}\p{Nd}]+$`) tagPattern := regexp.MustCompile(`^([\p{Ll}\p{Nd}]+,)*[\p{Ll}\p{Nd}]+$`)
if !tagPattern.MatchString(remainder) { if !tagPattern.MatchString(remainder) {
return errorFcall(fc, "tags must be comma-delimited lowercase unicode words (no spaces)") return errorFcall(fc, "tags must be comma-delimited lowercase unicode words (no spaces)")
@ -605,10 +613,10 @@ func (s *server) dispatchWrite(f *fid, tag uint16) *plan9.Fcall {
} }
} }
identifier := time.Now().Format("20060102T150405") identifier := time.Now().Format("20060102T150405")
fm := metadata.NewFrontMatter(title, signature, tags, identifier) fm := metadata.NewFrontMatter(title, signature, tags, identifier)
fileName := metadata.BuildFilename(fm, ".md") fileName := metadata.BuildFilename(fm, ".md")
path := filepath.Join(s.denoteDir, fileName) path := filepath.Join(s.denoteDir, subdir, fileName)
meta := &metadata.Metadata{ meta := &metadata.Metadata{
Identifier: identifier, Identifier: identifier,
Signature: signature, Signature: signature,