Extracted IHP.FileStorage.Preprocessor.ImageMagick to ihp-imagemagick package

Author: mpscholten

NixSupport/overlay.nix

@@ -24,6 +24,7 @@ final: prev: {
             ihp-job-dashboard = localPackage"ihp-job-dashboard";
             wai-asset-path = localPackage "wai-asset-path";
             wai-flash-messages = localPackage "wai-flash-messages";
+            ihp-imagemagick = localPackage "ihp-imagemagick";
 
             fsnotify = final.haskell.lib.dontCheck (super.callHackageDirect { pkg = "fsnotify"; ver = "0.4.3.0"; sha256 = "sha256-6SJ8w2p0HNhMPjdQzxx4oqsyI48/C/K7wh+kLNy9/fM="; } {});
 

devenv-module.nix

@@ -144,6 +144,7 @@ that is defined in flake-module.nix
             ihp-job-dashboard = pkgs.ghc.ihp-job-dashboard;
             wai-asset-path = pkgs.ghc.wai-asset-path;
             wai-flash-messages = pkgs.ghc.wai-flash-messages;
+            ihp-imagemagick = pkgs.ghc.ihp-imagemagick;
 
             run-script = pkgs.stdenv.mkDerivation {
                 pname = "run-script";

ihp/IHP/FileStorage/Preprocessor/ImageMagick.hs renamed to ihp-imagemagick/IHP/FileStorage/Preprocessor/ImageMagick.hs

@@ -7,8 +7,10 @@ module IHP.FileStorage.Preprocessor.ImageMagick
 ( applyImageMagick
 ) where
 
-import IHP.Prelude
+import Prelude
 
+import Data.Text (Text)
+import qualified Data.Text as Text
 import qualified Network.Wai.Parse as Wai
 import qualified Data.ByteString.Lazy as LBS
 import qualified System.IO.Temp as Temp
@@ -48,15 +50,13 @@ import qualified System.Process as Process
 -- >             company <- company |> updateRecord
 -- >             redirectTo EditCompanyAction { .. }
 --
-applyImageMagick :: Text -> [String] -> Wai.FileInfo LByteString -> IO (Wai.FileInfo LByteString)
+applyImageMagick :: Text -> [String] -> Wai.FileInfo LBS.LazyByteString -> IO (Wai.FileInfo LBS.LazyByteString)
 applyImageMagick convertTo otherParams fileInfo = do
     Temp.withTempDirectory "/tmp" "ihp-upload" $ \tempPath -> do
         let tempFilePath = tempPath <> "/image"
-        let convertedFilePath = tempPath <> "/converted." <> cs convertTo
+        let convertedFilePath = tempPath <> "/converted." <> Text.unpack convertTo
 
-        fileInfo
-            |> (.fileContent)
-            |> LBS.writeFile tempFilePath
+        LBS.writeFile tempFilePath fileInfo.fileContent
 
         let params :: [String] = [tempFilePath] <> otherParams <> [convertedFilePath]
         Process.callProcess "magick" params

ihp-imagemagick/ihp-imagemagick.cabal

@@ -0,0 +1,44 @@
+cabal-version:       2.2
+name:                ihp-imagemagick
+version:             1.4.0
+synopsis:            ImageMagick preprocessing for IHP file uploads
+description:         Preprocess uploaded images with ImageMagick in IHP apps
+license:             MIT
+author:              digitally induced GmbH
+maintainer:          [email protected]
+bug-reports:         https://github.com/digitallyinduced/ihp/issues
+category:            Web
+build-type:          Simple
+
+source-repository head
+    type:     git
+    location: https://github.com/digitallyinduced/ihp.git
+
+common ihp-std
+    default-language: GHC2021
+    default-extensions:
+        NoImplicitPrelude
+        OverloadedLabels
+        OverloadedRecordDot
+        DuplicateRecordFields
+        DisambiguateRecordFields
+        TypeApplications
+        TemplateHaskell
+        QuasiQuotes
+        PackageImports
+        ScopedTypeVariables
+        BlockArguments
+        OverloadedStrings
+        ImplicitParams
+
+library
+    import: ihp-std
+    build-depends:
+          base >= 4.17.0 && < 4.22
+        , text
+        , bytestring
+        , wai-extra
+        , process
+        , temporary
+    hs-source-dirs: .
+    exposed-modules: IHP.FileStorage.Preprocessor.ImageMagick

ihp/ihp.cabal

@@ -137,6 +137,7 @@ common shared-properties
             , wai-asset-path
             , wai-flash-messages
             , slugger
+            , ihp-imagemagick
     default-extensions:
         OverloadedStrings
         , NoImplicitPrelude
@@ -262,7 +263,6 @@ library
         , IHP.FileStorage.Types
         , IHP.FileStorage.ControllerFunctions
         , IHP.FileStorage.Config
-        , IHP.FileStorage.Preprocessor.ImageMagick
         , IHP.Pagination.ControllerFunctions
         , IHP.Pagination.ViewFunctions
         , IHP.Pagination.Types