Merge pull request #15 from tmck-code/compress-pokemon-data

Compress all pokemon cowfile data

pokesay.go

@@ -27,17 +27,6 @@ func check(e error) {
 	}
 }
 
-type PokemonEntry struct {
-	Name       string
-	Data       []byte
-	Categories []string
-}
-
-type PokemonEntryMap struct {
-	Categories map[string][]PokemonEntry
-	Total int
-}
-
 func printSpeechBubbleLine(line string, width int) {
 	if len(line) > width {
 		fmt.Println("|", line)
@@ -88,7 +77,7 @@ func printPokemon(list pokedex.PokemonEntryMap) {
 	for _, pokemon := range list.Categories {
 		if idx == chosenCategory {
 			chosenPokemon := pokemon[randomInt(len(pokemon))]
-			binary.Write(os.Stdout, binary.LittleEndian, chosenPokemon.Data)
+			binary.Write(os.Stdout, binary.LittleEndian, pokedex.Decompress(chosenPokemon.Data))
 			fmt.Printf("choice: %s / categories: %s\n", chosenPokemon.Name, chosenPokemon.Categories)
 		}
 		idx += 1

src/pokedex.go

@@ -32,13 +32,13 @@ func findFiles(dirpath string, ext string, skip []string) pokedex.PokemonEntryMa
 			pokemonCategories := createCategories(fpath)
 
 			for _, c := range pokemonCategories {
-				p := pokedex.PokemonEntry{Name: createName(fpath), Categories: createCategories(fpath), Data: data}
+				p := pokedex.NewPokemonEntry(data, createName(fpath), createCategories(fpath))
 				if val, ok := categories.Categories[c]; ok {
-					val = append(val, p)
+					val = append(val, *p)
 				} else {
-					categories.Categories[c] = []pokedex.PokemonEntry{p}
+					categories.Categories[c] = []pokedex.PokemonEntry{*p}
 				}
-				categories.Categories[c] = append(categories.Categories[c], p)
+				categories.Categories[c] = append(categories.Categories[c], *p)
 			}
 		}
 		return err

src/pokedex/entries.go

@@ -5,6 +5,7 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/gob"
+	"compress/gzip"
 	"log"
 )
 
@@ -25,6 +26,41 @@ type PokemonEntryMap struct {
 	NCategories int
 }
 
+func NewPokemonEntry(data []byte, name string, categories []string) *PokemonEntry {
+	return &PokemonEntry{
+		Name: name,
+		Categories: categories,
+		Data: Compress(data),
+	}
+}
+
+func Compress(data []byte) []byte {
+	var b bytes.Buffer
+	gz := gzip.NewWriter(&b)
+
+	_, err := gz.Write(data)
+	check(err)
+
+	err = gz.Close()
+	check(err)
+
+	return b.Bytes()
+}
+
+func Decompress(data []byte) []byte {
+	buf := bytes.NewBuffer(data)
+
+	reader, err := gzip.NewReader(buf)
+	check(err)
+
+	var resB bytes.Buffer
+
+	_, err = resB.ReadFrom(reader)
+	check(err)
+
+	return resB.Bytes()
+}
+
 func WriteToFile(categories PokemonEntryMap, fpath string) {
 	ostream, err := os.Create(fpath)
 	check(err)