[PATCH] readahead: scan tracklist properly

[PATCH] readahead: scan tracklist properly

[Eric Wong]

Ensure we skip the current track when performing readahead,
otherwise it was getting stuck on the current track.
---
 bin/dtas-readahead | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/bin/dtas-readahead b/bin/dtas-readahead
index 3eedd86..a9d5733 100755
--- a/bin/dtas-readahead
+++ b/bin/dtas-readahead
@@ -157,11 +157,12 @@ def do_open(path)
   t0 = DTAS.now
   fp = nil
   cur = YAML.load(c.req('current'))
+  current_track = nil
   while @todo_ra > 0 && fp.nil?
     if current = cur['current']
       track = current['infile']
       break unless track.kind_of?(String)
-      track.freeze
+      current_track = track.freeze
       fp = work[track] ||= do_open(track)
       cur_pid = current['pid']
       if fp
@@ -181,6 +182,7 @@ def do_open(path)
     queue = YAML.load(c.req('queue cat'))
     while @todo_ra > 0 && track = queue.shift
       next unless track.kind_of?(String)
+      next if current_track == track.freeze
       fp = nil
       begin
         fp = work[track] ||= do_open(track)
@@ -199,12 +201,14 @@ def do_open(path)
     while @todo_ra > 0 && idx && (cid = ids[idx])
       fp = nil
       track = c.req("tl get #{cid}").sub!(/\A1 \d+=/, '').freeze
-      begin
-        fp = work[track] ||= do_open(track)
-      rescue SystemCallError
+      if current_track != track
+        begin
+          fp = work[track] ||= do_open(track)
+        rescue SystemCallError
+        end
+        fp = do_ra(fp, 0, w) if fp
+        work.delete_if { |_, io| io.closed? }
       end
-      fp = do_ra(fp, 0, w) if fp
-      work.delete_if { |_, io| io.closed? }
       if @todo_ra > 0 && fp.nil? && ids[idx += 1].nil?
         idx = repeat == 'true' ? 0 : nil
       end