summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-04-30 15:24:03 +0200
committertv <tv@krebsco.de>2017-04-30 15:46:32 +0200
commit5f78ec96b34fe96b933d079776a24f2b23e767a3 (patch)
tree078335cbb1a04025d30bdd12bdeec14bca2b964c
parent936ad5f12422e3d124ade90fae78f9ed0427fc7d (diff)
Notmuch.search: support passing additional args
-rw-r--r--Notmuch.hs6
-rw-r--r--TreeView.hs2
-rw-r--r--test5.hs2
3 files changed, 5 insertions, 5 deletions
diff --git a/Notmuch.hs b/Notmuch.hs
index e6d0d32..ffe403d 100644
--- a/Notmuch.hs
+++ b/Notmuch.hs
@@ -140,9 +140,9 @@ notmuchWithInput args input = do
return (exitCode, out, err)
-search :: String -> IO (Either String [SearchResult])
-search term =
- notmuch [ "search", "--format=json", "--format-version=2", term ]
+search :: [String] -> IO (Either String [SearchResult])
+search args =
+ notmuch ("search" : "--format=json" : "--format-version=2" : args)
>>= return . eitherDecode'
diff --git a/TreeView.hs b/TreeView.hs
index fad16fe..923212d 100644
--- a/TreeView.hs
+++ b/TreeView.hs
@@ -158,7 +158,7 @@ loadSubForest = \case
. subForest
. fromSearchResults s
. either error id
- <$> Notmuch.search s
+ <$> Notmuch.search [s]
_ ->
return $ Right []
diff --git a/test5.hs b/test5.hs
index d2732cf..4e7cccb 100644
--- a/test5.hs
+++ b/test5.hs
@@ -83,7 +83,7 @@ data State = State
initState :: String -> IO State
initState query = do
- r_ <- either error id <$> Notmuch.search query
+ r_ <- either error id <$> Notmuch.search [query]
return State
{ cursor = Z.fromTree $ fromSearchResults query r_