Gzip gob files.

[lightning.git] / gob.go

diff --git a/gob.go b/gob.go
index 9426af9871e0514ed06d606c0a638e2ac003e90a..39b15ab4aba904ba02c67bf06fddee15f0f4bab8 100644 (file)
--- a/gob.go
+++ b/gob.go
@@ -1,8 +1,11 @@
 package main
 
 import (
+       "bufio"
+       "compress/gzip"
        "encoding/gob"
        "io"
+       "io/ioutil"
        _ "net/http/pprof"
 
        "golang.org/x/crypto/blake2b"
@@ -13,29 +16,53 @@ type CompactGenome struct {
        Variants []tileVariantID
 }
 
+type CompactSequence struct {
+       Name          string
+       TileSequences map[string][]tileLibRef
+}
+
 type TileVariant struct {
        Tag      tagID
+       Variant  tileVariantID
        Blake2b  [blake2b.Size256]byte
        Sequence []byte
 }
 
 type LibraryEntry struct {
-       TagSet         [][]byte
-       CompactGenomes []CompactGenome
-       TileVariants   []TileVariant
+       TagSet           [][]byte
+       CompactGenomes   []CompactGenome
+       CompactSequences []CompactSequence
+       TileVariants     []TileVariant
 }
 
-func ReadCompactGenomes(rdr io.Reader) ([]CompactGenome, error) {
-       dec := gob.NewDecoder(rdr)
+func ReadCompactGenomes(rdr io.Reader, gz bool) ([]CompactGenome, error) {
        var ret []CompactGenome
-       for {
+       err := DecodeLibrary(rdr, gz, func(ent *LibraryEntry) error {
+               ret = append(ret, ent.CompactGenomes...)
+               return nil
+       })
+       return ret, err
+}
+
+func DecodeLibrary(rdr io.Reader, gz bool, cb func(*LibraryEntry) error) error {
+       zrdr := ioutil.NopCloser(rdr)
+       var err error
+       if gz {
+               zrdr, err = gzip.NewReader(bufio.NewReaderSize(rdr, 1<<26))
+               if err != nil {
+                       return err
+               }
+       }
+       dec := gob.NewDecoder(zrdr)
+       for err == nil {
                var ent LibraryEntry
-               err := dec.Decode(&ent)
-               if err == io.EOF {
-                       return ret, nil
-               } else if err != nil {
-                       return nil, err
+               err = dec.Decode(&ent)
+               if err == nil {
+                       err = cb(&ent)
                }
-               ret = append(ret, ent.CompactGenomes...)
        }
+       if err != io.EOF {
+               return err
+       }
+       return zrdr.Close()
 }