Change database schema

Start and end times, and leading silence duration, are all available
through SQL.

1 files changed, 31 insertions, 12 deletions

diff --git a/midi-dump.hs b/midi-dump.hs
index e950653..c47e8bf 100644
--- a/midi-dump.hs
+++ b/midi-dump.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE FlexibleContexts  #-}
+{-# LANGUAGE FlexibleInstances  #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 import           AlsaSeq
@@ -40,6 +41,8 @@ data Recording = Recording {
   _recordingEvents :: RecordedEvents
 }
 
+data FinishedRecording = FinishedRecording Recording TimeSpec
+
 recordEvents :: Recording -> RecordedEvents -> Recording
 recordEvents (Recording s orig) new = Recording s (new ++ orig)
 
@@ -53,7 +56,7 @@ data LoopState = LoopState {
 initializeState now = LoopState False Set.empty (emptyRecording now) now
 
 data LoopEnv = LoopEnv {
-  _saver         :: Chan Recording,
+  _saver         :: Chan FinishedRecording,
   _sqlite        :: Connection,
   _startTime     :: TimeSpec,
   _startTimeReal :: TimeSpec,
@@ -73,6 +76,16 @@ getAbsTime = do
   now <- liftIO $ getTime Monotonic
   return $ now - startTime + startTimeReal
 
+createTable = fromString $ concat
+  ["CREATE TABLE IF NOT EXISTS axis_input",
+  " (id INTEGER PRIMARY KEY,",
+  " start_sec INTEGER,",
+  " start_nsec INTEGER,",
+  " end_sec INTEGER,",
+  " end_nsec INTEGER,",
+  " leading_silence INTEGER,",
+  " midi BLOB)"]
+
 main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
   cmdlineAlsaConnect h public
 
@@ -81,7 +94,7 @@ main' = withAlsaInit $ \h public private q publicAddr privateAddr -> do
   startTimeReal <- getTime Realtime
 
   sqlite <- open "test.db"
-  execute_ sqlite "CREATE TABLE IF NOT EXISTS axis_input (id INTEGER PRIMARY KEY, sec INTEGER, nsec INTEGER, silence INTEGER, midi BLOB)"
+  execute_ sqlite createTable
   saver <- startSaver sqlite
   lineReader <- startLineReader
 
@@ -134,16 +147,23 @@ startLineReader = do
   thread <- liftIO $ forkIO (forever $ getLine >>= putMVar mv)
   return mv
 
-data Chunk = Chunk Int64 Int64 Int64 {- duration of silence in nanoseconds -} BS.ByteString
+data Chunk = Chunk Int64 Int64 Int64 Int64 Int64 BS.ByteString
 instance FromRow Chunk where
-  fromRow = Chunk <$> field <*> field <*> field <*> field
+  fromRow = Chunk <$> field <*> field <*> field <*> field <*> field <*> field
 instance ToRow Chunk where
-  toRow (Chunk s ns b pre) = toRow (s, ns, b, pre)
+  toRow (Chunk s ns s' ns' d m) = toRow (s, ns, s', ns', d, m)
+
+data Chunkable = MkChunk FinishedRecording TimeSpec
+instance ToRow Chunkable where
+  toRow (MkChunk reco ts) = toRow (s, ns, s', ns', leadingSilence :: Int64, pack $ show midi)
+    where
+      (FinishedRecording (Recording start@(TimeSpec s ns) midi) (TimeSpec s' ns')) = reco
+      leadingSilence = fromIntegral $ timeSpecAsNanoSecs $ ts - start
 
 saveMidi recording = do
   saver <- asks _saver
-  (TimeSpec s ns) <- gets lastTick
-  liftIO $ writeChan saver recording
+  end <- gets lastTick
+  liftIO $ writeChan saver $ FinishedRecording recording end
 
 startSaver sqlite = do
   chan <- liftIO newChan
@@ -151,11 +171,10 @@ startSaver sqlite = do
   return chan
   where
     saver chan = forever $ do
-      (Recording silenceStart events) <- readChan chan
-      let bytes = pack $ show events
-          ts@(TimeSpec s ns) = fst $ head events
-          silence = fromIntegral $ timeSpecAsNanoSecs $ ts - silenceStart
-      liftIO $ execute sqlite "INSERT INTO axis_input (sec, nsec, silence, midi) VALUES (?,?,?,?)" (Chunk s ns silence bytes)
+      reco@(FinishedRecording (Recording _ events) _) <- readChan chan
+      let start = fst $ head events
+          sqlInsert = "INSERT INTO axis_input (start_sec, start_nsec, end_sec, end_nsec, leading_silence, midi) VALUES (?,?,?,?,?,?)"
+      liftIO $ execute sqlite sqlInsert (MkChunk reco start)
       return ()