3 次代碼提交 4b74fc6e39 ... b709eb70c4

作者 SHA1 備註 提交日期
  Daniel Sheffield b709eb70c4 update credentials 1 周之前
  Daniel Sheffield a78fb45707 updating Tapiri Dairy key 1 周之前
  Daniel Sheffield 4324b8f500 add list of default tags to exclude 1 周之前
共有 1 個文件被更改,包括 15 次插入7 次删除
  1. 15 7
      reconcile.py

+ 15 - 7
reconcile.py

@@ -10,7 +10,7 @@
 import sys
 if sys.argv[1] == '-h':
     print("""
-  usage:  ./reconcile.py ~/gnucash/merged.gnucash 2024-02-01 2024-06-10 1 Alcohol Sundries CatFood Cleaning 2T
+  usage:  ./reconcile.py ~/gnucash/merged.gnucash 2024-02-01 2024-06-10 1
 """)
     sys.exit(0)
 
@@ -23,11 +23,20 @@ import psycopg
 from app.data.QueryManager import cursor_as_dict
 from app.data.TransactionView import get_session_transactions_statement as get_statement
 
-
+DEFAULT_TAGS =[
+    'Alcohol',
+    'Sundries',
+    'CatFood',
+    'Cleaning',
+    '2T',
+    'Snack',
+    'Travel',
+]
 try:
-    from db_credentials import HOST, PASSWORD
+    from db_credentials import USER, HOST, PASSWORD
     host = f'host={HOST}'
     password = f'password={PASSWORD}'
+    user = f'user={USER}'
 except:
     host = ''
     password = ''
@@ -43,7 +52,7 @@ STORE_CODES = {
     'ORGANICFOOD': 'TOFS',
     'TOFS' : 'TOFS',
     'WHATAWHATA BERRY FARM': 'Farm',
-    'TAUPIRI DAIRY TAUPIRI': 'TD',
+    'TAUPIRI DAIRY': 'TD',
     'Dreamview Cre': 'DV',
     'new world': 'NW',
     'BIN INN': 'BI',
@@ -63,8 +72,7 @@ STORE_CODES = {
     'WWNZ' : 'CD',
 }
 
-user = os.getenv('USER')
-conn = psycopg.connect(f"{host} dbname=grocery user={user} {password}")
+conn = psycopg.connect(f"{host} dbname=grocery {user} {password}")
 cur = conn.cursor()
 output = []
 
@@ -155,7 +163,7 @@ def _iter(root, blacklist, whitelist, _from, _to):
 if __name__ == '__main__':
   args = sys.argv
   session = gnucash.Session(args[1])
-  tags = set()
+  tags = set(DEFAULT_TAGS)
   if len(args) > 5:
     for arg in args[5:]:
       tags.add(arg)