The --format option's OutputFormat type was named confusingly like the --output-format option. It has been renamed StringFormat to distinguish it from StorageFormat (aka the data file format, referenced by --output-format). Related code and types have been consolidated. Also the (single-column) balance report's item rendering has had some cleanup.
		
			
				
	
	
		
			149 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			Haskell
		
	
	
	
	
	
			
		
		
	
	
			149 lines
		
	
	
		
			6.2 KiB
		
	
	
	
		
			Haskell
		
	
	
	
	
	
| -- | Parse format strings provided by --format, with awareness of
 | |
| -- hledger's report item fields. Also provides a string formatting
 | |
| -- helper.
 | |
| 
 | |
| {-# LANGUAGE FlexibleContexts #-}
 | |
| 
 | |
| module Hledger.Data.StringFormat (
 | |
|           parseStringFormat
 | |
|         , formatString
 | |
|         , StringFormat(..)
 | |
|         , ReportItemField(..)
 | |
|         -- , stringformatp
 | |
|         , tests
 | |
|         ) where
 | |
| 
 | |
| import Prelude ()
 | |
| import Prelude.Compat
 | |
| import Numeric
 | |
| import Data.Char (isPrint)
 | |
| import Data.Maybe
 | |
| import Test.HUnit
 | |
| import Text.Parsec
 | |
| import Text.Printf (printf)
 | |
| 
 | |
| 
 | |
| -- | A format specification/template to use when rendering report line items as text.
 | |
| -- These are currently supported by the balance command.
 | |
| data StringFormat =
 | |
|     FormatLiteral String
 | |
|   | FormatField Bool        -- Left justified ?
 | |
|                 (Maybe Int) -- Min width
 | |
|                 (Maybe Int) -- Max width
 | |
|                 ReportItemField       -- Field name
 | |
|   deriving (Show, Eq)
 | |
| 
 | |
| -- | An id identifying which report item field to interpolate.  These
 | |
| -- are drawn from several hledger report types, so are not all
 | |
| -- applicable for a given report.
 | |
| data ReportItemField =
 | |
|     AccountField
 | |
|   | DefaultDateField
 | |
|   | DescriptionField
 | |
|   | TotalField
 | |
|   | DepthSpacerField
 | |
|   | FieldNo Int
 | |
|     deriving (Show, Eq)
 | |
| 
 | |
| -- | Clip and pad a string to a minimum & maximum width, and/or left/right justify it.
 | |
| formatString :: Bool -> Maybe Int -> Maybe Int -> String -> String
 | |
| formatString leftJustified min max s = printf fmt s
 | |
|     where
 | |
|       l = if leftJustified then "-" else ""
 | |
|       min' = maybe "" show min
 | |
|       max' = maybe "" (\i -> "." ++ (show i)) max
 | |
|       fmt = "%" ++ l ++ min' ++ max' ++ "s"
 | |
| 
 | |
| -- | Parse a string format specification, or return a parse error.
 | |
| parseStringFormat :: String -> Either String [StringFormat]
 | |
| parseStringFormat input = case (runParser (stringformatp <* eof) () "(unknown)") input of
 | |
|     Left y -> Left $ show y
 | |
|     Right x -> Right x
 | |
| 
 | |
| ----------------------------------------------------------------------
 | |
| 
 | |
| field :: Stream [Char] m Char => ParsecT [Char] st m ReportItemField
 | |
| field = do
 | |
|         try (string "account" >> return AccountField)
 | |
|     <|> try (string "depth_spacer" >> return DepthSpacerField)
 | |
|     <|> try (string "date" >> return DescriptionField)
 | |
|     <|> try (string "description" >> return DescriptionField)
 | |
|     <|> try (string "total" >> return TotalField)
 | |
|     <|> try (many1 digit >>= (\s -> return $ FieldNo $ read s))
 | |
| 
 | |
| formatField :: Stream [Char] m Char => ParsecT [Char] st m StringFormat
 | |
| formatField = do
 | |
|     char '%'
 | |
|     leftJustified <- optionMaybe (char '-')
 | |
|     minWidth <- optionMaybe (many1 $ digit)
 | |
|     maxWidth <- optionMaybe (do char '.'; many1 $ digit) -- TODO: Can this be (char '1') *> (many1 digit)
 | |
|     char '('
 | |
|     f <- field
 | |
|     char ')'
 | |
|     return $ FormatField (isJust leftJustified) (parseDec minWidth) (parseDec maxWidth) f
 | |
|     where
 | |
|       parseDec s = case s of
 | |
|         Just text -> Just m where ((m,_):_) = readDec text
 | |
|         _ -> Nothing
 | |
| 
 | |
| formatLiteral :: Stream [Char] m Char => ParsecT [Char] st m StringFormat
 | |
| formatLiteral = do
 | |
|     s <- many1 c
 | |
|     return $ FormatLiteral s
 | |
|     where
 | |
|       isPrintableButNotPercentage x = isPrint x && (not $ x == '%')
 | |
|       c =     (satisfy isPrintableButNotPercentage <?> "printable character")
 | |
|           <|> try (string "%%" >> return '%')
 | |
| 
 | |
| formatp :: Stream [Char] m Char => ParsecT [Char] st m StringFormat
 | |
| formatp =
 | |
|         formatField
 | |
|     <|> formatLiteral
 | |
| 
 | |
| stringformatp :: Stream [Char] m Char => ParsecT [Char] st m [StringFormat]
 | |
| stringformatp = many formatp
 | |
| 
 | |
| ----------------------------------------------------------------------
 | |
| 
 | |
| testFormat :: StringFormat -> String -> String -> Assertion
 | |
| testFormat fs value expected = assertEqual name expected actual
 | |
|     where
 | |
|         (name, actual) = case fs of
 | |
|             FormatLiteral l -> ("literal", formatString False Nothing Nothing l)
 | |
|             FormatField leftJustify min max _ -> ("field", formatString leftJustify min max value)
 | |
| 
 | |
| testParser :: String -> [StringFormat] -> Assertion
 | |
| testParser s expected = case (parseStringFormat s) of
 | |
|     Left  error -> assertFailure $ show error
 | |
|     Right actual -> assertEqual ("Input: " ++ s) expected actual
 | |
| 
 | |
| tests = test [ formattingTests ++ parserTests ]
 | |
| 
 | |
| formattingTests = [
 | |
|       testFormat (FormatLiteral " ")                                ""            " "
 | |
|     , testFormat (FormatField False Nothing Nothing DescriptionField)    "description" "description"
 | |
|     , testFormat (FormatField False (Just 20) Nothing DescriptionField)  "description" "         description"
 | |
|     , testFormat (FormatField False Nothing (Just 20) DescriptionField)  "description" "description"
 | |
|     , testFormat (FormatField True Nothing (Just 20) DescriptionField)   "description" "description"
 | |
|     , testFormat (FormatField True (Just 20) Nothing DescriptionField)   "description" "description         "
 | |
|     , testFormat (FormatField True (Just 20) (Just 20) DescriptionField) "description" "description         "
 | |
|     , testFormat (FormatField True Nothing (Just 3) DescriptionField)    "description" "des"
 | |
|     ]
 | |
| 
 | |
| parserTests = [
 | |
|       testParser ""                             []
 | |
|     , testParser "D"                            [FormatLiteral "D"]
 | |
|     , testParser "%(date)"                      [FormatField False Nothing Nothing DescriptionField]
 | |
|     , testParser "%(total)"                     [FormatField False Nothing Nothing TotalField]
 | |
|     , testParser "Hello %(date)!"               [FormatLiteral "Hello ", FormatField False Nothing Nothing DescriptionField, FormatLiteral "!"]
 | |
|     , testParser "%-(date)"                     [FormatField True Nothing Nothing DescriptionField]
 | |
|     , testParser "%20(date)"                    [FormatField False (Just 20) Nothing DescriptionField]
 | |
|     , testParser "%.10(date)"                   [FormatField False Nothing (Just 10) DescriptionField]
 | |
|     , testParser "%20.10(date)"                 [FormatField False (Just 20) (Just 10) DescriptionField]
 | |
|     , testParser "%20(account) %.10(total)\n"   [ FormatField False (Just 20) Nothing AccountField
 | |
|                                                 , FormatLiteral " "
 | |
|                                                 , FormatField False Nothing (Just 10) TotalField
 | |
|                                                 , FormatLiteral "\n"
 | |
|                                                 ]
 | |
|   ]
 |