Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ŇḞÇ ňöŗṁàḷīʑéɖ ƫë×Ɨ ʍʴɑᴾƿïŋğ #109

Merged
merged 1 commit into from
Jan 13, 2019
Merged

ŇḞÇ ňöŗṁàḷīʑéɖ ƫë×Ɨ ʍʴɑᴾƿïŋğ #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ import (
"os/exec"
"strings"

"golang.org/x/text/unicode/norm"

"github.com/bhutch29/abv/cache"
"github.com/bhutch29/abv/config"
"github.com/bhutch29/abv/model"
Expand Down Expand Up @@ -141,11 +143,16 @@ func refreshInventory() error {
fmt.Fprintf(view, "Total Beers: %d Total Varieties: %d\n\n", total, variety)
for _, drink := range inventory {
//TODO: Make this more robust to handle arbitrary length Brand and Name strings
if len(drink.Name) < 30 {
nfcBytes := norm.NFC.Bytes([]byte(drink.Name))
nfcRunes := []rune(string(nfcBytes))
visualLen := len(nfcRunes)
if visualLen < 30 {
fmt.Fprintf(view, "%-4d%-35s%-30s\n", drink.Quantity, drink.Brand, drink.Name)
} else {
fmt.Fprintf(view, "%-4d%-35s%-30s\n", drink.Quantity, drink.Brand, drink.Name[:30])
fmt.Fprintf(view, "%-4s%-35s%-30s\n", "", drink.Name[30:], "")
const wsPad = " " // strings.Repeat(" ", 39)
fmt.Printf("Hello, %8s\n", "pad")
fmt.Fprintf(view, "%-4d%-35s%-30s...\n", drink.Quantity, drink.Brand, string(nfcRunes[:30]))
fmt.Fprintf(view, "%s...%s\n", wsPad, string(nfcRunes[30:]))
}
}
return nil
Expand Down