From a502b78c3f35f2cec42494e67afd02ad22b02754 Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Thu, 17 Jan 2013 00:15:09 -0800
Subject: [PATCH] Revert "add error return for (Un)GzipData"

This reverts commit 824371035109225128f8942b64a817838a7c0c25.
---
 weed-fs/src/cmd/weed/volume.go      |  6 ++--
 weed-fs/src/pkg/storage/compress.go | 46 +++++++++++++++++++----------
 weed-fs/src/pkg/storage/needle.go   |  8 ++---
 3 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/weed-fs/src/cmd/weed/volume.go b/weed-fs/src/cmd/weed/volume.go
index 576096dbb..59a5623ea 100644
--- a/weed-fs/src/cmd/weed/volume.go
+++ b/weed-fs/src/cmd/weed/volume.go
@@ -42,7 +42,7 @@ var (
 	store *storage.Store
 )
 
-var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"")
+var fileNameEscaper = strings.NewReplacer("\\","\\\\","\"","\\\"")
 
 func statusHandler(w http.ResponseWriter, r *http.Request) {
 	m := make(map[string]interface{})
@@ -156,9 +156,7 @@ func GetHandler(w http.ResponseWriter, r *http.Request) {
 			if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
 				w.Header().Set("Content-Encoding", "gzip")
 			} else {
-				if n.Data, err = storage.UnGzipData(n.Data); err != nil {
-					debug("lookup error:", err, r.URL.Path)
-				}
+				n.Data = storage.UnGzipData(n.Data)
 			}
 		}
 	}
diff --git a/weed-fs/src/pkg/storage/compress.go b/weed-fs/src/pkg/storage/compress.go
index 35de70600..9df85b4da 100644
--- a/weed-fs/src/pkg/storage/compress.go
+++ b/weed-fs/src/pkg/storage/compress.go
@@ -10,40 +10,54 @@ import (
 
 /*
 * Default more not to gzip since gzip can be done on client side.
- */
+*/
 func IsGzippable(ext, mtype string) bool {
-	if strings.HasPrefix(mtype, "text/") {
-		return true
-	}
-	switch ext {
-	case ".zip", ".rar", ".gz", ".bz2", ".xz":
+    if strings.HasPrefix(mtype, "text/"){
+        return true
+    }
+	if ext == ".zip" {
 		return false
-	case ".pdf", ".txt", ".html", ".css", ".js", ".json":
+	}
+	if ext == ".rar" {
+		return false
+	}
+	if ext == ".gz" {
+		return false
+	}
+	if ext == ".pdf" {
 		return true
 	}
+	if ext == ".css" {
+		return true
+	}
+	if ext == ".js" {
+		return true
+	}
+    if ext == ".json" {
+        return true
+    }
 	if strings.HasPrefix(mtype, "application/") {
-		if strings.HasSuffix(mtype, "xml") ||
-			strings.HasSuffix(mtype, "script") {
+		if strings.HasSuffix(mtype, "xml") {
+			return true
+		}
+		if strings.HasSuffix(mtype, "script") {
 			return true
 		}
 	}
 	return false
 }
-
-func GzipData(input []byte) ([]byte, error) {
+func GzipData(input []byte) []byte {
 	buf := new(bytes.Buffer)
 	w, _ := gzip.NewWriterLevel(buf, flate.BestCompression)
 	if _, err := w.Write(input); err != nil {
 		println("error compressing data:", err)
-		return nil, err
 	}
 	if err := w.Close(); err != nil {
 		println("error closing compressed data:", err)
-		return nil, err
 	}
-	return buf.Bytes(), nil
+	return buf.Bytes()
 }
-func UnGzipData(input []byte) ([]byte, error) {
+func UnGzipData(input []byte) []byte {
 	buf := bytes.NewBuffer(input)
 	r, _ := gzip.NewReader(buf)
 	defer r.Close()
@@ -51,5 +65,5 @@ func UnGzipData(input []byte) ([]byte, error) {
 	if err != nil {
 		println("error uncompressing data:", err)
 	}
-	return output, err
+	return output
 }
diff --git a/weed-fs/src/pkg/storage/needle.go b/weed-fs/src/pkg/storage/needle.go
index 1f778c7ff..867852362 100644
--- a/weed-fs/src/pkg/storage/needle.go
+++ b/weed-fs/src/pkg/storage/needle.go
@@ -12,8 +12,8 @@ import (
 )
 
 const (
-	NeedleHeaderSize   = 16 //should never change this
-	NeedlePaddingSize  = 8
+	NeedleHeaderSize  = 16 //should never change this
+	NeedlePaddingSize = 8
 	NeedleChecksumSize = 4
 )
 
@@ -64,9 +64,7 @@ func NewNeedle(r *http.Request) (n *Needle, fname string, e error) {
 		mtype = contentType
 	}
 	if IsGzippable(ext, mtype) {
-		if data, e = GzipData(data); e != nil {
-			return
-		}
+		data = GzipData(data)
 		n.SetGzipped()
 	}
 	if ext == ".gz" {