diff options
author | Gregor Kleen <gkleen@yggdrasil.li> | 2016-01-11 03:35:58 +0000 |
---|---|---|
committer | Gregor Kleen <gkleen@yggdrasil.li> | 2016-01-11 03:35:58 +0000 |
commit | b7e515570bde2d43c013f3a9cf5fb793826abd6c (patch) | |
tree | 98a3af3efcb3eac1db4f85e3291dab1faed22edf | |
parent | ea079b5ee00f5371bde992a14676374a431371b5 (diff) | |
download | thermoprint-b7e515570bde2d43c013f3a9cf5fb793826abd6c.tar thermoprint-b7e515570bde2d43c013f3a9cf5fb793826abd6c.tar.gz thermoprint-b7e515570bde2d43c013f3a9cf5fb793826abd6c.tar.bz2 thermoprint-b7e515570bde2d43c013f3a9cf5fb793826abd6c.tar.xz thermoprint-b7e515570bde2d43c013f3a9cf5fb793826abd6c.zip |
API cleanup
-rw-r--r-- | spec/src/Thermoprint/API.hs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/spec/src/Thermoprint/API.hs b/spec/src/Thermoprint/API.hs index d722903..ac6acbe 100644 --- a/spec/src/Thermoprint/API.hs +++ b/spec/src/Thermoprint/API.hs | |||
@@ -33,11 +33,6 @@ data PrinterStatus = Busy JobId | |||
33 | | Available | 33 | | Available |
34 | deriving (Generic, Show, FromJSON, ToJSON) | 34 | deriving (Generic, Show, FromJSON, ToJSON) |
35 | 35 | ||
36 | data JobInfo = JobInfo | ||
37 | { jobPrinter :: PrinterId | ||
38 | , jobStatus :: JobStatus | ||
39 | } | ||
40 | |||
41 | data JobStatus = Queued | 36 | data JobStatus = Queued |
42 | | Printing | 37 | | Printing |
43 | | Done | 38 | | Done |
@@ -57,7 +52,8 @@ type ThermoprintAPI = "printers" :> Get '[JSON] (Set PrinterId) | |||
57 | ) | 52 | ) |
58 | :<|> "job" :> Capture "jobId" JobId :> ( | 53 | :<|> "job" :> Capture "jobId" JobId :> ( |
59 | Get '[JSON] Printout | 54 | Get '[JSON] Printout |
60 | :<|> "status" :> Get '[JSON] JobInfo | 55 | :<|> "status" :> Get '[JSON] JobStatus |
56 | :<|> "printer" :> Get '[JSON] PrinterId | ||
61 | :<|> Delete '[] () | 57 | :<|> Delete '[] () |
62 | ) | 58 | ) |
63 | :<|> "drafts" :> ( | 59 | :<|> "drafts" :> ( |