shortened describePlayer output

src/Mtlstats/Control/EditPlayer.hs

@@ -25,6 +25,7 @@ import Data.Maybe (fromMaybe)
 import Lens.Micro ((^.))
 import qualified UI.NCurses as C
 
+import Mtlstats.Helpers.Player
 import Mtlstats.Menu
 import Mtlstats.Prompt
 import Mtlstats.Prompt.EditPlayer
@@ -92,4 +93,4 @@ header :: ProgState -> C.Update ()
 header s = C.drawString $ fromMaybe "" $ do
   pid    <- s^.progMode.editPlayerStateL.epsSelectedPlayer
   player <- nth pid $ s^.database.dbPlayers
-  Just $ playerDetails player
+  Just $ playerDetails player ++ "\n"

src/Mtlstats/Format.hs

@@ -26,8 +26,13 @@ module Mtlstats.Format
   , centre
   , overlay
   , month
+  , labelTable
+  , numTable
+  , tableWith
   ) where
 
+import Data.List (transpose)
+
 -- | Pad an 'Int' with leading zeroes to fit a certain character width
 padNum
   :: Int
@@ -101,3 +106,44 @@ month 10 = "OCT"
 month 11 = "NOV"
 month 12 = "DEC"
 month _  = ""
+
+-- | Creates a two-column table with labels
+labelTable :: [(String, String)] -> [String]
+labelTable xs = let
+  labelWidth = maximum $ map (length . fst) xs
+  in map
+    (\(label, val) -> right labelWidth label ++ ": " ++ val)
+    xs
+
+-- | Creates a variable column table of numbers with two axes
+numTable
+  :: [String]
+  -- ^ The top column labels
+  -> [(String, [Int])]
+  -- ^ The rows with their labels
+  -> [String]
+numTable headers rows = tableWith right $ header : body
+  where
+    header = "" : headers
+    body   = map
+      (\(label, row) ->
+        label : map show row)
+      rows
+
+-- | Creates a table from a two-dimensional list with a specified
+-- padding function
+tableWith
+  :: (Int -> String -> String)
+  -- ^ The padding function
+  -> [[String]]
+  -- ^ The cells
+  -> [String]
+tableWith func tdata = let
+  widths    = map (map length) tdata
+  colWidths = map maximum $ transpose widths
+  fitted    = map
+    (\row -> map
+      (\(str, len) -> func len str) $
+      zip row colWidths)
+    tdata
+  in map unwords fitted

src/Mtlstats/Helpers/Player.hs

@@ -0,0 +1,45 @@
+{- |
+
+mtlstats
+Copyright (C) 2019 Rhéal Lamothe
+<rheal.lamothe@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+-}
+
+module Mtlstats.Helpers.Player (playerDetails) where
+
+import Lens.Micro ((^.))
+
+import Mtlstats.Format
+import Mtlstats.Types
+
+-- | Provides a detailed string describing a 'Player'
+playerDetails :: Player -> String
+playerDetails p = unlines $ top ++ [""] ++ table
+  where
+    top = labelTable
+      [ ( "Number",   show $ p^.pNumber )
+      , ( "Name",     p^.pName          )
+      , ( "Position", p^.pPosition      )
+      ]
+
+    table = numTable ["YTD", "Lifetime"] $ map
+      (\(label, lens) ->
+        (label, [p^.pYtd.lens, p^.pLifetime.lens]))
+      [ ( "Goals",        psGoals   )
+      , ( "Assists",      psAssists )
+      , ( "Penalty mins", psPMin    )
+      ]

src/Mtlstats/Types.hs

@@ -161,7 +161,6 @@ module Mtlstats.Types (
   playerSearchExact,
   modifyPlayer,
   playerSummary,
-  playerDetails,
   playerIsActive,
   -- ** PlayerStats Helpers
   psPoints,
@@ -917,20 +916,6 @@ playerSummary :: Player -> String
 playerSummary p =
   p^.pName ++ " (" ++ show (p^.pNumber) ++ ") " ++ p^.pPosition
 
--- | Provides a detailed string describing a 'Player'
-playerDetails :: Player -> String
-playerDetails p = unlines
-  [ "               Number: " ++ show (p^.pNumber)
-  , "                 Name: " ++ p^.pName
-  , "             Position: " ++ p^.pPosition
-  , "            YTD goals: " ++ show (p^.pYtd.psGoals)
-  , "          YTD assists: " ++ show (p^.pYtd.psAssists)
-  , "     YTD penalty mins: " ++ show (p^.pYtd.psPMin)
-  , "       Lifetime goals: " ++ show (p^.pLifetime.psGoals)
-  , "     Lifetime assists: " ++ show (p^.pLifetime.psAssists)
-  , "Lifetime penalty mins: " ++ show (p^.pLifetime.psPMin)
-  ]
-
 -- | Determines whether or not a player has been active in the current
 -- season/year
 playerIsActive :: Player -> Bool