Merge branch 'hotfix/seek'

CiaranOMara · Jan 22, 2019 · ce440c9 · ce440c9
2 parents 2a5f172 + be373cc
commit ce440c9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/reader.jl b/src/reader.jl
@@ -13,12 +13,12 @@ end
 
 
 function seekNextRecord(io::IO) :: Nothing
-    seekstart(io)
 
     pos = position(io)
+    initial = pos == 0 ? -1 : pos # Note: Allows for the fist line of headerless bedGraph file to be read.
     line = ""
 
-    while !eof(io) && !isLikeRecord(line)
+    while !eof(io) && (!isLikeRecord(line) || pos == initial)
         pos = position(io)
         line = readline(io)
     end
@@ -57,6 +57,7 @@ function readRecord(io::IO) :: Union{Nothing, Record}
 end
 
 function readRecords(io::IO) :: Vector{Record}
+    seekstart(io)
     seekNextRecord(io)
 
     records = Vector{Record}()

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -81,9 +81,17 @@ end
 
 # Check things for headerless Bag.files.
 open(Bag.file_headerless, "r") do io
+
+	# Check that the first record of a headerless bedGraph file can be sought.
     Bedgraph.seekNextRecord(io)
     @test position(io) == 0
-    @test readline(io) == Bag.line1
+    @test readline(io) == Bag.line1 # IO position is at the start of line 2.
+
+	# Check behaviour of consecutive calls to Bedgraph.seekNextRecord(io).
+	Bedgraph.seekNextRecord(io) # Skip to start of line 3.
+	Bedgraph.seekNextRecord(io) # Skip to start of line 4.
+	@test readline(io) == Bag.line4
+
 end