From 77131546eee9cec0c756f3c61a78b953cdfadcff Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 11 Apr 2016 08:24:03 -0400
Subject: [PATCH] helper: Refactored data I/O

---
 src/helper.cpp | 17 ++++++++++++-----
 src/timew.h    |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/helper.cpp b/src/helper.cpp
index 2913ac06..af788928 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -176,20 +176,27 @@ Timeline createTimelineFromData (
   // TODO Add filtered exclusions.
 
   // Add filtered intervals.
-  for (auto& interval : database.getAllIntervals ())
+  for (auto& line : database.allLines ())
+  {
+    Interval interval;
+    interval.initialize (line);
+
     if (intervalMatchesFilter (interval, filter))
       t.include (interval);
+  }
 
   return t;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-Interval getLatestInterval (
-  Timeline& timeline,
-  Database& database,
-  const Filter& filter)
+Interval getLatestInterval (Database& database)
 {
   Interval i;
+  auto lastLine = database.lastLine ();
+  if (lastLine != "")
+    i.initialize (lastLine);
+
+  // TODO Mask i against timeline.
 
   return i;
 }
diff --git a/src/timew.h b/src/timew.h
index ad708830..77f2eb0e 100644
--- a/src/timew.h
+++ b/src/timew.h
@@ -50,7 +50,7 @@ std::string intervalSummarize (const Rules&, const Interval&);
 void expandIntervalHint (const std::string&, std::string&, std::string&);
 Filter createFilterFromCLI (const CLI&);
 Timeline createTimelineFromData (const Rules&, Database&, const Filter&);
-Interval getLatestInterval (Timeline&, Database&, const Filter&);
+Interval getLatestInterval (Database&);
 bool intervalMatchesFilter (const Interval&, const Filter&);
 std::string jsonFromIntervals (const std::vector <Interval>&);