From 94c9d40eeef02cc751864a44df635444be665b8b Mon Sep 17 00:00:00 2001 From: Vincent Batts Date: Mon, 22 Oct 2018 19:01:35 +0100 Subject: [PATCH] this function is in the main project now --- docker-ex/main.go | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/docker-ex/main.go b/docker-ex/main.go index 1144112..8ab706f 100644 --- a/docker-ex/main.go +++ b/docker-ex/main.go @@ -1,7 +1,6 @@ package main import ( - "encoding/hex" "encoding/json" "flag" "fmt" @@ -10,7 +9,7 @@ import ( "os/exec" "strings" - esum "github.com/emojisum/emojisum/emoji" + "github.com/emojisum/emojisum/emoji" ) var ( @@ -58,7 +57,7 @@ func main() { if strings.Contains(it.Digest, ":") { chunks := strings.SplitN(it.Digest, ":", 2) h = chunks[0] - d, err = emojiFromHexString(chunks[1]) + d, err = emoji.FromHexString(chunks[1]) if err != nil { fmt.Fprintln(os.Stderr, err) os.Exit(1) @@ -80,25 +79,6 @@ func main() { cmd.Run() } -func emojiFromHexString(s string) (string, error) { - d, err := hex.DecodeString(s) - if err != nil { - return "", err - } - - var ret string - for _, b := range d { - for _, e := range esum.Map(b) { - // use the first colon notation word and continue - if esum.IsCodepoint(e) { - ret = ret + esum.CodepointToUnicode(e) - break - } - } - } - return ret, nil -} - type ImageThing struct { Repo string ID string