Skip to content
Snippets Groups Projects
Commit 0448bb99 authored by Josh Brooks's avatar Josh Brooks
Browse files

Add some logging

parent ef50518a
No related branches found
No related tags found
2 merge requests!67fix for latest client release,!61Add emoji sanitizater
......@@ -11,6 +11,7 @@ import (
"encoding/json"
"github.com/forPelevin/gomoji"
"github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman"
cEmoji "gitlab.com/elixxir/client/v4/emoji"
"strings"
)
......@@ -54,9 +55,13 @@ func (s *Set) SanitizeEmojiMartSet(frontendEmojiSetJson []byte) ([]byte, error)
"failed to unmarshal emoji-mart set JSON: %+v", err)
}
jww.INFO.Printf("Finding incompatible emojis...")
// Find all incompatible emojis in the front end set
emojisToRemove := s.findIncompatibleEmojis(&frontEndEmojiSet)
jww.INFO.Printf("Removing incompatible emojis...")
// Remove all incompatible emojis from the set
removeIncompatibleEmojis(&frontEndEmojiSet, emojisToRemove)
......
......@@ -57,6 +57,8 @@ var sanitizeEmojis = &cobra.Command{
initLog(viper.GetInt(logFileFlag), logFile)
}
jww.INFO.Printf("Retrieving emoji-mart JSON file...")
// Retrieve emoji-mart file from URL
resp, err := http.Get(emojiMartUrl)
if err != nil {
......@@ -64,6 +66,8 @@ var sanitizeEmojis = &cobra.Command{
"Failed to retrieve emoji-mart JSON from URL: %+v", err)
}
jww.INFO.Printf("Reading emoji-mart JSON file into bytes...")
// Read HTTP response into byte slice
var buf bytes.Buffer
_, err = buf.ReadFrom(resp.Body)
......@@ -75,6 +79,8 @@ var sanitizeEmojis = &cobra.Command{
}
emojiMartJson := buf.Bytes()
jww.INFO.Printf("Sanitizing emoji-mart JSON...")
// Sanitize the JSON file
backendSet := NewSet()
sanitizedJSON, err := backendSet.SanitizeEmojiMartSet(emojiMartJson)
......@@ -82,6 +88,8 @@ var sanitizeEmojis = &cobra.Command{
jww.FATAL.Panicf("Failed to sanitize emoji-mart list: %+v", err)
}
jww.INFO.Printf("Outputting sanitized emoji JSON to file...")
// Write sanitized JSON to file
sanitizedOutputFilePath := viper.GetString(sanitizedOutputFlag)
err = utils.WriteFileDef(sanitizedOutputFilePath, sanitizedJSON)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment