Update for latest msgpack4nim

* jangko/msgpack4nim#18 And update both msgpack4nim and cligen.
bio-nim · May 22, 2018 · 2aefcd6 · 2aefcd6
1 parent 89bd9af
commit 2aefcd6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,22 +1,28 @@
 [submodule "repos/nim-DAZZ_DB"]
 	path = repos/nim-DAZZ_DB
 	url = https://github.com/bio-nim/nim-DAZZ_DB
+	ignore=dirty
 	branch = dev
 [submodule "repos/nim-htslib"]
 	path = repos/nim-htslib
 	url = https://github.com/bio-nim/nim-htslib
+	ignore=dirty
 [submodule "repos/nim-DALIGNER"]
 	path = repos/nim-DALIGNER
 	url = https://github.com/bio-nim/nim-DALIGNER
+	ignore=dirty
 	branch = dev
 [submodule "repos/nim-heap"]
 	path = repos/nim-heap
 	url = https://github.com/bio-nim/nim-heap
+	ignore=dirty
 [submodule "repos/cligen"]
 	path = repos/cligen
 	url = https://github.com/c-blake/cligen
+	ignore=dirty
 	branch = master
 [submodule "repos/msgpack4nim"]
 	path = repos/msgpack4nim
 	url = https://github.com/jangko/msgpack4nim
+	ignore=dirty
 	#branch = master
diff --git a/repos/cligen b/repos/cligen
diff --git a/repos/msgpack4nim b/repos/msgpack4nim
diff --git a/src/falcon/rr_hctg_track.nim b/src/falcon/rr_hctg_track.nim
@@ -1,6 +1,7 @@
 # vim: sw=2 ts=2 sts=2 tw=80 et:
 # Nim re-write of FALCON_unzip/falcon_unzip/rr_hctg_track.py
 import "../msgpack4nim/msgpack4nim.nim"
+import "../msgpack4nim/msgpack4collection.nim"
 from "../nim-heap/binaryheap" import nil
 from sys import log
 
@@ -499,8 +500,10 @@ proc run_stage2*(
       let infile = streams.newFileStream(fn_rtn, system.fmRead)
       defer:
         infile.close()
+      var msgss = msgpack4nim.initMsgStream()
+      msgss.data = infile.readAll()
       var res: mytable
-      msgpack4nim.unpack(infile, res)
+      msgpack4nim.unpack(msgss, res)
       log("  Updating bread_to_areads table with ", len(res), " breads.")
       for k,v in res.pairs:
         if not bread_to_areads.contains(k):