fix hotfolder mode in other than cwd

diff --git a/agitprop.hs b/agitprop.hs
index 53a4c62b05aa9735b8691e1d5986d4abaffb6790..9dd7213c6a2c3afccf4171a8ea1109a5e62d4133 100644 (file)
--- a/agitprop.hs
+++ b/agitprop.hs
@@ -1,5 +1,4 @@
 -- generic AMQP publisher
-
 import Control.Concurrent (threadDelay)
 import qualified Control.Exception as X
 import Control.Monad (forever)
@@ -53,7 +52,7 @@ main = do
              inotify
              [CloseWrite, MoveIn]
              (inputFile args)
-             (handleEvent publishOneMsg (suffix args))
+             (handleEvent publishOneMsg (suffix args) (inputFile args))
          hr $ "watching " ++ (inputFile args)
          _ <- forever $ threadDelay 1000000
          removeWatch wd
@@ -83,11 +82,15 @@ confirmCallback (deliveryTag, isAll, ackType) =
 
 -- | Hotfolder event handler
 handleEvent ::
-     (Maybe String -> BL.ByteString -> IO ()) -> [String] -> Event -> IO ()
+     (Maybe String -> BL.ByteString -> IO ())
+  -> [String]
+  -> String
+  -> Event
+  -> IO ()
 -- just handle closewrite and movedin events
-handleEvent f s (Closed False (Just x) True) = handleFile f s x
-handleEvent f s (MovedIn False x _) = handleFile f s x
-handleEvent _ _ _ = return ()
+handleEvent f s p (Closed False (Just x) True) = handleFile f s (p ++ "/" ++ x)
+handleEvent f s p (MovedIn False x _) = handleFile f s (p ++ "/" ++ x)
+handleEvent _ _ _ _ = return ()
 
 -- | Hotfolder file handler
 handleFile ::

diff --git a/amqp-utils.cabal b/amqp-utils.cabal
index fe8deeb133959cf01d1d408c10621846c3a1dbe7..09e8cc6212796cf771b1e1a1a2d91b5733d0025e 100644 (file)
--- a/amqp-utils.cabal
+++ b/amqp-utils.cabal
@@ -1,6 +1,6 @@
 name:                amqp-utils
 
-version:             0.3.2.1
+version:             0.3.2.2
 
 synopsis:            Generic Haskell AMQP Consumer
 

diff --git a/amqp-utils.nix b/amqp-utils.nix
index c8ca7b68f1d5eed10fedd13f8b4a3112e59b784e..267970c14e7cdc172db13bc13f0fa10db513514a 100644 (file)
--- a/amqp-utils.nix
+++ b/amqp-utils.nix
@@ -4,7 +4,7 @@
 }:
 mkDerivation {
   pname = "amqp-utils";
-  version = "0.3.2.1";
+  version = "0.3.2.2";
   src = ./.;
   isLibrary = false;
   isExecutable = true;

diff --git a/debian/changelog b/debian/changelog
index 7675207c75c2fb672eed275cb54a7aca91df49e5..b02ff3938f5af78e3fd991e2cf79d28de7a7d784 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+haskell-amqp-utils (0.3.2.2) unstable; urgency=medium
+
+  * fix hotfolder mode in other than cwd
+
+ -- Frank Doepper <[email protected]>  Wed, 04 Jul 2018 18:32:39 +0200
+
 haskell-amqp-utils (0.3.2.1) unstable; urgency=medium
 
   * fix doc