Pārlūkot izejas kodu

Bug fixes in Importer

oz123 10 gadi atpakaļ
vecāks
revīzija
75bcddef19
2 mainītis faili ar 8 papildinājumiem un 6 dzēšanām
  1. 7 5
      pwman/exchange/importer.py
  2. 1 1
      scripts/pwman3

+ 7 - 5
pwman/exchange/importer.py

@@ -55,7 +55,8 @@ class CSVImporter(BaseImporter):
     def _create_node(self, row):
     def _create_node(self, row):
         """create a node object with encrypted properties"""
         """create a node object with encrypted properties"""
         n = {'clear_text': True,
         n = {'clear_text': True,
-             'username': row[0], 'password': row[2], 'url': row[1], 'notes': row[3],
+             'username': row[0], 'password': row[2], 'url': row[1],
+             'notes': row[3],
              'tags': row[4].split(',')}
              'tags': row[4].split(',')}
         node = Node(**n)
         node = Node(**n)
         return node
         return node
@@ -76,13 +77,14 @@ class CSVImporter(BaseImporter):
         self._db._con.commit()
         self._db._con.commit()
         self._db.open()
         self._db.open()
 
 
-    def runner(self):
+    def run(self):
         self._open_db()
         self._open_db()
 
 
         for row in self._read_file():
         for row in self._read_file():
             node = self._create_node(row)
             node = self._create_node(row)
             self._insert_node(node)
             self._insert_node(node)
 
 
+
 class Importer(object):
 class Importer(object):
 
 
     """
     """
@@ -90,8 +92,8 @@ class Importer(object):
     This could be changes by calling other instance which for example import
     This could be changes by calling other instance which for example import
     from KeePass XML or other formats.
     from KeePass XML or other formats.
     """
     """
-    def __init__(self, invoke=CSVImporter):
-        self.runner = invoke()
+    def __init__(self,  args, invoke=CSVImporter):
+        self.importer = invoke(*args)
 
 
     def run(self):
     def run(self):
-        self.runner()
+        self.importer.run()

+ 1 - 1
scripts/pwman3

@@ -43,7 +43,7 @@ def main(args):
     db = pwman.data.factory.create(dbtype, dbver, fname)
     db = pwman.data.factory.create(dbtype, dbver, fname)
 
 
     if args.import_file:
     if args.import_file:
-        importer = Importer(args, config, db)
+        importer = Importer((args, config, db))
         importer.run()
         importer.run()
         sys.exit(0)
         sys.exit(0)