From a843eb759bd7f955f95254ee93165968be39bbb0 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 26 Jul 2017 21:33:22 +0300 Subject: Stylish Haskell --- src/Application.hs | 28 +++++++++++++++------------- src/LogFormat.hs | 8 ++++---- src/Main.hs | 12 ++++++------ src/Server.hs | 33 +++++++++++++++++---------------- 4 files changed, 42 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/Application.hs b/src/Application.hs index 3c57079..0b7ca52 100644 --- a/src/Application.hs +++ b/src/Application.hs @@ -1,7 +1,7 @@ -{-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE OverloadedStrings #-} -{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE ScopedTypeVariables #-} module Application ( @@ -13,23 +13,25 @@ import Prelude hiding (id) import Control.Monad.Trans (liftIO) import Data.Aeson (ToJSON) import Data.Default.Class (def) +import qualified Data.HashMap.Lazy as HM import Data.List (sort) import Data.Pool (Pool, withResource) import Data.Text.Lazy (Text) -import Database.MySQL.Simple (Connection, Only(..), query_, execute) +import Database.MySQL.Simple (Connection, Only (..), execute, query_) import GHC.Generics (Generic) -import Network.HTTP.Types (ok200, notFound404, notImplemented501, StdMethod(HEAD)) +import Network.HTTP.Types (StdMethod (HEAD), notFound404, notImplemented501, + ok200) import Network.Wai (Application, Middleware) -import Network.Wai.Middleware.RequestLogger (Destination(Handle), - mkRequestLogger, RequestLoggerSettings(destination, outputFormat), - OutputFormat(CustomOutputFormat)) +import qualified Network.Wai.Middleware.Gzip as Gzip +import Network.Wai.Middleware.RequestLogger (Destination (Handle), + OutputFormat (CustomOutputFormat), + RequestLoggerSettings (destination, outputFormat), + mkRequestLogger) import Network.Wai.Middleware.Static (addBase, hasPrefix, staticPolicy, (>->)) import System.FilePath.Posix (()) import System.IO (stderr) -import Web.Scotty (ScottyM, ActionM, middleware, json, file, addroute, get, - delete, status, text, param, scottyApp) -import qualified Data.HashMap.Lazy as HM -import qualified Network.Wai.Middleware.Gzip as Gzip +import Web.Scotty (ActionM, ScottyM, addroute, delete, file, get, json, + middleware, param, scottyApp, status, text) import LogFormat (logFormat) diff --git a/src/LogFormat.hs b/src/LogFormat.hs index 9eb25f1..b1fc488 100644 --- a/src/LogFormat.hs +++ b/src/LogFormat.hs @@ -4,13 +4,13 @@ module LogFormat ( logFormat ) where +import qualified Data.ByteString.Char8 as BS import Data.Maybe (fromMaybe) import Data.Monoid ((<>)) -import Network.HTTP.Types (Status(statusCode)) -import Network.Wai (Request, httpVersion, requestHeaders, requestMethod, - rawPathInfo, requestHeaderReferer, requestHeaderUserAgent) +import Network.HTTP.Types (Status (statusCode)) +import Network.Wai (Request, httpVersion, rawPathInfo, requestHeaderReferer, + requestHeaderUserAgent, requestHeaders, requestMethod) import System.Log.FastLogger (LogStr, toLogStr) -import qualified Data.ByteString.Char8 as BS -- Sligthly modified Combined Log Format. -- User ID extracted from the From header. diff --git a/src/Main.hs b/src/Main.hs index e9a29b7..532bf02 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -5,17 +5,17 @@ module Main ( ) where import Data.ByteString.Char8 (pack) +import qualified Data.ConfigFile as Cf import Data.Either.Utils (forceEither) -import Data.Maybe (fromJust) import Data.List (isPrefixOf) +import Data.Maybe (fromJust) import Data.Version (showVersion) -import Database.MySQL.Base (ConnectInfo(..), defaultSSLInfo) -import Database.MySQL.Base.Types (Option(ReadDefaultFile, ReadDefaultGroup)) -import Paths_mywatch (getDataDir, version) -- from cabal +import Database.MySQL.Base (ConnectInfo (..), defaultSSLInfo) +import Database.MySQL.Base.Types (Option (ReadDefaultFile, ReadDefaultGroup)) +import Paths_mywatch (getDataDir, version) +import qualified System.Console.Docopt.NoTH as O import System.Environment (getArgs) import Text.InterpolatedString.Perl6 (qc) -import qualified Data.ConfigFile as Cf -import qualified System.Console.Docopt.NoTH as O import Server (server) diff --git a/src/Server.hs b/src/Server.hs index 40ae921..622b61b 100644 --- a/src/Server.hs +++ b/src/Server.hs @@ -3,27 +3,28 @@ module Server server ) where -import Control.Exception.Base (throwIO, catch, bracket) +import Control.Exception.Base (bracket, catch, throwIO) import Data.Bits ((.|.)) +import qualified Data.ByteString.Lazy as LBS +import qualified Data.HashMap.Lazy as HM import Data.List (find) import Data.Maybe (fromJust) import Data.Pool (createPool, destroyAllResources) import Data.Text.Lazy (Text) import Data.Text.Lazy.Encoding (decodeUtf8) -import Database.MySQL.Base (ConnectInfo(connectOptions)) -import Database.MySQL.Base.Types (Option(ReadDefaultGroup)) -import Network.Socket (socket, setSocketOption, bind, listen, close, - maxListenQueue, getSocketName, inet_addr, Family(AF_UNIX, AF_INET), - SocketType(Stream), SocketOption(ReuseAddr), Socket, SockAddr(SockAddrUnix, - SockAddrInet)) +import Database.MySQL.Base (ConnectInfo (connectOptions)) +import Database.MySQL.Base.Types (Option (ReadDefaultGroup)) +import qualified Database.MySQL.Simple as MySQL +import Network.Socket (Family (AF_INET, AF_UNIX), + SockAddr (SockAddrInet, SockAddrUnix), Socket, + SocketOption (ReuseAddr), SocketType (Stream), bind, + close, getSocketName, inet_addr, listen, maxListenQueue, + setSocketOption, socket) import Network.Wai.Handler.Warp (Port, defaultSettings, runSettingsSocket) import System.IO (hPutStrLn, stderr) import System.IO.Error (isDoesNotExistError) -import System.Posix.Files (removeLink, setFileMode, socketMode, ownerReadMode, - ownerWriteMode, groupReadMode, groupWriteMode) -import qualified Data.ByteString.Lazy as LBS -import qualified Data.HashMap.Lazy as HM -import qualified Database.MySQL.Simple as MySQL +import System.Posix.Files (groupReadMode, groupWriteMode, ownerReadMode, + ownerWriteMode, removeLink, setFileMode, socketMode) import Application (app) @@ -45,16 +46,16 @@ server socketSpec mysqlConnInfo dataDir = ( \(sock, mysql) -> do listen sock maxListenQueue hPutStrLn stderr $ "Static files from `" ++ dataDir ++ "'" - runSettingsSocket defaultSettings sock =<< app mysql dataDir) + runSettingsSocket defaultSettings sock =<< app mysql dataDir ) getGroup :: ConnectInfo -> Text getGroup = decodeUtf8 . getName . fromJust . find isGroup . connectOptions where isGroup (ReadDefaultGroup _) = True - isGroup _ = False + isGroup _ = False -- FIXME: Removing trailing zero added for buggy mysql in Main.hs. getName (ReadDefaultGroup n) = LBS.takeWhile (0 /=) . LBS.fromStrict $ n - getName _ = error "Cannot happen" + getName _ = error "Cannot happen" createSocket :: Listen -> IO Socket @@ -82,7 +83,7 @@ closeSocket sock = do close sock case name of SockAddrUnix path -> removeIfExists path - _ -> return () + _ -> return () removeIfExists :: FilePath -> IO () -- cgit v1.2.3