printers

5 files changed, 37 insertions, 11 deletions

diff --git a/tprint/src/Instances.hs b/tprint/src/Instances.hs
index cffb8b0..7814bbc 100644
--- a/tprint/src/Instances.hs
+++ b/tprint/src/Instances.hs
@@ -8,7 +8,7 @@ import Data.Time (UTCTime, formatTime, defaultTimeLocale)
 import Text.Show.Pretty (Value, PrettyVal(..), dumpStr)
 import qualified Text.Show.Pretty as PShow (Value(..))
 
-import Thermoprint.Client (Scheme(..), BaseUrl(..), PrinterId(..), JobId(..), DraftId(..), Range(..))
+import Thermoprint.Client (Scheme(..), BaseUrl(..), PrinterId(..), JobId(..), DraftId(..), Range(..), PrinterStatus(..), JobStatus(..), PrintingError(..), EncodingException(..))
 
 instance PrettyVal Scheme
 instance PrettyVal BaseUrl
@@ -23,3 +23,7 @@ instance PrettyVal UTCTime where
 instance PrettyVal Text where
   prettyVal = prettyVal . T.unpack
 
+instance PrettyVal PrinterStatus
+instance PrettyVal JobStatus
+instance PrettyVal PrintingError
+instance PrettyVal EncodingException
diff --git a/tprint/src/Main.hs b/tprint/src/Main.hs
index cd6e68b..a937181 100644
--- a/tprint/src/Main.hs
+++ b/tprint/src/Main.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE ViewPatterns #-}
 
 import Data.Map (Map)
 import qualified Data.Map as Map
@@ -6,10 +7,15 @@ import Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import Data.Text (Text)
 import qualified Data.Text as T
+import qualified Data.ByteString.Lazy.Char8 as Lazy (ByteString)
+import qualified Data.ByteString.Lazy.Char8 as LCBS
+
+import Control.Monad
 
 import Control.Monad
 
 import Text.Show.Pretty (dumpStr)
+import Data.Aeson.Encode.Pretty (encodePretty)
 
 import System.IO
 
@@ -19,9 +25,22 @@ import Options
 import Debug.Trace
 
 main :: IO ()
-main = withArgs (tprint <=< dumpOpts)
+main = withArgs (main' <=< dumpOpts)
   where
     dumpOpts c@(TPrint{..}) = c <$ when (dumpOptions) (hPutStrLn stderr $ dumpStr c)
-
-tprint :: TPrint -> IO ()
-tprint = undefined
+    main' config@(TPrint{..}) = withOutput config $ tprint config (mkClient' baseUrl)
+
+withOutput :: TPrint -> (Handle -> IO a) -> IO a
+withOutput TPrint{..} a
+  | (_, WriteFile f) <- output = withFile f WriteMode a
+  | otherwise = a stdout
+
+tprint :: TPrint -> Client IO -> Handle -> IO ()
+tprint TPrint{ operation = Printers, ..} Client{..} out = printers >>= format
+  where format ps
+          | (Human, _) <- output = mapM_ (\(PrinterId n, st) -> hPutStrLn out $ show n ++ "\t" ++ humanStatus st) $ Map.toAscList ps
+          | (JSON , _) <- output = LCBS.hPutStrLn out $ encodePretty ps
+          | otherwise            = hPutStrLn out . dumpStr $ Map.toAscList ps
+        humanStatus (Busy (JobId n)) = "busy printing job #" ++ show n
+        humanStatus (Available)      = "available"
+tprint _ _ _ = undefined
diff --git a/tprint/src/Options.hs b/tprint/src/Options.hs
index 4b61d1c..30350cb 100644
--- a/tprint/src/Options.hs
+++ b/tprint/src/Options.hs
@@ -80,8 +80,8 @@ data Sink = Stdout | WriteFile FilePath
   deriving (Show, Generic, PrettyVal)
 
 supportedInputs, supportedOutputs :: [Format]
-supportedInputs = [BBCode]
-supportedOutputs = [Human]
+supportedInputs = [BBCode, JSON]
+supportedOutputs = [Human, Internal, JSON]
 
 cmdPrinters, cmdJobs, cmdJobCreate, cmdJob, cmdJobStatus, cmdJobDelete, cmdDrafts, cmdDraftCreate, cmdDraftReplace, cmdDraft, cmdDraftDelete, cmdDraftPrint :: ParserInfo Operation
 cmdPrinters = info cmdPrinters' $ progDesc "List all available printers"
diff --git a/tprint/tprint.cabal b/tprint/tprint.cabal
index aeb61c9..9531665 100644
--- a/tprint/tprint.cabal
+++ b/tprint/tprint.cabal
@@ -30,6 +30,8 @@ executable tprint
                      , time >=1.5.0 && <2
                      , pretty-show >=1.6.9 && <2
                      , text >=1.2.2 && <2
+                     , aeson-pretty >=0.7.2 && <1
+                     , bytestring >=0.10.6 && <1
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:         -Wall
\ No newline at end of file
diff --git a/tprint/tprint.nix b/tprint/tprint.nix
index 9954b02..e28204d 100644
--- a/tprint/tprint.nix
+++ b/tprint/tprint.nix
@@ -1,5 +1,6 @@
-{ mkDerivation, base, containers, optparse-applicative, pretty-show
-, stdenv, thermoprint-bbcode, thermoprint-client, time
+{ mkDerivation, aeson-pretty, base, bytestring, containers
+, optparse-applicative, pretty-show, stdenv, text
+, thermoprint-bbcode, thermoprint-client, time
 }:
 mkDerivation {
   pname = "tprint";
@@ -8,8 +9,8 @@ mkDerivation {
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    base containers optparse-applicative pretty-show thermoprint-bbcode
-    thermoprint-client time
+    aeson-pretty base bytestring containers optparse-applicative
+    pretty-show text thermoprint-bbcode thermoprint-client time
   ];
   homepage = "http://dirty-haskell.org/tags/thermoprint.html";
   description = "A CLI for thermoprint-client";