Refactor
Signed-off-by: Oliver Davies <oliver@oliverdavies.uk>
This commit is contained in:
parent
a4901b9ae7
commit
d27eca0a07
13 changed files with 71 additions and 57 deletions
19
cmd/view.go
19
cmd/view.go
|
@ -9,7 +9,8 @@ import (
|
|||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
"code.oliverdavies.uk/opdavies/cmd-zet/internal/lib"
|
||||
"code.oliverdavies.uk/opdavies/cmd-zet/internal/fzf"
|
||||
"code.oliverdavies.uk/opdavies/cmd-zet/internal/zet"
|
||||
)
|
||||
|
||||
var viewCmd = &cobra.Command{
|
||||
|
@ -29,32 +30,32 @@ zet view|v latest
|
|||
var query string
|
||||
|
||||
if args[0] == "latest" {
|
||||
id = lib.GetLatestZet()
|
||||
id = zet.GetLatestZet()
|
||||
|
||||
fmt.Println(lib.ViewZet(id))
|
||||
fmt.Println(zet.ViewZet(id))
|
||||
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
if id, err := strconv.Atoi(args[0]); err == nil {
|
||||
fmt.Println(lib.ViewZet(id))
|
||||
fmt.Println(zet.ViewZet(id))
|
||||
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
query = args[0]
|
||||
|
||||
ids := lib.SearchZets(query)
|
||||
ids := zet.SearchZets(query)
|
||||
|
||||
if len(ids) == 1 {
|
||||
fmt.Println(lib.ViewZet(ids[0]))
|
||||
fmt.Println(zet.ViewZet(ids[0]))
|
||||
|
||||
os.Exit(0)
|
||||
}
|
||||
|
||||
zets := lib.ParseZetList(ids)
|
||||
zets := zet.ParseZetList(ids)
|
||||
|
||||
selected, err := lib.SelectWithFzf(zets)
|
||||
selected, err := fzf.SelectWithFzf(zets)
|
||||
|
||||
if err != nil {
|
||||
log.Fatalf("No zet selected.")
|
||||
|
@ -68,6 +69,6 @@ zet view|v latest
|
|||
log.Fatal(err)
|
||||
}
|
||||
|
||||
fmt.Println(lib.ViewZet(id))
|
||||
fmt.Println(zet.ViewZet(id))
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue