From: b3nj4m1n Date: Sun, 22 May 2022 13:47:39 +0000 (+0200) Subject: Formatting X-Git-Tag: v0.2.0.0~25 X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/xdg-ninja.git/commitdiff_plain/ccec211fd61e58feb986d44e4132d001ac780f71 Formatting --- diff --git a/lib/Checks.hs b/lib/Checks.hs index 671389c..3d81a54 100644 --- a/lib/Checks.hs +++ b/lib/Checks.hs @@ -2,16 +2,16 @@ module Checks where -import Program -import Data.List (isSuffixOf) -import Output -import System.FilePath -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import Data.Text.ANSI -import System.Directory.Extra -import System.Environment (getEnv) -import Text.Replace +import Data.List (isSuffixOf) +import qualified Data.Text as T +import Data.Text.ANSI +import qualified Data.Text.Lazy as TL +import Output +import Program +import System.Directory.Extra +import System.Environment (getEnv) +import System.FilePath +import Text.Replace data Result = Exist | MustExist | NoExist deriving Show @@ -22,7 +22,7 @@ expandPath path = do let replacements = [ Replace "$HOME" (T.pack home) ] let result = replaceWithList replacements (TL.pack path) return (TL.unpack result) - + checkFile :: T.Text -> Bool -> File -> IO Result checkFile programName verbose file = do @@ -39,7 +39,7 @@ checkFile programName verbose file = do logFile programName file True case (supportLevel file) of Unsupported -> return MustExist - _ -> return Exist + _ -> return Exist checkProgram :: Bool -> Program -> IO [Result] checkProgram verbose program = sequence (map (checkFile (name program) verbose) (files program)) diff --git a/lib/Output.hs b/lib/Output.hs index ddc486a..ec66fce 100644 --- a/lib/Output.hs +++ b/lib/Output.hs @@ -1,13 +1,13 @@ module Output where -import qualified Data.Text as T -import Data.Char (isSpace) -import Data.Text.ANSI +import Data.Char (isSpace) +import qualified Data.Text as T +import Data.Text.ANSI import Data.UUID import Data.UUID.V4 +import Program import System.Exit import System.Process -import Program getFilename :: IO String getFilename = do @@ -44,7 +44,7 @@ log mode name filename help = case mode of SUCS -> putStrLn (line green name filename) HELP -> do md <- case (all isSpace help) of - True -> renderMarkdown "_No help available._" + True -> renderMarkdown "_No help available._" False -> renderMarkdown help putStr md diff --git a/lib/PreviewProgram.hs b/lib/PreviewProgram.hs index cd9ea6b..6ae379e 100644 --- a/lib/PreviewProgram.hs +++ b/lib/PreviewProgram.hs @@ -1,9 +1,9 @@ module PreviewProgram where +import qualified Data.Text as T +import Data.Text.ANSI +import Output import Program -import Data.Text.ANSI -import Output -import qualified Data.Text as T previewFile :: T.Text -> File -> IO () previewFile name file = logFile name file True @@ -18,5 +18,5 @@ previewProgramFile filename = do x <- readProgram filename case x of Just program -> previewProgram program - Nothing -> putStrLn (T.unpack (red (T.pack "Error."))) + Nothing -> putStrLn (T.unpack (red (T.pack "Error."))) return () diff --git a/src/xdgnj.hs b/src/xdgnj.hs index 306c22b..f3adf7c 100644 --- a/src/xdgnj.hs +++ b/src/xdgnj.hs @@ -2,11 +2,11 @@ module Main where import qualified AddProgram as PA -import qualified Checks as C +import qualified Checks as C import Data.Semigroup ((<>)) import qualified EditProgram as PE -import qualified PreviewProgram as PP import Options.Applicative +import qualified PreviewProgram as PP data Args = RunChecks | AddProgram @@ -43,8 +43,8 @@ main :: IO () main = do args <- execParser args case args of - RunChecks -> C.checkDir "./programs" - AddProgram -> PA.saveProgram - EditProgram filename -> PE.editProgram filename + RunChecks -> C.checkDir "./programs" + AddProgram -> PA.saveProgram + EditProgram filename -> PE.editProgram filename PreviewProgram filename -> PP.previewProgramFile filename - _ -> print args + _ -> print args