===================================================================
RCS file: /cvs/pta/pta_import.pl,v
retrieving revision 1.1
retrieving revision 1.6
diff -u -p -r1.1 -r1.6
--- pta/pta_import.pl	2020/10/31 01:02:57	1.1
+++ pta/pta_import.pl	2020/11/10 17:25:58	1.6
@@ -16,83 +16,139 @@
 
 use warnings;
 use strict;
-use autodie;
 
-# Please change the account numbers below to match the 
-# desired accounts in your accounts.txt.
-
-my %accounts = (
-    CHASE_CREDIT_CARD => '1234',
-    CHASE_PAYMENT_ACCOUNT => '5678',
-    AUTO => '1111',
-    BILLS => '2222',
-    FEES => '3333',
-    FOOD => '4444',
-    GAS => '5555',
-    GIFTS => '6666',
-    GROCERIES => '7777',
-    HEALTH => '8888',
-    HOME => '9999',
-    PERSONAL => '9998',
-    PRO => '9997',
-    SHOP => '9996'
-);
-
-# This is the end of the user-configurable section.
-
 # === SUBROUTINES  =====================================================
 
-sub import_chase_credit_card() {
-	my %categories = (
-	    'Automotive' => 'AUTO',
-  	    'Bills & Utilities' => 'BILLS',
-	    'Fees & Adjustments' => 'FEES',
-	    'Food & Drink' => 'FOOD',
-	    'Gas' => 'GAS',
-	    'Gifts & Donations' => 'GIFTS',
-	    'Groceries' => 'GROCERIES',
-	    'Health & Wellness' => 'HEALTH',
-	    'Home' => 'HOME',
-	    'Personal' => 'PERSONAL',
-	    'Professional Services' => 'PRO',
-	    'Shopping' => 'SHOP'
-	);
-	while (<CSV>) {
+sub parse_import_file ($) {
+	my $fn = shift;
+	my (@compiled, %bookings, %accounts, $import_type);
+	my $csv_account = "";
+	if ($fn eq "import_chase_credit.txt") {
+		$import_type = "chase_credit";
+	} elsif ($fn eq "import_capital_one_credit.txt") { 
+		$import_type = "capital_one_credit";
+	} else {
+		die "Undefined import type for: $fn";
+	}
+	open my $in, $fn or die "$fn: $!";
+	while (<$in>) {
 		chomp;
-		my ($trans_date, $post_date, $description, $category, 
+		next if /^(?:#|$)/;
+		my $line = $_;
+		if (/^ACCOUNT/) {
+			$csv_account = $line;
+			$csv_account =~ s/^ACCOUNT\s+(\d+)$/$1/;
+			next;
+		}
+		s/^(.*),\s+(\d+)\s+(\S+)// or
+		    die "$fn import parse error: $line";
+		my ($reg, $account, $booking) = ($1, $2, $3);
+		$reg =~ s/(?:^|(?<=,))(?:$|(?=,))/[^,]*/g;
+		$reg = qr/$reg/;
+		push @compiled, $reg;
+		$bookings{$reg} = $booking;
+		$accounts{$reg} = $account;
+	}
+	close $in;
+	die "CSV account not defined in $fn" if ($csv_account eq "");
+	return (\%bookings, \%accounts, \@compiled, $csv_account, $import_type);
+}
+
+sub import_chase_credit_card ($$$$) {
+	my ($bookings_ref, $accounts_ref, $compiled_ref,
+	    $csv_account) = @_;
+	my ($trans_date, $post_date, $description, $category, 
+	    $type, $amount);
+	chomp(my $header = <>);
+	while (<>) {
+		next if (/^$/);
+		chomp;
+		s#(\d+)/(\d+)/(\d+)#$3$1$2#g; 
+		my $line = $_;
+		($trans_date, $post_date, $description, $category, 
 		    $type, $amount) = split /,/;
-		
-		$trans_date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#; 
-		$post_date =~ s#(\d+)/(\d+)/(\d+)#$3$1$2#; 
 		$description =~ s/#//g;
-		my $booking = $categories{$category} || 
-		    'CHASE_PAYMENT_ACCOUNT';
-		my $contra = $accounts{$booking};
 		my ($debit, $credit);
+		my $booking = "";
+		my $account = "";
+		foreach my $regex (@$compiled_ref) {
+			if ($line =~ /$regex/) {
+				$account = %$accounts_ref{$regex};
+				$booking = %$bookings_ref{$regex};
+				last;
+			}
+		}
+		if ($booking eq "" || $account eq "") {
+			die "import parse error: $line";
+		}
 		if ($amount <= 0) {
 			$amount = substr $amount, 1;
-			$credit = $accounts{CHASE_CREDIT_CARD};
-			$debit = $contra;
+			$credit = $csv_account;	
+			$debit = $account;
 		} else {
-			$debit = $accounts{CHASE_CREDIT_CARD};
-			$credit = $contra;
+			$debit = $csv_account;	
+			$credit = $account;
 		}
 		print "$post_date $booking $debit $credit $amount " .
 		    "$description\n";
 	}
 }
 
+sub import_capital_one_credit_card ($$$$) {
+	my ($bookings_ref, $accounts_ref, $compiled_ref,
+	    $csv_account) = @_;
+	my ($trans_date, $post_date, $card_num, $description,
+	    $category, $csv_debit, $csv_credit, $amount);
+	chomp(my $header = <>);
+	while (<>) {
+		next if (/^$/);
+		chomp;
+		s/(\d+)-(\d+)-(\d+)/$1$2$3/g; 
+		my $line = $_;
+		($trans_date, $post_date, $card_num, $description,
+		    $category, , $csv_debit, $csv_credit) = split /,/;
+		$description =~ s/#//g;
+		my ($debit, $credit);
+		my $booking = "";
+		my $account = "";
+		foreach my $regex (@$compiled_ref) {
+			if ($line =~ /$regex/) {
+				$account = %$accounts_ref{$regex};
+				$booking = %$bookings_ref{$regex};
+				last;
+			}
+		}
+		if ($booking eq "" || $account eq "") {
+			die "import parse error: $line";
+		}
+		if ($csv_debit =~ /^$/) {
+			$amount = $csv_credit;
+			$credit = $account;
+			$debit = $csv_account;
+		} else {
+			$amount = $csv_debit;
+			$credit = $csv_account;
+			$debit = $account;
+		}
+		print "$post_date $booking $debit $credit $amount " .
+		    "$description\n";
+	}
+}
 # === MAIN PROGRAM =====================================================
 
-my $chase_credit_card_header = "Transaction Date,Post Date," .
-    "Description,Category,Type,Amount";
-my $firstLine;
+# This begins the user-editable section to select the formatting file. 
+my $fn = "import_capital_one_credit.txt";	
+# my $fn = "import_chase_credit.txt";	
+# This ends the user-editable section to select the formatting file. 
 
-open CSV, '<', $ARGV[0];
-chomp($firstLine = <CSV>);
-if ($firstLine eq $chase_credit_card_header) {
-	import_chase_credit_card;
+my ($bookings_ref, $accounts_ref, $compiled_ref, $csv_account, $import_type) =
+    parse_import_file $fn;
+if ($import_type eq "chase_credit") {
+	import_chase_credit_card $bookings_ref, $accounts_ref,
+	    $compiled_ref, $csv_account;
+} elsif ($import_type eq "capital_one_credit") {
+	import_capital_one_credit_card $bookings_ref, $accounts_ref,
+	$compiled_ref, $csv_account;
 } else {
-	print "Undefined bank header\n";
+	die "Undefined import type: $import_type";
 }
-close CSV;