From 5f78ec96b34fe96b933d079776a24f2b23e767a3 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 30 Apr 2017 15:24:03 +0200 Subject: Notmuch.search: support passing additional args --- Notmuch.hs | 6 +++--- TreeView.hs | 2 +- test5.hs | 2 +- 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_ -- cgit v1.2.3