DELETED .deepsource.toml Index: .deepsource.toml ================================================================== --- .deepsource.toml +++ .deepsource.toml @@ -1,8 +0,0 @@ -version = 1 - -[[analyzers]] -name = "go" -enabled = true - - [analyzers.meta] -import_paths = ["github.com/zettelstore/zettelstore"] Index: LICENSE.txt ================================================================== --- LICENSE.txt +++ LICENSE.txt @@ -1,6 +1,6 @@ -Copyright (c) 2020-2022 Detlef Stern +Copyright (c) 2020-present Detlef Stern Licensed under the EUPL Zettelstore is licensed under the European Union Public License, version 1.2 or later (EUPL v. 1.2). The license is available in the official languages of the Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -1,9 +1,9 @@ -## Copyright (c) 2020-2021 Detlef Stern +## Copyright (c) 2020-present Detlef Stern ## -## This file is part of zettelstore. +## This file is part of Zettelstore. ## ## Zettelstore is licensed under the latest version of the EUPL (European Union ## Public License). Please see file LICENSE.txt for your rights and obligations ## under this license. Index: README.md ================================================================== --- README.md +++ README.md @@ -21,6 +21,6 @@ The software, including the manual, is licensed under the [European Union Public License 1.2 (or later)](https://zettelstore.de/home/file?name=LICENSE.txt&ci=trunk). -[Stay tuned](https://twitter.com/zettelstore) … +[Stay tuned](https://mastodon.social/tags/Zettelstore) … Index: VERSION ================================================================== --- VERSION +++ VERSION @@ -1,1 +1,1 @@ -0.8.0 +0.14.0 Index: ast/ast.go ================================================================== --- ast/ast.go +++ ast/ast.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -12,20 +12,20 @@ package ast import ( "net/url" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // ZettelNode is the root node of the abstract syntax tree. // It is *not* part of the visitor pattern. type ZettelNode struct { Meta *meta.Meta // Original metadata - Content domain.Content // Original content + Content zettel.Content // Original content Zid id.Zid // Zettel identification. InhMeta *meta.Meta // Metadata of the zettel, with inherited values. Ast BlockSlice // Zettel abstract syntax tree is a sequence of block nodes. Syntax string // Syntax / parser that produced the Ast } Index: ast/block.go ================================================================== --- ast/block.go +++ ast/block.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -8,11 +8,11 @@ // under this license. //----------------------------------------------------------------------------- package ast -import "zettelstore.de/c/attrs" +import "zettelstore.de/client.fossil/attrs" // Definition of Block nodes. // BlockSlice is a slice of BlockNodes. type BlockSlice []BlockNode @@ -88,15 +88,10 @@ func (*VerbatimNode) itemNode() { /* Just a marker */ } // WalkChildren does nothing. func (*VerbatimNode) WalkChildren(Visitor) { /* No children*/ } -// Supported syntax values for VerbatimEval. -const ( - VerbatimEvalSyntaxDraw = "draw" -) - //-------------------------------------------------------------------------- // RegionNode encapsulates a region of block nodes. type RegionNode struct { Kind RegionKind @@ -284,14 +279,14 @@ //-------------------------------------------------------------------------- // BLOBNode contains just binary data that must be interpreted according to // a syntax. type BLOBNode struct { - Title string - Syntax string - Blob []byte + Description InlineSlice + Syntax string + Blob []byte } func (*BLOBNode) blockNode() { /* Just a marker */ } // WalkChildren does nothing. func (*BLOBNode) WalkChildren(Visitor) { /* No children*/ } Index: ast/inline.go ================================================================== --- ast/inline.go +++ ast/inline.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,11 +11,11 @@ package ast import ( "unicode/utf8" - "zettelstore.de/c/attrs" + "zettelstore.de/client.fossil/attrs" ) // Definitions of inline nodes. // InlineSlice is a list of BlockNodes. Index: ast/ref.go ================================================================== --- ast/ref.go +++ ast/ref.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -12,19 +12,19 @@ import ( "net/url" "strings" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) // QueryPrefix is the prefix that denotes a query expression. const QueryPrefix = "query:" // ParseReference parses a string and returns a reference. func ParseReference(s string) *Reference { - if s == "" || s == "00000000000000" { + if invalidReference(s) { return &Reference{URL: nil, Value: s, State: RefStateInvalid} } if strings.HasPrefix(s, QueryPrefix) { return &Reference{URL: nil, Value: s[len(QueryPrefix):], State: RefStateQuery} } @@ -39,20 +39,25 @@ } u, err := url.Parse(s) if err != nil { return &Reference{URL: nil, Value: s, State: RefStateInvalid} } - if len(u.Scheme)+len(u.Opaque)+len(u.Host) == 0 && u.User == nil { + if !externalURL(u) { if _, err = id.Parse(u.Path); err == nil { return &Reference{URL: u, Value: s, State: RefStateZettel} } if u.Path == "" && u.Fragment != "" { return &Reference{URL: u, Value: s, State: RefStateSelf} } } return &Reference{URL: u, Value: s, State: RefStateExternal} } + +func invalidReference(s string) bool { return s == "" || s == "00000000000000" } +func externalURL(u *url.URL) bool { + return u.Scheme != "" || u.Opaque != "" || u.Host != "" || u.User != nil +} func localState(path string) (RefState, bool) { if len(path) > 0 && path[0] == '/' { if len(path) > 1 && path[1] == '/' { return RefStateBased, true Index: ast/ref_test.go ================================================================== --- ast/ref_test.go +++ ast/ref_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations Index: ast/walk.go ================================================================== --- ast/walk.go +++ ast/walk.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations Index: ast/walk_test.go ================================================================== --- ast/walk_test.go +++ ast/walk_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,11 +11,11 @@ package ast_test import ( "testing" - "zettelstore.de/c/attrs" + "zettelstore.de/client.fossil/attrs" "zettelstore.de/z/ast" ) func BenchmarkWalk(b *testing.B) { root := ast.BlockSlice{ Index: auth/auth.go ================================================================== --- auth/auth.go +++ auth/auth.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -14,12 +14,12 @@ import ( "time" "zettelstore.de/z/box" "zettelstore.de/z/config" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // BaseManager allows to check some base auth modes. type BaseManager interface { // IsReadonly returns true, if the systems is configured to run in read-only-mode. @@ -40,12 +40,12 @@ type TokenKind int // Allowed values of token kind const ( _ TokenKind = iota - KindJSON - KindHTML + KindAPI + KindwebUI ) // TokenData contains some important elements from a token. type TokenData struct { Token []byte Index: auth/cred/cred.go ================================================================== --- auth/cred/cred.go +++ auth/cred/cred.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -13,11 +13,11 @@ import ( "bytes" "golang.org/x/crypto/bcrypt" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) // HashCredential returns a hashed vesion of the given credential func HashCredential(zid id.Zid, ident, credential string) (string, error) { fullCredential := createFullCredential(zid, ident, credential) @@ -42,12 +42,12 @@ return false, err } func createFullCredential(zid id.Zid, ident, credential string) []byte { var buf bytes.Buffer - buf.WriteString(zid.String()) + buf.Write(zid.Bytes()) buf.WriteByte(' ') buf.WriteString(ident) buf.WriteByte(' ') buf.WriteString(credential) return buf.Bytes() } ADDED auth/impl/digest.go Index: auth/impl/digest.go ================================================================== --- auth/impl/digest.go +++ auth/impl/digest.go @@ -0,0 +1,83 @@ +//----------------------------------------------------------------------------- +// Copyright (c) 2023-present Detlef Stern +// +// This file is part of Zettelstore. +// +// Zettelstore is licensed under the latest version of the EUPL (European Union +// Public License). Please see file LICENSE.txt for your rights and obligations +// under this license. +//----------------------------------------------------------------------------- + +package impl + +import ( + "bytes" + "crypto" + "crypto/hmac" + "encoding/base64" + + "zettelstore.de/sx.fossil" + "zettelstore.de/sx.fossil/sxreader" +) + +var encoding = base64.RawURLEncoding + +const digestAlg = crypto.SHA384 + +func sign(claim sx.Object, secret []byte) ([]byte, error) { + var buf bytes.Buffer + sx.Print(&buf, claim) + token := make([]byte, encoding.EncodedLen(buf.Len())) + encoding.Encode(token, buf.Bytes()) + + digest := hmac.New(digestAlg.New, secret) + _, err := digest.Write(buf.Bytes()) + if err != nil { + return nil, err + } + dig := digest.Sum(nil) + encDig := make([]byte, encoding.EncodedLen(len(dig))) + encoding.Encode(encDig, dig) + + token = append(token, '.') + token = append(token, encDig...) + return token, nil +} + +func check(token []byte, secret []byte) (sx.Object, error) { + i := bytes.IndexByte(token, '.') + if i <= 0 || 1024 < i { + return nil, ErrMalformedToken + } + buf := make([]byte, len(token)) + n, err := encoding.Decode(buf, token[:i]) + if err != nil { + return nil, err + } + rdr := sxreader.MakeReader(bytes.NewReader(buf[:n])) + obj, err := rdr.Read() + if err != nil { + return nil, err + } + + var objBuf bytes.Buffer + _, err = sx.Print(&objBuf, obj) + if err != nil { + return nil, err + } + + digest := hmac.New(digestAlg.New, secret) + _, err = digest.Write(objBuf.Bytes()) + if err != nil { + return nil, err + } + + n, err = encoding.Decode(buf, token[i+1:]) + if err != nil { + return nil, err + } + if !hmac.Equal(buf[:n], digest.Sum(nil)) { + return nil, ErrMalformedToken + } + return obj, nil +} Index: auth/impl/impl.go ================================================================== --- auth/impl/impl.go +++ auth/impl/impl.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -15,20 +15,20 @@ "errors" "hash/fnv" "io" "time" - "github.com/pascaldekloe/jwt" - - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" + "zettelstore.de/client.fossil/sexp" + "zettelstore.de/sx.fossil" "zettelstore.de/z/auth" "zettelstore.de/z/auth/policy" "zettelstore.de/z/box" "zettelstore.de/z/config" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) type myAuth struct { readonly bool owner id.Zid @@ -65,11 +65,12 @@ } // IsReadonly returns true, if the systems is configured to run in read-only-mode. func (a *myAuth) IsReadonly() bool { return a.readonly } -const reqHash = jwt.HS512 +// ErrMalformedToken signals a broken token. +var ErrMalformedToken = errors.New("auth: malformed token") // ErrNoIdent signals that the 'ident' key is missing. var ErrNoIdent = errors.New("auth: missing ident") // ErrOtherKind signals that the token was defined for another token kind. @@ -84,68 +85,66 @@ if !ok || subject == "" { return nil, ErrNoIdent } now := time.Now().Round(time.Second) - claims := jwt.Claims{ - Registered: jwt.Registered{ - Subject: subject, - Expires: jwt.NewNumericTime(now.Add(d)), - Issued: jwt.NewNumericTime(now), - }, - Set: map[string]interface{}{ - "zid": ident.Zid.String(), - "_tk": int(kind), - }, - } - token, err := claims.HMACSign(reqHash, a.secret) - if err != nil { - return nil, err - } - return token, nil + sClaim := sx.MakeList( + sx.Int64(kind), + sx.String(subject), + sx.Int64(now.Unix()), + sx.Int64(now.Add(d).Unix()), + sx.Int64(ident.Zid), + ) + return sign(sClaim, a.secret) } // ErrTokenExpired signals an exired token var ErrTokenExpired = errors.New("auth: token expired") // CheckToken checks the validity of the token and returns relevant data. -func (a *myAuth) CheckToken(token []byte, k auth.TokenKind) (auth.TokenData, error) { - h, err := jwt.NewHMAC(reqHash, a.secret) - if err != nil { - return auth.TokenData{}, err - } - claims, err := h.Check(token) - if err != nil { - return auth.TokenData{}, err - } - now := time.Now().Round(time.Second) - expires := claims.Expires.Time() - if expires.Before(now) { - return auth.TokenData{}, ErrTokenExpired - } - ident := claims.Subject +func (a *myAuth) CheckToken(tok []byte, k auth.TokenKind) (auth.TokenData, error) { + var tokenData auth.TokenData + + obj, err := check(tok, a.secret) + if err != nil { + return tokenData, err + } + + tokenData.Token = tok + err = setupTokenData(obj, k, &tokenData) + return tokenData, err +} + +func setupTokenData(obj sx.Object, k auth.TokenKind, tokenData *auth.TokenData) error { + vals, err := sexp.ParseList(obj, "isiii") + if err != nil { + return ErrMalformedToken + } + if auth.TokenKind(vals[0].(sx.Int64)) != k { + return ErrOtherKind + } + ident := vals[1].(sx.String) if ident == "" { - return auth.TokenData{}, ErrNoIdent - } - if zidS, ok := claims.Set["zid"].(string); ok { - if zid, err2 := id.Parse(zidS); err2 == nil { - if kind, ok2 := claims.Set["_tk"].(float64); ok2 { - if auth.TokenKind(kind) == k { - return auth.TokenData{ - Token: token, - Now: now, - Issued: claims.Issued.Time(), - Expires: expires, - Ident: ident, - Zid: zid, - }, nil - } - } - return auth.TokenData{}, ErrOtherKind - } - } - return auth.TokenData{}, ErrNoZid + return ErrNoIdent + } + issued := time.Unix(int64(vals[2].(sx.Int64)), 0) + expires := time.Unix(int64(vals[3].(sx.Int64)), 0) + now := time.Now().Round(time.Second) + if expires.Before(now) { + return ErrTokenExpired + } + zid := id.Zid(vals[4].(sx.Int64)) + if !zid.IsValid() { + return ErrNoZid + } + + tokenData.Ident = ident.String() + tokenData.Issued = issued + tokenData.Now = now + tokenData.Expires = expires + tokenData.Zid = zid + return nil } func (a *myAuth) Owner() id.Zid { return a.owner } func (a *myAuth) IsOwner(zid id.Zid) bool { Index: auth/policy/anon.go ================================================================== --- auth/policy/anon.go +++ auth/policy/anon.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -11,11 +11,11 @@ package policy import ( "zettelstore.de/z/auth" "zettelstore.de/z/config" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/meta" ) type anonPolicy struct { authConfig config.AuthConfig pre auth.Policy Index: auth/policy/box.go ================================================================== --- auth/policy/box.go +++ auth/policy/box.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -14,23 +14,19 @@ "context" "zettelstore.de/z/auth" "zettelstore.de/z/box" "zettelstore.de/z/config" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/query" "zettelstore.de/z/web/server" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // BoxWithPolicy wraps the given box inside a policy box. -func BoxWithPolicy( - manager auth.AuthzManager, - box box.Box, - authConfig config.AuthConfig, -) (box.Box, auth.Policy) { +func BoxWithPolicy(manager auth.AuthzManager, box box.Box, authConfig config.AuthConfig) (box.Box, auth.Policy) { pol := newPolicy(manager, authConfig) return newBox(box, pol), pol } // polBox implements a policy box. @@ -53,33 +49,37 @@ func (pp *polBox) CanCreateZettel(ctx context.Context) bool { return pp.box.CanCreateZettel(ctx) } -func (pp *polBox) CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) { +func (pp *polBox) CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) { user := server.GetUser(ctx) if pp.policy.CanCreate(user, zettel.Meta) { return pp.box.CreateZettel(ctx, zettel) } return id.Invalid, box.NewErrNotAllowed("Create", user, id.Invalid) } -func (pp *polBox) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) { - zettel, err := pp.box.GetZettel(ctx, zid) +func (pp *polBox) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) { + z, err := pp.box.GetZettel(ctx, zid) if err != nil { - return domain.Zettel{}, err + return zettel.Zettel{}, err } user := server.GetUser(ctx) - if pp.policy.CanRead(user, zettel.Meta) { - return zettel, nil + if pp.policy.CanRead(user, z.Meta) { + return z, nil } - return domain.Zettel{}, box.NewErrNotAllowed("GetZettel", user, zid) + return zettel.Zettel{}, box.NewErrNotAllowed("GetZettel", user, zid) } -func (pp *polBox) GetAllZettel(ctx context.Context, zid id.Zid) ([]domain.Zettel, error) { +func (pp *polBox) GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error) { return pp.box.GetAllZettel(ctx, zid) } + +func (pp *polBox) FetchZids(ctx context.Context) (id.Set, error) { + return nil, box.NewErrNotAllowed("fetch-zids", server.GetUser(ctx), id.Invalid) +} func (pp *polBox) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) { m, err := pp.box.GetMeta(ctx, zid) if err != nil { return nil, err @@ -89,41 +89,33 @@ return m, nil } return nil, box.NewErrNotAllowed("GetMeta", user, zid) } -func (pp *polBox) GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error) { - return pp.box.GetAllMeta(ctx, zid) -} - -func (pp *polBox) FetchZids(ctx context.Context) (id.Set, error) { - return nil, box.NewErrNotAllowed("fetch-zids", server.GetUser(ctx), id.Invalid) -} - -func (pp *polBox) SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) { +func (pp *polBox) SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error) { user := server.GetUser(ctx) canRead := pp.policy.CanRead q = q.SetPreMatch(func(m *meta.Meta) bool { return canRead(user, m) }) - return pp.box.SelectMeta(ctx, q) + return pp.box.SelectMeta(ctx, metaSeq, q) } -func (pp *polBox) CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool { +func (pp *polBox) CanUpdateZettel(ctx context.Context, zettel zettel.Zettel) bool { return pp.box.CanUpdateZettel(ctx, zettel) } -func (pp *polBox) UpdateZettel(ctx context.Context, zettel domain.Zettel) error { +func (pp *polBox) UpdateZettel(ctx context.Context, zettel zettel.Zettel) error { zid := zettel.Meta.Zid user := server.GetUser(ctx) if !zid.IsValid() { - return &box.ErrInvalidID{Zid: zid} + return box.ErrInvalidZid{Zid: zid.String()} } // Write existing zettel - oldMeta, err := pp.box.GetMeta(ctx, zid) + oldZettel, err := pp.box.GetZettel(ctx, zid) if err != nil { return err } - if pp.policy.CanWrite(user, oldMeta, zettel.Meta) { + if pp.policy.CanWrite(user, oldZettel.Meta, zettel.Meta) { return pp.box.UpdateZettel(ctx, zettel) } return box.NewErrNotAllowed("Write", user, zid) } @@ -130,16 +122,16 @@ func (pp *polBox) AllowRenameZettel(ctx context.Context, zid id.Zid) bool { return pp.box.AllowRenameZettel(ctx, zid) } func (pp *polBox) RenameZettel(ctx context.Context, curZid, newZid id.Zid) error { - meta, err := pp.box.GetMeta(ctx, curZid) + z, err := pp.box.GetZettel(ctx, curZid) if err != nil { return err } user := server.GetUser(ctx) - if pp.policy.CanRename(user, meta) { + if pp.policy.CanRename(user, z.Meta) { return pp.box.RenameZettel(ctx, curZid, newZid) } return box.NewErrNotAllowed("Rename", user, curZid) } @@ -146,16 +138,16 @@ func (pp *polBox) CanDeleteZettel(ctx context.Context, zid id.Zid) bool { return pp.box.CanDeleteZettel(ctx, zid) } func (pp *polBox) DeleteZettel(ctx context.Context, zid id.Zid) error { - meta, err := pp.box.GetMeta(ctx, zid) + z, err := pp.box.GetZettel(ctx, zid) if err != nil { return err } user := server.GetUser(ctx) - if pp.policy.CanDelete(user, meta) { + if pp.policy.CanDelete(user, z.Meta) { return pp.box.DeleteZettel(ctx, zid) } return box.NewErrNotAllowed("Delete", user, zid) } Index: auth/policy/default.go ================================================================== --- auth/policy/default.go +++ auth/policy/default.go @@ -1,21 +1,21 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- package policy import ( - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/auth" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/meta" ) type defaultPolicy struct { manager auth.AuthzManager } Index: auth/policy/owner.go ================================================================== --- auth/policy/owner.go +++ auth/policy/owner.go @@ -1,22 +1,22 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- package policy import ( - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/auth" "zettelstore.de/z/config" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/meta" ) type ownerPolicy struct { manager auth.AuthzManager authConfig config.AuthConfig Index: auth/policy/policy.go ================================================================== --- auth/policy/policy.go +++ auth/policy/policy.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -12,11 +12,11 @@ package policy import ( "zettelstore.de/z/auth" "zettelstore.de/z/config" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/meta" ) // newPolicy creates a policy based on given constraints. func newPolicy(manager auth.AuthzManager, authConfig config.AuthConfig) auth.Policy { var pol auth.Policy Index: auth/policy/policy_test.go ================================================================== --- auth/policy/policy_test.go +++ auth/policy/policy_test.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -12,14 +12,14 @@ import ( "fmt" "testing" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/auth" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func TestPolicies(t *testing.T) { t.Parallel() testScene := []struct { Index: auth/policy/readonly.go ================================================================== --- auth/policy/readonly.go +++ auth/policy/readonly.go @@ -1,22 +1,22 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- package policy -import "zettelstore.de/z/domain/meta" +import "zettelstore.de/z/zettel/meta" type roPolicy struct{} func (*roPolicy) CanCreate(_, _ *meta.Meta) bool { return false } func (*roPolicy) CanRead(_, _ *meta.Meta) bool { return true } func (*roPolicy) CanWrite(_, _, _ *meta.Meta) bool { return false } func (*roPolicy) CanRename(_, _ *meta.Meta) bool { return false } func (*roPolicy) CanDelete(_, _ *meta.Meta) bool { return false } func (*roPolicy) CanRefresh(user *meta.Meta) bool { return user != nil } Index: box/box.go ================================================================== --- box/box.go +++ box/box.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -14,19 +14,17 @@ import ( "context" "errors" "fmt" "io" - "net/url" - "strconv" "time" - "zettelstore.de/c/api" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // BaseBox is implemented by all Zettel boxes. type BaseBox interface { // Location returns some information where the box is located. @@ -36,23 +34,20 @@ // CanCreateZettel returns true, if box could possibly create a new zettel. CanCreateZettel(ctx context.Context) bool // CreateZettel creates a new zettel. // Returns the new zettel id (and an error indication). - CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) + CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) // GetZettel retrieves a specific zettel. - GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) - - // GetMeta retrieves just the meta data of a specific zettel. - GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) + GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) // CanUpdateZettel returns true, if box could possibly update the given zettel. - CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool + CanUpdateZettel(ctx context.Context, zettel zettel.Zettel) bool // UpdateZettel updates an existing zettel. - UpdateZettel(ctx context.Context, zettel domain.Zettel) error + UpdateZettel(ctx context.Context, zettel zettel.Zettel) error // AllowRenameZettel returns true, if box will not disallow renaming the zettel. AllowRenameZettel(ctx context.Context, zid id.Zid) bool // RenameZettel changes the current Zid to a new Zid. @@ -72,10 +67,13 @@ type MetaFunc func(*meta.Meta) // ManagedBox is the interface of managed boxes. type ManagedBox interface { BaseBox + + // HasZettel returns true, if box conains zettel with given identifier. + HasZettel(context.Context, id.Zid) bool // Apply identifier of every zettel to the given function, if predicate returns true. ApplyZid(context.Context, ZidFunc, query.RetrievePredicate) error // Apply metadata of every zettel to the given function, if predicate returns true. @@ -91,15 +89,33 @@ ReadOnly bool // Zettel is the number of zettel managed by the box. Zettel int } + +// StartState enumerates the possible states of starting and stopping a box. +// +// StartStateStopped -> StartStateStarting -> StartStateStarted -> StateStateStopping -> StartStateStopped. +// +// Other transitions are also possible. +type StartState uint8 + +// Constant values of StartState +const ( + StartStateStopped StartState = iota + StartStateStarting + StartStateStarted + StartStateStopping +) // StartStopper performs simple lifecycle management. type StartStopper interface { + // State the current status of the box. + State() StartState + // Start the box. Now all other functions of the box are allowed. - // Starting an already started box is not allowed. + // Starting a box, which is not in state StartStateStopped is not allowed. Start(ctx context.Context) error // Stop the started box. Now only the Start() function is allowed. Stop(ctx context.Context) } @@ -114,19 +130,20 @@ type Box interface { BaseBox // FetchZids returns the set of all zettel identifer managed by the box. FetchZids(ctx context.Context) (id.Set, error) + + // GetMeta returns the metadata of the zettel with the given identifier. + GetMeta(context.Context, id.Zid) (*meta.Meta, error) // SelectMeta returns a list of metadata that comply to the given selection criteria. - SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) + // If `metaSeq` is `nil`, the box assumes metadata of all available zettel. + SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error) // GetAllZettel retrieves a specific zettel from all managed boxes. - GetAllZettel(ctx context.Context, zid id.Zid) ([]domain.Zettel, error) - - // GetAllMeta retrieves the meta data of a specific zettel from all managed boxes. - GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error) + GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error) // Refresh the data from the box and from its managed sub-boxes. Refresh(context.Context) error } @@ -181,17 +198,18 @@ type UpdateReason uint8 // Values for Reason const ( _ UpdateReason = iota + OnReady // Box is started and fully operational OnReload // Box was reloaded OnZettel // Something with a zettel happened ) // UpdateInfo contains all the data about a changed zettel. type UpdateInfo struct { - Box Box + Box BaseBox Reason UpdateReason Zid id.Zid } // UpdateFunc is a function to be called when a change is detected. @@ -225,10 +243,18 @@ // DoNotEnrich determines if the context is marked to not enrich metadata. func DoNotEnrich(ctx context.Context) bool { _, ok := ctx.Value(ctxNoEnrichKey).(*ctxNoEnrichType) return ok } + +// NoEnrichQuery provides a context that signals not to enrich, if the query does not need this. +func NoEnrichQuery(ctx context.Context, q *query.Query) context.Context { + if q.EnrichNeeded() { + return ctx + } + return NoEnrichContext(ctx) +} // ErrNotAllowed is returned if the caller is not allowed to perform the operation. type ErrNotAllowed struct { Op string User *meta.Meta @@ -273,44 +299,23 @@ var ErrStopped = errors.New("box is stopped") // ErrReadOnly is returned if there is an attepmt to write to a read-only box. var ErrReadOnly = errors.New("read-only box") -// ErrNotFound is returned if a zettel was not found in the box. -var ErrNotFound = errors.New("zettel not found") +// ErrZettelNotFound is returned if a zettel was not found in the box. +type ErrZettelNotFound struct{ Zid id.Zid } + +func (eznf ErrZettelNotFound) Error() string { return "zettel not found: " + eznf.Zid.String() } + +//var ErrZettelNotFound = errors.New("zettel not found") // ErrConflict is returned if a box operation detected a conflict.. // One example: if calculating a new zettel identifier takes too long. var ErrConflict = errors.New("conflict") // ErrCapacity is returned if a box has reached its capacity. var ErrCapacity = errors.New("capacity exceeded") -// ErrInvalidID is returned if the zettel id is not appropriate for the box operation. -type ErrInvalidID struct{ Zid id.Zid } - -func (err *ErrInvalidID) Error() string { return "invalid Zettel id: " + err.Zid.String() } - -// GetQueryBool is a helper function to extract bool values from a box URI. -func GetQueryBool(u *url.URL, key string) bool { - _, ok := u.Query()[key] - return ok -} - -// GetQueryInt is a helper function to extract int values of a specified range from a box URI. -func GetQueryInt(u *url.URL, key string, min, def, max int) int { - sVal := u.Query().Get(key) - if sVal == "" { - return def - } - iVal, err := strconv.Atoi(sVal) - if err != nil { - return def - } - if iVal < min { - return min - } - if iVal > max { - return max - } - return iVal -} +// ErrInvalidZid is returned if the zettel id is not appropriate for the box operation. +type ErrInvalidZid struct{ Zid string } + +func (err ErrInvalidZid) Error() string { return "invalid Zettel id: " + err.Zid } Index: box/compbox/compbox.go ================================================================== --- box/compbox/compbox.go +++ box/compbox/compbox.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -13,19 +13,19 @@ import ( "context" "net/url" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/box" "zettelstore.de/z/box/manager" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func init() { manager.Register( " comp", @@ -70,50 +70,42 @@ func (*compBox) Location() string { return "" } func (*compBox) CanCreateZettel(context.Context) bool { return false } -func (cb *compBox) CreateZettel(context.Context, domain.Zettel) (id.Zid, error) { +func (cb *compBox) CreateZettel(context.Context, zettel.Zettel) (id.Zid, error) { cb.log.Trace().Err(box.ErrReadOnly).Msg("CreateZettel") return id.Invalid, box.ErrReadOnly } -func (cb *compBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) { +func (cb *compBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) { if gen, ok := myZettel[zid]; ok && gen.meta != nil { if m := gen.meta(zid); m != nil { updateMeta(m) if genContent := gen.content; genContent != nil { - cb.log.Trace().Msg("GetMeta/Content") - return domain.Zettel{ - Meta: m, - Content: domain.NewContent(genContent(m)), - }, nil - } - cb.log.Trace().Msg("GetMeta/NoContent") - return domain.Zettel{Meta: m}, nil - } - } - cb.log.Trace().Err(box.ErrNotFound).Msg("GetZettel/Err") - return domain.Zettel{}, box.ErrNotFound -} - -func (cb *compBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) { - if gen, ok := myZettel[zid]; ok { - if genMeta := gen.meta; genMeta != nil { - if m := genMeta(zid); m != nil { - updateMeta(m) - cb.log.Trace().Msg("GetMeta") - return m, nil - } - } - } - cb.log.Trace().Err(box.ErrNotFound).Msg("GetMeta/Err") - return nil, box.ErrNotFound + cb.log.Trace().Msg("GetZettel/Content") + return zettel.Zettel{ + Meta: m, + Content: zettel.NewContent(genContent(m)), + }, nil + } + cb.log.Trace().Msg("GetZettel/NoContent") + return zettel.Zettel{Meta: m}, nil + } + } + err := box.ErrZettelNotFound{Zid: zid} + cb.log.Trace().Err(err).Msg("GetZettel/Err") + return zettel.Zettel{}, err +} + +func (*compBox) HasZettel(_ context.Context, zid id.Zid) bool { + _, found := myZettel[zid] + return found } func (cb *compBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error { - cb.log.Trace().Int("entries", int64(len(myZettel))).Msg("ApplyMeta") + cb.log.Trace().Int("entries", int64(len(myZettel))).Msg("ApplyZid") for zid, gen := range myZettel { if !constraint(zid) { continue } if genMeta := gen.meta; genMeta != nil { @@ -140,37 +132,39 @@ } } return nil } -func (*compBox) CanUpdateZettel(context.Context, domain.Zettel) bool { return false } +func (*compBox) CanUpdateZettel(context.Context, zettel.Zettel) bool { return false } -func (cb *compBox) UpdateZettel(context.Context, domain.Zettel) error { +func (cb *compBox) UpdateZettel(context.Context, zettel.Zettel) error { cb.log.Trace().Err(box.ErrReadOnly).Msg("UpdateZettel") return box.ErrReadOnly } func (*compBox) AllowRenameZettel(_ context.Context, zid id.Zid) bool { _, ok := myZettel[zid] return !ok } -func (cb *compBox) RenameZettel(_ context.Context, curZid, _ id.Zid) error { - err := box.ErrNotFound +func (cb *compBox) RenameZettel(_ context.Context, curZid, _ id.Zid) (err error) { if _, ok := myZettel[curZid]; ok { err = box.ErrReadOnly + } else { + err = box.ErrZettelNotFound{Zid: curZid} } cb.log.Trace().Err(err).Msg("RenameZettel") return err } func (*compBox) CanDeleteZettel(context.Context, id.Zid) bool { return false } -func (cb *compBox) DeleteZettel(_ context.Context, zid id.Zid) error { - err := box.ErrNotFound +func (cb *compBox) DeleteZettel(_ context.Context, zid id.Zid) (err error) { if _, ok := myZettel[zid]; ok { err = box.ErrReadOnly + } else { + err = box.ErrZettelNotFound{Zid: zid} } cb.log.Trace().Err(err).Msg("DeleteZettel") return err } @@ -180,14 +174,14 @@ cb.log.Trace().Int("zettel", int64(st.Zettel)).Msg("ReadStats") } func updateMeta(m *meta.Meta) { if _, ok := m.Get(api.KeySyntax); !ok { - m.Set(api.KeySyntax, api.ValueSyntaxZmk) + m.Set(api.KeySyntax, meta.SyntaxZmk) } m.Set(api.KeyRole, api.ValueRoleConfiguration) m.Set(api.KeyLang, api.ValueLangEN) m.Set(api.KeyReadOnly, api.ValueTrue) if _, ok := m.Get(api.KeyVisibility); !ok { m.Set(api.KeyVisibility, api.ValueVisibilityExpert) } } Index: box/compbox/config.go ================================================================== --- box/compbox/config.go +++ box/compbox/config.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -11,14 +11,14 @@ package compbox import ( "bytes" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func genConfigZettelM(zid id.Zid) *meta.Meta { if myConfig == nil { return nil Index: box/compbox/keys.go ================================================================== --- box/compbox/keys.go +++ box/compbox/keys.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -12,14 +12,14 @@ import ( "bytes" "fmt" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func genKeysM(zid id.Zid) *meta.Meta { m := meta.New(zid) m.Set(api.KeyTitle, "Zettelstore Supported Metadata Keys") @@ -32,9 +32,9 @@ keys := meta.GetSortedKeyDescriptions() var buf bytes.Buffer buf.WriteString("|=Name<|=Type<|=Computed?:|=Property?:\n") for _, kd := range keys { fmt.Fprintf(&buf, - "|%v|%v|%v|%v\n", kd.Name, kd.Type.Name, kd.IsComputed(), kd.IsProperty()) + "|[[%v|query:%v?]]|%v|%v|%v\n", kd.Name, kd.Name, kd.Type.Name, kd.IsComputed(), kd.IsProperty()) } return buf.Bytes() } Index: box/compbox/log.go ================================================================== --- box/compbox/log.go +++ box/compbox/log.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,20 +11,20 @@ package compbox import ( "bytes" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func genLogM(zid id.Zid) *meta.Meta { m := meta.New(zid) m.Set(api.KeyTitle, "Zettelstore Log") - m.Set(api.KeySyntax, api.ValueSyntaxText) + m.Set(api.KeySyntax, meta.SyntaxText) m.Set(api.KeyCreated, kernel.Main.GetConfig(kernel.CoreService, kernel.CoreStarted).(string)) m.Set(api.KeyModified, kernel.Main.GetLastLogTime().Local().Format(id.ZidLayout)) return m } Index: box/compbox/manager.go ================================================================== --- box/compbox/manager.go +++ box/compbox/manager.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -12,14 +12,14 @@ import ( "bytes" "fmt" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func genManagerM(zid id.Zid) *meta.Meta { m := meta.New(zid) m.Set(api.KeyTitle, "Zettelstore Box Manager") Index: box/compbox/parser.go ================================================================== --- box/compbox/parser.go +++ box/compbox/parser.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -14,15 +14,15 @@ "bytes" "fmt" "sort" "strings" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/kernel" "zettelstore.de/z/parser" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func genParserM(zid id.Zid) *meta.Meta { m := meta.New(zid) m.Set(api.KeyTitle, "Zettelstore Supported Parser") @@ -31,11 +31,11 @@ return m } func genParserC(*meta.Meta) []byte { var buf bytes.Buffer - buf.WriteString("|=Syntax<|=Alt. Value(s):|=Text Parser?:|=Image Format?:\n") + buf.WriteString("|=Syntax<|=Alt. Value(s):|=Text Parser?:|=Text Format?:|=Image Format?:\n") syntaxes := parser.GetSyntaxes() sort.Strings(syntaxes) for _, syntax := range syntaxes { info := parser.Get(syntax) if info.Name != syntax { @@ -42,10 +42,10 @@ continue } altNames := info.AltNames sort.Strings(altNames) fmt.Fprintf( - &buf, "|%v|%v|%v|%v\n", - syntax, strings.Join(altNames, ", "), info.IsTextParser, info.IsImageFormat) + &buf, "|%v|%v|%v|%v|%v\n", + syntax, strings.Join(altNames, ", "), info.IsASTParser, info.IsTextFormat, info.IsImageFormat) } return buf.Bytes() } Index: box/compbox/version.go ================================================================== --- box/compbox/version.go +++ box/compbox/version.go @@ -1,22 +1,22 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- package compbox import ( - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func getVersionMeta(zid id.Zid, title string) *meta.Meta { m := meta.New(zid) m.Set(api.KeyTitle, title) Index: box/constbox/base.css ================================================================== --- box/constbox/base.css +++ box/constbox/base.css @@ -81,10 +81,11 @@ h3 { font-size:1.15rem; margin:.75rem 0 } h4 { font-size:1.05rem; margin:.8rem 0; font-weight: bold } h5 { font-size:1.05rem; margin:.8rem 0 } h6 { font-size:1.05rem; margin:.8rem 0; font-weight: lighter } p { margin: .5rem 0 0 0 } + p.zs-tag-zettel { margin-top: .5rem; margin-left: 0.5rem } li,figure,figcaption,dl { margin: 0 } dt { margin: .5rem 0 0 0 } dt+dd { margin-top: 0 } dd { margin: .5rem 0 0 2rem } dd > p:first-child { margin: 0 0 0 0 } @@ -136,12 +137,17 @@ border-bottom:1px solid #ccc; width:100%; } input.zs-primary { float:right } input.zs-secondary { float:left } + input.zs-upload { + padding-left: 1em; + padding-right: 1em; + } a:not([class]) { text-decoration-skip-ink: auto } a.broken { text-decoration: line-through } + a.external::after { content: "➚"; display: inline-block } img { max-width: 100% } img.right { float: right } ol.zs-endnotes { padding-top: .5rem; border-top: 1px solid; DELETED box/constbox/base.mustache Index: box/constbox/base.mustache ================================================================== --- box/constbox/base.mustache +++ box/constbox/base.mustache @@ -1,66 +0,0 @@ - - - - - - - -{{{MetaHeader}}} - - -{{#CSSRoleURL}}{{/CSSRoleURL}} -{{Title}} - - - -
-{{{Content}}} -
-{{#FooterHTML}}{{/FooterHTML}} -{{#DebugMode}}
WARNING: Debug mode is enabled. DO NOT USE IN PRODUCTION!
{{/DebugMode}} - - ADDED box/constbox/base.sxn Index: box/constbox/base.sxn ================================================================== --- box/constbox/base.sxn +++ box/constbox/base.sxn @@ -0,0 +1,48 @@ +`(@@@@ +(html ,@(if lang `((@ (lang ,lang)))) +(head + (meta (@ (charset "utf-8"))) + (meta (@ (name "viewport") (content "width=device-width, initial-scale=1.0"))) + (meta (@ (name "generator") (content "Zettelstore"))) + (meta (@ (name "format-detection") (content "telephone=no"))) + ,@META-HEADER + (link (@ (rel "stylesheet") (href ,css-base-url))) + (link (@ (rel "stylesheet") (href ,css-user-url))) + ,@(ROLE-DEFAULT-meta (current-environment)) + (title ,title)) +(body + (nav (@ (class "zs-menu")) + (a (@ (href ,home-url)) "Home") + ,@(if with-auth + `((div (@ (class "zs-dropdown")) + (button "User") + (nav (@ (class "zs-dropdown-content")) + ,@(if user-is-valid + `((a (@ (href ,user-zettel-url)) ,user-ident) + (a (@ (href ,logout-url)) "Logout")) + `((a (@ (href ,login-url)) "Login")) + ) + ))) + ) + (div (@ (class "zs-dropdown")) + (button "Lists") + (nav (@ (class "zs-dropdown-content")) + (a (@ (href ,list-zettel-url)) "List Zettel") + (a (@ (href ,list-roles-url)) "List Roles") + (a (@ (href ,list-tags-url)) "List Tags") + ,@(if (bound? 'refresh-url) `((a (@ (href ,refresh-url)) "Refresh"))) + )) + ,@(if new-zettel-links + `((div (@ (class "zs-dropdown")) + (button "New") + (nav (@ (class "zs-dropdown-content")) + ,@(map wui-link new-zettel-links) + ))) + ) + (form (@ (action ,search-url)) + (input (@ (type "text") (placeholder "Search..") (name ,query-key-query) (dir "auto")))) + ) + (main (@ (class "content")) ,DETAIL) + ,@(if FOOTER `((footer (hr) ,@FOOTER))) + ,@(if debug-mode '((div (b "WARNING: Debug mode is enabled. DO NOT USE IN PRODUCTION!")))) +))) Index: box/constbox/constbox.go ================================================================== --- box/constbox/constbox.go +++ box/constbox/constbox.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -14,19 +14,19 @@ import ( "context" _ "embed" // Allow to embed file content "net/url" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/box" "zettelstore.de/z/box/manager" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func init() { manager.Register( " const", @@ -43,11 +43,11 @@ type constHeader map[string]string type constZettel struct { header constHeader - content domain.Content + content zettel.Content } type constBox struct { log *logger.Logger number int @@ -57,31 +57,28 @@ func (*constBox) Location() string { return "const:" } func (*constBox) CanCreateZettel(context.Context) bool { return false } -func (cb *constBox) CreateZettel(context.Context, domain.Zettel) (id.Zid, error) { +func (cb *constBox) CreateZettel(context.Context, zettel.Zettel) (id.Zid, error) { cb.log.Trace().Err(box.ErrReadOnly).Msg("CreateZettel") return id.Invalid, box.ErrReadOnly } -func (cb *constBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) { +func (cb *constBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) { if z, ok := cb.zettel[zid]; ok { cb.log.Trace().Msg("GetZettel") - return domain.Zettel{Meta: meta.NewWithData(zid, z.header), Content: z.content}, nil - } - cb.log.Trace().Err(box.ErrNotFound).Msg("GetZettel") - return domain.Zettel{}, box.ErrNotFound -} - -func (cb *constBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) { - if z, ok := cb.zettel[zid]; ok { - cb.log.Trace().Msg("GetMeta") - return meta.NewWithData(zid, z.header), nil - } - cb.log.Trace().Err(box.ErrNotFound).Msg("GetMeta") - return nil, box.ErrNotFound + return zettel.Zettel{Meta: meta.NewWithData(zid, z.header), Content: z.content}, nil + } + err := box.ErrZettelNotFound{Zid: zid} + cb.log.Trace().Err(err).Msg("GetZettel/Err") + return zettel.Zettel{}, err +} + +func (cb *constBox) HasZettel(_ context.Context, zid id.Zid) bool { + _, found := cb.zettel[zid] + return found } func (cb *constBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error { cb.log.Trace().Int("entries", int64(len(cb.zettel))).Msg("ApplyZid") for zid := range cb.zettel { @@ -102,37 +99,39 @@ } } return nil } -func (*constBox) CanUpdateZettel(context.Context, domain.Zettel) bool { return false } +func (*constBox) CanUpdateZettel(context.Context, zettel.Zettel) bool { return false } -func (cb *constBox) UpdateZettel(context.Context, domain.Zettel) error { +func (cb *constBox) UpdateZettel(context.Context, zettel.Zettel) error { cb.log.Trace().Err(box.ErrReadOnly).Msg("UpdateZettel") return box.ErrReadOnly } func (cb *constBox) AllowRenameZettel(_ context.Context, zid id.Zid) bool { _, ok := cb.zettel[zid] return !ok } -func (cb *constBox) RenameZettel(_ context.Context, curZid, _ id.Zid) error { - err := box.ErrNotFound +func (cb *constBox) RenameZettel(_ context.Context, curZid, _ id.Zid) (err error) { if _, ok := cb.zettel[curZid]; ok { err = box.ErrReadOnly + } else { + err = box.ErrZettelNotFound{Zid: curZid} } cb.log.Trace().Err(err).Msg("RenameZettel") return err } func (*constBox) CanDeleteZettel(context.Context, id.Zid) bool { return false } -func (cb *constBox) DeleteZettel(_ context.Context, zid id.Zid) error { - err := box.ErrNotFound +func (cb *constBox) DeleteZettel(_ context.Context, zid id.Zid) (err error) { if _, ok := cb.zettel[zid]; ok { err = box.ErrReadOnly + } else { + err = box.ErrZettelNotFound{Zid: zid} } cb.log.Trace().Err(err).Msg("DeleteZettel") return err } @@ -140,224 +139,234 @@ st.ReadOnly = true st.Zettel = len(cb.zettel) cb.log.Trace().Int("zettel", int64(st.Zettel)).Msg("ReadStats") } -const syntaxTemplate = "mustache" - var constZettelMap = map[id.Zid]constZettel{ id.ConfigurationZid: { constHeader{ api.KeyTitle: "Zettelstore Runtime Configuration", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxNone, + api.KeySyntax: meta.SyntaxNone, api.KeyCreated: "20200804111624", api.KeyVisibility: api.ValueVisibilityOwner, }, - domain.NewContent(nil)}, + zettel.NewContent(nil)}, id.MustParse(api.ZidLicense): { constHeader{ api.KeyTitle: "Zettelstore License", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxText, + api.KeySyntax: meta.SyntaxText, api.KeyCreated: "20210504135842", api.KeyLang: api.ValueLangEN, api.KeyModified: "20220131153422", api.KeyReadOnly: api.ValueTrue, api.KeyVisibility: api.ValueVisibilityPublic, }, - domain.NewContent(contentLicense)}, - id.MustParse(api.ZidAuthors): { - constHeader{ - api.KeyTitle: "Zettelstore Contributors", - api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxZmk, - api.KeyCreated: "20210504135842", - api.KeyLang: api.ValueLangEN, - api.KeyReadOnly: api.ValueTrue, - api.KeyVisibility: api.ValueVisibilityLogin, - }, - domain.NewContent(contentContributors)}, - id.MustParse(api.ZidDependencies): { - constHeader{ - api.KeyTitle: "Zettelstore Dependencies", - api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxZmk, - api.KeyLang: api.ValueLangEN, - api.KeyReadOnly: api.ValueTrue, - api.KeyVisibility: api.ValueVisibilityLogin, - api.KeyCreated: "20210504135842", - api.KeyModified: "20221013105100", - }, - domain.NewContent(contentDependencies)}, - id.BaseTemplateZid: { - constHeader{ - api.KeyTitle: "Zettelstore Base HTML Template", - api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, - api.KeyCreated: "20210504135842", - api.KeyVisibility: api.ValueVisibilityExpert, - }, - domain.NewContent(contentBaseMustache)}, - id.LoginTemplateZid: { - constHeader{ - api.KeyTitle: "Zettelstore Login Form HTML Template", - api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, - api.KeyCreated: "20200804111624", - api.KeyVisibility: api.ValueVisibilityExpert, - }, - domain.NewContent(contentLoginMustache)}, + zettel.NewContent(contentLicense)}, + id.MustParse(api.ZidAuthors): { + constHeader{ + api.KeyTitle: "Zettelstore Contributors", + api.KeyRole: api.ValueRoleConfiguration, + api.KeySyntax: meta.SyntaxZmk, + api.KeyCreated: "20210504135842", + api.KeyLang: api.ValueLangEN, + api.KeyReadOnly: api.ValueTrue, + api.KeyVisibility: api.ValueVisibilityLogin, + }, + zettel.NewContent(contentContributors)}, + id.MustParse(api.ZidDependencies): { + constHeader{ + api.KeyTitle: "Zettelstore Dependencies", + api.KeyRole: api.ValueRoleConfiguration, + api.KeySyntax: meta.SyntaxZmk, + api.KeyLang: api.ValueLangEN, + api.KeyReadOnly: api.ValueTrue, + api.KeyVisibility: api.ValueVisibilityLogin, + api.KeyCreated: "20210504135842", + api.KeyModified: "20230601163100", + }, + zettel.NewContent(contentDependencies)}, + id.BaseTemplateZid: { + constHeader{ + api.KeyTitle: "Zettelstore Base HTML Template", + api.KeyRole: api.ValueRoleConfiguration, + api.KeySyntax: meta.SyntaxSxn, + api.KeyCreated: "20230510155100", + api.KeyModified: "20230827212200", + api.KeyVisibility: api.ValueVisibilityExpert, + }, + zettel.NewContent(contentBaseSxn)}, + id.LoginTemplateZid: { + constHeader{ + api.KeyTitle: "Zettelstore Login Form HTML Template", + api.KeyRole: api.ValueRoleConfiguration, + api.KeySyntax: meta.SyntaxSxn, + api.KeyCreated: "20200804111624", + api.KeyModified: "20230527144100", + api.KeyVisibility: api.ValueVisibilityExpert, + }, + zettel.NewContent(contentLoginSxn)}, id.ZettelTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore Zettel HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, - api.KeyCreated: "20200804111624", + api.KeySyntax: meta.SyntaxSxn, + api.KeyCreated: "20230510155300", + api.KeyModified: "20230907203300", api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentZettelMustache)}, + zettel.NewContent(contentZettelSxn)}, id.InfoTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore Info HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, + api.KeySyntax: meta.SyntaxSxn, api.KeyCreated: "20200804111624", + api.KeyModified: "20230907203300", api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentInfoMustache)}, - id.ContextTemplateZid: { - constHeader{ - api.KeyTitle: "Zettelstore Context HTML Template", - api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, - api.KeyCreated: "20210218181140", - api.KeyVisibility: api.ValueVisibilityExpert, - }, - domain.NewContent(contentContextMustache)}, + zettel.NewContent(contentInfoSxn)}, id.FormTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore Form HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, + api.KeySyntax: meta.SyntaxSxn, api.KeyCreated: "20200804111624", + api.KeyModified: "20230621132600", api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentFormMustache)}, + zettel.NewContent(contentFormSxn)}, id.RenameTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore Rename Form HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, + api.KeySyntax: meta.SyntaxSxn, api.KeyCreated: "20200804111624", + api.KeyModified: "20230707190246", api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentRenameMustache)}, + zettel.NewContent(contentRenameSxn)}, id.DeleteTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore Delete HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, + api.KeySyntax: meta.SyntaxSxn, api.KeyCreated: "20200804111624", + api.KeyModified: "20230621133100", api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentDeleteMustache)}, + zettel.NewContent(contentDeleteSxn)}, id.ListTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore List Zettel HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, - api.KeyCreated: "20200804111624", + api.KeySyntax: meta.SyntaxSxn, + api.KeyCreated: "20230704122100", + api.KeyModified: "20230829223600", api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentListZettelMustache)}, + zettel.NewContent(contentListZettelSxn)}, id.ErrorTemplateZid: { constHeader{ api.KeyTitle: "Zettelstore Error HTML Template", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: syntaxTemplate, + api.KeySyntax: meta.SyntaxSxn, api.KeyCreated: "20210305133215", + api.KeyModified: "20230527224800", + api.KeyVisibility: api.ValueVisibilityExpert, + }, + zettel.NewContent(contentErrorSxn)}, + id.StartSxnZid: { + constHeader{ + api.KeyTitle: "Zettelstore Sxn Start Code", + api.KeyRole: api.ValueRoleConfiguration, + api.KeySyntax: meta.SyntaxSxn, + api.KeyCreated: "20230824160700", + api.KeyVisibility: api.ValueVisibilityExpert, + api.KeyPrecursor: id.BaseSxnZid.String(), + }, + zettel.NewContent(contentStartCodeSxn)}, + id.BaseSxnZid: { + constHeader{ + api.KeyTitle: "Zettelstore Sxn Base Code", + api.KeyRole: api.ValueRoleConfiguration, + api.KeySyntax: meta.SyntaxSxn, + api.KeyCreated: "20230619132800", + api.KeyModified: "20230907203100", + api.KeyReadOnly: api.ValueTrue, api.KeyVisibility: api.ValueVisibilityExpert, }, - domain.NewContent(contentErrorMustache)}, + zettel.NewContent(contentBaseCodeSxn)}, id.MustParse(api.ZidBaseCSS): { constHeader{ api.KeyTitle: "Zettelstore Base CSS", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: "css", + api.KeySyntax: meta.SyntaxCSS, api.KeyCreated: "20200804111624", api.KeyVisibility: api.ValueVisibilityPublic, }, - domain.NewContent(contentBaseCSS)}, + zettel.NewContent(contentBaseCSS)}, id.MustParse(api.ZidUserCSS): { constHeader{ api.KeyTitle: "Zettelstore User CSS", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: "css", + api.KeySyntax: meta.SyntaxCSS, api.KeyCreated: "20210622110143", api.KeyVisibility: api.ValueVisibilityPublic, }, - domain.NewContent([]byte("/* User-defined CSS */"))}, - id.RoleCSSMapZid: { - constHeader{ - api.KeyTitle: "Zettelstore Role to CSS Map", - api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxNone, - api.KeyCreated: "20220321183214", - api.KeyVisibility: api.ValueVisibilityExpert, - }, - domain.NewContent(nil)}, + zettel.NewContent([]byte("/* User-defined CSS */"))}, id.EmojiZid: { constHeader{ api.KeyTitle: "Zettelstore Generic Emoji", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxGif, + api.KeySyntax: meta.SyntaxGif, api.KeyReadOnly: api.ValueTrue, api.KeyCreated: "20210504175807", api.KeyVisibility: api.ValueVisibilityPublic, }, - domain.NewContent(contentEmoji)}, + zettel.NewContent(contentEmoji)}, id.TOCNewTemplateZid: { constHeader{ api.KeyTitle: "New Menu", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxZmk, + api.KeySyntax: meta.SyntaxZmk, api.KeyLang: api.ValueLangEN, api.KeyCreated: "20210217161829", api.KeyVisibility: api.ValueVisibilityCreator, }, - domain.NewContent(contentNewTOCZettel)}, + zettel.NewContent(contentNewTOCZettel)}, id.MustParse(api.ZidTemplateNewZettel): { constHeader{ api.KeyTitle: "New Zettel", api.KeyRole: api.ValueRoleZettel, - api.KeySyntax: api.ValueSyntaxZmk, + api.KeySyntax: meta.SyntaxZmk, api.KeyCreated: "20201028185209", api.KeyVisibility: api.ValueVisibilityCreator, }, - domain.NewContent(nil)}, + zettel.NewContent(nil)}, id.MustParse(api.ZidTemplateNewUser): { constHeader{ api.KeyTitle: "New User", api.KeyRole: api.ValueRoleConfiguration, - api.KeySyntax: api.ValueSyntaxNone, + api.KeySyntax: meta.SyntaxNone, api.KeyCreated: "20201028185209", meta.NewPrefix + api.KeyCredential: "", meta.NewPrefix + api.KeyUserID: "", meta.NewPrefix + api.KeyUserRole: api.ValueUserRoleReader, api.KeyVisibility: api.ValueVisibilityOwner, }, - domain.NewContent(nil)}, + zettel.NewContent(nil)}, id.DefaultHomeZid: { constHeader{ api.KeyTitle: "Home", api.KeyRole: api.ValueRoleZettel, - api.KeySyntax: api.ValueSyntaxZmk, + api.KeySyntax: meta.SyntaxZmk, api.KeyLang: api.ValueLangEN, api.KeyCreated: "20210210190757", }, - domain.NewContent(contentHomeZettel)}, + zettel.NewContent(contentHomeZettel)}, } //go:embed license.txt var contentLicense []byte @@ -365,39 +374,42 @@ var contentContributors []byte //go:embed dependencies.zettel var contentDependencies []byte -//go:embed base.mustache -var contentBaseMustache []byte - -//go:embed login.mustache -var contentLoginMustache []byte - -//go:embed zettel.mustache -var contentZettelMustache []byte - -//go:embed info.mustache -var contentInfoMustache []byte - -//go:embed context.mustache -var contentContextMustache []byte - -//go:embed form.mustache -var contentFormMustache []byte - -//go:embed rename.mustache -var contentRenameMustache []byte - -//go:embed delete.mustache -var contentDeleteMustache []byte - -//go:embed listzettel.mustache -var contentListZettelMustache []byte - -//go:embed error.mustache -var contentErrorMustache []byte +//go:embed base.sxn +var contentBaseSxn []byte + +//go:embed login.sxn +var contentLoginSxn []byte + +//go:embed zettel.sxn +var contentZettelSxn []byte + +//go:embed info.sxn +var contentInfoSxn []byte + +//go:embed form.sxn +var contentFormSxn []byte + +//go:embed rename.sxn +var contentRenameSxn []byte + +//go:embed delete.sxn +var contentDeleteSxn []byte + +//go:embed listzettel.sxn +var contentListZettelSxn []byte + +//go:embed error.sxn +var contentErrorSxn []byte + +//go:embed start.sxn +var contentStartCodeSxn []byte + +//go:embed wuicode.sxn +var contentBaseCodeSxn []byte //go:embed base.css var contentBaseCSS []byte //go:embed emoji_spin.gif DELETED box/constbox/context.mustache Index: box/constbox/context.mustache ================================================================== --- box/constbox/context.mustache +++ box/constbox/context.mustache @@ -1,11 +0,0 @@ -
-

{{Title}}

-
-Info -· Backward -· Both -· Forward -· Depth:{{#Depths}} {{{Text}}}{{/Depths}} -
-
-{{{Content}}} DELETED box/constbox/delete.mustache Index: box/constbox/delete.mustache ================================================================== --- box/constbox/delete.mustache +++ box/constbox/delete.mustache @@ -1,43 +0,0 @@ -
-
-

Delete Zettel {{Zid}}

-
-

Do you really want to delete this zettel?

-{{#HasShadows}} -
-

Infomation

-

If you delete this zettel, the previoulsy shadowed zettel from overlayed box {{ShadowedBox}} becomes available.

-
-{{/HasShadows}} -{{#Incoming.Has}} -
-

Warning!

-

If you delete this zettel, incoming references from the following zettel will become invalid.

-
    -{{#Incoming.Links}} -
  • {{Text}}
    • -{{/Incoming.Links}} -
-
-{{/Incoming.Has}} -{{#HasUselessFiles}} -
-

Warning!

-

Deleting this zettel will also delete the following files, so that they will not be interpreted as content for this zettel.

-
    -{{#UselessFiles}} -
  • {{{.}}}
    • -{{/UselessFiles}} -
-
-{{/HasUselessFiles}} -
-{{#MetaPairs}} -
{{Key}}:
{{Value}}
-{{/MetaPairs}} -
-
- -
-
-{{end}} ADDED box/constbox/delete.sxn Index: box/constbox/delete.sxn ================================================================== --- box/constbox/delete.sxn +++ box/constbox/delete.sxn @@ -0,0 +1,26 @@ +`(article + (header (h1 "Delete Zettel " ,zid)) + (p "Do you really want to delete this zettel?") + ,@(if shadowed-box + `((div (@ (class "zs-info")) + (h2 "Information") + (p "If you delete this zettel, the previously shadowed zettel from overlayed box " ,shadowed-box " becomes available.") + )) + ) + ,@(if incoming + `((div (@ (class "zs-warning")) + (h2 "Warning!") + (p "If you delete this zettel, incoming references from the following zettel will become invalid.") + (ul ,@(map wui-item-link incoming)) + )) + ) + ,@(if (and (bound? 'useless) useless) + `((div (@ (class "zs-warning")) + (h2 "Warning!") + (p "Deleting this zettel will also delete the following files, so that they will not be interpreted as content for this zettel.") + (ul ,@(map wui-item useless)) + )) + ) + ,(wui-meta-desc metapairs) + (form (@ (method "POST")) (input (@ (class "zs-primary") (type "submit") (value "Delete")))) +) Index: box/constbox/dependencies.zettel ================================================================== --- box/constbox/dependencies.zettel +++ box/constbox/dependencies.zettel @@ -99,89 +99,10 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` -=== gopikchr -; URL & Source -: [[https://github.com/gopikchr/gopikchr]] -; License -: MIT License -; Remarks -: Author is [[Zellyn Hunter|https://github.com/zellyn]], he wrote a blog post [[gopikchr: a yakshave|https://zellyn.com/2022/01/gopikchr-a-yakshave/]] about his work. -: Gopikchr was incorporated into the source code of Zettelstore, moving it into package ''zettelstore.de/z/parser/pikchr''. - Later, the source code was changed to adapt it to the needs of Zettelstore. - For details, read README.txt in the appropriate source code folder. -``` -MIT License - -Copyright (c) 2022 gopikchr - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. -``` - -=== hoisie/mustache / cbroglie/mustache -; URL & Source -: [[https://github.com/hoisie/mustache]] / [[https://github.com/cbroglie/mustache]] -; License -: MIT License -; Remarks -: cbroglie/mustache is a fork from hoisie/mustache (starting with commit [f9b4cbf]). - cbroglie/mustache does not claim a copyright and includes just the license file from hoisie/mustache. - cbroglie/mustache obviously continues with the original license. - -``` -Copyright (c) 2009 Michael Hoisie - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -``` - -=== pascaldekloe/jwt -; URL & Source -: [[https://github.com/pascaldekloe/jwt]] -; License -: [[CC0 1.0 Universal|https://creativecommons.org/publicdomain/zero/1.0/legalcode]] -``` -To the extent possible under law, Pascal S. de Kloe has waived all -copyright and related or neighboring rights to JWT. This work is -published from The Netherlands. - -https://creativecommons.org/publicdomain/zero/1.0/legalcode -``` - === yuin/goldmark ; URL & Source : [[https://github.com/yuin/goldmark]] ; License : MIT License @@ -206,5 +127,16 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ``` + +=== sx, zettelstore-client +These are companion projects, written by the current main developer of Zettelstore. +They are published under the same license, [[EUPL v1.2, or later|00000000000004]]. + +; URL & Source sx +: [[https://zettelstore.de/sx]] +; URL & Source zettelstore-client +: [[https://zettelstore.de/client/]] +; License: +: European Union Public License, version 1.2 (EUPL v1.2), or later. DELETED box/constbox/error.mustache Index: box/constbox/error.mustache ================================================================== --- box/constbox/error.mustache +++ box/constbox/error.mustache @@ -1,6 +0,0 @@ -
-
-

{{ErrorTitle}}

-
-{{ErrorText}} -
ADDED box/constbox/error.sxn Index: box/constbox/error.sxn ================================================================== --- box/constbox/error.sxn +++ box/constbox/error.sxn @@ -0,0 +1,4 @@ +`(article + (header (h1 ,heading)) + ,message +) DELETED box/constbox/form.mustache Index: box/constbox/form.mustache ================================================================== --- box/constbox/form.mustache +++ box/constbox/form.mustache @@ -1,54 +0,0 @@ -
-
-

{{Heading}}

-
-
-
- - -
-
-
- - -{{#HasRoleData}} - -{{#RoleData}} - -{{/HasRoleData}} -
- - -
-
- - -
-
- - -{{#HasSyntaxData}} - -{{#SyntaxData}} - -{{/HasSyntaxData}}
-
-{{#IsTextContent}} - - -{{/IsTextContent}} -
-
- - -
-
-
ADDED box/constbox/form.sxn Index: box/constbox/form.sxn ================================================================== --- box/constbox/form.sxn +++ box/constbox/form.sxn @@ -0,0 +1,38 @@ +`(article + (header (h1 ,heading)) + (form (@ (action ,form-action-url) (method "POST") (enctype "multipart/form-data")) + (div + (label (@ (for "zs-title")) "Title " (a (@ (title "Main heading of this zettel.")) (@H "ⓘ"))) + (input (@ (class "zs-input") (type "text") (id "zs-title") (name "title") (placeholder "Title..") (value ,meta-title) (dir "auto") (autofocus)))) + (div + (label (@ (for "zs-role")) "Role " (a (@ (title "One word, without spaces, to set the main role of this zettel.")) (@H "ⓘ"))) + (input (@ (class "zs-input") (type "text") (id "zs-role") (name "role") (placeholder "role..") (value ,meta-role) (dir "auto") + ,@(if role-data '((list "zs-role-data"))) + )) + ,@(wui-datalist "zs-role-data" role-data) + ) + (div + (label (@ (for "zs-tags")) "Tags " (a (@ (title "Tags must begin with an '#' sign. They are separated by spaces.")) (@H "ⓘ"))) + (input (@ (class "zs-input") (type "text") (id "zs-tags") (name "tags") (placeholder "#tag") (value ,meta-tags) (dir "auto")))) + (div + (label (@ (for "zs-meta")) "Metadata " (a (@ (title "Other metadata for this zettel. Each line contains a key/value pair, separated by a colon ':'.")) (@H "ⓘ"))) + (textarea (@ (class "zs-input") (id "zs-meta") (name "meta") (rows "4") (placeholder "metakey: metavalue") (dir "auto")) ,meta)) + (div + (label (@ (for "zs-syntax")) "Syntax " (a (@ (title "Syntax of zettel content below, one word. Typically 'zmk' (for zettelmarkup).")) (@H "ⓘ"))) + (input (@ (class "zs-input") (type "text") (id "zs-syntax") (name "syntax") (placeholder "syntax..") (value ,meta-syntax) (dir "auto") + ,@(if syntax-data '((list "zs-syntax-data"))) + )) + ,@(wui-datalist "zs-syntax-data" syntax-data) + ) + ,@(if (bound? 'content) + `((div + (label (@ (for "zs-content")) "Content " (a (@ (title "Content for this zettel, according to above syntax.")) (@H "ⓘ"))) + (textarea (@ (class "zs-input zs-content") (id "zs-content") (name "content") (rows "20") (placeholder "Zettel content..") (dir "auto")) ,content) + )) + ) + (div + (input (@ (class "zs-primary") (type "submit") (value "Submit"))) + (input (@ (class "zs-secondary") (type "submit") (value "Save") (formaction "?save"))) + (input (@ (class "zs-upload") (type "file") (id "zs-file") (name "file"))) + )) +) DELETED box/constbox/info.mustache Index: box/constbox/info.mustache ================================================================== --- box/constbox/info.mustache +++ box/constbox/info.mustache @@ -1,72 +0,0 @@ -
-
-

Information for Zettel {{Zid}}

-Web -· Context -{{#CanWrite}} · Edit{{/CanWrite}} -{{#CanCopy}} · Copy{{/CanCopy}} -{{#CanVersion}} · Version{{/CanVersion}} -{{#CanFolge}} · Folge{{/CanFolge}} -{{#CanRename}}· Rename{{/CanRename}} -{{#CanDelete}}· Delete{{/CanDelete}} -
-

Interpreted Metadata

-{{#MetaData}}{{/MetaData}}
{{Key}}{{{Value}}}
-

References

-{{#HasLocLinks}} -

Local

- -{{/HasLocLinks}} -{{#QueryLinks.Has}} -

Queries

- -{{/QueryLinks.Has}} -{{#HasExtLinks}} -

External

- -{{/HasExtLinks}} -

Unlinked

-{{{UnLinksContent}}} -
- - -
-

Parts and encodings

- -{{#EvalMatrix}} - - -{{#Elements}} -{{/Elements}} - -{{/EvalMatrix}} -
{{Header}}{{Text}}
-

Parsed (not evaluated)

- -{{#ParseMatrix}} - - -{{#Elements}} -{{/Elements}} - -{{/ParseMatrix}} -
{{Header}}{{Text}}
-{{#HasShadowLinks}} -

Shadowed Boxes

- -{{/HasShadowLinks}} -{{#Endnotes}}{{{Endnotes}}}{{/Endnotes}} -
ADDED box/constbox/info.sxn Index: box/constbox/info.sxn ================================================================== --- box/constbox/info.sxn +++ box/constbox/info.sxn @@ -0,0 +1,33 @@ +`(article + (header (h1 "Information for Zettel " ,zid) + (p + (a (@ (href ,web-url)) "Web") + (@H " · ") (a (@ (href ,context-url)) "Context") + ,@(if (bound? 'edit-url) `((@H " · ") (a (@ (href ,edit-url)) "Edit"))) + ,@(ROLE-DEFAULT-actions (current-environment)) + ,@(if (bound? 'rename-url) `((@H " · ") (a (@ (href ,rename-url)) "Rename"))) + ,@(if (bound? 'delete-url) `((@H " · ") (a (@ (href ,delete-url)) "Delete"))) + ) + ) + (h2 "Interpreted Metadata") + (table ,@(map wui-table-row metadata)) + (h2 "References") + ,@(if local-links `((h3 "Local") (ul ,@(map wui-valid-link local-links)))) + ,@(if query-links `((h3 "Queries") (ul ,@(map wui-item-link query-links)))) + ,@(if ext-links `((h3 "External") (ul ,@(map wui-item-popup-link ext-links)))) + (h3 "Unlinked") + ,@unlinked-content + (form + (label (@ (for "phrase")) "Search Phrase") + (input (@ (class "zs-input") (type "text") (id "phrase") (name ,query-key-phrase) (placeholder "Phrase..") (value ,phrase))) + ) + (h2 "Parts and encodings") + ,(wui-enc-matrix enc-eval) + (h3 "Parsed (not evaluated)") + ,(wui-enc-matrix enc-parsed) + ,@(if shadow-links + `((h2 "Shadowed Boxes") + (ul ,@(map wui-item shadow-links)) + ) + ) +) Index: box/constbox/license.txt ================================================================== --- box/constbox/license.txt +++ box/constbox/license.txt @@ -1,6 +1,6 @@ -Copyright (c) 2020-2022 Detlef Stern +Copyright (c) 2020-present Detlef Stern Licensed under the EUPL Zettelstore is licensed under the European Union Public License, version 1.2 or later (EUPL v. 1.2). The license is available in the official languages of the DELETED box/constbox/listzettel.mustache Index: box/constbox/listzettel.mustache ================================================================== --- box/constbox/listzettel.mustache +++ box/constbox/listzettel.mustache @@ -1,7 +0,0 @@ -
-

{{Title}}

-
-
- -
-{{{Content}}} ADDED box/constbox/listzettel.sxn Index: box/constbox/listzettel.sxn ================================================================== --- box/constbox/listzettel.sxn +++ box/constbox/listzettel.sxn @@ -0,0 +1,22 @@ +`(article + (header (h1 ,heading)) + (form (@ (action ,search-url)) + (input (@ (class "zs-input") (type "text") (placeholder "Search..") (name ,query-key-query) (value ,query-value) (dir "auto")))) + ,@(if (bound? 'tag-zettel) + `((p (@ (class "zs-tag-zettel")) "Tag zettel: " ,@tag-zettel)) + ) + ,@content + ,@endnotes + (form (@ (action ,(if (bound? 'create-url) create-url))) + "Other encodings: " + (a (@ (href ,data-url)) "data") + ", " + (a (@ (href ,plain-url)) "plain") + ,@(if (bound? 'create-url) + `((input (@ (type "hidden") (name ,query-key-query) (value ,query-value))) + (input (@ (type "hidden") (name ,query-key-seed) (value ,seed))) + (input (@ (class "zs-primary") (type "submit") (value "Save As Zettel"))) + ) + ) + ) +) DELETED box/constbox/login.mustache Index: box/constbox/login.mustache ================================================================== --- box/constbox/login.mustache +++ box/constbox/login.mustache @@ -1,19 +0,0 @@ -
-
-

{{Title}}

-
-{{#Retry}} -
Wrong user name / password. Try again.
-{{/Retry}} -
-
- - -
-
- - -
-
-
-
ADDED box/constbox/login.sxn Index: box/constbox/login.sxn ================================================================== --- box/constbox/login.sxn +++ box/constbox/login.sxn @@ -0,0 +1,14 @@ +`(article + (header (h1 "Login")) + ,@(if retry '((div (@ (class "zs-indication zs-error")) "Wrong user name / password. Try again."))) + (form (@ (method "POST") (action "")) + (div + (label (@ (for "username")) "User name:") + (input (@ (class "zs-input") (type "text") (id "username") (name "username") (placeholder "Your user name..") (autofocus)))) + (div + (label (@ (for "password")) "Password:") + (input (@ (class "zs-input") (type "password") (id "password") (name "password") (placeholder "Your password..")))) + (div + (input (@ (class "zs-primary") (type "submit") (value "Login")))) + ) +) DELETED box/constbox/rename.mustache Index: box/constbox/rename.mustache ================================================================== --- box/constbox/rename.mustache +++ box/constbox/rename.mustache @@ -1,41 +0,0 @@ -
-
-

Rename Zettel {{Zid}}

-
-

Do you really want to rename this zettel?

-{{#Incoming.Has}} -
-

Warning!

-

If you rename this zettel, incoming references from the following zettel will become invalid.

-
    -{{#Incoming.Links}} -
  • {{Text}}
    • -{{/Incoming.Links}} -
-
-{{/Incoming.Has}} -{{#HasUselessFiles}} -
-

Warning!

-

Renaming this zettel will also delete the following files, so that they will not be interpreted as content for a zettel with identifier {{Zid}}.

-
    -{{#UselessFiles}} -
  • {{{.}}}
    • -{{/UselessFiles}} -
-
-{{/HasUselessFiles}} -
-
- - -
- -
-
-
-{{#MetaPairs}} -
{{Key}}:
{{Value}}
-{{/MetaPairs}} -
-
ADDED box/constbox/rename.sxn Index: box/constbox/rename.sxn ================================================================== --- box/constbox/rename.sxn +++ box/constbox/rename.sxn @@ -0,0 +1,26 @@ +`(article + (header (h1 "Rename Zettel " ,zid)) + (p "Do you really want to rename this zettel?") + ,@(if incoming + `((div (@ (class "zs-warning")) + (h2 "Warning!") + (p "If you rename this zettel, incoming references from the following zettel will become invalid.") + (ul ,@(map wui-item-link incoming)) + )) + ) + ,@(if (and (bound? 'useless) useless) + `((div (@ (class "zs-warning")) + (h2 "Warning!") + (p "Renaming this zettel will also delete the following files, so that they will not be interpreted as content for this zettel.") + (ul ,@(map wui-item useless)) + )) + ) + (form (@ (method "POST")) + (input (@ (type "hidden") (id "curzid") (name "curzid") (value ,zid))) + (div + (label (@ (for "newzid")) "New zettel id") + (input (@ (class "zs-input") (type "text") (id "newzid") (name "newzid") (placeholder "ZID..") (value ,zid) (autofocus)))) + (div (input (@ (class "zs-primary") (type "submit") (value "Rename")))) + ) + ,(wui-meta-desc metapairs) +) ADDED box/constbox/start.sxn Index: box/constbox/start.sxn ================================================================== --- box/constbox/start.sxn +++ box/constbox/start.sxn @@ -0,0 +1,14 @@ +;;;---------------------------------------------------------------------------- +;;; Copyright (c) 2023-present Detlef Stern +;;; +;;; This file is part of Zettelstore. +;;; +;;; Zettelstore is licensed under the latest version of the EUPL (European +;;; Union Public License). Please see file LICENSE.txt for your rights and +;;; obligations under this license. +;;;---------------------------------------------------------------------------- + +;;; This zettel is the start of the loading sequence for Sx code used in the +;;; Zettelstore. Via the precursor metadata, dependend zettel are evaluated +;;; before this zettel. You must always depend, directly or indirectly on the +;;; "Zettelstore Sxn Base Code" zettel. It provides the base definitions. ADDED box/constbox/wuicode.sxn Index: box/constbox/wuicode.sxn ================================================================== --- box/constbox/wuicode.sxn +++ box/constbox/wuicode.sxn @@ -0,0 +1,123 @@ +;;;---------------------------------------------------------------------------- +;;; Copyright (c) 2023-present Detlef Stern +;;; +;;; This file is part of Zettelstore. +;;; +;;; Zettelstore is licensed under the latest version of the EUPL (European +;;; Union Public License). Please see file LICENSE.txt for your rights and +;;; obligations under this license. +;;;---------------------------------------------------------------------------- + +;; wui-list-item returns the argument as a HTML list item. +(define (wui-item s) `(li ,s)) + +;; wui-table-row takes a pair and translates it into a HTML table row with +;; two columns. +(define (wui-table-row p) + `(tr (td ,(car p)) (td ,(cdr p)))) + +;; wui-valid-link translates a local link into a HTML link. A link is a pair +;; (valid . url). If valid is not truish, only the invalid url is returned. +(define (wui-valid-link l) + (if (car l) + `(li (a (@ (href ,(cdr l))) ,(cdr l))) + `(li ,(cdr l)))) + +;; wui-link takes a link (title . url) and returns a HTML reference. +(define (wui-link q) + `(a (@ (href ,(cdr q))) ,(car q))) + +;; wui-item-link taks a pair (text . url) and returns a HTML link inside +;; a list item. +(define (wui-item-link q) `(li ,(wui-link q))) + +;; wui-tdata-link taks a pair (text . url) and returns a HTML link inside +;; a table data item. +(define (wui-tdata-link q) `(td ,(wui-link q))) + +;; wui-item-popup-link is like 'wui-item-link, but the HTML link will open +;; a new tab / window. +(define (wui-item-popup-link e) + `(li (a (@ (href ,e) (target "_blank") (rel "noopener noreferrer")) ,e))) + +;; wui-option-value returns a value for an HTML option element. +(define (wui-option-value v) `(option (@ (value ,v)))) + +;; wui-datalist returns a HTML datalist with the given HTML identifier and a +;; list of values. +(define (wui-datalist id lst) + (if lst + `((datalist (@ (id ,id)) ,@(map wui-option-value lst))))) + +;; wui-pair-desc-item takes a pair '(term . text) and returns a list with +;; a HTML description term and a HTML description data. +(define (wui-pair-desc-item p) `((dt ,(car p)) (dd ,(cdr p)))) + +;; wui-meta-desc returns a HTML description list made from the list of pairs +;; given. +(define (wui-meta-desc l) + `(dl ,@(apply append (map wui-pair-desc-item l)))) + +;; wui-enc-matrix returns the HTML table of all encodings and parts. +(define (wui-enc-matrix matrix) + `(table + ,@(map + (lambda (row) `(tr (th ,(car row)) ,@(map wui-tdata-link (cdr row)))) + matrix))) + +;; CSS-ROLE-map is a mapping (pair list, assoc list) of role names to zettel +;; identifier. It is used in the base template to update the metadata of the +;; HTML page to include some role specific CSS code. +;; Referenced in function "ROLE-DEFAULT-meta". +(define CSS-ROLE-map '()) + +;; ROLE-DEFAULT-meta returns some metadata for the base template. Any role +;; specific code should include the returned list of this function. +(define (ROLE-DEFAULT-meta env) + `(,@(let (meta-role (environment-lookup 'meta-role env)) + (let (entry (assoc CSS-ROLE-map meta-role)) + (if (pair? entry) + `((link (@ (rel "stylesheet") (href ,(zid-content-path (cdr entry)))))) + ) + ) + ) + ) +) + +;;; ACTION-SEPARATOR defines a HTML value that separates actions links. +(define ACTION-SEPARATOR '(@H " · ")) + +;;; ROLE-DEFAULT-actions returns the default text for actions. +(define (ROLE-DEFAULT-actions env) + `(,@(let (copy-url (environment-lookup 'copy-url env)) + (if (defined? copy-url) `((@H " · ") (a (@ (href ,copy-url)) "Copy")))) + ,@(let (version-url (environment-lookup 'version-url env)) + (if (defined? version-url) `((@H " · ") (a (@ (href ,version-url)) "Version")))) + ,@(let (child-url (environment-lookup 'child-url env)) + (if (defined? child-url) `((@H " · ") (a (@ (href ,child-url)) "Child")))) + ,@(let (folge-url (environment-lookup 'folge-url env)) + (if (defined? folge-url) `((@H " · ") (a (@ (href ,folge-url)) "Folge")))) + ) +) + +;;; ROLE-tag-actions returns an additional action "Zettel" for zettel with role "tag". +(define (ROLE-tag-actions env) + `(,@(ROLE-DEFAULT-actions env) + ,@(let (title (environment-lookup 'title env)) + (if (and (defined? title) title) + `(,ACTION-SEPARATOR (a (@ (href ,(query->url (string-append "tags:" title)))) "Zettel")) + ) + ) + ) +) + +;;; ROLE-DEFAULT-heading returns the default text for headings, below the +;;; references of a zettel. In most cases it should be called from an +;;; overwriting function. +(define (ROLE-DEFAULT-heading env) + `(,@(let (meta-url (environment-lookup 'meta-url env)) + (if (defined? meta-url) `((br) "URL: " ,(url-to-html meta-url)))) + ,@(let (meta-author (environment-lookup 'meta-author env)) + (if (and (defined? meta-author) meta-author) `((br) "By " ,meta-author))) + ) +) DELETED box/constbox/zettel.mustache Index: box/constbox/zettel.mustache ================================================================== --- box/constbox/zettel.mustache +++ box/constbox/zettel.mustache @@ -1,52 +0,0 @@ -
-
-

{{{HTMLTitle}}}

-
-{{#CanWrite}}Edit ·{{/CanWrite}} -{{Zid}} · -Info · -({{RoleText}}) -{{#Tags.Has}}· {{#Tags.Links}} {{Text}}{{/Tags.Links}}{{/Tags.Has}} -{{#CanCopy}}· Copy{{/CanCopy}} -{{#CanVersion}}· Version{{/CanVersion}} -{{#CanFolge}}· Folge{{/CanFolge}} -{{#PredecessorRefs}}
Predecessor: {{{PredecessorRefs}}}{{/PredecessorRefs}} -{{#PrecursorRefs}}
Precursor: {{{PrecursorRefs}}}{{/PrecursorRefs}} -{{#HasExtURL}}
URL: {{ExtURL}}{{/HasExtURL}} -{{#Author}}
By {{Author}}{{/Author}} -
-
-{{{Content}}} -
-{{#NeedBottomNav}}{{/NeedBottomNav}} ADDED box/constbox/zettel.sxn Index: box/constbox/zettel.sxn ================================================================== --- box/constbox/zettel.sxn +++ box/constbox/zettel.sxn @@ -0,0 +1,30 @@ +`(article + (header + (h1 ,heading) + (div (@ (class "zs-meta")) + ,@(if (bound? 'edit-url) `((a (@ (href ,edit-url)) "Edit") (@H " · "))) + ,zid (@H " · ") + (a (@ (href ,info-url)) "Info") (@H " · ") + "(" ,@(if (bound? 'role-url) `((a (@ (href ,role-url)) ,meta-role))) + ,@(if (and (bound? 'folge-role-url) (bound? 'meta-folge-role)) + `((@H " → ") (a (@ (href ,folge-role-url)) ,meta-folge-role))) + ")" + ,@(if tag-refs `((@H " · ") ,@tag-refs)) + ,@(ROLE-DEFAULT-actions (current-environment)) + ,@(if predecessor-refs `((br) "Predecessor: " ,predecessor-refs)) + ,@(if precursor-refs `((br) "Precursor: " ,precursor-refs)) + ,@(if superior-refs `((br) "Superior: " ,superior-refs)) + ,@(ROLE-DEFAULT-heading (current-environment)) + ) + ) + ,@content + ,endnotes + ,@(if (or folge-links subordinate-links back-links successor-links) + `((nav + ,@(if folge-links `((details (@ (open)) (summary "Folgezettel") (ul ,@(map wui-item-link folge-links))))) + ,@(if subordinate-links `((details (@ (open)) (summary "Subordinates") (ul ,@(map wui-item-link subordinate-links))))) + ,@(if back-links `((details (@ (open)) (summary "Incoming") (ul ,@(map wui-item-link back-links))))) + ,@(if successor-links `((details (@ (open)) (summary "Successors") (ul ,@(map wui-item-link successor-links))))) + )) + ) +) Index: box/dirbox/dirbox.go ================================================================== --- box/dirbox/dirbox.go +++ box/dirbox/dirbox.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -20,16 +20,16 @@ "sync" "zettelstore.de/z/box" "zettelstore.de/z/box/manager" "zettelstore.de/z/box/notify" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func init() { manager.Register("dir", func(u *url.URL, cdata *manager.ConnectData) (box.ManagedBox, error) { var log *logger.Logger @@ -126,10 +126,28 @@ } func (dp *dirBox) Location() string { return dp.location } + +func (dp *dirBox) State() box.StartState { + if ds := dp.dirSrv; ds != nil { + switch ds.State() { + case notify.DsCreated: + return box.StartStateStopped + case notify.DsStarting: + return box.StartStateStarting + case notify.DsWorking: + return box.StartStateStarted + case notify.DsMissing: + return box.StartStateStarted + case notify.DsStopping: + return box.StartStateStopping + } + } + return box.StartStateStopped +} func (dp *dirBox) Start(context.Context) error { dp.mxCmds.Lock() defer dp.mxCmds.Unlock() dp.fCmds = make([]chan fileCmd, 0, dp.fSrvs) @@ -151,10 +169,11 @@ dp.log.Fatal().Err(err).Msg("Unable to create directory supervisor") dp.stopFileServices() return err } dp.dirSrv = notify.NewDirService( + dp, dp.log.Clone().Str("sub", "dirsrv").Child(), notifier, dp.cdata.Notify, ) dp.dirSrv.Start() @@ -179,14 +198,14 @@ for _, c := range dp.fCmds { close(c) } } -func (dp *dirBox) notifyChanged(reason box.UpdateReason, zid id.Zid) { +func (dp *dirBox) notifyChanged(zid id.Zid) { if chci := dp.cdata.Notify; chci != nil { - dp.log.Trace().Zid(zid).Uint("reason", uint64(reason)).Msg("notifyChanged") - chci <- box.UpdateInfo{Reason: reason, Zid: zid} + dp.log.Trace().Zid(zid).Msg("notifyChanged") + chci <- box.UpdateInfo{Reason: box.OnZettel, Zid: zid} } } func (dp *dirBox) getFileChan(zid id.Zid) chan fileCmd { // Based on https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function @@ -202,11 +221,11 @@ func (dp *dirBox) CanCreateZettel(_ context.Context) bool { return !dp.readonly } -func (dp *dirBox) CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) { +func (dp *dirBox) CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) { if dp.readonly { return id.Invalid, box.ErrReadOnly } newZid, err := dp.dirSrv.SetNewDirEntry() @@ -220,44 +239,31 @@ err = dp.srvSetZettel(ctx, &entry, zettel) if err == nil { err = dp.dirSrv.UpdateDirEntry(&entry) } - dp.notifyChanged(box.OnZettel, meta.Zid) + dp.notifyChanged(meta.Zid) dp.log.Trace().Err(err).Zid(meta.Zid).Msg("CreateZettel") return meta.Zid, err } -func (dp *dirBox) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) { +func (dp *dirBox) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) { entry := dp.dirSrv.GetDirEntry(zid) if !entry.IsValid() { - return domain.Zettel{}, box.ErrNotFound + return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid} } m, c, err := dp.srvGetMetaContent(ctx, entry, zid) if err != nil { - return domain.Zettel{}, err + return zettel.Zettel{}, err } - zettel := domain.Zettel{Meta: m, Content: domain.NewContent(c)} + zettel := zettel.Zettel{Meta: m, Content: zettel.NewContent(c)} dp.log.Trace().Zid(zid).Msg("GetZettel") return zettel, nil } -func (dp *dirBox) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) { - m, err := dp.doGetMeta(ctx, zid) - dp.log.Trace().Zid(zid).Err(err).Msg("GetMeta") - return m, err -} -func (dp *dirBox) doGetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) { - entry := dp.dirSrv.GetDirEntry(zid) - if !entry.IsValid() { - return nil, box.ErrNotFound - } - m, err := dp.srvGetMeta(ctx, entry, zid) - if err != nil { - return nil, err - } - return m, nil +func (dp *dirBox) HasZettel(_ context.Context, zid id.Zid) bool { + return dp.dirSrv.GetDirEntry(zid).IsValid() } func (dp *dirBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error { entries := dp.dirSrv.GetDirEntries(constraint) dp.log.Trace().Int("entries", int64(len(entries))).Msg("ApplyZid") @@ -282,23 +288,23 @@ handle(m) } return nil } -func (dp *dirBox) CanUpdateZettel(context.Context, domain.Zettel) bool { +func (dp *dirBox) CanUpdateZettel(context.Context, zettel.Zettel) bool { return !dp.readonly } -func (dp *dirBox) UpdateZettel(ctx context.Context, zettel domain.Zettel) error { +func (dp *dirBox) UpdateZettel(ctx context.Context, zettel zettel.Zettel) error { if dp.readonly { return box.ErrReadOnly } meta := zettel.Meta zid := meta.Zid if !zid.IsValid() { - return &box.ErrInvalidID{Zid: zid} + return box.ErrInvalidZid{Zid: zid.String()} } entry := dp.dirSrv.GetDirEntry(zid) if !entry.IsValid() { // Existing zettel, but new in this box. entry = ¬ify.DirEntry{Zid: zid} @@ -305,17 +311,17 @@ } dp.updateEntryFromMetaContent(entry, meta, zettel.Content) dp.dirSrv.UpdateDirEntry(entry) err := dp.srvSetZettel(ctx, entry, zettel) if err == nil { - dp.notifyChanged(box.OnZettel, zid) + dp.notifyChanged(zid) } dp.log.Trace().Zid(zid).Err(err).Msg("UpdateZettel") return err } -func (dp *dirBox) updateEntryFromMetaContent(entry *notify.DirEntry, m *meta.Meta, content domain.Content) { +func (dp *dirBox) updateEntryFromMetaContent(entry *notify.DirEntry, m *meta.Meta, content zettel.Content) { entry.SetupFromMetaContent(m, content, dp.cdata.Config.GetZettelFileSyntax) } func (dp *dirBox) AllowRenameZettel(context.Context, id.Zid) bool { return !dp.readonly @@ -325,19 +331,19 @@ if curZid == newZid { return nil } curEntry := dp.dirSrv.GetDirEntry(curZid) if !curEntry.IsValid() { - return box.ErrNotFound + return box.ErrZettelNotFound{Zid: curZid} } if dp.readonly { return box.ErrReadOnly } // Check whether zettel with new ID already exists in this box. - if _, err := dp.doGetMeta(ctx, newZid); err == nil { - return &box.ErrInvalidID{Zid: newZid} + if dp.HasZettel(ctx, newZid) { + return box.ErrInvalidZid{Zid: newZid.String()} } oldMeta, oldContent, err := dp.srvGetMetaContent(ctx, curEntry, curZid) if err != nil { return err @@ -346,20 +352,20 @@ newEntry, err := dp.dirSrv.RenameDirEntry(curEntry, newZid) if err != nil { return err } oldMeta.Zid = newZid - newZettel := domain.Zettel{Meta: oldMeta, Content: domain.NewContent(oldContent)} + newZettel := zettel.Zettel{Meta: oldMeta, Content: zettel.NewContent(oldContent)} if err = dp.srvSetZettel(ctx, &newEntry, newZettel); err != nil { // "Rollback" rename. No error checking... dp.dirSrv.RenameDirEntry(&newEntry, curZid) return err } err = dp.srvDeleteZettel(ctx, curEntry, curZid) if err == nil { - dp.notifyChanged(box.OnZettel, curZid) - dp.notifyChanged(box.OnZettel, newZid) + dp.notifyChanged(curZid) + dp.notifyChanged(newZid) } dp.log.Trace().Zid(curZid).Zid(newZid).Err(err).Msg("RenameZettel") return err } @@ -376,19 +382,19 @@ return box.ErrReadOnly } entry := dp.dirSrv.GetDirEntry(zid) if !entry.IsValid() { - return box.ErrNotFound + return box.ErrZettelNotFound{Zid: zid} } err := dp.dirSrv.DeleteDirEntry(zid) if err != nil { return nil } err = dp.srvDeleteZettel(ctx, entry, zid) if err == nil { - dp.notifyChanged(box.OnZettel, zid) + dp.notifyChanged(zid) } dp.log.Trace().Zid(zid).Err(err).Msg("DeleteZettel") return err } Index: box/dirbox/dirbox_test.go ================================================================== --- box/dirbox/dirbox_test.go +++ box/dirbox/dirbox_test.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- Index: box/dirbox/service.go ================================================================== --- box/dirbox/service.go +++ box/dirbox/service.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -17,23 +17,23 @@ "path/filepath" "time" "zettelstore.de/z/box/filebox" "zettelstore.de/z/box/notify" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/input" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func fileService(i uint32, log *logger.Logger, dirPath string, cmds <-chan fileCmd) { // Something may panic. Ensure a running service. defer func() { - if r := recover(); r != nil { - kernel.Main.LogRecover("FileService", r) + if ri := recover(); ri != nil { + kernel.Main.LogRecover("FileService", ri) go fileService(i, log, dirPath, cmds) } }() log.Trace().Uint("i", uint64(i)).Str("dirpath", dirPath).Msg("File service started") @@ -166,11 +166,11 @@ // COMMAND: srvSetZettel ---------------------------------------- // // Writes a new or exsting zettel. -func (dp *dirBox) srvSetZettel(ctx context.Context, entry *notify.DirEntry, zettel domain.Zettel) error { +func (dp *dirBox) srvSetZettel(ctx context.Context, entry *notify.DirEntry, zettel zettel.Zettel) error { rc := make(chan resSetZettel, 1) dp.getFileChan(zettel.Meta.Zid) <- &fileSetZettel{entry, zettel, rc} ctx, cancel := context.WithTimeout(ctx, serviceTimeout) defer cancel() select { @@ -181,11 +181,11 @@ } } type fileSetZettel struct { entry *notify.DirEntry - zettel domain.Zettel + zettel zettel.Zettel rc chan<- resSetZettel } type resSetZettel = error func (cmd *fileSetZettel) run(log *logger.Logger, dirPath string) { Index: box/filebox/filebox.go ================================================================== --- box/filebox/filebox.go +++ box/filebox/filebox.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -15,16 +15,16 @@ "errors" "net/url" "path/filepath" "strings" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/box" "zettelstore.de/z/box/manager" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func init() { manager.Register("file", func(u *url.URL, cdata *manager.ConnectData) (box.ManagedBox, error) { path := getFilepathFromURL(u) Index: box/filebox/zipbox.go ================================================================== --- box/filebox/zipbox.go +++ box/filebox/zipbox.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -16,16 +16,16 @@ "io" "strings" "zettelstore.de/z/box" "zettelstore.de/z/box/notify" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/input" "zettelstore.de/z/logger" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) type zipBox struct { log *logger.Logger number int @@ -39,22 +39,37 @@ if strings.HasPrefix(zb.name, "/") { return "file://" + zb.name } return "file:" + zb.name } + +func (zb *zipBox) State() box.StartState { + if ds := zb.dirSrv; ds != nil { + switch ds.State() { + case notify.DsCreated: + return box.StartStateStopped + case notify.DsStarting: + return box.StartStateStarting + case notify.DsWorking: + return box.StartStateStarted + case notify.DsMissing: + return box.StartStateStarted + case notify.DsStopping: + return box.StartStateStopping + } + } + return box.StartStateStopped +} func (zb *zipBox) Start(context.Context) error { reader, err := zip.OpenReader(zb.name) if err != nil { return err } reader.Close() - zipNotifier, err := notify.NewSimpleZipNotifier(zb.log, zb.name) - if err != nil { - return err - } - zb.dirSrv = notify.NewDirService(zb.log, zipNotifier, zb.notify) + zipNotifier := notify.NewSimpleZipNotifier(zb.log, zb.name) + zb.dirSrv = notify.NewDirService(zb, zb.log, zipNotifier, zb.notify) zb.dirSrv.Start() return nil } func (zb *zipBox) Refresh(_ context.Context) { @@ -62,28 +77,29 @@ zb.log.Trace().Msg("Refresh") } func (zb *zipBox) Stop(context.Context) { zb.dirSrv.Stop() + zb.dirSrv = nil } func (*zipBox) CanCreateZettel(context.Context) bool { return false } -func (zb *zipBox) CreateZettel(context.Context, domain.Zettel) (id.Zid, error) { +func (zb *zipBox) CreateZettel(context.Context, zettel.Zettel) (id.Zid, error) { err := box.ErrReadOnly zb.log.Trace().Err(err).Msg("CreateZettel") return id.Invalid, err } -func (zb *zipBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) { +func (zb *zipBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) { entry := zb.dirSrv.GetDirEntry(zid) if !entry.IsValid() { - return domain.Zettel{}, box.ErrNotFound + return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid} } reader, err := zip.OpenReader(zb.name) if err != nil { - return domain.Zettel{}, err + return zettel.Zettel{}, err } defer reader.Close() var m *meta.Meta var src []byte @@ -94,11 +110,11 @@ if contentName == "" { zb.log.Panic().Zid(zid).Msg("No meta, no content in zipBox.GetZettel") } src, err = readZipFileContent(reader, entry.ContentName) if err != nil { - return domain.Zettel{}, err + return zettel.Zettel{}, err } if entry.HasMetaInContent() { inp := input.NewInput(src) m = meta.NewFromInput(zid, inp) src = src[inp.Pos:] @@ -106,39 +122,28 @@ m = CalcDefaultMeta(zid, entry.ContentExt) } } else { m, err = readZipMetaFile(reader, zid, metaName) if err != nil { - return domain.Zettel{}, err + return zettel.Zettel{}, err } inMeta = true if contentName != "" { src, err = readZipFileContent(reader, entry.ContentName) if err != nil { - return domain.Zettel{}, err + return zettel.Zettel{}, err } } } CleanupMeta(m, zid, entry.ContentExt, inMeta, entry.UselessFiles) zb.log.Trace().Zid(zid).Msg("GetZettel") - return domain.Zettel{Meta: m, Content: domain.NewContent(src)}, nil -} - -func (zb *zipBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) { - entry := zb.dirSrv.GetDirEntry(zid) - if !entry.IsValid() { - return nil, box.ErrNotFound - } - reader, err := zip.OpenReader(zb.name) - if err != nil { - return nil, err - } - defer reader.Close() - m, err := zb.readZipMeta(reader, zid, entry) - zb.log.Trace().Err(err).Zid(zid).Msg("GetMeta") - return m, err + return zettel.Zettel{Meta: m, Content: zettel.NewContent(src)}, nil +} + +func (zb *zipBox) HasZettel(_ context.Context, zid id.Zid) bool { + return zb.dirSrv.GetDirEntry(zid).IsValid() } func (zb *zipBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error { entries := zb.dirSrv.GetDirEntries(constraint) zb.log.Trace().Int("entries", int64(len(entries))).Msg("ApplyZid") @@ -168,13 +173,13 @@ handle(m) } return nil } -func (*zipBox) CanUpdateZettel(context.Context, domain.Zettel) bool { return false } +func (*zipBox) CanUpdateZettel(context.Context, zettel.Zettel) bool { return false } -func (zb *zipBox) UpdateZettel(context.Context, domain.Zettel) error { +func (zb *zipBox) UpdateZettel(context.Context, zettel.Zettel) error { err := box.ErrReadOnly zb.log.Trace().Err(err).Msg("UpdateZettel") return err } @@ -188,11 +193,11 @@ if curZid == newZid { err = nil } curEntry := zb.dirSrv.GetDirEntry(curZid) if !curEntry.IsValid() { - err = box.ErrNotFound + err = box.ErrZettelNotFound{Zid: curZid} } zb.log.Trace().Err(err).Msg("RenameZettel") return err } @@ -200,11 +205,11 @@ func (zb *zipBox) DeleteZettel(_ context.Context, zid id.Zid) error { err := box.ErrReadOnly entry := zb.dirSrv.GetDirEntry(zid) if !entry.IsValid() { - err = box.ErrNotFound + err = box.ErrZettelNotFound{Zid: zid} } zb.log.Trace().Err(err).Msg("DeleteZettel") return err } Index: box/helper.go ================================================================== --- box/helper.go +++ box/helper.go @@ -1,21 +1,23 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- package box import ( + "net/url" + "strconv" "time" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) // GetNewZid calculates a new and unused zettel identifier, based on the current date and time. func GetNewZid(testZid func(id.Zid) (bool, error)) (id.Zid, error) { withSeconds := false @@ -32,5 +34,30 @@ time.Sleep(100 * time.Millisecond) withSeconds = true } return id.Invalid, ErrConflict } + +// GetQueryBool is a helper function to extract bool values from a box URI. +func GetQueryBool(u *url.URL, key string) bool { + _, ok := u.Query()[key] + return ok +} + +// GetQueryInt is a helper function to extract int values of a specified range from a box URI. +func GetQueryInt(u *url.URL, key string, min, def, max int) int { + sVal := u.Query().Get(key) + if sVal == "" { + return def + } + iVal, err := strconv.Atoi(sVal) + if err != nil { + return def + } + if iVal < min { + return min + } + if iVal > max { + return max + } + return iVal +} Index: box/manager/anteroom.go ================================================================== --- box/manager/anteroom.go +++ box/manager/anteroom.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,11 +11,11 @@ package manager import ( "sync" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) type arAction int const ( @@ -25,84 +25,83 @@ ) type anteroom struct { num uint64 next *anteroom - waiting map[id.Zid]arAction + waiting id.Set curLoad int reload bool } -type anterooms struct { +type anteroomQueue struct { mx sync.Mutex nextNum uint64 first *anteroom last *anteroom maxLoad int } -func newAnterooms(maxLoad int) *anterooms { - return &anterooms{maxLoad: maxLoad} -} +func newAnteroomQueue(maxLoad int) *anteroomQueue { return &anteroomQueue{maxLoad: maxLoad} } -func (ar *anterooms) EnqueueZettel(zid id.Zid) { +func (ar *anteroomQueue) EnqueueZettel(zid id.Zid) { if !zid.IsValid() { return } ar.mx.Lock() defer ar.mx.Unlock() if ar.first == nil { - ar.first = ar.makeAnteroom(zid, arZettel) + ar.first = ar.makeAnteroom(zid) ar.last = ar.first return } for room := ar.first; room != nil; room = room.next { if room.reload { continue // Do not put zettel in reload room } if _, ok := room.waiting[zid]; ok { - // Zettel is already waiting. + // Zettel is already waiting. Nothing to do. return } } if room := ar.last; !room.reload && (ar.maxLoad == 0 || room.curLoad < ar.maxLoad) { - room.waiting[zid] = arZettel + room.waiting.Add(zid) room.curLoad++ return } - room := ar.makeAnteroom(zid, arZettel) + room := ar.makeAnteroom(zid) ar.last.next = room ar.last = room } -func (ar *anterooms) makeAnteroom(zid id.Zid, action arAction) *anteroom { +func (ar *anteroomQueue) makeAnteroom(zid id.Zid) *anteroom { + ar.nextNum++ + if zid == id.Invalid { + return &anteroom{num: ar.nextNum, next: nil, waiting: nil, curLoad: 0, reload: true} + } c := ar.maxLoad if c == 0 { c = 100 } - waiting := make(map[id.Zid]arAction, c) - waiting[zid] = action - ar.nextNum++ + waiting := id.NewSetCap(ar.maxLoad, zid) return &anteroom{num: ar.nextNum, next: nil, waiting: waiting, curLoad: 1, reload: false} } -func (ar *anterooms) Reset() { +func (ar *anteroomQueue) Reset() { ar.mx.Lock() defer ar.mx.Unlock() - ar.first = ar.makeAnteroom(id.Invalid, arReload) + ar.first = ar.makeAnteroom(id.Invalid) ar.last = ar.first } -func (ar *anterooms) Reload(newZids id.Set) uint64 { +func (ar *anteroomQueue) Reload(allZids id.Set) uint64 { ar.mx.Lock() defer ar.mx.Unlock() - newWaiting := createWaitingSet(newZids) ar.deleteReloadedRooms() - if ns := len(newWaiting); ns > 0 { + if ns := len(allZids); ns > 0 { ar.nextNum++ - ar.first = &anteroom{num: ar.nextNum, next: ar.first, waiting: newWaiting, curLoad: ns} + ar.first = &anteroom{num: ar.nextNum, next: ar.first, waiting: allZids, curLoad: ns, reload: true} if ar.first.next == nil { ar.last = ar.first } return ar.nextNum } @@ -110,21 +109,11 @@ ar.first = nil ar.last = nil return 0 } -func createWaitingSet(zids id.Set) map[id.Zid]arAction { - waitingSet := make(map[id.Zid]arAction, len(zids)) - for zid := range zids { - if zid.IsValid() { - waitingSet[zid] = arZettel - } - } - return waitingSet -} - -func (ar *anterooms) deleteReloadedRooms() { +func (ar *anteroomQueue) deleteReloadedRooms() { room := ar.first for room != nil && room.reload { room = room.next } ar.first = room @@ -131,24 +120,34 @@ if room == nil { ar.last = nil } } -func (ar *anterooms) Dequeue() (arAction, id.Zid, uint64) { - ar.mx.Lock() - defer ar.mx.Unlock() - if ar.first == nil { - return arNothing, id.Invalid, 0 - } - for zid, action := range ar.first.waiting { - roomNo := ar.first.num - delete(ar.first.waiting, zid) - if len(ar.first.waiting) == 0 { - ar.first = ar.first.next - if ar.first == nil { - ar.last = nil - } - } - return action, zid, roomNo - } - return arNothing, id.Invalid, 0 +func (ar *anteroomQueue) Dequeue() (arAction, id.Zid, uint64) { + ar.mx.Lock() + defer ar.mx.Unlock() + first := ar.first + if first == nil { + return arNothing, id.Invalid, 0 + } + roomNo := first.num + if first.waiting == nil && first.reload { + ar.removeFirst() + return arReload, id.Invalid, roomNo + } + for zid := range first.waiting { + delete(first.waiting, zid) + if len(first.waiting) == 0 { + ar.removeFirst() + } + return arZettel, zid, roomNo + } + ar.removeFirst() + return arNothing, id.Invalid, 0 +} + +func (ar *anteroomQueue) removeFirst() { + ar.first = ar.first.next + if ar.first == nil { + ar.last = nil + } } Index: box/manager/anteroom_test.go ================================================================== --- box/manager/anteroom_test.go +++ box/manager/anteroom_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,16 +11,16 @@ package manager import ( "testing" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) func TestSimple(t *testing.T) { t.Parallel() - ar := newAnterooms(2) + ar := newAnteroomQueue(2) ar.EnqueueZettel(id.Zid(1)) action, zid, rno := ar.Dequeue() if zid != id.Zid(1) || action != arZettel || rno != 1 { t.Errorf("Expected arZettel/1/1, but got %v/%v/%v", action, zid, rno) } @@ -50,11 +50,11 @@ } } func TestReset(t *testing.T) { t.Parallel() - ar := newAnterooms(1) + ar := newAnteroomQueue(1) ar.EnqueueZettel(id.Zid(1)) ar.Reset() action, zid, _ := ar.Dequeue() if action != arReload || zid != id.Invalid { t.Errorf("Expected reload & invalid Zid, but got %v/%v", action, zid) @@ -83,11 +83,11 @@ action, zid, _ = ar.Dequeue() if action != arNothing || zid != id.Invalid { t.Errorf("Expected nothing & invalid Zid, but got %v/%v", action, zid) } - ar = newAnterooms(1) + ar = newAnteroomQueue(1) ar.Reload(id.NewSet(id.Zid(6))) action, zid, _ = ar.Dequeue() if zid != id.Zid(6) || action != arZettel { t.Errorf("Expected 6/arZettel, but got %v/%v", zid, action) } @@ -94,13 +94,13 @@ action, zid, _ = ar.Dequeue() if action != arNothing || zid != id.Invalid { t.Errorf("Expected nothing & invalid Zid, but got %v/%v", action, zid) } - ar = newAnterooms(1) + ar = newAnteroomQueue(1) ar.EnqueueZettel(id.Zid(8)) ar.Reload(nil) action, zid, _ = ar.Dequeue() if action != arNothing || zid != id.Invalid { t.Errorf("Expected nothing & invalid Zid, but got %v/%v", action, zid) } } Index: box/manager/box.go ================================================================== --- box/manager/box.go +++ box/manager/box.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -9,173 +9,164 @@ //----------------------------------------------------------------------------- package manager import ( - "bytes" "context" "errors" + "strings" "zettelstore.de/z/box" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // Conatains all box.Box related functions // Location returns some information where the box is located. func (mgr *Manager) Location() string { if len(mgr.boxes) <= 2 { return "NONE" } - var buf bytes.Buffer + var sb strings.Builder for i := 0; i < len(mgr.boxes)-2; i++ { if i > 0 { - buf.WriteString(", ") + sb.WriteString(", ") } - buf.WriteString(mgr.boxes[i].Location()) + sb.WriteString(mgr.boxes[i].Location()) } - return buf.String() + return sb.String() } // CanCreateZettel returns true, if box could possibly create a new zettel. func (mgr *Manager) CanCreateZettel(ctx context.Context) bool { mgr.mgrMx.RLock() defer mgr.mgrMx.RUnlock() - return mgr.started && mgr.boxes[0].CanCreateZettel(ctx) + return mgr.State() == box.StartStateStarted && mgr.boxes[0].CanCreateZettel(ctx) } // CreateZettel creates a new zettel. -func (mgr *Manager) CreateZettel(ctx context.Context, zettel domain.Zettel) (id.Zid, error) { +func (mgr *Manager) CreateZettel(ctx context.Context, zettel zettel.Zettel) (id.Zid, error) { mgr.mgrLog.Debug().Msg("CreateZettel") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return id.Invalid, box.ErrStopped } + mgr.mgrMx.RLock() + defer mgr.mgrMx.RUnlock() return mgr.boxes[0].CreateZettel(ctx, zettel) } // GetZettel retrieves a specific zettel. -func (mgr *Manager) GetZettel(ctx context.Context, zid id.Zid) (domain.Zettel, error) { +func (mgr *Manager) GetZettel(ctx context.Context, zid id.Zid) (zettel.Zettel, error) { mgr.mgrLog.Debug().Zid(zid).Msg("GetZettel") + if mgr.State() != box.StartStateStarted { + return zettel.Zettel{}, box.ErrStopped + } mgr.mgrMx.RLock() defer mgr.mgrMx.RUnlock() - if !mgr.started { - return domain.Zettel{}, box.ErrStopped - } for i, p := range mgr.boxes { - if z, err := p.GetZettel(ctx, zid); err != box.ErrNotFound { + var errZNF box.ErrZettelNotFound + if z, err := p.GetZettel(ctx, zid); !errors.As(err, &errZNF) { if err == nil { mgr.Enrich(ctx, z.Meta, i+1) } return z, err } } - return domain.Zettel{}, box.ErrNotFound + return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid} } // GetAllZettel retrieves a specific zettel from all managed boxes. -func (mgr *Manager) GetAllZettel(ctx context.Context, zid id.Zid) ([]domain.Zettel, error) { +func (mgr *Manager) GetAllZettel(ctx context.Context, zid id.Zid) ([]zettel.Zettel, error) { mgr.mgrLog.Debug().Zid(zid).Msg("GetAllZettel") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return nil, box.ErrStopped } - var result []domain.Zettel + mgr.mgrMx.RLock() + defer mgr.mgrMx.RUnlock() + var result []zettel.Zettel for i, p := range mgr.boxes { if z, err := p.GetZettel(ctx, zid); err == nil { mgr.Enrich(ctx, z.Meta, i+1) result = append(result, z) } } return result, nil } -// GetMeta retrieves just the meta data of a specific zettel. -func (mgr *Manager) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) { - mgr.mgrLog.Debug().Zid(zid).Msg("GetMeta") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { - return nil, box.ErrStopped - } - return mgr.doGetMeta(ctx, zid) -} - -func (mgr *Manager) doGetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) { - for i, p := range mgr.boxes { - if m, err := p.GetMeta(ctx, zid); err != box.ErrNotFound { - if err == nil { - mgr.Enrich(ctx, m, i+1) - } - return m, err - } - } - return nil, box.ErrNotFound -} - -// GetAllMeta retrieves the meta data of a specific zettel from all managed boxes. -func (mgr *Manager) GetAllMeta(ctx context.Context, zid id.Zid) ([]*meta.Meta, error) { - mgr.mgrLog.Debug().Zid(zid).Msg("GetAllMeta") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { - return nil, box.ErrStopped - } - var result []*meta.Meta - for i, p := range mgr.boxes { - if m, err := p.GetMeta(ctx, zid); err == nil { - mgr.Enrich(ctx, m, i+1) - result = append(result, m) - } - } - return result, nil -} - // FetchZids returns the set of all zettel identifer managed by the box. func (mgr *Manager) FetchZids(ctx context.Context) (id.Set, error) { mgr.mgrLog.Debug().Msg("FetchZids") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return nil, box.ErrStopped } result := id.Set{} + mgr.mgrMx.RLock() + defer mgr.mgrMx.RUnlock() for _, p := range mgr.boxes { - err := p.ApplyZid(ctx, func(zid id.Zid) { result.Zid(zid) }, func(id.Zid) bool { return true }) + err := p.ApplyZid(ctx, func(zid id.Zid) { result.Add(zid) }, func(id.Zid) bool { return true }) if err != nil { return nil, err } } return result, nil } -type metaMap map[id.Zid]*meta.Meta +func (mgr *Manager) HasZettel(ctx context.Context, zid id.Zid) bool { + mgr.mgrLog.Debug().Zid(zid).Msg("HasZettel") + if mgr.State() != box.StartStateStarted { + return false + } + mgr.mgrMx.RLock() + defer mgr.mgrMx.RUnlock() + for _, bx := range mgr.boxes { + if bx.HasZettel(ctx, zid) { + return true + } + } + return false +} + +func (mgr *Manager) GetMeta(ctx context.Context, zid id.Zid) (*meta.Meta, error) { + mgr.mgrLog.Debug().Zid(zid).Msg("GetMeta") + if mgr.State() != box.StartStateStarted { + return nil, box.ErrStopped + } + + m, err := mgr.idxStore.GetMeta(ctx, zid) + if err != nil { + return nil, err + } + mgr.Enrich(ctx, m, 0) + return m, nil +} // SelectMeta returns all zettel meta data that match the selection // criteria. The result is ordered by descending zettel id. -func (mgr *Manager) SelectMeta(ctx context.Context, q *query.Query) ([]*meta.Meta, error) { +func (mgr *Manager) SelectMeta(ctx context.Context, metaSeq []*meta.Meta, q *query.Query) ([]*meta.Meta, error) { if msg := mgr.mgrLog.Debug(); msg.Enabled() { msg.Str("query", q.String()).Msg("SelectMeta") } - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return nil, box.ErrStopped } + mgr.mgrMx.RLock() + defer mgr.mgrMx.RUnlock() - compSearch := q.RetrieveAndCompile(mgr) - selected := metaMap{} + compSearch := q.RetrieveAndCompile(ctx, mgr, metaSeq) + if result := compSearch.Result(); result != nil { + mgr.mgrLog.Trace().Int("count", int64(len(result))).Msg("found without ApplyMeta") + return result, nil + } + selected := map[id.Zid]*meta.Meta{} for _, term := range compSearch.Terms { rejected := id.Set{} handleMeta := func(m *meta.Meta) { zid := m.Zid - if rejected.Contains(zid) { + if rejected.ContainsOrNil(zid) { mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/alreadyRejected") return } if _, ok := selected[zid]; ok { mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/alreadySelected") @@ -183,40 +174,40 @@ } if compSearch.PreMatch(m) && term.Match(m) { selected[zid] = m mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/match") } else { - rejected.Zid(zid) + rejected.Add(zid) mgr.mgrLog.Trace().Zid(zid).Msg("SelectMeta/reject") } } for _, p := range mgr.boxes { - if err := p.ApplyMeta(ctx, handleMeta, term.Retrieve); err != nil { - return nil, err + if err2 := p.ApplyMeta(ctx, handleMeta, term.Retrieve); err2 != nil { + return nil, err2 } } } result := make([]*meta.Meta, 0, len(selected)) for _, m := range selected { result = append(result, m) } - return q.Sort(result), nil + result = compSearch.AfterSearch(result) + mgr.mgrLog.Trace().Int("count", int64(len(result))).Msg("found with ApplyMeta") + return result, nil } // CanUpdateZettel returns true, if box could possibly update the given zettel. -func (mgr *Manager) CanUpdateZettel(ctx context.Context, zettel domain.Zettel) bool { +func (mgr *Manager) CanUpdateZettel(ctx context.Context, zettel zettel.Zettel) bool { mgr.mgrMx.RLock() defer mgr.mgrMx.RUnlock() - return mgr.started && mgr.boxes[0].CanUpdateZettel(ctx, zettel) + return mgr.State() == box.StartStateStarted && mgr.boxes[0].CanUpdateZettel(ctx, zettel) } // UpdateZettel updates an existing zettel. -func (mgr *Manager) UpdateZettel(ctx context.Context, zettel domain.Zettel) error { +func (mgr *Manager) UpdateZettel(ctx context.Context, zettel zettel.Zettel) error { mgr.mgrLog.Debug().Zid(zettel.Meta.Zid).Msg("UpdateZettel") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return box.ErrStopped } // Remove all (computed) properties from metadata before storing the zettel. zettel.Meta = zettel.Meta.Clone() for _, p := range zettel.Meta.ComputedPairsRest() { @@ -227,15 +218,15 @@ return mgr.boxes[0].UpdateZettel(ctx, zettel) } // AllowRenameZettel returns true, if box will not disallow renaming the zettel. func (mgr *Manager) AllowRenameZettel(ctx context.Context, zid id.Zid) bool { + if mgr.State() != box.StartStateStarted { + return false + } mgr.mgrMx.RLock() defer mgr.mgrMx.RUnlock() - if !mgr.started { - return false - } for _, p := range mgr.boxes { if !p.AllowRenameZettel(ctx, zid) { return false } } @@ -243,18 +234,19 @@ } // RenameZettel changes the current zid to a new zid. func (mgr *Manager) RenameZettel(ctx context.Context, curZid, newZid id.Zid) error { mgr.mgrLog.Debug().Zid(curZid).Zid(newZid).Msg("RenameZettel") - mgr.mgrMx.RLock() - defer mgr.mgrMx.RUnlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return box.ErrStopped } + mgr.mgrMx.RLock() + defer mgr.mgrMx.RUnlock() for i, p := range mgr.boxes { err := p.RenameZettel(ctx, curZid, newZid) - if err != nil && !errors.Is(err, box.ErrNotFound) { + var errZNF box.ErrZettelNotFound + if err != nil && !errors.As(err, &errZNF) { for j := 0; j < i; j++ { mgr.boxes[j].RenameZettel(ctx, newZid, curZid) } return err } @@ -262,15 +254,15 @@ return nil } // CanDeleteZettel returns true, if box could possibly delete the given zettel. func (mgr *Manager) CanDeleteZettel(ctx context.Context, zid id.Zid) bool { + if mgr.State() != box.StartStateStarted { + return false + } mgr.mgrMx.RLock() defer mgr.mgrMx.RUnlock() - if !mgr.started { - return false - } for _, p := range mgr.boxes { if p.CanDeleteZettel(ctx, zid) { return true } } @@ -278,21 +270,22 @@ } // DeleteZettel removes the zettel from the box. func (mgr *Manager) DeleteZettel(ctx context.Context, zid id.Zid) error { mgr.mgrLog.Debug().Zid(zid).Msg("DeleteZettel") + if mgr.State() != box.StartStateStarted { + return box.ErrStopped + } mgr.mgrMx.RLock() defer mgr.mgrMx.RUnlock() - if !mgr.started { - return box.ErrStopped - } for _, p := range mgr.boxes { err := p.DeleteZettel(ctx, zid) if err == nil { return nil } - if !errors.Is(err, box.ErrNotFound) && !errors.Is(err, box.ErrReadOnly) { + var errZNF box.ErrZettelNotFound + if !errors.As(err, &errZNF) && !errors.Is(err, box.ErrReadOnly) { return err } } - return box.ErrNotFound + return box.ErrZettelNotFound{Zid: zid} } Index: box/manager/collect.go ================================================================== --- box/manager/collect.go +++ box/manager/collect.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -13,12 +13,12 @@ import ( "strings" "zettelstore.de/z/ast" "zettelstore.de/z/box/manager/store" - "zettelstore.de/z/domain/id" "zettelstore.de/z/strfun" + "zettelstore.de/z/zettel/id" ) type collectData struct { refs id.Set words store.WordSet @@ -74,8 +74,8 @@ } if !ref.IsZettel() { return } if zid, err := id.Parse(ref.URL.Path); err == nil { - data.refs.Zid(zid) + data.refs.Add(zid) } } Index: box/manager/enrich.go ================================================================== --- box/manager/enrich.go +++ box/manager/enrich.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -12,14 +12,14 @@ import ( "context" "strconv" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/box" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // Enrich computes additional properties and updates the given metadata. func (mgr *Manager) Enrich(ctx context.Context, m *meta.Meta, boxNumber int) { @@ -32,11 +32,13 @@ // Enrich is called indirectly via indexer or enrichment is not requested // because of other reasons -> ignore this call, do not update metadata return } computePublished(m) - m.Set(api.KeyBoxNumber, strconv.Itoa(boxNumber)) + if boxNumber > 0 { + m.Set(api.KeyBoxNumber, strconv.Itoa(boxNumber)) + } mgr.idxStore.Enrich(ctx, m) } func computeCreated(zid id.Zid) string { if zid <= 10101000000 { @@ -59,26 +61,33 @@ if hours > 23 { hours = 23 } zid /= 100 day := zid % 100 + zid /= 100 + month := zid % 100 + year := zid / 100 + month, day = sanitizeMonthDay(year, month, day) + created := ((((year*100+month)*100+day)*100+hours)*100+minutes)*100 + seconds + return created.String() +} + +func sanitizeMonthDay(year, month, day id.Zid) (id.Zid, id.Zid) { if day < 1 { day = 1 } - zid /= 100 - month := zid % 100 if month < 1 { month = 1 } if month > 12 { month = 12 } - year := zid / 100 + switch month { case 1, 3, 5, 7, 8, 10, 12: if day > 31 { - day = 32 + day = 31 } case 4, 6, 9, 11: if day > 30 { day = 30 } @@ -91,12 +100,11 @@ if day > 29 { day = 29 } } } - created := ((((year*100+month)*100+day)*100+hours)*100+minutes)*100 + seconds - return created.String() + return month, day } func computePublished(m *meta.Meta) { if _, ok := m.Get(api.KeyPublished); ok { return Index: box/manager/indexer.go ================================================================== --- box/manager/indexer.go +++ box/manager/indexer.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -16,16 +16,16 @@ "net/url" "time" "zettelstore.de/z/box" "zettelstore.de/z/box/manager/store" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/parser" "zettelstore.de/z/strfun" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // SearchEqual returns all zettel that contains the given exact word. // The word must be normalized through Unicode NKFD, trimmed and not empty. func (mgr *Manager) SearchEqual(word string) id.Set { @@ -73,12 +73,12 @@ // idxIndexer runs in the background and updates the index data structures. // This is the main service of the idxIndexer. func (mgr *Manager) idxIndexer() { // Something may panic. Ensure a running indexer. defer func() { - if r := recover(); r != nil { - kernel.Main.LogRecover("Indexer", r) + if ri := recover(); ri != nil { + kernel.Main.LogRecover("Indexer", ri) go mgr.idxIndexer() } }() timerDuration := 15 * time.Second @@ -155,17 +155,17 @@ return false } return true } -func (mgr *Manager) idxUpdateZettel(ctx context.Context, zettel domain.Zettel) { +func (mgr *Manager) idxUpdateZettel(ctx context.Context, zettel zettel.Zettel) { var cData collectData cData.initialize() collectZettelIndexData(parser.ParseZettel(ctx, zettel, "", mgr.rtConfig), &cData) m := zettel.Meta - zi := store.NewZettelIndex(m.Zid) + zi := store.NewZettelIndex(m) mgr.idxCollectFromMeta(ctx, m, zi, &cData) mgr.idxProcessData(ctx, zi, &cData) toCheck := mgr.idxStore.UpdateReferences(ctx, zi) mgr.idxCheckZettel(toCheck) } @@ -198,11 +198,11 @@ } } func (mgr *Manager) idxProcessData(ctx context.Context, zi *store.ZettelIndex, cData *collectData) { for ref := range cData.refs { - if _, err := mgr.GetMeta(ctx, ref); err == nil { + if mgr.HasZettel(ctx, ref) { zi.AddBackRef(ref) } else { zi.AddDeadRef(ref) } } @@ -213,19 +213,19 @@ func (mgr *Manager) idxUpdateValue(ctx context.Context, inverseKey, value string, zi *store.ZettelIndex) { zid, err := id.Parse(value) if err != nil { return } - if _, err = mgr.GetMeta(ctx, zid); err != nil { + if !mgr.HasZettel(ctx, zid) { zi.AddDeadRef(zid) return } if inverseKey == "" { zi.AddBackRef(zid) return } - zi.AddMetaRef(inverseKey, zid) + zi.AddInverseRef(inverseKey, zid) } func (mgr *Manager) idxDeleteZettel(zid id.Zid) { toCheck := mgr.idxStore.DeleteZettel(context.Background(), zid) mgr.idxCheckZettel(toCheck) Index: box/manager/manager.go ================================================================== --- box/manager/manager.go +++ box/manager/manager.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -16,21 +16,21 @@ "io" "net/url" "sync" "time" - "zettelstore.de/c/maps" + "zettelstore.de/client.fossil/maps" "zettelstore.de/z/auth" "zettelstore.de/z/box" "zettelstore.de/z/box/manager/memstore" "zettelstore.de/z/box/manager/store" "zettelstore.de/z/config" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/strfun" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // ConnectData contains all administration related values. type ConnectData struct { Number int // number of the box, starting with 1. @@ -83,12 +83,13 @@ func GetSchemes() []string { return maps.Keys(registry) } // Manager is a coordinating box. type Manager struct { mgrLog *logger.Logger + stateMx sync.RWMutex + state box.StartState mgrMx sync.RWMutex - started bool rtConfig config.Config boxes []box.ManagedBox observers []box.UpdateFunc mxObserver sync.RWMutex done chan struct{} @@ -96,19 +97,32 @@ propertyKeys strfun.Set // Set of property key names // Indexer data idxLog *logger.Logger idxStore store.Store - idxAr *anterooms + idxAr *anteroomQueue idxReady chan struct{} // Signal a non-empty anteroom to background task // Indexer stats data idxMx sync.RWMutex idxLastReload time.Time idxDurReload time.Duration idxSinceReload uint64 } + +func (mgr *Manager) setState(newState box.StartState) { + mgr.stateMx.Lock() + mgr.state = newState + mgr.stateMx.Unlock() +} + +func (mgr *Manager) State() box.StartState { + mgr.stateMx.RLock() + state := mgr.state + mgr.stateMx.RUnlock() + return state +} // New creates a new managing box. func New(boxURIs []*url.URL, authManager auth.BaseManager, rtConfig config.Config) (*Manager, error) { descrs := meta.GetSortedKeyDescriptions() propertyKeys := make(strfun.Set, len(descrs)) @@ -124,11 +138,11 @@ infos: make(chan box.UpdateInfo, len(boxURIs)*10), propertyKeys: propertyKeys, idxLog: boxLog.Clone().Str("box", "index").Child(), idxStore: memstore.New(), - idxAr: newAnterooms(10), + idxAr: newAnteroomQueue(1000), idxReady: make(chan struct{}, 1), } cdata := ConnectData{Number: 1, Config: rtConfig, Enricher: mgr, Notify: mgr.infos} boxes := make([]box.ManagedBox, 0, len(boxURIs)+2) for _, uri := range boxURIs { @@ -167,12 +181,12 @@ } func (mgr *Manager) notifier() { // The call to notify may panic. Ensure a running notifier. defer func() { - if r := recover(); r != nil { - kernel.Main.LogRecover("Notifier", r) + if ri := recover(); ri != nil { + kernel.Main.LogRecover("Notifier", ri) go mgr.notifier() } }() tsLastEvent := time.Now() @@ -193,15 +207,18 @@ mgr.mgrLog.Debug().Uint("reason", uint64(reason)).Zid(zid).Msg("notifier") if ignoreUpdate(cache, now, reason, zid) { mgr.mgrLog.Trace().Uint("reason", uint64(reason)).Zid(zid).Msg("notifier ignored") continue } + mgr.idxEnqueue(reason, zid) if ci.Box == nil { ci.Box = mgr } - mgr.notifyObserver(&ci) + if mgr.State() == box.StartStateStarted { + mgr.notifyObserver(&ci) + } } case <-mgr.done: return } } @@ -226,15 +243,18 @@ return false } func (mgr *Manager) idxEnqueue(reason box.UpdateReason, zid id.Zid) { switch reason { + case box.OnReady: + return case box.OnReload: mgr.idxAr.Reset() case box.OnZettel: mgr.idxAr.EnqueueZettel(zid) default: + mgr.mgrLog.Warn().Uint("reason", uint64(reason)).Zid(zid).Msg("Unknown notification reason") return } select { case mgr.idxReady <- struct{}{}: default: @@ -252,65 +272,94 @@ // Start the box. Now all other functions of the box are allowed. // Starting an already started box is not allowed. func (mgr *Manager) Start(ctx context.Context) error { mgr.mgrMx.Lock() - if mgr.started { - mgr.mgrMx.Unlock() + defer mgr.mgrMx.Unlock() + if mgr.State() != box.StartStateStopped { return box.ErrStarted } + mgr.setState(box.StartStateStarting) for i := len(mgr.boxes) - 1; i >= 0; i-- { ssi, ok := mgr.boxes[i].(box.StartStopper) if !ok { continue } err := ssi.Start(ctx) if err == nil { continue } + mgr.setState(box.StartStateStopping) for j := i + 1; j < len(mgr.boxes); j++ { if ssj, ok2 := mgr.boxes[j].(box.StartStopper); ok2 { ssj.Stop(ctx) } } - mgr.mgrMx.Unlock() + mgr.setState(box.StartStateStopped) return err } mgr.idxAr.Reset() // Ensure an initial index run mgr.done = make(chan struct{}) go mgr.notifier() - go mgr.idxIndexer() + + mgr.waitBoxesAreStarted() + mgr.setState(box.StartStateStarted) + mgr.notifyObserver(&box.UpdateInfo{Box: mgr, Reason: box.OnReady}) - mgr.started = true - mgr.mgrMx.Unlock() + go mgr.idxIndexer() return nil } + +func (mgr *Manager) waitBoxesAreStarted() { + const waitTime = 10 * time.Millisecond + const waitLoop = int(1 * time.Second / waitTime) + for i := 1; !mgr.allBoxesStarted(); i++ { + if i%waitLoop == 0 { + if time.Duration(i)*waitTime > time.Minute { + mgr.mgrLog.Warn().Msg("Waiting for more than one minute to start") + } else { + mgr.mgrLog.Trace().Msg("Wait for boxes to start") + } + } + time.Sleep(waitTime) + } +} + +func (mgr *Manager) allBoxesStarted() bool { + for _, bx := range mgr.boxes { + if b, ok := bx.(box.StartStopper); ok && b.State() != box.StartStateStarted { + return false + } + } + return true +} // Stop the started box. Now only the Start() function is allowed. func (mgr *Manager) Stop(ctx context.Context) { mgr.mgrMx.Lock() defer mgr.mgrMx.Unlock() - if !mgr.started { + if mgr.State() != box.StartStateStarted { return } + mgr.setState(box.StartStateStopping) close(mgr.done) for _, p := range mgr.boxes { if ss, ok := p.(box.StartStopper); ok { ss.Stop(ctx) } } - mgr.started = false + mgr.setState(box.StartStateStopped) } // Refresh internal box data. func (mgr *Manager) Refresh(ctx context.Context) error { mgr.mgrLog.Debug().Msg("Refresh") + if mgr.State() != box.StartStateStarted { + return box.ErrStopped + } mgr.mgrMx.Lock() defer mgr.mgrMx.Unlock() - if !mgr.started { - return box.ErrStopped - } mgr.infos <- box.UpdateInfo{Reason: box.OnReload, Zid: id.Invalid} for _, bx := range mgr.boxes { if rb, ok := bx.(box.Refresher); ok { rb.Refresh(ctx) } Index: box/manager/memstore/memstore.go ================================================================== --- box/manager/memstore/memstore.go +++ box/manager/memstore/memstore.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -17,66 +17,74 @@ "io" "sort" "strings" "sync" - "zettelstore.de/c/api" - "zettelstore.de/c/maps" + "zettelstore.de/client.fossil/api" + "zettelstore.de/client.fossil/maps" + "zettelstore.de/z/box" "zettelstore.de/z/box/manager/store" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) -type metaRefs struct { +type bidiRefs struct { forward id.Slice backward id.Slice } -type zettelIndex struct { - dead id.Slice - forward id.Slice - backward id.Slice - meta map[string]metaRefs - words []string - urls []string -} - -func (zi *zettelIndex) isEmpty() bool { - if len(zi.forward) > 0 || len(zi.backward) > 0 || len(zi.dead) > 0 || len(zi.words) > 0 { - return false - } - return len(zi.meta) == 0 +type zettelData struct { + meta *meta.Meta + dead id.Slice + forward id.Slice + backward id.Slice + otherRefs map[string]bidiRefs + words []string + urls []string } type stringRefs map[string]id.Slice type memStore struct { - mx sync.RWMutex - idx map[id.Zid]*zettelIndex - dead map[id.Zid]id.Slice // map dead refs where they occur - words stringRefs - urls stringRefs + mx sync.RWMutex + intern map[string]string // map to intern strings + idx map[id.Zid]*zettelData + dead map[id.Zid]id.Slice // map dead refs where they occur + words stringRefs + urls stringRefs // Stats + mxStats sync.Mutex updates uint64 } // New returns a new memory-based index store. func New() store.Store { return &memStore{ - idx: make(map[id.Zid]*zettelIndex), - dead: make(map[id.Zid]id.Slice), - words: make(stringRefs), - urls: make(stringRefs), + intern: make(map[string]string, 1024), + idx: make(map[id.Zid]*zettelData), + dead: make(map[id.Zid]id.Slice), + words: make(stringRefs), + urls: make(stringRefs), + } +} + +func (ms *memStore) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) { + ms.mx.RLock() + defer ms.mx.RUnlock() + if zi, found := ms.idx[zid]; found && zi.meta != nil { + // zi.meta is nil, if zettel was referenced, but is not indexed yet. + return zi.meta.Clone(), nil } + return nil, box.ErrZettelNotFound{Zid: zid} } func (ms *memStore) Enrich(_ context.Context, m *meta.Meta) { if ms.doEnrich(m) { - ms.mx.Lock() + ms.mxStats.Lock() ms.updates++ - ms.mx.Unlock() + ms.mxStats.Unlock() } } func (ms *memStore) doEnrich(m *meta.Meta) bool { ms.mx.RLock() @@ -88,21 +96,21 @@ var updated bool if len(zi.dead) > 0 { m.Set(api.KeyDead, zi.dead.String()) updated = true } - back := removeOtherMetaRefs(m, zi.backward.Copy()) + back := removeOtherMetaRefs(m, zi.backward.Clone()) if len(zi.backward) > 0 { m.Set(api.KeyBackward, zi.backward.String()) updated = true } if len(zi.forward) > 0 { m.Set(api.KeyForward, zi.forward.String()) back = remRefs(back, zi.forward) updated = true } - for k, refs := range zi.meta { + for k, refs := range zi.otherRefs { if len(refs.backward) > 0 { m.Set(k, refs.backward.String()) back = remRefs(back, refs.backward) updated = true } @@ -119,14 +127,14 @@ func (ms *memStore) SearchEqual(word string) id.Set { ms.mx.RLock() defer ms.mx.RUnlock() result := id.NewSet() if refs, ok := ms.words[word]; ok { - result.AddSlice(refs) + result.CopySlice(refs) } if refs, ok := ms.urls[word]; ok { - result.AddSlice(refs) + result.CopySlice(refs) } zid, err := id.Parse(word) if err != nil { return result } @@ -221,27 +229,27 @@ result := id.NewSet() for word, refs := range ms.words { if !pred(word, s) { continue } - result.AddSlice(refs) + result.CopySlice(refs) } for u, refs := range ms.urls { if !pred(u, s) { continue } - result.AddSlice(refs) + result.CopySlice(refs) } return result } -func addBackwardZids(result id.Set, zid id.Zid, zi *zettelIndex) { +func addBackwardZids(result id.Set, zid id.Zid, zi *zettelData) { // Must only be called if ms.mx is read-locked! - result.Zid(zid) - result.AddSlice(zi.backward) - for _, mref := range zi.meta { - result.AddSlice(mref.backward) + result.Add(zid) + result.CopySlice(zi.backward) + for _, mref := range zi.otherRefs { + result.CopySlice(mref.backward) } } func removeOtherMetaRefs(m *meta.Meta, back id.Slice) id.Slice { for _, p := range m.PairsRest() { @@ -260,15 +268,16 @@ } return back } func (ms *memStore) UpdateReferences(_ context.Context, zidx *store.ZettelIndex) id.Set { + m := ms.makeMeta(zidx) ms.mx.Lock() defer ms.mx.Unlock() zi, ziExist := ms.idx[zidx.Zid] if !ziExist || zi == nil { - zi = &zettelIndex{} + zi = &zettelData{} ziExist = false } // Is this zettel an old dead reference mentioned in other zettel? var toCheck id.Set @@ -276,25 +285,65 @@ // These must be checked later again toCheck = id.NewSet(refs...) delete(ms.dead, zidx.Zid) } + zi.meta = m ms.updateDeadReferences(zidx, zi) - ms.updateForwardBackwardReferences(zidx, zi) - ms.updateMetadataReferences(zidx, zi) + ids := ms.updateForwardBackwardReferences(zidx, zi) + toCheck = toCheck.Copy(ids) + ids = ms.updateMetadataReferences(zidx, zi) + toCheck = toCheck.Copy(ids) zi.words = updateWordSet(zidx.Zid, ms.words, zi.words, zidx.GetWords()) zi.urls = updateWordSet(zidx.Zid, ms.urls, zi.urls, zidx.GetUrls()) // Check if zi must be inserted into ms.idx - if !ziExist && !zi.isEmpty() { + if !ziExist { ms.idx[zidx.Zid] = zi } return toCheck } -func (ms *memStore) updateDeadReferences(zidx *store.ZettelIndex, zi *zettelIndex) { +var internableKeys = map[string]bool{ + api.KeyRole: true, + api.KeySyntax: true, + api.KeyFolgeRole: true, + api.KeyLang: true, + api.KeyReadOnly: true, +} + +func isInternableValue(key string) bool { + if internableKeys[key] { + return true + } + return strings.HasSuffix(key, "-role") +} + +func (ms *memStore) internString(s string) string { + if is, found := ms.intern[s]; found { + return is + } + ms.intern[s] = s + return s +} + +func (ms *memStore) makeMeta(zidx *store.ZettelIndex) *meta.Meta { + origM := zidx.GetMeta() + copyM := meta.New(origM.Zid) + for _, p := range origM.Pairs() { + key := ms.internString(p.Key) + if isInternableValue(key) { + copyM.Set(key, ms.internString(p.Value)) + } else if key == api.KeyBoxNumber || !meta.IsComputed(key) { + copyM.Set(key, p.Value) + } + } + return copyM +} + +func (ms *memStore) updateDeadReferences(zidx *store.ZettelIndex, zi *zettelData) { // Must only be called if ms.mx is write-locked! drefs := zidx.GetDeadRefs() newRefs, remRefs := refsDiff(drefs, zi.dead) zi.dead = drefs for _, ref := range remRefs { @@ -303,58 +352,71 @@ for _, ref := range newRefs { ms.dead[ref] = addRef(ms.dead[ref], zidx.Zid) } } -func (ms *memStore) updateForwardBackwardReferences(zidx *store.ZettelIndex, zi *zettelIndex) { +func (ms *memStore) updateForwardBackwardReferences(zidx *store.ZettelIndex, zi *zettelData) id.Set { // Must only be called if ms.mx is write-locked! brefs := zidx.GetBackRefs() newRefs, remRefs := refsDiff(brefs, zi.forward) zi.forward = brefs + + var toCheck id.Set for _, ref := range remRefs { - bzi := ms.getEntry(ref) + bzi := ms.getOrCreateEntry(ref) bzi.backward = remRef(bzi.backward, zidx.Zid) + if bzi.meta == nil { + toCheck = toCheck.Add(ref) + } } for _, ref := range newRefs { - bzi := ms.getEntry(ref) + bzi := ms.getOrCreateEntry(ref) bzi.backward = addRef(bzi.backward, zidx.Zid) + if bzi.meta == nil { + toCheck = toCheck.Add(ref) + } } + return toCheck } -func (ms *memStore) updateMetadataReferences(zidx *store.ZettelIndex, zi *zettelIndex) { +func (ms *memStore) updateMetadataReferences(zidx *store.ZettelIndex, zi *zettelData) id.Set { // Must only be called if ms.mx is write-locked! - metarefs := zidx.GetMetaRefs() - for key, mr := range zi.meta { - if _, ok := metarefs[key]; ok { + inverseRefs := zidx.GetInverseRefs() + for key, mr := range zi.otherRefs { + if _, ok := inverseRefs[key]; ok { continue } ms.removeInverseMeta(zidx.Zid, key, mr.forward) } - if zi.meta == nil { - zi.meta = make(map[string]metaRefs) + if zi.otherRefs == nil { + zi.otherRefs = make(map[string]bidiRefs) } - for key, mrefs := range metarefs { - mr := zi.meta[key] + var toCheck id.Set + for key, mrefs := range inverseRefs { + mr := zi.otherRefs[key] newRefs, remRefs := refsDiff(mrefs, mr.forward) mr.forward = mrefs - zi.meta[key] = mr + zi.otherRefs[key] = mr for _, ref := range newRefs { - bzi := ms.getEntry(ref) - if bzi.meta == nil { - bzi.meta = make(map[string]metaRefs) + bzi := ms.getOrCreateEntry(ref) + if bzi.otherRefs == nil { + bzi.otherRefs = make(map[string]bidiRefs) } - bmr := bzi.meta[key] + bmr := bzi.otherRefs[key] bmr.backward = addRef(bmr.backward, zidx.Zid) - bzi.meta[key] = bmr + bzi.otherRefs[key] = bmr + if bzi.meta == nil { + toCheck = toCheck.Add(ref) + } } ms.removeInverseMeta(zidx.Zid, key, remRefs) } + return toCheck } func updateWordSet(zid id.Zid, srefs stringRefs, prev []string, next store.WordSet) []string { - // Must only be called if ms.mx is write-locked! newWords, removeWords := next.Diff(prev) for _, word := range newWords { if refs, ok := srefs[word]; ok { srefs[word] = addRef(refs, zid) continue @@ -374,16 +436,16 @@ srefs[word] = refs2 } return next.Words() } -func (ms *memStore) getEntry(zid id.Zid) *zettelIndex { +func (ms *memStore) getOrCreateEntry(zid id.Zid) *zettelData { // Must only be called if ms.mx is write-locked! if zi, ok := ms.idx[zid]; ok { return zi } - zi := &zettelIndex{} + zi := &zettelData{} ms.idx[zid] = zi return zi } func (ms *memStore) DeleteZettel(_ context.Context, zid id.Zid) id.Set { @@ -395,21 +457,21 @@ return nil } ms.deleteDeadSources(zid, zi) toCheck := ms.deleteForwardBackward(zid, zi) - if len(zi.meta) > 0 { - for key, mrefs := range zi.meta { + if len(zi.otherRefs) > 0 { + for key, mrefs := range zi.otherRefs { ms.removeInverseMeta(zid, key, mrefs.forward) } } ms.deleteWords(zid, zi.words) delete(ms.idx, zid) return toCheck } -func (ms *memStore) deleteDeadSources(zid id.Zid, zi *zettelIndex) { +func (ms *memStore) deleteDeadSources(zid id.Zid, zi *zettelData) { // Must only be called if ms.mx is write-locked! for _, ref := range zi.dead { if drefs, ok := ms.dead[ref]; ok { drefs = remRef(drefs, zid) if len(drefs) > 0 { @@ -419,11 +481,11 @@ } } } } -func (ms *memStore) deleteForwardBackward(zid id.Zid, zi *zettelIndex) id.Set { +func (ms *memStore) deleteForwardBackward(zid id.Zid, zi *zettelData) id.Set { // Must only be called if ms.mx is write-locked! var toCheck id.Set for _, ref := range zi.forward { if fzi, ok := ms.idx[ref]; ok { fzi.backward = remRef(fzi.backward, zid) @@ -433,34 +495,34 @@ if bzi, ok := ms.idx[ref]; ok { bzi.forward = remRef(bzi.forward, zid) if toCheck == nil { toCheck = id.NewSet() } - toCheck.Zid(ref) + toCheck.Add(ref) } } return toCheck } func (ms *memStore) removeInverseMeta(zid id.Zid, key string, forward id.Slice) { // Must only be called if ms.mx is write-locked! for _, ref := range forward { bzi, ok := ms.idx[ref] - if !ok || bzi.meta == nil { + if !ok || bzi.otherRefs == nil { continue } - bmr, ok := bzi.meta[key] + bmr, ok := bzi.otherRefs[key] if !ok { continue } bmr.backward = remRef(bmr.backward, zid) if len(bmr.backward) > 0 || len(bmr.forward) > 0 { - bzi.meta[key] = bmr + bzi.otherRefs[key] = bmr } else { - delete(bzi.meta, key) - if len(bzi.meta) == 0 { - bzi.meta = nil + delete(bzi.otherRefs, key) + if len(bzi.otherRefs) == 0 { + bzi.otherRefs = nil } } } } @@ -481,14 +543,16 @@ } func (ms *memStore) ReadStats(st *store.Stats) { ms.mx.RLock() st.Zettel = len(ms.idx) - st.Updates = ms.updates st.Words = uint64(len(ms.words)) st.Urls = uint64(len(ms.urls)) ms.mx.RUnlock() + ms.mxStats.Lock() + st.Updates = ms.updates + ms.mxStats.Unlock() } func (ms *memStore) Dump(w io.Writer) { ms.mx.RLock() defer ms.mx.RUnlock() @@ -516,11 +580,11 @@ if len(zi.dead) > 0 { fmt.Fprintln(w, "* Dead:", zi.dead) } dumpZids(w, "* Forward:", zi.forward) dumpZids(w, "* Backward:", zi.backward) - for k, fb := range zi.meta { + for k, fb := range zi.otherRefs { fmt.Fprintln(w, "* Meta", k) dumpZids(w, "** Forward:", fb.forward) dumpZids(w, "** Backward:", fb.backward) } dumpStrings(w, "* Words", "", "", zi.words) Index: box/manager/memstore/refs.go ================================================================== --- box/manager/memstore/refs.go +++ box/manager/memstore/refs.go @@ -1,18 +1,22 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- package memstore -import "zettelstore.de/z/domain/id" +import ( + "slices" + + "zettelstore.de/z/zettel/id" +) func refsDiff(refsN, refsO id.Slice) (newRefs, remRefs id.Slice) { npos, opos := 0, 0 for npos < len(refsN) && opos < len(refsO) { rn, ro := refsN[npos], refsO[opos] @@ -48,13 +52,11 @@ lo = m + 1 } else { hi = m } } - refs = append(refs, id.Invalid) - copy(refs[hi+1:], refs[hi:]) - refs[hi] = ref + refs = slices.Insert(refs, hi, ref) return refs } func remRefs(refs, rem id.Slice) id.Slice { if len(refs) == 0 || len(rem) == 0 { Index: box/manager/memstore/refs_test.go ================================================================== --- box/manager/memstore/refs_test.go +++ box/manager/memstore/refs_test.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -11,11 +11,11 @@ package memstore import ( "testing" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) func assertRefs(t *testing.T, i int, got, exp id.Slice) { t.Helper() if got == nil && exp != nil { Index: box/manager/store/store.go ================================================================== --- box/manager/store/store.go +++ box/manager/store/store.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -13,13 +13,13 @@ import ( "context" "io" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/query" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // Stats records statistics about the store. type Stats struct { // Zettel is the number of zettel managed by the indexer. @@ -37,10 +37,13 @@ // Store all relevant zettel data. There may be multiple implementations, i.e. // memory-based, file-based, based on SQLite, ... type Store interface { query.Searcher + + // GetMeta returns the metadata of the zettel with the given identifier. + GetMeta(context.Context, id.Zid) (*meta.Meta, error) // Entrich metadata with data from store. Enrich(ctx context.Context, m *meta.Meta) // UpdateReferences for a specific zettel. Index: box/manager/store/wordset.go ================================================================== --- box/manager/store/wordset.go +++ box/manager/store/wordset.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- Index: box/manager/store/wordset_test.go ================================================================== --- box/manager/store/wordset_test.go +++ box/manager/store/wordset_test.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- Index: box/manager/store/zettel.go ================================================================== --- box/manager/store/zettel.go +++ box/manager/store/zettel.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -8,76 +8,80 @@ // under this license. //----------------------------------------------------------------------------- package store -import "zettelstore.de/z/domain/id" +import ( + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" +) // ZettelIndex contains all index data of a zettel. type ZettelIndex struct { - Zid id.Zid // zid of the indexed zettel - backrefs id.Set // set of back references - metarefs map[string]id.Set // references to inverse keys - deadrefs id.Set // set of dead references - words WordSet - urls WordSet + Zid id.Zid // zid of the indexed zettel + meta *meta.Meta // full metadata + backrefs id.Set // set of back references + inverseRefs map[string]id.Set // references of inverse keys + deadrefs id.Set // set of dead references + words WordSet + urls WordSet } // NewZettelIndex creates a new zettel index. -func NewZettelIndex(zid id.Zid) *ZettelIndex { +func NewZettelIndex(m *meta.Meta) *ZettelIndex { return &ZettelIndex{ - Zid: zid, - backrefs: id.NewSet(), - metarefs: make(map[string]id.Set), - deadrefs: id.NewSet(), + Zid: m.Zid, + meta: m, + backrefs: id.NewSet(), + inverseRefs: make(map[string]id.Set), + deadrefs: id.NewSet(), } } // AddBackRef adds a reference to a zettel where the current zettel links to // without any more information. func (zi *ZettelIndex) AddBackRef(zid id.Zid) { - zi.backrefs.Zid(zid) + zi.backrefs.Add(zid) } -// AddMetaRef adds a named reference to a zettel. On that zettel, the given +// AddInverseRef adds a named reference to a zettel. On that zettel, the given // metadata key should point back to the current zettel. -func (zi *ZettelIndex) AddMetaRef(key string, zid id.Zid) { - if zids, ok := zi.metarefs[key]; ok { - zids.Zid(zid) +func (zi *ZettelIndex) AddInverseRef(key string, zid id.Zid) { + if zids, ok := zi.inverseRefs[key]; ok { + zids.Add(zid) return } - zi.metarefs[key] = id.NewSet(zid) + zi.inverseRefs[key] = id.NewSet(zid) } // AddDeadRef adds a dead reference to a zettel. func (zi *ZettelIndex) AddDeadRef(zid id.Zid) { - zi.deadrefs.Zid(zid) + zi.deadrefs.Add(zid) } // SetWords sets the words to the given value. func (zi *ZettelIndex) SetWords(words WordSet) { zi.words = words } // SetUrls sets the words to the given value. func (zi *ZettelIndex) SetUrls(urls WordSet) { zi.urls = urls } // GetDeadRefs returns all dead references as a sorted list. -func (zi *ZettelIndex) GetDeadRefs() id.Slice { - return zi.deadrefs.Sorted() -} +func (zi *ZettelIndex) GetDeadRefs() id.Slice { return zi.deadrefs.Sorted() } + +// GetMeta return just the raw metadata. +func (zi *ZettelIndex) GetMeta() *meta.Meta { return zi.meta } // GetBackRefs returns all back references as a sorted list. -func (zi *ZettelIndex) GetBackRefs() id.Slice { - return zi.backrefs.Sorted() -} +func (zi *ZettelIndex) GetBackRefs() id.Slice { return zi.backrefs.Sorted() } -// GetMetaRefs returns all meta references as a map of strings to a sorted list of references -func (zi *ZettelIndex) GetMetaRefs() map[string]id.Slice { - if len(zi.metarefs) == 0 { +// GetInverseRefs returns all inverse meta references as a map of strings to a sorted list of references +func (zi *ZettelIndex) GetInverseRefs() map[string]id.Slice { + if len(zi.inverseRefs) == 0 { return nil } - result := make(map[string]id.Slice, len(zi.metarefs)) - for key, refs := range zi.metarefs { + result := make(map[string]id.Slice, len(zi.inverseRefs)) + for key, refs := range zi.inverseRefs { result[key] = refs.Sorted() } return result } Index: box/membox/membox.go ================================================================== --- box/membox/membox.go +++ box/membox/membox.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -16,16 +16,15 @@ "net/url" "sync" "zettelstore.de/z/box" "zettelstore.de/z/box/manager" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/query" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" ) func init() { manager.Register( "mem", @@ -46,27 +45,36 @@ u *url.URL cdata manager.ConnectData maxZettel int maxBytes int mx sync.RWMutex // Protects the following fields - zettel map[id.Zid]domain.Zettel + zettel map[id.Zid]zettel.Zettel curBytes int } -func (mb *memBox) notifyChanged(reason box.UpdateReason, zid id.Zid) { +func (mb *memBox) notifyChanged(zid id.Zid) { if chci := mb.cdata.Notify; chci != nil { - chci <- box.UpdateInfo{Reason: reason, Zid: zid} + chci <- box.UpdateInfo{Box: mb, Reason: box.OnZettel, Zid: zid} } } func (mb *memBox) Location() string { return mb.u.String() } + +func (mb *memBox) State() box.StartState { + mb.mx.RLock() + defer mb.mx.RUnlock() + if mb.zettel == nil { + return box.StartStateStopped + } + return box.StartStateStarted +} func (mb *memBox) Start(context.Context) error { mb.mx.Lock() - mb.zettel = make(map[id.Zid]domain.Zettel) + mb.zettel = make(map[id.Zid]zettel.Zettel) mb.curBytes = 0 mb.mx.Unlock() mb.log.Trace().Int("max-zettel", int64(mb.maxZettel)).Int("max-bytes", int64(mb.maxBytes)).Msg("Start Box") return nil } @@ -81,11 +89,11 @@ mb.mx.RLock() defer mb.mx.RUnlock() return len(mb.zettel) < mb.maxZettel } -func (mb *memBox) CreateZettel(_ context.Context, zettel domain.Zettel) (id.Zid, error) { +func (mb *memBox) CreateZettel(_ context.Context, zettel zettel.Zettel) (id.Zid, error) { mb.mx.Lock() newBytes := mb.curBytes + zettel.Length() if mb.maxZettel < len(mb.zettel) || mb.maxBytes < newBytes { mb.mx.Unlock() return id.Invalid, box.ErrCapacity @@ -102,36 +110,32 @@ meta.Zid = zid zettel.Meta = meta mb.zettel[zid] = zettel mb.curBytes = newBytes mb.mx.Unlock() - mb.notifyChanged(box.OnZettel, zid) + mb.notifyChanged(zid) mb.log.Trace().Zid(zid).Msg("CreateZettel") return zid, nil } -func (mb *memBox) GetZettel(_ context.Context, zid id.Zid) (domain.Zettel, error) { - mb.mx.RLock() - zettel, ok := mb.zettel[zid] - mb.mx.RUnlock() - if !ok { - return domain.Zettel{}, box.ErrNotFound - } - zettel.Meta = zettel.Meta.Clone() - mb.log.Trace().Msg("GetZettel") - return zettel, nil -} - -func (mb *memBox) GetMeta(_ context.Context, zid id.Zid) (*meta.Meta, error) { - mb.mx.RLock() - zettel, ok := mb.zettel[zid] - mb.mx.RUnlock() - if !ok { - return nil, box.ErrNotFound - } - mb.log.Trace().Msg("GetMeta") - return zettel.Meta.Clone(), nil +func (mb *memBox) GetZettel(_ context.Context, zid id.Zid) (zettel.Zettel, error) { + mb.mx.RLock() + z, ok := mb.zettel[zid] + mb.mx.RUnlock() + if !ok { + return zettel.Zettel{}, box.ErrZettelNotFound{Zid: zid} + } + z.Meta = z.Meta.Clone() + mb.log.Trace().Msg("GetZettel") + return z, nil +} + +func (mb *memBox) HasZettel(_ context.Context, zid id.Zid) bool { + mb.mx.RLock() + _, found := mb.zettel[zid] + mb.mx.RUnlock() + return found } func (mb *memBox) ApplyZid(_ context.Context, handle box.ZidFunc, constraint query.RetrievePredicate) error { mb.mx.RLock() defer mb.mx.RUnlock() @@ -156,11 +160,11 @@ } } return nil } -func (mb *memBox) CanUpdateZettel(_ context.Context, zettel domain.Zettel) bool { +func (mb *memBox) CanUpdateZettel(_ context.Context, zettel zettel.Zettel) bool { mb.mx.RLock() defer mb.mx.RUnlock() zid := zettel.Meta.Zid if !zid.IsValid() { return false @@ -171,14 +175,14 @@ newBytes -= prevZettel.Length() } return newBytes < mb.maxBytes } -func (mb *memBox) UpdateZettel(_ context.Context, zettel domain.Zettel) error { +func (mb *memBox) UpdateZettel(_ context.Context, zettel zettel.Zettel) error { m := zettel.Meta.Clone() if !m.Zid.IsValid() { - return &box.ErrInvalidID{Zid: m.Zid} + return box.ErrInvalidZid{Zid: m.Zid.String()} } mb.mx.Lock() newBytes := mb.curBytes + zettel.Length() if prevZettel, found := mb.zettel[m.Zid]; found { @@ -191,11 +195,11 @@ zettel.Meta = m mb.zettel[m.Zid] = zettel mb.curBytes = newBytes mb.mx.Unlock() - mb.notifyChanged(box.OnZettel, m.Zid) + mb.notifyChanged(m.Zid) mb.log.Trace().Msg("UpdateZettel") return nil } func (*memBox) AllowRenameZettel(context.Context, id.Zid) bool { return true } @@ -203,27 +207,27 @@ func (mb *memBox) RenameZettel(_ context.Context, curZid, newZid id.Zid) error { mb.mx.Lock() zettel, ok := mb.zettel[curZid] if !ok { mb.mx.Unlock() - return box.ErrNotFound + return box.ErrZettelNotFound{Zid: curZid} } // Check that there is no zettel with newZid if _, ok = mb.zettel[newZid]; ok { mb.mx.Unlock() - return &box.ErrInvalidID{Zid: newZid} + return box.ErrInvalidZid{Zid: newZid.String()} } meta := zettel.Meta.Clone() meta.Zid = newZid zettel.Meta = meta mb.zettel[newZid] = zettel delete(mb.zettel, curZid) mb.mx.Unlock() - mb.notifyChanged(box.OnZettel, curZid) - mb.notifyChanged(box.OnZettel, newZid) + mb.notifyChanged(curZid) + mb.notifyChanged(newZid) mb.log.Trace().Msg("RenameZettel") return nil } func (mb *memBox) CanDeleteZettel(_ context.Context, zid id.Zid) bool { @@ -236,16 +240,16 @@ func (mb *memBox) DeleteZettel(_ context.Context, zid id.Zid) error { mb.mx.Lock() oldZettel, found := mb.zettel[zid] if !found { mb.mx.Unlock() - return box.ErrNotFound + return box.ErrZettelNotFound{Zid: zid} } delete(mb.zettel, zid) mb.curBytes -= oldZettel.Length() mb.mx.Unlock() - mb.notifyChanged(box.OnZettel, zid) + mb.notifyChanged(zid) mb.log.Trace().Msg("DeleteZettel") return nil } func (mb *memBox) ReadStats(st *box.ManagedBoxStats) { Index: box/notify/directory.go ================================================================== --- box/notify/directory.go +++ box/notify/directory.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -17,68 +17,80 @@ "regexp" "strings" "sync" "zettelstore.de/z/box" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/parser" "zettelstore.de/z/query" "zettelstore.de/z/strfun" + "zettelstore.de/z/zettel/id" ) type entrySet map[id.Zid]*DirEntry -// directoryState signal the internal state of the service. +// DirServiceState signal the internal state of the service. // // The following state transitions are possible: // --newDirService--> dsCreated // dsCreated --Start--> dsStarting // dsStarting --last list notification--> dsWorking // dsWorking --directory missing--> dsMissing // dsMissing --last list notification--> dsWorking // --Stop--> dsStopping -type directoryState uint8 +type DirServiceState uint8 const ( - dsCreated directoryState = iota - dsStarting // Reading inital scan - dsWorking // Initial scan complete, fully operational - dsMissing // Directory is missing - dsStopping // Service is shut down + DsCreated DirServiceState = iota + DsStarting // Reading inital scan + DsWorking // Initial scan complete, fully operational + DsMissing // Directory is missing + DsStopping // Service is shut down ) // DirService specifies a directory service for file based zettel. type DirService struct { + box box.ManagedBox log *logger.Logger dirPath string notifier Notifier infos chan<- box.UpdateInfo mx sync.RWMutex // protects status, entries - state directoryState + state DirServiceState entries entrySet } // ErrNoDirectory signals missing directory data. var ErrNoDirectory = errors.New("unable to retrieve zettel directory information") // NewDirService creates a new directory service. -func NewDirService(log *logger.Logger, notifier Notifier, chci chan<- box.UpdateInfo) *DirService { +func NewDirService(box box.ManagedBox, log *logger.Logger, notifier Notifier, chci chan<- box.UpdateInfo) *DirService { return &DirService{ + box: box, log: log, notifier: notifier, infos: chci, - state: dsCreated, + state: DsCreated, } } + +// State the current service state. +func (ds *DirService) State() DirServiceState { + ds.mx.RLock() + state := ds.state + ds.mx.RUnlock() + return state +} // Start the directory service. func (ds *DirService) Start() { ds.mx.Lock() - ds.state = dsStarting + ds.state = DsStarting ds.mx.Unlock() - go ds.updateEvents() + var newEntries entrySet + go ds.updateEvents(newEntries) } // Refresh the directory entries. func (ds *DirService) Refresh() { ds.notifier.Refresh() @@ -85,11 +97,11 @@ } // Stop the directory service. func (ds *DirService) Stop() { ds.mx.Lock() - ds.state = dsStopping + ds.state = DsStopping ds.mx.Unlock() ds.notifier.Close() } func (ds *DirService) logMissingEntry(action string) error { @@ -177,11 +189,11 @@ defer ds.mx.Unlock() if ds.entries == nil { return DirEntry{}, ds.logMissingEntry("rename") } if _, found := ds.entries[newZid]; found { - return DirEntry{}, &box.ErrInvalidID{Zid: newZid} + return DirEntry{}, box.ErrInvalidZid{Zid: newZid.String()} } oldZid := oldEntry.Zid newEntry := DirEntry{ Zid: newZid, MetaName: renameFilename(oldEntry.MetaName, oldZid, newZid), @@ -210,71 +222,87 @@ } delete(ds.entries, zid) return nil } -func (ds *DirService) updateEvents() { - var newEntries entrySet +func (ds *DirService) updateEvents(newEntries entrySet) { + // Something may panic. Ensure a running service. + defer func() { + if ri := recover(); ri != nil { + kernel.Main.LogRecover("DirectoryService", ri) + go ds.updateEvents(newEntries) + } + }() + for ev := range ds.notifier.Events() { - ds.mx.RLock() - state := ds.state - ds.mx.RUnlock() - - if msg := ds.log.Trace(); msg.Enabled() { - msg.Uint("state", uint64(state)).Str("op", ev.Op.String()).Str("name", ev.Name).Msg("notifyEvent") - } - if state == dsStopping { + e, ok := ds.handleEvent(ev, newEntries) + if !ok { break } - - switch ev.Op { - case Error: - newEntries = nil - if state != dsMissing { - ds.log.Warn().Err(ev.Err).Msg("Notifier confused") - } - case Make: - newEntries = make(entrySet) - case List: - if ev.Name == "" { - zids := getNewZids(newEntries) - ds.mx.Lock() - fromMissing := ds.state == dsMissing - prevEntries := ds.entries - ds.entries = newEntries - ds.state = dsWorking - ds.mx.Unlock() - newEntries = nil - ds.onCreateDirectory(zids, prevEntries) - if fromMissing { - ds.log.Info().Str("path", ds.dirPath).Msg("Zettel directory found") - } - } else if newEntries != nil { - ds.onUpdateFileEvent(newEntries, ev.Name) - } - case Destroy: - newEntries = nil - ds.onDestroyDirectory() - ds.log.Error().Str("path", ds.dirPath).Msg("Zettel directory missing") - case Update: - ds.mx.Lock() - zid := ds.onUpdateFileEvent(ds.entries, ev.Name) - ds.mx.Unlock() - if zid != id.Invalid { - ds.notifyChange(box.OnZettel, zid) - } - case Delete: - ds.mx.Lock() - zid := ds.onDeleteFileEvent(ds.entries, ev.Name) - ds.mx.Unlock() - if zid != id.Invalid { - ds.notifyChange(box.OnZettel, zid) - } - default: - ds.log.Warn().Str("event", fmt.Sprintf("%v", ev)).Msg("Unknown zettel notification event") - } - } + newEntries = e + } +} +func (ds *DirService) handleEvent(ev Event, newEntries entrySet) (entrySet, bool) { + ds.mx.RLock() + state := ds.state + ds.mx.RUnlock() + + if msg := ds.log.Trace(); msg.Enabled() { + msg.Uint("state", uint64(state)).Str("op", ev.Op.String()).Str("name", ev.Name).Msg("notifyEvent") + } + if state == DsStopping { + return nil, false + } + + switch ev.Op { + case Error: + newEntries = nil + if state != DsMissing { + ds.log.Warn().Err(ev.Err).Msg("Notifier confused") + } + case Make: + newEntries = make(entrySet) + case List: + if ev.Name == "" { + zids := getNewZids(newEntries) + ds.mx.Lock() + fromMissing := ds.state == DsMissing + prevEntries := ds.entries + ds.entries = newEntries + ds.state = DsWorking + ds.mx.Unlock() + ds.onCreateDirectory(zids, prevEntries) + if fromMissing { + ds.log.Info().Str("path", ds.dirPath).Msg("Zettel directory found") + } + return nil, true + } + if newEntries != nil { + ds.onUpdateFileEvent(newEntries, ev.Name) + } + case Destroy: + ds.onDestroyDirectory() + ds.log.Error().Str("path", ds.dirPath).Msg("Zettel directory missing") + return nil, true + case Update: + ds.mx.Lock() + zid := ds.onUpdateFileEvent(ds.entries, ev.Name) + ds.mx.Unlock() + if zid != id.Invalid { + ds.notifyChange(zid) + } + case Delete: + ds.mx.Lock() + zid := ds.onDeleteFileEvent(ds.entries, ev.Name) + ds.mx.Unlock() + if zid != id.Invalid { + ds.notifyChange(zid) + } + default: + ds.log.Warn().Str("event", fmt.Sprintf("%v", ev)).Msg("Unknown zettel notification event") + } + return newEntries, true } func getNewZids(entries entrySet) id.Slice { zids := make(id.Slice, 0, len(entries)) for zid := range entries { @@ -283,29 +311,29 @@ return zids } func (ds *DirService) onCreateDirectory(zids id.Slice, prevEntries entrySet) { for _, zid := range zids { - ds.notifyChange(box.OnZettel, zid) + ds.notifyChange(zid) delete(prevEntries, zid) } // These were previously stored, by are not found now. // Notify system that these were deleted, e.g. for updating the index. for zid := range prevEntries { - ds.notifyChange(box.OnZettel, zid) + ds.notifyChange(zid) } } func (ds *DirService) onDestroyDirectory() { ds.mx.Lock() entries := ds.entries ds.entries = nil - ds.state = dsMissing + ds.state = DsMissing ds.mx.Unlock() for zid := range entries { - ds.notifyChange(box.OnZettel, zid) + ds.notifyChange(zid) } } var validFileName = regexp.MustCompile(`^(\d{14})`) @@ -550,12 +578,15 @@ if newExt == "zmk" { return true } oldInfo := parser.Get(oldExt) newInfo := parser.Get(newExt) - if oldTextParser := oldInfo.IsTextParser; oldTextParser != newInfo.IsTextParser { - return !oldTextParser + if oldASTParser := oldInfo.IsASTParser; oldASTParser != newInfo.IsASTParser { + return !oldASTParser + } + if oldTextFormat := oldInfo.IsTextFormat; oldTextFormat != newInfo.IsTextFormat { + return !oldTextFormat } if oldImageFormat := oldInfo.IsImageFormat; oldImageFormat != newInfo.IsImageFormat { return oldImageFormat } if oldPrimary := primarySyntax.Has(oldExt); oldPrimary != primarySyntax.Has(newExt) { @@ -569,11 +600,11 @@ return newLen < oldLen } return newExt < oldExt } -func (ds *DirService) notifyChange(reason box.UpdateReason, zid id.Zid) { +func (ds *DirService) notifyChange(zid id.Zid) { if chci := ds.infos; chci != nil { - ds.log.Trace().Zid(zid).Uint("reason", uint64(reason)).Msg("notifyChange") - chci <- box.UpdateInfo{Reason: reason, Zid: zid} + ds.log.Trace().Zid(zid).Msg("notifyChange") + chci <- box.UpdateInfo{Box: ds.box, Reason: box.OnZettel, Zid: zid} } } Index: box/notify/directory_test.go ================================================================== --- box/notify/directory_test.go +++ box/notify/directory_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2022 Detlef Stern +// Copyright (c) 2022-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,18 +11,18 @@ package notify import ( "testing" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" _ "zettelstore.de/z/parser/blob" // Allow to use BLOB parser. + _ "zettelstore.de/z/parser/draw" // Allow to use draw parser. _ "zettelstore.de/z/parser/markdown" // Allow to use markdown parser. _ "zettelstore.de/z/parser/none" // Allow to use none parser. - _ "zettelstore.de/z/parser/pikchr" // Allow to use pikchr parser. _ "zettelstore.de/z/parser/plain" // Allow to use plain parser. _ "zettelstore.de/z/parser/zettelmark" // Allow to use zettelmark parser. + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) func TestSeekZid(t *testing.T) { testcases := []struct { name string @@ -47,15 +47,20 @@ } func TestNewExtIsBetter(t *testing.T) { extVals := []string{ // Main Formats - api.ValueSyntaxZmk, "pikchr", "markdown", "md", + meta.SyntaxZmk, meta.SyntaxDraw, meta.SyntaxMarkdown, meta.SyntaxMD, // Other supported text formats - "css", "txt", api.ValueSyntaxHTML, api.ValueSyntaxNone, "mustache", api.ValueSyntaxText, "plain", - // Supported graphics formats - api.ValueSyntaxGif, "png", api.ValueSyntaxSVG, "jpeg", "jpg", + meta.SyntaxCSS, meta.SyntaxSxn, meta.SyntaxTxt, meta.SyntaxHTML, + meta.SyntaxText, meta.SyntaxPlain, + // Supported text graphics formats + meta.SyntaxSVG, + meta.SyntaxNone, + // Supported binary graphic formats + meta.SyntaxGif, meta.SyntaxPNG, meta.SyntaxJPEG, meta.SyntaxWebp, meta.SyntaxJPG, + // Unsupported syntax values "gz", "cpp", "tar", "cppc", } for oldI, oldExt := range extVals { for newI, newExt := range extVals { Index: box/notify/entry.go ================================================================== --- box/notify/entry.go +++ box/notify/entry.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,15 +11,15 @@ package notify import ( "path/filepath" - "zettelstore.de/c/api" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/parser" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) const ( extZettel = "zettel" // file contains metadata and content extBin = "bin" // file contains binary content @@ -46,11 +46,11 @@ func (e *DirEntry) HasMetaInContent() bool { return e.IsValid() && extIsMetaAndContent(e.ContentExt) } // SetupFromMetaContent fills entry data based on metadata and zettel content. -func (e *DirEntry) SetupFromMetaContent(m *meta.Meta, content domain.Content, getZettelFileSyntax func() []string) { +func (e *DirEntry) SetupFromMetaContent(m *meta.Meta, content zettel.Content, getZettelFileSyntax func() []string) { if e.Zid != m.Zid { panic("Zid differ") } if contentName := e.ContentName; contentName != "" { if !extIsMetaAndContent(e.ContentExt) && e.MetaName == "" { @@ -78,11 +78,11 @@ e.MetaName = e.calcBaseName(e.ContentName) } } } -func contentExtWithMeta(syntax string, content domain.Content) string { +func contentExtWithMeta(syntax string, content zettel.Content) string { p := parser.Get(syntax) if content.IsBinary() { if p.IsImageFormat { return syntax } @@ -97,11 +97,11 @@ func calcContentExt(syntax string, yamlSep bool, getZettelFileSyntax func() []string) string { if yamlSep { return extZettel } switch syntax { - case api.ValueSyntaxNone, api.ValueSyntaxZmk: + case meta.SyntaxNone, meta.SyntaxZmk: return extZettel } for _, s := range getZettelFileSyntax() { if s == syntax { return extZettel Index: box/notify/fsdir.go ================================================================== --- box/notify/fsdir.go +++ box/notify/fsdir.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -92,24 +92,25 @@ defer close(fsdn.events) defer close(fsdn.refresh) if !listDirElements(fsdn.log, fsdn.fetcher, fsdn.events, fsdn.done) { return } + for fsdn.readAndProcessEvent() { } } func (fsdn *fsdirNotifier) readAndProcessEvent() bool { select { case <-fsdn.done: - fsdn.log.Trace().Int("i", 1).Msg("done with read and process events") + fsdn.traceDone(1) return false default: } select { case <-fsdn.done: - fsdn.log.Trace().Int("i", 2).Msg("done with read and process events") + fsdn.traceDone(2) return false case <-fsdn.refresh: fsdn.log.Trace().Msg("refresh") listDirElements(fsdn.log, fsdn.fetcher, fsdn.events, fsdn.done) case err, ok := <-fsdn.base.Errors: @@ -118,11 +119,11 @@ return false } select { case fsdn.events <- Event{Op: Error, Err: err}: case <-fsdn.done: - fsdn.log.Trace().Int("i", 3).Msg("done with read and process events") + fsdn.traceDone(3) return false } case ev, ok := <-fsdn.base.Events: fsdn.log.Trace().Str("name", ev.Name).Str("op", ev.Op.String()).Bool("ok", ok).Msg("file event") if !ok { @@ -132,10 +133,14 @@ return false } } return true } + +func (fsdn *fsdirNotifier) traceDone(pos int64) { + fsdn.log.Trace().Int("i", pos).Msg("done with read and process events") +} func (fsdn *fsdirNotifier) processEvent(ev *fsnotify.Event) bool { if strings.HasPrefix(ev.Name, fsdn.path) { if len(ev.Name) == len(fsdn.path) { return fsdn.processDirEvent(ev) Index: box/notify/helper.go ================================================================== --- box/notify/helper.go +++ box/notify/helper.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- Index: box/notify/notify.go ================================================================== --- box/notify/notify.go +++ box/notify/notify.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -33,19 +33,19 @@ // Error signals a detected error. Details are in Event.Err. // // Make signals that the container is detected. List events will follow. // // List signals a found file, if Event.Name is not empty. Otherwise it signals -// the end of files within the container. +// the end of files within the container. // // Destroy signals that the container is not there any more. It might me Make later again. // -// Update signals that file Event.Name was created/updated. File name is relative -// to the container. +// Update signals that file Event.Name was created/updated. +// File name is relative to the container. // -// Delete signals that file Event.Name was removed. File name is relative to -// the container's name. +// Delete signals that file Event.Name was removed. +// File name is relative to the container's name. const ( _ EventOp = iota Error // Error while operating Make // Make container List // List container Index: box/notify/simpledir.go ================================================================== --- box/notify/simpledir.go +++ box/notify/simpledir.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -42,20 +42,20 @@ return sdn, nil } // NewSimpleZipNotifier creates a zip-file based notifier that will not receive // any notifications from the operating system. -func NewSimpleZipNotifier(log *logger.Logger, zipPath string) (Notifier, error) { +func NewSimpleZipNotifier(log *logger.Logger, zipPath string) Notifier { sdn := &simpleDirNotifier{ log: log, events: make(chan Event), done: make(chan struct{}), refresh: make(chan struct{}), fetcher: newZipPathFetcher(zipPath), } go sdn.eventLoop() - return sdn, nil + return sdn } func (sdn *simpleDirNotifier) Events() <-chan Event { return sdn.events } Index: cmd/cmd_file.go ================================================================== --- cmd/cmd_file.go +++ cmd/cmd_file.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -15,17 +15,17 @@ "flag" "fmt" "io" "os" - "zettelstore.de/c/api" - "zettelstore.de/z/domain" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/encoder" "zettelstore.de/z/input" "zettelstore.de/z/parser" + "zettelstore.de/z/zettel" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) // ---------- Subcommand: file ----------------------------------------------- func cmdFile(fs *flag.FlagSet) (int, error) { @@ -34,15 +34,15 @@ if m == nil { return 2, err } z := parser.ParseZettel( context.Background(), - domain.Zettel{ + zettel.Zettel{ Meta: m, - Content: domain.NewContent(inp.Src[inp.Pos:]), + Content: zettel.NewContent(inp.Src[inp.Pos:]), }, - m.GetDefault(api.KeySyntax, api.ValueSyntaxZmk), + m.GetDefault(api.KeySyntax, meta.SyntaxZmk), nil, ) encdr := encoder.Create(api.Encoder(enc)) if encdr == nil { fmt.Fprintf(os.Stderr, "Unknown format %q\n", enc) Index: cmd/cmd_password.go ================================================================== --- cmd/cmd_password.go +++ cmd/cmd_password.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- @@ -15,13 +15,13 @@ "fmt" "os" "golang.org/x/term" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/auth/cred" - "zettelstore.de/z/domain/id" + "zettelstore.de/z/zettel/id" ) // ---------- Subcommand: password ------------------------------------------- func cmdPassword(fs *flag.FlagSet) (int, error) { Index: cmd/cmd_run.go ================================================================== --- cmd/cmd_run.go +++ cmd/cmd_run.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -16,16 +16,16 @@ "net/http" "zettelstore.de/z/auth" "zettelstore.de/z/box" "zettelstore.de/z/config" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/kernel" "zettelstore.de/z/usecase" "zettelstore.de/z/web/adapter/api" "zettelstore.de/z/web/adapter/webui" "zettelstore.de/z/web/server" + "zettelstore.de/z/zettel/meta" ) // ---------- Subcommand: run ------------------------------------------------ func flgRun(fs *flag.FlagSet) { @@ -50,95 +50,78 @@ func setupRouting(webSrv server.Server, boxManager box.Manager, authManager auth.Manager, rtConfig config.Config) { protectedBoxManager, authPolicy := authManager.BoxWithPolicy(boxManager, rtConfig) kern := kernel.Main webLog := kern.GetLogger(kernel.WebService) + + var getUser getUserImpl + logAuth := kern.GetLogger(kernel.AuthService) + logUc := kern.GetLogger(kernel.CoreService).WithUser(&getUser) + ucGetUser := usecase.NewGetUser(authManager, boxManager) + ucAuthenticate := usecase.NewAuthenticate(logAuth, authManager, &ucGetUser) + ucIsAuth := usecase.NewIsAuthenticated(logUc, &getUser, authManager) + ucCreateZettel := usecase.NewCreateZettel(logUc, rtConfig, protectedBoxManager) + ucGetAllZettel := usecase.NewGetAllZettel(protectedBoxManager) + ucGetZettel := usecase.NewGetZettel(protectedBoxManager) + ucParseZettel := usecase.NewParseZettel(rtConfig, ucGetZettel) + ucQuery := usecase.NewQuery(protectedBoxManager) + ucEvaluate := usecase.NewEvaluate(rtConfig, &ucGetZettel, &ucQuery) + ucQuery.SetEvaluate(&ucEvaluate) + ucListSyntax := usecase.NewListSyntax(protectedBoxManager) + ucListRoles := usecase.NewListRoles(protectedBoxManager) + ucDelete := usecase.NewDeleteZettel(logUc, protectedBoxManager) + ucUpdate := usecase.NewUpdateZettel(logUc, protectedBoxManager) + ucRename := usecase.NewRenameZettel(logUc, protectedBoxManager) + ucRefresh := usecase.NewRefresh(logUc, protectedBoxManager) + ucVersion := usecase.NewVersion(kernel.Main.GetConfig(kernel.CoreService, kernel.CoreVersion).(string)) + a := api.New( webLog.Clone().Str("adapter", "api").Child(), webSrv, authManager, authManager, rtConfig, authPolicy) wui := webui.New( webLog.Clone().Str("adapter", "wui").Child(), - webSrv, authManager, rtConfig, authManager, boxManager, authPolicy) - - var getUser getUserImpl - logAuth := kern.GetLogger(kernel.AuthService) - logUc := kern.GetLogger(kernel.CoreService).WithUser(&getUser) - ucAuthenticate := usecase.NewAuthenticate(logAuth, authManager, authManager, boxManager) - ucIsAuth := usecase.NewIsAuthenticated(logUc, &getUser, authManager) - ucCreateZettel := usecase.NewCreateZettel(logUc, rtConfig, protectedBoxManager) - ucGetMeta := usecase.NewGetMeta(protectedBoxManager) - ucGetAllMeta := usecase.NewGetAllMeta(protectedBoxManager) - ucGetZettel := usecase.NewGetZettel(protectedBoxManager) - ucParseZettel := usecase.NewParseZettel(rtConfig, ucGetZettel) - ucListMeta := usecase.NewListMeta(protectedBoxManager) - ucEvaluate := usecase.NewEvaluate(rtConfig, ucGetZettel, ucGetMeta, ucListMeta) - ucListSyntax := usecase.NewListSyntax(protectedBoxManager) - ucListRoles := usecase.NewListRoles(protectedBoxManager) - ucZettelContext := usecase.NewZettelContext(protectedBoxManager, rtConfig) - ucDelete := usecase.NewDeleteZettel(logUc, protectedBoxManager) - ucUpdate := usecase.NewUpdateZettel(logUc, protectedBoxManager) - ucRename := usecase.NewRenameZettel(logUc, protectedBoxManager) - ucUnlinkedRefs := usecase.NewUnlinkedReferences(protectedBoxManager, rtConfig) - ucRefresh := usecase.NewRefresh(logUc, protectedBoxManager) - ucVersion := usecase.NewVersion(kernel.Main.GetConfig(kernel.CoreService, kernel.CoreVersion).(string)) + webSrv, authManager, rtConfig, authManager, boxManager, authPolicy, &ucEvaluate) webSrv.Handle("/", wui.MakeGetRootHandler(protectedBoxManager)) if assetDir := kern.GetConfig(kernel.WebService, kernel.WebAssetDir).(string); assetDir != "" { const assetPrefix = "/assets/" webSrv.Handle(assetPrefix, http.StripPrefix(assetPrefix, http.FileServer(http.Dir(assetDir)))) + webSrv.Handle("/favicon.ico", wui.MakeFaviconHandler(assetDir)) } // Web user interface if !authManager.IsReadonly() { - webSrv.AddZettelRoute('b', server.MethodGet, wui.MakeGetRenameZettelHandler( - ucGetMeta, &ucEvaluate)) + webSrv.AddZettelRoute('b', server.MethodGet, wui.MakeGetRenameZettelHandler(ucGetZettel)) webSrv.AddZettelRoute('b', server.MethodPost, wui.MakePostRenameZettelHandler(&ucRename)) + webSrv.AddListRoute('c', server.MethodGet, wui.MakeGetZettelFromListHandler(&ucQuery, &ucEvaluate, ucListRoles, ucListSyntax)) + webSrv.AddListRoute('c', server.MethodPost, wui.MakePostCreateZettelHandler(&ucCreateZettel)) webSrv.AddZettelRoute('c', server.MethodGet, wui.MakeGetCreateZettelHandler( ucGetZettel, &ucCreateZettel, ucListRoles, ucListSyntax)) webSrv.AddZettelRoute('c', server.MethodPost, wui.MakePostCreateZettelHandler(&ucCreateZettel)) - webSrv.AddZettelRoute('d', server.MethodGet, wui.MakeGetDeleteZettelHandler( - ucGetMeta, ucGetAllMeta, &ucEvaluate)) + webSrv.AddZettelRoute('d', server.MethodGet, wui.MakeGetDeleteZettelHandler(ucGetZettel, ucGetAllZettel)) webSrv.AddZettelRoute('d', server.MethodPost, wui.MakePostDeleteZettelHandler(&ucDelete)) webSrv.AddZettelRoute('e', server.MethodGet, wui.MakeEditGetZettelHandler(ucGetZettel, ucListRoles, ucListSyntax)) webSrv.AddZettelRoute('e', server.MethodPost, wui.MakeEditSetZettelHandler(&ucUpdate)) } webSrv.AddListRoute('g', server.MethodGet, wui.MakeGetGoActionHandler(&ucRefresh)) - webSrv.AddListRoute('h', server.MethodGet, wui.MakeListHTMLMetaHandler(ucListMeta, &ucEvaluate)) - webSrv.AddZettelRoute('h', server.MethodGet, wui.MakeGetHTMLZettelHandler( - &ucEvaluate, ucGetMeta)) + webSrv.AddListRoute('h', server.MethodGet, wui.MakeListHTMLMetaHandler(&ucQuery)) + webSrv.AddZettelRoute('h', server.MethodGet, wui.MakeGetHTMLZettelHandler(&ucEvaluate, ucGetZettel)) webSrv.AddListRoute('i', server.MethodGet, wui.MakeGetLoginOutHandler()) webSrv.AddListRoute('i', server.MethodPost, wui.MakePostLoginHandler(&ucAuthenticate)) webSrv.AddZettelRoute('i', server.MethodGet, wui.MakeGetInfoHandler( - ucParseZettel, &ucEvaluate, ucGetMeta, ucGetAllMeta, ucUnlinkedRefs)) - webSrv.AddZettelRoute('k', server.MethodGet, wui.MakeZettelContextHandler( - ucZettelContext, &ucEvaluate)) + ucParseZettel, &ucEvaluate, ucGetZettel, ucGetAllZettel, &ucQuery)) // API webSrv.AddListRoute('a', server.MethodPost, a.MakePostLoginHandler(&ucAuthenticate)) webSrv.AddListRoute('a', server.MethodPut, a.MakeRenewAuthHandler()) - webSrv.AddListRoute('j', server.MethodGet, a.MakeQueryHandler(ucListMeta)) - webSrv.AddZettelRoute('j', server.MethodGet, a.MakeGetZettelHandler(ucGetZettel)) - webSrv.AddZettelRoute('m', server.MethodGet, a.MakeGetMetaHandler(ucGetMeta)) - webSrv.AddZettelRoute('o', server.MethodGet, a.MakeGetOrderHandler( - usecase.NewZettelOrder(protectedBoxManager, ucEvaluate))) - webSrv.AddZettelRoute('p', server.MethodGet, a.MakeGetParsedZettelHandler(ucParseZettel)) - webSrv.AddListRoute('q', server.MethodGet, a.MakeQueryHandler(ucListMeta)) - webSrv.AddZettelRoute('u', server.MethodGet, a.MakeListUnlinkedMetaHandler( - ucGetMeta, ucUnlinkedRefs, &ucEvaluate)) - webSrv.AddZettelRoute('v', server.MethodGet, a.MakeGetEvalZettelHandler(ucEvaluate)) webSrv.AddListRoute('x', server.MethodGet, a.MakeGetDataHandler(ucVersion)) webSrv.AddListRoute('x', server.MethodPost, a.MakePostCommandHandler(&ucIsAuth, &ucRefresh)) - webSrv.AddZettelRoute('x', server.MethodGet, a.MakeZettelContextHandler(ucZettelContext)) - webSrv.AddListRoute('z', server.MethodGet, a.MakeListPlainHandler(ucListMeta)) - webSrv.AddZettelRoute('z', server.MethodGet, a.MakeGetPlainZettelHandler(ucGetZettel)) + webSrv.AddListRoute('z', server.MethodGet, a.MakeQueryHandler(&ucQuery)) + webSrv.AddZettelRoute('z', server.MethodGet, a.MakeGetZettelHandler(ucGetZettel, ucParseZettel, ucEvaluate)) if !authManager.IsReadonly() { - webSrv.AddListRoute('j', server.MethodPost, a.MakePostCreateZettelHandler(&ucCreateZettel)) - webSrv.AddZettelRoute('j', server.MethodPut, a.MakeUpdateZettelHandler(&ucUpdate)) - webSrv.AddZettelRoute('j', server.MethodDelete, a.MakeDeleteZettelHandler(&ucDelete)) - webSrv.AddZettelRoute('j', server.MethodMove, a.MakeRenameZettelHandler(&ucRename)) - webSrv.AddListRoute('z', server.MethodPost, a.MakePostCreatePlainZettelHandler(&ucCreateZettel)) - webSrv.AddZettelRoute('z', server.MethodPut, a.MakeUpdatePlainZettelHandler(&ucUpdate)) + webSrv.AddListRoute('z', server.MethodPost, a.MakePostCreateZettelHandler(&ucCreateZettel)) + webSrv.AddZettelRoute('z', server.MethodPut, a.MakeUpdateZettelHandler(&ucUpdate)) webSrv.AddZettelRoute('z', server.MethodDelete, a.MakeDeleteZettelHandler(&ucDelete)) webSrv.AddZettelRoute('z', server.MethodMove, a.MakeRenameZettelHandler(&ucRename)) } if authManager.WithAuth() { Index: cmd/command.go ================================================================== --- cmd/command.go +++ cmd/command.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,11 +11,11 @@ package cmd import ( "flag" - "zettelstore.de/c/maps" + "zettelstore.de/client.fossil/maps" "zettelstore.de/z/logger" ) // Command stores information about commands / sub-commands. type Command struct { @@ -46,11 +46,11 @@ } if _, ok := commands[cmd.Name]; ok { panic("Command already registered: " + cmd.Name) } cmd.flags = flag.NewFlagSet(cmd.Name, flag.ExitOnError) - cmd.flags.String("l", logger.InfoLevel.String(), "global log level") + cmd.flags.String("l", logger.InfoLevel.String(), "log level specification") if cmd.SetFlags != nil { cmd.SetFlags(cmd.flags) } commands[cmd.Name] = cmd Index: cmd/main.go ================================================================== --- cmd/main.go +++ cmd/main.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -20,23 +20,23 @@ "runtime/debug" "strconv" "strings" "time" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/auth" "zettelstore.de/z/auth/impl" "zettelstore.de/z/box" "zettelstore.de/z/box/compbox" "zettelstore.de/z/box/manager" "zettelstore.de/z/config" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/input" "zettelstore.de/z/kernel" "zettelstore.de/z/logger" "zettelstore.de/z/web/server" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" ) const strRunSimple = "run-simple" func init() { @@ -86,19 +86,19 @@ Name: "password", Func: cmdPassword, }) } -func fetchStartupConfiguration(fs *flag.FlagSet) (cfg *meta.Meta) { +func fetchStartupConfiguration(fs *flag.FlagSet) (string, *meta.Meta) { if configFlag := fs.Lookup("c"); configFlag != nil { if filename := configFlag.Value.String(); filename != "" { content, err := readConfiguration(filename) - return createConfiguration(content, err) + return filename, createConfiguration(content, err) } } - content, err := searchAndReadConfiguration() - return createConfiguration(content, err) + filename, content, err := searchAndReadConfiguration() + return filename, createConfiguration(content, err) } func createConfiguration(content []byte, err error) *meta.Meta { if err != nil { return meta.New(id.Invalid) @@ -106,21 +106,21 @@ return meta.NewFromInput(id.Invalid, input.NewInput(content)) } func readConfiguration(filename string) ([]byte, error) { return os.ReadFile(filename) } -func searchAndReadConfiguration() ([]byte, error) { - for _, filename := range []string{"zettelstore.cfg", "zsconfig.txt", "zscfg.txt", "_zscfg"} { +func searchAndReadConfiguration() (string, []byte, error) { + for _, filename := range []string{"zettelstore.cfg", "zsconfig.txt", "zscfg.txt", "_zscfg", ".zscfg"} { if content, err := readConfiguration(filename); err == nil { - return content, nil + return filename, content, nil } } - return readConfiguration(".zscfg") + return "", nil, os.ErrNotExist } -func getConfig(fs *flag.FlagSet) *meta.Meta { - cfg := fetchStartupConfiguration(fs) +func getConfig(fs *flag.FlagSet) (string, *meta.Meta) { + filename, cfg := fetchStartupConfiguration(fs) fs.Visit(func(flg *flag.Flag) { switch flg.Name { case "p": cfg.Set(keyListenAddr, net.JoinHostPort("127.0.0.1", flg.Value.String())) case "a": @@ -142,11 +142,11 @@ cfg.Set(keyReadOnly, flg.Value.String()) case "v": cfg.Set(keyVerbose, flg.Value.String()) } }) - return cfg + return filename, cfg } func deleteConfiguredBoxes(cfg *meta.Meta) { for _, p := range cfg.PairsRest() { if key := p.Key; strings.HasPrefix(key, kernel.BoxURIs) { @@ -177,16 +177,14 @@ ) func setServiceConfig(cfg *meta.Meta) bool { debugMode := cfg.GetBool(keyDebug) if debugMode && kernel.Main.GetKernelLogger().Level() > logger.DebugLevel { - kernel.Main.SetGlobalLogLevel(logger.DebugLevel) + kernel.Main.SetLogLevel(logger.DebugLevel.String()) } - if strLevel, found := cfg.Get(keyLogLevel); found { - if level := logger.ParseLevel(strLevel); level.IsValid() { - kernel.Main.SetGlobalLogLevel(level) - } + if logLevel, found := cfg.Get(keyLogLevel); found { + kernel.Main.SetLogLevel(logLevel) } err := setConfigValue(nil, kernel.CoreService, kernel.CoreDebug, debugMode) err = setConfigValue(err, kernel.CoreService, kernel.CoreVerbose, cfg.GetBool(keyVerbose)) if val, found := cfg.Get(keyAdminPort); found { err = setConfigValue(err, kernel.CoreService, kernel.CorePort, val) @@ -251,11 +249,11 @@ fs := command.GetFlags() if err := fs.Parse(args); err != nil { fmt.Fprintf(os.Stderr, "%s: unable to parse flags: %v %v\n", name, args, err) return 1 } - cfg := getConfig(fs) + filename, cfg := getConfig(fs) if !setServiceConfig(cfg) { fs.Usage() return 2 } @@ -290,11 +288,11 @@ ) if command.Simple { kern.SetConfig(kernel.ConfigService, kernel.ConfigSimpleMode, "true") } - kern.Start(command.Header, command.LineServer) + kern.Start(command.Header, command.LineServer, filename) exitCode, err := command.Func(fs) if err != nil { fmt.Fprintf(os.Stderr, "%s: %v\n", name, err) } kern.Shutdown(true) @@ -302,11 +300,11 @@ } // runSimple is called, when the user just starts the software via a double click // or via a simple call “./zettelstore“ on the command line. func runSimple() int { - if _, err := searchAndReadConfiguration(); err == nil { + if _, _, err := searchAndReadConfiguration(); err == nil { return executeCommand(strRunSimple) } dir := "./zettel" if err := os.MkdirAll(dir, 0750); err != nil { fmt.Fprintf(os.Stderr, "Unable to create zettel directory %q (%s)\n", dir, err) Index: cmd/register.go ================================================================== --- cmd/register.go +++ cmd/register.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -17,17 +17,18 @@ _ "zettelstore.de/z/box/constbox" // Allow to use global internal box. _ "zettelstore.de/z/box/dirbox" // Allow to use directory box. _ "zettelstore.de/z/box/filebox" // Allow to use file box. _ "zettelstore.de/z/box/membox" // Allow to use in-memory box. _ "zettelstore.de/z/encoder/htmlenc" // Allow to use HTML encoder. - _ "zettelstore.de/z/encoder/sexprenc" // Allow to use sexpr encoder. + _ "zettelstore.de/z/encoder/mdenc" // Allow to use markdown encoder. + _ "zettelstore.de/z/encoder/shtmlenc" // Allow to use SHTML encoder. + _ "zettelstore.de/z/encoder/szenc" // Allow to use Sz encoder. _ "zettelstore.de/z/encoder/textenc" // Allow to use text encoder. - _ "zettelstore.de/z/encoder/zjsonenc" // Allow to use ZJSON encoder. _ "zettelstore.de/z/encoder/zmkenc" // Allow to use zmk encoder. _ "zettelstore.de/z/kernel/impl" // Allow kernel implementation to create itself _ "zettelstore.de/z/parser/blob" // Allow to use BLOB parser. + _ "zettelstore.de/z/parser/draw" // Allow to use draw parser. _ "zettelstore.de/z/parser/markdown" // Allow to use markdown parser. _ "zettelstore.de/z/parser/none" // Allow to use none parser. - _ "zettelstore.de/z/parser/pikchr" // Allow to use PIC/Pikchr parser. _ "zettelstore.de/z/parser/plain" // Allow to use plain parser. _ "zettelstore.de/z/parser/zettelmark" // Allow to use zettelmark parser. ) Index: cmd/zettelstore/main.go ================================================================== --- cmd/zettelstore/main.go +++ cmd/zettelstore/main.go @@ -1,9 +1,9 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // -// This file is part of zettelstore. +// This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations // under this license. //----------------------------------------------------------------------------- Index: collect/collect.go ================================================================== --- collect/collect.go +++ collect/collect.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations Index: collect/collect_test.go ================================================================== --- collect/collect_test.go +++ collect/collect_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations Index: collect/order.go ================================================================== --- collect/order.go +++ collect/order.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations Index: collect/split.go ================================================================== --- collect/split.go +++ collect/split.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations Index: config/config.go ================================================================== --- config/config.go +++ config/config.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -12,20 +12,18 @@ package config import ( "context" - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/meta" ) // Key values that are supported by Config.Get const ( - KeyFooterHTML = "footer-html" + KeyFooterZettel = "footer-zettel" + KeyHomeZettel = "home-zettel" // api.KeyLang - KeyMarkerExternal = "marker-external" ) // Config allows to retrieve all defined configuration values that can be changed during runtime. type Config interface { AuthConfig @@ -38,13 +36,10 @@ AddDefaultValues(context.Context, *meta.Meta) *meta.Meta // GetSiteName returns the current value of the "site-name" key. GetSiteName() string - // GetHomeZettel returns the value of the "home-zettel" key. - GetHomeZettel() id.Zid - // GetHTMLInsecurity returns the current GetHTMLInsecurity() HTMLInsecurity // GetMaxTransclusions returns the maximum number of indirect transclusions. GetMaxTransclusions() int @@ -94,13 +89,14 @@ // AllowHTML returns true, if the given HTML insecurity level matches the given syntax value. func (hi HTMLInsecurity) AllowHTML(syntax string) bool { switch hi { case SyntaxHTML: - return syntax == api.ValueSyntaxHTML + return syntax == meta.SyntaxHTML case MarkdownHTML: - return syntax == api.ValueSyntaxHTML || syntax == "markdown" || syntax == "md" + return syntax == meta.SyntaxHTML || syntax == meta.SyntaxMarkdown || syntax == meta.SyntaxMD case ZettelmarkupHTML: - return syntax == api.ValueSyntaxZmk || syntax == api.ValueSyntaxHTML || syntax == "markdown" || syntax == "md" + return syntax == meta.SyntaxZmk || syntax == meta.SyntaxHTML || + syntax == meta.SyntaxMarkdown || syntax == meta.SyntaxMD } return false } Index: docs/development/00010000000000.zettel ================================================================== --- docs/development/00010000000000.zettel +++ docs/development/00010000000000.zettel @@ -1,8 +1,10 @@ id: 00010000000000 title: Developments Notes role: zettel syntax: zmk -modified: 20210916194954 +created: 00010101000000 +modified: 20221026184905 * [[Required Software|20210916193200]] +* [[Fuzzing tests|20221026184300]] * [[Checklist for Release|20210916194900]] Index: docs/development/20210916193200.zettel ================================================================== --- docs/development/20210916193200.zettel +++ docs/development/20210916193200.zettel @@ -1,19 +1,28 @@ id: 20210916193200 title: Required Software role: zettel syntax: zmk -modified: 20211213190428 +created: 20210916193200 +modified: 20230405150541 The following software must be installed: -* A current, supported [[release of Go|https://golang.org/doc/devel/release.html]], -* [[shadow|https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/shadow]] via ``go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest``, -* [[staticcheck|https://staticcheck.io/]] via ``go install honnef.co/go/tools/cmd/staticcheck@latest``, -* [[unparam|https://mvdan.cc/unparam]][^[[GitHub|https://github.com/mvdan/unparam]]] via ``go install mvdan.cc/unparam@latest`` +* A current, supported [[release of Go|https://go.dev/doc/devel/release]], +* [[Fossil|https://fossil-scm.org/]], +* [[Git|https://git-scm.org/]] (most dependencies are accessible via Git only). Make sure that the software is in your path, e.g. via: - ```sh export PATH=$PATH:/usr/local/go/bin export PATH=$PATH:$(go env GOPATH)/bin ``` + +The internal build tool need the following software. +It can be installed / updated via the build tool itself: ``go run tools/build.go tools``. + +Otherwise you can install the software by hand: + +* [[shadow|https://pkg.go.dev/golang.org/x/tools/go/analysis/passes/shadow]] via ``go install golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow@latest``, +* [[staticcheck|https://staticcheck.io/]] via ``go install honnef.co/go/tools/cmd/staticcheck@latest``, +* [[unparam|https://mvdan.cc/unparam]][^[[GitHub|https://github.com/mvdan/unparam]]] via ``go install mvdan.cc/unparam@latest``, +* [[govulncheck|https://golang.org/x/vuln/cmd/govulncheck]] via ``go install golang.org/x/vuln/cmd/govulncheck@latest``, Index: docs/development/20210916194900.zettel ================================================================== --- docs/development/20210916194900.zettel +++ docs/development/20210916194900.zettel @@ -1,10 +1,11 @@ id: 20210916194900 title: Checklist for Release role: zettel syntax: zmk -modified: 20220309105459 +created: 20210916194900 +modified: 20230402181229 # Sync with the official repository #* ``fossil sync -u`` # Make sure that there is no workspace defined. #* ``ls ..`` must not have a file ''go.work'', in no parent folder. @@ -47,12 +48,12 @@ # Create the release: #* ``go run tools/build.go release`` (alternatively: ``make release``). # Remove previous executables: #* ``fossil uv remove --glob '*-PREVVERSION*'`` # Add executables for release: -#* ``cd release`` +#* ``cd releases`` #* ``fossil uv add *.zip`` #* ``cd ..`` #* Synchronize with main repository: #* ``fossil sync -u`` # Enable autosync: #* ``fossil setting autosync on`` ADDED docs/development/20221026184300.zettel Index: docs/development/20221026184300.zettel ================================================================== --- docs/development/20221026184300.zettel +++ docs/development/20221026184300.zettel @@ -0,0 +1,14 @@ +id: 20221026184300 +title: Fuzzing Tests +role: zettel +syntax: zmk +created: 20221026184320 +modified: 20221102140156 + +The source code contains some simple [[fuzzing tests|https://go.dev/security/fuzz/]]. +You should call them regularly to make sure that the software will cope with unusual input. + +```sh +go test -fuzz=FuzzParseBlocks zettelstore.de/z/parser/draw +go test -fuzz=FuzzParseBlocks zettelstore.de/z/parser/zettelmark +``` Index: docs/manual/00000000000100.zettel ================================================================== --- docs/manual/00000000000100.zettel +++ docs/manual/00000000000100.zettel @@ -1,13 +1,14 @@ id: 00000000000100 title: Zettelstore Runtime Configuration role: configuration syntax: none -default-copyright: (c) 2020-2022 by Detlef Stern +created: 00010101000000 +default-copyright: (c) 2020-present by Detlef Stern default-license: EUPL-1.2-or-later default-visibility: public -footer-html:

Imprint / Privacy

+footer-zettel: 00001000000100 home-zettel: 00001000000000 -modified: 20220215171041 +modified: 20221205173642 site-name: Zettelstore Manual visibility: owner ADDED docs/manual/00001000000100.zettel Index: docs/manual/00001000000100.zettel ================================================================== --- docs/manual/00001000000100.zettel +++ docs/manual/00001000000100.zettel @@ -0,0 +1,8 @@ +id: 00001000000100 +title: Footer Zettel +role: configuration +syntax: zmk +created: 20221205173520 +modified: 20221207175927 + +[[Imprint / Privacy|/home/doc/trunk/www/impri.wiki]] Index: docs/manual/00001002000000.zettel ================================================================== --- docs/manual/00001002000000.zettel +++ docs/manual/00001002000000.zettel @@ -2,17 +2,21 @@ title: Design goals for the Zettelstore role: manual tags: #design #goal #manual #zettelstore syntax: zmk created: 20210126175322 -modified: 20221018105415 +modified: 20230624171152 Zettelstore supports the following design goals: ; Longevity of stored notes / zettel : Every zettel you create should be readable without the help of any tool, even without Zettelstore. : It should be not hard to write other software that works with your zettel. +: Normal zettel should be stored in a single file. + If this is not possible: at most in two files: one for the metadata, one for the content. + The only exception are [[predefined zettel|00001005090000]] stored in the Zettelstore executable. +: There is no additional database. ; Single user : All zettel belong to you, only to you. Zettelstore provides its services only to one person: you. If the computer running Zettelstore is securely configured, there should be no risk that others are able to read or update your zettel. : If you want, you can customize Zettelstore in a way that some specific or all persons are able to read some of your zettel. @@ -33,5 +37,7 @@ : External software can be written to deeply analyze your zettel and the structures they form. ; Security by default : Without any customization, Zettelstore provides its services in a safe and secure manner and does not expose you (or other users) to security risks. : If you know what use are doing, Zettelstore allows you to relax some security-related preferences. However, even in this case, the more secure way is chosen. +: The Zettelstore software uses a minimal design and uses other software dependencies only is essential needed. +: There will be no plugin mechanism, which allows external software to control the inner workings of the Zettelstore software. Index: docs/manual/00001004010000.zettel ================================================================== --- docs/manual/00001004010000.zettel +++ docs/manual/00001004010000.zettel @@ -2,11 +2,11 @@ title: Zettelstore startup configuration role: manual tags: #configuration #manual #zettelstore syntax: zmk created: 20210126175322 -modified: 20221018184208 +modified: 20221128155143 The configuration file, as specified by the ''-c CONFIGFILE'' [[command line option|00001004051000]], allows you to specify some startup options. These options cannot be stored in a [[configuration zettel|00001004020000]] because either they are needed before Zettelstore can start or because of security reasons. For example, Zettelstore need to know in advance, on which network address is must listen or where zettel are stored. An attacker that is able to change the owner can do anything. @@ -82,14 +82,19 @@ : Configures the network address, where the Zettelstore service is listening for requests. Syntax is: ''[NETWORKIP]:PORT'', where ''NETWORKIP'' is the IP-address of the networking interface (or something like ""0.0.0.0"" if you want to listen on all network interfaces, and ''PORT'' is the TCP port. Default value: ""127.0.0.1:23123"" ; [!log-level|''log-level''] -: Specify the global [[logging level|00001004059700]] for the whole application, overwriting the level ""debug"" set by configuration [[''debug-mode''|#debug-mode]]. +: Specify the [[logging level|00001004059700]] for the whole application or for a given (internal) service, overwriting the level ""debug"" set by configuration [[''debug-mode''|#debug-mode]]. Can be changed at runtime, even for specific internal services, with the ''log-level'' command of the [[administrator console|00001004101000#log-level]]. - + + Several specifications are separated by the semicolon character (""'';''"", U+003B). + Each specification consists of an optional service name, together with the colon character (""'':''"", U+003A), followed by the logging level. + Default: ""info"". + + Examples: ""sense"" will produce sensing messages (e.g. a little more than ""info""); ""sense;web:debug"" will emit debugging messages for the web component of Zettelstore while still producing sensing messages for all other components. When you are familiar to operate the Zettelstore, you might set the level to ""warn"" or ""error"" to receive less noisy messages from the Zettelstore. ; [!max-request-size|''max-request-size''] : Limits the maximum byte size of a web request body to prevent clients from accidentally or maliciously sending a large request and wasting server resources. The minimum value is 1024. Index: docs/manual/00001004020000.zettel ================================================================== --- docs/manual/00001004020000.zettel +++ docs/manual/00001004020000.zettel @@ -2,15 +2,17 @@ title: Configure the running Zettelstore role: manual tags: #configuration #manual #zettelstore syntax: zmk created: 20210126175322 -modified: 20220827180953 +modified: 20230807171016 You can configure a running Zettelstore by modifying the special zettel with the ID [[00000000000100]]. This zettel is called __configuration zettel__. -The following metadata keys change the appearance / behavior of Zettelstore: +The following metadata keys change the appearance / behavior of Zettelstore. +Some of them can be overwritten in an [[user zettel|00001010040200]], a subset of those may be overwritten in zettel that is currently used. +See the full list of [[metadata that may be overwritten|00001004020200]]. ; [!default-copyright|''default-copyright''] : Copyright value to be used when rendering content. Can be overwritten in a zettel with [[meta key|00001006020000]] ''copyright''. @@ -24,21 +26,24 @@ Default: ""login"". ; [!expert-mode|''expert-mode''] : If set to a [[boolean true value|00001006030500]], all zettel with [[visibility ""expert""|00001010070200]] will be shown (to the owner, if [[authentication is enabled|00001010040100]]; to all, otherwise). This affects most computed zettel. Default: ""False"". -; [!footer-html|''footer-html''] -: Contains some HTML code that will be included into the footer of each Zettelstore web page. - It only affects the [[web user interface|00001014000000]]. - Zettel content, delivered via the [[API|00001012000000]] as JSON, etc. is not affected. - Default: (the empty string). +; [!footer-zettel|''footer-zettel''] +: Identifier of a zettel that is rendered as HTML and will be placed as the footer of every zettel in the [[web user interface|00001014000000]]. + Zettel content, delivered via the [[API|00001012000000]] as symbolic expressions, etc. is not affected. + If the zettel identifier is invalid or references a zettel that could not be read (possibly because of a limited [[visibility setting|00001010070200]]), nothing is written as the footer. + + May be [[overwritten|00001004020200]] in a user zettel. + + Default: (an invalid zettel identifier) ; [!home-zettel|''home-zettel''] : Specifies the identifier of the zettel, that should be presented for the default view / home view. If not given or if the identifier does not identify a zettel, the zettel with the identifier ''00010000000000'' is shown. -; [!marker-external|''marker-external''] -: Some HTML code that is displayed after a [[reference to external material|00001007040310]]. - Default: ""&\#10138;"", to display a ""➚"" sign. + + May be [[overwritten|00001004020200]] in a user zettel. + ; [!lang|''lang''] : Language to be used when displaying content. Default: ""en"". ADDED docs/manual/00001004020200.zettel Index: docs/manual/00001004020200.zettel ================================================================== --- docs/manual/00001004020200.zettel +++ docs/manual/00001004020200.zettel @@ -0,0 +1,18 @@ +id: 00001004020200 +title: Runtime configuration data that may be user specific or zettel specific +role: manual +tags: #configuration #manual #zettelstore +syntax: zmk +created: 20221205155521 +modified: 20230317183403 + +Some metadata of the [[runtime configuration|00001004020000]] may be overwritten in an [[user zettel|00001010040200]]. +A subset of those may be overwritten in zettel that is currently used. +This allows to specify user specific or zettel specific behavior. + +The following metadata keys are supported to provide a more specific behavior: + +|=Key|User:|Zettel:|Remarks +|[[''footer-zettel''|00001004020000#footer-zettel]]|Y|N| +|[[''home-zettel''|00001004020000#home-zettel]]|Y|N| +|[[''lang''|00001004020000#lang]]|Y|Y|Making it user-specific could make zettel for other user less useful Index: docs/manual/00001004050000.zettel ================================================================== --- docs/manual/00001004050000.zettel +++ docs/manual/00001004050000.zettel @@ -1,11 +1,12 @@ id: 00001004050000 title: Command line parameters role: manual tags: #command #configuration #manual #zettelstore syntax: zmk -modified: 20220805174626 +created: 20210126175322 +modified: 20221128161932 Zettelstore is not just a service that provides services of a zettelkasten. It allows to some tasks to be executed at the command line. Typically, the task (""sub-command"") will be given at the command line as the first parameter. @@ -25,6 +26,13 @@ * [[``zettelstore run``|00001004051000]] to start the Zettelstore service. * [[``zettelstore run-simple``|00001004051100]] is typically called, when you start Zettelstore by a double.click in your GUI. * [[``zettelstore file``|00001004051200]] to render files manually without activated/running Zettelstore services. * [[``zettelstore password``|00001004051400]] to calculate data for [[user authentication|00001010040200]]. +Every sub-command allows the following command line options: +; [!h|''-h''] (or ''--help'') +: Does not execute the sub-command, but shows allowed command line options (except ''-h'' / ''--help''). +; [!l|''-l LOGSPEC''] +: Makes the given logging level specification effective for this command. + Details, including syntax, can be found in the description for the [[''log-level''|00001004010000#log-level]] key of the startup configuration. + To measure potential bottlenecks within the software Zettelstore, there are some [[command line flags for profiling the application|00001004059900]]. Index: docs/manual/00001004051100.zettel ================================================================== --- docs/manual/00001004051100.zettel +++ docs/manual/00001004051100.zettel @@ -1,11 +1,12 @@ id: 00001004051100 title: The ''run-simple'' sub-command role: manual tags: #command #configuration #manual #zettelstore syntax: zmk -modified: 20220724162843 +created: 20210126175322 +modified: 20221128161922 === ``zettelstore run-simple`` This sub-command is implicitly called, when an user starts Zettelstore by double-clicking on its GUI icon. It is s simplified variant of the [[''run'' sub-command|00001004051000]]. Index: docs/manual/00001004051200.zettel ================================================================== --- docs/manual/00001004051200.zettel +++ docs/manual/00001004051200.zettel @@ -1,11 +1,12 @@ id: 00001004051200 title: The ''file'' sub-command role: manual tags: #command #configuration #manual #zettelstore syntax: zmk -modified: 20220423131738 +created: 20210126175322 +modified: 20230316182711 Reads zettel data from a file (or from standard input / stdin) and renders it to standard output / stdout. This allows Zettelstore to render files manually. ``` zettelstore file [-t FORMAT] [file-1 [file-2]] @@ -13,16 +14,17 @@ ; ''-t FORMAT'' : Specifies the output format. Supported values are: [[''html''|00001012920510]] (default), - [[''sexpr''|00001012920516]], + [[''md''|00001012920513]], + [[''shtml''|00001012920525]], + [[''sz''|00001012920516]], [[''text''|00001012920519]], - [[''zjson''|00001012920503]], and [[''zmk''|00001012920522]]. ; ''file-1'' : Specifies the file name, where at least metadata is read. If ''file-2'' is not given, the zettel content is also read from here. ; ''file-2'' : File name where the zettel content is stored. If neither ''file-1'' nor ''file-2'' are given, metadata and zettel content are read from standard input / stdin. Index: docs/manual/00001005090000.zettel ================================================================== --- docs/manual/00001005090000.zettel +++ docs/manual/00001005090000.zettel @@ -2,11 +2,11 @@ title: List of predefined zettel role: manual tags: #manual #reference #zettelstore syntax: zmk created: 20210126175322 -modified: 20220909180240 +modified: 20230827212840 The following table lists all predefined zettel with their purpose. |= Identifier :|= Title | Purpose | [[00000000000001]] | Zettelstore Version | Contains the version string of the running Zettelstore @@ -27,17 +27,19 @@ | [[00000000010401]] | Zettelstore Detail HTML Template | Layout for the HTML detail view of one zettel | [[00000000010402]] | Zettelstore Info HTML Template | Layout for the information view of a specific zettel | [[00000000010403]] | Zettelstore Form HTML Template | Form that is used to create a new or to change an existing zettel that contains text | [[00000000010404]] | Zettelstore Rename Form HTML Template | View that is displayed to change the [[zettel identifier|00001006050000]] | [[00000000010405]] | Zettelstore Delete HTML Template | View to confirm the deletion of a zettel +| [[00000000010700]] | Zettelstore Error HTML Template | View to show an error message +| [[00000000019000]] | Zettelstore Sxn Start Code | Starting point of sxn functions to build the templates +| [[00000000019990]] | Zettelstore Sxn Base Code | Base sxn functions to build the templates | [[00000000020001]] | Zettelstore Base CSS | System-defined CSS file that is included by the [[Base HTML Template|00000000010100]] | [[00000000025001]] | Zettelstore User CSS | User-defined CSS file that is included by the [[Base HTML Template|00000000010100]] -| [[00000000029000]] | Zettelstore Role to CSS Map | [[Maps|00001017000000#role-css]] [[role|00001006020000#role]] to a zettel identifier that is included by the [[Base HTML Template|00000000010100]] as an CSS file | [[00000000040001]] | Generic Emoji | Image that is shown if [[original image reference|00001007040322]] is invalid | [[00000000090000]] | New Menu | Contains items that should contain in the zettel template menu | [[00000000090001]] | New Zettel | Template for a new zettel with role ""[[zettel|00001006020100]]"" | [[00000000090002]] | New User | Template for a new [[user zettel|00001010040200]] | [[00010000000000]] | Home | Default home zettel, contains some welcome information If a zettel is not linked, it is not accessible for the current user. **Important:** All identifier may change until a stable version of the software is released. Index: docs/manual/00001006000000.zettel ================================================================== --- docs/manual/00001006000000.zettel +++ docs/manual/00001006000000.zettel @@ -1,11 +1,12 @@ id: 00001006000000 title: Layout of a Zettel role: manual tags: #design #manual #zettelstore syntax: zmk -modified: 20220724165931 +created: 20210126175322 +modified: 20230403123541 A zettel consists of two parts: the metadata and the zettel content. Metadata gives some information mostly about the zettel content, how it should be interpreted, how it is sorted within Zettelstore. The zettel content is, well, the actual content. In many cases, the content is in plain text form. @@ -27,22 +28,22 @@ Other character encodings are not supported and will never be[^This is not a real problem, since every modern software should support UTF-8 as an encoding.]. There is support for a graphical format with a text representation: SVG. And there is support for some binary image formats, like GIF, PNG, and JPEG. === Plain, parsed, and evaluated zettel -Zettelstore may present your zettel in various forms. +Zettelstore may present your zettel in various forms, typically retrieved with the [[endpoint|00001012920000]] ''/z/{ID}''. One way is to present the zettel as it was read by Zettelstore. -This is called ""[[plain zettel|00001003000000#plain]]"", typically retrieved with the [[endpoint|00001012920000]] ''/z/{ID}''. +This is called ""[[plain zettel|00001012053300]]"". The second way is to present the zettel as it was recognized by Zettelstore. -This is called ""[[parsed zettel|00001012053600]]"", typically retrieved with the [[endpoint|00001012920000]] ''/p/{ID}''. +This is called ""[[parsed zettel|00001012053600]]"", also retrieved with the [[endpoint|00001012920000]] ''/z/{ID}'', but with the additional query parameter ''parseonly''. Such a zettel was read and analyzed. It can be presented in various [[encodings|00001012920500]].[^The [[zmk encoding|00001012920522]] allows you to compare the plain, the parsed, and the evaluated form of a zettel.] -However, a zettel such as this one you are currently reading, is a ""[[evaluated zettel|00001012053500]]"", typically retrieved with the [[endpoint|00001012920000]] ''/v/{ID}''. +However, a zettel such as this one you are currently reading, is a ""[[evaluated zettel|00001012053500]]"", also retrieved with the [[endpoint|00001012920000]] ''/z/{ID}'' and specifying an encoding. The biggest difference to a parsed zettel is the inclusion of [[block transclusions|00001007031100]] or [[inline transclusions|00001007040324]] for an evaluated zettel. It can also be presented in various encoding, including the ""zmk"" encoding. Evaluations also applies to metadata of a zettel, if appropriate. Please note, that searching for content is based on parsed zettel. Transcluded content will only be found in transcluded zettel, but not in the zettel that transcluded the content. However, you will easily pick up that zettel by follow the [[backward|00001006020000#backward]] metadata key of the transcluded zettel. Index: docs/manual/00001006020000.zettel ================================================================== --- docs/manual/00001006020000.zettel +++ docs/manual/00001006020000.zettel @@ -2,11 +2,11 @@ title: Supported Metadata Keys role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210126175322 -modified: 20221004134841 +modified: 20230704161159 Although you are free to define your own metadata, by using any key (according to the [[syntax|00001006010000]]), some keys have a special meaning that is enforced by Zettelstore. See the [[computed list of supported metadata keys|00000000000090]] for details. Most keys conform to a [[type|00001006030000]]. @@ -42,12 +42,21 @@ It is internally created by hashing the password, the [[zettel identifier|00001006050000]], and the value of the ''ident'' key. It is only used for zettel with a ''role'' value of ""user"". ; [!dead|''dead''] : Property that contains all references that does __not__ identify a zettel. +; [!expire|''expire''] +: A user-entered time stamp that document the point in time when the zettel should expire. + When a zettel is expires, Zettelstore does nothing. + It is up to you to define required actions. + ''expire'' is just a documentation. + You could define a query and execute it regularly, for example [[query:expire? ORDER expire]]. + Alternatively, a Zettelstore client software could define some actions when it detects expired zettel. ; [!folge|''folge''] : Is a property that contains identifier of all zettel that reference this zettel through the [[''precursor''|#precursor]] value. +; [!folge-role|''folge-role''] +: Specifies a suggested [[''role''|#role]] the zettel should use in the future, if zettel currently has a preliminary role. ; [!forward|''forward''] : Property that contains all references that identify another zettel within the content of the zettel. ; [!id|''id''] : Contains the [[zettel identifier|00001006050000]], as given by the Zettelstore. It cannot be set manually, because it is a computed value. @@ -83,24 +92,35 @@ It can be used for [[sorting|00001007700000]] zettel based on their publication date. It is a computed value. There is no need to set it via Zettelstore. +; [!query|''query''] +: Stores the [[query|00001007031140]] that was used to create the zettel. + This is for future reference. ; [!read-only|''read-only''] : Marks a zettel as read-only. The interpretation of [[supported values|00001006020400]] for this key depends, whether authentication is [[enabled|00001010040100]] or not. ; [!role|''role''] : Defines the role of the zettel. Can be used for selecting zettel. See [[supported zettel roles|00001006020100]]. If not given, it is ignored. +; [!subordinates|''subordinates''] +: Is a property that contains identifier of all zettel that reference this zettel through the [[''superior''|#superior]] value. ; [!successors|''successors''] : Is a property that contains identifier of all zettel that reference this zettel through the [[''predecessor''|#predecessor]] value. Therefore, it references all zettel that contain a new version of the content and/or metadata. In contrast to [[''folge''|#folge]], these are references because of technical reasons, not because of content-related reasons. In most cases, zettel referencing the current zettel should be updated to reference a successor zettel. The [[query reference|00001007040310]] [[query:backward? successors?]] lists all such zettel. +; [!summary|''summary''] +: Summarizes the content of the zettel. + You may use all [[inline-structued elements|00001007040000]] of Zettelmarkup. +; [!superior|''superior''] +: Specifies a zettel that is conceptually a superior zettel. + This might be a more abstract zettel, or a zettel that should be higher in a hierarchy. ; [!syntax|''syntax''] : Specifies the syntax that should be used for interpreting the zettel. The zettel about [[other markup languages|00001008000000]] defines supported values. If it is not given, it defaults to ''plain''. ; [!tags|''tags''] @@ -107,12 +127,10 @@ : Contains a space separated list of tags to describe the zettel further. Each Tag must begin with the number sign character (""''#''"", U+0023). ; [!title|''title''] : Specifies the title of the zettel. If not given, the value of [[''id''|#id]] will be used. - - You can use all [[inline-structured elements|00001007040000]] of Zettelmarkup. ; [!url|''url''] : Defines an URL / URI for this zettel that possibly references external material. One use case is to specify the document that the current zettel comments on. The URL will be rendered special in the [[web user interface|00001014000000]] if you use the default template. ; [!useless-files|''useless-files''] Index: docs/manual/00001006020100.zettel ================================================================== --- docs/manual/00001006020100.zettel +++ docs/manual/00001006020100.zettel @@ -1,11 +1,12 @@ id: 00001006020100 title: Supported Zettel Roles role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk -modified: 20220623183234 +created: 00010101000000 +modified: 20230829233016 The [[''role'' key|00001006020000#role]] defines what kind of zettel you are writing. You are free to define your own roles. It is allowed to set an empty value or to omit the role. @@ -15,10 +16,13 @@ : A zettel that contains some configuration data for the Zettelstore. Most prominent is [[00000000000100]], as described in [[00001004020000]]. ; [!manual|''manual''] : All zettel that document the inner workings of the Zettelstore software. This role is only used in this specific Zettelstore. +; [!tag|''tag''] +: A zettel with the role ""tag"" and a title, which names a [[tag|00001006020000#tags]], is treated as a __tag zettel__. + Basically, tag zettel describe the tag, and form a hierarchiy of meta-tags. If you adhere to the process outlined by Niklas Luhmann, a zettel could have one of the following three roles: ; [!note|''note''] : A small note, to remember something. Index: docs/manual/00001006030000.zettel ================================================================== --- docs/manual/00001006030000.zettel +++ docs/manual/00001006030000.zettel @@ -1,20 +1,23 @@ id: 00001006030000 title: Supported Key Types role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk -modified: 20220304114106 +created: 20210126175322 +modified: 20230612183742 All [[supported metadata keys|00001006020000]] conform to a type. User-defined metadata keys conform also to a type, based on the suffix of the key. |=Suffix|Type +| ''-date'' | [[Timestamp|00001006034500]] | ''-number'' | [[Number|00001006033000]] | ''-role'' | [[Word|00001006035500]] | ''-set'' | [[WordSet|00001006036000]] +| ''-time'' | [[Timestamp|00001006034500]] | ''-title'' | [[Zettelmarkup|00001006036500]] | ''-url'' | [[URL|00001006035000]] | ''-zettel'' | [[Identifier|00001006032000]] | ''-zid'' | [[Identifier|00001006032000]] | ''-zids'' | [[IdentifierSet|00001006032500]] @@ -21,11 +24,11 @@ | any other suffix | [[EString|00001006031500]] The name of the metadata key is bound to the key type Every key type has an associated validation rule to check values of the given type. -There is also a rule how values are matched, e.g. against a search term when selecting some zettel. +There is also a rule how values are matched, e.g. against a [[search value|00001007706000]] when selecting some zettel. And there is a rule how values compare for sorting. * [[Credential|00001006031000]] * [[EString|00001006031500]] * [[Identifier|00001006032000]] Index: docs/manual/00001006031000.zettel ================================================================== --- docs/manual/00001006031000.zettel +++ docs/manual/00001006031000.zettel @@ -2,19 +2,19 @@ title: Credential Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130324 +modified: 20230419175515 Values of this type denote a credential value, e.g. an encrypted password. === Allowed values All printable characters are allowed. Since a credential contains some kind of secret, the sequence of characters might have some hidden syntax to be interpreted by other parts of Zettelstore. -=== Query operators +=== Query comparison A credential never compares to any other value. A comparison will never match in any way. === Sorting If a list of zettel should be sorted based on a credential value, the identifier of the respective zettel is used instead. Index: docs/manual/00001006031500.zettel ================================================================== --- docs/manual/00001006031500.zettel +++ docs/manual/00001006031500.zettel @@ -2,24 +2,24 @@ title: EString Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130448 +modified: 20230419175525 Values of this type are just a sequence of character, possibly an empty sequence. An EString is the most general metadata key type, as it places no restrictions to the character sequence.[^Well, there are some minor restrictions that follow from the [[metadata syntax|00001006010000]].] === Allowed values All printable characters are allowed. -=== Query operator +=== Query comparison All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""Hello"". === Sorting To sort two values, the underlying encoding is used to determine which value is less than the other. Uppercase letters are typically interpreted as less than their corresponding lowercase letters, i.e. ``A < a``. Comparison is done character-wise by finding the first difference in the respective character sequence. For example, ``abc > aBc``. Index: docs/manual/00001006032000.zettel ================================================================== --- docs/manual/00001006032000.zettel +++ docs/manual/00001006032000.zettel @@ -2,20 +2,30 @@ title: Identifier Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914134914 +modified: 20230612183459 Values of this type denote a [[zettel identifier|00001006050000]]. === Allowed values Must be a sequence of 14 digits (""0""--""9""). -=== Query operator -Comparison is done with the string representation of the identifiers. +=== Query comparison +[[Search values|00001007706000]] with more than 14 characters are truncated to contain exactly 14 characters. + +When the [[search operators|00001007705000]] ""less"", ""not less"", ""greater"", and ""not greater"" are given, the length of the search value is checked. +If it contains less than 14 digits, zero digits (""0"") are appended, until it contains exactly 14 digits. + +All other comparisons assume that up to 14 characters are given. + +Comparison is done through the string representation. + +In case of the search operators ""less"", ""not less"", ""greater"", and ""not greater"", this is the same as a numerical comparison. + For example, ""000010"" matches ""[[00001006032000]]"". === Sorting Sorting is done by comparing the [[String|00001006033500]] values. If both values are identifiers, this works well because both have the same length. Index: docs/manual/00001006032500.zettel ================================================================== --- docs/manual/00001006032500.zettel +++ docs/manual/00001006032500.zettel @@ -2,21 +2,21 @@ title: IdentifierSet Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914131354 +modified: 20230419175551 Values of this type denote a (sorted) set of [[zettel identifier|00001006050000]]. A set is different to a list, as no duplicate values are allowed. === Allowed values Must be at least one sequence of 14 digits (""0""--""9""), separated by space characters. -=== Query operator +=== Query comparison A value matches an identifier set value, if the value matches any of the identifier set values. For example, ""000010060325"" is a prefix ""[[00001006032000]] [[00001006032500]]"". === Sorting Sorting is done by comparing the [[String|00001006033500]] values. Index: docs/manual/00001006033000.zettel ================================================================== --- docs/manual/00001006033000.zettel +++ docs/manual/00001006033000.zettel @@ -2,17 +2,23 @@ title: Number Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914131211 +modified: 20230612183900 Values of this type denote a numeric integer value. === Allowed values Must be a sequence of digits (""0""--""9""), optionally prefixed with a ""-"" or a ""+"" character. -=== Query operator -All comparisons are done on the given string representation of the number, ""+12"" will be treated as a different number of ""12"". +=== Query comparison +[[Search operators|00001007705000]] for equality (""equal"" or ""not equal"", ""has"" or ""not has""), for lesser values (""less"" or ""not less""), or for greater values (""greater"" or ""not greater"") are executed by converting both the [[search value|00001007706000]] and the metadata value into integer values and then comparing them numerically. +Integer values must be in the range -9223372036854775808 … 9223372036854775807. +Comparisons with metadata values outside this range always returns a negative match. +Comparisons with search values outside this range will be executed as a comparison of the string representation values. + +All other comparisons (""match"", ""not match"", ""prefix"", ""not prefix"", ""suffix"", and ""not suffix"") are done on the given string representation of the number. +In this case, the number ""+12"" will be treated as different to the number ""12"". === Sorting Sorting is done by comparing the numeric values. Index: docs/manual/00001006033500.zettel ================================================================== --- docs/manual/00001006033500.zettel +++ docs/manual/00001006033500.zettel @@ -2,23 +2,23 @@ title: String Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130505 +modified: 20230419175633 Values of this type are just a sequence of character, but not an empty sequence. === Allowed values All printable characters are allowed. There must be at least one such character. -=== Query operator +=== Query comparison All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""Hello"". === Sorting To sort two values, the underlying encoding is used to determine which value is less than the other. Uppercase letters are typically interpreted as less than their corresponding lowercase letters, i.e. ``A < a``. Comparison is done character-wise by finding the first difference in the respective character sequence. For example, ``abc > aBc``. Index: docs/manual/00001006034000.zettel ================================================================== --- docs/manual/00001006034000.zettel +++ docs/manual/00001006034000.zettel @@ -2,11 +2,11 @@ title: TagSet Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914131048 +modified: 20230419175642 Values of this type denote a (sorted) set of tags. A set is different to a list, as no duplicate values are allowed. @@ -14,10 +14,10 @@ Every tag must must begin with the number sign character (""''#''"", U+0023), followed by at least one printable character. Tags are separated by space characters. All characters are mapped to their lower case values. -=== Query operator +=== Query comparison All comparisons are done case-sensitive, i.e. ""#hell"" will not be the prefix of ""#Hello"". === Sorting Sorting is done by comparing the [[String|00001006033500]] values. Index: docs/manual/00001006034500.zettel ================================================================== --- docs/manual/00001006034500.zettel +++ docs/manual/00001006034500.zettel @@ -2,11 +2,11 @@ title: Timestamp Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130919 +modified: 20230612183509 Values of this type denote a point in time. === Allowed values Must be a sequence of 14 digits (""0""--""9"") (same as an [[Identifier|00001006032000]]), with the restriction that is conforms to the pattern ""YYYYMMDDhhmmss"". @@ -16,12 +16,20 @@ * DD is the day, * hh is the hour, * mm is the minute, * ss is the second. -=== Query operator -All comparisons assume that up to 14 digits are given. +=== Query comparison +[[Search values|00001007706000]] with more than 14 characters are truncated to contain exactly 14 characters. + +When the [[search operators|00001007705000]] ""less"", ""not less"", ""greater"", and ""not greater"" are given, the length of the search value is checked. +If it contains less than 14 digits, zero digits (""0"") are appended, until it contains exactly 14 digits. + +All other comparisons assume that up to 14 characters are given. + +Comparison is done through the string representation. +In case of the search operators ""less"", ""not less"", ""greater"", and ""not greater"", this is the same as a numerical comparison. === Sorting Sorting is done by comparing the [[String|00001006033500]] values. If both values are timestamp values, this works well because both have the same length. Index: docs/manual/00001006035000.zettel ================================================================== --- docs/manual/00001006035000.zettel +++ docs/manual/00001006035000.zettel @@ -2,18 +2,18 @@ title: URL Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130809 +modified: 20230419175725 Values of this type denote an URL. === Allowed values All characters of an URL / URI are allowed. -=== Query operator +=== Query comparison All comparisons are done case-insensitive. For example, ""hello"" is the suffix of ""http://example.com/Hello"". === Sorting Sorting is done by comparing the [[String|00001006033500]] values. Index: docs/manual/00001006035500.zettel ================================================================== --- docs/manual/00001006035500.zettel +++ docs/manual/00001006035500.zettel @@ -2,19 +2,19 @@ title: Word Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130655 +modified: 20230419175735 Values of this type denote a single word. === Allowed values Must be a non-empty sequence of characters, but without the space character. All characters are mapped to their lower case values. -=== Query operator +=== Query comparison All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""Hello"". === Sorting Sorting is done by comparing the [[String|00001006033500]] values. Index: docs/manual/00001006036000.zettel ================================================================== --- docs/manual/00001006036000.zettel +++ docs/manual/00001006036000.zettel @@ -2,19 +2,19 @@ title: WordSet Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914130725 +modified: 20230419175745 Values of this type denote a (sorted) set of [[words|00001006035500]]. A set is different to a list, as no duplicate values are allowed. === Allowed values Must be a sequence of at least one word, separated by space characters. -=== Query operator +=== Query comparison All comparisons are done case-insensitive, i.e. ""hell"" will be the prefix of ""World, Hello"". === Sorting Sorting is done by comparing the [[String|00001006033500]] values. Index: docs/manual/00001006036500.zettel ================================================================== --- docs/manual/00001006036500.zettel +++ docs/manual/00001006036500.zettel @@ -2,19 +2,19 @@ title: Zettelmarkup Key Type role: manual tags: #manual #meta #reference #zettel #zettelstore syntax: zmk created: 20210212135017 -modified: 20220914135405 +modified: 20230419175441 Values of this type are [[String|00001006033500]] values, interpreted as [[Zettelmarkup|00001007000000]]. === Allowed values All printable characters are allowed. There must be at least one such character. -=== Query operator +=== Query comparison Comparison is done similar to the full-text search: both the value to compare and the metadata value are normalized according to Unicode NKFD, ignoring everything except letters and numbers. Letters are mapped to the corresponding lower-case value. For example, ""Brücke"" will be the prefix of ""(Bruckenpfeiler,"". Index: docs/manual/00001007000000.zettel ================================================================== --- docs/manual/00001007000000.zettel +++ docs/manual/00001007000000.zettel @@ -2,11 +2,11 @@ title: Zettelmarkup role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk created: 20210126175322 -modified: 20221018104725 +modified: 20221209192105 Zettelmarkup is a rich plain-text based markup language for writing zettel content. Besides the zettel content, Zettelmarkup is also used for specifying the title of a zettel, regardless of the syntax of a zettel. Zettelmarkup supports the longevity of stored notes by providing a syntax that any person can easily read, as well as a computer. @@ -37,5 +37,6 @@ * [[Inline-structured element|00001007040000]] * [[Attributes|00001007050000]] * [[Query expressions|00001007700000]] * [[Summary of formatting characters|00001007800000]] * [[Tutorial|00001007900000]] +* [[Cheat Sheet|00001007990000]] Index: docs/manual/00001007030900.zettel ================================================================== --- docs/manual/00001007030900.zettel +++ docs/manual/00001007030900.zettel @@ -1,20 +1,21 @@ id: 00001007030900 title: Zettelmarkup: Comment Blocks role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk -modified: 20220218130330 +created: 20210126175322 +modified: 20230807170858 Comment blocks are quite similar to [[verbatim blocks|00001007030500]]: both are used to enter text that should not be interpreted. While the text entered inside a verbatim block will be processed somehow, text inside a comment block will be ignored[^Well, not completely ignored: text is read, but it will typically not rendered visible.]. Comment blocks are typically used to give some internal comments, e.g. the license of a text or some internal remarks. Comment blocks begin with at least three percent sign characters (""''%''"", U+0025) at the first position of a line. You can add some [[attributes|00001007050000]] on the beginning line of a comment block, following the initiating characters. The comment block supports the default attribute: when given, the text will be rendered, e.g. as an HTML comment. -When rendered to JSON, the comment block will not be ignored but it will output some JSON text. +When rendered to a symbolic expression, the comment block will not be ignored but it will output some text. Same for other renderer. Any other character in this line will be ignored Text following the beginning line will not be interpreted, until a line begins with at least the same number of the same characters given at the beginning line. Index: docs/manual/00001007031140.zettel ================================================================== --- docs/manual/00001007031140.zettel +++ docs/manual/00001007031140.zettel @@ -2,11 +2,11 @@ title: Zettelmarkup: Query Transclusion role: manual tags: #manual #search #zettelmarkup #zettelstore syntax: zmk created: 20220809132350 -modified: 20221014164027 +modified: 20230116183656 A query transclusion is specified by the following sequence, starting at the first position in a line: ''{{{query:query-expression}}}''. The line must literally start with the sequence ''{{{query:''. Everything after this prefix is interpreted as a [[query expression|00001007700000]]. @@ -45,16 +45,19 @@ : Transform the zettel list into an [[Atom 1.0|https://www.rfc-editor.org/rfc/rfc4287]]-conformant document / feed. The document is embedded into the referencing zettel. ; ''RSS'' (aggregate) : Transform the zettel list into a [[RSS 2.0|https://www.rssboard.org/rss-specification]]-conformant document / feed. The document is embedded into the referencing zettel. +; ''KEYS'' (aggregate) +: Emit a list of all metadata keys, together with the number of zettel having the key. ; Any [[metadata key|00001006020000]] of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]] (aggregates) : Emit an aggregate of the given metadata key. - The key can be given in any letter case. + The key can be given in any letter case[^Except if the key name collides with one of the above names. In this case use at least one lower case letter.]. +Example: ```zmk {{{query:tags:#search | tags}}} ``` This is a tag cloud of all tags that are used together with the tag #search: :::example {{{query:tags:#search | tags}}} ::: Index: docs/manual/00001007031300.zettel ================================================================== --- docs/manual/00001007031300.zettel +++ docs/manual/00001007031300.zettel @@ -1,21 +1,22 @@ id: 00001007031300 title: Zettelmarkup: Evaluation Blocks role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk -modified: 20220311120658 +created: 20220310184916 +modified: 20230109105402 Evaluation blocks are used to enter text that could be evaluated by either Zettelstore or external software. They begin with at least three tilde characters (""''~''"", U+007E) at the first position of a line. You can add some [[attributes|00001007050000]] on the beginning line of a verbatim block, following the initiating characters. The evaluation block supports the default attribute[^Depending on the syntax value.]: when given, all spaces in the text are rendered in HTML as open box characters (U+2423). If you want to give only one attribute and this attribute is the generic attribute, you can omit the most of the attribute syntax and just specify the value. It will be interpreted as a [[syntax|00001008000000]] value to evaluate its content. Not all syntax values are supported by Zettelstore.[^Currently just ""[[draw|00001008050000]]"".] -The main reason for an evaluation block is to be used with external software via the [[ZJSON encoding|00001012920503]]. +The main reason for an evaluation block is to be used with external software via the [[sz encoding|00001012920516]]. Any other character in this line will be ignored Text following the beginning line will not be interpreted, until a line begins with at least the same number of the same characters given at the beginning line. This allows to enter some tilde characters in the text that should not be interpreted. Index: docs/manual/00001007031400.zettel ================================================================== --- docs/manual/00001007031400.zettel +++ docs/manual/00001007031400.zettel @@ -1,11 +1,12 @@ id: 00001007031400 title: Zettelmarkup: Math-mode Blocks role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk -modified: 20220311182505 +created: 20220311173226 +modified: 20230109105340 Math-mode blocks are used to enter mathematical formulas / equations in a display style mode. Similar to a [[evaluation blocks|00001007031300]], the block content will be interpreted by either Zettelstore or an external software. They begin with at least three dollar sign characters (""''$''"", U+0024) at the first position of a line. @@ -13,11 +14,11 @@ A math-mode block supports the default attribute[^Depending on the syntax value.]: when given, all spaces in the text are rendered in HTML as open box characters (U+2423). If you want to give only one attribute and this attribute is the generic attribute, you can omit the most of the attribute syntax and just specify the value. It will be interpreted as a [[syntax|00001008000000]] value to evaluate its content. Alternatively, you could provide an attribute with the key ""syntax"" and use the value to specify the syntax. Not all syntax values are supported by Zettelstore.[^Currently: none.] -External software might support several values via the [[ZJSON encoding|00001012920503]]. +External software might support several values via the [[sz encoding|00001012920516]]. Any other character in this line will be ignored Text following the beginning line will not be interpreted, until a line begins with at least the same number of the same characters given at the beginning line. This allows to enter some dollar-sign characters in the text that should not be interpreted. Index: docs/manual/00001007040310.zettel ================================================================== --- docs/manual/00001007040310.zettel +++ docs/manual/00001007040310.zettel @@ -2,14 +2,15 @@ title: Zettelmarkup: Links role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk created: 20210810155955 -modified: 20220922154843 +modified: 20221024173849 There are two kinds of links, regardless of links to (internal) other zettel or to (external) material. Both kinds begin with two consecutive left square bracket characters (""''[''"", U+005B) and ends with two consecutive right square bracket characters (""'']''"", U+005D). +If the content starts with more than two left square bracket characters, all but the last two will be treated as text. The first form provides some text plus the link specification, delimited by a vertical bar character (""''|''"", U+007C): ``[[text|linkspecification]]``. The text is a sequence of [[inline elements|00001007040000]]. However, it should not contain links itself. Index: docs/manual/00001007040320.zettel ================================================================== --- docs/manual/00001007040320.zettel +++ docs/manual/00001007040320.zettel @@ -1,19 +1,21 @@ id: 00001007040320 title: Zettelmarkup: Inline Embedding / Transclusion role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk -modified: 20220803183936 +created: 20210810155955 +modified: 20221024173926 To some degree, an specification for embedded material is conceptually not too far away from a specification for [[linked material|00001007040310]]. Both contain a reference specification and optionally some text. In contrast to a link, the specification of embedded material must currently resolve to some kind of real content. This content replaces the embed specification. An embed specification begins with two consecutive left curly bracket characters (""''{''"", U+007B) and ends with two consecutive right curly bracket characters (""''}''"", U+007D). The curly brackets delimits either a reference specification or some text, a vertical bar character and the link specification, similar to a link. +If the content starts with more than two left curly bracket characters, all but the last two will be treated as text. One difference to a link: if the text was not given, an empty string is assumed. The reference must point to some content, either zettel content or URL-referenced content. If the current user is not allowed to read the referenced zettel, the inline transclusion / embedding is ignored. Index: docs/manual/00001007040322.zettel ================================================================== --- docs/manual/00001007040322.zettel +++ docs/manual/00001007040322.zettel @@ -1,20 +1,22 @@ id: 00001007040322 title: Zettelmarkup: Image Embedding role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk -modified: 20220214180955 +created: 20210811154251 +modified: 20221112111054 Image content is assumed, if an URL is used or if the referenced zettel contains an image. Supported formats are: * Portable Network Graphics (""PNG""), as defined by [[RFC\ 2083|https://tools.ietf.org/html/rfc2083]]. * Graphics Interchange Format (""GIF"), as defined by [[https://www.w3.org/Graphics/GIF/spec-gif89a.txt]]. * JPEG / JPG, defined by the __Joint Photographic Experts Group__. * Scalable Vector Graphics (SVG), defined by [[https://www.w3.org/Graphics/SVG/]] +* WebP, defined by [[Google|https://developers.google.com/speed/webp]] If the text is given, it will be interpreted as an alternative textual representation, to help persons with some visual disabilities. [[Attributes|00001007050000]] are supported. They must follow the last right curly bracket character immediately. Index: docs/manual/00001007040324.zettel ================================================================== --- docs/manual/00001007040324.zettel +++ docs/manual/00001007040324.zettel @@ -2,11 +2,11 @@ title: Zettelmarkup: Inline-mode Transclusion role: manual tags: #manual #zettelmarkup #zettelstore syntax: zmk created: 20210811154251 -modified: 20220926183509 +modified: 20221116165428 Inline-mode transclusion applies to all zettel that are parsed in a non-trivial way, e.g. as structured textual content. For example, textual content is assumed if the [[syntax|00001006020000#syntax]] of a zettel is ""zmk"" ([[Zettelmarkup|00001007000000]]), or ""markdown"" / ""md"" ([[Markdown|00001008010000]]). Since this type of transclusion is at the level of [[inline-structured elements|00001007040000]], the transclude specification must be replaced with some inline-structured elements. @@ -36,14 +36,14 @@ ** Just specifying the fragment identifier will reference something in the current page. This is not allowed, to prevent a possible endless recursion. * If the reference is a [[hosted or based|00001007040310#link-specifications]] link / URL to an image, that image will be rendered. - Example: ``{{/z/00000000040001}}`` is rendered as ::{{/z/00000000040001}}::{=example} + Example: ``{{//z/00000000040001}}`` is rendered as ::{{//z/00000000040001}}::{=example} If no inline-structured elements are found, the transclude specification is replaced by an error message. To avoid an exploding ""transclusion bomb"", a form of a [[billion laughs attack|https://en.wikipedia.org/wiki/Billion_laughs_attack]] (also known as ""XML bomb""), the total number of transclusions / expansions is limited. The limit can be controlled by setting the value [[''max-transclusions''|00001004020000#max-transclusions]] of the runtime configuration zettel. === See also [[Full transclusion|00001007031100]] does not work inside some text, but is used for [[block-structured elements|00001007030000]]. Index: docs/manual/00001007700000.zettel ================================================================== --- docs/manual/00001007700000.zettel +++ docs/manual/00001007700000.zettel @@ -1,49 +1,30 @@ id: 00001007700000 -title: Query expression +title: Query Expression role: manual tags: #manual #search #zettelstore syntax: zmk created: 20220805150154 -modified: 20220913135434 +modified: 20230731161954 A query expression allows you to search for specific zettel and to perform some actions on them. -You may select zettel based on a full-text search, based on specific metadata values, or both. +You may select zettel based on a list of [[zettel identifier|00001006050000]], based on a query directive, based on a full-text search, based on specific metadata values, or some or all of them. -A query expression consists of a __search expression__ and of an optional __action list__. -Both are separated by a vertical bar character (""''|''"", U+007C). +A query expression consists of an optional __[[zettel identifier list|00001007710000]]__, zero or more __[[query directives|00001007720000]]__, an optional __[[search expression|00001007701000]]__, and an optional __[[action list|00001007770000]]__. +The latter two are separated by a vertical bar character (""''|''"", U+007C). A query expression follows a [[formal syntax|00001007780000]]. -=== Search expression - -In its simplest form, a search expression just contains a string to be search for with the help of a full-text search. -For example, the string ''syntax'' will search for all zettel containing the word ""syntax"". - -If you want to search for all zettel with a title containing the word ""syntax"", you must specify ''title:syntax''. -""title"" names the [[metadata key|00001006010000]], in this case the [[supported metadata key ""title""|00001006020000#title]]. -The colon character (""'':''"") is a [[search operator|00001007705000]], in this example to specify a match. -""syntax"" is the [[search value|00001007706000]] that must match to the value of the given metadata key, here ""title"". - -A search expression may contain more than one search term, such as ''title:syntax''. -Search terms must be separated by one or more space characters, for example ''title:syntax title:search''. -All terms of a select expression must be true so that a zettel is selected. - -* [[Search terms|00001007702000]] -* [[Search operator|00001007705000]] -* [[Search value|00001007706000]] - -Here are [[some examples|00001007790000]] of search expressions, which can be used to manage a Zettelstore: -{{{00001007790000}}} - -=== Action List - -With a search expression, a list of zettel is selected. -Actions allow to modify this list to a certain degree. - -Which actions are allowed depends on the context. -However, actions are further separated into __parameter action__ and __aggregate actions__. -A parameter action just sets a parameter for an aggregate action. -An aggregate action transforms the list of selected zettel into a different, aggregate form. -Only the first aggregate form is executed, following aggregate actions are ignored. - -In most contexts, valid actions include the name of metadata keys, at least of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]]. +* [[List of zettel identifier|00001007710000]] +* [[Query directives|00001007720000]] +** [[Context directive|00001007720300]] +** [[Ident directive|00001007720600]] +** [[Items directive|00001007720900]] +** [[Unlinked directive|00001007721200]] +* [[Search expression|00001007701000]] +** [[Search term|00001007702000]] +** [[Search operator|00001007705000]] +** [[Search value|00001007706000]] +* [[Action list|00001007770000]] + +Here are [[some examples|00001007790000]], which can be used to manage a Zettelstore: +{{{00001007790000}}} ADDED docs/manual/00001007701000.zettel Index: docs/manual/00001007701000.zettel ================================================================== --- docs/manual/00001007701000.zettel +++ docs/manual/00001007701000.zettel @@ -0,0 +1,26 @@ +id: 00001007701000 +title: Query: Search Expression +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 20230707205043 +modified: 20230707210039 + +In its simplest form, a search expression just contains a string to be search for with the help of a full-text search. +For example, the string ''syntax'' will search for all zettel containing the word ""syntax"". + +If you want to search for all zettel with a title containing the word ""syntax"", you must specify ''title:syntax''. +""title"" denotes the [[metadata key|00001006010000]], in this case the [[supported metadata key ""title""|00001006020000#title]]. +The colon character (""'':''"") is a [[search operator|00001007705000]], in this example to specify a match. +""syntax"" is the [[search value|00001007706000]] that must match to the value of the given metadata key, here ""title"". + +A search expression may contain more than one search term, such as ''title:syntax''. +Search terms must be separated by one or more space characters, for example ''title:syntax title:search''. +All terms of a select expression must be true so that a zettel is selected. + +Above sequence of search expressions may be combined by specifying the keyword ''OR''. +At most one of those sequences must be true so that a zettel is selected. + +* [[Search term|00001007702000]] +* [[Search operator|00001007705000]] +* [[Search value|00001007706000]] Index: docs/manual/00001007702000.zettel ================================================================== --- docs/manual/00001007702000.zettel +++ docs/manual/00001007702000.zettel @@ -1,11 +1,12 @@ id: 00001007702000 title: Search term role: manual tags: #manual #search #zettelstore syntax: zmk -modified: 20220821163727 +created: 20220805150154 +modified: 20230612180954 A search term allows you to specify one search restriction. The result [[search expression|00001007700000]], which contains more than one search term, will be the applications of all restrictions. A search term can be one of the following (the first three term are collectively called __search literals__): @@ -15,10 +16,14 @@ If no search value is given, then all zettel containing the given metadata key are selected (or ignored, for a negated search operator). * An optional [[search operator|00001007705000]], followed by a [[search value|00001007706000]]. This specifies a full-text search for the given search value. + + However, the operators ""less"" and ""greater"" are not supported, they are internally translated into the ""match"" operators. + Similar, ""not less"" and ""not greater"" are translated into ""not match"". + It simply does not make sense to search the content of all zettel for words less than a specific word, for example. **Note:** the search value will be normalized according to Unicode NKFD, ignoring everything except letters and numbers. Therefore, the following search expression are essentially the same: ''"search syntax"'' and ''search syntax''. The first is a search expression with one search value, which is normalized to two strings to be searched for. The second is a search expression containing two search values, giving two string to be searched for. @@ -29,10 +34,17 @@ Since search literals may be negated, it is possible to form any boolean search expression. Any search expression will be in a [[disjunctive normal form|https://en.wikipedia.org/wiki/Disjunctive_normal_form]]. It has no effect on the following search terms initiated with a special uppercase word. +* The string ''PICK'', followed by a non-empty sequence of spaces and a number greater zero (called ""N""). + + This will pick randomly N elements of the result list, preserving the order of that list. + A zero value of N will produce the same result as if nothing was specified. + If specified multiple times, the lower value takes precedence. + + Example: ''PICK 5 PICK 3'' will be interpreted as ''PICK 3''. * The string ''ORDER'', followed by a non-empty sequence of spaces and the name of a metadata key, will specify an ordering of the result list. If you include the string ''REVERSE'' after ''ORDER'' but before the metadata key, the ordering will be reversed. Example: ''ORDER published'' will order the resulting list based on the publishing data, while ''ORDER REVERSED published'' will return a reversed result order. @@ -74,6 +86,7 @@ * A search term containing no [[search operator character|00001007705000]] is treated as a full-text search. * The first search operator character found in a search term divides the term into two pieces. If the first piece, from the beginning of the search term to the search operator character, is syntactically a metadata key, the search term is treated as a metadata-based search. * Otherwise, the search term is treated as a full-text search. -If a term like ''ORDER'', ''ORDER REVERSE'', ''OFFSET'', or ''LIMIT'' is not followed by an appropriate value, it is interpreted as a search value for a full-text search. For example, ''ORDER 123'' will search for a zettel conatining the strings ""ORDER"" (case-insensitive) and ""123"". +If a term like ''PICK'', ''ORDER'', ''ORDER REVERSE'', ''OFFSET'', or ''LIMIT'' is not followed by an appropriate value, it is interpreted as a search value for a full-text search. +For example, ''ORDER 123'' will search for a zettel containing the strings ""ORDER"" (case-insensitive) and ""123"". Index: docs/manual/00001007705000.zettel ================================================================== --- docs/manual/00001007705000.zettel +++ docs/manual/00001007705000.zettel @@ -1,32 +1,44 @@ id: 00001007705000 title: Search operator role: manual tags: #manual #search #zettelstore syntax: zmk -modified: 20220819194709 +created: 20220805150154 +modified: 20230612180539 A search operator specifies how the comparison of a search value and a zettel should be executed. Every comparison is done case-insensitive, treating all uppercase letters the same as lowercase letters. The following are allowed search operator characters: -* The exclamation mark character (""!"", U+0021) negates the meaning -* The tilde character (""''~''"", U+007E) compares on matching (""match operator"") -* The greater-than sign character (""''>''"", U+003E) matches if there is some prefix (""prefix operator"") -* The less-than sign character (""''<''"", U+003C) compares a suffix relationship (""suffix operator"") -* The colon character (""'':''"", U+003A) compares on equal words (""has operator"") -* The question mark (""''?''"", U+003F) checks for an existing metadata key (""exist operator"") - -Since the exclamation mark character can be combined with the other, there are 10 possible combinations: +* The exclamation mark character (""''!''"", U+0021) negates the meaning. +* The equal sign character (""''=''"", U+003D) compares on equal content (""equals operator""). +* The tilde character (""''~''"", U+007E) compares on matching (""match operator""). +* The left square bracket character (""''[''"", U+005B) matches if there is some prefix (""prefix operator""). +* The right square bracket character (""'']''"", U+005D) compares a suffix relationship (""suffix operator""). +* The colon character (""'':''"", U+003A) compares depending on the on the actual [[key type|00001006030000]] (""has operator""). + In most cases, it acts as a equals operator, but for some type it acts as the match operator. +* The less-than sign character (""''<''"", U+003C) matches if the search value is somehow less then the metadata value (""less operator""). +* The greater-than sign character (""''>''"", U+003E) matches if the search value is somehow greater then the metadata value (""greater operator""). +* The question mark (""''?''"", U+003F) checks for an existing metadata key (""exist operator""). + In this case no [[search value|00001007706000]] must be given. + +Since the exclamation mark character can be combined with the other, there are 18 possible combinations: # ""''!''"": is an abbreviation of the ""''!~''"" operator. # ""''~''"": is successful if the search value matched the value to be compared. # ""''!~''"": is successful if the search value does not match the value to be compared. -# ""'':''"": is successful if the search value is equal to one word of the value to be compared. -# ""''!:''"": is successful if the search value is not equal to any word of the value to be compared. -# ""''>''"": is successful if the search value is a prefix of the value to be compared. -# ""''!>''"": is successful if the search value is not a prefix of the value to be compared. -# ""''<''"": is successful if the search value is a suffix of the value to be compared. -# ""''!<''"": is successful if the search value is not a suffix of the value to be compared. +# ""''=''"": is successful if the search value is equal to one word of the value to be compared. +# ""''!=''"": is successful if the search value is not equal to any word of the value to be compared. +# ""''[''"": is successful if the search value is a prefix of the value to be compared. +# ""''![''"": is successful if the search value is not a prefix of the value to be compared. +# ""'']''"": is successful if the search value is a suffix of the value to be compared. +# ""''!]''"": is successful if the search value is not a suffix of the value to be compared. +# ""'':''"": is successful if the search value is has/match one word of the value to be compared. +# ""''!:''"": is successful if the search value is not match/has to any word of the value to be compared. +# ""''<''"": is successful if the search value is less than the value to be compared. +# ""''!<''"": is successful if the search value is not less than, e.g. greater or equal than the value to be compared. +# ""''>''"": is successful if the search value is greater than the value to be compared. +# ""''!>''"": is successful if the search value is not greater than, e.g. less or equal than the value to be compared. # ""''?''"": is successful if the metadata contains the given key. # ""''!?''"": is successful if the metadata does not contain the given key. # ""''''"": a missing search operator can only occur for a full-text search. It is equal to the ""''~''"" operator. ADDED docs/manual/00001007710000.zettel Index: docs/manual/00001007710000.zettel ================================================================== --- docs/manual/00001007710000.zettel +++ docs/manual/00001007710000.zettel @@ -0,0 +1,17 @@ +id: 20230707202600 +title: Query: List of Zettel Identifier +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 20230707202652 + +A query may start with a list of [[zettel identifier|00001006050000]], where the identifier are separated by one ore more space characters. + +If you specify at least one query directive, this list acts as a input for the first query directive. +Otherwise, only the zettel of the given list are used to evaluated the search expression or the action list (if no search expression was given). + +Some examples: +* [[query:00001007700000 CONTEXT]] returns the context of this zettel. +* [[query:00001007700000 00001007031140 man]] searches the given two zettel for a string ""man"". +* [[query:00001007700000 00001007031140 | tags]] return a tag cloud with tags from those two zettel. +* [[query:00001007700000 00001007031140]] returns a list with the two zettel. ADDED docs/manual/00001007720000.zettel Index: docs/manual/00001007720000.zettel ================================================================== --- docs/manual/00001007720000.zettel +++ docs/manual/00001007720000.zettel @@ -0,0 +1,19 @@ +id: 00001007720000 +title: Query Directives +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 20230707203135 +modified: 20230731162002 + +A query directive transforms a list of zettel identifier into a list of zettel identifiert. +It is only valid if a list of zettel identifier is specified at the beginning of the query expression. +Otherwise the text of the directive is interpreted as a search expression. +For example, ''CONTEXT'' is interpreted as a full-text search for the word ""context"". + +Every query directive therefore consumes a list of zettel, and it produces a list of zettel according to the specific directive. + +* [[Context directive|00001007720300]] +* [[Ident directive|00001007720600]] +* [[Items directive|00001007720900]] +* [[Unlinked directive|00001007721200]] ADDED docs/manual/00001007720300.zettel Index: docs/manual/00001007720300.zettel ================================================================== --- docs/manual/00001007720300.zettel +++ docs/manual/00001007720300.zettel @@ -0,0 +1,37 @@ +id: 00001007720300 +title: Query: Context Directive +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 20230707204706 +modified: 20230724153832 + +A context directive calculates the __context__ of a list of zettel identifier. +It starts with the keyword ''CONTEXT''. + +Optionally you may specify some context details, after the keyword ''CONTEXT'', separated by space characters. +These are: +* ''BACKWARD'': search for context only though backward links, +* ''FORWARD'': search for context only through forward links, +* ''COST'', one or more space characters, and a positive integer: set the maximum __cost__ (default: 17), +* ''MAX'', one or more space characters, and a positive integer: set the maximum number of context zettel (default: 200). + +If no ''BACKWARD'' and ''FORWARD'' is specified, a search for context zettel will be done though backward and forward links. + +The cost of a context zettel is calculated iteratively: +* Each of the specified zettel hast a cost of one. +* A zettel found as a single folge zettel or single precursor zettel has the cost of the originating zettel, plus one. +* A zettel found as a single successor zettel or single predecessor zettel has the cost of the originating zettel, plus two. +* A zettel found via another link without being part of a [[set of zettel identifier|00001006032500]], has the cost of the originating zettel, plus three. +* A zettel which is part of a set of zettel identifier, has the cost of the originating zettel, plus one of the three choices above and multiplied with roughly a logarithmic value based on the size of the set. +* A zettel with the same tag, has the cost of the originating zettel, plus the number of zettel with the same tag (if it is less than eight), or the cost of the originating zettel plus two, multiplied by number of zettel with the same tag divided by four. + +The maximum cost is only checked for all zettel that are not directly reachable from the initial, specified list of zettel. +This ensures that initial zettel that have only a highly used tag, will also produce some context zettel. + +Despite its possibly complicated structure, this algorithm ensures in practice that the zettel context is a list of zettel, where the first elements are ""near"" to the specified zettel and the last elements are more ""distant"" to the specified zettel. +It also penalties zettel that acts as a ""hub"" to other zettel, to make it more likely that only relevant zettel appear on the context list. + +This directive may be specified only once as a query directive. +A second occurence of ''CONTEXT'' is interpreted as a [[search expression|00001007701000]]. +In most cases it is easier to adjust the maximum cost than to perform another context search, which is relatively expensive in terms of retrieving power. ADDED docs/manual/00001007720600.zettel Index: docs/manual/00001007720600.zettel ================================================================== --- docs/manual/00001007720600.zettel +++ docs/manual/00001007720600.zettel @@ -0,0 +1,12 @@ +id: 00001007720600 +title: Query: Ident Directive +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 20230724153018 +modified: 20230724154015 + +An ident directive is needed if you want to specify just a list of zettel identifier. +It starts with / consists of the keyword ''IDENT''. + +When not using the ident directive, zettel identifier are interpreted as a [[search expression|00001007701000]]. ADDED docs/manual/00001007720900.zettel Index: docs/manual/00001007720900.zettel ================================================================== --- docs/manual/00001007720900.zettel +++ docs/manual/00001007720900.zettel @@ -0,0 +1,39 @@ +id: 00001007720900 +title: Query: Items Directive +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 00010101000000 +modified: 20230729120755 + +The items directive works on zettel that act as a ""table of contents"" for other zettel. +The [[initial zettel|00001000000000]] of this manual is one example, the [[general API description|00001012000000]] is another. +Every zettel with a certain internal structure can act as the ""table of contents"" for others. + +What is a ""table of contents""? +Basically, it is just a list of references to other zettel. + +To retrieve the items of a zettel, the software looks at first level [[list items|00001007030200]]. +If an item contains a valid reference to a zettel, this reference will be interpreted as an item in the items list, in the ""table of contents"". + +This applies only to first level list items (ordered or unordered list), but not to deeper levels. +Only the first reference to a valid zettel is collected for the table of contents. +Following references to zettel within such an list item are ignored. + + +```` +# curl 'http://127.0.0.1:23123/z?q=00001000000000+ITEMS' +00001001000000 Introduction to the Zettelstore +00001002000000 Design goals for the Zettelstore +00001003000000 Installation of the Zettelstore software +00001004000000 Configuration of Zettelstore +00001005000000 Structure of Zettelstore +00001006000000 Layout of a Zettel +00001007000000 Zettelmarkup +00001008000000 Other Markup Languages +00001010000000 Security +00001012000000 API +00001014000000 Web user interface +00001017000000 Tips and Tricks +00001018000000 Troubleshooting +```` ADDED docs/manual/00001007721200.zettel Index: docs/manual/00001007721200.zettel ================================================================== --- docs/manual/00001007721200.zettel +++ docs/manual/00001007721200.zettel @@ -0,0 +1,44 @@ +id: 00001007721200 +title: Query: Unlinked Directive +role: manual +tags: #api #manual #zettelstore +syntax: zmk +created: 20211119133357 +modified: 20230731163343 + +The value of a personal Zettelstore is determined in part by explicit connections between related zettel. +If the number of zettel grow, some of these connections are missing. +There are various reasons for this. +Maybe, you forgot that a zettel exists. +Or you add a zettel later, but forgot that previous zettel already mention its title. + +__Unlinked references__ are phrases in a zettel that mention the title of another, currently unlinked zettel. + +To retrieve unlinked references to an existing zettel, use the query ''{ID} UNLINKED''. + +```` +# curl 'http://127.0.0.1:23123/z?q=00001012000000+UNLINKED' +00001012921200 API: Encoding of Zettel Access Rights +```` + +This returns all zettel (in this case: only one) that references the title of the given Zettel, but does not references it directly. + +In addition you may add __phrases__ if you do not want to scan for the title of the given zettel. + +``` +# curl 'http://localhost:23123/z?q=00001012054400+UNLINKED+PHRASE+API' +00001012050600 API: Provide an access token +00001012921200 API: Encoding of Zettel Access Rights +00001012080200 API: Check for authentication +00001012080500 API: Refresh internal data +00001012050200 API: Authenticate a client +00001010040700 Access token +``` + +This finds all zettel that does contain the phrase ""API"" but does not directly reference the given zettel. + +The directive searches within all zettel whether the title of the specified zettel occurs there. +The other zettel must not link to the specified zettel. +The title must not occur within a link (e.g. to another zettel), in a [[heading|00001007030300]], in a [[citation|00001007040340]], and must have a uniform formatting. +The match must be exact, but is case-insensitive. +For example ""API"" does not match ""API:"". ADDED docs/manual/00001007770000.zettel Index: docs/manual/00001007770000.zettel ================================================================== --- docs/manual/00001007770000.zettel +++ docs/manual/00001007770000.zettel @@ -0,0 +1,18 @@ +id: 00001007770000 +title: Query: Action List +role: manual +tags: #manual #search #zettelstore +syntax: zmk +created: 20230707205246 +modified: 20230707205532 + +With a [[list of zettel identifier|00001007710000]], a [[query directives|00001007720000]], or a [[search expression|00001007701000]], a list of zettel is selected. +__Actions__ allow to modify this list to a certain degree. + +Which actions are allowed depends on the context. +However, actions are further separated into __parameter action__ and __aggregate actions__. +A parameter action just sets a parameter for an aggregate action. +An aggregate action transforms the list of selected zettel into a different, aggregate form. +Only the first aggregate form is executed, following aggregate actions are ignored. + +In most contexts, valid actions include the name of metadata keys, at least of type [[Word|00001006035500]], [[WordSet|00001006036000]], or [[TagSet|00001006034000]]. Index: docs/manual/00001007780000.zettel ================================================================== --- docs/manual/00001007780000.zettel +++ docs/manual/00001007780000.zettel @@ -2,29 +2,45 @@ title: Formal syntax of query expressions role: manual tags: #manual #reference #search #zettelstore syntax: zmk created: 20220810144539 -modified: 20220913134024 +modified: 20230731160413 ``` -QueryExpression := SearchExpression ActionExpression? -SearchExpression := SearchTerm (SPACE+ SearchTerm)*. -SearchTerm := SearchOperator? SearchValue - | SearchKey SearchOperator SearchValue? - | SearchKey ExistOperator - | "OR" - | "RANDOM" - | "ORDER" SPACE+ ("REVERSE" SPACE+)? SearchKey - | "OFFSET" SPACE+ PosInt - | "LIMIT" SPACE+ PosInt. -SearchValue := Word. -SearchKey := MetadataKey. -SearchOperator := '!' - | ('!')? ('~' | ':' | '<' | '>'). -ExistOperator := '?' - | '!' '?'. -PosInt := '0' - | ('1' .. '9') DIGIT*. -ActionExpression := '|' (Word (SPACE+ Word)*)? -Word := NO-SPACE NO-SPACE* +QueryExpression := ZettelList? QueryDirective* SearchExpression ActionExpression? +ZettelList := (ZID (SPACE+ ZID)*). +ZID := '0'+ ('1' .. '9'') DIGIT* + | ('1' .. '9') DIGIT*. +QueryDirective := ContextDirective + | IdentDirective + | ItemsDirective + | UnlinkedDirective. +ContextDirective := "CONTEXT" (SPACE+ ContextDetail)*. +ContextDetail := "BACKWARD" + | "FORWARD" + | "COST" SPACE+ PosInt + | "MAX" SPACE+ PosInt. +IdentDirective := IDENT. +ItemsDirective := ITEMS. +UnlinkedDirective := UNLINKED (SPACE+ PHRASE SPACE+ Word)*. +SearchExpression := SearchTerm (SPACE+ SearchTerm)*. +SearchTerm := SearchOperator? SearchValue + | SearchKey SearchOperator SearchValue? + | SearchKey ExistOperator + | "OR" + | "RANDOM" + | "PICK" SPACE+ PosInt + | "ORDER" SPACE+ ("REVERSE" SPACE+)? SearchKey + | "OFFSET" SPACE+ PosInt + | "LIMIT" SPACE+ PosInt. +SearchValue := Word. +SearchKey := MetadataKey. +SearchOperator := '!' + | ('!')? ('~' | ':' | '[' | '}'). +ExistOperator := '?' + | '!' '?'. +PosInt := '0' + | ('1' .. '9') DIGIT*. +ActionExpression := '|' (Word (SPACE+ Word)*)? +Word := NO-SPACE NO-SPACE* ``` Index: docs/manual/00001007790000.zettel ================================================================== --- docs/manual/00001007790000.zettel +++ docs/manual/00001007790000.zettel @@ -2,15 +2,17 @@ title: Useful query expressions role: manual tags: #example #manual #search #zettelstore syntax: zmk created: 20220810144539 -modified: 20220917174956 +modified: 20230706155134 |= Query Expression |= Meaning | [[query:role:configuration]] | Zettel that contains some configuration data for the Zettelstore | [[query:ORDER REVERSE created LIMIT 40]] | 40 recently created zettel | [[query:ORDER REVERSE published LIMIT 40]] | 40 recently updated zettel -| [[query:RANDOM LIMIT 40]] | 40 random zettel +| [[query:PICK 40]] | 40 random zettel, ordered by zettel identifier | [[query:dead?]] | Zettel with invalid / dead links | [[query:backward!? precursor!?]] | Zettel that are not referenced by other zettel | [[query:tags!?]] | Zettel without tags +| [[query:expire? ORDER expire]] | Zettel with an expire date, ordered from the nearest to the latest +| [[query:00001007700000 CONTEXT]] | Zettel within the context of the [[given zettel|00001007700000]] Index: docs/manual/00001007900000.zettel ================================================================== --- docs/manual/00001007900000.zettel +++ docs/manual/00001007900000.zettel @@ -1,10 +1,10 @@ id: 00001007900000 title: Zettelmarkup: Tutorial role: manual -tags: #manual #tutorial #zettelmarkup #zettelstore +tags: #manual #tutorial #zettelmarkup syntax: zmk created: 20220810182917 -modified: 20220811135314 +modified: 20221209191820 * [[First steps|00001007903000]]: learn something about paragraphs, emphasized text, and lists. * [[Second steps|00001007906000]]: know about links, thematic breaks, and headings. ADDED docs/manual/00001007990000.zettel Index: docs/manual/00001007990000.zettel ================================================================== --- docs/manual/00001007990000.zettel +++ docs/manual/00001007990000.zettel @@ -0,0 +1,57 @@ +id: 00001007990000 +title: Zettelmarkup: Cheat Sheet +role: manual +tags: #manual #reference #zettelmarkup +syntax: zmk +created: 20221209191905 +modified: 20221209193310 + +=== Overview +This Zettelmarkup cheat sheet provides a quick overview of many Zettelmarkup elements. +It can not cover any special case. +If you need more information about any of these elements, please refer to the detailed description. + +=== Basic Syntax +|[[Text formatting|00001007040100]]|''__italic text__'' → __italic text__, ''**bold text**'' → **bold text**, ''""quoted text""'' → ""quoted text"" +|[[Text editing|00001007040100]]|''>>inserted text>>'' → >>inserted text>>, ''~~deleted text~~'' → ~~deleted text~~ +|[[Text literal formatting|00001007040200]]|''\'\'entered text\'\''' → ''entered text'', ''``source code``'' → ``source code``, ''==text output=='' → ==text output== +|[[Superscript, subscript|00001007040100]]|''m^^2^^'' → m^^2^^, ''H,,2,,O'' → H,,2,,O +|[[Links to other zettel|00001007040310]]|''[[Link text|00001007990000]]'' → [[Link text|00001007990000]] +|[[Links to external resources|00001007040310]]|''[[Zettelstore|https://zettelstore.de]]'' → [[Zettelstore|https://zettelstore.de]] +|[[Embed an image|00001007040322]]|''{{Image text|00000000040001}}'' → {{Image text|00000000040001}} +|[[Embed content of first paragraph|00001007040324]]|''{{00001007990000}}'' → {{00001007990000}} +|[[Footnote|00001007040330]]|''text[^footnote]'' → text[^footnote] +|[[Special characters / entities|00001007040000]]|''→'' → →, ''ℕ'' → ℕ, ''⌛'' → ⌛ + +=== Structuring +* [[Heading|00001007030300]]: ''=== Heading'', ''==== Sub-Heading'' +* [[Horizontal rule / thematic break|00001007030400]]: ''---'' +* [[Paragraphs|00001007030000]] are separated by an empty line +--- + +=== Lists +[[Unnumbered list|00001007030200]]: +``` +* First list item +* Second list item +* Third list item +``` +[[Numbered list|00001007030200]]: +``` +# Item number 1 +# Item number 2 +# Item number 3 +``` +[[Description List|00001007030100]]: +``` +; Term +: Definition +; Other Term +: Definition for other term +``` +=== [[Tables|00001007031000]] +``` +|=Header|Because|Equal Sign +|Cell 1.1|Cell 1.2| Cell 1.3 +|Cell 2.1|Cell 2.2 +``` Index: docs/manual/00001008000000.zettel ================================================================== --- docs/manual/00001008000000.zettel +++ docs/manual/00001008000000.zettel @@ -2,11 +2,11 @@ title: Other Markup Languages role: manual tags: #manual #zettelstore syntax: zmk created: 20210126175300 -modified: 20221018115054 +modified: 20230529223634 [[Zettelmarkup|00001007000000]] is not the only markup language you can use to define your content. Zettelstore is quite agnostic with respect to markup languages. Of course, Zettelmarkup plays an important role. However, with the exception of zettel titles, you can use any (markup) language that is supported: @@ -15,17 +15,19 @@ * HTML template data * Image formats: GIF, PNG, JPEG, SVG * Markdown * Plain text, not further interpreted -The [[metadata key|00001006020000#syntax]] ""''syntax''"" specifies which language should be used. +The [[metadata key|00001006020000#syntax]] ""''syntax''"" specifies which markup language / data format should be used. If it is not given, it defaults to ''plain''. The following syntax values are supported: ; [!css|''css''] : A [[Cascading Style Sheet|https://www.w3.org/Style/CSS/]], to be used when rendering a zettel as HTML. -; [!gif|''gif'']; [!jpeg|''jpeg'']; [!jpg|''jpg'']; [!png|''png''] +; [!draw|''draw''] +: A [[language|00001008050000]] to ""draw"" a graphic by using some simple Unicode characters. +; [!gif|''gif'']; [!jpeg|''jpeg'']; [!jpg|''jpg'']; [!png|''png'']; [!webp|''webp''] : The formats for pixel graphics. Typically the data is stored in a separate file and the syntax is given in the meta-file, which has the same name as the zettel identifier and has no file extension.[^Before version 0.2, the meta-file had the file extension ''.meta''] ; [!html|''html''] : Hypertext Markup Language, will not be parsed further. Instead, it is treated as [[text|#text]], but will be encoded differently for [[HTML format|00001012920510]] (same for the [[web user interface|00001014000000]]). @@ -37,31 +39,23 @@ See [[security aspects of Markdown|00001008010000#security-aspects]] for some details. ; [!markdown|''markdown''], [!md|''md''] : For those who desperately need [[Markdown|https://daringfireball.net/projects/markdown/]]. Since the world of Markdown is so diverse, a [[CommonMark|00001008010500]] parser is used. See [[Use Markdown within Zettelstore|00001008010000]]. -; [!mustache|''mustache''] -: A [[Mustache template|https://mustache.github.io/]], used when rendering a zettel as HTML for the [[web user interface|00001014000000]]. ; [!none|''none''] : Only the metadata of a zettel is ""parsed"". Useful for displaying the full metadata. The [[runtime configuration zettel|00000000000100]] uses this syntax. The zettel content is ignored. -; [!pikchr]''pikchr'' -: A [[PIC|https://en.wikipedia.org/wiki/Pic_language]]-like [[markup language for diagrams|https://pikchr.org/]]. ; [!svg|''svg''] : [[Scalable Vector Graphics|https://www.w3.org/TR/SVG2/]]. +; [!sxn|''sxn''] +: S-Expressions, as implemented by [[sx|https://zettelstore.de/sx]]. + Often used to specify templates when rendering a zettel as HTML for the [[web user interface|00001014000000]] (with the help of sxhtml]). ; [!text|''text''], [!plain|''plain''], [!txt|''txt''] : Plain text that must not be interpreted further. ; [!zmk|''zmk''] : [[Zettelmarkup|00001007000000]]. The actual values are also listed in a zettel named [[Zettelstore Supported Parser|00000000000092]]. If you specify something else, your content will be interpreted as plain text. - -=== Language for other elements of a zettel -[[Zettelmarkup|00001007000000]] allows to specify [[evaluation blocks|00001007031300]], which also receive a syntax value. -An evaluation blocks is typically interpreted by external software, for example [[Zettel Presenter|00001006055000#external-applications]]. -However, some values are interpreted by Zettelstore during evaluation of a zettel: -; [!draw|''draw''] -: A [[language|00001008050000]] to ""draw"" a graphic by using some simple Unicode characters. Index: docs/manual/00001008050000.zettel ================================================================== --- docs/manual/00001008050000.zettel +++ docs/manual/00001008050000.zettel @@ -1,11 +1,12 @@ id: 00001008050000 -title: The ""draw"" language +title: The "draw" language role: manual tags: #graphic #manual #zettelstore syntax: zmk -modified: 20220311120439 +created: 20220131142036 +modified: 20230403123738 Sometimes, ""a picture is worth a thousand words"". To create some graphical representations, Zettelmarkup provides a simple mechanism. Characters like ""''|''"" or ""''-''"" already provide some visual feedback. For example, to create a picture containing two boxes that are connected via an arrow, the following representation is possible: Index: docs/manual/00001010040200.zettel ================================================================== --- docs/manual/00001010040200.zettel +++ docs/manual/00001010040200.zettel @@ -1,11 +1,12 @@ id: 00001010040200 title: Creating an user zettel role: manual tags: #authentication #configuration #manual #security #zettelstore syntax: zmk -modified: 20211127174207 +created: 20210126175322 +modified: 20221205160251 All data to be used for authenticating a user is store in a special zettel called ""user zettel"". A user zettel must have set the following two metadata fields: ; ''user-id'' (""user identification"") @@ -17,10 +18,12 @@ The following metadata elements are optional: ; ''user-role'' : Associate the user with some basic privileges, e.g. a [[user role|00001010070300]] + +A user zettel may additionally contain metadata that [[overwrites corresponding values|00001004020200]] of the [[runtime configuration|00001004020000]]. A user zettel can only be created by the owner of the Zettelstore. The owner should execute the following steps to create a new user zettel: Index: docs/manual/00001012000000.zettel ================================================================== --- docs/manual/00001012000000.zettel +++ docs/manual/00001012000000.zettel @@ -2,18 +2,18 @@ title: API role: manual tags: #api #manual #zettelstore syntax: zmk created: 20210126175322 -modified: 20220923105117 +modified: 20230807171136 The API (short for ""**A**pplication **P**rogramming **I**nterface"") is the primary way to communicate with a running Zettelstore. Most integration with other systems and services is done through the API. The [[web user interface|00001014000000]] is just an alternative, secondary way of interacting with a Zettelstore. === Background -The API is HTTP-based and uses plain text and JSON as its main encoding format for exchanging messages between a Zettelstore and its client software. +The API is HTTP-based and uses plain text and [[symbolic expressions|00001012930000]] as its main encoding formats for exchanging messages between a Zettelstore and its client software. There is an [[overview zettel|00001012920000]] that shows the structure of the endpoints used by the API and gives an indication about its use. === Authentication If [[authentication is enabled|00001010040100]], most API calls must include an [[access token|00001010040700]] that proves the identity of the caller. @@ -20,26 +20,23 @@ * [[Authenticate an user|00001012050200]] to obtain an access token * [[Renew an access token|00001012050400]] without costly re-authentication * [[Provide an access token|00001012050600]] when doing an API call === Zettel lists +* [[List all zettel|00001012051200]] * [[Query the list of all zettel|00001012051400]] -* [[List plain text titles of all zettel|00001012051200]] === Working with zettel * [[Create a new zettel|00001012053200]] * [[Retrieve metadata and content of an existing zettel|00001012053300]] * [[Retrieve metadata of an existing zettel|00001012053400]] * [[Retrieve evaluated metadata and content of an existing zettel in various encodings|00001012053500]] * [[Retrieve parsed metadata and content of an existing zettel in various encodings|00001012053600]] -* [[Retrieve context of an existing zettel|00001012053800]] -* [[Retrieve unlinked references to an existing zettel|00001012053900]] -* [[Retrieve zettel order within an existing zettel|00001012054000]] * [[Update metadata and content of a zettel|00001012054200]] * [[Rename a zettel|00001012054400]] * [[Delete a zettel|00001012054600]] === Various helper methods * [[Retrieve administrative data|00001012070500]] * [[Execute some commands|00001012080100]] ** [[Check for authentication|00001012080200]] ** [[Refresh internal data|00001012080500]] Index: docs/manual/00001012050200.zettel ================================================================== --- docs/manual/00001012050200.zettel +++ docs/manual/00001012050200.zettel @@ -1,51 +1,52 @@ id: 00001012050200 title: API: Authenticate a client role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20220107215844 +created: 20210126175322 +modified: 20230412150544 Authentication for future API calls is done by sending a [[user identification|00001010040200]] and a password to the Zettelstore to obtain an [[access token|00001010040700]]. This token has to be used for other API calls. It is valid for a relatively short amount of time, as configured with the key ''token-lifetime-api'' of the [[startup configuration|00001004010000#token-lifetime-api]] (typically 10 minutes). The simplest way is to send user identification (''IDENT'') and password (''PASSWORD'') via [[HTTP Basic Authentication|https://tools.ietf.org/html/rfc7617]] and send them to the [[endpoint|00001012920000]] ''/a'' with a POST request: ```sh # curl -X POST -u IDENT:PASSWORD http://127.0.0.1:23123/a -{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":600} +("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA2MiwiaWF0IjoxNjgxMzA0MDAyLCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.kdF8PdiL50gIPkRD3ovgR6nUXR0-80EKAXcY2zVYgYvryF09iXnNR3zrvYnGzdrArMcnvAYqVvuXtqhQj2jG9g" 600) ``` Some tools, like [[curl|https://curl.haxx.se/]], also allow to specify user identification and password as part of the URL: ```sh # curl -X POST http://IDENT:PASSWORD@127.0.0.1:23123/a -{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":600} +("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA4NiwiaWF0IjoxNjgxMzA0MDI2LCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.kZd3prYc79dt9efDsrYVHtKrjWyOWvfByjeeUB3hf_vs43V3SNJqmb8k-zTHVNWOK0-5orVPrg2tIAqbXqmkhg" 600) ``` If you do not want to use Basic Authentication, you can also send user identification and password as HTML form data: ```sh # curl -X POST -d 'username=IDENT&password=PASSWORD' http://127.0.0.1:23123/a -{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":600} +("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA4OCwiaWF0IjoxNjgxMzA0MDI4LCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.qIEyOMFXykCApWtBaqbSESwTL96stWl2LRICiRNAXUjcY-mwx_SSl9L5Fj2FvmrI1K1RBvWehjoq8KZUNjhJ9Q" 600) ``` -In all cases, you will receive an JSON object will all [[relevant data|00001012921000]] to be used for further API calls. +In all cases, you will receive a list with three elements that will contain all [[relevant data|00001012921000]] to be used for further API calls. **Important:** obtaining a token is a time-intensive process. Zettelstore will delay every request to obtain a token for a certain amount of time. Please take into account that this request will take approximately 500 milliseconds, under certain circumstances more. However, if [[authentication is not enabled|00001010040100]] and you send an authentication request, no user identification/password checking is done and you receive an artificial token immediate, without any delay: ```sh # curl -X POST -u IDENT:PASSWORD http://127.0.0.1:23123/a -{"token":"freeaccess","token_type":"Bearer","expires_in":316224000} +("Bearer" "freeaccess" 316224000) ``` In this case, it is even possible to omit the user identification/password. === HTTP Status codes -In all cases of successful authentication, a JSON object is returned, which contains the token under the key ''"token"''. +In all cases of successful authentication, a list is returned, which contains the token as the second element. A successful authentication is signaled with the HTTP status code 200, as usual. Other status codes possibly send by the Zettelstore: ; ''400'' : Unable to process the request. Index: docs/manual/00001012050400.zettel ================================================================== --- docs/manual/00001012050400.zettel +++ docs/manual/00001012050400.zettel @@ -1,37 +1,38 @@ id: 00001012050400 title: API: Renew an access token role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20220107215751 +created: 20210126175322 +modified: 20230412160219 An access token is only valid for a certain duration. Since the [[authentication process|00001012050200]] will need some processing time, there is a way to renew the token without providing full authentication data. Send a HTTP PUT request to the [[endpoint|00001012920000]] ''/a'' and include the current access token in the ''Authorization'' header: ```sh # curl -X PUT -H 'Authorization: Bearer TOKEN' http://127.0.0.1:23123/a -{"access_token":"eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTYwMTczMTI3NSwiaWF0IjoxNjAxNzMwNjc1LCJzdWIiOiJhYmMiLCJ6aWQiOiIyMDIwMTAwMzE1MDEwMCJ9.ekhXkvn146P2bMKFQcU-bNlvgbeO6sS39hs6U5EKfjIqnSInkuHYjYAIfUqf_clYRfr6YBlX5izii8XfxV8jhg","token_type":"Bearer","expires_in":456} +("Bearer" "eyJhbGciOiJIUzUxMiJ9.eyJfdGsiOjEsImV4cCI6MTY4MTMwNDA4NiwiaWF0IjoxNjgxMzA0MDI2LCJzdWIiOiJvd25lciIsInppZCI6IjIwMjEwNjI5MTYzMzAwIn0.kZd3prYc79dt9efDsrYVHtKrjWyOWvfByjeeUB3hf_vs43V3SNJqmb8k-zTHVNWOK0-5orVPrg2tIAqbXqmkhg" 456) ``` You may receive a new access token, or the current one if it was obtained not a long time ago. However, the lifetime of the returned [[access token|00001012921000]] is accurate. If [[authentication is not enabled|00001010040100]] and you send a renew request, no checking is done and you receive an artificial token immediate, without any delay: ```sh # curl -X PUT -H 'Authorization: Bearer freeaccess' http://127.0.0.1:23123/a -{"token":"freeaccess","token_type":"Bearer","expires_in":316224000} +("Bearer" "freeaccess" 316224000) ``` In this case, it is even possible to omit the access token. === HTTP Status codes ; ''200'' -: Renew process was successful, the body contains an [[appropriate JSON object|00001012921000]]. +: Renew process was successful, the body contains a [[list|00001012921000]] with the relevant data. ; ''400'' : The renew process was not successful. There are several reasons for this. Maybe access bearer token was not valid. Probably you should [[authenticate|00001012050200]] again with user identification and password. Index: docs/manual/00001012051200.zettel ================================================================== --- docs/manual/00001012051200.zettel +++ docs/manual/00001012051200.zettel @@ -1,63 +1,81 @@ id: 00001012051200 -title: API: List plain text titles of all or some zettel +title: API: List all zettel role: manual tags: #api #manual #zettelstore syntax: zmk created: 20210126175322 -modified: 20220923105412 +modified: 20230807170810 -To list the plain text titles of all zettel just send a HTTP GET request to the [[endpoint|00001012920000]] ''/z''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. +To list all zettel just send a HTTP GET request to the [[endpoint|00001012920000]] ''/z''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. +Always use the endpoint ''/z'' to work with a list of zettel. -A plain text document is returned, with one line per zettel. +Without further specifications, a plain text document is returned, with one line per zettel. Each line contains in the first 14 characters the [[zettel identifier|00001006050000]]. Separated by a space character, the title of the zettel follows: ```sh # curl http://127.0.0.1:23123/z -00001012051200 API: Renew an access token -00001012050600 API: Provide an access token -00001012050400 API: Renew an access token -00001012050200 API: Authenticate a client -00001012000000 API -``` - -The query parameter ""''q''"" allows you to specify [[query expressions|00001007700000]] for a full-text search of all zettel content and/or restricting the search according to specific metadata, similar to endpoint ''/q'' to [[query zettel|00001012051400]]. - -You are allowed to specify this query parameter more than once. - -This parameter loosely resembles the search form of the [[web user interface|00001014000000]]. - -For example, if you want to retrieve all zettel that contain the string ""API"" in its title, your request will be: -```sh -# curl 'http://127.0.0.1:23123/z?q=title%3AAPI' -00001012921000 API: JSON structure of an access token -00001012920500 Formats available by the API -00001012920000 Endpoints used by the API -... -``` - -An implicit precondition is that the zettel must contain the given metadata key. -For a metadata key like [[''title''|00001006020000#title]], which has a default value, this precondition should always be true. -But the situation is different for a key like [[''url''|00001006020000#url]]. -Both ``curl 'http://localhost:23123/z?q=url%3A'`` and ``curl 'http://localhost:23123/z?q=url%3A!'`` may result in an empty list. - -Alternatively, you also can use the [[endpoint|00001012920000]] ''/z'' for a simpler result format. -The first example translates to: -```sh -# curl 'http://127.0.0.1:23123/z?q=title%3AAPI' -00001012921000 API: JSON structure of an access token -00001012920500 Formats available by the API -00001012920000 Endpoints used by the API -... -``` - -=== Other output formats -If you want to get the list of metadata of all or some zettel in JSON format, use endpoint ''/q'' to [[query the list of zettel|00001012051400]]. - -=== HTTP Status codes -; ''200'' -: Retrieval was successful, the body contains an [[appropriate JSON object|00001012921000]]. +... +00001012051200 API: List all zettel +00001012050600 API: Provide an access token +00001012050400 API: Renew an access token +00001012050200 API: Authenticate a client +... +``` + +The list is **not** sorted, even in the these examples where it appears to be sorted. +If you want to have it ordered, you must specify it with the help of a [[query expression|00001007700000]] / [[search term|00001007702000]]. +See [[Query the list of all zettel|00001012051400]] how to do it. + +=== Data output + +Alternatively, you may retrieve the zettel list as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data'': + +```sh +# curl 'http://127.0.0.1:23123/z?enc=data' +(meta-list (query "") (human "") (list (zettel (id "00001012921200") (meta (title "API: Encoding of Zettel Access Rights") (role "manual") (tags "#api #manual #reference #zettelstore") (syntax "zmk") (back "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000") (backward "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000") (box-number "1") (created "00010101000000") (forward "00001003000000 00001006020400 00001010000000 00001010040100 00001010040200 00001010070200 00001010070300") (modified "20220201171959") (published "20220201171959")) (rights 62)) (zettel (id "00001007030100") ... +``` + +Pretty-printed, this results in: +``` +(meta-list (query "") + (human "") + (list (zettel (id "00001012921200") + (meta (title "API: Encoding of Zettel Access Rights") + (role "manual") + (tags "#api #manual #reference #zettelstore") + (syntax "zmk") + (back "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000") + (backward "00001012051200 00001012051400 00001012053300 00001012053400 00001012053900 00001012054000") + (box-number "1") + (created "00010101000000") + (forward "00001003000000 00001006020400 00001010000000 00001010040100 00001010040200 00001010070200 00001010070300") + (modified "20220201171959") + (published "20220201171959")) + (rights 62)) + (zettel (id "00001007030100") +``` + +* The result is a list, starting with the symbol ''meta-list''. +* Then, some key/value pairs are following, also nested. +* Keys ''query'' and ''human'' will be explained [[later in this manual|00001012051400]]. +* ''list'' starts a list of zettel. +* ''zettel'' itself start, well, a zettel. +* ''id'' denotes the zettel identifier, encoded as a string. +* Nested in ''meta'' are the metadata, each as a key/value pair. +* ''rights'' specifies the [[access rights|00001012921200]] the user has for this zettel. + +=== Note +This request (and similar others) will always return a list of metadata, provided the request was syntactically correct. +There will never be a HTTP status code 403 (Forbidden), even if [[authentication was enabled|00001010040100]] and you did not provide a valid access token. +In this case, the resulting list might be quite short (some zettel will have [[public visibility|00001010070200]]) or the list might be empty. + +With this call, you cannot differentiate between an empty result list (e.g because your search did not found a zettel with the specified term) and an empty list because of missing authorization (e.g. an invalid access token). + +=== HTTP Status codes +; ''200'' +: Retrieval was successful, the body contains an appropriate data value. ; ''400'' : Request was not valid. There are several reasons for this. Maybe the access bearer token was not valid. Index: docs/manual/00001012051400.zettel ================================================================== --- docs/manual/00001012051400.zettel +++ docs/manual/00001012051400.zettel @@ -2,44 +2,106 @@ title: API: Query the list of all zettel role: manual tags: #api #manual #zettelstore syntax: zmk created: 20220912111111 -modified: 20220923105405 +modified: 20230807170638 +precursor: 00001012051200 -The [[endpoint|00001012920000]] ''/q'' allows to query the list of all zettel[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. +The [[endpoint|00001012920000]] ''/z'' also allows you to filter the list of all zettel[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] and optionally to provide some actions. A [[query|00001007700000]] is an optional [[search expression|00001007700000#search-expression]], together with an optional [[list of actions|00001007700000#action-list]] (described below). An empty search expression will select all zettel. An empty list of action, or no valid action, returns the list of all selected zettel metadata. Search expression and action list are separated by a vertical bar character (""''|''"", U+007C), and must be given with the query parameter ''q''. -For example, to list all roles used in the Zettelstore, send a HTTP GET request to the endpoint ''/q?q=|role''. -If successful, the output is a JSON object: - -```sh -# curl http://127.0.0.1:23123/q?q=|role -{"map":{"configuration":["00000000090002","00000000090000", ... ,"00000000000001"],"manual":["00001014000000", ... ,"00001000000000"],"zettel":["00010000000000", ... ,"00001012070500","00000000090001"]}} -``` - -The JSON object only contains the key ''"map"'' with the value of another object. -This second object contains all role names as keys and the list of identifier of those zettel with this specific role as a value. - -Similar, to list all tags used in the Zettelstore, send a HTTP GET request to the endpoint ''/q?q=|tags''. -If successful, the output is a JSON object: - -```sh -# curl http://127.0.0.1:23123/q?q=|tags -{"map":{"#api":[:["00001012921000","00001012920800","00001012920522",...],"#authorization":["00001010040700","00001010040400",...],...,"#zettelstore":["00010000000000","00001014000000",...,"00001001000000"]}} -``` - -The JSON object only contains the key ''"map"'' with the value of another object. -This second object contains all tags as keys and the list of identifier of those zettel with this tag as a value. - -If you want only those tags that occur at least 100 times, use the endpoint ''/q?q=|MIN100+tags''. -You see from this that actions are separated by space characters. +The query parameter ""''q''"" allows you to specify [[query expressions|00001007700000]] for a full-text search of all zettel content and/or restricting the search according to specific metadata. + +It is allowed to specify this query parameter more than once. + +This parameter loosely resembles the search form of the [[web user interface|00001014000000]] or those of [[Zettelmarkup's Query Transclusion|00001007031140]]. + +For example, if you want to retrieve all zettel that contain the string ""API"" in its title, your request will be: +```sh +# curl 'http://127.0.0.1:23123/z?q=title%3AAPI+ORDER+REVERSE+id+OFFSET+1' +00001012921000 API: Structure of an access token +00001012920500 Formats available by the API +00001012920000 Endpoints used by the API +... +``` + +If you want to retrieve a data document, as a [[symbolic expression|00001012930500]]: + +```sh +# curl 'http://127.0.0.1:23123/z?q=title%3AAPI+ORDER+REVERSE+id+OFFSET+1&enc=data' +(meta-list (query "title:API ORDER REVERSE id OFFSET 1") (human "title HAS API ORDER REVERSE id OFFSET 1") (list (zettel (id 1012921000) (meta (title "API: Structure of an access token") (role "manual") (tags "#api #manual #reference #zettelstore") (syntax "zmk") (back "00001012050600 00001012051200") (backward "00001012050200 00001012050400 00001012050600 00001012051200") (box-number "1") (created "20210126175322") (forward "00001012050200 00001012050400 00001012930000") (modified "20230412155303") (published "20230412155303")) (rights 62)) (zettel (id 1012920500) (meta (title "Encodings available via the API") (role "manual") (tags "#api #manual #reference #zettelstore") (syntax "zmk") (back "00001006000000 00001008010000 00001008010500 00001012053500 00001012053600") (backward "00001006000000 00001008010000 00001008010500 00001012053500 00001012053600") (box-number "1") (created "20210126175322") (forward "00001012000000 00001012920510 00001012920513 00001012920516 00001012920519 00001012920522 00001012920525") (modified "20230403123653") (published "20230403123653")) (rights 62)) (zettel (id 1012920000) (meta (title "Endpoints used by the API") ... +``` + +The data object contains a key ''"meta-list"'' to signal that it contains a list of metadata values (and some more). +It contains the keys ''"query"'' and ''"human"'' with a string value. +Both will contain a textual description of the underlying query if you select only some zettel with a [[query expression|00001007700000]]. +Without a selection, the values are the empty string. +''"query"'' returns the normalized query expression itself, while ''"human"'' is the normalized query expression to be read by humans. + +The symbol ''list'' starts the list of zettel data. +Data of a zettel is indicated by the symbol ''zettel'', followed by ''(id ID)'' that describes the zettel identifier as a numeric value. +Leading zeroes are removed. +Metadata starts with the symbol ''meta'', and each metadatum itself is a list of metadata key / metadata value. +Metadata keys are encoded as a symbol, metadata values as a string. +''"rights"'' encodes the [[access rights|00001012921200]] for the given zettel. + +=== Aggregates + +An implicit precondition is that the zettel must contain the given metadata key. +For a metadata key like [[''title''|00001006020000#title]], which have a default value, this precondition should always be true. +But the situation is different for a key like [[''url''|00001006020000#url]]. +Both ``curl 'http://localhost:23123/z?q=url%3A'`` and ``curl 'http://localhost:23123/z?q=url%3A!'`` may result in an empty list. + + +As an example for a query action, to list all roles used in the Zettelstore, send a HTTP GET request to the endpoint ''/z?q=|role''. + +```sh +# curl 'http://127.0.0.1:23123/z?q=|role' +configuration 00001000000100 00000000090002 00000000090000 00000000040001 00000000025001 00000000020001 00000000000100 00000000000092 00000000000090 00000000000006 00000000000005 00000000000004 00000000000001 +manual 00001018000000 00001017000000 00001014000000 00001012921200 00001012921000 00001012920800 00001012920588 00001012920584 00001012920582 00001012920522 00001012920519 00001012920516 00001012920513 00001012920510 00001012920503 00001012920500 00001012920000 00001012080500 00001012080200 00001012080100 00001012070500 00001012054600 00001012054400 00001012054200 00001012054000 00001012053900 00001012053800 00001012053600 00001012053500 00001012053400 00001012053300 00001012053200 00001012051400 00001012051200 00001012050600 00001012050400 00001012050200 00001012000000 00001010090100 00001010070600 00001010070400 00001010070300 00001010070200 00001010040700 00001010040400 00001010040200 00001010040100 00001010000000 00001008050000 00001008010500 00001008010000 00001008000000 00001007990000 00001007906000 00001007903000 00001007900000 00001007800000 00001007790000 00001007780000 00001007706000 00001007705000 00001007702000 00001007700000 00001007050200 00001007050100 00001007050000 00001007040350 00001007040340 00001007040330 00001007040324 00001007040322 00001007040320 00001007040310 00001007040300 00001007040200 00001007040100 00001007040000 00001007031400 00001007031300 00001007031200 00001007031140 00001007031110 00001007031100 00001007031000 00001007030900 00001007030800 00001007030700 00001007030600 00001007030500 00001007030400 00001007030300 00001007030200 00001007030100 00001007030000 00001007020000 00001007010000 00001007000000 00001006055000 00001006050000 00001006036500 00001006036000 00001006035500 00001006035000 00001006034500 00001006034000 00001006033500 00001006033000 00001006032500 00001006032000 00001006031500 00001006031000 00001006030500 00001006030000 00001006020400 00001006020100 00001006020000 00001006010000 00001006000000 00001005090000 00001005000000 00001004101000 00001004100000 00001004059900 00001004059700 00001004051400 00001004051200 00001004051100 00001004051000 00001004050400 00001004050200 00001004050000 00001004020200 00001004020000 00001004011600 00001004011400 00001004011200 00001004010000 00001004000000 00001003600000 00001003315000 00001003310000 00001003305000 00001003300000 00001003000000 00001002000000 00001001000000 00001000000000 +zettel 00010000000000 00000000090001 +``` + +The result is a text file. +The first word, separated by a horizontal tab (U+0009) contains the role name. +The rest of the line consists of zettel identifier, where the corresponding zettel have this role. +Zettel identifier are separated by a space character (U+0020). + +Please note that the list is **not** sorted by the role name, so the same request might result in a different order. +If you want a sorted list, you could sort it on the command line (``curl 'http://127.0.0.1:23123/z?q=|role' | sort``) or within the software that made the call to the Zettelstore. + +Of course, this list can also be returned as a data object: + +```sh +# curl 'http://127.0.0.1:23123/z?q=|role&enc=data' +(aggregate "role" (query "| role") (human "| role") (list ("zettel" 10000000000 90001) ("configuration" 6 100 1000000100 20001 90 25001 92 4 40001 1 90000 5 90002) ("manual" 1008050000 1007031110 1008000000 1012920513 1005000000 1012931800 1010040700 1012931000 1012053600 1006050000 1012050200 1012000000 1012070500 1012920522 1006032500 1006020100 1007906000 1007030300 1012051400 1007040350 1007040324 1007706000 1012931900 1006030500 1004050200 1012054400 1007700000 1004050000 1006020000 1007030400 1012080100 1012920510 1007790000 1010070400 1005090000 1004011400 1006033000 1012930500 1001000000 1007010000 1006020400 1007040300 1010070300 1008010000 1003305000 1006030000 1006034000 1012054200 1012080200 1004010000 1003300000 1006032000 1003310000 1004059700 1007031000 1003600000 1004000000 1007030700 1007000000 1006055000 1007050200 1006036000 1012050600 1006000000 1012053900 1012920500 1004050400 1007031100 1007040340 1007020000 1017000000 1012053200 1007030600 1007040320 1003315000 1012054000 1014000000 1007030800 1010000000 1007903000 1010070200 1004051200 1007040330 1004051100 1004051000 1007050100 1012080500 1012053400 1006035500 1012054600 1004100000 1010040200 1012920000 1012920525 1004051400 1006031500 1012921200 1008010500 1012921000 1018000000 1012051200 1010040100 1012931200 1012920516 1007040310 1007780000 1007030200 1004101000 1012920800 1007030100 1007040200 1012053500 1007040000 1007040322 1007031300 1007031140 1012931600 1012931400 1004059900 1003000000 1006036500 1004020200 1010040400 1006033500 1000000000 1012053300 1007990000 1010090100 1007900000 1007030500 1004011600 1012930000 1007030900 1004020000 1007030000 1010070600 1007040100 1007800000 1012050400 1006010000 1007705000 1007702000 1007050000 1002000000 1007031200 1006035000 1006031000 1006034500 1004011200 1007031400 1012920519))) +``` + +The data object starts with the symbol ''aggregate'' to signal a different format compared to ''meta-list'' above. +Then a string follows, which specifies the key on which the aggregate was performed. +''query'' and ''human'' have the same meaning as above. +The ''symbol'' list starts the result list of aggregates. +Each aggregate starts with a string of the aggregate value, in this case the role value, followed by a list of zettel identifier, denoting zettel which have the given role value. + +Similar, to list all tags used in the Zettelstore, send a HTTP GET request to the endpoint ''/z?q=|tags''. +If successful, the output is a data object: + +```sh +# curl 'http://127.0.0.1:23123/z?q=|tags&enc=data' +(aggregate "tags" (query "| tags") (human "| tags") (list ("#zettel" 1006034500 1006034000 1006031000 1006020400 1006033500 1006036500 1006032500 1006020100 1006031500 1006030500 1006035500 1006033000 1006020000 1006036000 1006030000 1006032000 1006035000) ("#reference" 1006034500 1006034000 1007800000 1012920500 1006031000 1012931000 1006020400 1012930000 1006033500 1012920513 1007050100 1012920800 1007780000 1012921000 1012920510 1007990000 1006036500 1006032500 1006020100 1012931400 1012931800 1012920516 1012931600 1012920525 1012931200 1006031500 1012931900 1012920000 1005090000 1012920522 1006030500 1007050200 1012921200 1006035500 1012920519 1006033000 1006020000 1006036000 1006030000 1006032000 1012930500 1006035000) ("#graphic" 1008050000) ("#search" 1007700000 1007705000 1007790000 1007780000 1007702000 1007706000 1007031140) ("#installation" 1003315000 1003310000 1003000000 1003305000 1003300000 1003600000) ("#zettelmarkup" 1007900000 1007030700 1007031300 1007030600 1007800000 1007000000 1007031400 1007040100 1007030300 1007031200 1007040350 1007030400 1007030900 1007050100 1007040000 1007030500 1007903000 1007040200 1007040330 1007990000 1007040320 1007050000 1007040310 1007031100 1007040340 1007020000 1007031110 1007031140 1007040324 1007030800 1007031000 1007030000 1007010000 1007906000 1007050200 1007030100 1007030200 1007040300 1007040322) ("#design" 1005000000 1006000000 1002000000 1006050000 1006055000) ("#markdown" 1008010000 1008010500) ("#goal" 1002000000) ("#syntax" 1006010000) ... +``` + +If you want only those tags that occur at least 100 times, use the endpoint ''/z?q=|MIN100+tags''. +You see from this that actions are separated by space characters. + +=== Actions There are two types of actions: parameters and aggregates. The following actions are supported: ; ''MINn'' (parameter) : Emit only those values with at least __n__ aggregated values. @@ -51,94 +113,10 @@ : Emit an aggregate of the given metadata key. The key can be given in any letter case. Only the first aggregate action will be executed. -If no valid aggregate action is given, the metadata of all selected zettel are returned.[^For this reason, a HTTP GET to the endpoint ''/j'' is an alias for the endpoint ''/q''.] - -```sh -# curl http://127.0.0.1:23123/q -{"query":"","list":[{"id":"00001012051200","meta":{"title":"API: Renew an access token","tags":"#api #manual #zettelstore","syntax":"zmk","role":"manual"},"rights":62},{"id":"00001012050600","meta":{"title":"API: Provide an access token","tags":"#api #manual #zettelstore","syntax":"zmk","role":"manual"},"rights":62},{"id":"00001012050400","meta":{"title":"API: Renew an access token","tags":"#api #manual #zettelstore","syntax":"zmk","role":"manual"},"rights":62},{"id":"00001012050200","meta":{"title":"API: Authenticate a client","tags":"#api #manual #zettelstore","syntax":"zmk","role":"manual"},"rights":62},{"id":"00001012000000","meta":{"title":"API","tags":"#api #manual #zettelstore","syntax":"zmk","role":"manual"},"rights":62}]} -``` - -The JSON object contains a key ''"list"'' where its value is a list of zettel JSON objects. -These zettel JSON objects themselves contains the keys ''"id"'' (value is a string containing the [[zettel identifier|00001006050000]]), ''"meta"'' (value as a JSON object), and ''"rights"'' (encodes the [[access rights|00001012921200]] for the given zettel). -The value of key ''"meta"'' effectively contains all metadata of the identified zettel, where metadata keys are encoded as JSON object keys and metadata values encoded as JSON strings. - -Additionally, the JSON object contains the keys ''"query"'' and ''"human"'' with a string value. -Both will contain a textual description of the underlying query if you select only some zettel with a [[query expression|00001007700000]]. -Without a selection, the values are the empty string. -''"query"'' returns the normalized query expression itself, while ''"human"'' is the normalized query expression to be read by humans. - -If you reformat the JSON output from the ''GET /q'' call, you'll see its structure better: - -```json -{ - "query": "", - "human": "", - "list": [ - { - "id": "00001012051200", - "meta": { - "title": "API: List for all zettel some data", - "tags": "#api #manual #zettelstore", - "syntax": "zmk", - "role": "manual" - }, - "rights":62 - }, - { - "id": "00001012050600", - "meta": { - "title": "API: Provide an access token", - "tags": "#api #manual #zettelstore", - "syntax": "zmk", - "role": "manual" - }, - "rights":62 - }, - { - "id": "00001012050400", - "meta": { - "title": "API: Renew an access token", - "tags": "#api #manual #zettelstore", - "syntax": "zmk", - "role": "manual" - }, - "rights":62 - }, - { - "id": "00001012050200", - "meta": { - "title": "API: Authenticate a client", - "tags": "#api #manual #zettelstore", - "syntax": "zmk", - "role": "manual" - }, - "rights":62 - }, - { - "id": "00001012000000", - "meta": { - "title": "API", - "tags": "#api #manual #zettelstore", - "syntax": "zmk", - "role": "manual" - }, - "rights":62 - } - ] -} -``` -In this special case, the metadata of each zettel just contains the four default keys ''title'', ''tags'', ''syntax'', and ''role''. - -=== Note -This request (and similar others) will always return a list of metadata, provided the request was syntactically correct. -There will never be a HTTP status code 403 (Forbidden), even if [[authentication was enabled|00001010040100]] and you did not provide a valid access token. -In this case, the resulting list might be quite short (some zettel will have [[public visibility|00001010070200]]) or the list might be empty. - -With this call, you cannot differentiate between an empty result list (e.g because your search did not found a zettel with the specified term) and an empty list because of missing authorization (e.g. an invalid access token). === HTTP Status codes ; ''200'' : Query was successful. ; ''204'' Index: docs/manual/00001012053200.zettel ================================================================== --- docs/manual/00001012053200.zettel +++ docs/manual/00001012053200.zettel @@ -1,65 +1,40 @@ id: 00001012053200 title: API: Create a new zettel role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20220628111320 - -A zettel is created by adding it to the [[list of zettel|00001012000000#zettel-lists]]. -Therefore, the [[endpoint|00001012920000]] to create a new zettel is also ''/j'', but you must send the data of the new zettel via a HTTP POST request. - -The body of the POST request must contain a JSON object that specifies metadata and content of the zettel to be created. -The following keys of the JSON object are used: -; ''"meta"'' -: References an embedded JSON object with only string values. - The name/value pairs of this objects are interpreted as the metadata of the new zettel. - Please consider the [[list of supported metadata keys|00001006020000]] (and their value types). -; ''"encoding"'' -: States how the content is encoded. - Currently, only two values are allowed: the empty string (''""'') that specifies an empty encoding, and the string ''"base64"'' that specifies the [[standard Base64 encoding|https://www.rfc-editor.org/rfc/rfc4648.txt]]. - Other values will result in a HTTP response status code ''400''. -; ''"content"'' -: Is a string value that contains the content of the zettel to be created. - Typically, text content is not encoded, and binary content is encoded via Base64. - -Other keys will be ignored. -Even these three keys are just optional. -The body of the HTTP POST request must not be empty and it must contain a JSON object. - -Therefore, a body containing just ''{}'' is perfectly valid. -The new zettel will have no content, and only an identifier as [[metadata|00001006020000]]: - -``` -# curl -X POST --data '{}' http://127.0.0.1:23123/j -{"id":"20210713161000"} -``` -If creating the zettel was successful, the HTTP response will contain a JSON object with one key: -; ''"id"'' -: Contains the [[zettel identifier|00001006050000]] of the created zettel for further usage. - -In addition, the HTTP response header contains a key ''Location'' with a relative URL for the new zettel. -A client must prepend the HTTP protocol scheme, the host name, and (optional, but often needed) the post number to make it an absolute URL. - -As an example, a zettel with title ""Note"" and content ""Important content."" can be created by issuing: -``` -# curl -X POST --data '{"meta":{"title":"Note"},"content":"Important content."}' http://127.0.0.1:23123/j -{"id":"20210713163100"} -``` - -[!plain]Alternatively, you can use the [[endpoint|00001012920000]] ''/z'' to create a new zettel. -In this case, the zettel must be encoded in a [[plain|00001006000000]] format: first comes the [[metadata|00001006010000]] and the following content is separated by an empty line. +created: 20210713150005 +modified: 20230807170416 + +A zettel is created by adding it to the [[list of zettel|00001012000000]]. +Therefore, the [[endpoint|00001012920000]] to create a new zettel is also ''/z'', but you must send the data of the new zettel via a HTTP POST request. + + +The zettel must be encoded in a [[plain|00001006000000]] format: first comes the [[metadata|00001006010000]] and the following content is separated by an empty line. This is the same format as used by storing zettel within a [[directory box|00001006010000]]. + ``` # curl -X POST --data $'title: Note\n\nImportant content.' http://127.0.0.1:23123/z 20210903211500 ``` +The zettel identifier of the created zettel is returned. +In addition, the HTTP response header contains a key ''Location'' with a relative URL for the new zettel. +A client must prepend the HTTP protocol scheme, the host name, and (optional, but often needed) the post number to make it an absolute URL. + +=== Data input +Alternatively, you may encode the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data''. +The encoding is the same as the data output encoding when you [[retrieve a zettel|00001012053300#data-output]]. + +The encoding for [[access rights|00001012921200]] must be given, but is ignored. +You may encode computed or property [[metadata keys|00001006020000]], but these are also ignored. + === HTTP Status codes ; ''201'' -: Zettel creation was successful, the body contains its [[zettel identifier|00001006050000]] (JSON object or plain text). +: Zettel creation was successful, the body contains its [[zettel identifier|00001006050000]] (data value or plain text). ; ''400'' : Request was not valid. There are several reasons for this. - Most likely, the JSON was not formed according to above rules. + Most likely, the symbolic expression was not formed according to above rules. ; ''403'' : You are not allowed to create a new zettel. Index: docs/manual/00001012053300.zettel ================================================================== --- docs/manual/00001012053300.zettel +++ docs/manual/00001012053300.zettel @@ -2,93 +2,83 @@ title: API: Retrieve metadata and content of an existing zettel role: manual tags: #api #manual #zettelstore syntax: zmk created: 20211004093206 -modified: 20220908162927 +modified: 20230807170259 + +The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. + +For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/z/00001012053300''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. -The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. +````sh +# curl 'http://127.0.0.1:23123/z/00001012053300' +The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. -For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/j/00001012053300''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. -If successful, the output is a JSON object: +For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/z/00001012053300''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. + ```sh -# curl http://127.0.0.1:23123/j/00001012053300 -{"id":"00001012053300","meta":{"title":"API: Retrieve data for an existing zettel","tags":"#api #manual #zettelstore","syntax":"zmk","role":"manual","copyright":"(c) 2020 by Detlef Stern ","lang":"en","license":"CC BY-SA 4.0"},"content":"The endpoint to work with a specific zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000}}.\n\nFor example, ... -``` - -Pretty-printed, this results in: -``` -{ - "id": "00001012053300", - "meta": { - "back": "00001012000000 00001012053200 00001012054400", - "backward": "00001012000000 00001012053200 00001012054400 00001012920000", - "box-number": "1", - "forward": "00001010040100 00001012050200 00001012920000 00001012920800", - "modified": "20210726190012", - "published": "20210726190012", - "role": "manual", - "syntax": "zmk", - "tags": "#api #manual #zettelstore", - "title": "API: Retrieve metadata and content of an existing zettel" - }, - "encoding": "", - "content": "The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/j/{ID}'', where ''{ID}'' (...) - "rights": 62 -} -``` - -The following keys of the JSON object are used: -; ''"id"'' -: The zettel identifier of the zettel you requested. -; ''"meta"'' -: References an embedded JSON object with only string values. - The name/value pairs of this objects are interpreted as the metadata of the new zettel. - Please consider the [[list of supported metadata keys|00001006020000]] (and their value types). -; ''"encoding"'' -: States how the content is encoded. - Currently, only two values are allowed: the empty string (''""'') that specifies an empty encoding, and the string ''"base64"'' that specifies the [[standard Base64 encoding|https://www.rfc-editor.org/rfc/rfc4648.txt]]. - Other values will result in a HTTP response status code ''400''. -; ''"content"'' -: Is a string value that contains the content of the zettel to be created. - Typically, text content is not encoded, and binary content is encoded via Base64. -; ''"rights"'' -: An integer number that describes the [[access rights|00001012921200]] for the zettel. - -=== Plain zettel -[!plain]Additionally, you can retrieve the plain zettel, without using JSON. -Just change the [[endpoint|00001012920000]] to ''/z/{ID}'' +... +```` + Optionally, you may provide which parts of the zettel you are requesting. In this case, add an additional query parameter ''part=PART''. Valid values for [[''PART''|00001012920800]] are ""zettel"", ""[[meta|00001012053400]]"", and ""content"" (the default value). -````sh -# curl 'http://127.0.0.1:23123/z/00001012053300' -The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. - -For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/j/00001012053300''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. -If successful, the output is a JSON object: -```sh -... -```` ````sh # curl 'http://127.0.0.1:23123/z/00001012053300?part=zettel' title: API: Retrieve metadata and content of an existing zettel role: manual tags: #api #manual #zettelstore syntax: zmk -The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. +The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ... ```` +=== Data output + +Alternatively, you may retrieve the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data'': + +```sh +# curl 'http://127.0.0.1:23123/z/00001012053300?enc=data&part=zettel' +(zettel (meta (back "00001006000000 00001012000000 00001012053200 00001012054400") (backward "00001006000000 00001012000000 00001012053200 00001012054400 00001012920000") (box-number "1") (created "20211004093206") (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012053400 00001012920000 00001012920800 00001012921200 00001012930500") (modified "20230703174152") (published "20230703174152") (role "manual") (syntax "zmk") (tags "#api #manual #zettelstore") (title "API: Retrieve metadata and content of an existing zettel")) (rights 62) (encoding "") (content "The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].\n\nFor example, ... +``` + +If you print the result a little bit nicer, you will see its structure: +``` +(zettel (meta (back "00001006000000 00001012000000 00001012053200 00001012054400") + (backward "00001006000000 00001012000000 00001012053200 00001012054400 00001012920000") + (box-number "1") + (created "20211004093206") + (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012053400 00001012920000 00001012920800 00001012921200 00001012930500") + (modified "20230703174152") + (published "20230703174152") + (role "manual") + (syntax "zmk") + (tags "#api #manual #zettelstore") + (title "API: Retrieve metadata and content of an existing zettel")) + (rights 62) + (encoding "") + (content "The [[endpoint|00001012920000]] to work with metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]].\n\nFor example, ... +``` + +* The result is a list, starting with the symbol ''zettel''. +* Then, some key/value pairs are following, also nested. +* Nested in ''meta'' are the metadata, each as a key/value pair. +* ''rights'' specifies the [[access rights|00001012921200]] the user has for this zettel. +* ''"encoding"'' states how the content is encoded. + Currently, only two values are allowed: the empty string (''""'') that specifies an empty encoding, and the string ''"base64"'' that specifies the [[standard Base64 encoding|https://www.rfc-editor.org/rfc/rfc4648.txt]]. +* The zettel contents is stored as a value of the key ''content''. + Typically, text content is not encoded, and binary content is encoded via Base64. + === HTTP Status codes ; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object / plain zettel data. +: Retrieval was successful, the body contains an appropriate data value. ; ''204'' : Request was valid, but there is no data to be returned. Most likely, you specified the query parameter ''part=content'', but the zettel does not contain any content. ; ''400'' : Request was not valid. Index: docs/manual/00001012053400.zettel ================================================================== --- docs/manual/00001012053400.zettel +++ docs/manual/00001012053400.zettel @@ -2,65 +2,61 @@ title: API: Retrieve metadata of an existing zettel role: manual tags: #api #manual #zettelstore syntax: zmk created: 20210726174524 -modified: 20220917175233 - -The [[endpoint|00001012920000]] to work with metadata of a specific zettel is ''/m/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. - -For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/j/00001012053400''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. -If successful, the output is a JSON object: -```sh -# curl http://127.0.0.1:23123/m/00001012053400 -{"meta":{"back":"00001012000000 00001012053300","backward":"00001012000000 00001012053300 00001012920000","box-number":"1","forward":"00001010040100 00001012050200 00001012920000 00001012920800","modified":"20211004111240","published":"20211004111240","role":"manual","syntax":"zmk","tags":"#api #manual #zettelstore","title":"API: Retrieve metadata of an existing zettel"},"rights":62} -``` - -Pretty-printed, this results in: -``` -{ - "meta": { - "back": "00001012000000 00001012053300", - "backward": "00001012000000 00001012053300 00001012920000", - "box-number": "1", - "forward": "00001010040100 00001012050200 00001012920000 00001012920800", - "modified": "20211004111240", - "published": "20211004111240", - "role": "manual", - "syntax": "zmk", - "tags": "#api #manual #zettelstore", - "title": "API: Retrieve metadata of an existing zettel" - }, - "rights": 62 -} -``` -The following keys of the JSON object are used: -; ''"meta"'' -: References an embedded JSON object with only string values. - The name/value pairs of this objects are interpreted as the metadata of the new zettel. - Please consider the [[list of supported metadata keys|00001006020000]] (and their value types). -; ''"rights"'' -: An integer number that describes the [[access rights|00001012921200]] for the zettel. - -[!plain]Additionally, you can retrieve the plain metadata of a zettel, without using JSON. -Just change the [[endpoint|00001012920000]] to ''/z/{ID}?part=meta'' +modified: 20230807170155 + +The [[endpoint|00001012920000]] to work with metadata of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]][^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. + +To retrieve the plain metadata of a zettel, use the query parameter ''part=meta'' ````sh # curl 'http://127.0.0.1:23123/z/00001012053400?part=meta' title: API: Retrieve metadata of an existing zettel role: manual tags: #api #manual #zettelstore syntax: zmk ```` +=== Data output + +Alternatively, you may retrieve the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data'': + +```sh +# curl 'http://127.0.0.1:23123/z/00001012053400?part=meta&enc=data' +(list (meta (title "API: Retrieve metadata of an existing zettel") (role "manual") (tags "#api #manual #zettelstore") (syntax "zmk") (back "00001012000000 00001012053300") (backward "00001012000000 00001012053300") (box-number "1") (created "20210726174524") (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012920000 00001012921200") (modified "20230703174515") (published "20230703174515")) (rights 62)) +``` + +Pretty-printed, this results in: +``` +(list (meta (title "API: Retrieve metadata of an existing zettel") + (role "manual") + (tags "#api #manual #zettelstore") + (syntax "zmk") + (back "00001012000000 00001012053300") + (backward "00001012000000 00001012053300") + (box-number "1") + (created "20210726174524") + (forward "00001006020000 00001006050000 00001010040100 00001012050200 00001012920000 00001012921200") + (modified "20230703174515") + (published "20230703174515")) + (rights 62)) +``` + +* The result is a list, starting with the symbol ''list''. +* Then, some key/value pairs are following, also nested. +* Nested in ''meta'' are the metadata, each as a key/value pair. +* ''rights'' specifies the [[access rights|00001012921200]] the user has for this zettel. + === HTTP Status codes ; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. +: Retrieval was successful, the body contains an appropriate data value. ; ''400'' : Request was not valid. There are several reasons for this. Maybe the zettel identifier did not consist of exactly 14 digits. ; ''403'' : You are not allowed to retrieve data of the given zettel. ; ''404'' : Zettel not found. You probably used a zettel identifier that is not used in the Zettelstore. Index: docs/manual/00001012053500.zettel ================================================================== --- docs/manual/00001012053500.zettel +++ docs/manual/00001012053500.zettel @@ -2,70 +2,59 @@ title: API: Retrieve evaluated metadata and content of an existing zettel in various encodings role: manual tags: #api #manual #zettelstore syntax: zmk created: 20210726174524 -modified: 20220908162843 - -The [[endpoint|00001012920000]] to work with evaluated metadata and content of a specific zettel is ''/v/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. - -For example, to retrieve some evaluated data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/v/00001012053500''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. -If successful, the output is a JSON object: -```sh -# curl http://127.0.0.1:23123/v/00001012053500 -{"meta":{"title":[{"t":"Text","s":"API:"},{"t":"Space"},{"t":"Text","s":"Retrieve"},{"t":"Space"},{"t":"Text","s":"evaluated"},{"t":"Space"},{"t":"Text","s":"metadata"},{"t":"Space"},{"t":"Text","s":"and"},{"t":"Space"},{"t":"Text","s":"content"},{"t":"Space"},{"t":"Text","s":"of"},{"t":"Space"},{"t":"Text","s":"an"},{"t":"Space"},{"t":"Text","s":"existing"},{"t":"Space"},{"t":"Text","s":"zettel"},{"t":"Space"},{"t":"Text","s":"in"},{"t":"Space"}, ... +modified: 20230807170112 + +The [[endpoint|00001012920000]] to work with evaluated metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. + +For example, to retrieve some evaluated data about this zettel you are currently viewing in [[Sz encoding|00001012920516]], just send a HTTP GET request to the endpoint ''/z/00001012053500''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] with the query parameter ''enc=sz''. +If successful, the output is a symbolic expression value: +```sh +# curl 'http://127.0.0.1:23123/z/00001012053500?enc=sz' +((PARA (TEXT "The") (SPACE) (LINK-ZETTEL () "00001012920000" (TEXT "endpoint")) (SPACE) (TEXT "to") (SPACE) (TEXT "work") (SPACE) (TEXT "with") (SPACE) (TEXT "evaluated") (SPACE) (TEXT "metadata") (SPACE) (TEXT "and") (SPACE) (TEXT "content") (SPACE) (TEXT "of") (SPACE) (TEXT "a") (SPACE) (TEXT "specific") (SPACE) (TEXT "zettel") (SPACE) (TEXT "is") (SPACE) (LITERAL-INPUT () "/z/{ID}") (TEXT ",") (SPACE) (TEXT "where") (SPACE) (LITERAL-INPUT () "{ID}") ... ``` -To select another encoding, you can provide a query parameter ''enc=ENCODING''. -The default value for [[''ENCODING''|00001012920500]] is ""[[zjson|00001012920503]]"". -Others are ""[[html|00001012920510]]"", ""[[text|00001012920519]]"", and some more. +To select another encoding, you must provide the query parameter ''enc=ENCODING''. +Others are ""[[html|00001012920510]]"", ""[[text|00001012920519]]"", and some [[more|00001012920500]]. +In addition, you may provide a query parameter ''part=PART'' to select the relevant [[part|00001012920800]] of a zettel. ```sh -# curl 'http://127.0.0.1:23123/v/00001012053500?enc=html' - - +# curl 'http://127.0.0.1:23123/z/00001012053500?enc=html&part=zettel' + API: Retrieve evaluated metadata and content of an existing zettel in various encodings + - + - - + + - - - + + + + + + + + -

The endpoint to work with evaluated metadata and content of a specific zettel is /v/{ID}, where {ID} is a placeholder for the zettel identifier.

+

API: Retrieve evaluated metadata and content of an existing zettel in various encodings

+

The endpoint to work with evaluated metadata and content of a specific zettel is /z/{ID}, ... ``` -You also can use the query parameter ''part=PART'' to specify which [[parts|00001012920800]] of a zettel must be encoded. -In this case, its default value is ''content''. -```sh -# curl 'http://127.0.0.1:23123/v/00001012053500?enc=html&part=meta' - - - - - - - - - - - -``` - === HTTP Status codes ; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. +: Retrieval was successful, the body contains an appropriate data value. ; ''400'' : Request was not valid. There are several reasons for this. Maybe the zettel identifier did not consist of exactly 14 digits or ''enc'' / ''part'' contained illegal values. ; ''403'' : You are not allowed to retrieve data of the given zettel. ; ''404'' : Zettel not found. You probably used a zettel identifier that is not used in the Zettelstore. Index: docs/manual/00001012053600.zettel ================================================================== --- docs/manual/00001012053600.zettel +++ docs/manual/00001012053600.zettel @@ -2,34 +2,34 @@ title: API: Retrieve parsed metadata and content of an existing zettel in various encodings role: manual tags: #api #manual #zettelstore syntax: zmk created: 20210126175322 -modified: 20220908163514 +modified: 20230807170019 -The [[endpoint|00001012920000]] to work with parsed metadata and content of a specific zettel is ''/p/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. +The [[endpoint|00001012920000]] to work with parsed metadata and content of a specific zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. A __parsed__ zettel is basically an [[unevaluated|00001012053500]] zettel: the zettel is read and analyzed, but its content is not __evaluated__. By using this endpoint, you are able to retrieve the structure of a zettel before it is evaluated. -For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/v/00001012053600''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header]. -If successful, the output is a JSON object: +For example, to retrieve some data about this zettel you are currently viewing, just send a HTTP GET request to the endpoint ''/z/00001012053600''[^If [[authentication is enabled|00001010040100]], you must include the a valid [[access token|00001012050200]] in the ''Authorization'' header] with the query parameter ''parseonly'' (and other appropriate query parameter). +For example: ```sh -# curl http://127.0.0.1:23123/p/00001012053600 -[{"t":"Para","i":[{"t":"Text","s":"The"},{"t":"Space"},{"t":"Link","q":"zettel","s":"00001012920000","i":[{"t":"Text","s":"endpoint"}]},{"t":"Space"},{"t":"Text","s":"to"},{"t":"Space"},{"t":"Text","s":"work"},{"t":"Space"},{"t":"Text","s":"with"},{"t":"Space"}, ... +# curl 'http://127.0.0.1:23123/z/00001012053600?enc=sz&parseonly' +((PARA (TEXT "The") (SPACE) (LINK-ZETTEL () "00001012920000" (TEXT "endpoint")) (SPACE) (TEXT "to") (SPACE) (TEXT "work") (SPACE) (TEXT "with") (SPACE) ... ``` Similar to [[retrieving an encoded zettel|00001012053500]], you can specify an [[encoding|00001012920500]] and state which [[part|00001012920800]] of a zettel you are interested in. The same default values applies to this endpoint. === HTTP Status codes ; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. +: Retrieval was successful, the body contains an appropriate data value. ; ''400'' : Request was not valid. There are several reasons for this. Maybe the zettel identifier did not consist of exactly 14 digits or ''enc'' / ''part'' contained illegal values. ; ''403'' : You are not allowed to retrieve data of the given zettel. ; ''404'' : Zettel not found. You probably used a zettel identifier that is not used in the Zettelstore. DELETED docs/manual/00001012053800.zettel Index: docs/manual/00001012053800.zettel ================================================================== --- docs/manual/00001012053800.zettel +++ docs/manual/00001012053800.zettel @@ -1,79 +0,0 @@ -id: 00001012053800 -title: API: Retrieve context of an existing zettel -role: manual -tags: #api #manual #zettelstore -syntax: zmk -modified: 20220202112607 - -The context of an origin zettel consists of those zettel that are somehow connected to the origin zettel. -Direct connections of an origin zettel to other zettel are visible via [[metadata values|00001006020000]], such as ''backward'', ''forward'' or other values with type [[identifier|00001006032000]] or [[set of identifier|00001006032500]]. - -The context is defined by a __direction__, a __depth__, and a __limit__: -* Direction: connections are directed. - For example, the metadata value of ''backward'' lists all zettel that link to the current zettel, while ''forward'' list all zettel to which the current zettel links to. - When you are only interested in one direction, set the parameter ''dir'' either to the value ""backward"" or ""forward"". - All other values, including a missing value, is interpreted as ""both"". -* Depth: a direct connection has depth 1, an indirect connection is the length of the shortest path between two zettel. - You should limit the depth by using the parameter ''depth''. - Its default value is ""5"". - A value of ""0"" does disable any depth check. -* Limit: to set an upper bound for the returned context, you should use the parameter ''limit''. - Its default value is ""200"". - A value of ""0"" disables does not limit the number of elements returned. - -The search for the context of a zettel stops at the [[home zettel|00001004020000#home-zettel]]. -This zettel is connected to all other zettel. -If it is included, the context would become too big and therefore unusable. - -To retrieve the context of an existing zettel, use the [[endpoint|00001012920000]] ''/x/{ID}''[^Mnemonic: conte**X**t]. - -```` -# curl 'http://127.0.0.1:23123/x/00001012053800?limit=3&dir=forward&depth=2' -{"id": "00001012053800","meta": {...},"rights":62,"list":[{"id": "00001012921000","meta": {...},"rights":62},{"id": "00001012920800","meta": {...},"rights":62},{"id": "00010000000000","meta": {...},"rights":62}]} -```` -Formatted, this translates into:[^Metadata (key ''meta'') are hidden to make the overall structure easier to read.] -````json -{ - "id": "00001012053800", - "meta": {...}, - "rights": 62, - "list": [ - { - "id": "00001012921000", - "meta": {...}, - "rights":62 - }, - { - "id": "00001012920800", - "meta": {...}, - "rights":62 - }, - { - "id": "00010000000000", - "meta": {...}, - "rights":62 - } - ] -} -```` -=== Keys -The following top-level JSON keys are returned: -; ''id'' -: The [[zettel identifier|00001006050000]] for which the context was requested. -; ''meta'': -: The metadata of the zettel, encoded as a JSON object. -; ''rights'' -: An integer number that describes the [[access rights|00001012921200]] for the given zettel. -; ''list'' -: A list of JSON objects with keys ''id'', ''meta'', and ''rights'' that contains the zettel of the context. - -=== HTTP Status codes -; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. -; ''400'' -: Request was not valid. -; ''403'' -: You are not allowed to retrieve data of the given zettel. -; ''404'' -: Zettel not found. - You probably used a zettel identifier that is not used in the Zettelstore. DELETED docs/manual/00001012053900.zettel Index: docs/manual/00001012053900.zettel ================================================================== --- docs/manual/00001012053900.zettel +++ docs/manual/00001012053900.zettel @@ -1,80 +0,0 @@ -id: 00001012053900 -title: API: Retrieve unlinked references to an existing zettel -role: manual -tags: #api #manual #zettelstore -syntax: zmk -created: 20211119133357 -modified: 20220913152019 - -The value of a personal Zettelstore is determined in part by explicit connections between related zettel. -If the number of zettel grow, some of these connections are missing. -There are various reasons for this. -Maybe, you forgot that a zettel exists. -Or you add a zettel later, but forgot that previous zettel already mention its title. - -__Unlinked references__ are phrases in a zettel that mention the title of another, currently unlinked zettel. - -To retrieve unlinked references to an existing zettel, use the [[endpoint|00001012920000]] ''/u/{ID}''. - -```` -# curl 'http://127.0.0.1:23123/u/00001007000000' -{"id": "00001007000000","meta": {...},"rights":62,"list": [{"id": "00001012070500","meta": {...},"rights":62},...{"id": "00001006020000","meta": {...},"rights":62}]} -```` -Formatted, this translates into:[^Metadata (key ''meta'') are hidden to make the overall structure easier to read.] -````json -{ - "id": "00001007000000", - "meta": {...}, - "rights": 62, - "list": [ - { - "id": "00001012070500", - "meta": {...}, - "rights": 62 - }, - ... - { - "id": "00001006020000", - "meta": {...}, - "rights": 62 - } - ] -} -```` - -This call searches within all zettel whether the title of the specified zettel occurs there. -The other zettel must not link to the specified zettel. -The title must not occur within a link (e.g. to another zettel), in a [[heading|00001007030300]], in a [[citation|00001007040340]], and must have a uniform formatting. -The match must be exact, but is case-insensitive. - -If the title of the specified zettel contains some extra character that probably reduce the number of found unlinked references, -you can specify the title phase to be searched for as a query parameter ''phrase'': - -```` -# curl 'http://127.0.0.1:23123/u/00001007000000?phrase=markdown' -{"id": "00001007000000","meta": {...},"list": [{"id": "00001008010000","meta": {...},"rights":62},{"id": "00001004020000","meta": {...},"rights":62}]} -```` - -%%TODO: In addition, you are allowed to limit the search by a [[query expression|00001012051840]], which may search for zettel content. - -=== Keys -The following top-level JSON keys are returned: -; ''id'' -: The [[zettel identifier|00001006050000]] for which the unlinked references were requested. -; ''meta'': -: The metadata of the zettel, encoded as a JSON object. -; ''rights'' -: An integer number that describes the [[access rights|00001012921200]] for the given zettel. -; ''list'' -: A list of JSON objects with keys ''id'', ''meta'', and ''rights'' that describe zettel with unlinked references. - -=== HTTP Status codes -; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. -; ''400'' -: Request was not valid. -; ''403'' -: You are not allowed to retrieve data of the given zettel. -; ''404'' -: Zettel not found. - You probably used a zettel identifier that is not used in the Zettelstore. DELETED docs/manual/00001012054000.zettel Index: docs/manual/00001012054000.zettel ================================================================== --- docs/manual/00001012054000.zettel +++ docs/manual/00001012054000.zettel @@ -1,84 +0,0 @@ -id: 00001012054000 -title: API: Retrieve zettel order within an existing zettel -role: manual -tags: #api #manual #zettelstore -syntax: zmk -modified: 20220202112451 - -Some zettel act as a ""table of contents"" for other zettel. -The [[initial zettel|00001000000000]] of this manual is one example, the [[general API description|00001012000000]] is another. -Every zettel with a certain internal structure can act as the ""table of contents"" for others. - -What is a ""table of contents""? -Basically, it is just a list of references to other zettel. - -To retrieve the ""table of contents"", the software looks at first level [[list items|00001007030200]]. -If an item contains a valid reference to a zettel, this reference will be interpreted as an item in the table of contents. - -This applies only to first level list items (ordered or unordered list), but not to deeper levels. -Only the first reference to a valid zettel is collected for the table of contents. -Following references to zettel within such an list item are ignored. - -To retrieve the zettel order of an existing zettel, use the [[endpoint|00001012920000]] ''/o/{ID}''. - -```` -# curl http://127.0.0.1:23123/o/00001000000000 -{"id":"00001000000000","meta":{...},"rights":62,"list":[{"id":"00001001000000","meta":{...},"rights":62},{"id":"00001002000000","meta":{...},"rights":62},{"id":"00001003000000","meta":{...},"rights":62},{"id":"00001004000000","meta":{...},"rights":62},...,{"id":"00001014000000","meta":{...},"rights":62}]} -```` -Formatted, this translates into:[^Metadata (key ''meta'') are hidden to make the overall structure easier to read.] -````json -{ - "id": "00001000000000", - "meta": {...}, - "rights": 62, - "list": [ - { - "id": "00001001000000", - "meta": {...}, - "rights": 62 - }, - { - "id": "00001002000000", - "meta": {...}, - "rights": 62 - }, - { - "id": "00001003000000", - "meta": {...}, - "rights": 62 - }, - { - "id": "00001004000000", - "meta": {...}, - "rights": 62 - }, - ... - { - "id": "00001014000000", - "meta": {...}, - "rights": 62 - } - ] -} -```` - -The following top-level JSON keys are returned: -; ''id'' -: The [[zettel identifier|00001006050000]] for which the references were requested. -; ''meta'': -: The metadata of the zettel, encoded as a JSON object. -; ''rights'' -: An integer number that describes the [[access rights|00001012921200]] for the given zettel. -; ''list'' -: A list of JSON objects with keys ''id'', ''meta'', and ''rights'' that describe other zettel in the defined order. - -=== HTTP Status codes -; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. -; ''400'' -: Request was not valid. -; ''403'' -: You are not allowed to retrieve data of the given zettel. -; ''404'' -: Zettel not found. - You probably used a zettel identifier that is not used in the Zettelstore. Index: docs/manual/00001012054200.zettel ================================================================== --- docs/manual/00001012054200.zettel +++ docs/manual/00001012054200.zettel @@ -1,33 +1,33 @@ id: 00001012054200 title: API: Update a zettel role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20211124180943 +created: 20210713150005 +modified: 20230807165948 Updating metadata and content of a zettel is technically quite similar to [[creating a new zettel|00001012053200]]. In both cases you must provide the data for the new or updated zettel in the body of the HTTP request. One difference is the endpoint. -The [[endpoint|00001012920000]] to update a zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. -You must send a HTTP PUT request to that endpoint: - -``` -# curl -X PUT --data '{}' http://127.0.0.1:23123/j/00001012054200 -``` -This will put some empty content and metadata to the zettel you are currently reading. -As usual, some metadata will be calculated if it is empty. - -The body of the HTTP response is empty, if the request was successful. - -[!plain]Alternatively, you can use the [[endpoint|00001012920000]] ''/z/{ID}'' to update a zettel. -In this case, the zettel must be encoded in a [[plain|00001006000000]] format: first comes the [[metadata|00001006010000]] and the following content is separated by an empty line. -This is the same format as used by storing zettel within a [[directory box|00001006010000]]. -``` -# curl -X POST --data $'title: Updated Note\n\nUpdated content.' http://127.0.0.1:23123/z/00001012054200 -``` +The [[endpoint|00001012920000]] to update a zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. +You must send a HTTP PUT request to that endpoint. + +The zettel must be encoded in a [[plain|00001006000000]] format: first comes the [[metadata|00001006010000]] and the following content is separated by an empty line. +This is the same format as used by storing zettel within a [[directory box|00001006010000]]. + +``` +# curl -X POST --data 'title: Updated Note\n\nUpdated content.' http://127.0.0.1:23123/z/00001012054200 +``` + +=== Data input +Alternatively, you may encode the zettel as a parseable object / a [[symbolic expression|00001012930500]] by providing the query parameter ''enc=data''. +The encoding is the same as the data output encoding when you [[retrieve a zettel|00001012053300#data-output]]. + +The encoding for [[access rights|00001012921200]] must be given, but is ignored. +You may encode computed or property [[metadata keys|00001006020000]], but these are also ignored. === HTTP Status codes ; ''204'' : Update was successful, there is no body in the response. ; ''400'' Index: docs/manual/00001012054400.zettel ================================================================== --- docs/manual/00001012054400.zettel +++ docs/manual/00001012054400.zettel @@ -1,33 +1,31 @@ id: 00001012054400 title: API: Rename a zettel role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20211124181324 +created: 20210713150005 +modified: 20221219154659 Renaming a zettel is effectively just specifying a new identifier for the zettel. Since more than one [[box|00001004011200]] might contain a zettel with the old identifier, the rename operation must success in every relevant box to be overall successful. If the rename operation fails in one box, Zettelstore tries to rollback previous successful operations. As a consequence, you cannot rename a zettel when its identifier is used in a read-only box. This applies to all [[predefined zettel|00001005090000]], for example. -The [[endpoint|00001012920000]] to rename a zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. +The [[endpoint|00001012920000]] to rename a zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. You must send a HTTP MOVE request to this endpoint, and you must specify the new zettel identifier as an URL, placed under the HTTP request header key ''Destination''. ``` -# curl -X MOVE -H "Destination: 10000000000001" http://127.0.0.1:23123/j/00001000000000 +# curl -X MOVE -H "Destination: 10000000000001" http://127.0.0.1:23123/z/00001000000000 ``` Only the last 14 characters of the value of ''Destination'' are taken into account and those must form an unused [[zettel identifier|00001006050000]]. If the value contains less than 14 characters that do not form an unused zettel identifier, the response will contain a HTTP status code ''400''. All other characters, besides those 14 digits, are effectively ignored. However, the value should form a valid URL that could be used later to [[read the content|00001012053300]] of the freshly renamed zettel. -[!plain]Alternatively, you can also use the [[endpoint|00001012920000]] ''/z/{ID}''. -Both endpoints behave identical. - === HTTP Status codes ; ''204'' : Rename was successful, there is no body in the response. ; ''400'' : Request was not valid. Index: docs/manual/00001012054600.zettel ================================================================== --- docs/manual/00001012054600.zettel +++ docs/manual/00001012054600.zettel @@ -1,29 +1,27 @@ id: 00001012054600 title: API: Delete a zettel role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20211124181041 +created: 20210713150005 +modified: 20221219154608 Deleting a zettel within the Zettelstore is executed on the first [[box|00001004011200]] that contains that zettel. Zettel with the same identifier, but in subsequent boxes remain. If the first box containing the zettel is read-only, deleting that zettel will fail, as well for a Zettelstore in [[read-only mode|00001004010000#read-only-mode]] or if [[authentication is enabled|00001010040100]] and the user has no [[access right|00001010070600]] to do so. -The [[endpoint|00001012920000]] to delete a zettel is ''/j/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. +The [[endpoint|00001012920000]] to delete a zettel is ''/z/{ID}'', where ''{ID}'' is a placeholder for the [[zettel identifier|00001006050000]]. You must send a HTTP DELETE request to this endpoint: ``` -# curl -X DELETE http://127.0.0.1:23123/j/00001000000000 +# curl -X DELETE http://127.0.0.1:23123/z/00001000000000 ``` -[!plain]Alternatively, you can also use the [[endpoint|00001012920000]] ''/z/{ID}''. -Both endpoints behave identical. - === HTTP Status codes ; ''204'' : Delete was successful, there is no body in the response. ; ''403'' : You are not allowed to delete the given zettel. Maybe you do not have enough access rights, or either the box or Zettelstore itself operate in read-only mode. ; ''404'' : Zettel not found. You probably specified a zettel identifier that is not used in the Zettelstore. Index: docs/manual/00001012070500.zettel ================================================================== --- docs/manual/00001012070500.zettel +++ docs/manual/00001012070500.zettel @@ -1,27 +1,29 @@ id: 00001012070500 title: Retrieve administrative data role: manual tags: #api #manual #zettelstore syntax: zmk -modified: 20220805174216 +created: 00010101000000 +modified: 20230701160903 The [[endpoint|00001012920000]] ''/x'' allows you to retrieve some (administrative) data. Currently, you can only request Zettelstore version data. ```` # curl 'http://127.0.0.1:23123/x' -{"major":0,"minor":4,"patch":0,"info":"dev","hash":"cb121cc980-dirty"} +(0 13 0 "dev" "f781dc384b-dirty") ```` -Zettelstore conforms somehow to the Standard [[Semantic Versioning|https://semver.org/]]. +* Zettelstore conforms somehow to the Standard [[Semantic Versioning|https://semver.org/]]. -The names ""major"", ""minor"", and ""patch"" are described in this standard. + The first three digits contain the major, minor, and patch version as described in this standard. +* The first string contains additional information, e.g. ""dev"" for a development version, or ""preview"" for a preview version. +* The second string contains data to identify the version from a developers perspective. -The name ""info"" contains sometimes some additional information, e.g. ""dev"" for a development version, or ""preview"" for a preview version. - -The name ""hash"" contains some data to identify the version from a developers perspective. +If any of the three digits has the value -1, its semantic value is unknown. +Similar, the two string might be empty. === HTTP Status codes ; ''200'' -: Retrieval was successful, the body contains an appropriate JSON object. +: Retrieval was successful, the body contains an appropriate object. Index: docs/manual/00001012920000.zettel ================================================================== --- docs/manual/00001012920000.zettel +++ docs/manual/00001012920000.zettel @@ -2,11 +2,11 @@ title: Endpoints used by the API role: manual tags: #api #manual #reference #zettelstore syntax: zmk created: 20210126175322 -modified: 20220923101703 +modified: 20230731162343 All API endpoints conform to the pattern ''[PREFIX]LETTER[/ZETTEL-ID]'', where: ; ''PREFIX'' : is the URL prefix (default: ""/""), configured via the ''url-prefix'' [[startup configuration|00001004010000]], ; ''LETTER'' @@ -17,26 +17,16 @@ The following letters are currently in use: |= Letter:| Without zettel identifier | With [[zettel identifier|00001006050000]] | Mnemonic | ''a'' | POST: [[client authentication|00001012050200]] | | **A**uthenticate | | PUT: [[renew access token|00001012050400]] | -| ''j'' | GET: [[query zettel list|00001012051400]] (alias of ''/q'') | GET: [[retrieve zettel AS JSON|00001012053300]] | **J**SON -| | POST: [[create new zettel|00001012053200]] | PUT: [[update a zettel|00001012054200]] -| | | DELETE: [[delete the zettel|00001012054600]] -| | | MOVE: [[rename the zettel|00001012054400]] -| ''m'' | | GET: [[retrieve metadata|00001012053400]] | **M**etadata -| ''o'' | | GET: [[list zettel order|00001012054000]] | **O**rder -| ''p'' | | GET: [[retrieve parsed zettel|00001012053600]]| **P**arsed -| ''q'' | GET: [[query zettel list|00001012051400]] | | **Q**uery -| ''u'' | | GET [[unlinked references|00001012053900]] | **U**nlinked -| ''v'' | | GET: [[retrieve evaluated zettel|00001012053500]] | E**v**aluated -| ''x'' | GET: [[retrieve administrative data|00001012070500]] | GET: [[list zettel context|00001012053800]] | Conte**x**t +| ''x'' | GET: [[retrieve administrative data|00001012070500]] | | E**x**ecute | | POST: [[execute command|00001012080100]] -| ''z'' | GET: [[list zettel|00001012051200#plain]] | GET: [[retrieve zettel|00001012053300#plain]] | **Z**ettel -| | POST: [[create new zettel|00001012053200#plain]] | PUT: [[update a zettel|00001012054200#plain]] -| | | DELETE: [[delete zettel|00001012054600#plain]] -| | | MOVE: [[rename zettel|00001012054400#plain]] +| ''z'' | GET: [[list zettel|00001012051200]]/[[query zettel|00001012051400]] | GET: [[retrieve zettel|00001012053300]] | **Z**ettel +| | POST: [[create new zettel|00001012053200]] | PUT: [[update zettel|00001012054200]] +| | | DELETE: [[delete zettel|00001012054600]] +| | | MOVE: [[rename zettel|00001012054400]] The full URL will contain either the ""http"" oder ""https"" scheme, a host name, and an optional port number. The API examples will assume the ""http"" schema, the local host ""127.0.0.1"", the default port ""23123"", and the default empty ''PREFIX'' ""/"". Therefore, all URLs in the API documentation will begin with ""http://127.0.0.1:23123/"". Index: docs/manual/00001012920500.zettel ================================================================== --- docs/manual/00001012920500.zettel +++ docs/manual/00001012920500.zettel @@ -1,14 +1,17 @@ id: 00001012920500 -title: Encodings available via the [[API|00001012000000]] +title: Encodings available via the API role: manual tags: #api #manual #reference #zettelstore syntax: zmk -modified: 20220423131535 +created: 20210126175322 +modified: 20230403123653 A zettel representation can be encoded in various formats for further processing. +These will be retrieved via the [[API|00001012000000]]. * [[html|00001012920510]] -* [[sexpr|00001012920516]] +* [[md|00001012920513]] +* [[shtml|00001012920525]] +* [[sz|00001012920516]] * [[text|00001012920519]] -* [[zjson|00001012920503]] (default) * [[zmk|00001012920522]] DELETED docs/manual/00001012920503.zettel Index: docs/manual/00001012920503.zettel ================================================================== --- docs/manual/00001012920503.zettel +++ docs/manual/00001012920503.zettel @@ -1,36 +0,0 @@ -id: 00001012920503 -title: ZJSON Encoding -role: manual -tags: #api #manual #reference #zettelstore -syntax: zmk -created: 20210126175322 -modified: 20220908163450 - -A zettel representation that allows to process the syntactic structure of a zettel. -It is a JSON-based encoding format, but different to the structures returned by [[endpoint|00001012920000]] ''/j/{ID}''. - -For an example, take a look at the ZJSON encoding of this page, which is available via the ""Info"" sub-page of this zettel: - -* [[//v/00001012920503?enc=zjson&part=zettel]], -* [[//v/00001012920503?enc=zjson&part=meta]], -* [[//v/00001012920503?enc=zjson&part=content]]. - -If transferred via HTTP, the content type will be ''application/json''. - -A full zettel encoding results in a JSON object with two keys: ''"meta"'' and ''"content"''. -Both values are the same as if you have requested just the appropriate [[part|00001012920800]]. - -=== Encoding of metadata -Metadata encoding results in a JSON object, where each metadata key is mapped to the same JSON object name. -The associated value is itself a JSON object with two names. -The first name ``""`` references the [[metadata key type|00001006030000]]. -Depending on the key type, the other name denotes the value of the metadata element. -The meaning of these names is [[well defined|00001012920582]], as well as the [[mapping of key types to used object names|00001012920584]]. - -=== Encoding of zettel content -The content encoding results in a JSON array of objects, where each objects represents a Zettelmarkup element. - -Every [!zettelmarkup|Zettelmarkup] element is encoded as a JSON object. -These objects always contain the empty name ''""'' with a string value describing the type of Zettelmarkup element. -Depending on the type, other one letter names denotes the details of the element. -The meaning of these names is [[well defined|00001012920588]]. ADDED docs/manual/00001012920513.zettel Index: docs/manual/00001012920513.zettel ================================================================== --- docs/manual/00001012920513.zettel +++ docs/manual/00001012920513.zettel @@ -0,0 +1,30 @@ +id: 00001012920513 +title: Markdown Encoding +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20221107183011 +modified: 20221107185130 + +A zettel representation that tries to recreate a [[Markdown|00001008010500]] representation of the zettel. +Useful if you want to convert [[other markup languages|00001008000000]] to Markdown (e.g. [[Zettelmarkup|00001007000000]]). + +If transferred via HTTP, the content type will be ''text/markdown''. + +Please note that many elements of Zettelmarkup cannot be encoded in Markdown / CommonMark. +Examples are: +* [[Description lists|00001007030100]] +* [[Verse blocks|00001007030700]] +* [[Region blocks|00001007030800]] +* [[Comment blocks|00001007030900]] (and inline comments) +* [[Evaluation blocks|00001007031300]] +* [[Math-mode blocks|00001007031400]] +* [[Tables|00001007031000]] +* Most [[text formatting|00001007040100]] elements (except emphasis and quotation) +* Most [[literal-like formatting|00001007040200]] (except literal text / code spans) +Some elements are restricted, e.g. [[quotation lists|00001007030200]] are only supported as a top-level element. + +Restricted and unsupported elements are not encoded. +They will not appear on the encoded output. + +Maybe in the future, ignored elements may be shown as an HTML-like comment. Index: docs/manual/00001012920516.zettel ================================================================== --- docs/manual/00001012920516.zettel +++ docs/manual/00001012920516.zettel @@ -1,45 +1,20 @@ id: 00001012920516 -title: Sexpr Encoding +title: Sz Encoding role: manual tags: #api #manual #reference #zettelstore syntax: zmk created: 20220422181104 -modified: 20220908163427 - -A zettel representation that is a [[s-expression|https://en.wikipedia.org/wiki/S-expression]] (also known as symbolic expression). - -It is an alternative to the [[ZJSON encoding|00001012920503]]. -Both encodings are (relatively) easy to parse and contain all relevant information of a zettel, metadata and content. - -For example, take a look at the Sexpr encoding of this page, which is available via the ""Info"" sub-page of this zettel: - -* [[//v/00001012920516?enc=sexpr&part=zettel]], -* [[//v/00001012920516?enc=sexpr&part=meta]], -* [[//v/00001012920516?enc=sexpr&part=content]]. +modified: 20230403161458 + +A zettel representation that is a [[s-expression|00001012930000]] (also known as symbolic expression). + +It is (relatively) easy to parse and contain all relevant information of a zettel, metadata and content. +For example, take a look at the Sz encoding of this page, which is available via the ""Info"" sub-page of this zettel: + +* [[//z/00001012920516?enc=sz&part=zettel]], +* [[//z/00001012920516?enc=sz&part=meta]], +* [[//z/00001012920516?enc=sz&part=content]]. + +Some zettel describe the [[Sz encoding|00001012931000]] in a more detailed way. If transferred via HTTP, the content type will be ''text/plain''. - -=== Syntax of s-expressions -There are only two types of elements: atoms and lists. - -A list always starts with the left parenthesis (""''(''"", U+0028) and ends with a right parenthesis (""'')''"", U+0029). -A list may contain a possibly empty sequence of elements, i.e. lists and / or atoms. - -There are three syntactic forms for an atom: numbers, symbols and strings. - -A number is a non-empty sequence of digits (""0"" ... ""9""). -The smallest number is ``0``, there are no negative numbers. - -A symbol is a non-empty sequence of printable characters, except left or right parenthesis. -Unicode characters of the following categories contains printable characters in the above sense: letter (L), number (N), punctuation (P), symbol (S). -Symbols are case-insensitive, i.e. ""''ZETTEL''"" and ""''zettel''"" denote the same symbol. - -A string starts with a quotation mark (""''"''"", U+0022), contains a possibly empty sequence of Unicode characters, and ends with a quotation mark. -To allow a string to contain a quotations mark, it must be prefixed by one backslash (""''\\''"", U+005C). -To allow a string to contain a backslash, it also must be prefixed by one backslash. -Unicode characters with a code less than U+FF are encoded by by the sequence ""''\\xNM''"", where ''NM'' is the hex encoding of the character. -Unicode characters with a code less than U+FFFF are encoded by by the sequence ""''\\uNMOP''"", where ''NMOP'' is the hex encoding of the character. -Unicode characters with a code less than U+FFFFFF are encoded by by the sequence ""''\\UNMOPQR''"", where ''NMOPQR'' is the hex encoding of the character. -In addition, the sequence ""''\\t''"" encodes a horizontal tab (U+0009), the sequence ""''\\n''"" encodes a line feed (U+000A). - -Atoms are separated by Unicode characters of category separator (Z). ADDED docs/manual/00001012920525.zettel Index: docs/manual/00001012920525.zettel ================================================================== --- docs/manual/00001012920525.zettel +++ docs/manual/00001012920525.zettel @@ -0,0 +1,36 @@ +id: 00001012920525 +title: SHTML Encoding +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230316181044 +modified: 20230403150657 + +A zettel representation that is a [[s-expression|00001012930000]], syntactically similar to the [[Sz encoding|00001012920516]], but denotes [[HTML|00001012920510]] semantics. +It is derived from a XML encoding in s-expressions, called [[SXML|https://en.wikipedia.org/wiki/SXML]]. + +It is (relatively) easy to parse and contains everything to transform it into real HTML. +In contrast to HTML, SHTML is easier to parse and to manipulate. +For example, take a look at the SHTML encoding of this page, which is available via the ""Info"" sub-page of this zettel: + +* [[//z/00001012920525?enc=shtml&part=zettel]], +* [[//z/00001012920525?enc=shtml&part=meta]], +* [[//z/00001012920525?enc=shtml&part=content]]. + +If transferred via HTTP, the content type will be ''text/plain''. + +Internally, if a zettel should be transformed into HTML, the zettel is translated into the [[Sz encoding|00001012920516]], which is transformed into this SHTML encoding to produce the [[HTML encoding|00001012920510]]. + +=== Syntax of SHTML +There are only two types of elements: atoms and lists, similar to the Sz encoding. + +A list always starts with the left parenthesis (""''(''"", U+0028) and ends with a right parenthesis (""'')''"", U+0029). +A list may contain a possibly empty sequence of elements, i.e. lists and / or atoms. +Before the last element of a list of at least to elements, a full stop character (""''.''"", U+002E) signal a pair as the last two elements. +This allows a more space economic storage of data. + +An HTML tag like ``< a href="link">Text`` is encoded in SHTML with a list, where the first element is a symbol named a the tag. +The second element is an optional encoding of the tag's attributes. +Further elements are either other tag encodings or a string. +The above tag is encoded as ``(a (@ (href . "link")) "Text")``. +Also possible is to encode the attribute without pairs: ``(a (@ (href "link")) "Text")`` (note the missing full stop character). DELETED docs/manual/00001012920582.zettel Index: docs/manual/00001012920582.zettel ================================================================== --- docs/manual/00001012920582.zettel +++ docs/manual/00001012920582.zettel @@ -1,14 +0,0 @@ -id: 00001012920582 -title: ZJSON Encoding: List of Valid Metadata Value Objects Names -role: manual -tags: #api #manual #reference #zettelstore -syntax: zmk -modified: 20220223184324 - -Every Metadata value element is mapped to a JSON object with some well defined names / keys. - -|=Name | JSON Value | Meaning -| ''"\"'' | string | The type of the Zettelmarkup element. -| ''"i"'' | array | A sequence of [[inline-structured|00001007040000]] elements. -| ''"s"'' | string | The first / major string value of an element. -| ''"y"'' | array | A set of string values. DELETED docs/manual/00001012920584.zettel Index: docs/manual/00001012920584.zettel ================================================================== --- docs/manual/00001012920584.zettel +++ docs/manual/00001012920584.zettel @@ -1,28 +0,0 @@ -id: 00001012920584 -title: ZJSON Encoding: Mapping of Metadata Key Types to Object Names -role: manual -tags: #api #manual #reference #zettelstore -syntax: zmk -modified: 20220304114135 - -Every [[Metadata key|00001006030000]] is mapped to an [[object name|00001012920582]] where its value is encoded. - -|=Type | JSON Object Name | Remark -| [[Credential|00001006031000]] | ''"s"'' | A string with the decrypted credential. -| [[EString|00001006031500]] | ''"s"'' | A possibly empty string. -| [[Identifier|00001006032000]] | ''"s"'' | A string containing a [[zettel identifier|00001006050000]]. -| [[IdentifierSet|00001006032500]] | ''"y"'' | An array of strings containing [[zettel identifier|00001006050000]]. -| [[Number|00001006033000]] | ''"s"'' | A string containing a numeric value. -| [[String|00001006033500]] | ''"s"'' | A non-empty string. -| [[TagSet|00001006034000]] | ''"y"'' | An array of string containing zettel tags. -| [[Timestamp|00001006034500]] | ''"s"'' | A string containing a timestamp in the format YYYYMMDDHHmmSS. -| [[URL|00001006035000]] | ''"s"'' | A string containing an URL. -| [[Word|00001006035500]] | ''"s"'' | A string containing a word (no space characters) -| [[WordSet|00001006036000]] | ''"y"'' | An array of strings containing words. -| [[Zettelmarkup|00001006036500]] | ''"i"'' | A sequence of [[inline-structured|00001007040000]] elements. - -Please note, that metadata is weakly typed. -Every metadata key expects a certain type. -But the user is free to enter something different. -For example, even if the metadata type is ""number"", its value could still be ""abc"". -However, the mapping itself is always valid. DELETED docs/manual/00001012920588.zettel Index: docs/manual/00001012920588.zettel ================================================================== --- docs/manual/00001012920588.zettel +++ docs/manual/00001012920588.zettel @@ -1,24 +0,0 @@ -id: 00001012920588 -title: ZJSON Encoding: List of Valid Zettelmarkup Element Objects Names -role: manual -tags: #api #manual #reference #zettelstore -syntax: zmk -modified: 20220301102447 - -Every [[Zettelmarkup|00001007000000]] element is mapped to a JSON object with some well defined names / keys. - -|=Name | JSON Value | Meaning -| ''"\"'' | string | The type of the Zettelmarkup element. -| ''"a"'' | object | Additional attributes of the element. -| ''"b"'' | array | A sequence of [[block-structured|00001007030000]] elements. -| ''"c"'' | array | A sequence of a sequence of (sub-) list elements or [[inline-structured|00001007040000]] elements. Used for nested lists. -| ''"d"'' | array | A sequence of description list elements, where each element is an object of a definition term and a list of descriptions. -| ''"e"'' | array | A sequence of descriptions: a JSON array of simple description, which is itself a JSON array of block structured elements. -| ''"i"'' | array | A sequence of [[inline-structured|00001007040000]] elements. -| ''"j"'' | object | An objects describing a BLOB element. -| ''"n"'' | number | A numeric value, e.g. for specifying the [[heading|00001007030300]] level. -| ''"o"'' | string | A base64 encoded binary value. Used in some BLOB elements. -| ''"p"'' | array | A sequence of two elements: a sequence of [[table|00001007031000]] header value, followed by a sequence of sequence of table row values. -| ''"q"'' | string | A second string value, if ''""s""'' is already used. -| ''"s"'' | string | The first / major string value of an element. -| ''"v"'' | string | A third string value, if ''""q""'' is already used. Index: docs/manual/00001012921000.zettel ================================================================== --- docs/manual/00001012921000.zettel +++ docs/manual/00001012921000.zettel @@ -1,14 +1,23 @@ id: 00001012921000 -title: API: JSON structure of an access token +title: API: Structure of an access token +role: manual tags: #api #manual #reference #zettelstore syntax: zmk -role: manual +created: 20210126175322 +modified: 20230807165915 If the [[authentication process|00001012050200]] was successful, an access token with some additional data is returned. The same is true, if the access token was [[renewed|00001012050400]]. -The response is structured as an JSON object, with the following named values: +The response is structured as a [[symbolic expression|00001012930000]] list, with the following elements: -|=Name|Description -|''access_token''|The access token itself, as string value, which is a [[JSON Web Token|https://tools.ietf.org/html/rfc7519]] (JWT, RFC 7915) -|''token_type''|The type of the token, always set to ''"Bearer"'', as described in [[RFC 6750|https://tools.ietf.org/html/rfc6750]] -|''expires_in''|An integer that gives a hint about the lifetime / endurance of the token, measured in seconds +# The type of the token, always set to ''"Bearer"'', as described in [[RFC 6750|https://tools.ietf.org/html/rfc6750]] +# The token itself, which is technically the string representation of a [[symbolic expression|00001012930500]] containing relevant data, plus a check sum. +#* The symbolic expression has the form ''(KIND USERNAME NOW EXPIRE Z-ID)'' +#* ''KIND'' is ''0'' for an API access, ''1'' if it created for the Web user interface. +#* ''USERNAME'' is the user name of the user. +#* ''NOW'' is a timestamp of the current time. +#* ''EXPIRE'' is the timestamp when the access token expires. +#* ''Z-ID'' is the zettel identifier of the user zettel. + The symbolic expression is encoded via ""base64"". + Based on this encoding, a checksum is calculated, also encoded via ""base64"". + Both encoded values are concatenated, with a period (''"."'') as a delimiter. Index: docs/manual/00001012921200.zettel ================================================================== --- docs/manual/00001012921200.zettel +++ docs/manual/00001012921200.zettel @@ -1,14 +1,15 @@ id: 00001012921200 title: API: Encoding of Zettel Access Rights role: manual tags: #api #manual #reference #zettelstore syntax: zmk -modified: 20220201171959 +created: 20220201173115 +modified: 20230807164817 -Various API calls return a JSON key ''"rights"'' that encodes the access rights the user currently has. -It is an integer number between 0 and 62.[^Not all values in this range are used.] +Various API calls return a symbolic expression list ''(rights N)'', with ''N'' as a number, that encodes the access rights the user currently has. +''N'' is an integer number between 0 and 62.[^Not all values in this range are used.] The value ""0"" signals that something went wrong internally while determining the access rights. A value of ""1"" says, that the current user has no access right for the given zettel. In most cases, this value will not occur, because only zettel are presented, which are at least readable by the current user. ADDED docs/manual/00001012930000.zettel Index: docs/manual/00001012930000.zettel ================================================================== --- docs/manual/00001012930000.zettel +++ docs/manual/00001012930000.zettel @@ -0,0 +1,26 @@ +id: 00001012930000 +title: Symbolic Expression +role: manual +tags: #manual #reference #zettelstore +syntax: zmk +created: 20230403145644 +modified: 20230403154010 + +A symbolic expression (also called __s-expression__) is a notation of a list-based tree. +Inner nodes are lists of arbitrary length, outer nodes are primitive values (also called __atoms__) or the empty list. + +A symbolic expression is either +* a primitive value (__atom__), or +* a list of the form __(E,,1,, E,,2,, … E,,n,,)__, where __E,,i,,__ is itself a symbolic expression, separated by space characters. + +An atom is a number, a string, or a symbol. + +Symbolic expressions are used in programming languages like LISP or Scheme, where they denote both data structures and the program itself. +This allows a LISP or Scheme program to process LISP or Scheme programs. +That property is also used within Zettelstore. + +Symbolic expressions are relatively easy to read, to parse, and to process. + +=== See also +* [[Syntax|00001012930500]] of symbolic expressions in the Zettelstore +* [[S-expression @ Wikipedia|https://en.wikipedia.org/wiki/S-expression]] ADDED docs/manual/00001012930500.zettel Index: docs/manual/00001012930500.zettel ================================================================== --- docs/manual/00001012930500.zettel +++ docs/manual/00001012930500.zettel @@ -0,0 +1,77 @@ +id: 00001012930500 +title: Syntax of Symbolic Expressions +role: manual +tags: #manual #reference #zettelstore +syntax: zmk +created: 20230403151127 +modified: 20230703174218 + +=== Syntax of lists +A list always starts with the left parenthesis (""''(''"", U+0028) and ends with a right parenthesis (""'')''"", U+0029). +A list may contain a possibly empty sequence of elements, i.e. lists and / or atoms. + +Internally, lists are composed of __cells__. +A cell allows to store two values. +The first value references the first element of a list. +The second value references the rest of the list, or is the special value __nil__ if there is no rest of the list. + +However, it is possible to store an atom as the second value of the last cell. +In this case, before the last element of a list of at least two elements, a full stop character (""''.''"", U+002E) signals such a cell as the last two elements. +This allows a more space economic storage of data. + +A __proper__ list, which contains __nil__ as the second value of the last element might be pictured as follows: + +~~~draw ++---+---+ +---+---+ +---+---+ +| V | N +-->| V | N +--> -->| V | | ++-+-+---+ +-+-+---+ +-+-+---+ + | | | + v v v ++-------+ +-------+ +-------+ +| Elem1 | | Elem2 | | ElemN | ++-------+ +-------+ +-------+ +~~~ + +''V'' is a placeholder for a value, ''N'' is the reference to the next cell (also known as the rest / tail of the list). +Above list will be represented as an symbolic expression as ''(Elem1 Elem2 ... ElemN)'' + +An improper list will have a non-__nil__ reference to an atom as the very last element + +~~~draw ++---+---+ +---+---+ +---+---+ +| V | N +-->| V | N +--> -->| V | V | ++-+-+---+ +-+-+---+ +-+-+-+-+ + | | | | + v v v v ++-------+ +-------+ +-------+ +------+ +| Elem1 | | Elem2 | | ElemN | | Atom | ++-------+ +-------+ +-------+ +------+ +~~~ + +Above improper list will be represented as an symbolic expression as ''(Elem1 Elem2 ... ElemN . Atom)'' + + +=== Syntax of numbers (atom) +A number is a non-empty sequence of digits (""0"" ... ""9""). +The smallest number is ``0``, there are no negative numbers. + +=== Syntax of symbols (atom) +A symbol is a non-empty sequence of printable characters, except left or right parenthesis. +Unicode characters of the following categories contains printable characters in the above sense: letter (L), number (N), punctuation (P), symbol (S). +Symbols are case-sensitive, i.e. ""''ZETTEL''"" and ""''zettel''"" denote different symbols. + +=== Syntax of string (atom) + +A string starts with a quotation mark (""''"''"", U+0022), contains a possibly empty sequence of Unicode characters, and ends with a quotation mark. +To allow a string to contain a quotations mark, it must be prefixed by one backslash (""''\\''"", U+005C). +To allow a string to contain a backslash, it also must be prefixed by one backslash. +Unicode characters with a code less than U+FF are encoded by by the sequence ""''\\xNM''"", where ''NM'' is the hex encoding of the character. +Unicode characters with a code less than U+FFFF are encoded by by the sequence ""''\\uNMOP''"", where ''NMOP'' is the hex encoding of the character. +Unicode characters with a code less than U+FFFFFF are encoded by by the sequence ""''\\UNMOPQR''"", where ''NMOPQR'' is the hex encoding of the character. +In addition, the sequence ""''\\t''"" encodes a horizontal tab (U+0009), the sequence ""''\\n''"" encodes a line feed (U+000A). + +=== See also +* Currently, Zettelstore uses [[sx|https://zettelstore.de/sx]] (""Symbolic eXPression Framework"") to implement symbolic expression. + The project page might contain additional information about the full syntax. + + Zettelstore only uses lists, numbers, string, and symbols to represent zettel. ADDED docs/manual/00001012931000.zettel Index: docs/manual/00001012931000.zettel ================================================================== --- docs/manual/00001012931000.zettel +++ docs/manual/00001012931000.zettel @@ -0,0 +1,81 @@ +id: 00001012931000 +title: Encoding of Sz +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230403153903 +modified: 20230405133249 + +Zettel in a [[Sz encoding|00001012920516]] are represented as a [[symbolic expression|00001012930000]]. +To process these symbolic expressions, you need to know, how a specific part of a zettel is represented by a symbolic expression. + +Basically, each part of a zettel is represented as a list, often a nested list. +The first element of that list is always an unique symbol, which denotes that part. +The meaning / semantic of all other elements depend on that symbol. + +=== Zettel +A full zettel is represented by a list of two elements. +The first elements represents the metadata, the second element represents the zettel content. + +:::syntax +__Zettel__ **=** ''('' [[__Metadata__|#metadata]] [[__Content__|#content]] '')''. +::: + +=== Metadata + +Metadata is represented by a list, where the first element is the symbol ''META''. +Following elements represent each metadatum[^""Metadatum"" is used as the singular form of metadata.] of a zettel in standard order. + +Standard order is: [[Title|00001006020000#title]], [[Role|00001006020000#role]], [[Tags|00001006020000#tags]], [[Syntax|00001006020000#syntax]], all other [[keys|00001006020000]] in alphabetic order. + +:::syntax +__Metadata__ **=** ''(META'' [[__Metadatum__|00001012931200]] __Metadatum__ … __Metadatum__ '')''. +::: +=== Content + +Zettel content is represented by a block. +:::syntax +__Content__ **=** [[__Block__|#block]]. +::: + +==== Block +A block is represented by a list with the symbol ''BLOCK'' as the first element. +All following elements represent a nested [[block-structured element|00001007030000]]. + +:::syntax +[!block|__Block__] **=** ''(BLOCK'' [[__BlockElement__|00001012931400]] __BlockElement__ … __BlockElement__ '')''. +::: + +==== Inline +Both block-structured elements and some metadata values may contain [[inline-structured elements|00001007040000]]. +Similar, inline-structured elements are represented as follows: + +:::syntax +__Inline__ **=** ''(INLINE'' [[__InlineElement__|00001012931600]] __InlineElement__ … __InlineElement__ '')''. +::: + +==== Attribute +[[Attributes|00001007050000]] may be specified for both block- and inline- structured elements. +Attributes are represented by the following schema. +Please note, the the symbol ''quote'' is lower-case by intention. + +:::syntax +__Attribute__ **=** ''('' **[** ''quote'' ''('' [[__AttributeKeyValue__|00001012931800]] __AttributeKeyValue__ … __AttributeKeyValue__ '')'' **]** ')'. +::: + +Either, there are no attributes. +These are specified by the empty list ''()''. +Or there are attributes. +In this case, the first element of the list must be the symbol ''quote'': ''(quote'' ''('' A,,1,, A,,2,, … A,,n,, '')'''')''. + +=== Other +A list with ''UNKNOWN'' as its first element signals an internal error during transforming a zettel into the Sz encoding. +It may be ignored, or it may produce an error. + +:::syntax +__Unknown__ **=** ''(UNKNOWN'' Object … '')''. +::: + +The list may only contain the symbol ''UNKNOWN'', or additionally an unlimited amount of other objects. + +Similar, any symbol with the pattern ''**xyz:NOT-FOUND**'', where ''xyz'' is any string, signals an internal error. ADDED docs/manual/00001012931200.zettel Index: docs/manual/00001012931200.zettel ================================================================== --- docs/manual/00001012931200.zettel +++ docs/manual/00001012931200.zettel @@ -0,0 +1,41 @@ +id: 00001012931200 +title: Encoding of Sz Metadata +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230403161618 +modified: 20230405121932 + +A single metadata (""metadatum"") is represented by a triple: a symbol representing the type, a symbol representing the key, and either a string or a list that represent the value. + +The key symbol must be ""quoted"", i.e. for the key ""title"": ''(quote title)''. +This property may be relaxed in future versions of the Zettelstore. + +The symbol depends on the [[metadata key type|00001006030000]]. +The value also depends somehow on the key type: a set of values is represented as a list, all other values are represented by a string, even if it is a number. + +The following table maps key types to symbols and to the type of the value representation. + +|=Key Type<| Symbol<| Value< +| [[Credential|00001006031000]] | ''CREDENTIAL'' | string +| [[EString|00001006031500]] | ''EMPTY-STRING'' | string +| [[Identifier|00001006032000]] | ''ZID'' | string +| [[IdentifierSet|00001006032500]] | ''ZID-SET'' | list +| [[Number|00001006033000]] | ''NUMBER'' | string +| [[String|00001006033500]] | ''STRING'' | string +| [[TagSet|00001006034000]] | ''TAG-SET'' | list +| [[Timestamp|00001006034500]] | ''TIMESTAMP'' | string +| [[URL|00001006035000]] | ''URL'' | string +| [[Word|00001006035500]] | ''WORD'' | string +| [[WordSet|00001006036000]] | ''WORD-SET'' | list +| [[Zettelmarkup|00001006036500]] | ''ZETTELMARKUP'' | string + +If the value is represented as a list, its first element is the symbol ''list'', and all other elements are strings with the appropriate values. + +:::syntax +__ListValue__ **=** ''(list'' String,,1,, String,,2,, … String,,n,, '')''. +::: + +Examples: +* The title of this zettel is represented as: ''(EMPTY-STRING (quote title) "Encoding of Sz Metadata")'' +* The tags of this zettel are represented as: ''(TAG-SET (quote tags) (list "#api" "#manual" "#reference" "#zettelstore"))'' ADDED docs/manual/00001012931400.zettel Index: docs/manual/00001012931400.zettel ================================================================== --- docs/manual/00001012931400.zettel +++ docs/manual/00001012931400.zettel @@ -0,0 +1,186 @@ +id: 00001012931400 +title: Encoding of Sz Block Elements +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230403161803 +modified: 20230405132916 + +=== ''PARA'' +:::syntax +__Paragraph__ **=** ''(PARA'' [[__InlineElement__|00001012931600]] … '')''. +::: +A paragraph is just a list of inline elements. + +=== ''HEADING'' +:::syntax +__Heading__ **=** ''(HEADING'' Number [[__Attributes__|00001012931000#attribute]] String,,1,, String,,2,, [[__InlineElement__|00001012931600]] … '')''. +::: +A heading consists of a number, which specifies its level (1 -- 5), its optional attributes. +The first string is a ""slug"" of the heading text, i.e. transformed it to lower case, replaced space character with minus sign, and some more. +The second string is the slug, but made unique for the whole zettel. +Then the heading text follows as a sequence of inline elements. + +=== ''THEMATIC'' +:::syntax +__Thematic__ **=** ''(THEMATIC'' [[__Attributes__|00001012931000#attribute]] '')''. +::: + +=== ''ORDERED'', ''UNORDERED'', ''QUOTATION'' +These three symbols are specifying different kinds of lists / enumerations: an ordered list, an unordered list, and a quotation list. +Their structure is the same. + +:::syntax +__OrderedList__ **=** ''(ORDERED'' __ListElement__ … '')''. + +__UnorderedList__ **=** ''(UNORDERED'' __ListElement__ … '')''. + +__QuotationList__ **=** ''(QUOTATION'' __ListElement__ … '')''. +::: + +:::syntax +__ListElement__ **=** [[__Block__|00001012931000#block]] **|** [[__Inline__|00001012931000#inline]]. +::: +A list element is either a block or an inline. +If it is a block, it may contain a nested list. +=== ''DESCRIPTION'' +:::syntax +__Description__ **=** ''(DESCRIPTION'' __DescriptionTerm__ __DescriptionValues__ __DescriptionTerm__ __DescriptionValues__ … '')''. +::: +A description is a sequence of one ore more terms and values. + +:::syntax +__DescriptionTerm__ **=** [[__Inline__|00001012931000#inline]]. +::: +A description term is just an inline-structured value. + +:::syntax +__DescriptionValues__ **=** ''(BLOCK'' [[__Block__|00001012931000#block]] … '')''. +::: +Description values are sequences of blocks. + +=== ''TABLE'' +:::syntax +__Table__ **=** ''(TABLE'' __TableHeader__ __TableRow__ … '')''. +::: +A table is a table header and a sequence of table rows. + +:::syntax +__TableHeader__ **=** ''()'' **|** ''(list'' __TableCell__ … '')''. +::: +A table header is either the empty list or a list of table cells stating with the ''list'' symbol. + +:::syntax +__TableRow__ **=** ''(list'' __TableCell__ … '')''. +::: +A table row is a list with the initial symbol ''list'', followed by table cells. + +=== ''CELL'', ''CELL-*'' +There are four kinds of table cells, one for each possible cell alignment. +The structure is the same for all kind. + +:::syntax +__TableCell__ **=** __DefaultCell__ **|** __CenterCell__ **|** __LeftCell__ **|** __RightCell__. +::: + +:::syntax +__DefaultCell__ **=** ''(CELL'' [[__InlineElement__|00001012931600]] … '')''. +::: +The cell content, specified by the sequence of inline elements, used the default alignment. + +:::syntax +__CenterCell__ **=** ''(CELL-CENTER'' [[__InlineElement__|00001012931600]] … '')''. +::: +The cell content, specified by the sequence of inline elements, is centered aligned. + +:::syntax +__LeftCell__ **=** ''(CELL-LEFT'' [[__InlineElement__|00001012931600]] … '')''. +::: +The cell content, specified by the sequence of inline elements, is left aligned. + +:::syntax +__RightCell__ **=** ''(CELL-RIGHT'' [[__InlineElement__|00001012931600]] … '')''. +::: +The cell content, specified by the sequence of inline elements, is right aligned. + +=== ''REGION-*'' +The following lists specifies different kinds of regions. +A region treat a sequence of block elements to be belonging together in certain ways. +The have a similar structure. + +:::syntax +__BlockRegion__ **=** ''(REGION-BLOCK'' [[__Attributes__|00001012931000#attribute]] [[__Block__|00001012931000#block]] [[__Inline__|00001012931000#inline]] '')''. +::: +A block region just treats the block to belong in an unspecified way. +Typically, the reason is given in the attributes. +The inline describes the block. + +:::syntax +__QuoteRegion__ **=** ''(REGION-QUOTE'' [[__Attributes__|00001012931000#attribute]] [[__Block__|00001012931000#block]] [[__Inline__|00001012931000#inline]] '')''. +::: +A block region just treats the block to contain a longer quotation. +Attributes may further specify the quotation. +The inline typically describes author / source of the quotation. + +:::syntax +__VerseRegion__ **=** ''(REGION-VERSE'' [[__Attributes__|00001012931000#attribute]] [[__Block__|00001012931000#block]] [[__Inline__|00001012931000#inline]] '')''. +::: +A block region just treats the block to contain a verse. +Soft line break are transformed into hard line breaks to save the structure of the verse / poem. +Attributes may further specify something. +The inline typically describes author / source of the verse. + +=== ''VERBATIM-*'' +The following lists specifies some literal text of more than one line. +The structure is always the same, the initial symbol denotes the actual usage. +The content is encoded as a string, most likely to contain control characters that signals the end of a line. + +:::syntax +__CommentVerbatim__ **=** ''(VERBATIM-COMMENT'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as an internal comment not to be interpreted further. + +:::syntax +__EvalVerbatim__ **=** ''(VERBATIM-EVAL'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be evaluated by an (external) software to produce some derived content. + +:::syntax +__HTMLVerbatim__ **=** ''(VERBATIM-HTML'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains HTML code. + +:::syntax +__MathVerbatim__ **=** ''(VERBATIM-MATH'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as special code to be interpreted as mathematical formulas. + +:::syntax +__CodeVerbatim__ **=** ''(VERBATIM-CODE'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as (executable) code. + +:::syntax +__ZettelVerbatim__ **=** ''(VERBATIM-ZETTEL'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as (nested) zettel content. + +=== ''BLOB'' +:::syntax +__BLOB__ **=** ''(BLOB'' [[__Inline__|00001012931000#inline]] String,,1,, String,,2,, '')''. +::: +A BLOB contains an image in block mode. +The inline states some description. +The first string contains the syntax of the image. +The second string contains the actual image. +If the syntax is ""SVG"", then the second string contains the SVG code. +Otherwise the (binary) image data is encoded with base64. + +=== ''TRANSCLUDE'' +:::syntax +__Transclude__ **=** ''(TRANSCLUDE'' [[__Attributes__|00001012931000#attribute]] [[__Reference__|00001012931900]] '')''. +::: +A transclude list only occurs for a parsed zettel, but not for a evaluated zettel. +Evaluating a zettel also means that all transclusions are resolved. + +__Reference__ denotes the zettel to be transcluded. ADDED docs/manual/00001012931600.zettel Index: docs/manual/00001012931600.zettel ================================================================== --- docs/manual/00001012931600.zettel +++ docs/manual/00001012931600.zettel @@ -0,0 +1,212 @@ +id: 00001012931600 +title: Encoding of Sz Inline Elements +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230403161845 +modified: 20230405123222 + +=== ''TEXT'' +:::syntax +__Text__ **=** ''(TEXT'' String '')''. +::: +Specifies the string as some text content, typically a word. + +=== ''SPACE'' +:::syntax +__Space__ **=** ''(SPACE'' **[** String **]** '')''. +::: +Specifies some space, typically white space. +If the string is not given it is assumed to be ''" "'' (one space character). +Otherwise it contains the space characters. + +=== ''SOFT'' +:::syntax +__Soft__ **=** ''(SOFT)''. +::: +Denotes a soft line break. +It is typically translated into a space character, but signals the point in the textual content, where a line break occurred. + +=== ''HARD'' +:::syntax +__Hard__ **=** ''(HARD)''. +::: +Specifies a hard line break, i.e. the user wants to have a line break here. + +=== ''LINK-*'' +The following lists specify various links, based on the full reference. +They all have the same structure, with a trailing sequence of __InlineElements__ that contain the linked text. + +:::syntax +__InvalidLink__ **=** ''(LINK-INVALID'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains the invalid link specification. + +:::syntax +__ZettelLink__ **=** ''(LINK-ZETTEL'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains the zettel identifier, a zettel reference. + +:::syntax +__SelfLink__ **=** ''(LINK-SELF'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains the number sign character and the name of a zettel mark. +It reference the same zettel where it occurs. + +:::syntax +__FoundLink__ **=** ''(LINK-FOUND'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains a zettel identifier, a zettel reference, of a zettel known to be included in the Zettelstore. + +:::syntax +__BrokenLink__ **=** ''(LINK-BROKEN'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains a zettel identifier, a zettel reference, of a zettel known to be __not__ included in the Zettelstore. + +:::syntax +__HostedLink__ **=** ''(LINK-HOSTED'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains a link starting with one slash character, denoting an absolute local reference. + +:::syntax +__BasedLink__ **=** ''(LINK-BASED'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains a link starting with two slash characters, denoting a local reference interpreted relative to the Zettelstore base URL. + +:::syntax +__QueryLink__ **=** ''(LINK-BASED'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains a [[query expression|00001007700000]]. + +:::syntax +__ExternalLink__ **=** ''(LINK-EXTERNAL'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains a full URL, referencing a resource outside of the Zettelstore server. + +=== ''EMBED'' +:::syntax +__Embed__ **=** ''(EMBED'' [[__Attributes__|00001012931000#attribute]] [[__Reference__|00001012931900]] String [[__InlineElement__|00001012931600]] … '')''. +::: +Specifies an embedded element, in most cases some image content or an inline transclusion. +A transclusion will only be used, if the zettel content was not evaluated. + +__Reference__ denoted the referenced zettel. + +If the string value is empty, it is an inline transclusion. +Otherwise it contains the syntax of an image. + +The __InlineElement__ at the end of the list is interpreted as describing text. + +=== ''EMBED-BLOB'' +:::syntax +__EmbedBLOB__ **=** ''(EMBED-BLOB'' [[__Attributes__|00001012931000#attribute]] String,,1,, String,,2,, '')''. +::: +If used if some processed image has to be embedded inside some inline material. +The first string specifies the syntax of the image content. +The second string contains the image content. +If the syntax is ""SVG"", the image content is not further encoded. +Otherwise a base64 encoding is used. + +=== ''CITE'' +:::syntax +__CiteBLOB__ **=** ''(CITE'' [[__Attributes__|00001012931000#attribute]] String [[__InlineElement__|00001012931600]] … '')''. +::: +The string contains the citation key. + +=== ''MARK'' +:::syntax +__Mark__ **=** ''(MARK'' String,,1,, String,,2,, String,,3,, [[__InlineElement__|00001012931600]] … '')''. +::: +The first string is the mark string used in the content. +The second string is the mark string transformed to a slug, i.e. transformed to lower case, remove non-ASCII characters. +The third string is the slug string, but made unique for the whole zettel. +Then follows the marked text as a sequence of __InlineElement__s. + +=== ''ENDNOTE'' +:::syntax +__Endnote__ **=** ''(ENDNOTE'' [[__Attributes__|00001012931000#attribute]] ''(quote'' [[__InlineElement__|00001012931600]] … '')'''')''. +::: +Specifies endnote / footnote text. + +=== ''FORMAT-*'' +The following lists specifies some inline text formatting. +The structure is always the same, the initial symbol denotes the actual formatting. + +:::syntax +__DeleteFormat__ **=** ''(FORMAT-DELETE'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as deleted. + +:::syntax +__EmphasizeFormat__ **=** ''(FORMAT-EMPH'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as emphasized. + +:::syntax +__InsertFormat__ **=** ''(FORMAT-INSERT'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as inserted. + +:::syntax +__QuoteFormat__ **=** ''(FORMAT-QUOTE'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as quoted text. + +:::syntax +__SpanFormat__ **=** ''(FORMAT-SPAN'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as belonging together in a certain, yet unspecified way. + +:::syntax +__SubScriptFormat__ **=** ''(FORMAT-SUB'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as sub-scripted text. + +:::syntax +__SuperScriptFormat__ **=** ''(FORMAT-SUPER'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as super-scripted text. + +:::syntax +__StrongFormat__ **=** ''(FORMAT-STRONG'' [[__Attributes__|00001012931000#attribute]] [[__InlineElement__|00001012931600]] … '')''. +::: +The inline text should be treated as strongly emphasized. + +=== ''LITERAL-*'' +The following lists specifies some literal text. +The structure is always the same, the initial symbol denotes the actual usage. + +:::syntax +__CodeLiteral__ **=** ''(LITERAL-CODE'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as executable code. + +:::syntax +__CommentLiteral__ **=** ''(LITERAL-COMMENT'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as an internal comment not to be interpreted further. + +:::syntax +__HTMLLiteral__ **=** ''(LITERAL-HTML'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as HTML code. + +:::syntax +__InputLiteral__ **=** ''(LITERAL-INPUT'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as input entered by an user. + +:::syntax +__MathLiteral__ **=** ''(LITERAL-MATH'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as special code to be interpreted as mathematical formulas. + +:::syntax +__OutputLiteral__ **=** ''(LITERAL-OUTPUT'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as computer output to be read by an user. + +:::syntax +__ZettelLiteral__ **=** ''(LITERAL-ZETTEL'' [[__Attributes__|00001012931000#attribute]] String '')''. +::: +The string contains text that should be treated as (nested) zettel content. ADDED docs/manual/00001012931800.zettel Index: docs/manual/00001012931800.zettel ================================================================== --- docs/manual/00001012931800.zettel +++ docs/manual/00001012931800.zettel @@ -0,0 +1,28 @@ +id: 00001012931800 +title: Encoding of Sz Attribute Values +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230403161923 +modified: 20230403163701 + +An attribute is represented by a single cell. +The first element of the cell references the attribute key, the second value the corresponding value. + +:::syntax +__AttributeKeyValue__ **=** ''('' __AttributeKey__ ''.'' __AttributeValue__ '')''. +::: + +__AttributeKey__ and __AttributeValue__ are [[string values|00001012930500]]. + +An empty key denotes the generic attribute. + +A key with the value ''"-"'' specifies the default attribute. +In this case, the attribute value is not interpreted. + +Some examples: +* ''()'' represents the absence of attributes, +* ''(quote (("-" . "")))'' represent the default attribute, +* ''(quote (("-" . "") ("" . "syntax")))'' adds the generic attrribute with the value ""syntax"", +* ''(quote ())'' will also represent the absence of attribute (in a more complicated way), +* ''(quote (("lang" . "en")))'' denote the attribute key ""lang"" with a value ""en"". ADDED docs/manual/00001012931900.zettel Index: docs/manual/00001012931900.zettel ================================================================== --- docs/manual/00001012931900.zettel +++ docs/manual/00001012931900.zettel @@ -0,0 +1,38 @@ +id: 00001012931900 +title: Encoding of Sz Reference Values +role: manual +tags: #api #manual #reference #zettelstore +syntax: zmk +created: 20230405123046 +modified: 20230405124516 + +A reference is encoded as the actual reference value, and a symbol describing the state of that actual reference value. + +:::syntax +__Reference__ **=** ''(quote'' __ReferenceState__ String '')''. +::: +The ''quote'' is needed for internal reasons, the string contains the actual reference value. + +:::syntax +__ReferenceState__ **=** ''INVALID'' **|** ''ZETTEL'' **|** ''SELF'' **|** ''FOUND'' **|** ''BROKEN'' **|** ''HOSTED'' **|** ''BASED'' **|** ''QUERY'' **|** ''EXTERNAL''. +::: + +The meaning of the state symbols corresponds to that of the symbols used for the description of [[link references|00001012931600#link]]. + +; ''INVALID'' +: The reference value is invalid. +; ''ZETTEL'' +: The reference value is a reference to a zettel. + This value is only possible before evaluating the zettel. +; ''SELF'' +: The reference value is a reference to the same zettel, to a specific mark. +; ''FOUND'' +: The reference value is a valid reference to an existing zettel. + This value is only possible after evaluating the zettel. +; ''BROKEN'' +: The reference value is a valid reference to an missing zettel. + This value is only possible after evaluating the zettel. +; ''HOSTED'' +; ''BASED'' +; ''QUERY'' +; ''EXTERNAL'' Index: docs/manual/00001017000000.zettel ================================================================== --- docs/manual/00001017000000.zettel +++ docs/manual/00001017000000.zettel @@ -2,49 +2,52 @@ title: Tips and Tricks role: manual tags: #manual #zettelstore syntax: zmk created: 20220803170112 -modified: 20220916132030 +modified: 20230827225202 === Welcome Zettel * **Problem:** You want to put your Zettelstore into the public and need a starting zettel for your users. In addition, you still want a ""home zettel"", with all your references to internal, non-public zettel. Zettelstore only allows to specify one [[''home-zettel''|00001004020000#home-zettel]]. -* **Solution:** +* **Solution 1:** *# Create a new zettel with all your references to internal, non-public zettel. Let's assume this zettel receives the zettel identifier ''20220803182600''. *# Create the zettel that should serve as the starting zettel for your users. It must have syntax [[Zettelmarkup|00001008000000#zmk]], i.e. the syntax metadata must be set to ''zmk''. If needed, set the runtime configuration [[''home-zettel|00001004020000#home-zettel]] to the value of the identifier of this zettel. *# At the beginning of the start zettel, add the following [[Zettelmarkup|00001007000000]] text in a separate paragraph: ``{{{20220803182600}}}`` (you have to adapt to the actual value of the zettel identifier for your non-public home zettel). * **Discussion:** As stated in the description for a [[transclusion|00001007031100]], a transclusion will be ignored, if the transcluded zettel is not visible to the current user. In effect, the transclusion statement (above paragraph that contained ''{{{...}}}'') is ignored when rendering the zettel. +* **Solution 2:** Set a user-specific value by adding metadata ''home-zettel'' to the [[user zettel|00001010040200]]. +* **Discussion:** A value for ''home-zettel'' is first searched in the user zettel of the current authenticated user. + Only if it is not found, the value is looked up in the runtime configuration zettel. + If multiple user should use the same home zettel, its zettel identifier must be set in all relevant user zettel. === Role-specific Layout of Zettel in Web User Interface (WebUI) [!role-css] * **Problem:** You want to add some CSS when displaying zettel of a specific [[role|00001006020000#role]]. For example, you might want to add a yellow background color for all [[configuration|00001006020100#configuration]] zettel. Or you want a multi-column layout. -* **Solution:** If you enable [[''expert-mode''|00001004020000#expert-mode]], you will have access to a zettel called ""[[Zettelstore Role to CSS Map|00000000029000]]"" (its identifier is ''00000000029000''). - This zettel maps a role name to a zettel that must contain the role-specific CSS code. +* **Solution:** If you enable [[''expert-mode''|00001004020000#expert-mode]], you will have access to a zettel called ""[[Zettelstore Sxn Start Code|00000000019000]]"" (its identifier is ''00000000019000''). + This zettel is the starting point for Sxn code, where you can place a definition for a variable named ""CSS-ROLE-map"". - First, create a zettel containing the needed CSS: give it any title, its role is preferably ""configuration"" (but this is not a must). - Set its [[''syntax''|00001006020000#syntax]] must be set to ""[[css|00001008000000#css]]"". + But first, create a zettel containing the needed CSS: give it any title, its role is preferably ""configuration"" (but this is not a must). + Its [[''syntax''|00001006020000#syntax]] must be set to ""[[css|00001008000000#css]]"". The content must contain the role-specific CSS code, for example ``body {background-color: #FFFFD0}``for a background in a light yellow color. Let's assume, the newly created CSS zettel got the identifier ''20220825200100''. - Now, you have to connect this zettel to the zettel called ""Zettelstore Role CSS Map"". - Since you have enabled ''expert-mode'', you are allowed to modify it. - Add the following metadata ''css-configuration-zid: 20220825200100'' to assign the role-specific CSS code for the role ""configuration"" to the CSS zettel containing that CSS. + Now, you have to map this freshly created zettel to a role, for example ""zettel"". + Since you have enabled ''expert-mode'', you are allowed to modify the zettel ""[[Zettelstore Sxn Start Code|00000000019000]]"". + Add the following code to the Sxn Start Code zettel: ``(define CSS-ROLE-map '(("zettel" . "20220825200100")))``. - In general, its role-assigning metadata must be like this pattern: ''css-ROLE-zid: ID'', where ''ROLE'' is the placeholder for the role, and ''ID'' for the zettel identifier containing CSS code. - It is allowed to assign more than one role to a specific CSS zettel. + In general, the mapping must follow the pattern: ``(ROLE . ID)``, where ''ROLE'' is the placeholder for the role, and ''ID'' for the zettel identifier containing CSS code. + For example, if you also want the role ""configuration"" to be rendered using that CSS, the code should be something like ``(define CSS-ROLE-map '(("zettel" . "20220825200100") ("configuration" . "20220825200100")))``. * **Discussion:** you have to ensure that the CSS zettel is allowed to be read by the intended audience of the zettel with that given role. For example, if you made zettel with a specific role public visible, the CSS zettel must also have a [[''visibility: public''|00001010070200]] metadata. -* **Extension:** if you have already established a role-specific layout for zettel, but you additionally want just one another zettel with another role to be rendered with the same CSS, you have to add metadata to the one zettel: ''css-role: ROLE'', where ''ROLE'' is the placeholder for the role that already is assigned to a specific CSS-based layout. === Zettel synchronization with iCloud (Apple) * **Problem:** You use Zettelstore on various macOS computers and you want to use the sameset of zettel across all computers. * **Solution:** Place your zettel in an iCloud folder. Index: docs/readmezip.txt ================================================================== --- docs/readmezip.txt +++ docs/readmezip.txt @@ -15,7 +15,6 @@ possible to make it directly available for your local Zettelstore. The software, including the manual, is licensed under the European Union Public License 1.2 (or later). See the separate file LICENSE.txt. -To get in contact with the developer, send an email to ds@zettelstore.de or -follow Zettelstore on Twitter: https://twitter.com/zettelstore. +To get in contact with the developer, send an email to ds@zettelstore.de. DELETED domain/content.go Index: domain/content.go ================================================================== --- domain/content.go +++ domain/content.go @@ -1,129 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package domain provides domain specific types, constants, and functions. -package domain - -import ( - "bytes" - "encoding/base64" - "errors" - "io" - "unicode" - "unicode/utf8" - - "zettelstore.de/z/input" -) - -// Content is just the content of a zettel. -type Content struct { - data []byte - isBinary bool -} - -// NewContent creates a new content from a string. -func NewContent(data []byte) Content { - return Content{data: data, isBinary: calcIsBinary(data)} -} - -// Length returns the number of bytes stored. -func (zc *Content) Length() int { return len(zc.data) } - -// Equal compares two content values. -func (zc *Content) Equal(o *Content) bool { - if zc == nil { - return o == nil - } - if zc.isBinary != o.isBinary { - return false - } - return bytes.Equal(zc.data, o.data) -} - -// Set content to new string value. -func (zc *Content) Set(data []byte) { - zc.data = data - zc.isBinary = calcIsBinary(data) -} - -// Write it to a Writer -func (zc *Content) Write(w io.Writer) (int, error) { - return w.Write(zc.data) -} - -// AsString returns the content itself is a string. -func (zc *Content) AsString() string { return string(zc.data) } - -// AsBytes returns the content itself is a byte slice. -func (zc *Content) AsBytes() []byte { return zc.data } - -// IsBinary returns true if the content contains non-unicode values or is, -// interpreted a text, with a high probability binary content. -func (zc *Content) IsBinary() bool { return zc.isBinary } - -// TrimSpace remove some space character in content, if it is not binary content. -func (zc *Content) TrimSpace() { - if zc.isBinary { - return - } - inp := input.NewInput(zc.data) - pos := inp.Pos - for inp.Ch != input.EOS { - if input.IsEOLEOS(inp.Ch) { - inp.Next() - pos = inp.Pos - continue - } - if !input.IsSpace(inp.Ch) { - break - } - inp.Next() - } - zc.data = bytes.TrimRightFunc(inp.Src[pos:], unicode.IsSpace) -} - -// Encode content for future transmission. -func (zc *Content) Encode() (data, encoding string) { - if !zc.isBinary { - return zc.AsString(), "" - } - return base64.StdEncoding.EncodeToString(zc.data), "base64" -} - -// SetDecoded content to the decoded value of the given string. -func (zc *Content) SetDecoded(data, encoding string) error { - switch encoding { - case "": - zc.data = []byte(data) - case "base64": - decoded, err := base64.StdEncoding.DecodeString(data) - if err != nil { - return err - } - zc.data = decoded - default: - return errors.New("unknown encoding " + encoding) - } - zc.isBinary = calcIsBinary(zc.data) - return nil -} - -func calcIsBinary(data []byte) bool { - if !utf8.Valid(data) { - return true - } - l := len(data) - for i := 0; i < l; i++ { - if data[i] == 0 { - return true - } - } - return false -} DELETED domain/content_test.go Index: domain/content_test.go ================================================================== --- domain/content_test.go +++ domain/content_test.go @@ -1,66 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -package domain_test - -import ( - "testing" - - "zettelstore.de/z/domain" -) - -func TestContentIsBinary(t *testing.T) { - t.Parallel() - td := []struct { - s string - exp bool - }{ - {"abc", false}, - {"äöü", false}, - {"", false}, - {string([]byte{0}), true}, - } - for i, tc := range td { - content := domain.NewContent([]byte(tc.s)) - got := content.IsBinary() - if got != tc.exp { - t.Errorf("TC=%d: expected %v, got %v", i, tc.exp, got) - } - } -} - -func TestTrimSpace(t *testing.T) { - t.Parallel() - testcases := []struct { - in, exp string - }{ - {"", ""}, - {" ", ""}, - {"abc", "abc"}, - {" abc", " abc"}, - {"abc ", "abc"}, - {"abc \n", "abc"}, - {"abc\n ", "abc"}, - {"\nabc", "abc"}, - {" \nabc", "abc"}, - {" \n abc", " abc"}, - {" \n\n abc", " abc"}, - {" \n \n abc", " abc"}, - {" \n \n abc \n \n ", " abc"}, - } - for _, tc := range testcases { - c := domain.NewContent([]byte(tc.in)) - c.TrimSpace() - got := c.AsString() - if got != tc.exp { - t.Errorf("TrimSpace(%q) should be %q, but got %q", tc.in, tc.exp, got) - } - } -} DELETED domain/id/id.go Index: domain/id/id.go ================================================================== --- domain/id/id.go +++ domain/id/id.go @@ -1,163 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package id provides domain specific types, constants, and functions about -// zettel identifier. -package id - -import ( - "strconv" - "time" - - "zettelstore.de/c/api" -) - -// Zid is the internal identifier of a zettel. Typically, it is a -// time stamp of the form "YYYYMMDDHHmmSS" converted to an unsigned integer. -// A zettelstore implementation should try to set the last two digits to zero, -// e.g. the seconds should be zero, -type Zid uint64 - -// Some important ZettelIDs. -const ( - Invalid = Zid(0) // Invalid is a Zid that will never be valid -) - -// ZettelIDs that are used as Zid more than once. -// -// Note: if you change some values, ensure that you also change them in the -// Constant box. They are mentioned there literally, because these -// constants are not available there. -var ( - ConfigurationZid = MustParse(api.ZidConfiguration) - BaseTemplateZid = MustParse(api.ZidBaseTemplate) - LoginTemplateZid = MustParse(api.ZidLoginTemplate) - ListTemplateZid = MustParse(api.ZidListTemplate) - ZettelTemplateZid = MustParse(api.ZidZettelTemplate) - InfoTemplateZid = MustParse(api.ZidInfoTemplate) - FormTemplateZid = MustParse(api.ZidFormTemplate) - RenameTemplateZid = MustParse(api.ZidRenameTemplate) - DeleteTemplateZid = MustParse(api.ZidDeleteTemplate) - ContextTemplateZid = MustParse(api.ZidContextTemplate) - ErrorTemplateZid = MustParse(api.ZidErrorTemplate) - RoleCSSMapZid = MustParse(api.ZidRoleCSSMap) - EmojiZid = MustParse(api.ZidEmoji) - TOCNewTemplateZid = MustParse(api.ZidTOCNewTemplate) - DefaultHomeZid = MustParse(api.ZidDefaultHome) -) - -const maxZid = 99999999999999 - -// ParseUint interprets a string as a possible zettel identifier -// and returns its integer value. -func ParseUint(s string) (uint64, error) { - res, err := strconv.ParseUint(s, 10, 47) - if err != nil { - return 0, err - } - if res == 0 || res > maxZid { - return res, strconv.ErrRange - } - return res, nil -} - -// Parse interprets a string as a zettel identification and -// returns its value. -func Parse(s string) (Zid, error) { - if len(s) != 14 { - return Invalid, strconv.ErrSyntax - } - res, err := ParseUint(s) - if err != nil { - return Invalid, err - } - return Zid(res), nil -} - -// MustParse tries to interpret a string as a zettel identifier and returns -// its value or panics otherwise. -func MustParse(s api.ZettelID) Zid { - zid, err := Parse(string(s)) - if err == nil { - return zid - } - panic(err) -} - -// String converts the zettel identification to a string of 14 digits. -// Only defined for valid ids. -func (zid Zid) String() string { - var result [14]byte - zid.toByteArray(&result) - return string(result[:]) -} - -// Bytes converts the zettel identification to a byte slice of 14 digits. -// Only defined for valid ids. -func (zid Zid) Bytes() []byte { - var result [14]byte - zid.toByteArray(&result) - return result[:] -} - -// toByteArray converts the Zid into a fixed byte array, usable for printing. -// -// Based on idea by Daniel Lemire: "Converting integers to fix-digit representations quickly" -// https://lemire.me/blog/2021/11/18/converting-integers-to-fix-digit-representations-quickly/ -func (zid Zid) toByteArray(result *[14]byte) { - date := uint64(zid) / 1000000 - fullyear := date / 10000 - century := fullyear / 100 - year := fullyear % 100 - monthday := date % 10000 - month := monthday / 100 - day := monthday % 100 - time := uint64(zid) % 1000000 - hmtime := time / 100 - second := time % 100 - hour := hmtime / 100 - minute := hmtime % 100 - result[0] = byte(century/10) + '0' - result[1] = byte(century%10) + '0' - result[2] = byte(year/10) + '0' - result[3] = byte(year%10) + '0' - result[4] = byte(month/10) + '0' - result[5] = byte(month%10) + '0' - result[6] = byte(day/10) + '0' - result[7] = byte(day%10) + '0' - result[8] = byte(hour/10) + '0' - result[9] = byte(hour%10) + '0' - result[10] = byte(minute/10) + '0' - result[11] = byte(minute%10) + '0' - result[12] = byte(second/10) + '0' - result[13] = byte(second%10) + '0' -} - -// IsValid determines if zettel id is a valid one, e.g. consists of max. 14 digits. -func (zid Zid) IsValid() bool { return 0 < zid && zid <= maxZid } - -// ZidLayout to transform a date into a Zid and into other internal dates. -const ZidLayout = "20060102150405" - -// New returns a new zettel id based on the current time. -func New(withSeconds bool) Zid { - now := time.Now().Local() - var s string - if withSeconds { - s = now.Format(ZidLayout) - } else { - s = now.Format("20060102150400") - } - res, err := Parse(s) - if err != nil { - panic(err) - } - return res -} DELETED domain/id/id_test.go Index: domain/id/id_test.go ================================================================== --- domain/id/id_test.go +++ domain/id/id_test.go @@ -1,87 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern -// -// This file is part of zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package id_test provides unit tests for testing zettel id specific functions. -package id_test - -import ( - "testing" - - "zettelstore.de/z/domain/id" -) - -func TestIsValid(t *testing.T) { - t.Parallel() - validIDs := []string{ - "00000000000001", - "00000000000020", - "00000000000300", - "00000000004000", - "00000000050000", - "00000000600000", - "00000007000000", - "00000080000000", - "00000900000000", - "00001000000000", - "00020000000000", - "00300000000000", - "04000000000000", - "50000000000000", - "99999999999999", - "00001007030200", - "20200310195100", - } - - for i, sid := range validIDs { - zid, err := id.Parse(sid) - if err != nil { - t.Errorf("i=%d: sid=%q is not valid, but should be. err=%v", i, sid, err) - } - s := zid.String() - if s != sid { - t.Errorf( - "i=%d: zid=%v does not format to %q, but to %q", i, zid, sid, s) - } - } - - invalidIDs := []string{ - "", "0", "a", - "00000000000000", - "0000000000000a", - "000000000000000", - "20200310T195100", - } - - for i, sid := range invalidIDs { - if zid, err := id.Parse(sid); err == nil { - t.Errorf("i=%d: sid=%q is valid (zid=%s), but should not be", i, sid, zid) - } - } -} - -var sResult string // to disable compiler optimization in loop below - -func BenchmarkString(b *testing.B) { - var s string - for n := 0; n < b.N; n++ { - s = id.Zid(12345678901200).String() - } - sResult = s -} - -var bResult []byte // to disable compiler optimization in loop below - -func BenchmarkBytes(b *testing.B) { - var bs []byte - for n := 0; n < b.N; n++ { - bs = id.Zid(12345678901200).Bytes() - } - bResult = bs -} DELETED domain/id/set.go Index: domain/id/set.go ================================================================== --- domain/id/set.go +++ domain/id/set.go @@ -1,119 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -package id - -// Set is a set of zettel identifier -type Set map[Zid]struct{} - -// NewSet returns a new set of identifier with the given initial values. -func NewSet(zids ...Zid) Set { - l := len(zids) - if l < 8 { - l = 8 - } - result := make(Set, l) - result.AddSlice(zids) - return result -} - -// NewSetCap returns a new set of identifier with the given capacity and initial values. -func NewSetCap(c int, zids ...Zid) Set { - l := len(zids) - if c < l { - c = l - } - if c < 8 { - c = 8 - } - result := make(Set, c) - result.AddSlice(zids) - return result -} - -// Zid adds a Zid to the set. -func (s Set) Zid(zid Zid) Set { - if s == nil { - return NewSet(zid) - } - s[zid] = struct{}{} - return s -} - -// Contains return true if the set is nil or if the set contains the given Zettel identifier. -func (s Set) Contains(zid Zid) bool { - if s != nil { - _, found := s[zid] - return found - } - return true -} - -// Add all member from the other set. -func (s Set) Add(other Set) Set { - if s == nil { - return other - } - for zid := range other { - s[zid] = struct{}{} - } - return s -} - -// AddSlice adds all identifier of the given slice to the set. -func (s Set) AddSlice(sl Slice) { - for _, zid := range sl { - s[zid] = struct{}{} - } -} - -// Sorted returns the set as a sorted slice of zettel identifier. -func (s Set) Sorted() Slice { - if l := len(s); l > 0 { - result := make(Slice, 0, l) - for zid := range s { - result = append(result, zid) - } - result.Sort() - return result - } - return nil -} - -// IntersectOrSet removes all zettel identifier that are not in the other set. -// Both sets can be modified by this method. One of them is the set returned. -// It contains the intersection of both, if s is not nil. -// -// If s == nil, then the other set is always returned. -func (s Set) IntersectOrSet(other Set) Set { - if s == nil { - return other - } - if len(s) > len(other) { - s, other = other, s - } - for zid := range s { - _, otherOk := other[zid] - if !otherOk { - delete(s, zid) - } - } - return s -} - -// Remove all zettel identifier from 's' that are in the set 'other'. -func (s Set) Remove(other Set) { - if s == nil || other == nil { - return - } - for zid := range other { - delete(s, zid) - } -} DELETED domain/id/set_test.go Index: domain/id/set_test.go ================================================================== --- domain/id/set_test.go +++ domain/id/set_test.go @@ -1,149 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -package id_test - -import ( - "testing" - - "zettelstore.de/z/domain/id" -) - -func TestSetContains(t *testing.T) { - t.Parallel() - testcases := []struct { - s id.Set - zid id.Zid - exp bool - }{ - {nil, id.Invalid, true}, - {nil, 14, true}, - {id.NewSet(), id.Invalid, false}, - {id.NewSet(), 1, false}, - {id.NewSet(), id.Invalid, false}, - {id.NewSet(1), 1, true}, - } - for i, tc := range testcases { - got := tc.s.Contains(tc.zid) - if got != tc.exp { - t.Errorf("%d: %v.Contains(%v) == %v, but got %v", i, tc.s, tc.zid, tc.exp, got) - } - } -} - -func TestSetAdd(t *testing.T) { - t.Parallel() - testcases := []struct { - s1, s2 id.Set - exp id.Slice - }{ - {nil, nil, nil}, - {id.NewSet(), nil, nil}, - {id.NewSet(), id.NewSet(), nil}, - {nil, id.NewSet(1), id.Slice{1}}, - {id.NewSet(1), nil, id.Slice{1}}, - {id.NewSet(1), id.NewSet(), id.Slice{1}}, - {id.NewSet(1), id.NewSet(2), id.Slice{1, 2}}, - {id.NewSet(1), id.NewSet(1), id.Slice{1}}, - } - for i, tc := range testcases { - sl1 := tc.s1.Sorted() - sl2 := tc.s2.Sorted() - got := tc.s1.Add(tc.s2).Sorted() - if !got.Equal(tc.exp) { - t.Errorf("%d: %v.Add(%v) should be %v, but got %v", i, sl1, sl2, tc.exp, got) - } - } -} - -func TestSetSorted(t *testing.T) { - t.Parallel() - testcases := []struct { - set id.Set - exp id.Slice - }{ - {nil, nil}, - {id.NewSet(), nil}, - {id.NewSet(9, 4, 6, 1, 7), id.Slice{1, 4, 6, 7, 9}}, - } - for i, tc := range testcases { - got := tc.set.Sorted() - if !got.Equal(tc.exp) { - t.Errorf("%d: %v.Sorted() should be %v, but got %v", i, tc.set, tc.exp, got) - } - } -} - -func TestSetIntersectOrSet(t *testing.T) { - t.Parallel() - testcases := []struct { - s1, s2 id.Set - exp id.Slice - }{ - {nil, nil, nil}, - {id.NewSet(), nil, nil}, - {nil, id.NewSet(), nil}, - {id.NewSet(), id.NewSet(), nil}, - {id.NewSet(1), nil, nil}, - {nil, id.NewSet(1), id.Slice{1}}, - {id.NewSet(1), id.NewSet(), nil}, - {id.NewSet(), id.NewSet(1), nil}, - {id.NewSet(1), id.NewSet(2), nil}, - {id.NewSet(2), id.NewSet(1), nil}, - {id.NewSet(1), id.NewSet(1), id.Slice{1}}, - } - for i, tc := range testcases { - sl1 := tc.s1.Sorted() - sl2 := tc.s2.Sorted() - got := tc.s1.IntersectOrSet(tc.s2).Sorted() - if !got.Equal(tc.exp) { - t.Errorf("%d: %v.IntersectOrSet(%v) should be %v, but got %v", i, sl1, sl2, tc.exp, got) - } - } -} - -func TestSetRemove(t *testing.T) { - t.Parallel() - testcases := []struct { - s1, s2 id.Set - exp id.Slice - }{ - {nil, nil, nil}, - {id.NewSet(), nil, nil}, - {id.NewSet(), id.NewSet(), nil}, - {id.NewSet(1), nil, id.Slice{1}}, - {id.NewSet(1), id.NewSet(), id.Slice{1}}, - {id.NewSet(1), id.NewSet(2), id.Slice{1}}, - {id.NewSet(1), id.NewSet(1), id.Slice{}}, - } - for i, tc := range testcases { - sl1 := tc.s1.Sorted() - sl2 := tc.s2.Sorted() - newS1 := id.NewSet(sl1...) - newS1.Remove(tc.s2) - got := newS1.Sorted() - if !got.Equal(tc.exp) { - t.Errorf("%d: %v.Remove(%v) should be %v, but got %v", i, sl1, sl2, tc.exp, got) - } - } -} - -// func BenchmarkSet(b *testing.B) { -// s := id.Set{} -// for i := 0; i < b.N; i++ { -// s[id.Zid(i)] = true -// } -// } -func BenchmarkSet(b *testing.B) { - s := id.Set{} - for i := 0; i < b.N; i++ { - s[id.Zid(i)] = struct{}{} - } -} DELETED domain/id/slice.go Index: domain/id/slice.go ================================================================== --- domain/id/slice.go +++ domain/id/slice.go @@ -1,69 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern -// -// This file is part of zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package id provides domain specific types, constants, and functions about -// zettel identifier. -package id - -import ( - "bytes" - "sort" -) - -// Slice is a sequence of zettel identifier. A special case is a sorted slice. -type Slice []Zid - -func (zs Slice) Len() int { return len(zs) } -func (zs Slice) Less(i, j int) bool { return zs[i] < zs[j] } -func (zs Slice) Swap(i, j int) { zs[i], zs[j] = zs[j], zs[i] } - -// Sort a slice of Zids. -func (zs Slice) Sort() { sort.Sort(zs) } - -// Copy a zettel identifier slice -func (zs Slice) Copy() Slice { - if zs == nil { - return nil - } - result := make(Slice, len(zs)) - copy(result, zs) - return result -} - -// Equal reports whether zs and other are the same length and contain the samle zettel -// identifier. A nil argument is equivalent to an empty slice. -func (zs Slice) Equal(other Slice) bool { - if len(zs) != len(other) { - return false - } - if len(zs) == 0 { - return true - } - for i, e := range zs { - if e != other[i] { - return false - } - } - return true -} - -func (zs Slice) String() string { - if len(zs) == 0 { - return "" - } - var buf bytes.Buffer - for i, zid := range zs { - if i > 0 { - buf.WriteByte(' ') - } - buf.WriteString(zid.String()) - } - return buf.String() -} DELETED domain/id/slice_test.go Index: domain/id/slice_test.go ================================================================== --- domain/id/slice_test.go +++ domain/id/slice_test.go @@ -1,88 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2021 Detlef Stern -// -// This file is part of zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package id provides domain specific types, constants, and functions about -// zettel identifier. -package id_test - -import ( - "testing" - - "zettelstore.de/z/domain/id" -) - -func TestSliceSort(t *testing.T) { - t.Parallel() - zs := id.Slice{9, 4, 6, 1, 7} - zs.Sort() - exp := id.Slice{1, 4, 6, 7, 9} - if !zs.Equal(exp) { - t.Errorf("Slice.Sort did not work. Expected %v, got %v", exp, zs) - } -} - -func TestCopy(t *testing.T) { - t.Parallel() - var orig id.Slice - got := orig.Copy() - if got != nil { - t.Errorf("Nil copy resulted in %v", got) - } - orig = id.Slice{9, 4, 6, 1, 7} - got = orig.Copy() - if !orig.Equal(got) { - t.Errorf("Slice.Copy did not work. Expected %v, got %v", orig, got) - } -} - -func TestSliceEqual(t *testing.T) { - t.Parallel() - testcases := []struct { - s1, s2 id.Slice - exp bool - }{ - {nil, nil, true}, - {nil, id.Slice{}, true}, - {nil, id.Slice{1}, false}, - {id.Slice{1}, id.Slice{1}, true}, - {id.Slice{1}, id.Slice{2}, false}, - {id.Slice{1, 2}, id.Slice{2, 1}, false}, - {id.Slice{1, 2}, id.Slice{1, 2}, true}, - } - for i, tc := range testcases { - got := tc.s1.Equal(tc.s2) - if got != tc.exp { - t.Errorf("%d/%v.Equal(%v)==%v, but got %v", i, tc.s1, tc.s2, tc.exp, got) - } - got = tc.s2.Equal(tc.s1) - if got != tc.exp { - t.Errorf("%d/%v.Equal(%v)==%v, but got %v", i, tc.s2, tc.s1, tc.exp, got) - } - } -} - -func TestSliceString(t *testing.T) { - t.Parallel() - testcases := []struct { - in id.Slice - exp string - }{ - {nil, ""}, - {id.Slice{}, ""}, - {id.Slice{1}, "00000000000001"}, - {id.Slice{1, 2}, "00000000000001 00000000000002"}, - } - for i, tc := range testcases { - got := tc.in.String() - if got != tc.exp { - t.Errorf("%d/%v: expected %q, but got %q", i, tc.in, tc.exp, got) - } - } -} DELETED domain/meta/collection.go Index: domain/meta/collection.go ================================================================== --- domain/meta/collection.go +++ domain/meta/collection.go @@ -1,101 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -package meta - -import "sort" - -// Arrangement stores metadata within its categories. -// Typecally a category might be a tag name, a role name, a syntax value. -type Arrangement map[string][]*Meta - -// CreateArrangement by inspecting a given key and use the found -// value as a category. -func CreateArrangement(metaList []*Meta, key string) Arrangement { - if len(metaList) == 0 { - return nil - } - descr := Type(key) - if descr == nil { - return nil - } - a := make(Arrangement) - if descr.IsSet { - for _, m := range metaList { - if vals, ok := m.GetList(key); ok { - for _, val := range vals { - a[val] = append(a[val], m) - } - } - } - } else { - for _, m := range metaList { - if val, ok := m.Get(key); ok && val != "" { - a[val] = append(a[val], m) - } - } - } - return a -} - -// Counted returns the list of categories, together with the number of -// metadata for each category. -func (a Arrangement) Counted() CountedCategories { - if len(a) == 0 { - return nil - } - result := make(CountedCategories, 0, len(a)) - for cat, metas := range a { - result = append(result, CountedCategory{Name: cat, Count: len(metas)}) - } - return result -} - -// CountedCategory contains of a name and the number how much this name occured -// somewhere. -type CountedCategory struct { - Name string - Count int -} - -// CountedCategories is the list of CountedCategories. -// Every name must occur only once. -type CountedCategories []CountedCategory - -// SortByName sorts the list by the name attribute. -// Since each name must occur only once, two CountedCategories cannot have -// the same name. -func (ccs CountedCategories) SortByName() { - sort.Slice(ccs, func(i, j int) bool { return ccs[i].Name < ccs[j].Name }) -} - -// SortByCount sorts the list by the count attribute, descending. -// If two counts are equal, elements are sorted by name. -func (ccs CountedCategories) SortByCount() { - sort.Slice(ccs, func(i, j int) bool { - iCount, jCount := ccs[i].Count, ccs[j].Count - if iCount > jCount { - return true - } - if iCount == jCount { - return ccs[i].Name < ccs[j].Name - } - return false - }) -} - -// Categories returns just the category names. -func (ccs CountedCategories) Categories() []string { - result := make([]string, len(ccs)) - for i, cc := range ccs { - result[i] = cc.Name - } - return result -} DELETED domain/meta/meta.go Index: domain/meta/meta.go ================================================================== --- domain/meta/meta.go +++ domain/meta/meta.go @@ -1,420 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta provides the domain specific type 'meta'. -package meta - -import ( - "bytes" - "regexp" - "sort" - "strings" - "unicode" - "unicode/utf8" - - "zettelstore.de/c/api" - "zettelstore.de/c/maps" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/input" - "zettelstore.de/z/strfun" -) - -type keyUsage int - -const ( - _ keyUsage = iota - usageUser // Key will be manipulated by the user - usageComputed // Key is computed by zettelstore - usageProperty // Key is computed and not stored by zettelstore -) - -// DescriptionKey formally describes each supported metadata key. -type DescriptionKey struct { - Name string - Type *DescriptionType - usage keyUsage - Inverse string -} - -// IsComputed returns true, if metadata is computed and not set by the user. -func (kd *DescriptionKey) IsComputed() bool { return kd.usage >= usageComputed } - -// IsProperty returns true, if metadata is a computed property. -func (kd *DescriptionKey) IsProperty() bool { return kd.usage >= usageProperty } - -// IsStoredComputed retruns true, if metadata is computed, but also stored. -func (kd *DescriptionKey) IsStoredComputed() bool { return kd.usage == usageComputed } - -var registeredKeys = make(map[string]*DescriptionKey) - -func registerKey(name string, t *DescriptionType, usage keyUsage, inverse string) { - if _, ok := registeredKeys[name]; ok { - panic("Key '" + name + "' already defined") - } - if inverse != "" { - if t != TypeID && t != TypeIDSet { - panic("Inversable key '" + name + "' is not identifier type, but " + t.String()) - } - inv, ok := registeredKeys[inverse] - if !ok { - panic("Inverse Key '" + inverse + "' not found") - } - if !inv.IsComputed() { - panic("Inverse Key '" + inverse + "' is not computed.") - } - if inv.Type != TypeIDSet { - panic("Inverse Key '" + inverse + "' is not an identifier set, but " + inv.Type.String()) - } - } - registeredKeys[name] = &DescriptionKey{name, t, usage, inverse} -} - -// IsComputed returns true, if key denotes a computed metadata key. -func IsComputed(name string) bool { - if kd, ok := registeredKeys[name]; ok { - return kd.IsComputed() - } - return false -} - -// IsProperty returns true, if key denotes a property metadata value. -func IsProperty(name string) bool { - if kd, ok := registeredKeys[name]; ok { - return kd.IsProperty() - } - return false -} - -// IsStoredComputed returns true, if key denotes a computed metadata key that is stored. -func IsStoredComputed(name string) bool { - if kd, ok := registeredKeys[name]; ok { - return kd.IsStoredComputed() - } - return false -} - -// Inverse returns the name of the inverse key. -func Inverse(name string) string { - if kd, ok := registeredKeys[name]; ok { - return kd.Inverse - } - return "" -} - -// GetDescription returns the key description object of the given key name. -func GetDescription(name string) DescriptionKey { - if d, ok := registeredKeys[name]; ok { - return *d - } - return DescriptionKey{Type: Type(name)} -} - -// GetSortedKeyDescriptions delivers all metadata key descriptions as a slice, sorted by name. -func GetSortedKeyDescriptions() []*DescriptionKey { - keys := maps.Keys(registeredKeys) - result := make([]*DescriptionKey, 0, len(keys)) - for _, n := range keys { - result = append(result, registeredKeys[n]) - } - return result -} - -// Supported keys. -func init() { - registerKey(api.KeyID, TypeID, usageComputed, "") - registerKey(api.KeyTitle, TypeZettelmarkup, usageUser, "") - registerKey(api.KeyRole, TypeWord, usageUser, "") - registerKey(api.KeyTags, TypeTagSet, usageUser, "") - registerKey(api.KeySyntax, TypeWord, usageUser, "") - - // Properties that are inverse keys - registerKey(api.KeyFolge, TypeIDSet, usageProperty, "") - registerKey(api.KeySuccessors, TypeIDSet, usageProperty, "") - - registerKey(api.KeyAuthor, TypeString, usageUser, "") - registerKey(api.KeyBack, TypeIDSet, usageProperty, "") - registerKey(api.KeyBackward, TypeIDSet, usageProperty, "") - registerKey(api.KeyBoxNumber, TypeNumber, usageProperty, "") - registerKey(api.KeyCopyright, TypeString, usageUser, "") - registerKey(api.KeyCreated, TypeTimestamp, usageComputed, "") - registerKey(api.KeyCredential, TypeCredential, usageUser, "") - registerKey(api.KeyDead, TypeIDSet, usageProperty, "") - registerKey(api.KeyForward, TypeIDSet, usageProperty, "") - registerKey(api.KeyLang, TypeWord, usageUser, "") - registerKey(api.KeyLicense, TypeEmpty, usageUser, "") - registerKey(api.KeyModified, TypeTimestamp, usageComputed, "") - registerKey(api.KeyPrecursor, TypeIDSet, usageUser, api.KeyFolge) - registerKey(api.KeyPredecessor, TypeID, usageUser, api.KeySuccessors) - registerKey(api.KeyPublished, TypeTimestamp, usageProperty, "") - registerKey(api.KeyReadOnly, TypeWord, usageUser, "") - registerKey(api.KeySummary, TypeZettelmarkup, usageUser, "") - registerKey(api.KeyURL, TypeURL, usageUser, "") - registerKey(api.KeyUselessFiles, TypeString, usageProperty, "") - registerKey(api.KeyUserID, TypeWord, usageUser, "") - registerKey(api.KeyUserRole, TypeWord, usageUser, "") - registerKey(api.KeyVisibility, TypeWord, usageUser, "") -} - -// NewPrefix is the prefix for metadata key in template zettel for creating new zettel. -const NewPrefix = "new-" - -// Meta contains all meta-data of a zettel. -type Meta struct { - Zid id.Zid - pairs map[string]string - YamlSep bool -} - -// New creates a new chunk for storing metadata. -func New(zid id.Zid) *Meta { - return &Meta{Zid: zid, pairs: make(map[string]string, 5)} -} - -// NewWithData creates metadata object with given data. -func NewWithData(zid id.Zid, data map[string]string) *Meta { - pairs := make(map[string]string, len(data)) - for k, v := range data { - pairs[k] = v - } - return &Meta{Zid: zid, pairs: pairs} -} - -// Length returns the number of bytes stored for the metadata. -func (m *Meta) Length() int { - if m == nil { - return 0 - } - result := 6 // storage needed for Zid - for k, v := range m.pairs { - result += len(k) + len(v) + 1 // 1 because separator - } - return result -} - -// Clone returns a new copy of the metadata. -func (m *Meta) Clone() *Meta { - return &Meta{ - Zid: m.Zid, - pairs: m.Map(), - YamlSep: m.YamlSep, - } -} - -// Map returns a copy of the meta data as a string map. -func (m *Meta) Map() map[string]string { - pairs := make(map[string]string, len(m.pairs)) - for k, v := range m.pairs { - pairs[k] = v - } - return pairs -} - -var reKey = regexp.MustCompile("^[0-9a-z][-0-9a-z]{0,254}$") - -// KeyIsValid returns true, the the key is a valid string. -func KeyIsValid(key string) bool { - return reKey.MatchString(key) -} - -// Pair is one key-value-pair of a Zettel meta. -type Pair struct { - Key string - Value string -} - -var firstKeys = []string{api.KeyTitle, api.KeyRole, api.KeyTags, api.KeySyntax} -var firstKeySet strfun.Set - -func init() { - firstKeySet = strfun.NewSet(firstKeys...) -} - -// Set stores the given string value under the given key. -func (m *Meta) Set(key, value string) { - if key != api.KeyID { - m.pairs[key] = trimValue(value) - } -} - -// SetNonEmpty stores the given value under the given key, if the value is non-empty. -// An empty value will delete the previous association. -func (m *Meta) SetNonEmpty(key, value string) { - if value == "" { - delete(m.pairs, key) - } else if key != api.KeyID { - m.pairs[key] = trimValue(value) - } -} - -func trimValue(value string) string { - return strings.TrimFunc(value, input.IsSpace) -} - -// Get retrieves the string value of a given key. The bool value signals, -// whether there was a value stored or not. -func (m *Meta) Get(key string) (string, bool) { - if key == api.KeyID { - return m.Zid.String(), true - } - value, ok := m.pairs[key] - return value, ok -} - -// GetDefault retrieves the string value of the given key. If no value was -// stored, the given default value is returned. -func (m *Meta) GetDefault(key, def string) string { - if value, ok := m.Get(key); ok { - return value - } - return def -} - -// GetTitle returns the title of the metadata. It is the only key that has a -// defined default value: the string representation of the zettel identifier. -func (m *Meta) GetTitle() string { - if title, found := m.Get(api.KeyTitle); found { - return title - } - return m.Zid.String() -} - -// Pairs returns not computed key/values pairs stored, in a specific order. -// First come the pairs with predefined keys: MetaTitleKey, MetaTagsKey, MetaSyntaxKey, -// MetaContextKey. Then all other pairs are append to the list, ordered by key. -func (m *Meta) Pairs() []Pair { - return m.doPairs(m.getFirstKeys(), notComputedKey) -} - -// ComputedPairs returns all key/values pairs stored, in a specific order. First come -// the pairs with predefined keys: MetaTitleKey, MetaTagsKey, MetaSyntaxKey, -// MetaContextKey. Then all other pairs are append to the list, ordered by key. -func (m *Meta) ComputedPairs() []Pair { - return m.doPairs(m.getFirstKeys(), anyKey) -} - -// PairsRest returns not computed key/values pairs stored, except the values with -// predefined keys. The pairs are ordered by key. -func (m *Meta) PairsRest() []Pair { - result := make([]Pair, 0, len(m.pairs)) - return m.doPairs(result, notComputedKey) -} - -// ComputedPairsRest returns all key/values pairs stored, except the values with -// predefined keys. The pairs are ordered by key. -func (m *Meta) ComputedPairsRest() []Pair { - result := make([]Pair, 0, len(m.pairs)) - return m.doPairs(result, anyKey) -} - -func notComputedKey(key string) bool { return !IsComputed(key) } -func anyKey(string) bool { return true } - -func (m *Meta) doPairs(firstKeys []Pair, addKeyPred func(string) bool) []Pair { - keys := m.getKeysRest(addKeyPred) - for _, k := range keys { - firstKeys = append(firstKeys, Pair{k, m.pairs[k]}) - } - return firstKeys -} - -func (m *Meta) getFirstKeys() []Pair { - result := make([]Pair, 0, len(m.pairs)) - for _, key := range firstKeys { - if value, ok := m.pairs[key]; ok { - result = append(result, Pair{key, value}) - } - } - return result -} - -func (m *Meta) getKeysRest(addKeyPred func(string) bool) []string { - keys := make([]string, 0, len(m.pairs)) - for k := range m.pairs { - if !firstKeySet.Has(k) && addKeyPred(k) { - keys = append(keys, k) - } - } - sort.Strings(keys) - return keys -} - -// Delete removes a key from the data. -func (m *Meta) Delete(key string) { - if key != api.KeyID { - delete(m.pairs, key) - } -} - -// Equal compares to metas for equality. -func (m *Meta) Equal(o *Meta, allowComputed bool) bool { - if m == nil && o == nil { - return true - } - if m == nil || o == nil || m.Zid != o.Zid { - return false - } - tested := make(strfun.Set, len(m.pairs)) - for k, v := range m.pairs { - tested.Set(k) - if !equalValue(k, v, o, allowComputed) { - return false - } - } - for k, v := range o.pairs { - if !tested.Has(k) && !equalValue(k, v, m, allowComputed) { - return false - } - } - return true -} - -func equalValue(key, val string, other *Meta, allowComputed bool) bool { - if allowComputed || !IsComputed(key) { - if valO, ok := other.pairs[key]; !ok || val != valO { - return false - } - } - return true -} - -// Sanitize all metadata keys and values, so that they can be written safely into a file. -func (m *Meta) Sanitize() { - if m == nil { - return - } - for k, v := range m.pairs { - m.pairs[RemoveNonGraphic(k)] = RemoveNonGraphic(v) - } -} - -// RemoveNonGraphic changes the given string not to include non-graphical characters. -// It is needed to sanitize meta data. -func RemoveNonGraphic(s string) string { - if s == "" { - return "" - } - pos := 0 - var buf bytes.Buffer - for pos < len(s) { - nextPos := strings.IndexFunc(s[pos:], func(r rune) bool { return !unicode.IsGraphic(r) }) - if nextPos < 0 { - break - } - buf.WriteString(s[pos:nextPos]) - buf.WriteByte(' ') - _, size := utf8.DecodeRuneInString(s[nextPos:]) - pos = nextPos + size - } - if pos == 0 { - return strings.TrimSpace(s) - } - buf.WriteString(s[pos:]) - return strings.TrimSpace(buf.String()) -} DELETED domain/meta/meta_test.go Index: domain/meta/meta_test.go ================================================================== --- domain/meta/meta_test.go +++ domain/meta/meta_test.go @@ -1,262 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta provides the domain specific type 'meta'. -package meta - -import ( - "strings" - "testing" - - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" -) - -const testID = id.Zid(98765432101234) - -func TestKeyIsValid(t *testing.T) { - t.Parallel() - validKeys := []string{"0", "a", "0-", "title", "title-----", strings.Repeat("r", 255)} - for _, key := range validKeys { - if !KeyIsValid(key) { - t.Errorf("Key %q wrongly identified as invalid key", key) - } - } - invalidKeys := []string{"", "-", "-a", "Title", "a_b", strings.Repeat("e", 256)} - for _, key := range invalidKeys { - if KeyIsValid(key) { - t.Errorf("Key %q wrongly identified as valid key", key) - } - } -} - -func TestTitleHeader(t *testing.T) { - t.Parallel() - m := New(testID) - if got, ok := m.Get(api.KeyTitle); ok && got != "" { - t.Errorf("Title is not empty, but %q", got) - } - addToMeta(m, api.KeyTitle, " ") - if got, ok := m.Get(api.KeyTitle); ok && got != "" { - t.Errorf("Title is not empty, but %q", got) - } - const st = "A simple text" - addToMeta(m, api.KeyTitle, " "+st+" ") - if got, ok := m.Get(api.KeyTitle); !ok || got != st { - t.Errorf("Title is not %q, but %q", st, got) - } - addToMeta(m, api.KeyTitle, " "+st+"\t") - const exp = st + " " + st - if got, ok := m.Get(api.KeyTitle); !ok || got != exp { - t.Errorf("Title is not %q, but %q", exp, got) - } - - m = New(testID) - const at = "A Title" - addToMeta(m, api.KeyTitle, at) - addToMeta(m, api.KeyTitle, " ") - if got, ok := m.Get(api.KeyTitle); !ok || got != at { - t.Errorf("Title is not %q, but %q", at, got) - } -} - -func checkSet(t *testing.T, exp []string, m *Meta, key string) { - t.Helper() - got, _ := m.GetList(key) - for i, tag := range exp { - if i < len(got) { - if tag != got[i] { - t.Errorf("Pos=%d, expected %q, got %q", i, exp[i], got[i]) - } - } else { - t.Errorf("Expected %q, but is missing", exp[i]) - } - } - if len(exp) < len(got) { - t.Errorf("Extra tags: %q", got[len(exp):]) - } -} - -func TestTagsHeader(t *testing.T) { - t.Parallel() - m := New(testID) - checkSet(t, []string{}, m, api.KeyTags) - - addToMeta(m, api.KeyTags, "") - checkSet(t, []string{}, m, api.KeyTags) - - addToMeta(m, api.KeyTags, " #t1 #t2 #t3 #t4 ") - checkSet(t, []string{"#t1", "#t2", "#t3", "#t4"}, m, api.KeyTags) - - addToMeta(m, api.KeyTags, "#t5") - checkSet(t, []string{"#t1", "#t2", "#t3", "#t4", "#t5"}, m, api.KeyTags) - - addToMeta(m, api.KeyTags, "t6") - checkSet(t, []string{"#t1", "#t2", "#t3", "#t4", "#t5"}, m, api.KeyTags) -} - -func TestSyntax(t *testing.T) { - t.Parallel() - m := New(testID) - if got, ok := m.Get(api.KeySyntax); ok || got != "" { - t.Errorf("Syntax is not %q, but %q", "", got) - } - addToMeta(m, api.KeySyntax, " ") - if got, _ := m.Get(api.KeySyntax); got != "" { - t.Errorf("Syntax is not %q, but %q", "", got) - } - addToMeta(m, api.KeySyntax, "MarkDown") - const exp = "markdown" - if got, ok := m.Get(api.KeySyntax); !ok || got != exp { - t.Errorf("Syntax is not %q, but %q", exp, got) - } - addToMeta(m, api.KeySyntax, " ") - if got, _ := m.Get(api.KeySyntax); got != "" { - t.Errorf("Syntax is not %q, but %q", "", got) - } -} - -func checkHeader(t *testing.T, exp map[string]string, gotP []Pair) { - t.Helper() - got := make(map[string]string, len(gotP)) - for _, p := range gotP { - got[p.Key] = p.Value - if _, ok := exp[p.Key]; !ok { - t.Errorf("Key %q is not expected, but has value %q", p.Key, p.Value) - } - } - for k, v := range exp { - if gv, ok := got[k]; !ok || v != gv { - if ok { - t.Errorf("Key %q is not %q, but %q", k, v, got[k]) - } else { - t.Errorf("Key %q missing, should have value %q", k, v) - } - } - } -} - -func TestDefaultHeader(t *testing.T) { - t.Parallel() - m := New(testID) - addToMeta(m, "h1", "d1") - addToMeta(m, "H2", "D2") - addToMeta(m, "H1", "D1.1") - exp := map[string]string{"h1": "d1 D1.1", "h2": "D2"} - checkHeader(t, exp, m.Pairs()) - addToMeta(m, "", "d0") - checkHeader(t, exp, m.Pairs()) - addToMeta(m, "h3", "") - exp["h3"] = "" - checkHeader(t, exp, m.Pairs()) - addToMeta(m, "h3", " ") - checkHeader(t, exp, m.Pairs()) - addToMeta(m, "h4", " ") - exp["h4"] = "" - checkHeader(t, exp, m.Pairs()) -} - -func TestDelete(t *testing.T) { - t.Parallel() - m := New(testID) - m.Set("key", "val") - if got, ok := m.Get("key"); !ok || got != "val" { - t.Errorf("Value != %q, got: %v/%q", "val", ok, got) - } - m.Set("key", "") - if got, ok := m.Get("key"); !ok || got != "" { - t.Errorf("Value != %q, got: %v/%q", "", ok, got) - } - m.Delete("key") - if got, ok := m.Get("key"); ok || got != "" { - t.Errorf("Value != %q, got: %v/%q", "", ok, got) - } -} - -func TestEqual(t *testing.T) { - t.Parallel() - testcases := []struct { - pairs1, pairs2 []string - allowComputed bool - exp bool - }{ - {nil, nil, true, true}, - {nil, nil, false, true}, - {[]string{"a", "a"}, nil, false, false}, - {[]string{"a", "a"}, nil, true, false}, - {[]string{api.KeyFolge, "0"}, nil, true, false}, - {[]string{api.KeyFolge, "0"}, nil, false, true}, - {[]string{api.KeyFolge, "0"}, []string{api.KeyFolge, "0"}, true, true}, - {[]string{api.KeyFolge, "0"}, []string{api.KeyFolge, "0"}, false, true}, - } - for i, tc := range testcases { - m1 := pairs2meta(tc.pairs1) - m2 := pairs2meta(tc.pairs2) - got := m1.Equal(m2, tc.allowComputed) - if tc.exp != got { - t.Errorf("%d: %v =?= %v: expected=%v, but got=%v", i, tc.pairs1, tc.pairs2, tc.exp, got) - } - got = m2.Equal(m1, tc.allowComputed) - if tc.exp != got { - t.Errorf("%d: %v =!= %v: expected=%v, but got=%v", i, tc.pairs1, tc.pairs2, tc.exp, got) - } - } - - // Pathologic cases - var m1, m2 *Meta - if !m1.Equal(m2, true) { - t.Error("Nil metas should be treated equal") - } - m1 = New(testID) - if m1.Equal(m2, true) { - t.Error("Empty meta should not be equal to nil") - } - if m2.Equal(m1, true) { - t.Error("Nil meta should should not be equal to empty") - } - m2 = New(testID + 1) - if m1.Equal(m2, true) { - t.Error("Different ID should differentiate") - } - if m2.Equal(m1, true) { - t.Error("Different ID should differentiate") - } -} - -func pairs2meta(pairs []string) *Meta { - m := New(testID) - for i := 0; i < len(pairs); i = i + 2 { - m.Set(pairs[i], pairs[i+1]) - } - return m -} - -func TestRemoveNonGraphic(t *testing.T) { - testCases := []struct { - inp string - exp string - }{ - {"", ""}, - {" ", ""}, - {"a", "a"}, - {"a ", "a"}, - {"a b", "a b"}, - {"\n", ""}, - {"a\n", "a"}, - {"a\nb", "a b"}, - {"a\tb", "a b"}, - } - for i, tc := range testCases { - got := RemoveNonGraphic(tc.inp) - if tc.exp != got { - t.Errorf("%q/%d: expected %q, but got %q", tc.inp, i, tc.exp, got) - } - } -} DELETED domain/meta/parse.go Index: domain/meta/parse.go ================================================================== --- domain/meta/parse.go +++ domain/meta/parse.go @@ -1,178 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta provides the domain specific type 'meta'. -package meta - -import ( - "strings" - - "zettelstore.de/c/api" - "zettelstore.de/c/maps" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/input" - "zettelstore.de/z/strfun" -) - -// NewFromInput parses the meta data of a zettel. -func NewFromInput(zid id.Zid, inp *input.Input) *Meta { - if inp.Ch == '-' && inp.PeekN(0) == '-' && inp.PeekN(1) == '-' { - skipToEOL(inp) - inp.EatEOL() - } - meta := New(zid) - for { - skipSpace(inp) - switch inp.Ch { - case '\r': - if inp.Peek() == '\n' { - inp.Next() - } - fallthrough - case '\n': - inp.Next() - return meta - case input.EOS: - return meta - case '%': - skipToEOL(inp) - inp.EatEOL() - continue - } - parseHeader(meta, inp) - if inp.Ch == '-' && inp.PeekN(0) == '-' && inp.PeekN(1) == '-' { - skipToEOL(inp) - inp.EatEOL() - meta.YamlSep = true - return meta - } - } -} - -func parseHeader(m *Meta, inp *input.Input) { - pos := inp.Pos - for isHeader(inp.Ch) { - inp.Next() - } - key := inp.Src[pos:inp.Pos] - skipSpace(inp) - if inp.Ch == ':' { - inp.Next() - } - var val []byte - for { - skipSpace(inp) - pos = inp.Pos - skipToEOL(inp) - val = append(val, inp.Src[pos:inp.Pos]...) - inp.EatEOL() - if !input.IsSpace(inp.Ch) { - break - } - val = append(val, ' ') - } - addToMeta(m, string(key), string(val)) -} - -func skipSpace(inp *input.Input) { - for input.IsSpace(inp.Ch) { - inp.Next() - } -} - -func skipToEOL(inp *input.Input) { - for { - switch inp.Ch { - case '\n', '\r', input.EOS: - return - } - inp.Next() - } -} - -// Return true iff rune is valid for header key. -func isHeader(ch rune) bool { - return ('a' <= ch && ch <= 'z') || - ('0' <= ch && ch <= '9') || - ch == '-' || - ('A' <= ch && ch <= 'Z') -} - -type predValidElem func(string) bool - -func addToSet(set strfun.Set, elems []string, useElem predValidElem) { - for _, s := range elems { - if len(s) > 0 && useElem(s) { - set.Set(s) - } - } -} - -func addSet(m *Meta, key, val string, useElem predValidElem) { - newElems := strings.Fields(val) - oldElems, ok := m.GetList(key) - if !ok { - oldElems = nil - } - - set := make(strfun.Set, len(newElems)+len(oldElems)) - addToSet(set, newElems, useElem) - if len(set) == 0 { - // Nothing to add. Maybe because of rejected elements. - return - } - addToSet(set, oldElems, useElem) - m.SetList(key, maps.Keys(set)) -} - -func addData(m *Meta, k, v string) { - if o, ok := m.Get(k); !ok || o == "" { - m.Set(k, v) - } else if v != "" { - m.Set(k, o+" "+v) - } -} - -func addToMeta(m *Meta, key, val string) { - v := trimValue(val) - key = strings.ToLower(key) - if !KeyIsValid(key) { - return - } - switch key { - case "", api.KeyID: - // Empty key and 'id' key will be ignored - return - } - - switch Type(key) { - case TypeTagSet: - addSet(m, key, strings.ToLower(v), func(s string) bool { return s[0] == '#' && len(s) > 1 }) - case TypeWord: - m.Set(key, strings.ToLower(v)) - case TypeWordSet: - addSet(m, key, strings.ToLower(v), func(s string) bool { return true }) - case TypeID: - if _, err := id.Parse(v); err == nil { - m.Set(key, v) - } - case TypeIDSet: - addSet(m, key, v, func(s string) bool { - _, err := id.Parse(s) - return err == nil - }) - case TypeTimestamp: - if _, ok := TimeValue(v); ok { - m.Set(key, v) - } - default: - addData(m, key, v) - } -} DELETED domain/meta/parse_test.go Index: domain/meta/parse_test.go ================================================================== --- domain/meta/parse_test.go +++ domain/meta/parse_test.go @@ -1,168 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta_test provides tests for the domain specific type 'meta'. -package meta_test - -import ( - "strings" - "testing" - - "zettelstore.de/c/api" - "zettelstore.de/z/domain/meta" - "zettelstore.de/z/input" -) - -func parseMetaStr(src string) *meta.Meta { - return meta.NewFromInput(testID, input.NewInput([]byte(src))) -} - -func TestEmpty(t *testing.T) { - t.Parallel() - m := parseMetaStr("") - if got, ok := m.Get(api.KeySyntax); ok || got != "" { - t.Errorf("Syntax is not %q, but %q", "", got) - } - if got, ok := m.GetList(api.KeyTags); ok || len(got) > 0 { - t.Errorf("Tags are not nil, but %v", got) - } -} - -func TestTitle(t *testing.T) { - t.Parallel() - td := []struct{ s, e string }{ - {api.KeyTitle + ": a title", "a title"}, - {api.KeyTitle + ": a\n\t title", "a title"}, - {api.KeyTitle + ": a\n\t title\r\n x", "a title x"}, - {api.KeyTitle + " AbC", "AbC"}, - {api.KeyTitle + " AbC\n ded", "AbC ded"}, - {api.KeyTitle + ": o\ntitle: p", "o p"}, - {api.KeyTitle + ": O\n\ntitle: P", "O"}, - {api.KeyTitle + ": b\r\ntitle: c", "b c"}, - {api.KeyTitle + ": B\r\n\r\ntitle: C", "B"}, - {api.KeyTitle + ": r\rtitle: q", "r q"}, - {api.KeyTitle + ": R\r\rtitle: Q", "R"}, - } - for i, tc := range td { - m := parseMetaStr(tc.s) - if got, ok := m.Get(api.KeyTitle); !ok || got != tc.e { - t.Log(m) - t.Errorf("TC=%d: expected %q, got %q", i, tc.e, got) - } - } -} - -func TestTags(t *testing.T) { - t.Parallel() - testcases := []struct { - src string - exp string - }{ - {"", ""}, - {api.KeyTags + ":", ""}, - {api.KeyTags + ": c", ""}, - {api.KeyTags + ": #", ""}, - {api.KeyTags + ": #c", "c"}, - {api.KeyTags + ": #c #", "c"}, - {api.KeyTags + ": #c #b", "b c"}, - {api.KeyTags + ": #c # #", "c"}, - {api.KeyTags + ": #c # #b", "b c"}, - } - for i, tc := range testcases { - m := parseMetaStr(tc.src) - tags, found := m.GetTags(api.KeyTags) - if !found { - if tc.exp != "" { - t.Errorf("%d / %q: no %s found", i, tc.src, api.KeyTags) - } - continue - } - if tc.exp == "" && len(tags) > 0 { - t.Errorf("%d / %q: expected no %s, but got %v", i, tc.src, api.KeyTags, tags) - continue - } - got := strings.Join(tags, " ") - if tc.exp != got { - t.Errorf("%d / %q: expected %q, got: %q", i, tc.src, tc.exp, got) - } - } -} - -func TestNewFromInput(t *testing.T) { - t.Parallel() - testcases := []struct { - input string - exp []meta.Pair - }{ - {"", []meta.Pair{}}, - {" a:b", []meta.Pair{{"a", "b"}}}, - {"%a:b", []meta.Pair{}}, - {"a:b\r\n\r\nc:d", []meta.Pair{{"a", "b"}}}, - {"a:b\r\n%c:d", []meta.Pair{{"a", "b"}}}, - {"% a:b\r\n c:d", []meta.Pair{{"c", "d"}}}, - {"---\r\na:b\r\n", []meta.Pair{{"a", "b"}}}, - {"---\r\na:b\r\n--\r\nc:d", []meta.Pair{{"a", "b"}, {"c", "d"}}}, - {"---\r\na:b\r\n---\r\nc:d", []meta.Pair{{"a", "b"}}}, - {"---\r\na:b\r\n----\r\nc:d", []meta.Pair{{"a", "b"}}}, - {"new-title:\nnew-url:", []meta.Pair{{"new-title", ""}, {"new-url", ""}}}, - } - for i, tc := range testcases { - meta := parseMetaStr(tc.input) - if got := meta.Pairs(); !equalPairs(tc.exp, got) { - t.Errorf("TC=%d: expected=%v, got=%v", i, tc.exp, got) - } - } - - // Test, whether input position is correct. - inp := input.NewInput([]byte("---\na:b\n---\nX")) - m := meta.NewFromInput(testID, inp) - exp := []meta.Pair{{"a", "b"}} - if got := m.Pairs(); !equalPairs(exp, got) { - t.Errorf("Expected=%v, got=%v", exp, got) - } - expCh := 'X' - if gotCh := inp.Ch; gotCh != expCh { - t.Errorf("Expected=%v, got=%v", expCh, gotCh) - } -} - -func equalPairs(one, two []meta.Pair) bool { - if len(one) != len(two) { - return false - } - for i := 0; i < len(one); i++ { - if one[i].Key != two[i].Key || one[i].Value != two[i].Value { - return false - } - } - return true -} - -func TestPrecursorIDSet(t *testing.T) { - t.Parallel() - var testdata = []struct { - inp string - exp string - }{ - {"", ""}, - {"123", ""}, - {"12345678901234", "12345678901234"}, - {"123 12345678901234", "12345678901234"}, - {"12345678901234 123", "12345678901234"}, - {"01234567890123 123 12345678901234", "01234567890123 12345678901234"}, - {"12345678901234 01234567890123", "01234567890123 12345678901234"}, - } - for i, tc := range testdata { - m := parseMetaStr(api.KeyPrecursor + ": " + tc.inp) - if got, ok := m.Get(api.KeyPrecursor); (!ok && tc.exp != "") || tc.exp != got { - t.Errorf("TC=%d: expected %q, but got %q when parsing %q", i, tc.exp, got, tc.inp) - } - } -} DELETED domain/meta/type.go Index: domain/meta/type.go ================================================================== --- domain/meta/type.go +++ domain/meta/type.go @@ -1,208 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta provides the domain specific type 'meta'. -package meta - -import ( - "strconv" - "strings" - "sync" - "time" - - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" -) - -// DescriptionType is a description of a specific key type. -type DescriptionType struct { - Name string - IsSet bool -} - -// String returns the string representation of the given type -func (t DescriptionType) String() string { return t.Name } - -var registeredTypes = make(map[string]*DescriptionType) - -func registerType(name string, isSet bool) *DescriptionType { - if _, ok := registeredTypes[name]; ok { - panic("Type '" + name + "' already registered") - } - t := &DescriptionType{name, isSet} - registeredTypes[name] = t - return t -} - -// Supported key types. -var ( - TypeCredential = registerType(api.MetaCredential, false) - TypeEmpty = registerType(api.MetaEmpty, false) - TypeID = registerType(api.MetaID, false) - TypeIDSet = registerType(api.MetaIDSet, true) - TypeNumber = registerType(api.MetaNumber, false) - TypeString = registerType(api.MetaString, false) - TypeTagSet = registerType(api.MetaTagSet, true) - TypeTimestamp = registerType(api.MetaTimestamp, false) - TypeURL = registerType(api.MetaURL, false) - TypeWord = registerType(api.MetaWord, false) - TypeWordSet = registerType(api.MetaWordSet, true) - TypeZettelmarkup = registerType(api.MetaZettelmarkup, false) -) - -// Type returns a type hint for the given key. If no type hint is specified, -// TypeUnknown is returned. -func (*Meta) Type(key string) *DescriptionType { - return Type(key) -} - -var ( - cachedTypedKeys = make(map[string]*DescriptionType) - mxTypedKey sync.RWMutex - suffixTypes = map[string]*DescriptionType{ - "-number": TypeNumber, - "-role": TypeWord, - "-set": TypeWordSet, - "-title": TypeZettelmarkup, - "-url": TypeURL, - "-zettel": TypeID, - "-zid": TypeID, - "-zids": TypeIDSet, - } -) - -// Type returns a type hint for the given key. If no type hint is specified, -// TypeEmpty is returned. -func Type(key string) *DescriptionType { - if k, ok := registeredKeys[key]; ok { - return k.Type - } - mxTypedKey.RLock() - k, ok := cachedTypedKeys[key] - mxTypedKey.RUnlock() - if ok { - return k - } - for suffix, t := range suffixTypes { - if strings.HasSuffix(key, suffix) { - mxTypedKey.Lock() - defer mxTypedKey.Unlock() - cachedTypedKeys[key] = t - return t - } - } - return TypeEmpty -} - -// SetList stores the given string list value under the given key. -func (m *Meta) SetList(key string, values []string) { - if key != api.KeyID { - for i, val := range values { - values[i] = trimValue(val) - } - m.pairs[key] = strings.Join(values, " ") - } -} - -// SetNow stores the current timestamp under the given key. -func (m *Meta) SetNow(key string) { - m.Set(key, time.Now().Local().Format(id.ZidLayout)) -} - -// BoolValue returns the value interpreted as a bool. -func BoolValue(value string) bool { - if len(value) > 0 { - switch value[0] { - case '0', 'f', 'F', 'n', 'N': - return false - } - } - return true -} - -// GetBool returns the boolean value of the given key. -func (m *Meta) GetBool(key string) bool { - if value, ok := m.Get(key); ok { - return BoolValue(value) - } - return false -} - -// TimeValue returns the time value of the given value. -func TimeValue(value string) (time.Time, bool) { - if t, err := time.Parse(id.ZidLayout, value); err == nil { - return t, true - } - return time.Time{}, false -} - -// GetTime returns the time value of the given key. -func (m *Meta) GetTime(key string) (time.Time, bool) { - if value, ok := m.Get(key); ok { - return TimeValue(value) - } - return time.Time{}, false -} - -// ListFromValue transforms a string value into a list value. -func ListFromValue(value string) []string { - return strings.Fields(value) -} - -// GetList retrieves the string list value of a given key. The bool value -// signals, whether there was a value stored or not. -func (m *Meta) GetList(key string) ([]string, bool) { - value, ok := m.Get(key) - if !ok { - return nil, false - } - return ListFromValue(value), true -} - -// GetTags returns the list of tags as a string list. Each tag does not begin -// with the '#' character, in contrast to `GetList`. -func (m *Meta) GetTags(key string) ([]string, bool) { - tagsValue, ok := m.Get(key) - if !ok { - return nil, false - } - tags := ListFromValue(strings.ToLower(tagsValue)) - for i, tag := range tags { - tags[i] = CleanTag(tag) - } - return tags, len(tags) > 0 -} - -// CleanTag removes the number character ('#') from a tag value and lowercases it. -func CleanTag(tag string) string { - if len(tag) > 1 && tag[0] == '#' { - return tag[1:] - } - return tag -} - -// GetListOrNil retrieves the string list value of a given key. If there was -// nothing stores, a nil list is returned. -func (m *Meta) GetListOrNil(key string) []string { - if value, ok := m.GetList(key); ok { - return value - } - return nil -} - -// GetNumber retrieves the numeric value of a given key. -func (m *Meta) GetNumber(key string, def int64) int64 { - if value, ok := m.Get(key); ok { - if num, err := strconv.ParseInt(value, 10, 64); err == nil { - return num - } - } - return def -} DELETED domain/meta/type_test.go Index: domain/meta/type_test.go ================================================================== --- domain/meta/type_test.go +++ domain/meta/type_test.go @@ -1,65 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2021 Detlef Stern -// -// This file is part of zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta_test provides tests for the domain specific type 'meta'. -package meta_test - -import ( - "strconv" - "testing" - "time" - - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" -) - -func TestNow(t *testing.T) { - t.Parallel() - m := meta.New(id.Invalid) - m.SetNow("key") - val, ok := m.Get("key") - if !ok { - t.Error("Unable to get value of key") - } - if len(val) != 14 { - t.Errorf("Value is not 14 digits long: %q", val) - } - if _, err := strconv.ParseInt(val, 10, 64); err != nil { - t.Errorf("Unable to parse %q as an int64: %v", val, err) - } - if _, ok = m.GetTime("key"); !ok { - t.Errorf("Unable to get time from value %q", val) - } -} - -func TestGetTime(t *testing.T) { - t.Parallel() - testCases := []struct { - value string - valid bool - exp time.Time - }{ - {"", false, time.Time{}}, - {"1", false, time.Time{}}, - {"00000000000000", false, time.Time{}}, - {"98765432109876", false, time.Time{}}, - {"20201221111905", true, time.Date(2020, time.December, 21, 11, 19, 5, 0, time.UTC)}, - } - for i, tc := range testCases { - got, ok := meta.TimeValue(tc.value) - if ok != tc.valid { - t.Errorf("%d: parsing of %q should be %v, but got %v", i, tc.value, tc.valid, ok) - continue - } - if got != tc.exp { - t.Errorf("%d: parsing of %q should return %v, but got %v", i, tc.value, tc.exp, got) - } - } -} DELETED domain/meta/values.go Index: domain/meta/values.go ================================================================== --- domain/meta/values.go +++ domain/meta/values.go @@ -1,89 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -package meta - -import ( - "fmt" - - "zettelstore.de/c/api" -) - -// Visibility enumerates the variations of the 'visibility' meta key. -type Visibility int - -// Supported values for visibility. -const ( - _ Visibility = iota - VisibilityUnknown - VisibilityPublic - VisibilityCreator - VisibilityLogin - VisibilityOwner - VisibilityExpert -) - -var visMap = map[string]Visibility{ - api.ValueVisibilityPublic: VisibilityPublic, - api.ValueVisibilityCreator: VisibilityCreator, - api.ValueVisibilityLogin: VisibilityLogin, - api.ValueVisibilityOwner: VisibilityOwner, - api.ValueVisibilityExpert: VisibilityExpert, -} -var revVisMap = map[Visibility]string{} - -func init() { - for k, v := range visMap { - revVisMap[v] = k - } -} - -// GetVisibility returns the visibility value of the given string -func GetVisibility(val string) Visibility { - if vis, ok := visMap[val]; ok { - return vis - } - return VisibilityUnknown -} - -func (v Visibility) String() string { - if s, ok := revVisMap[v]; ok { - return s - } - return fmt.Sprintf("Unknown (%d)", v) -} - -// UserRole enumerates the supported values of meta key 'user-role'. -type UserRole int - -// Supported values for user roles. -const ( - _ UserRole = iota - UserRoleUnknown - UserRoleCreator - UserRoleReader - UserRoleWriter - UserRoleOwner -) - -var urMap = map[string]UserRole{ - api.ValueUserRoleCreator: UserRoleCreator, - api.ValueUserRoleReader: UserRoleReader, - api.ValueUserRoleWriter: UserRoleWriter, - api.ValueUserRoleOwner: UserRoleOwner, -} - -// GetUserRole role returns the user role of the given string. -func GetUserRole(val string) UserRole { - if ur, ok := urMap[val]; ok { - return ur - } - return UserRoleUnknown -} DELETED domain/meta/write.go Index: domain/meta/write.go ================================================================== --- domain/meta/write.go +++ domain/meta/write.go @@ -1,58 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta provides the domain specific type 'meta'. -package meta - -import "io" - -// Write writes metadata to a writer, excluding computed and propery values. -func (m *Meta) Write(w io.Writer) (int, error) { - return m.doWrite(w, IsComputed) -} - -// WriteComputed writes metadata to a writer, including computed values, -// but excluding property values. -func (m *Meta) WriteComputed(w io.Writer) (int, error) { - return m.doWrite(w, IsProperty) -} - -func (m *Meta) doWrite(w io.Writer, ignoreKeyPred func(string) bool) (length int, err error) { - for _, p := range m.ComputedPairs() { - key := p.Key - if ignoreKeyPred(key) { - continue - } - if err != nil { - break - } - var l int - l, err = io.WriteString(w, key) - length += l - if err == nil { - l, err = w.Write(colonSpace) - length += l - } - if err == nil { - l, err = io.WriteString(w, p.Value) - length += l - } - if err == nil { - l, err = w.Write(newline) - length += l - } - } - return length, err -} - -var ( - colonSpace = []byte{':', ' '} - newline = []byte{'\n'} -) DELETED domain/meta/write_test.go Index: domain/meta/write_test.go ================================================================== --- domain/meta/write_test.go +++ domain/meta/write_test.go @@ -1,59 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package meta_test provides tests for the domain specific type 'meta'. -package meta_test - -import ( - "bytes" - "strings" - "testing" - - "zettelstore.de/c/api" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" -) - -const testID = id.Zid(98765432101234) - -func newMeta(title string, tags []string, syntax string) *meta.Meta { - m := meta.New(testID) - if title != "" { - m.Set(api.KeyTitle, title) - } - if tags != nil { - m.Set(api.KeyTags, strings.Join(tags, " ")) - } - if syntax != "" { - m.Set(api.KeySyntax, syntax) - } - return m -} -func assertWriteMeta(t *testing.T, m *meta.Meta, expected string) { - t.Helper() - var buf bytes.Buffer - m.Write(&buf) - if got := buf.String(); got != expected { - t.Errorf("\nExp: %q\ngot: %q", expected, got) - } -} - -func TestWriteMeta(t *testing.T) { - t.Parallel() - assertWriteMeta(t, newMeta("", nil, ""), "") - - m := newMeta("TITLE", []string{"#t1", "#t2"}, "syntax") - assertWriteMeta(t, m, "title: TITLE\ntags: #t1 #t2\nsyntax: syntax\n") - - m = newMeta("TITLE", nil, "") - m.Set("user", "zettel") - m.Set("auth", "basic") - assertWriteMeta(t, m, "title: TITLE\nauth: basic\nuser: zettel\n") -} DELETED domain/zettel.go Index: domain/zettel.go ================================================================== --- domain/zettel.go +++ domain/zettel.go @@ -1,29 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern -// -// This file is part of Zettelstore. -// -// Zettelstore is licensed under the latest version of the EUPL (European Union -// Public License). Please see file LICENSE.txt for your rights and obligations -// under this license. -//----------------------------------------------------------------------------- - -// Package domain provides domain specific types, constants, and functions. -package domain - -import "zettelstore.de/z/domain/meta" - -// Zettel is the main data object of a zettelstore. -type Zettel struct { - Meta *meta.Meta // Some additional meta-data. - Content Content // The content of the zettel itself. -} - -// Length returns the number of bytes to store the zettel (in a domain view, -// not in a technical view). -func (z Zettel) Length() int { return z.Meta.Length() + z.Content.Length() } - -// Equal compares two zettel for equality. -func (z Zettel) Equal(o Zettel, allowComputed bool) bool { - return z.Meta.Equal(o.Meta, allowComputed) && z.Content.Equal(&o.Content) -} Index: encoder/encoder.go ================================================================== --- encoder/encoder.go +++ encoder/encoder.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2020-2022 Detlef Stern +// Copyright (c) 2020-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -15,13 +15,13 @@ import ( "errors" "fmt" "io" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/ast" - "zettelstore.de/z/domain/meta" + "zettelstore.de/z/zettel/meta" ) // Encoder is an interface that allows to encode different parts of a zettel. type Encoder interface { WriteZettel(io.Writer, *ast.ZettelNode, EvalMetaFunc) (int, error) @@ -71,13 +71,5 @@ for enc := range registry { result = append(result, enc) } return result } - -// GetDefaultEncoding returns the encoding that should be used as default. -func GetDefaultEncoding() api.EncodingEnum { - if _, ok := registry[api.EncoderZJSON]; ok { - return api.EncoderZJSON - } - panic("No ZJSON encoding registered") -} Index: encoder/encoder_blob_test.go ================================================================== --- encoder/encoder_blob_test.go +++ encoder/encoder_blob_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -11,16 +11,16 @@ package encoder_test import ( "testing" - "zettelstore.de/c/api" + "zettelstore.de/client.fossil/api" "zettelstore.de/z/config" - "zettelstore.de/z/domain/id" - "zettelstore.de/z/domain/meta" "zettelstore.de/z/input" "zettelstore.de/z/parser" + "zettelstore.de/z/zettel/id" + "zettelstore.de/z/zettel/meta" _ "zettelstore.de/z/parser/blob" // Allow to use BLOB parser. ) type blobTestCase struct { @@ -38,15 +38,15 @@ 0x55, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x62, 0x00, 0x00, 0x00, 0x06, 0x00, 0x03, 0x36, 0x37, 0x7c, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }, expect: expectMap{ - encoderZJSON: `[{"":"BLOB","q":"PNG","s":"png","o":"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=="}]`, - encoderHTML: `

`, - encoderSexpr: `((BLOB "PNG" "png" "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=="))`, + encoderHTML: `

PNG

`, + encoderSz: `(BLOCK (BLOB (INLINE (TEXT "PNG")) "png" "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg=="))`, + encoderSHTML: `((p (img (@ (alt . "PNG") (src . "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg==")))))`, encoderText: "", - encoderZmk: `%% Unable to display BLOB with title 'PNG' and syntax 'png'.`, + encoderZmk: `%% Unable to display BLOB with description 'PNG' and syntax 'png'.`, }, }, } func TestBlob(t *testing.T) { Index: encoder/encoder_block_test.go ================================================================== --- encoder/encoder_block_test.go +++ encoder/encoder_block_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -13,145 +13,182 @@ var tcsBlock = []zmkTestCase{ { descr: "Empty Zettelmarkup should produce near nothing", zmk: "", expect: expectMap{ - encoderZJSON: `[]`, encoderHTML: "", - encoderSexpr: `()`, + encoderMD: "", + encoderSz: `(BLOCK)`, + encoderSHTML: `()`, encoderText: "", encoderZmk: useZmk, }, }, { descr: "Simple text: Hello, world", zmk: "Hello, world", expect: expectMap{ - encoderZJSON: `[{"":"Para","i":[{"":"Text","s":"Hello,"},{"":"Space"},{"":"Text","s":"world"}]}]`, encoderHTML: "

Hello, world

", - encoderSexpr: `((PARA (TEXT "Hello,") (SPACE) (TEXT "world")))`, + encoderMD: "Hello, world", + encoderSz: `(BLOCK (PARA (TEXT "Hello,") (SPACE) (TEXT "world")))`, + encoderSHTML: `((p "Hello," " " "world"))`, encoderText: "Hello, world", encoderZmk: useZmk, }, }, { descr: "Simple block comment", zmk: "%%%\nNo\nrender\n%%%", expect: expectMap{ - encoderZJSON: `[{"":"CommentBlock","s":"No\nrender"}]`, encoderHTML: ``, - encoderSexpr: `((VERBATIM-COMMENT () "No\nrender"))`, + encoderMD: "", + encoderSz: `(BLOCK (VERBATIM-COMMENT () "No\nrender"))`, + encoderSHTML: `(())`, encoderText: ``, encoderZmk: useZmk, }, }, { descr: "Rendered block comment", zmk: "%%%{-}\nRender\n%%%", expect: expectMap{ - encoderZJSON: `[{"":"CommentBlock","a":{"-":""},"s":"Render"}]`, - encoderHTML: "", - encoderSexpr: `((VERBATIM-COMMENT (("-" "")) "Render"))`, + encoderHTML: "\n", + encoderMD: "", + encoderSz: `(BLOCK (VERBATIM-COMMENT (quote (("-" . ""))) "Render"))`, + encoderSHTML: "((@@@ \"Render\"))", encoderText: ``, encoderZmk: useZmk, }, }, { descr: "Simple Heading", zmk: `=== Top`, expect: expectMap{ - encoderZJSON: `[{"":"Heading","n":1,"s":"top","i":[{"":"Text","s":"Top"}]}]`, encoderHTML: "

Top

", - encoderSexpr: `((HEADING 1 () "top" "top" (TEXT "Top")))`, + encoderMD: "# Top", + encoderSz: `(BLOCK (HEADING 1 () "top" "top" (INLINE (TEXT "Top"))))`, + encoderSHTML: `((h2 (@ (id . "top")) "Top"))`, encoderText: `Top`, encoderZmk: useZmk, }, }, { descr: "Simple List", zmk: "* A\n* B\n* C", expect: expectMap{ - encoderZJSON: `[{"":"Bullet","c":[[{"":"Para","i":[{"":"Text","s":"A"}]}],[{"":"Para","i":[{"":"Text","s":"B"}]}],[{"":"Para","i":[{"":"Text","s":"C"}]}]]}]`, encoderHTML: "
  • A
  • B
  • C
", - encoderSexpr: `((UNORDERED ((TEXT "A")) ((TEXT "B")) ((TEXT "C"))))`, + encoderMD: "* A\n* B\n* C", + encoderSz: `(BLOCK (UNORDERED (INLINE (TEXT "A")) (INLINE (TEXT "B")) (INLINE (TEXT "C"))))`, + encoderSHTML: `((ul (li "A") (li "B") (li "C")))`, encoderText: "A\nB\nC", encoderZmk: useZmk, }, }, { descr: "Nested List", zmk: "* T1\n** T2\n* T3\n** T4\n** T5\n* T6", expect: expectMap{ - encoderZJSON: `[{"":"Bullet","c":[[{"":"Para","i":[{"":"Text","s":"T1"}]},{"":"Bullet","c":[[{"":"Para","i":[{"":"Text","s":"T2"}]}]]}],[{"":"Para","i":[{"":"Text","s":"T3"}]},{"":"Bullet","c":[[{"":"Para","i":[{"":"Text","s":"T4"}]}],[{"":"Para","i":[{"":"Text","s":"T5"}]}]]}],[{"":"Para","i":[{"":"Text","s":"T6"}]}]]}]`, encoderHTML: `

  • T1

    • T2

  • T3

    • T4
    • T5

  • T6

`, - encoderSexpr: `((UNORDERED ((PARA (TEXT "T1")) (UNORDERED ((TEXT "T2")))) ((PARA (TEXT "T3")) (UNORDERED ((TEXT "T4")) ((TEXT "T5")))) ((PARA (TEXT "T6")))))`, + encoderMD: "* T1\n * T2\n* T3\n * T4\n * T5\n* T6", + encoderSz: `(BLOCK (UNORDERED (BLOCK (PARA (TEXT "T1")) (UNORDERED (INLINE (TEXT "T2")))) (BLOCK (PARA (TEXT "T3")) (UNORDERED (INLINE (TEXT "T4")) (INLINE (TEXT "T5")))) (BLOCK (PARA (TEXT "T6")))))`, + encoderSHTML: `((ul (li (p "T1") (ul (li "T2"))) (li (p "T3") (ul (li "T4") (li "T5"))) (li (p "T6"))))`, encoderText: "T1\nT2\nT3\nT4\nT5\nT6", encoderZmk: useZmk, }, }, { descr: "Sequence of two lists", zmk: "* Item1.1\n* Item1.2\n* Item1.3\n\n* Item2.1\n* Item2.2", expect: expectMap{ - encoderZJSON: `[{"":"Bullet","c":[[{"":"Para","i":[{"":"Text","s":"Item1.1"}]}],[{"":"Para","i":[{"":"Text","s":"Item1.2"}]}],[{"":"Para","i":[{"":"Text","s":"Item1.3"}]}],[{"":"Para","i":[{"":"Text","s":"Item2.1"}]}],[{"":"Para","i":[{"":"Text","s":"Item2.2"}]}]]}]`, encoderHTML: "
  • Item1.1
  • Item1.2
  • Item1.3
  • Item2.1
  • Item2.2
", - encoderSexpr: `((UNORDERED ((TEXT "Item1.1")) ((TEXT "Item1.2")) ((TEXT "Item1.3")) ((TEXT "Item2.1")) ((TEXT "Item2.2"))))`, + encoderMD: "* Item1.1\n* Item1.2\n* Item1.3\n* Item2.1\n* Item2.2", + encoderSz: `(BLOCK (UNORDERED (INLINE (TEXT "Item1.1")) (INLINE (TEXT "Item1.2")) (INLINE (TEXT "Item1.3")) (INLINE (TEXT "Item2.1")) (INLINE (TEXT "Item2.2"))))`, + encoderSHTML: `((ul (li "Item1.1") (li "Item1.2") (li "Item1.3") (li "Item2.1") (li "Item2.2")))`, encoderText: "Item1.1\nItem1.2\nItem1.3\nItem2.1\nItem2.2", encoderZmk: "* Item1.1\n* Item1.2\n* Item1.3\n* Item2.1\n* Item2.2", }, }, { descr: "Simple horizontal rule", zmk: `---`, expect: expectMap{ - encoderZJSON: `[{"":"Thematic"}]`, encoderHTML: "
", - encoderSexpr: `((THEMATIC ()))`, + encoderMD: "---", + encoderSz: `(BLOCK (THEMATIC ()))`, + encoderSHTML: `((hr))`, + encoderText: ``, + encoderZmk: useZmk, + }, + }, + { + descr: "Thematic break with attribute", + zmk: `---{lang="zmk"}`, + expect: expectMap{ + encoderHTML: `
`, + encoderMD: "---", + encoderSz: `(BLOCK (THEMATIC (quote (("lang" . "zmk")))))`, + encoderSHTML: `((hr (@ (lang . "zmk"))))`, encoderText: ``, encoderZmk: useZmk, }, }, { descr: "No list after paragraph", zmk: "Text\n*abc", expect: expectMap{ - encoderZJSON: `[{"":"Para","i":[{"":"Text","s":"Text"},{"":"Soft"},{"":"Text","s":"*abc"}]}]`, encoderHTML: "

Text *abc

", - encoderSexpr: `((PARA (TEXT "Text") (SOFT) (TEXT "*abc")))`, + encoderMD: "Text\n*abc", + encoderSz: `(BLOCK (PARA (TEXT "Text") (SOFT) (TEXT "*abc")))`, + encoderSHTML: `((p "Text" " " "*abc"))`, encoderText: `Text *abc`, encoderZmk: useZmk, }, }, { descr: "A list after paragraph", zmk: "Text\n# abc", expect: expectMap{ - encoderZJSON: `[{"":"Para","i":[{"":"Text","s":"Text"}]},{"":"Ordered","c":[[{"":"Para","i":[{"":"Text","s":"abc"}]}]]}]`, encoderHTML: "

Text

  1. abc
", - encoderSexpr: `((PARA (TEXT "Text")) (ORDERED ((TEXT "abc"))))`, + encoderMD: "Text\n\n1. abc", + encoderSz: `(BLOCK (PARA (TEXT "Text")) (ORDERED (INLINE (TEXT "abc"))))`, + encoderSHTML: `((p "Text") (ol (li "abc")))`, encoderText: "Text\nabc", encoderZmk: useZmk, }, }, + { + descr: "Simple List Quote", + zmk: "> ToBeOrNotToBe", + expect: expectMap{ + encoderHTML: "

ToBeOrNotToBe

", + encoderMD: "> ToBeOrNotToBe", + encoderSz: `(BLOCK (QUOTATION (INLINE (TEXT "ToBeOrNotToBe"))))`, + encoderSHTML: `((blockquote (p "ToBeOrNotToBe")))`, + encoderText: "ToBeOrNotToBe", + encoderZmk: useZmk, + }, + }, { descr: "Simple Quote Block", zmk: "<<<\nToBeOrNotToBe\n<<< Romeo", expect: expectMap{ - encoderZJSON: `[{"":"Excerpt","b":[{"":"Para","i":[{"":"Text","s":"ToBeOrNotToBe"}]}],"i":[{"":"Text","s":"Romeo"}]}]`, encoderHTML: "

ToBeOrNotToBe

Romeo
", - encoderSexpr: `((REGION-QUOTE () ((PARA (TEXT "ToBeOrNotToBe"))) ((TEXT "Romeo"))))`, + encoderMD: "> ToBeOrNotToBe", + encoderSz: `(BLOCK (REGION-QUOTE () (BLOCK (PARA (TEXT "ToBeOrNotToBe"))) (INLINE (TEXT "Romeo"))))`, + encoderSHTML: `((blockquote (p "ToBeOrNotToBe") (cite "Romeo")))`, encoderText: "ToBeOrNotToBe\nRomeo", encoderZmk: useZmk, }, }, { descr: "Quote Block with multiple paragraphs", zmk: "<<<\nToBeOr\n\nNotToBe\n<<< Romeo", expect: expectMap{ - encoderZJSON: `[{"":"Excerpt","b":[{"":"Para","i":[{"":"Text","s":"ToBeOr"}]},{"":"Para","i":[{"":"Text","s":"NotToBe"}]}],"i":[{"":"Text","s":"Romeo"}]}]`, encoderHTML: "

ToBeOr

NotToBe

Romeo
", - encoderSexpr: `((REGION-QUOTE () ((PARA (TEXT "ToBeOr")) (PARA (TEXT "NotToBe"))) ((TEXT "Romeo"))))`, + encoderMD: "> ToBeOr\n\n> NotToBe", + encoderSz: `(BLOCK (REGION-QUOTE () (BLOCK (PARA (TEXT "ToBeOr")) (PARA (TEXT "NotToBe"))) (INLINE (TEXT "Romeo"))))`, + encoderSHTML: `((blockquote (p "ToBeOr") (p "NotToBe") (cite "Romeo")))`, encoderText: "ToBeOr\nNotToBe\nRomeo", encoderZmk: useZmk, }, }, { @@ -164,13 +201,14 @@ Paragraph Spacy Para """ Author`, expect: expectMap{ - encoderZJSON: "[{\"\":\"Poem\",\"b\":[{\"\":\"Para\",\"i\":[{\"\":\"Text\",\"s\":\"A\"},{\"\":\"Space\",\"s\":\"\u00a0\"},{\"\":\"Text\",\"s\":\"line\"},{\"\":\"Hard\"},{\"\":\"Space\",\"s\":\"\u00a0\u00a0\"},{\"\":\"Text\",\"s\":\"another\"},{\"\":\"Space\",\"s\":\"\u00a0\"},{\"\":\"Text\",\"s\":\"line\"},{\"\":\"Hard\"},{\"\":\"Text\",\"s\":\"Back\"}]},{\"\":\"Para\",\"i\":[{\"\":\"Text\",\"s\":\"Paragraph\"}]},{\"\":\"Para\",\"i\":[{\"\":\"Space\",\"s\":\"\u00a0\u00a0\u00a0\u00a0\"},{\"\":\"Text\",\"s\":\"Spacy\"},{\"\":\"Space\",\"s\":\"\u00a0\u00a0\"},{\"\":\"Text\",\"s\":\"Para\"}]}],\"i\":[{\"\":\"Text\",\"s\":\"Author\"}]}]", encoderHTML: "

A\u00a0line
\u00a0\u00a0another\u00a0line
Back

Paragraph

\u00a0\u00a0\u00a0\u00a0Spacy\u00a0\u00a0Para

Author
", - encoderSexpr: "((REGION-VERSE () ((PARA (TEXT \"A\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (SPACE \"\u00a0\u00a0\") (TEXT \"another\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (TEXT \"Back\")) (PARA (TEXT \"Paragraph\")) (PARA (SPACE \"\u00a0\u00a0\u00a0\u00a0\") (TEXT \"Spacy\") (SPACE \"\u00a0\u00a0\") (TEXT \"Para\"))) ((TEXT \"Author\"))))", + encoderMD: "", + encoderSz: "(BLOCK (REGION-VERSE () (BLOCK (PARA (TEXT \"A\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (SPACE \"\u00a0\u00a0\") (TEXT \"another\") (SPACE \"\u00a0\") (TEXT \"line\") (HARD) (TEXT \"Back\")) (PARA (TEXT \"Paragraph\")) (PARA (SPACE \"\u00a0\u00a0\u00a0\u00a0\") (TEXT \"Spacy\") (SPACE \"\u00a0\u00a0\") (TEXT \"Para\"))) (INLINE (TEXT \"Author\"))))", + encoderSHTML: "((div (p \"A\" \"\u00a0\" \"line\" (br) \"\u00a0\u00a0\" \"another\" \"\u00a0\" \"line\" (br) \"Back\") (p \"Paragraph\") (p \"\u00a0\u00a0\u00a0\u00a0\" \"Spacy\" \"\u00a0\u00a0\" \"Para\") (cite \"Author\")))", encoderText: "A line\n another line\nBack\nParagraph\n Spacy Para\nAuthor", encoderZmk: "\"\"\"\nA\u00a0line\\\n\u00a0\u00a0another\u00a0line\\\nBack\nParagraph\n\u00a0\u00a0\u00a0\u00a0Spacy\u00a0\u00a0Para\n\"\"\" Author", }, }, { @@ -179,79 +217,98 @@ A simple span and much more :::`, expect: expectMap{ - encoderZJSON: `[{"":"Block","b":[{"":"Para","i":[{"":"Text","s":"A"},{"":"Space"},{"":"Text","s":"simple"},{"":"Soft"},{"":"Space"},{"":"Text","s":"span"},{"":"Soft"},{"":"Text","s":"and"},{"":"Space"},{"":"Text","s":"much"},{"":"Space"},{"":"Text","s":"more"}]}]}]`, encoderHTML: "

A simple span and much more

", - encoderSexpr: `((REGION-BLOCK () ((PARA (TEXT "A") (SPACE) (TEXT "simple") (SOFT) (SPACE) (TEXT "span") (SOFT) (TEXT "and") (SPACE) (TEXT "much") (SPACE) (TEXT "more"))) ()))`, + encoderMD: "", + encoderSz: `(BLOCK (REGION-BLOCK () (BLOCK (PARA (TEXT "A") (SPACE) (TEXT "simple") (SOFT) (SPACE) (TEXT "span") (SOFT) (TEXT "and") (SPACE) (TEXT "much") (SPACE) (TEXT "more"))) (INLINE)))`, + encoderSHTML: `((div (p "A" " " "simple" " " " " "span" " " "and" " " "much" " " "more")))`, encoderText: `A simple span and much more`, encoderZmk: useZmk, }, }, { descr: "Simple Verbatim Code", zmk: "```\nHello\nWorld\n```", expect: expectMap{ - encoderZJSON: `[{"":"CodeBlock","s":"Hello\nWorld"}]`, encoderHTML: "
Hello\nWorld
", - encoderSexpr: `((VERBATIM-CODE () "Hello\nWorld"))`, + encoderMD: " Hello\n World", + encoderSz: `(BLOCK (VERBATIM-CODE () "Hello\nWorld"))`, + encoderSHTML: `((pre (code "Hello\nWorld")))`, encoderText: "Hello\nWorld", encoderZmk: useZmk, }, }, { descr: "Simple Verbatim Code with visible spaces", zmk: "```{-}\nHello World\n```", expect: expectMap{ - encoderZJSON: `[{"":"CodeBlock","a":{"-":""},"s":"Hello World"}]`, encoderHTML: "
Hello\u2423World
", - encoderSexpr: `((VERBATIM-CODE (("-" "")) "Hello World"))`, + encoderMD: " Hello World", + encoderSz: `(BLOCK (VERBATIM-CODE (quote (("-" . ""))) "Hello World"))`, + encoderSHTML: "((pre (code \"Hello\u2423World\")))", encoderText: "Hello World", encoderZmk: useZmk, }, }, { descr: "Simple Verbatim Eval", zmk: "~~~\nHello\nWorld\n~~~", expect: expectMap{ - encoderZJSON: `[{"":"EvalBlock","s":"Hello\nWorld"}]`, encoderHTML: "
Hello\nWorld
", - encoderSexpr: `((VERBATIM-EVAL () "Hello\nWorld"))`, + encoderMD: "", + encoderSz: `(BLOCK (VERBATIM-EVAL () "Hello\nWorld"))`, + encoderSHTML: "((pre (code (@ (class . \"zs-eval\")) \"Hello\\nWorld\")))", encoderText: "Hello\nWorld", encoderZmk: useZmk, }, }, { descr: "Simple Verbatim Math", zmk: "$$$\nHello\n\\LaTeX\n$$$", expect: expectMap{ - encoderZJSON: `[{"":"MathBlock","s":"Hello\n\\LaTeX"}]`, encoderHTML: "
Hello\n\\LaTeX
", - encoderSexpr: `((VERBATIM-MATH () "Hello\n\\LaTeX"))`, + encoderMD: "", + encoderSz: `(BLOCK (VERBATIM-MATH () "Hello\n\\LaTeX"))`, + encoderSHTML: "((pre (code (@ (class . \"zs-math\")) \"Hello\\n\\\\LaTeX\")))", encoderText: "Hello\n\\LaTeX", encoderZmk: useZmk, }, }, { descr: "Simple Description List", zmk: "; Zettel\n: Paper\n: Note\n; Zettelkasten\n: Slip box", expect: expectMap{ - encoderZJSON: `[{"":"Description","d":[{"i":[{"":"Text","s":"Zettel"}],"e":[[{"":"Para","i":[{"":"Text","s":"Paper"}]}],[{"":"Para","i":[{"":"Text","s":"Note"}]}]]},{"i":[{"":"Text","s":"Zettelkasten"}],"e":[[{"":"Para","i":[{"":"Text","s":"Slip"},{"":"Space"},{"":"Text","s":"box"}]}]]}]}]`, - encoderHTML: "
Zettel
Paper
Note
Zettelkasten
Slip box
", - encoderSexpr: `((DESCRIPTION ((TEXT "Zettel")) (((TEXT "Paper")) ((TEXT "Note"))) ((TEXT "Zettelkasten")) (((TEXT "Slip") (SPACE) (TEXT "box")))))`, + encoderHTML: "
Zettel

Paper

Note

Zettelkasten

Slip box

", + encoderMD: "", + encoderSz: `(BLOCK (DESCRIPTION (INLINE (TEXT "Zettel")) (BLOCK (BLOCK (PARA (TEXT "Paper"))) (BLOCK (PARA (TEXT "Note")))) (INLINE (TEXT "Zettelkasten")) (BLOCK (BLOCK (PARA (TEXT "Slip") (SPACE) (TEXT "box"))))))`, + encoderSHTML: `((dl (dt "Zettel") (dd (p "Paper")) (dd (p "Note")) (dt "Zettelkasten") (dd (p "Slip" " " "box"))))`, + encoderText: "Zettel\nPaper\nNote\nZettelkasten\nSlip box", + encoderZmk: useZmk, + }, + }, + { + descr: "Description List with paragraphs as item", + zmk: "; Zettel\n: Paper\n\n Note\n; Zettelkasten\n: Slip box", + expect: expectMap{ + encoderHTML: "
Zettel

Paper

Note

Zettelkasten

Slip box

", + encoderMD: "", + encoderSz: `(BLOCK (DESCRIPTION (INLINE (TEXT "Zettel")) (BLOCK (BLOCK (PARA (TEXT "Paper")) (PARA (TEXT "Note")))) (INLINE (TEXT "Zettelkasten")) (BLOCK (BLOCK (PARA (TEXT "Slip") (SPACE) (TEXT "box"))))))`, + encoderSHTML: `((dl (dt "Zettel") (dd (p "Paper") (p "Note")) (dt "Zettelkasten") (dd (p "Slip" " " "box"))))`, encoderText: "Zettel\nPaper\nNote\nZettelkasten\nSlip box", encoderZmk: useZmk, }, }, { descr: "Simple Table", zmk: "|c1|c2|c3\n|d1||d3", expect: expectMap{ - encoderZJSON: `[{"":"Table","p":[[],[[{"i":[{"":"Text","s":"c1"}]},{"i":[{"":"Text","s":"c2"}]},{"i":[{"":"Text","s":"c3"}]}],[{"i":[{"":"Text","s":"d1"}]},{"i":[]},{"i":[{"":"Text","s":"d3"}]}]]]}]`, encoderHTML: `
c1c2c3
d1d3
`, - encoderSexpr: `((TABLE () ((CELL (TEXT "c1")) (CELL (TEXT "c2")) (CELL (TEXT "c3"))) ((CELL (TEXT "d1")) (CELL) (CELL (TEXT "d3")))))`, + encoderMD: "", + encoderSz: `(BLOCK (TABLE () (list (CELL (TEXT "c1")) (CELL (TEXT "c2")) (CELL (TEXT "c3"))) (list (CELL (TEXT "d1")) (CELL) (CELL (TEXT "d3")))))`, + encoderSHTML: `((table (tbody (tr (td "c1") (td "c2") (td "c3")) (tr (td "d1") (td) (td "d3")))))`, encoderText: "c1 c2 c3\nd1 d3", encoderZmk: useZmk, }, }, { @@ -259,52 +316,78 @@ zmk: `|h1>|=h2|h3:| |%--+---+---+ |","i":[{"":"Text","s":"h1"}]},{"i":[{"":"Text","s":"h2"}]},{"s":":","i":[{"":"Text","s":"h3"}]}],[[{"s":"<","i":[{"":"Text","s":"c1"}]},{"i":[{"":"Text","s":"c2"}]},{"s":":","i":[{"":"Text","s":"c3"}]}],[{"s":">","i":[{"":"Text","s":"f1"}]},{"i":[{"":"Text","s":"f2"}]},{"s":":","i":[{"":"Text","s":"=f3"}]}]]]}]`, encoderHTML: `
h1h2h3
c1c2c3
f1f2=f3
`, - encoderSexpr: `((TABLE ((CELL-RIGHT (TEXT "h1")) (CELL (TEXT "h2")) (CELL-CENTER (TEXT "h3"))) ((CELL-LEFT (TEXT "c1")) (CELL (TEXT "c2")) (CELL-CENTER (TEXT "c3"))) ((CELL-RIGHT (TEXT "f1")) (CELL (TEXT "f2")) (CELL-CENTER (TEXT "=f3")))))`, + encoderMD: "", + encoderSz: `(BLOCK (TABLE (list (CELL-RIGHT (TEXT "h1")) (CELL (TEXT "h2")) (CELL-CENTER (TEXT "h3"))) (list (CELL-LEFT (TEXT "c1")) (CELL (TEXT "c2")) (CELL-CENTER (TEXT "c3"))) (list (CELL-RIGHT (TEXT "f1")) (CELL (TEXT "f2")) (CELL-CENTER (TEXT "=f3")))))`, + encoderSHTML: `((table (thead (tr (td (@ (class . "right")) "h1") (td "h2") (td (@ (class . "center")) "h3"))) (tbody (tr (td (@ (class . "left")) "c1") (td "c2") (td (@ (class . "center")) "c3")) (tr (td (@ (class . "right")) "f1") (td "f2") (td (@ (class . "center")) "=f3")))))`, encoderText: "h1 h2 h3\nc1 c2 c3\nf1 f2 =f3", encoderZmk: `|=h1>|=h2|=h3: |Text1

  1. Endnote \u21a9\ufe0e
", + encoderMD: "Text", + encoderSz: `(BLOCK (PARA (TEXT "Text") (ENDNOTE () (quote (INLINE (TEXT "Endnote"))))))`, + encoderSHTML: "((p \"Text\" (sup (@ (id . \"fnref:1\")) (a (@ (class . \"zs-noteref\") (href . \"#fn:1\") (role . \"doc-noteref\")) \"1\"))))", + encoderText: "Text Endnote", + encoderZmk: useZmk, + }, + }, + { + descr: "Nested Endnotes", + zmk: `Text[^Endnote[^Nested]]`, expect: expectMap{ - encoderZJSON: `[{"":"Para","i":[{"":"Text","s":"Text"},{"":"Footnote","i":[{"":"Text","s":"Footnote"}]}]}]`, - encoderHTML: `

Text1

  1. Footnote ↩︎
`, - encoderSexpr: `((PARA (TEXT "Text") (FOOTNOTE () (TEXT "Footnote"))))`, - encoderText: "Text Footnote", + encoderHTML: "

Text1

  1. Endnote2 \u21a9\ufe0e
  2. Nested \u21a9\ufe0e
", + encoderMD: "Text", + encoderSz: `(BLOCK (PARA (TEXT "Text") (ENDNOTE () (quote (INLINE (TEXT "Endnote") (ENDNOTE () (quote (INLINE (TEXT "Nested")))))))))`, + encoderSHTML: "((p \"Text\" (sup (@ (id . \"fnref:1\")) (a (@ (class . \"zs-noteref\") (href . \"#fn:1\") (role . \"doc-noteref\")) \"1\"))))", + encoderText: "Text Endnote Nested", encoderZmk: useZmk, }, }, { descr: "Transclusion", zmk: `{{{http://example.com/image}}}{width="100px"}`, expect: expectMap{ - encoderZJSON: `[{"":"Transclude","a":{"width":"100px"},"q":"external","s":"http://example.com/image"}]`, encoderHTML: `

`, - encoderSexpr: `((TRANSCLUDE (("width" "100px")) (EXTERNAL "http://example.com/image")))`, + encoderMD: "", + encoderSz: `(BLOCK (TRANSCLUDE (quote (("width" . "100px"))) (quote (EXTERNAL "http://example.com/image"))))`, + encoderSHTML: `((p (img (@ (class . "external") (src . "http://example.com/image") (width . "100px")))))`, encoderText: "", encoderZmk: useZmk, }, }, + { + descr: "A paragraph with a inline comment only should be empty in HTML", + zmk: `%% Comment`, + expect: expectMap{ + // encoderHTML: ``, + encoderSz: `(BLOCK (PARA (LITERAL-COMMENT () "Comment")))`, + // encoderSHTML: ``, + encoderText: "", + encoderZmk: useZmk, + }, + }, { descr: "", zmk: ``, expect: expectMap{ - encoderZJSON: `[]`, encoderHTML: ``, - encoderSexpr: `()`, + encoderSz: `(BLOCK)`, + encoderSHTML: `()`, encoderText: "", encoderZmk: useZmk, }, }, } // func TestEncoderBlock(t *testing.T) { // executeTestCases(t, tcsBlock) // } Index: encoder/encoder_inline_test.go ================================================================== --- encoder/encoder_inline_test.go +++ encoder/encoder_inline_test.go @@ -1,7 +1,7 @@ //----------------------------------------------------------------------------- -// Copyright (c) 2021-2022 Detlef Stern +// Copyright (c) 2021-present Detlef Stern // // This file is part of Zettelstore. // // Zettelstore is licensed under the latest version of the EUPL (European Union // Public License). Please see file LICENSE.txt for your rights and obligations @@ -13,497 +13,601 @@ var tcsInline = []zmkTestCase{ { descr: "Empty Zettelmarkup should produce near nothing (inline)", zmk: "", expect: expectMap{ - encoderZJSON: `[]`, encoderHTML: "", - encoderSexpr: `()`, + encoderMD: "", + encoderSz: `(INLINE)`, + encoderSHTML: `()`, encoderText: "", encoderZmk: useZmk, }, }, { descr: "Simple text: Hello, world (inline)", zmk: `Hello, world`, expect: expectMap{ - encoderZJSON: `[{"":"Text","s":"Hello,"},{"":"Space"},{"":"Text","s":"world"}]`, encoderHTML: "Hello, world", - encoderSexpr: `((TEXT "Hello,") (SPACE) (TEXT "world"))`, + encoderMD: "Hello, world", + encoderSz: `(INLINE (TEXT "Hello,") (SPACE) (TEXT "world"))`, + encoderSHTML: `("Hello," " " "world")`, encoderText: "Hello, world", encoderZmk: useZmk, }, }, + { + descr: "Soft Break", + zmk: "soft\nbreak", + expect: expectMap{ + encoderHTML: "soft break", + encoderMD: "soft\nbreak", + encoderSz: `(INLINE (TEXT "soft") (SOFT) (TEXT "break"))`, + encoderSHTML: `("soft" " " "break")`, + encoderText: "soft break", + encoderZmk: useZmk, + }, + }, + { + descr: "Hard Break", + zmk: "hard\\\nbreak", + expect: expectMap{ + encoderHTML: "hard
break", + encoderMD: "hard\\\nbreak", + encoderSz: `(INLINE (TEXT "hard") (HARD) (TEXT "break"))`, + encoderSHTML: `("hard" (br) "break")`, + encoderText: "hard\nbreak", + encoderZmk: useZmk, + }, + }, { descr: "Emphasized formatting", zmk: "__emph__", expect: expectMap{ - encoderZJSON: `[{"":"Emph","i":[{"":"Text","s":"emph"}]}]`, encoderHTML: "emph", - encoderSexpr: `((FORMAT-EMPH () (TEXT "emph")))`, + encoderMD: "*emph*", + encoderSz: `(INLINE (FORMAT-EMPH () (TEXT "emph")))`, + encoderSHTML: `((em "emph"))`, encoderText: "emph", encoderZmk: useZmk, }, }, { descr: "Strong formatting", zmk: "**strong**", expect: expectMap{ - encoderZJSON: `[{"":"Strong","i":[{"":"Text","s":"strong"}]}]`, encoderHTML: "strong", - encoderSexpr: `((FORMAT-STRONG () (TEXT "strong")))`, + encoderMD: "__strong__", + encoderSz: `(INLINE (FORMAT-STRONG () (TEXT "strong")))`, + encoderSHTML: `((strong "strong"))`, encoderText: "strong", encoderZmk: useZmk, }, }, { descr: "Insert formatting", zmk: ">>insert>>", expect: expectMap{ - encoderZJSON: `[{"":"Insert","i":[{"":"Text","s":"insert"}]}]`, encoderHTML: "insert", - encoderSexpr: `((FORMAT-INSERT () (TEXT "insert")))`, + encoderMD: "insert", + encoderSz: `(INLINE (FORMAT-INSERT () (TEXT "insert")))`, + encoderSHTML: `((ins "insert"))`, encoderText: "insert", encoderZmk: useZmk, }, }, { descr: "Delete formatting", zmk: "~~delete~~", expect: expectMap{ - encoderZJSON: `[{"":"Delete","i":[{"":"Text","s":"delete"}]}]`, encoderHTML: "delete", - encoderSexpr: `((FORMAT-DELETE () (TEXT "delete")))`, + encoderMD: "delete", + encoderSz: `(INLINE (FORMAT-DELETE () (TEXT "delete")))`, + encoderSHTML: `((del "delete"))`, encoderText: "delete", encoderZmk: useZmk, }, }, { descr: "Update formatting", zmk: "~~old~~>>new>>", expect: expectMap{ - encoderZJSON: `[{"":"Delete","i":[{"":"Text","s":"old"}]},{"":"Insert","i":[{"":"Text","s":"new"}]}]`, encoderHTML: "oldnew", - encoderSexpr: `((FORMAT-DELETE () (TEXT "old")) (FORMAT-INSERT () (TEXT "new")))`, + encoderMD: "oldnew", + encoderSz: `(INLINE (FORMAT-DELETE () (TEXT "old")) (FORMAT-INSERT () (TEXT "new")))`, + encoderSHTML: `((del "old") (ins "new"))`, encoderText: "oldnew", encoderZmk: useZmk, }, }, { descr: "Superscript formatting", zmk: "^^superscript^^", expect: expectMap{ - encoderZJSON: `[{"":"Super","i":[{"":"Text","s":"superscript"}]}]`, encoderHTML: `superscript`, - encoderSexpr: `((FORMAT-SUPER () (TEXT "superscript")))`, + encoderMD: "superscript", + encoderSz: `(INLINE (FORMAT-SUPER () (TEXT "superscript")))`, + encoderSHTML: `((sup "superscript"))`, encoderText: `superscript`, encoderZmk: useZmk, }, }, { descr: "Subscript formatting", zmk: ",,subscript,,", expect: expectMap{ - encoderZJSON: `[{"":"Sub","i":[{"":"Text","s":"subscript"}]}]`, encoderHTML: `subscript`, - encoderSexpr: `((FORMAT-SUB () (TEXT "subscript")))`, + encoderMD: "subscript", + encoderSz: `(INLINE (FORMAT-SUB () (TEXT "subscript")))`, + encoderSHTML: `((sub "subscript"))`, encoderText: `subscript`, encoderZmk: useZmk, }, }, { descr: "Quotes formatting", zmk: `""quotes""`, expect: expectMap{ - encoderZJSON: `[{"":"Quote","i":[{"":"Text","s":"quotes"}]}]`, encoderHTML: "quotes", - encoderSexpr: `((FORMAT-QUOTE () (TEXT "quotes")))`, + encoderMD: "quotes", + encoderSz: `(INLINE (FORMAT-QUOTE () (TEXT "quotes")))`, + encoderSHTML: `((q "quotes"))`, encoderText: `quotes`, encoderZmk: useZmk, }, }, { descr: "Quotes formatting (german)", zmk: `""quotes""{lang=de}`, expect: expectMap{ - encoderZJSON: `[{"":"Quote","a":{"lang":"de"},"i":[{"":"Text","s":"quotes"}]}]`, encoderHTML: `quotes`, - encoderSexpr: `((FORMAT-QUOTE (("lang" "de")) (TEXT "quotes")))`, + encoderMD: "quotes", + encoderSz: `(INLINE (FORMAT-QUOTE (quote (("lang" . "de"))) (TEXT "quotes")))`, + encoderSHTML: `((span (@ (lang . "de")) (q "quotes")))`, encoderText: `quotes`, encoderZmk: `""quotes""{lang="de"}`, }, }, { descr: "Span formatting", zmk: `::span::`, expect: expectMap{ - encoderZJSON: `[{"":"Span","i":[{"":"Text","s":"span"}]}]`, encoderHTML: `span`, - encoderSexpr: `((FORMAT-SPAN () (TEXT "span")))`, + encoderMD: "span", + encoderSz: `(INLINE (FORMAT-SPAN () (TEXT "span")))`, + encoderSHTML: `((span "span"))`, encoderText: `span`, encoderZmk: useZmk, }, }, { descr: "Code formatting", zmk: "``code``", expect: expectMap{ - encoderZJSON: `[{"":"Code","s":"code"}]`, encoderHTML: `code`, - encoderSexpr: `((LITERAL-CODE () "code"))`, + encoderMD: "`code`", + encoderSz: `(INLINE (LITERAL-CODE () "code"))`, + encoderSHTML: `((code "code"))`, encoderText: `code`, encoderZmk: useZmk, }, }, { descr: "Code formatting with visible space", zmk: "``x y``{-}", expect: expectMap{ - encoderZJSON: `[{"":"Code","a":{"-":""},"s":"x y"}]`, encoderHTML: "x\u2423y", - encoderSexpr: `((LITERAL-CODE (("-" "")) "x y"))`, + encoderMD: "`x y`", + encoderSz: `(INLINE (LITERAL-CODE (quote (("-" . ""))) "x y"))`, + encoderSHTML: "((code \"x\u2423y\"))", encoderText: `x y`, encoderZmk: useZmk, }, }, { descr: "HTML in Code formatting", zmk: "``