From 39a8b688a9ce7a63c9766e529fa8ffcf76bbdffb Mon Sep 17 00:00:00 2001 From: Matt Drollette Date: Wed, 10 Dec 2014 20:13:32 -0600 Subject: [PATCH] fix unzip --- reseed/service.go | 4 ---- reseed/utils.go | 16 +++++++++++----- 2 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 reseed/service.go diff --git a/reseed/service.go b/reseed/service.go deleted file mode 100644 index 4eaca94..0000000 --- a/reseed/service.go +++ /dev/null @@ -1,4 +0,0 @@ -package reseed - -type Su3Provider interface { -} diff --git a/reseed/utils.go b/reseed/utils.go index 52220b7..a526bc2 100644 --- a/reseed/utils.go +++ b/reseed/utils.go @@ -3,6 +3,7 @@ package reseed import ( "archive/zip" "bytes" + "io/ioutil" ) func zipSeeds(seeds Seed) ([]byte, error) { @@ -31,22 +32,27 @@ func zipSeeds(seeds Seed) ([]byte, error) { return buf.Bytes(), nil } -func uzipSeeds(c []byte) ([]byte, error) { +func uzipSeeds(c []byte) (Seed, error) { input := bytes.NewReader(c) zipReader, err := zip.NewReader(input, int64(len(c))) if nil != err { return nil, err } - var uncompressed []byte + var seeds Seed for _, f := range zipReader.File { rc, err := f.Open() if err != nil { - panic(err) + return nil, err } - uncompressed = append(uncompressed, []byte(f.Name+"\n")...) + data, err := ioutil.ReadAll(rc) rc.Close() + if nil != err { + return nil, err + } + + seeds = append(seeds, routerInfo{Name: f.Name, Data: data}) } - return uncompressed, nil + return seeds, nil }