1 files changed, 18 insertions, 6 deletions

diff --git a/server/src/Thermoprint/Server/API.hs b/server/src/Thermoprint/Server/API.hs
index 6411a70..6a92caf 100644
--- a/server/src/Thermoprint/Server/API.hs
+++ b/server/src/Thermoprint/Server/API.hs
@@ -10,6 +10,9 @@ module Thermoprint.Server.API
 
 import Thermoprint.API hiding (JobId(..), DraftId(..))
 import qualified Thermoprint.API as API (JobId(..), DraftId(..))
+
+import Thermoprint.Server.Printer (Printer(..), Queue(..))
+
 import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Sequence (Seq)
@@ -26,10 +29,14 @@ import Control.Monad.Reader
 import Control.Monad.Trans.Either
 import Control.Monad.IO.Class
 
+import Control.Concurrent.STM
+
 import Control.Monad ((<=<), liftM2)
-import Prelude hiding ((.), id)
+import Prelude hiding ((.), id, mapM)
 import Control.Category
 
+import Data.Traversable (mapM)
+
 import Database.Persist
 import Database.Persist.Sql
 
@@ -37,21 +44,23 @@ type ProtoHandler = ReaderT HandlerInput (LoggingT IO)
 type Handler      = EitherT ServantErr ProtoHandler
 
 -- ^ Runtime configuration of our handlers
-data HandlerInput = HandlerInput { sqlPool :: ConnectionPool -- ^ How to interact with 'persistent' storage
+data HandlerInput = HandlerInput { sqlPool  :: ConnectionPool -- ^ How to interact with 'persistent' storage
+                                 , printers :: Map PrinterId Printer
                                  }
 
 handlerNat :: ( MonadReader ConnectionPool m
               , MonadLoggerIO m
-              ) => m (Handler :~> EitherT ServantErr IO)
+              ) => Map PrinterId Printer -> m (Handler :~> EitherT ServantErr IO)
 -- ^ Servant requires its handlers to be 'EitherT ServantErr IO'
 --
 -- This generates a 'Nat'ural transformation for squashing the monad-transformer-stack we use in our handlers to the monad 'servant-server' wants
-handlerNat = do
+handlerNat printerMap = do
   sqlPool <- ask
   logFunc <- askLoggerIO
   let
     handlerInput = HandlerInput
-      { sqlPool = sqlPool
+      { sqlPool  = sqlPool
+      , printers = printerMap
       }
     protoNat :: ProtoHandler :~> IO
     protoNat = Nat (($ logFunc) . runLoggingT) . runReaderTNat handlerInput
@@ -71,7 +80,10 @@ thermoprintServer = listPrinters
     infixr 9 <||>
 
 listPrinters :: Handler (Map PrinterId PrinterStatus)
-listPrinters = return $ Map.fromList [(1, Available), (7, Available), (3, Available)]
+listPrinters = fmap toStatus <$> (mapM (liftIO . readTVarIO . queue) . printers =<< ask)
+  where
+    toStatus (Queue _ Nothing   _) = Available
+    toStatus (Queue _ (Just id) _) = Busy . castId $ fromSqlKey id
 
 queueJob :: Maybe PrinterId -> Printout -> Handler API.JobId
 queueJob = return undefined