From fb66c5f5681d8a2c545b3d667e06f1bb85869e51 Mon Sep 17 00:00:00 2001 From: scito Date: Mon, 21 Dec 2020 19:52:55 +0100 Subject: [PATCH] minor improvements --- .gitignore | 1 + extract_otp_secret_keys.py | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dea63f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +qr/ diff --git a/extract_otp_secret_keys.py b/extract_otp_secret_keys.py index 52e2881..6f6d996 100644 --- a/extract_otp_secret_keys.py +++ b/extract_otp_secret_keys.py @@ -72,12 +72,11 @@ def get_enum_name_by_number(parent, field_name): def convert_secret_from_bytes_to_base32_str(bytes): return str(base64.b32encode(otp.secret), 'utf-8').replace('=', '') - def save_qr(data, name): qr = QRCode() qr.add_data(data) - img = qr.make_image(fill_color="black", back_color="white") - if verbose: print("Saving to {}".format(name)) + img = qr.make_image(fill_color='black', back_color='white') + if verbose: print('Saving to {}'.format(name)) img.save(name) def print_qr(data): @@ -111,12 +110,12 @@ for line in (line.strip() for line in fileinput.input(args.infile)): otp_url = 'otpauth://{}/{}?'.format('totp' if otp.type == 2 else 'hotp', quote(otp.name)) + urlencode(url_params) if saveqr: if verbose: print(otp_url) - if not(path.exists("qr")): mkdir("qr") - pattern = rcompile('[\W_]+') + if not(path.exists('qr')): mkdir('qr') + pattern = rcompile(r'[\W_]+') file_otp_name = pattern.sub('', otp.name) file_otp_issuer = pattern.sub('', otp.issuer) - if not(file_otp_issuer): print_qr(otp_url, "qr/{}-{}.png".format(i, file_otp_name)) - if file_otp_issuer: save_qr(otp_url, "qr/{}-{}-{}.png".format(i,file_otp_name, file_otp_issuer)) + if not(file_otp_issuer): print_qr(otp_url) + if file_otp_issuer: save_qr(otp_url, 'qr/{}-{}-{}.png'.format(i, file_otp_name, file_otp_issuer)) if printqr: if verbose: print(otp_url) print_qr(otp_url)