Refactor code style

Author: HirotoShioi

LogAnalysis/Classifier.hs

@@ -4,13 +4,11 @@
 
 module LogAnalysis.Classifier
        ( extractIssuesFromLogs
-       , extractLogsFromZip
        , extractErrorCodes
        , prettyFormatAnalysis
        ) where
 
-import qualified Codec.Archive.Zip        as Zip
-import qualified Data.ByteString.Lazy     as LBS
+import qualified Data.ByteString.Lazy as LBS
 import           Data.List                (foldl')
 import           Data.Map.Strict          (Map)
 import qualified Data.Map.Strict          as Map
@@ -58,23 +56,6 @@ filterAnalysis as = do
       then Left "Cannot find any known issues"
       else return $ Map.map (take numberOfErrorText) filteredAnalysis
 
-readZip :: LBS.ByteString -> Either String (Map FilePath LBS.ByteString)
-readZip rawzip = case Zip.toArchiveOrFail rawzip of
-    Left err      -> Left err
-    Right archive -> Right $ finishProcessing archive
-  where
-    finishProcessing :: Zip.Archive -> Map FilePath LBS.ByteString
-    finishProcessing = Map.fromList . map handleEntry . Zip.zEntries
-    handleEntry :: Zip.Entry -> (FilePath, LBS.ByteString)
-    handleEntry entry = (Zip.eRelativePath entry, Zip.fromEntry entry)
-
--- | Extract log file from given zip file
-extractLogsFromZip :: Int -> LBS.ByteString -> Either String [LBS.ByteString]
-extractLogsFromZip numberOfFiles file = do
-    zipMap <- readZip file                             -- Read File
-    let extractedLogs = Map.elems $ Map.take numberOfFiles zipMap        -- Extract selected logs
-    return extractedLogs
-
 extractErrorCodes :: Analysis -> [ Text ]
 extractErrorCodes as = map (\(Knowledge{..}, _) -> toTag kErrorCode) $ Map.toList as
 

LogAnalysis/Types.hs

@@ -64,10 +64,10 @@ toComment SentLogCorrupted = "Log file is corrupted"
 toComment _                = "Error"
 
 -- | Map used to collect error lines
-type Analysis = Map Knowledge [ LT.Text ]
+type Analysis = Map Knowledge [LT.Text]
 
 -- | Create initial analysis environment
-setupAnalysis :: [ Knowledge ] -> Analysis
+setupAnalysis :: [Knowledge] -> Analysis
 setupAnalysis kbase = Map.fromList $ map (\kn -> (kn, [])) kbase
 
 instance Eq Knowledge where

Types.hs

@@ -20,10 +20,10 @@ import           Data.Text        (Text)
 
 -- | Comments
 data Comment = Comment
-    { commentBody        :: Text         -- ^ Body of comment
-    , commentAttachments :: [Attachment] -- ^ Attachment
-    , commentPublic      :: Bool         -- ^ Flag of whether comment should be public
-    , commentAuthor      :: Integer      -- ^ Auther of comment
+    { commentBody        :: !Text         -- ^ Body of comment
+    , commentAttachments :: ![Attachment] -- ^ Attachment
+    , commentPublic      :: !Bool         -- ^ Flag of whether comment should be public
+    , commentAuthor      :: !Integer      -- ^ Auther of comment
     } deriving (Show, Eq)
 
 -- | Outer comment ??
@@ -33,29 +33,29 @@ newtype CommentOuter = CommentOuter {
 
 -- | Attachment of the ticket
 data Attachment = Attachment
-    { attachmentURL         :: Text -- ^ URL of the attachment
-    , attachmentContentType :: Text -- ^ ContentType of the attachment
-    , attachmentSize        :: Int  -- ^ Attachment size
+    { attachmentURL         :: !Text -- ^ URL of the attachment
+    , attachmentContentType :: !Text -- ^ ContentType of the attachment
+    , attachmentSize        :: !Int  -- ^ Attachment size
     } deriving (Show, Eq)
 
 -- | Zendexk ticket
 data Ticket = Ticket
-    { ticketComment  :: Comment   -- ^ Ticket comment
-    , ticketAssignee :: Integer   -- ^ Assignee of the ticket
-    , ticketTag      :: [ Text ]  -- ^ Tags attached to ticket
+    { ticketComment  :: !Comment   -- ^ Ticket comment
+    , ticketAssignee :: !Integer   -- ^ Assignee of the ticket
+    , ticketTag      :: ![Text]  -- ^ Tags attached to ticket
     } deriving (Show, Eq)
 
 -- | List of zendesk ticket
 data TicketList = TicketList
-    { ticketListTickets :: [ TicketInfo ] -- ^ Information of tickets
+    { ticketListTickets :: ![TicketInfo] -- ^ Information of tickets
     , nextPage          :: Maybe Text     -- ^ Next page
     } deriving (Show, Eq)
 
 type TicketId = Int
 
 data TicketInfo = TicketInfo
-    { ticketId   :: Int    -- ^ Id of an ticket
-    , ticketTags :: [Text] -- ^ Tags associated with ticket
+    { ticketId   :: !Int    -- ^ Id of an ticket
+    , ticketTags :: ![Text] -- ^ Tags associated with ticket
     } deriving (Eq)
 
 instance Show TicketInfo where

Util.hs

@@ -1,9 +1,32 @@
 module Util
-    ( tshow
+    ( extractLogsFromZip
+    , tshow
+    , readZip
     ) where
 
-import           Data.Text                      (Text)
-import qualified Data.Text                      as T
+import qualified Codec.Archive.Zip    as Zip
+import qualified Data.ByteString.Lazy as LBS
+import           Data.Map.Strict      (Map)
+import qualified Data.Map.Strict      as Map
+import           Data.Text            (Text)
+import qualified Data.Text            as T
 
 tshow :: Show a => a -> Text
-tshow = T.pack . show
+tshow = T.pack . show
+
+-- | Extract log file from given zip file
+extractLogsFromZip :: Int -> LBS.ByteString -> Either String [LBS.ByteString]
+extractLogsFromZip numberOfFiles file = do
+    zipMap <- readZip file                             -- Read File
+    let extractedLogs = Map.elems $ Map.take numberOfFiles zipMap        -- Extract selected logs
+    return extractedLogs
+
+readZip :: LBS.ByteString -> Either String (Map FilePath LBS.ByteString)
+readZip rawzip = case Zip.toArchiveOrFail rawzip of
+    Left err      -> Left err
+    Right archive -> Right $ finishProcessing archive
+  where
+    finishProcessing :: Zip.Archive -> Map FilePath LBS.ByteString
+    finishProcessing = Map.fromList . map handleEntry . Zip.zEntries
+    handleEntry :: Zip.Entry -> (FilePath, LBS.ByteString)
+    handleEntry entry = (Zip.eRelativePath entry, Zip.fromEntry entry)