Section 06 simplified using new tabular rules from hledger 1.19+

06-maintaining-lots-of-csv-rules/export/export.hs

@@ -62,7 +62,7 @@ reports first current =
 -- Extra dependencies of the import files
 -----------------------------------------
 extraDeps file
-  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "generated.rules"]
+  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "rules.psv"]
   | otherwise = []
 
 -----------------------------------------------
@@ -133,9 +133,6 @@ export_all flags targets = return $ Just $ do
   -- Enumerate directories with auto-generated journals
   [ "//import/lloyds/journal/*.journal" ] |%> csv2journal
 
-  -- Whenever we need generated.rules, produce them from rules.psv
-  "//import//generated.rules" %> generated_rules
-
 -------------------------------------
 -- Implementations of the build rules
 -------------------------------------
@@ -191,12 +188,6 @@ csv2journal out = do
   (Stdout output) <- cmd (Cwd source_dir) Shell "./csv2journal" [makeRelative source_dir input]
   writeFileChanged out output
 
-generated_rules out = do
-  let (dir, file) = splitFileName out
-  need [ dir </> "rules.psv", dir </> ".." </> "psv-to-rules.awk" ]
-  (Stdout output) <- cmd (Cwd dir) "awk" ["-F", "|", "-f", "../psv-to-rules.awk", "rules.psv"]
-  writeFileChanged out output
-
 -------------------
 -- Helper functions
 -------------------

06-maintaining-lots-of-csv-rules/import/lloyds/lloyds.rules

@@ -5,4 +5,4 @@ date-format %d/%m/%Y
 currency1 £
 account2  expenses:unknown
 
-include generated.rules
+include rules.psv

06-maintaining-lots-of-csv-rules/import/lloyds/rules.psv

@@ -1,6 +1,7 @@
-INTEREST|income:interest
-EMPLOYER INC|income:employer
-TRANSFER|assets:Lloyds:transfers
-WAITROSE|expenses:groceries
-OASIS COFFEE|expenses:coffee
-AVIVA|assets:pension:aviva
+if|account2|comment
+INTEREST|income:interest|
+EMPLOYER INC|income:employer|
+TRANSFER|assets:Lloyds:transfers|
+WAITROSE|expenses:groceries|
+OASIS COFFEE|expenses:coffee|
+AVIVA|assets:pension:aviva|

07-investments-easy-approach/export/export.hs

@@ -69,7 +69,7 @@ reports first current =
 -- Extra dependencies of the import files
 -----------------------------------------
 extraDeps file
-  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "generated.rules"]
+  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "rules.psv"]
   | otherwise = []
 
 -----------------------------------------------
@@ -140,9 +140,6 @@ export_all flags targets = return $ Just $ do
   -- Enumerate directories with auto-generated journals
   [ "//import/lloyds/journal/*.journal" ] |%> csv2journal
 
-  -- Whenever we need generated.rules, produce them from rules.psv
-  "//import//generated.rules" %> generated_rules
-
   ("//" ++ investments) %> generate_investments_report current year_inputs
 
 -------------------------------------
@@ -200,12 +197,9 @@ csv2journal out = do
   (Stdout output) <- cmd (Cwd source_dir) Shell "./csv2journal" [makeRelative source_dir input]
   writeFileChanged out output
 
-generated_rules out = do
-  let (dir, file) = splitFileName out
-  need [ dir </> "rules.psv", dir </> ".." </> "psv-to-rules.awk" ]
-  (Stdout output) <- cmd (Cwd dir) "awk" ["-F", "|", "-f", "../psv-to-rules.awk", "rules.psv"]
-  writeFileChanged out output
-
+-------------------
+-- Helper functions
+-------------------
 generate_investments_report current year_inputs out = do
   deps <- mapM (year_inputs . show) (investment_years current)
   need (concat deps)

07-investments-easy-approach/import/lloyds/lloyds.rules

@@ -5,4 +5,4 @@ date-format %d/%m/%Y
 currency1 £
 account2  expenses:unknown
 
-include generated.rules
+include rules.psv

07-investments-easy-approach/import/lloyds/rules.psv

