slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev:import: drop archiving of original data

Browse Source 
just archive clean data
This commit is contained in:
Simon Michael 2025-08-24 09:40:31 +01:00
parent b64ddfe813
commit e796a00fc4
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hledger-lib/Hledger/Read/RulesReader.hs
View File

@ -79,7 +79,7 @@ import qualified Data.Text.IO as T
import Data.Time ( Day, TimeZone, UTCTime, LocalTime, ZonedTime(ZonedTime), import Data.Time ( Day, TimeZone, UTCTime, LocalTime, ZonedTime(ZonedTime),
defaultTimeLocale, getCurrentTimeZone, localDay, parseTimeM, utcToLocalTime, localTimeToUTC, zonedTimeToUTC, utctDay) defaultTimeLocale, getCurrentTimeZone, localDay, parseTimeM, utcToLocalTime, localTimeToUTC, zonedTimeToUTC, utctDay)
import Safe (atMay, headMay, lastMay, readMay) import Safe (atMay, headMay, lastMay, readMay)
import System.Directory (createDirectoryIfMissing, doesFileExist, getHomeDirectory, getModificationTime, renameFile) import System.Directory (createDirectoryIfMissing, doesFileExist, getHomeDirectory, getModificationTime, renameFile, removeFile)
-- import System.Directory (createDirectoryIfMissing, doesFileExist, getHomeDirectory, getModificationTime, listDirectory, renameFile, doesDirectoryExist) -- import System.Directory (createDirectoryIfMissing, doesFileExist, getHomeDirectory, getModificationTime, listDirectory, renameFile, doesDirectoryExist)
import System.Exit (ExitCode(..)) import System.Exit (ExitCode(..))
import System.FilePath (stripExtension, takeBaseName, takeDirectory, takeExtension, takeFileName, (<.>), (</>)) import System.FilePath (stripExtension, takeBaseName, takeDirectory, takeExtension, takeFileName, (<.>), (</>))
@ -259,22 +259,25 @@ runFilterCommand rulesfile cmd input = do
-- The remaining arguments are: the rules file path (for naming), the original data file, -- The remaining arguments are: the rules file path (for naming), the original data file,
-- and if there was a data-cleaning command, the cleaned data from that file. -- and if there was a data-cleaning command, the cleaned data from that file.
-- The archive file name will be RULESFILEBASENAME.DATAFILEMODDATE.DATAFILEEXT. -- The archive file name will be RULESFILEBASENAME.DATAFILEMODDATE.DATAFILEEXT.
-- When there is cleaned data, the original data is also saved, as -- When there is cleaned data, currently only that is saved (not the original data).
-- RULESFILEBASENAME.orig.DATAFILEMODDATE.DATAFILEEXT.
saveToArchive :: FilePath -> FilePath -> FilePath -> Maybe Text -> IO () saveToArchive :: FilePath -> FilePath -> FilePath -> Maybe Text -> IO ()
saveToArchive archivedir rulesfile datafile mcleandata = do saveToArchive archivedir rulesfile datafile mcleandata = do
createDirectoryIfMissing True archivedir createDirectoryIfMissing True archivedir
hPutStrLn stderr $ "archiving " <> datafile hPutStrLn stderr $ "archiving " <> datafile
(origname, cleanname) <- archiveFileName rulesfile datafile (_origname, cleanname) <- archiveFileName rulesfile datafile
let let
origarchive = archivedir </> origname
cleanarchive = archivedir </> cleanname cleanarchive = archivedir </> cleanname
-- origarchive = archivedir </> origname
case mcleandata of case mcleandata of
Just cleandata -> do Just cleandata -> do
hPutStrLn stderr $ " as " <> origarchive -- disabled for simplicity:
renameFile datafile origarchive -- the original data is also saved, as RULESFILEBASENAME.orig.DATAFILEMODDATE.DATAFILEEXT.
hPutStrLn stderr $ " and " <> cleanarchive -- hPutStrLn stderr $ " as " <> origarchive
-- renameFile datafile origarchive
-- hPutStrLn stderr $ " and " <> cleanarchive
hPutStrLn stderr $ " as " <> cleanarchive
T.writeFile cleanarchive cleandata T.writeFile cleanarchive cleandata
removeFile datafile
Nothing -> do Nothing -> do
hPutStrLn stderr $ " as " <> cleanarchive hPutStrLn stderr $ " as " <> cleanarchive
renameFile datafile cleanarchive renameFile datafile cleanarchive