main.py now implements nearly all the functionality of main.cc

1 files changed, 88 insertions, 20 deletions

diff --git a/main.py b/main.py
index 24fdc2b6..60c3e5ee 100644
--- a/main.py
+++ b/main.py
@@ -4,46 +4,114 @@ import time
 
 from ledger import *
 
-def hello (str):
-    print "Hello:", str
-def goodbye (str):
-    print "Goodbye:", str
+journal = Journal ()
 
 add_config_option_handlers ()
-add_option_handler ("hello", ":", hello)
-add_option_handler ("goodbye", ":", goodbye)
 
 args = process_arguments (sys.argv[1:])
+config.use_cache = len (config.data_file) > 0
 process_environment (os.environ, "LEDGER_")
 
-if len (args) > 0:
-    config.process_options (args[0], args[1:])
+if os.environ.has_key ("LEDGER"):
+    process_option ("file", os.environ["LEDGER"])
+if os.environ.has_key ("PRICE_HIST"):
+    process_option ("price-db", os.environ["PRICE_HIST"])
+if os.environ.has_key ("PRICE_EXP"):
+    process_option ("price-exp", os.environ["PRICE_EXP"])
+
+if len (args) == 0:
+    option_help ()
+    sys.exit (0)
+
+command = args.pop (0);
+
+if command == "balance" or command == "bal" or command == "b":
+    command = "b"
+elif command == "register" or command == "reg" or command == "r":
+    command = "r"
+elif command == "print" or command == "p":
+    command = "p"
+elif command == "entry":
+    command = "e"
+elif command == "equity":
+    command = "E"
+else:
+    print "Unrecognized command:", command
+    sys.exit (1)
 
 text_parser = TextualParser ()
+bin_parser  = BinaryParser ()
+qif_parser  = QifParser ()
+
 register_parser (text_parser)
+register_parser (bin_parser)
+register_parser (qif_parser)
 
-journal = Journal ()
-print parse_journal_file (args[0], journal), "entries"
+parse_ledger_data (journal, text_parser, bin_parser)
+
+config.process_options(command, args);
+
+new_entry = None
+if command == "e":
+    new_entry = journal.derive_entry (args)
+    if new_entry is None:
+	sys.exit (1)
 
 class FormatTransaction (TransactionHandler):
-    def __init__ (self, fmt):
-	self.formatter = Format (fmt)
+    last_entry = None
+
+    def __init__ (self, fmt = None):
+	if fmt is None:
+	    self.formatter  = config.format
+	    self.nformatter = config.nformat
+	else:
+	    self.formatter  = Format (fmt)
+
+	self.last_entry = None
+
 	TransactionHandler.__init__ (self)
 
     def __call__ (self, xact):
-	print self.formatter.format(xact)
+	if xact.entry is self.last_entry:
+	    print self.nformatter.format(xact),
+	else:
+	    print self.formatter.format(xact),
+	    self.last_entry = xact.entry
+
+handler = FormatTransaction()
+
+if not (command == "b" or command == "E"):
+    if config.display_predicate:
+	handler = FilterTransactions(handler, config.display_predicate)
+
+    handler = CalcTransactions(handler, config.show_inverted)
 
-expr = parse_value_expr ("a*2")
+    if config.sort_order:
+	handler = SortTransactions(handler, config.sort_order)
 
-def foo(x, val):
-    return x.xact.amount + expr.compute (x) + val
+    if config.show_revalued:
+	handler = ChangedValueTransactions(handler, config.show_revalued_only)
 
-handler = FormatTransaction("%D %-20P %N %('foo'{$100})")
-handler = FilterTransactions (handler, "/Checking/")
+    if config.show_collapsed:
+	handler = CollapseTransactions(handler);
+
+    if config.show_subtotal:
+	handler = SubtotalTransactions(handler)
+    elif config.report_interval:
+	handler = IntervalTransactions(handler, config.report_interval)
+    elif config.days_of_the_week:
+	handler = DowTransactions(handler)
+
+if config.show_related:
+    handler = RelatedTransactions(handler, config.show_all_related)
+
+if config.predicate:
+    handler = FilterTransactions(handler, config.predicate)
 
 for entry in journal:
     for xact in entry:
 	handler (xact)
 
-for date in Interval ("weekly last month"):
-    print time.strftime ("%c", time.localtime (date))
+handler.flush ()
+
+# jww (2004-09-14): still need to write out the cache