deleted: Diddo/Entry.hs

      renamed:    Diddo.hs -> src/Diddo.hs
      renamed:    diddohs.hs -> src/Main.hs

      cleanup, I guess, it’s been a while …
      basic functionality works it seems

1 files changed, 0 insertions, 114 deletions

diff --git a/diddohs.hs b/diddohs.hs
deleted file mode 100644
index 6884d14..0000000
--- a/diddohs.hs
+++ /dev/null
@@ -1,114 +0,0 @@
-import Control.Applicative( (<$>) )
-import Control.Monad( unless )
-import Data.Time.Clock( UTCTime(..) )
-import Data.Time.LocalTime( TimeZone(), ZonedTime(..), zonedTimeToUTC, utcToZonedTime )
-import Diddo( Diddo(..), LogEntry(..), parseDiddoLogline, formatDiddo, logToDiddo, parseToZonedTime )
-import System.Console.GetOpt
-import System.Environment( getArgs )
-import System.Exit( exitSuccess, exitFailure )
-import System.IO( stderr, hPutStr )
-import qualified Data.Map as Map
-import qualified Data.Text as T
-import qualified Data.Text.IO as TIO
-
-data Opt = Opt
-    { optVerbose        :: Bool
-    , optVersion        :: Bool
-    , optHelp           :: Bool
-    , optInputFiles     :: [String]
-    , optOutputFile     :: String
-    , optInputFormat    :: String
-    , optOutputFormat   :: String
-    , optStartDate      :: String
-    , optEndDate        :: String
-    }
-
-defaultOpts :: Opt
-defaultOpts = Opt
-    { optVerbose        = False
-    , optVersion        = False
-    , optHelp           = False
-    , optInputFiles     = []
-    , optOutputFile     = ""
-    , optInputFormat    = "%FT%T%z"
-    , optOutputFormat   = "%FT%T%z"
-    , optStartDate      = ""
-    , optEndDate        = ""
-    }
-
-availableOptions :: [OptDescr (Opt -> IO Opt)]
-availableOptions =
-    [ Option ['h']    ["help"]
-        (NoArg (\ _ -> putStrLn (usageInfo "Usage: diddohs [OPTION...]" availableOptions) >> exitSuccess))
-        "Display program help"
-    , Option ['v']    ["verbose"]
-        (NoArg (\ opts -> return opts { optVerbose = True }))
-        "More detailed output"
-    , Option ['V']    ["version"]
-        (NoArg (\ opts -> return opts { optVersion = True }))
-        "Display program version"
-    , Option ['f']    ["file"]
-        (ReqArg (\ arg opts -> return opts { optInputFiles = optInputFiles opts ++ [arg]}) "FILE" )
-        "Read from FILE"
-    , Option ['w']    ["output"]
-        (ReqArg (\ arg opts -> return opts { optOutputFile = arg }) "FILE")
-        "Write to FILE"
-    , Option ['i']    ["informat"]
-        (ReqArg (\ arg opts -> return opts { optInputFormat = arg }) "FORMAT")
-        "Timeformat used in input"
-    , Option ['o']    ["outformat"]
-        (ReqArg (\ arg opts -> return opts { optOutputFormat = arg }) "FORMAT")
-        "Timeformat used in output"
-    , Option ['s']    ["start"]
-        (ReqArg (\ arg opts -> return opts { optStartDate = arg }) "DATE")
-        "Start of reporting period"
-    , Option ['e']    ["end"]
-        (ReqArg (\ arg opts -> return opts { optEndDate = arg }) "DATE")
-        "End of reporting period"
-    ]
-
--- SECTION: Map of logentries to Map of Diddos
-logentryMapToDiddoMap :: Map.Map UTCTime Diddo.LogEntry -> Map.Map UTCTime Diddo.Diddo
-logentryMapToDiddoMap logmap = Map.mapWithKey toDddEntry logmap
-    where
-        toDddEntry key value    = Diddo.logToDiddo (precedingTimestamp key) value
-        precedingTimestamp x    = case Map.lookupLT x logmap of
-            Just (y,_)          -> y
-            Nothing             -> fst $ Map.findMin logmap
--- SECTION: Map of logentries to Map of DiddoEntries
-
-main :: IO ()
-main = do
-    -- SECTION: option processing
-    (givenOptions,args,errs) <- getArgs >>= return . getOpt Permute availableOptions
-
-    unless (null errs) $ do
-        mapM_ (hPutStr stderr) errs
-        exitFailure
-
-    effectiveOptions <- foldl (>>=) (return defaultOpts) givenOptions
-
-    let
-        inDateFmt               = optInputFormat effectiveOptions
-        outDateFmt              = optOutputFormat effectiveOptions
-
-        startDate               = parseToZonedTime inDateFmt $ optStartDate effectiveOptions
-        endDate                 = parseToZonedTime inDateFmt $ optEndDate effectiveOptions
-    -- SECTION: option processing
-
-    loglines <- case optInputFiles effectiveOptions of
-            files@(_:_)     -> T.lines . T.concat <$> mapM TIO.readFile files
-            []              -> T.lines <$> TIO.getContents
-
-    let
-        timestampLogentryMap                        = Map.fromList $ map Diddo.parseDiddoLogline loglines
-        (_, _, startedTimestampLogentryMap)         = Map.splitLookup (zonedTimeToUTC startDate) timestampLogentryMap
-        (endedTimestampLogentryMap, lastEntry, _)   = Map.splitLookup (zonedTimeToUTC endDate) startedTimestampLogentryMap
-        timestampDiddoMap                           = logentryMapToDiddoMap timestampLogentryMap
-
-    -- DEBUG
-    mapM_ putStrLn args
-    -- DEBUG
-
-    mapM_ (TIO.putStrLn . snd) $ Map.toAscList $ Map.map (Diddo.formatDiddo outDateFmt) timestampDiddoMap
-