orgstat 0.0.3 → 0.0.4

raw patch · 3 files changed

+15/−15 lines, 3 filesdep ~log-warperdep ~universum

Dependency ranges changed: log-warper, universum

Files

• orgstat.cabal +6/−6
• src/OrgStat/Report/Timeline.hs +8/−8
• src/cli/Main.hs +1/−1

@@ -1,5 +1,5 @@ name:                orgstat-version:             0.0.3+version:             0.0.4 synopsis:            Statistics visualizer for org-mode license:             GPL-3 license-file:        LICENSE@@ -38,14 +38,14 @@                      , hashable >= 1.2.4.0                      , lens >= 4.14                      , linear-                     , log-warper >= 0.2.1+                     , log-warper >= 1.1.4                      , mtl >= 2.2.1                      , optparse-simple                      , orgmode-parse                      , text >= 1.2.2.1                      , time >= 1.6.0.1                      , turtle >= 1.2.8-                     , universum >= 0.2.1+                     , universum >= 0.5.1.1                      , yaml >= 0.8.21.1   hs-source-dirs:      src   default-language:    Haskell2010@@ -73,10 +73,10 @@                      , exceptions >= 0.8.3                      , filepath                      , formatting-                     , log-warper >= 0.2.1+                     , log-warper >= 1.1.4                      , optparse-simple                      , orgstat-                     , universum >= 0.2.1+                     , universum >= 0.5.1.1   hs-source-dirs:      src/cli   default-language:    Haskell2010   ghc-options:         -threaded  -Wall -O2 @@ -101,7 +101,7 @@                      , time >= 1.6.0.1                      , text                      , transformers-                     , universum >= 0.2.1+                     , universum >= 0.5.1.1   type:                exitcode-stdio-1.0   hs-source-dirs:      test   default-language:    Haskell2010

@@ -85,14 +85,14 @@ -- [(a, [b])] -> [(a, b)] allClocks :: [(Text, [(DiffTime, DiffTime)])] -> [(Text, (DiffTime, DiffTime))] allClocks tasks = do-  (label, clocks) <- tasks-  clock <- clocks-  pure (label, clock)+    (label, clocks) <- tasks+    clock <- clocks+    pure (label, clock)  -- separate list for each day selectDays :: [Day] -> [(Text, [Clock])] -> [[(Text, [(DiffTime, DiffTime)])]] selectDays days tasks =-    foreach days $ \day ->+    flip map days $ \day ->       filter (not . null . snd) $       map (second (selectDay day)) tasks   where@@ -175,7 +175,7 @@     timeticks :: D.Diagram B     timeticks =       mconcat $-      foreach [(0::Int)..23] $ \hour ->+      flip map [(0::Int)..23] $ \hour ->       mconcat         [ D.alignedText 0.5 1 (show hour)           & D.font "DejaVu Sans"@@ -233,7 +233,7 @@   -> D.Diagram B timelineDays params days clocks topLists =     D.hcat $-    foreach (days `zip` (clocks `zip` topLists)) $ \(day, (dayClocks, topList)) ->+    flip map (days `zip` (clocks `zip` topLists)) $ \(day, (dayClocks, topList)) ->       D.vsep 5       [ timelineDay params day dayClocks       , taskList params topList True@@ -289,8 +289,8 @@     allDaysDurations :: [(Text, DiffTime)]     allDaysDurations =       let allTasks = nub $ map fst $ concat byDayDurations in-      foreach allTasks $ \task ->-      (task,) $ sum $ foreach byDayDurations $ \durations ->+      flip map allTasks $ \task ->+      (task,) $ sum $ flip map byDayDurations $ \durations ->       lookupDef (fromInteger 0) task durations      -- split clocks

@@ -49,7 +49,7 @@ main = do     args@Args{..} <- getNodeOptions =<< getHomeDirectory     let sev = if debug then Debug else Info-    setupLogging $ consoleOutB True & lcTermSeverity .~ Just sev+    setupLogging $ consoleOutB & lcTermSeverity .~ Just sev     runWorkM (WorkScope configPath xdgOpen) $ do         logDebug $ "Just started with options: " <> show args         runOrgStat `catch` topHandler