Only put .journal files in the generated include files. Fixes #92

Author: apauley

ChangeLog.md

@@ -1,5 +1,11 @@
 # Changelog for [hledger-flow](https://github.com/apauley/hledger-flow)
 
+## 0.14.3
+
+Ensure that generated include files only contain files ending with .journal
+
+Fixes [#92](https://github.com/apauley/hledger-flow/issues/92)
+
 ## 0.14.2
 
 Add an optional `--start-year` command-line option for imports:

package.yaml

@@ -1,5 +1,5 @@
 name:                hledger-flow
-version:             0.14.2.0
+version:             0.14.3.0
 synopsis:            An hledger workflow focusing on automated statement import and classification.
 category:            Finance, Console
 license:             GPL-3

src/Hledger/Flow/Import/ImportHelpersTurtle.hs

@@ -56,7 +56,10 @@ importDirBreakdown' acc path = do
     else importDirBreakdown' (dir:acc) $ Turtle.parent dir
 
 groupIncludeFiles :: [TurtlePath] -> (TurtleFileBundle, TurtleFileBundle)
-groupIncludeFiles = allYearIncludeFiles . groupIncludeFilesPerYear
+groupIncludeFiles = allYearIncludeFiles . groupIncludeFilesPerYear . filter isJournalFile
+
+isJournalFile :: TurtlePath -> Bool
+isJournalFile f = Turtle.extension f == Just "journal"
 
 allYearIncludeFiles :: TurtleFileBundle -> (TurtleFileBundle, TurtleFileBundle)
 allYearIncludeFiles m = (m, yearsIncludeMap $ Map.keys m)

stack.yaml

@@ -18,7 +18,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: nightly-2021-01-05
+resolver: nightly-2021-02-06
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.

stack.yaml.lock

@@ -6,7 +6,7 @@
 packages: []
 snapshots:
 - completed:
-    size: 562051
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/1/5.yaml
-    sha256: be105362ec57d665ea17fa574ab195c49bb1f9a5bd9016174ef83cd368fba253
-  original: nightly-2021-01-05
+    size: 565469
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2021/2/6.yaml
+    sha256: 7108f8cb8c928699c6c3c6574d3f6fc132db8bbba6a3987f9446fb35fd67dbf6
+  original: nightly-2021-02-06

test/Common/Integration.hs

@@ -23,7 +23,7 @@ testHiddenFiles = TestCase (
         let tmpHidden = map (tmpdir </>) hiddenFiles :: [TurtlePath]
         let onDisk = List.sort $ tmpJournals ++ tmpExtras ++ tmpHidden
         touchAll onDisk
-        filtered <- (fmap List.sort) $ shellToList $ onlyFiles $ select onDisk
+        filtered <- fmap List.sort $ shellToList $ onlyFiles $ select onDisk
         let expected = List.sort $ tmpExtras ++ tmpJournals
         liftIO $ assertEqual "Hidden files should be excluded" expected filtered
      )

test/TestHelpersTurtle.hs

@@ -44,13 +44,20 @@ inputFiles :: [TurtlePath]
 inputFiles = inputJohnBogart <> inputJohnOther <> inputJaneBogart <> inputJaneOther
 
 journalFiles :: [TurtlePath]
-journalFiles = toJournals inputFiles
+journalFiles = toJournals inputFiles ++ ignoredJournalFiles
+
+ignoredJournalFiles :: [TurtlePath]
+ignoredJournalFiles = ["import/john/bogartbank/checking/3-journal/2018/not-a-journal.pdf"]
 
 extraFiles :: [TurtlePath]
 extraFiles = ["import/john/bogartbank/savings/2017-opening.journal"]
 
 hiddenFiles :: [TurtlePath]
-hiddenFiles = [".hiddenfile", "checking/.DS_Store", "import/john/bogartbank/savings/1-in/.anotherhiddenfile", "import/john/bogartbank/checking/1-in/2018/.hidden"]
+hiddenFiles = [".hiddenfile",
+               "checking/.DS_Store",
+               "import/john/bogartbank/savings/1-in/.anotherhiddenfile",
+               "import/john/bogartbank/checking/1-in/2018/.hidden",
+               "import/john/bogartbank/checking/3-journal/2018/.hidden"]
 
 toJournals :: [TurtlePath] -> [TurtlePath]
 toJournals = map (changePathAndExtension "3-journal" "journal")