option cleanup

[fd/haskell-amqp-utils.git] / agitprop.hs

diff --git a/agitprop.hs b/agitprop.hs
index 03f0e4a8b7daabc0d930d33a50c4abe391cc2fb6..fd4922d298b621a7094b9e95db20168f8febe555 100644 (file)
--- a/agitprop.hs
+++ b/agitprop.hs
@@ -5,6 +5,7 @@ import qualified Control.Exception as X
 import Control.Monad (forever)
 import qualified Data.ByteString.Lazy.Char8 as BL
 import qualified Data.Text as T
+import Data.List (isSuffixOf)
 import Data.Time
 import Data.Time.Clock.POSIX
 import Data.Version (showVersion)
@@ -50,7 +51,7 @@ main = do
              inotify
              [CloseWrite, MoveIn]
              (inputFile args)
-             (handleEvent publishOneMsg)
+             (handleEvent publishOneMsg (suffix args))
          hr $ "watching " ++ (inputFile args)
          _ <- forever $ threadDelay 1000000
          removeWatch wd
@@ -79,16 +80,17 @@ confirmCallback (deliveryTag, isAll, ackType) =
      (show ackType))
 
 -- | Hotfolder event handler
-handleEvent :: (Maybe String -> BL.ByteString -> IO ()) -> Event -> IO ()
+handleEvent :: (Maybe String -> BL.ByteString -> IO ()) -> [ String ] -> Event -> IO ()
 -- just handle closewrite and movedin events
-handleEvent f (Closed False (Just x) True) = handleFile f x
-handleEvent f (MovedIn False x _) = handleFile f x
-handleEvent _ _ = return ()
+handleEvent f s (Closed False (Just x) True) = handleFile f s x
+handleEvent f s (MovedIn False x _) = handleFile f s x
+handleEvent _ _ _ = return ()
 
 -- | Hotfolder file handler
-handleFile :: (Maybe String -> BL.ByteString -> IO ()) -> FilePath -> IO ()
-handleFile _ ('.':_) = return () -- ignore hidden files
-handleFile f x =
+handleFile :: (Maybe String -> BL.ByteString -> IO ()) -> [String] -> FilePath -> IO ()
+handleFile _ _ ('.':_) = return () -- ignore hidden files
+handleFile f s@(_:_) x = if any (flip isSuffixOf x) s then handleFile f [] x else return ()
+handleFile f [] x =
   X.catch
     (hr ("sending " ++ x) >> BL.readFile x >>= f (Just x))
     (\exception ->
@@ -110,20 +112,20 @@ publishOneMsg' c a fn f = do
         , msgTimestamp = Just now
         , msgID = msgid a
         , msgType = msgtype a
-        , msgUserID = msguserid a
-        , msgApplicationID = msgappid a
-        , msgClusterID = msgclusterid a
-        , msgContentType = msgcontenttype a
-        , msgContentEncoding = msgcontentencoding a
-        , msgReplyTo = msgreplyto a
-        , msgPriority = msgprio a
-        , msgCorrelationID = msgcorrid a
+        , msgUserID = userid a
+        , msgApplicationID = appid a
+        , msgClusterID = clusterid a
+        , msgContentType = contenttype a
+        , msgContentEncoding = contentencoding a
+        , msgReplyTo = replyto a
+        , msgPriority = prio a
+        , msgCorrelationID = corrid a
         , msgExpiration = msgexp a
         , msgHeaders = substheader (fnheader a) fn $ msgheader a
         }
   printparam "sent" $ fmap show r
   where
-    substheader ::
-         Maybe String -> Maybe String -> Maybe FieldTable -> Maybe FieldTable
-    substheader (Just fnh) (Just fname) old = addheader old (fnh ++ "=" ++ fname)
+    substheader :: [String] -> Maybe String -> Maybe FieldTable -> Maybe FieldTable
+    substheader (s:r) (Just fname) old =
+      substheader r (Just fname) (addheader old (s ++ "=" ++ fname))
     substheader _ _ old = old