bth/um
Watch
1
Fork
You've already forked um
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

next : dont need to parse desc from last

Browse source
This commit is contained in:
bth 2026-01-18 21:43:11 -08:00
commit dbe1af4710
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
next/last.go
View file

@ -9,9 +9,8 @@ import (
) )
const ( const (
LS_CMD = `ls -r [0-9]*.md` LS_CMD = `ls -r [0-9]*.md`
LS_GREP_PIPE = `ls -r | grep -E '^[[:digit:]].*\.md'` FILE_REGEXP = `(?m)^([0-9]+)\.[[:alpha:]]*\.*md$`
FILE_REGEXP = `(?m)^([0-9]+)\.([[:alpha:]]*)\.*md$`
) )
var fileRegexp *regexp.Regexp = regexp.MustCompile(FILE_REGEXP) var fileRegexp *regexp.Regexp = regexp.MustCompile(FILE_REGEXP)

19
next/next.go
View file

@ -40,22 +40,18 @@ func parseArgs(args []string) options {
return opts return opts
} }
func parseFile(last string) (string, string, error) { func parseFile(last string) (string, error) {
res := fileRegexp.FindStringSubmatch(last) res := fileRegexp.FindStringSubmatch(last)
num := "" num := ""
desc := ""
if len(res) < 2 { if len(res) < 2 {
return num, desc, errors.New("no um files in current dir") return num, errors.New("no um files in current dir")
} }
num = res[1] num = res[1]
if len(res) > 2 { return num, nil
desc = res[2]
}
return num, desc, nil
} }
func next(last string) (string, error) { func next(last string, desc string) (string, error) {
num, desc, err := parseFile(last) num, err := parseFile(last)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -67,6 +63,7 @@ func next(last string) (string, error) {
desc = desc + "." desc = desc + "."
} }
width := len(num) width := len(num)
// whaddya doin bro wahh
fmtstr := fmt.Sprintf("%%0%dd.%%smd", width) fmtstr := fmt.Sprintf("%%0%dd.%%smd", width)
n := fmt.Sprintf(fmtstr, i+1, desc) n := fmt.Sprintf(fmtstr, i+1, desc)
return n, nil return n, nil
@ -74,13 +71,11 @@ func next(last string) (string, error) {
func Next(args []string) { func Next(args []string) {
opts := parseArgs(args) opts := parseArgs(args)
fmt.Println(opts)
l, err := last() l, err := last()
if err != nil { if err != nil {
fmt.Printf("err: %v\n", err) fmt.Printf("err: %v\n", err)
} }
n, err := next(l) n, err := next(l, opts.Descriptor.Val)
if err != nil { if err != nil {
fmt.Printf("err: %v\n", err) fmt.Printf("err: %v\n", err)
} }