eliaskohout/ax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assignee filter bug in List

Browse Source
This commit is contained in:
Elias Kohout
2026-03-29 18:58:34 +02:00
parent 9e8c37564f
commit 13b4c4b651
22 changed files with 939 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/alias.go
View File

@@ -1,41 +1,36 @@
package cmd
import (
"axolotl/db"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
"github.com/spf13/cobra"
)
var aliasList bool
var aliasDesc string
var aliasCmd = &cobra.Command{
Use: "alias [name] [command]", Short: "Manage aliases", Args: cobra.MaximumNArgs(2),
Run: func(cmd *cobra.Command, args []string) {
d, err := db.GetDB()
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
w := cmd.OutOrStdout()
if aliasList || len(args) == 0 {
if aliases, err := d.ListAliases(); err == nil {
if len(args) == 0 {
if aliases, err := cfg.ListAliases(); err == nil {
output.PrintAliases(w, aliases, jsonFlag)
}
return
}
if len(args) == 1 {
if a, err := d.GetAlias(args[0]); err != nil {
if a, err := cfg.GetAlias(args[0]); err != nil {
fmt.Fprintln(os.Stderr, "alias not found:", args[0])
} else {
fmt.Println(a.Command)
}
return
}
if err := d.SetAlias(args[0], args[1]); err != nil {
if err := cfg.SetAlias(&service.Alias{Name: args[0], Command: args[1], Description: aliasDesc}); err != nil {
fmt.Fprintln(os.Stderr, "failed to set alias:", err)
} else {
output.PrintAction(w, "Alias set", args[0], false)
@@ -43,7 +38,19 @@ var aliasCmd = &cobra.Command{
},
}
var aliasDeleteCmd = &cobra.Command{
Use: "delete <name>", Short: "Delete an alias", Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if err := cfg.DeleteAlias(args[0]); err != nil {
fmt.Fprintln(os.Stderr, err)
} else {
output.PrintAction(cmd.OutOrStdout(), "Alias deleted", args[0], false)
}
},
}
func init() {
rootCmd.AddCommand(aliasCmd)
aliasCmd.Flags().BoolVar(&aliasList, "list", false, "")
aliasCmd.AddCommand(aliasDeleteCmd)
aliasCmd.Flags().StringVar(&aliasDesc, "desc", "", "description for the alias")
}

16
cmd/create.go
View File

@@ -4,6 +4,7 @@ import (
"axolotl/db"
"axolotl/models"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
"slices"
@@ -32,29 +33,24 @@ var createCmd = &cobra.Command{
}
rels := make(map[models.RelType][]string)
relCreated, relNamespace := false, false
relNamespace := false
for _, r := range cRels {
rt, tgt, err := db.ParseRelFlag(r)
rt, tgt, err := parseRelFlag(r)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
if rt == models.RelCreated {
relCreated = true
}
if rt == models.RelInNamespace {
relNamespace = true
}
rels[rt] = append(rels[rt], tgt)
}
if !relCreated {
rels[models.RelCreated] = append(rels[models.RelCreated], db.GetCurrentUser())
}
if !relNamespace {
rels[models.RelInNamespace] = append(rels[models.RelInNamespace], db.GetCurrentUser())
rels[models.RelInNamespace] = append(rels[models.RelInNamespace], cfg.GetUser())
}
if n, err := d.CreateNode(db.CreateParams{Title: args[0], Content: cContent, DueDate: cDue, Tags: cTags, Rels: rels}); err != nil {
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
if n, err := svc.Create(args[0], cContent, cDue, cTags, rels); err != nil {
fmt.Fprintln(os.Stderr, "failed to create:", err)
} else {
output.PrintNode(cmd.OutOrStdout(), n, jsonFlag)

6
cmd/delete.go
View File

@@ -3,6 +3,7 @@ package cmd
import (
"axolotl/db"
"axolotl/output"
"axolotl/service"
"bufio"
"fmt"
"os"
@@ -20,7 +21,8 @@ var deleteCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
n, err := d.NodeByID(args[0])
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
n, err := svc.GetByID(args[0])
if err != nil {
fmt.Fprintln(os.Stderr, " node not found:", args[0])
return
@@ -35,7 +37,7 @@ var deleteCmd = &cobra.Command{
}
}
if err := d.DeleteNode(args[0]); err != nil {
if err := svc.Delete(args[0]); err != nil {
fmt.Fprintln(os.Stderr, "failed to delete: ", err)
} else {
output.PrintAction(cmd.OutOrStdout(), "Deleted", args[0], true)

10
cmd/edit.go
View File

@@ -3,6 +3,7 @@ package cmd
import (
"axolotl/db"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
"os/exec"
@@ -18,7 +19,8 @@ var editCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
n, err := d.NodeByID(args[0])
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
n, err := svc.GetByID(args[0])
if err != nil {
fmt.Fprintln(os.Stderr, "node not found:", args[0])
return
@@ -45,12 +47,12 @@ var editCmd = &cobra.Command{
}
if content, err := os.ReadFile(tmp.Name()); err == nil {
c := string(content)
if err := d.UpdateNode(args[0], db.UpdateParams{Content: &c}); err != nil {
n.Content = string(content)
if err := svc.Update(n); err != nil {
fmt.Fprintln(os.Stderr, "failed to update:", err)
return
}
n, _ = d.NodeByID(args[0])
n, _ = svc.GetByID(args[0])
output.PrintNode(cmd.OutOrStdout(), n, jsonFlag)
} else {
fmt.Fprintln(os.Stderr, "failed to read temp file:", err)

6
cmd/inbox.go
View File

@@ -3,6 +3,7 @@ package cmd
import (
"axolotl/db"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
@@ -17,7 +18,7 @@ var inboxCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
userID, err := d.GetUserByUsername(db.GetCurrentUser())
userID, err := d.GetUserByUsername(cfg.GetUser())
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
@@ -26,7 +27,8 @@ var inboxCmd = &cobra.Command{
output.PrintNodes(cmd.OutOrStdout(), nil, jsonFlag)
return
}
if nodes, err := d.ListNodes(db.ListFilter{MentionsUser: userID}); err == nil {
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
if nodes, err := svc.List(service.WithMentions(userID)); err == nil {
output.PrintNodes(cmd.OutOrStdout(), nodes, jsonFlag)
}
},

4
cmd/list.go
View File

@@ -3,6 +3,7 @@ package cmd
import (
"axolotl/db"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
@@ -20,7 +21,8 @@ var listCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
if nodes, err := d.ListNodes(db.ListFilter{TagPrefixes: lTags, Assignee: lAssignee}); err == nil {
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
if nodes, err := svc.List(service.WithTags(lTags...), service.WithAssignee(lAssignee)); err == nil {
output.PrintNodes(cmd.OutOrStdout(), nodes, jsonFlag)
} else {
fmt.Fprintf(os.Stderr, "err: %v\n", err)

14
cmd/rel.go Normal file
View File

@@ -0,0 +1,14 @@
package cmd
import (
"axolotl/models"
"fmt"
"strings"
)
func parseRelFlag(s string) (models.RelType, string, error) {
if p := strings.SplitN(s, ":", 2); len(p) == 2 {
return models.RelType(p[0]), p[1], nil
}
return "", "", fmt.Errorf("invalid relation format: %s (expected type:id)", s)
}

30
cmd/root.go
View File

@@ -1,6 +1,8 @@
package cmd
import (
"axolotl/service"
"fmt"
"os"
"strings"
@@ -8,15 +10,43 @@ import (
)
var jsonFlag bool
var cfg service.Config
var rootCmd = &cobra.Command{Use: "ax", Short: "The axolotl issue tracker"}
func Execute() {
var err error
cfg, err = service.LoadConfig()
if err != nil {
fmt.Fprintln(os.Stderr, "failed to load config:", err)
os.Exit(1)
}
registerAliasCommands()
rootCmd.SetArgs(transformArgs(os.Args[1:]))
if err := rootCmd.Execute(); err != nil {
os.Exit(1)
}
}
func registerAliasCommands() {
rootCmd.AddGroup(&cobra.Group{ID: "aliases", Title: "Aliases:"})
aliases, _ := cfg.ListAliases()
for _, a := range aliases {
a := a
rootCmd.AddCommand(&cobra.Command{
Use: a.Name,
Short: a.Description,
GroupID: "aliases",
Run: func(cmd *cobra.Command, args []string) {
expanded := service.ExpandAlias(a, args, cfg.GetUser())
rootCmd.SetArgs(transformArgs(expanded))
if err := rootCmd.Execute(); err != nil {
os.Exit(1)
}
},
})
}
}
func transformArgs(args []string) []string {
aliases := map[string]string{
"--status": "_status",

4
cmd/show.go
View File

@@ -3,6 +3,7 @@ package cmd
import (
"axolotl/db"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
@@ -17,7 +18,8 @@ var showCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
if n, err := d.NodeByID(args[0]); err == nil {
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
if n, err := svc.GetByID(args[0]); err == nil {
output.PrintNode(cmd.OutOrStdout(), n, jsonFlag)
} else {
fmt.Fprintln(os.Stderr, "node not found:", args[0])

52
cmd/update.go
View File

@@ -4,6 +4,7 @@ import (
"axolotl/db"
"axolotl/models"
"axolotl/output"
"axolotl/service"
"fmt"
"os"
"slices"
@@ -26,11 +27,18 @@ var updateCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
addRels, rmRels := make(map[models.RelType][]string), make(map[models.RelType][]string)
svc := service.NewSQLiteNodeService(d.DB, cfg.GetUser())
node, err := svc.GetByID(args[0])
if err != nil {
fmt.Fprintln(os.Stderr, "node not found:", args[0])
return
}
addRels, rmRels := make(map[models.RelType][]string), make(map[models.RelType][]string)
parseRel := func(src []string, dst map[models.RelType][]string) bool {
for _, r := range src {
rt, tgt, err := db.ParseRelFlag(r)
rt, tgt, err := parseRelFlag(r)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return false
@@ -44,7 +52,7 @@ var updateCmd = &cobra.Command{
}
if slices.Contains(uAddTags, "_status::done") {
ok, blockers, err := d.CanClose(args[0])
ok, blockers, err := svc.CanClose(args[0])
if err != nil {
fmt.Fprintln(os.Stderr, "failed to check blockers:", err)
return
@@ -61,22 +69,46 @@ var updateCmd = &cobra.Command{
uRmTags = append(uRmTags, "_prio::low", "_prio::medium", "_prio::high")
}
uParams := db.UpdateParams{ClearDue: uClearDue,
AddTags: uAddTags, RemoveTags: uRmTags, AddRels: addRels, RemoveRels: rmRels}
if cmd.Flags().Changed("title") {
uParams.Title = &uTitle
node.Title = uTitle
}
if cmd.Flags().Changed("content") {
uParams.Content = &uContent
node.Content = uContent
}
if cmd.Flags().Changed("due") {
uParams.DueDate = &uDue
node.DueDate = uDue
}
if err := d.UpdateNode(args[0], uParams); err != nil {
if uClearDue {
node.DueDate = ""
}
for _, t := range uRmTags {
node.Tags = slices.DeleteFunc(node.Tags, func(e string) bool { return e == t })
}
for _, t := range uAddTags {
if !slices.Contains(node.Tags, t) {
node.Tags = append(node.Tags, t)
}
}
for rt, tgts := range rmRels {
for _, tgt := range tgts {
node.Relations[string(rt)] = slices.DeleteFunc(node.Relations[string(rt)], func(e string) bool { return e == tgt })
}
}
for rt, tgts := range addRels {
for _, tgt := range tgts {
if !slices.Contains(node.Relations[string(rt)], tgt) {
node.Relations[string(rt)] = append(node.Relations[string(rt)], tgt)
}
}
}
if err := svc.Update(node); err != nil {
fmt.Fprintln(os.Stderr, "failed to update:", err)
return
}
if n, err := d.NodeByID(args[0]); err == nil {
if n, err := svc.GetByID(args[0]); err == nil {
output.PrintNode(cmd.OutOrStdout(), n, jsonFlag)
} else {
fmt.Fprintln(os.Stderr, "failed to fetch node:", err)