Add merge command.

[lightning.git] / gob.go

diff --git a/gob.go b/gob.go
index 7619ebd44f2b6b5fb351b59e534809de6056b040..2fb061c5b1fc1770982dbeb9400d35b33ef562fb 100644 (file)
--- a/gob.go
+++ b/gob.go
@@ -28,16 +28,27 @@ type LibraryEntry struct {
 }
 
 func ReadCompactGenomes(rdr io.Reader) ([]CompactGenome, error) {
-       dec := gob.NewDecoder(bufio.NewReaderSize(rdr, 1<<26))
        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
        }
 }