Added cache-file option.

I really need to clean up these files... way too many main()s floating around...

Author: himmAllRight

Makefile

@@ -1,4 +1,4 @@
-LIA="lia"
+LIA=lia
 INPUT1="test-files/test-input-small.csv"
 INPUT2="test-files/test-numbered-input.csv"
 OUTPUT="test-files/test-output.dat"
@@ -8,13 +8,13 @@ ACCOUNT="Liabilities:CreditCard:Ryan"
 
 
 run:
-	python3 $(LIA) -f $(INPUT1) -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -c
+	python3 $(LIA) -f $(INPUT1) -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -C 
 run2:
-	python3 $(LIA) -f $(INPUT2) -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -c
+	python3 $(LIA) -f $(INPUT2) -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -C
 manual:
-	python3 $(LIA) -m -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -c
+	python3 $(LIA) -m -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -C
 cacheRun:
-	python3 $(LIA) -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -c
+	python3 $(LIA) -o $(OUTPUT) -a $(ACCOUNT) -r $(RULES) -C
 build:
 	nuitka --recurse-all $(LIA)
 

lia

@@ -25,7 +25,10 @@ def main():
                         help="Manually write new Transactions instead of file import.",
                         required=False)
     parser.add_argument('-o', '--output', help="output ledger file name", required=True)
-    parser.add_argument('-c', '--color', action="store_true", help="Turns on the colored output", required=False)
+    parser.add_argument('-C', '--color', action="store_true", help="Turns on the colored output",
+                        required=False)
+    parser.add_argument('-c', '--cache', help="Defines the cache file location. Defaults to ~/.lia-cache.csv",
+                        required=False)
     parser.add_argument('-a', '--import-account', help="Default import account", required=True)
     parser.add_argument('-d', '--date-format', help="date-format", required=False)
     parser.add_argument('-w', '--overwrite', help="Overwrite output file. Defaults to append", required=False)
@@ -37,6 +40,8 @@ def main():
     inputFile = argSet('input', args, lambda key, value: open(value, "r"))
     ruleList = argSet('rules', args, lambda key, value: rules.parseRuleList(value))
     promptColor = argSet('color', args, lambda key, value: True)
+    cacheFileSRC = argSet('cache', args, lambda key, value: value,
+                          failReturn= os.path.expanduser('~') + os.sep + ".lia-cache.csv")
 
     # if(args['input']):
     #     inputFile     = open(args['input'], "r")
@@ -50,7 +55,6 @@ def main():
 
     manualInput = args['manual']
     outputFile = backend.openOutputFile(args['output'], args['overwrite'])
-    cacheFileSRC = os.path.expanduser('~') + os.sep + ".lia-cache.csv"
     importAccount = args['import_account']
     dateFormat = "%m/%d/%Y"
 

lialib/__main__.py

@@ -17,6 +17,7 @@ def argSet(key, args, fn, failReturn= False):
 ## Main CLI Loop
 def main():
     """ The Main Class"""
+    print("Lialib Main")
     parser = argparse.ArgumentParser(description="Convert csv files to Ledger")
     parser.add_argument('-f', '--input', help="Input csv file name", required=False)
     parser.add_argument('-r', '--rules', help="Automatic rules file", required=False)
@@ -25,6 +26,7 @@ def main():
                         required=False)
     parser.add_argument('-o', '--output', help="output ledger file name", required=True)
     parser.add_argument('-c', '--color', action="store_true", help="Turns on the colored output", required=False)
+    parser.add_argument('-s', '--cache', help="Defines the cache file location. Defaults to ~/.lia-cache.csv", required=False)
     parser.add_argument('-a', '--import-account', help="Default import account", required=True)
     parser.add_argument('-d', '--date-format', help="date-format", required=False)
     parser.add_argument('-w', '--overwrite', help="Overwrite output file. Defaults to append", required=False)