diff options
Diffstat (limited to 'pkg/model')
| -rw-r--r-- | pkg/model/card.go | 5 | ||||
| -rw-r--r-- | pkg/model/model.go | 7 | ||||
| -rw-r--r-- | pkg/model/types.go | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/pkg/model/card.go b/pkg/model/card.go index 6ed666b..5c9de76 100644 --- a/pkg/model/card.go +++ b/pkg/model/card.go @@ -11,18 +11,15 @@ func ParseCardLine(s string) (prefix string, number uint64, bonus string) { if raw == "" { return "", 0, "" } - // number = last run of digits if m := regexp.MustCompile(`(\d{3,})\D*$`).FindStringSubmatch(raw); len(m) == 2 { if n, err := strconv.ParseUint(m[1], 10, 64); err == nil { number = n } } - // tokens (letters with '-', '/', apostrophes) tokRe := regexp.MustCompile(`[A-Za-z][A-Za-z'/-]*`) toks := tokRe.FindAllString(s, -1) - // prefix = first 2–3 letter all-caps-ish token for _, t := range toks { u := strings.ToUpper(t) if len(u) >= 2 && len(u) <= 3 && regexp.MustCompile(`^[A-Z]{2,3}$`).MatchString(u) { @@ -30,7 +27,7 @@ func ParseCardLine(s string) (prefix string, number uint64, bonus string) { break } } - // bonus = all tokens except prefix + words := []string{} for _, t := range toks { if strings.ToUpper(t) == prefix { diff --git a/pkg/model/model.go b/pkg/model/model.go deleted file mode 100644 index 0a7e026..0000000 --- a/pkg/model/model.go +++ /dev/null @@ -1,7 +0,0 @@ -package model - - - -type Adapter interface { - Init(string) // inits adapter with filename -}
\ No newline at end of file diff --git a/pkg/model/types.go b/pkg/model/types.go index fd65d46..8b1106d 100644 --- a/pkg/model/types.go +++ b/pkg/model/types.go @@ -33,7 +33,7 @@ func (s *Sex) UnmarshalJSON(b []byte) error { return nil } } - // also accept numbers in JSON + var n int if err := json.Unmarshal(b, &n); err == nil { *s = Sex(n) |