Improve error message.

[lightning.git] / gob.go

diff --git a/gob.go b/gob.go
index d7ac24e48fbcdd5aa26c8bed50dc3e6148ccf79e..2fb061c5b1fc1770982dbeb9400d35b33ef562fb 100644 (file)
--- a/gob.go
+++ b/gob.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+       "bufio"
        "encoding/gob"
        "io"
        _ "net/http/pprof"
@@ -13,27 +14,41 @@ type CompactGenome struct {
        Variants []tileVariantID
 }
 
+type TileVariant struct {
+       Tag      tagID
+       Variant  tileVariantID
+       Blake2b  [blake2b.Size256]byte
+       Sequence []byte
+}
+
 type LibraryEntry struct {
        TagSet         [][]byte
        CompactGenomes []CompactGenome
-       TileVariants   []struct {
-               Tag      tagID
-               Blake2b  [blake2b.Size]byte
-               Sequence []byte
-       }
+       TileVariants   []TileVariant
 }
 
 func ReadCompactGenomes(rdr io.Reader) ([]CompactGenome, error) {
-       dec := gob.NewDecoder(rdr)
        var ret []CompactGenome
-       for {
+       err := DecodeLibrary(rdr, func(ent *LibraryEntry) error {
+               ret = append(ret, ent.CompactGenomes...)
+               return nil
+       })
+       return ret, err
+}
+
+func DecodeLibrary(rdr io.Reader, cb func(*LibraryEntry) error) error {
+       dec := gob.NewDecoder(bufio.NewReaderSize(rdr, 1<<26))
+       var err error
+       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 nil
+       } else {
+               return err
        }
 }