Add System.Filepath

Cauterization · Cauterization · commit 2109bf239b4e · 2023-11-30T20:32:23.000+03:00
diff --git a/encoins-relay-apps/encoins-relay-apps.cabal b/encoins-relay-apps/encoins-relay-apps.cabal
@@ -64,6 +64,7 @@ library
       exceptions                             -any,
       extra                                  -any,
       file-embed                             -any,
+      filepath                               -any,
       http-client                            -any,
       lens                                   -any,
       lens-aeson                             -any,
diff --git a/encoins-relay-apps/src/Encoins/Relay/Apps/Internal.hs b/encoins-relay-apps/src/Encoins/Relay/Apps/Internal.hs
@@ -9,7 +9,7 @@
 module Encoins.Relay.Apps.Internal where
 
 import           Cardano.Api                        (NetworkId, writeFileJSON)
-import           Control.Arrow                      ((>>>), Arrow ((&&&)), (<<<))
+import           Control.Arrow                      (Arrow ((&&&)), (<<<), (>>>))
 import           Control.Concurrent                 (threadDelay)
 import           Control.Exception                  (AsyncException (UserInterrupt), Exception (..), SomeException)
 import           Control.Monad                      (forM, join, (>=>))
@@ -19,7 +19,7 @@ import           Data.Aeson                         (FromJSON (parseJSON), ToJSO
 import           Data.Aeson.Types                   (parseMaybe)
 import           Data.Default                       (def)
 import           Data.Either.Extra                  (eitherToMaybe)
-import           Data.List                          (sort, stripPrefix, isPrefixOf)
+import           Data.List                          (isPrefixOf, sort, stripPrefix)
 import           Data.Maybe                         (catMaybes, listToMaybe, mapMaybe)
 import           Data.Text                          (Text)
 import qualified Data.Text.Lazy                     as TL
@@ -31,9 +31,10 @@ import           PlutusAppsExtra.Api.Kupo           (CreatedOrSpent (..), KupoRe
 import           PlutusAppsExtra.IO.ChainIndex.Kupo ()
 import           PlutusAppsExtra.Utils.Kupo         (KupoResponse (..), kupoResponseToJSON)
 import           System.Directory                   (createDirectoryIfMissing, listDirectory, removeFile)
-import           System.ProgressBar                 (Progress (..), ProgressBarWidth (..), Style (..), defStyle, exact,
-                                                     incProgress, msg, ProgressBar)
-import qualified System.ProgressBar as PB
+import           System.FilePath                    ((</>))
+import           System.ProgressBar                 (Progress (..), ProgressBar, ProgressBarWidth (..), Style (..), defStyle,
+                                                     exact, incProgress, msg)
+import qualified System.ProgressBar                 as PB
 
 encoinsTokenName :: TokenName
 encoinsTokenName = "ENCS"
@@ -114,17 +115,16 @@ loadMostRecentFile :: FromJSON a => FilePath -> String -> IO (Maybe (Time.UTCTim
 loadMostRecentFile dir prefix = do
     files <- listDirectory dir
     let time = listToMaybe . reverse . sort $ mapMaybe (stripPrefix prefix >=> takeWhile (/= '.') >>> readTime) files
-        fp = (\t -> dir <> "/" <> prefix <> t <> ".json") . formatTime <$> time
+        fp = (\t -> dir </> prefix <> t <> ".json") . formatTime <$> time
     res <- fmap join $ sequence $ fmap eitherToMaybe . eitherDecodeFileStrict <$> fp
     pure $ (,) <$> time <*> res
 
 janitorFiles :: MonadIO m => FilePath -> String -> m ()
 janitorFiles  dir prefix = liftIO $ do
         files <- listDirectory dir
         let mbLastTime = listToMaybe . reverse . sort $ mapMaybe (stripPrefix prefix >=> takeWhile (/= '.') >>> readTime) files
-            mbLastFile = (\t -> dir <> "/" <> prefix <> t <> ".json") . formatTime <$> mbLastTime
-            toRemove = (`filterFiles` map addDirPrefix files) <$> mbLastFile
+            mbLastFile = (\t -> dir </> prefix <> t <> ".json") . formatTime <$> mbLastTime
+            toRemove = (`filterFiles` map (dir </>) files) <$> mbLastFile
         sequence_ $ mapM_ removeFile <$> toRemove
     where
-        filterFiles lastFile = filter $ uncurry (&&) <<< (/= lastFile) &&& isPrefixOf (addDirPrefix prefix)
-        addDirPrefix f = dir <> "/" <> f
+        filterFiles lastFile = filter $ uncurry (&&) <<< (/= lastFile) &&& isPrefixOf (dir </> prefix)
