Merge lp:~wolfer7/wxbanker/bugfix-lp-534923 into lp:wxbanker

[wolfer]

changed csv-importer. previously one could only skip the first line, now it is possible to exactly specify how many rows should be skipped at the beginning of a file.

also added 'comdirect' to the shipped csv profiles.

[Michael Rooney (mrooney)]

Looks good, thanks for this feature and merge request! I can happily merge this after a few quick things. I would have just fixed the first two myself and pointed them out for your reference but the third one requires data from you.

 - It looks like there is a typo: "Linex to skip"
 - Instead of doing the counting logic like "if settings['linesToSkip']>linesSkipped: linesSkipped+=1", I would remove that logic and just change the for to "for row in csvReader[settings['linesToSkip']:]:"
 - All the included currencies should have tests with a small fixture CSV. It is fairly straightforward, see tests/csvimportertests.py for test examples, and you'll want to put an example CSV with a few transactions in the data/fixtures directory with the other .csv files.

Let me know if you have any questions and I look forward to merging this, thanks again!

review: Needs Fixing

[lp:~wolfer7/wxbanker/bugfix-lp-534923]

605. By wolfgang steitz <wolfer@IBWKA1> on 2010-03-10

added comdirect import test

[wolfer (wolfer7)]

Thanks, for merging this. This significantly improves my wxbanker experience, cause I don't need to manually adjust my csv files anymore. I just did some fixes.

1. just a typo
2. csvReader[settings['linesToSkip']] does not work:
      csvimporter.py", line 86, in getTransactionsFromCSV
      for row in csvReader[settings['linesToSkip']]:
      TypeError: '_csv.reader' object is unsubscriptable
3. I added a sample csv to the data directory and also a test function. Seems to work.

I had some problems running the unit tests, so I added a simple test.py to the main directory. Unfortunately localetests.py crashes..

Unmerged revisions

=== added file 'test.py'
--- test.py	1970-01-01 00:00:00 +0000
+++ test.py	2010-03-10 10:19:24 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+from wxbanker.tests import alltests
+alltests.main()

=== modified file 'wxbanker/csvimporter.py'
--- wxbanker/csvimporter.py	2009-12-06 03:40:42 +0000
+++ wxbanker/csvimporter.py	2010-03-10 10:19:24 +0000
@@ -40,7 +40,7 @@
         "delimiter": ",",
         "descriptionColumns": "2",
         "encoding": "utf-8",
-        "skipFirstLine": True
+        "linesToSkip": 1
     },
     "Sparkasse": {
         "amountColumn": 9,
@@ -50,7 +50,17 @@
         "delimiter": ";",
         "descriptionColumns": "6, 5 , 4",
         "encoding": "utf-8",
-        "skipFirstLine": True
+        "linesToSkip": 1
+     },
+     "comdirect": {
+        "amountColumn": 5,
+        "dateColumn": 1,
+        "dateFormat": "%d.%m.%Y",
+        "decimalSeparator": ",",
+        "delimiter": ";",
+        "descriptionColumns": "4 (3)",
+        "encoding": "iso8859-1",
+        "linesToSkip": 24
      }
 }
 
@@ -72,11 +82,13 @@
 
         transactions = []
 
-        firstLineSkipped = False
+        linesSkipped = 0
         for row in csvReader:
-            if settings['skipFirstLine'] and not firstLineSkipped:
-                firstLineSkipped = True
+            if settings['linesToSkip']>linesSkipped:
+                linesSkipped+=1
                 continue
+            if len(row) == 0: #empty line, reached end of file
+                break
 
             # convert to python unicode strings
             row = [unicode(s, "utf-8") for s in row]

=== modified file 'wxbanker/csvimportframe.py'
--- wxbanker/csvimportframe.py	2010-02-03 09:11:13 +0000
+++ wxbanker/csvimportframe.py	2010-03-10 10:19:24 +0000
@@ -124,9 +124,9 @@
         sizer.SetFlexibleDirection(wx.HORIZONTAL)
         staticBoxSizer.Add(sizer);
 
-        self.skipFirstLineCtrl = wx.CheckBox(topPanel)
-        sizer.Add(wx.StaticText(topPanel, label=_('Skip first line')), flag=wx.ALIGN_CENTER_VERTICAL)
-        sizer.Add(self.skipFirstLineCtrl, flag=wx.ALIGN_CENTER_VERTICAL)
+        self.linesToSkipCtrl = wx.SpinCtrl(topPanel, size=(40,-1))
+        sizer.Add(wx.StaticText(topPanel, label=_('Lines to skip')), flag=wx.ALIGN_CENTER_VERTICAL)
+        sizer.Add(self.linesToSkipCtrl, flag=wx.ALIGN_CENTER_VERTICAL)
 
         sizer.Add(wx.StaticText(topPanel, label=_('Encoding')), flag=wx.ALIGN_CENTER_VERTICAL)
         self.fileEncodingCtrl = wx.ComboBox(topPanel, choices=self.encodings, size=(110,-1))
