added parsing of dates in general

added some dates to the investment statement
iffy · Dec 9, 2010 · eebcdac · eebcdac
1 parent a6857b1
commit eebcdac
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/ofxparse/ofxparse.py b/ofxparse/ofxparse.py
@@ -1,5 +1,5 @@
 from BeautifulSoup import BeautifulStoneSoup
-import decimal
+import decimal, datetime
 
 class Ofx(object):
     pass
@@ -76,6 +76,13 @@ def parse(cls_, file_handle):
             return ofx_obj
         return ofx_obj
 
+    @classmethod
+    def parseOfxDateTime(cls_, ofxDateTime):
+        #dateAsString looks like 20101106160000.00[-5:EST]
+        #for 6 Nov 2010 4pm UTC-5 aka EST
+        timeZoneOffset = datetime.timedelta(hours=int(ofxDateTime[19:].split(':')[0]))
+        return datetime.datetime.strptime(ofxDateTime[:18], '%Y%m%d%H%M%S.%f') - timeZoneOffset
+
     @classmethod
     def parseInvstmtrs(cls_, invstmtrs_ofx):
         account = InvestmentAccount()
@@ -102,6 +109,9 @@ def parseInvestmentPosition(cls_, ofx):
         tag = ofx.find('unitprice')
         if (hasattr(tag, 'contents')):
             position.unit_price = decimal.Decimal(tag.contents[0].strip())
+        tag = ofx.find('dtpriceasof')
+        if (hasattr(tag, 'contents')):
+            position.date = cls_.parseOfxDateTime(tag.contents[0].strip())
         return position
 
     @classmethod
@@ -121,6 +131,12 @@ def parseInvestmentTransaction(cls_, ofx):
     @classmethod
     def parseInvestmentStatement(cls_, invstmtrs_ofx):
         statement = InvestmentStatement()
+        tag = invstmtrs_ofx.find('dtstart')
+        if (hasattr(tag, 'contents')):
+            statement.start_date = cls_.parseOfxDateTime(tag.contents[0].strip())
+        tag = invstmtrs_ofx.find('dtend')
+        if (hasattr(tag, 'contents')):
+            statement.end_date = cls_.parseOfxDateTime(tag.contents[0].strip())
         for position_ofx in invstmtrs_ofx.findAll("posmf"):
             statement.positions.append(cls_.parseInvestmentPosition(position_ofx))
         for transaction_ofx in invstmtrs_ofx.findAll("buymf"):
@@ -150,10 +166,10 @@ def parseStatement(cls_, stmt_ofx):
         statement = Statement()
         dtstart_tag = stmt_ofx.find('dtstart')
         if hasattr(dtstart_tag, "contents"):
-            statement.start_date = dtstart_tag.contents[0].strip()
+            statement.start_date = cls_.parseOfxDateTime(dtstart_tag.contents[0].strip())
         dtend_tag = stmt_ofx.find('dtend')
         if hasattr(dtend_tag, "contents"):
-            statement.end_date = dtend_tag.contents[0].strip()
+            statement.end_date = cls_.parseOfxDateTime(dtend_tag.contents[0].strip())
         ledger_bal_tag = stmt_ofx.find('ledgerbal')
         if hasattr(ledger_bal_tag, "contents"):
             balamt_tag = ledger_bal_tag.find('balamt')
@@ -193,7 +209,7 @@ def parseTransaction(cls_, txn_ofx):
 
         date_tag = txn_ofx.find('dtposted')
         if hasattr(date_tag, "contents"):
-            transaction.date = date_tag.contents[0].strip()
+            transaction.date = cls_.parseOfxDateTime(date_tag.contents[0].strip())
 
         id_tag = txn_ofx.find('fitid')
         if hasattr(id_tag, "contents"):