1
0

Merge pull request #582 from dabura667/csvaddresserr

CSV: Show erroneous addresses in warning window.
This commit is contained in:
ThomasV
2014-02-27 14:12:08 +01:00
2 changed files with 12 additions and 2 deletions

View File

@@ -1904,15 +1904,25 @@ class ElectrumWindow(QMainWindow):
def do_process_from_csvReader(self, csvReader):
outputs = []
errors = []
errtext = ""
try:
for row in csvReader:
for position, row in enumerate(csvReader):
address = row[0]
if not is_valid(address):
errors.append((position, address))
continue
amount = Decimal(row[1])
amount = int(100000000*amount)
outputs.append((address, amount))
except (ValueError, IOError, os.error), reason:
QMessageBox.critical(None, _("Unable to read file or no transaction found"), _("Electrum was unable to open your transaction file") + "\n" + str(reason))
return
if errors != []:
for x in errors:
errtext += "CSV Row " + str(x[0]+1) + ": " + x[1] + "\n"
QMessageBox.critical(None, _("Invalid Addresses"), _("ABORTING! Invalid Addresses found:") + "\n\n" + errtext)
return
try:
tx = self.wallet.make_unsigned_transaction(outputs, None, None)