@@ -200,7 +200,7 @@
         self.dateFormatCtrl.Value = settings['dateFormat']
         self.descriptionColumnCtrl.Value = settings['descriptionColumns']
         self.delimiterCtrl.Value = settings['delimiter']
-        self.skipFirstLineCtrl.Value = settings['skipFirstLine']
+        self.linesToSkipCtrl.Value = settings['linesToSkip']
         self.fileEncodingCtrl.Value = settings['encoding']
 
     def getDefaultSettings(self):
@@ -212,7 +212,7 @@
         settings['dateFormat'] = self.dateFormats[0]
         settings['descriptionColumns'] = "3, 4 (5)"
         settings['delimiter'] = ';'
-        settings['skipFirstLine'] = False
+        settings['linesToSkip'] = 0
         settings['encoding'] = 'utf-8'
 
         return settings
@@ -227,7 +227,7 @@
         settings['descriptionColumns'] = self.descriptionColumnCtrl.Value
         # delimiter must be 1-character string
         settings['delimiter'] = str(self.delimiterCtrl.Value)
-        settings['skipFirstLine'] = self.skipFirstLineCtrl.Value
+        settings['linesToSkip'] = self.linesToSkipCtrl.Value
         settings['encoding'] = self.fileEncodingCtrl.Value
 
         return settings

=== added file 'wxbanker/data/fixtures/comdirect.csv'
--- wxbanker/data/fixtures/comdirect.csv	1970-01-01 00:00:00 +0000
+++ wxbanker/data/fixtures/comdirect.csv	2010-03-10 10:19:24 +0000
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+
+
+
+"comdirect bank AG"
+"UMSÄTZE: MAX MUSTERMANN"
+"Erstellt am: 10.03.2010, 10:40 Uhr"
+
+"Kunden-Nummer:";"1234567"
+"BLZ:";"20041234"
+"Kontostand (Girokonto):";"1.234,56 EUR"
+"Kontostand (VR-Konto):";"0,00 EUR"
+
+"Umsätze Girokonto";" - Zeitraum: 90 Tage"
+
+"Neuer Kontostand";"+1.234,56"
+
+"Buchungstag";"Valuta";"Vorgang";"Buchungstext";"Umsatz in EUR"
+"09.03.2010";"09.03.2010";"Lastschrift Einzug";"Auftraggeber: FOO.DE Buchungstext: FOO.DE 12345467891234 Ref. AB123456789/00000 ";"-20,42"
+"09.03.2010";"09.03.2010";"Übertrag/Überweisung";"Auftraggeber: Max Mustermann Buchungstext: Max Mustermann ABCD1234";"190,00"
+"08.03.2010";"08.03.2010";"Lastschrift Einzug";"Auftraggeber: XYZ SAGT DANKE Buchungstext: XYZ SAGT DANKE EC 123456789 06.03 14.53 CE0 Ref. ABCDFER213456789/1480 ";"-32,27"
+"05.03.2010";"05.03.2010";"Übertrag/Überweisung";"Empfänger: Max Mustermann Kto/IBAN: 123456789 BLZ/BIC: 123456789 Buchungstext: MAX MUSTERMANN COMDIREKT ÜBERTRAG AUF ";"-1500,00"
+"05.03.2010";"05.03.2010";"Kontoübertrag";"Auftraggeber: Mustermann, Max  Kto/IBAN: 123456789 BLZ/BIC: 123456789 Buchungstext: MUSTERMANN, MAX ÜBERTRAG AUF GIROKONTO KDN-REF 123456789 Ref. ABCDFER213456789/1 ";"1500,00"
+
+"Alter Kontostand";"+2.345,67"
+
+

=== modified file 'wxbanker/tests/csvimportertests.py'
--- wxbanker/tests/csvimportertests.py	2009-12-06 03:40:42 +0000
+++ wxbanker/tests/csvimportertests.py	2010-03-10 10:19:24 +0000
@@ -54,6 +54,15 @@
         self.assertEqual(tran.Date, datetime.date(2009, 7, 17))
         self.assertEqual(tran.Description, "PHONE CORP, ### , LASTSCHRIFT")
         self.assertEqual(tran.Amount, -31.24)
+       
+    def testCanImportComdirectData(self):
+        transactions = self.getTransactions("comdirect")
+        self.assertEqual(len(transactions), 5)
+        
+        tran = transactions[2]
+        self.assertEqual(tran.Date, datetime.date(2010, 3, 8))
+        self.assertEqual(tran.Description, "Auftraggeber: XYZ SAGT DANKE Buchungstext: XYZ SAGT DANKE EC 123456789 06.03 14.53 CE0 Ref. ABCDFER213456789/1480  (Lastschrift Einzug)")
+        self.assertEqual(tran.Amount, -32.27)   
         
 
 if __name__ == "__main__":