@@ -1,6 +1,7 @@
-INTEREST|income:interest
-EMPLOYER INC|income:employer
-TRANSFER|assets:Lloyds:transfers
-WAITROSE|expenses:groceries
-OASIS COFFEE|expenses:coffee
-AVIVA|assets:pension:aviva
+if|account2|comment
+INTEREST|income:interest|
+EMPLOYER INC|income:employer|
+TRANSFER|assets:Lloyds:transfers|
+WAITROSE|expenses:groceries|
+OASIS COFFEE|expenses:coffee|
+AVIVA|assets:pension:aviva|

08-mortgage/export/export.hs

@@ -71,7 +71,7 @@ reports first current =
 -- Extra dependencies of the import files
 -----------------------------------------
 extraDeps file
-  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "generated.rules"]
+  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "rules.psv"]
   | otherwise = []
 
 -----------------------------------------------
@@ -142,9 +142,6 @@ export_all flags targets = return $ Just $ do
   -- Enumerate directories with auto-generated journals
   [ "//import/lloyds/journal/*.journal" ] |%> csv2journal
 
-  -- Whenever we need generated.rules, produce them from rules.psv
-  "//import//generated.rules" %> generated_rules
-
   ("//" ++ investments) %> generate_investments_report current year_inputs
 
   -- Mortgage interest transactions
@@ -205,12 +202,9 @@ csv2journal out = do
   (Stdout output) <- cmd (Cwd source_dir) Shell "./csv2journal" [makeRelative source_dir input]
   writeFileChanged out output
 
-generated_rules out = do
-  let (dir, file) = splitFileName out
-  need [ dir </> "rules.psv", dir </> ".." </> "psv-to-rules.awk" ]
-  (Stdout output) <- cmd (Cwd dir) "awk" ["-F", "|", "-f", "../psv-to-rules.awk", "rules.psv"]
-  writeFileChanged out output
-
+-------------------
+-- Helper functions
+-------------------
 generate_investments_report current year_inputs out = do
   deps <- mapM (year_inputs . show) (investment_years current)
   need (concat deps)

08-mortgage/import/lloyds/lloyds.rules

@@ -5,4 +5,4 @@ date-format %d/%m/%Y
 currency1 £
 account2  expenses:unknown
 
-include generated.rules
+include rules.psv

08-mortgage/import/lloyds/rules.psv

@@ -1,7 +1,8 @@
-INTEREST|income:interest
-EMPLOYER INC|income:employer
-TRANSFER|assets:Lloyds:transfers
-WAITROSE|expenses:groceries
-OASIS COFFEE|expenses:coffee
-AVIVA|assets:pension:aviva
-HSBC|liabilities:mortgage
+if|account2|comment
+INTEREST|income:interest|
+EMPLOYER INC|income:employer|
+TRANSFER|assets:Lloyds:transfers|
+WAITROSE|expenses:groceries|
+OASIS COFFEE|expenses:coffee|
+AVIVA|assets:pension:aviva|
+HSBC|liabilities:mortgage|

09-remortgage/export/export.hs

@@ -71,7 +71,7 @@ reports first current =
 -- Extra dependencies of the import files
 -----------------------------------------
 extraDeps file
-  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "generated.rules"]
+  | "//lloyds//*.journal" ?== file   = ["lloyds.rules", "rules.psv"]
   | otherwise = []
 
 -----------------------------------------------
@@ -142,9 +142,6 @@ export_all flags targets = return $ Just $ do
   -- Enumerate directories with auto-generated journals
   [ "//import/lloyds/journal/*.journal" ] |%> csv2journal
 
-  -- Whenever we need generated.rules, produce them from rules.psv
-  "//import//generated.rules" %> generated_rules
-
   ("//" ++ investments) %> generate_investments_report current year_inputs
 
   -- Mortgage interest transactions
@@ -205,12 +202,9 @@ csv2journal out = do
   (Stdout output) <- cmd (Cwd source_dir) Shell "./csv2journal" [makeRelative source_dir input]
   writeFileChanged out output
 
-generated_rules out = do
-  let (dir, file) = splitFileName out
-  need [ dir </> "rules.psv", dir </> ".." </> "psv-to-rules.awk" ]
-  (Stdout output) <- cmd (Cwd dir) "awk" ["-F", "|", "-f", "../psv-to-rules.awk", "rules.psv"]
-  writeFileChanged out output
-
+-------------------
+-- Helper functions
+-------------------
 generate_investments_report current year_inputs out = do
   deps <- mapM (year_inputs . show) (investment_years current)
   need (concat deps)