From 70dea3937943cdb304d14e44fef7a6788c8e2ff7 Mon Sep 17 00:00:00 2001
From: Chris S <chris@soundshare.co.uk>
Date: Sun, 17 Nov 2019 20:26:49 +0000
Subject: [PATCH] Add limit functionality, path equals and command equals
 filter.

---
 src/Filter.hs  | 10 +++++++-
 src/Main.hs    | 70 ++++++++++++++++++++++++++------------------------
 src/Printer.hs | 19 ++++++++------
 3 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/src/Filter.hs b/src/Filter.hs
index 6b395f3..2633f33 100644
--- a/src/Filter.hs
+++ b/src/Filter.hs
@@ -9,9 +9,11 @@ data Filter = Filter {
     pathContains :: [Text]
  , pathPrefix :: Maybe Text
  , pathSuffix :: Maybe Text
+ , pathEqual :: Maybe Text
  , commandContains :: [Text]
  , commandPrefix :: Maybe Text
  , commandSuffix :: Maybe Text
+ , commandEqual :: Maybe Text
  , before :: Maybe Text
  , after :: Maybe Text
 } deriving Show
@@ -22,11 +24,17 @@ filterRecords f r = Prelude.filter (filterRecord f) r
 filterRecord :: Filter -> CommandRecord -> Bool
 filterRecord Filter{..} CommandRecord{..}  =
   Prelude.all (== True)
+  $
   [
       Prelude.all (\pc -> isInfixOf (pc) path) pathContains
     , maybe True (\x -> isPrefixOf x path) pathPrefix
     , maybe True (\x -> isSuffixOf x path) pathSuffix
-    , Prelude.all (\pc -> isInfixOf (pc) command) commandContains
+    , maybe True ((==) path) pathEqual
+  ]
+  <>
+  [
+      Prelude.all (\pc -> isInfixOf (pc) command) commandContains
     , maybe True (\x -> isPrefixOf x command) commandPrefix
     , maybe True (\x -> isSuffixOf x command) commandSuffix
+    , maybe True ((==) command) commandEqual
   ]
diff --git a/src/Main.hs b/src/Main.hs
index defeec1..36759fe 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -48,25 +48,21 @@ target = strOption
   <> metavar "TARGET"
   <> help "Target for the greeting" )
 
+limiter :: Parser Int
+limiter =
+       option auto (
+         (  long "limit"
+         <> metavar "NUMBER"
+         <> help "limit"
+         <> value 30
+         )
+       )
+
 parser :: Parser (IO ())
 parser = do
-  work
-    <$>
-      textOption
-        (  long "command"
-        <> short 'c'
-        <> metavar "STRING"
-        <> help "command"
-        )
-    <*>
-      textOption
-        (  long "path"
-        <> short 'p'
-        <> metavar "STRING"
-        <> help "path"
-        )
-  <|> printRecords <$> switch ( long "print" <> help "Whether to be quiet" )
-  -- <|> processPendingFiles <$> switch ( long "process-pending" <> help "" )
+  printRecords
+     <$> switch ( long "print" <> help "Whether to be quiet" )
+     <*> limiter
   <|>
   printFilterRecords
     <$> switch ( long "print-filter" <> help "Print with filter" )
@@ -93,6 +89,14 @@ parser = do
         <> help "command"
         )
       )
+    <*> 
+      optional (
+      textOption
+        (  long "path"
+        <> metavar "STRING"
+        <> help "path equals"
+        )
+      )
     <*> many (
       textOption
         (  long "command-contains"
@@ -116,6 +120,14 @@ parser = do
         <> help "command"
         )
       )
+    <*> 
+      optional (
+      textOption
+        (  long "command"
+        <> metavar "STRING"
+        <> help "command equals"
+        )
+      )
     <*> 
       optional (
       textOption
@@ -132,31 +144,21 @@ parser = do
         <> help "command"
         )
       )
+    <*> limiter
   <|>
   daemon <$> switch ( long "daemon" <> help "Run daemon listener" )
 
-
-work :: Text -> Text -> IO ()
-work a o = do
-  x <- getCurrentTime
-  doesFileExist crFile >>= \case
-    True -> do
-      decodeFileOrFail crFile >>= \case
-        Right p -> encodeFile crFile $ CommandRecord a x o : p
-        Left e -> error $ show e
-    False -> encodeFile crFile $ [CommandRecord a x o]
-
-
 printFilterRecords :: Bool
-  -> [Text] -> Maybe Text -> Maybe Text  -- path
-  -> [Text] -> Maybe Text -> Maybe Text  -- command
+  -> [Text] -> Maybe Text -> Maybe Text -> Maybe Text -- path
+  -> [Text] -> Maybe Text -> Maybe Text -> Maybe Text -- command
   -> Maybe Text -> Maybe Text -- before / after
+  -> Int
   -> IO ()
-printFilterRecords _ a b c d e f g h = do
-  let filter' = Filter a b c d e f g h
+printFilterRecords _ pa pb pc pd ca cb cc cd ta tb l = do
+  let filter' = Filter pa pb pc pd ca cb cc cd ta tb
   print filter'
   decodeFileOrFail crFile >>= \case
     Right p -> do
       pp <- getPendingRecords
-      printRecords' (filterRecords filter' (p ++ pp))
+      printRecords' (filterRecords filter' (p ++ pp)) l
     Left e' -> error $ show e'
diff --git a/src/Printer.hs b/src/Printer.hs
index 584e10c..ebb8d11 100644
--- a/src/Printer.hs
+++ b/src/Printer.hs
@@ -2,7 +2,7 @@
 module Printer where
 
 import Rainbox
-import Rainbow ((&))
+import Data.Function ((&))
 import qualified Rainbow
 import Rainbow.Types
 import Data.Sequence (Seq)
@@ -57,7 +57,7 @@ fcol =
     Seq.adjust (\x -> x { _background = defaultText}) 0
 
 xyz :: Seq Cell -> Seq Cell
-xyz = (Rainbox.intersperse (separator defaultText 1))
+xyz = (Seq.intersperse (separator defaultText 1))
 
 myCell :: Rainbow.Radiant -> Rainbow.Radiant -> Alignment Vertical -> Text -> Rainbox.Cell
 myCell b f a vv = Rainbox.Cell v Rainbox.top a b
@@ -67,17 +67,20 @@ myCell b f a vv = Rainbox.Cell v Rainbox.top a b
 defaultText :: Rainbow.Radiant
 defaultText = Radiant (Color Nothing) (Color Nothing)
 
-printRecords :: Bool -> IO ()
-printRecords _ = do
+takeLastN :: Int -> [a] -> [a]
+takeLastN n = reverse . take n . reverse
+
+printRecords :: Bool -> Int -> IO ()
+printRecords _ l = do
   decodeFileOrFail crFile >>= \case
     Right p -> do
       pp <- getPendingRecords
-      printRecords' (p ++ pp)
+      printRecords' (p ++ pp) l
     Left e -> error $ show e
 
-printRecords' :: [CommandRecord] -> IO ()
-printRecords' r = do
-  let tableV = fmap (renderCr) r
+printRecords' :: [CommandRecord] -> Int -> IO ()
+printRecords' r l = do
+  let tableV = fmap (renderCr) $ takeLastN l r
   mapM_ Rainbow.putChunk . toList $ render $ horizontalStationTable tableV
 
 renderCr :: CommandRecord -> [String]