Эх сурвалжийг харах

start fixing problem with delimeter

oz123 9 жил өмнө
parent
commit
e430a9d197
2 өөрчлөгдсөн 4 нэмэгдсэн , 3 устгасан
  1. 3 1
      pwman/__init__.py
  2. 1 2
      pwman/ui/cli.py

+ 3 - 1
pwman/__init__.py

@@ -62,7 +62,9 @@ def parser_options(formatter_class=argparse.HelpFormatter):  # pragma: no cover
                         default=os.path.expanduser("~/.pwman/config"),
                         help='cofiguration file to read')
     parser.add_argument('-d', '--database', dest='dbase')
-    parser.add_argument('-i', '--import', dest='import_file',
+    #parser.add_argument('-i', '--import', dest='import_file',
+    #                    type=argparse.FileType())
+    parser.add_argument('-i', '--import', nargs=2, dest='file_delim',
                         type=argparse.FileType())
     return parser
 

+ 1 - 2
pwman/ui/cli.py

@@ -99,10 +99,9 @@ def main():
     dbver = get_db_version(config, args)
     CryptoEngine.get()
 
-
     db = factory.createdb(dburi, dbver)
 
-    if args.import_file:
+    if args.file_delim:
         importer = Importer((args, config, db))
         importer.run()
         sys.exit(0)