draft edit

4 files changed, 42 insertions, 7 deletions

diff --git a/tprint/src/Main.hs b/tprint/src/Main.hs
index bc5ee2f..f6008ac 100644
--- a/tprint/src/Main.hs
+++ b/tprint/src/Main.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ViewPatterns #-}
+{-# LANGUAGE TupleSections #-}
 
 import Data.Map (Map)
 import qualified Data.Map as Map
@@ -8,7 +9,9 @@ import qualified Data.Sequence as Seq
 import Data.Text (Text)
 import qualified Data.Text as T
 import qualified Data.Text.IO as T
+import qualified Data.Text.Encoding as T
 import qualified Data.ByteString.Lazy.Char8 as Lazy (ByteString)
+import qualified Data.ByteString.Lazy as LBS
 import qualified Data.ByteString.Lazy.Char8 as LCBS
 import Data.Time
 
@@ -26,7 +29,9 @@ import Control.Concurrent (threadDelay)
 
 import Text.Show.Pretty (dumpStr)
 import Data.Aeson.Encode.Pretty (encodePretty)
-import Data.Aeson (eitherDecode')
+import Data.Aeson (eitherDecode', eitherDecodeStrict')
+
+import Text.Editor (runUserEditorDWIM, jsonTemplate, plainTemplate)
 
 import System.IO
 
@@ -135,6 +140,26 @@ tprint TPrint{ operation = DraftCreate{..}, ..} Client{..} out = withPrintout in
 tprint TPrint{ operation = DraftReplace{..}, ..} Client{..} _ = withPrintout input $ \p -> do
   unless dryRun $ draftReplace draftId draftTitle p
 
+tprint TPrint{ operation = DraftEdit{..}, ..} Client{..} _ = do
+  d@(fromMaybe T.empty -> dTitle, dContent) <- draft draftId
+  let
+    content
+      | (JSON, _) <- output = return . LBS.toStrict $ encodePretty d
+      | otherwise           = do
+          c <- either throwM return (cobbcode dContent)
+          return . T.encodeUtf8 $ dTitle <> T.pack "\n" <> c
+    tmpl
+      | (JSON, _) <- output = jsonTemplate
+      | otherwise           = plainTemplate
+    parse
+      | (JSON, _) <- output = either (throwM . userError) return . eitherDecodeStrict'
+      | otherwise           = (\(t:(T.unlines -> c)) -> (massage t, ) <$> either throwM return (bbcode c)) . T.lines . T.decodeUtf8
+    massage (T.strip -> t)
+      | T.null t = Nothing
+      | otherwise = Just t
+  (dTitle', dContent') <- parse =<< runUserEditorDWIM tmpl =<< content
+  unless dryRun $ draftReplace draftId dTitle' dContent'
+
 tprint TPrint{ operation = DraftDelete{..}, ..} Client{..} _ = unless dryRun $ draftDelete draftId
 
 tprint TPrint{ operation = DraftPrint{..}, ..} client@Client{..} out = do
diff --git a/tprint/src/Options.hs b/tprint/src/Options.hs
index 703c23b..f4c7ebd 100644
--- a/tprint/src/Options.hs
+++ b/tprint/src/Options.hs
@@ -41,6 +41,9 @@ data TPrint = TPrint
   }
   deriving (Show, Generic, PrettyVal)
 
+data Interactive = Interactive
+  deriving (Show, Generic, PrettyVal)
+
 data Operation
   = Printers
   | Jobs
@@ -66,6 +69,7 @@ data Operation
     , draftTitle :: Maybe DraftTitle
     , input :: Input
     }
+  | DraftEdit { draftId :: DraftId }
   | Draft { draftId :: DraftId }
   | DraftDelete { draftId :: DraftId }
   | DraftPrint
@@ -125,6 +129,9 @@ cmdDraftCreate = info cmdDraftCreate' $ progDesc "Create a new draft"
 cmdDraftReplace = info cmdDraftReplace' $ progDesc "Update the contents and title of a draft"
   where cmdDraftReplace' = DraftReplace <$> aDraft <*> optional pTitle <*> pInput
 
+cmdDraftEdit = info cmdDraftEdit' $ progDesc "Edit an existing draft"
+  where cmdDraftEdit' = DraftEdit <$> aDraft
+
 cmdDraft = info cmdDraft' $ progDesc "Retrieve a drafts contents"
   where cmdDraft' = Draft <$> aDraft
 
@@ -146,6 +153,7 @@ pOperation = hsubparser $ mconcat [ command "printers" cmdPrinters
                                                          ) (progDesc "Interact with jobs")
                                   , command "draft" $ info ( hsubparser $ mconcat [ command "create" cmdDraftCreate
                                                                                   , command "replace" cmdDraftReplace
+                                                                                  , command "edit" cmdDraftEdit
                                                                                   , command "content" cmdDraft
                                                                                   , command "delete" cmdDraftDelete
                                                                                   , command "print" cmdDraftPrint
diff --git a/tprint/tprint.cabal b/tprint/tprint.cabal
index 94b0a8a..bbc5207 100644
--- a/tprint/tprint.cabal
+++ b/tprint/tprint.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                tprint
-version:             3.0.0
+version:             3.1.0
 synopsis:            A CLI for thermoprint-client
 -- description:         
 homepage:            http://dirty-haskell.org/tags/thermoprint.html
@@ -35,6 +35,7 @@ executable tprint
                      , bytestring >=0.10.6 && <1
                      , exceptions >=0.8.2 && <1
                      , deepseq >=1.4.1 && <2
+                     , editor-open >=0.6.0 && <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 9ce247d..310fe03 100644
--- a/tprint/tprint.nix
+++ b/tprint/tprint.nix
@@ -1,16 +1,17 @@
 { mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-, deepseq, exceptions, optparse-applicative, pretty-show, stdenv
-, text, thermoprint-bbcode, thermoprint-client, time
+, deepseq, editor-open, exceptions, optparse-applicative
+, pretty-show, stdenv, text, thermoprint-bbcode, thermoprint-client
+, time
 }:
 mkDerivation {
   pname = "tprint";
-  version = "3.0.0";
+  version = "3.1.0";
   src = ./.;
   isLibrary = false;
   isExecutable = true;
   executableHaskellDepends = [
-    aeson aeson-pretty base bytestring containers deepseq exceptions
-    optparse-applicative pretty-show text thermoprint-bbcode
+    aeson aeson-pretty base bytestring containers deepseq editor-open
+    exceptions optparse-applicative pretty-show text thermoprint-bbcode
     thermoprint-client time
   ];
   homepage = "http://dirty-haskell.org/tags/thermoprint.html";