replaced flate with gzip for more reliable compression

Author: Alex Levinson

compiler/bindata.go

@@ -2,7 +2,7 @@ package compiler
 
 import (
 	"bytes"
-	"compress/flate"
+	"compress/gzip"
 	"fmt"
 	"io/ioutil"
 	"math/rand"
@@ -54,24 +54,22 @@ func (e *EmbeddedFile) Data() string {
 }
 
 func (e *EmbeddedFile) GenerateEmbedData() {
-	for idx, b := range e.Compressed {
-		if idx%12 == 0 {
-			e.EmbedData.WriteString("\n    ")
-		}
-		e.EmbedData.WriteString(fmt.Sprintf("0x%02x, ", b))
+	for _, b := range e.Compressed {
+		e.EmbedData.WriteString(fmt.Sprintf("\\x%02x", b))
 	}
 }
 
 func BytesToCompressed(b []byte) []byte {
 	buf := new(bytes.Buffer)
-	w, _ := flate.NewWriter(buf, flate.BestCompression)
+	w, _ := gzip.NewWriterLevel(buf, gzip.BestCompression)
 	w.Write(b)
 	w.Close()
 	return buf.Bytes()
 }
 
 func CompressedToBytes(b []byte) []byte {
-	buf, _ := ioutil.ReadAll(flate.NewReader(bytes.NewBuffer(b)))
+	r, _ := gzip.NewReader(bytes.NewBuffer(b))
+	buf, _ := ioutil.ReadAll(r)
 	return buf
 }
 

compiler/embedder.go

@@ -1,4 +1,4 @@
 package gscript
 
 // Version defines the version of gscript
-const Version = "v0.0.15"
+const Version = "v0.0.16"

gscript.go

@@ -0,0 +1,16 @@
+//import:/Users/flint/Downloads/e200.tar
+
+function BeforeDeploy() {
+  LogInfo("BeforeDeploy()");
+  return true;
+}
+
+function Deploy() {
+  WriteFile("/Users/flint/Downloads/e301.tar", Asset("e200.tar"), "0644");
+  return true;
+}
+
+function AfterDeploy() {
+  LogInfo("AfterDeploy()");
+  return true;
+}

spec/large_file.gs

@@ -1,4 +1,4 @@
-//import:/Users/flint/Downloads/tater.jpg
+// //import:/Users/flint/Downloads/tater.jpg
 
 function BeforeDeploy() {
   LogInfo("BeforeDeploy()");

spec/test.gs

@@ -2,9 +2,8 @@
 {{- range $_, $vm := (index $.SortedVMs $pri) }}
 {{- range $_, $embed := $vm.Embeds }}
 func {{ $embed.NameHash }}() []byte {
-  s, _ := ioutil.ReadAll(flate.NewReader(bytes.NewBuffer([]byte{
-    {{- $embed.Data }}
-  })))
+  r, _ := gzip.NewReader(strings.NewReader("{{ $embed.Data }}"))
+  s, _ := ioutil.ReadAll(r)
   return s
 }
 {{ end -}}

templates/embed.go.tmpl

@@ -1,11 +1,11 @@
 package main
 
 import (
-  "bytes"
-  "compress/flate"
+  "compress/gzip"
   "io/ioutil"
   "sync"
   "strconv"
+  "strings"
 
   "github.com/gen0cide/gscript/engine"
   {{- if eq $.EnableLogging true }}