From 7d3df6adce65e8840ef651a8a02a34a1a02083aa Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sun, 24 Jan 2016 07:04:53 +0000
Subject: Revert "Broken existentially quantified printer config"

This reverts commit 6434397a3d103547b563ada27fd64c38cb05e1f0.
---
 server/src/Thermoprint/Server.hs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

(limited to 'server/src/Thermoprint/Server.hs')

diff --git a/server/src/Thermoprint/Server.hs b/server/src/Thermoprint/Server.hs
index 4e8d962..39bf0a1 100644
--- a/server/src/Thermoprint/Server.hs
+++ b/server/src/Thermoprint/Server.hs
@@ -3,11 +3,10 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeOperators     #-}
 {-# LANGUAGE FlexibleContexts  #-}
-{-# LANGUAGE ViewPatterns      #-}
 
 module Thermoprint.Server
        ( thermoprintServer
-       , Config(..), withPrinters
+       , Config(..)
        , module Data.Default.Class
        , module Servant.Server.Internal.Enter
        , module Thermoprint.Server.Printer
@@ -20,8 +19,7 @@ import Data.Map (Map)
 import qualified Data.Map as Map
 
 import Data.Maybe (maybe)
-import Data.Foldable (mapM_, forM_, foldlM)
-import Data.Monoid
+import Data.Foldable (mapM_, forM_)
 
 import Control.Monad.Trans.Resource
 import Control.Monad.Trans.Control
@@ -29,8 +27,6 @@ import Control.Monad.Logger
 import Control.Monad.Reader
 import Control.Monad.IO.Class
 
-import Control.Monad.Writer
-
 import Control.Concurrent
        
 import Data.Text (Text)
@@ -66,9 +62,9 @@ instance Default Config where
 
 
 thermoprintServer :: ( MonadLoggerIO m
-                     , MonadReader ConnectionPool m
-                     , MonadResource m
+                     , MonadIO m
                      , MonadBaseControl IO m
+                     , MonadReader ConnectionPool m
                      ) => (m :~> IO) -- ^ 'dyre' controls the base of the monad-transformer-stack ('IO') but we let the user specify the rest of it. Therefore we require a specification of how to enter the stack.
                      -> Config -> IO ()
 -- ^ Run the server
@@ -83,12 +79,3 @@ thermoprintServer io = Dyre.wrapMain $ Dyre.defaultParams
         mapM_ ($(logWarnS) "DB") =<< runSqlPool (runMigrationSilent migrateAll) =<< ask
         forM_ printers $ liftBaseDiscard forkIO . runPrinter
         liftIO . Warp.runSettings warpSettings . serve thermoprintAPI . flip enter API.thermoprintServer =<< handlerNat printers
-
-withPrinters :: MonadResource m => Config -> [PrinterSpec] -> m Config
--- ^ Helper for comfortably specifying a set of 'Printer's
-withPrinters cfg = fmap (\ps -> cfg { printers = printers cfg <> ps }) . foldlM (\ps p -> Map.insert (nextKey ps) <$> printer p <*> pure ps) Map.empty
-  where
-    nextKey :: Map PrinterId a -> PrinterId
-    nextKey (Map.keys -> keys)
-      | null keys = 0
-      | otherwise = succ $ maximum keys
-- 
cgit v1.2.3