hxmppc 0.2.1 → 0.2.3
raw patch · 2 files changed
+14/−14 lines, 2 filesdep ~fclabels
Dependency ranges changed: fclabels
Files
- hxmppc.cabal +2/−2
- hxmppc.hs +12/−12
hxmppc.cabal view
@@ -1,5 +1,5 @@ Name: hxmppc-Version: 0.2.1+Version: 0.2.3 Synopsis: Haskell XMPP (Jabber Client) Command Line Interface (CLI) Description: A simple command line interface to send and receive@@ -16,6 +16,6 @@ Executable hxmppc Main-is: hxmppc.hs Build-depends: base==4.3.*, text, xml-types, transformers, network,- network-protocol-xmpp==0.4.*, fclabels+ network-protocol-xmpp==0.4.*, fclabels>=1.0 Other-modules: EasyXMPP GHC-options: -Wall
hxmppc.hs view
@@ -11,7 +11,7 @@ import Control.Monad.IO.Class import Data.Functor import EasyXMPP-import Data.Record.Label+import Data.Label -- import Control.Arrow import System.Console.GetOpt @@ -34,11 +34,11 @@ options :: [OptDescr Flag] options =- [ Option "u" ["user"] (ReqArg (setL user . T.pack) "USER") "Username (example: foo@jabber.org)"- , Option "p" ["pass"] (ReqArg (setL pass . T.pack) "PASS") "Password"- , Option "h" ["host"] (ReqArg (setL host) "HOST") "Hostname (example: jabber.org)"- , Option "P" ["port"] (ReqArg (setL port . fromInteger . read) "PORT") "Port"- , Option "?" ["help"] (NoArg (setL help True)) "Show this help message"+ [ Option "u" ["user"] (ReqArg (set user . T.pack) "USER") "Username (example: foo@jabber.org)"+ , Option "p" ["pass"] (ReqArg (set pass . T.pack) "PASS") "Password"+ , Option "h" ["host"] (ReqArg (set host) "HOST") "Hostname (example: jabber.org)"+ , Option "P" ["port"] (ReqArg (set port . fromInteger . read) "PORT") "Port"+ , Option "?" ["help"] (NoArg (set help True)) "Show this help message" ] usage :: MonadIO m => T.Text -> m b@@ -57,13 +57,13 @@ (flags, nonopts, errs) <- getOpt Permute options <$> getArgs let opts = foldr ($) defaultSettings flags when (not . null $ errs) $ usage (T.concat . map T.pack $ errs)- when (getL help opts) $ usage ""- when (T.null $ getL user opts) $ usage "Missing username"- when (T.null $ getL pass opts) $ usage "Missing password"- when (null $ getL host opts) $ usage "Missing hostname"- let Just botJID = parseJID (getL user opts)+ when (get help opts) $ usage ""+ when (T.null $ get user opts) $ usage "Missing username"+ when (T.null $ get pass opts) $ usage "Missing password"+ when (null $ get host opts) $ usage "Missing hostname"+ let Just botJID = parseJID (get user opts) - res <- runPersistentClient (botJID, getL pass opts) (getL host opts, PortNumber (getL port opts)) $ do+ res <- runPersistentClient (botJID, get pass opts) (get host opts, PortNumber (get port opts)) $ do case map T.pack nonopts of "tell" : args -> do case args of