зеркало из https://github.com/microsoft/InQRy.git
fix circular dependency between asset_qr and gui
This commit is contained in:
Родитель
3d18ff3a20
Коммит
25dc614ae0
|
@ -2,8 +2,6 @@ import os
|
|||
|
||||
import qrcode
|
||||
|
||||
from inqry import gui
|
||||
|
||||
|
||||
class AssetQRCode(qrcode.QRCode):
|
||||
def __init__(self):
|
||||
|
@ -21,9 +19,9 @@ class AssetQRCode(qrcode.QRCode):
|
|||
|
||||
def save(self, file_name, data):
|
||||
desktop = os.path.expanduser('~/Desktop')
|
||||
qrcode_png = os.path.join(desktop, '{}.png'.format(file_name))
|
||||
self.prevent_duplicate_file(qrcode_png)
|
||||
with open(qrcode_png, 'wb') as fp:
|
||||
full_path = os.path.join(desktop, '{}.png'.format(file_name))
|
||||
self.prevent_duplicate_file(full_path)
|
||||
with open(full_path, 'wb') as fp:
|
||||
return self.make_new_asset_qr(data).save(fp)
|
||||
|
||||
def display(self, data):
|
||||
|
@ -32,4 +30,4 @@ class AssetQRCode(qrcode.QRCode):
|
|||
|
||||
def prevent_duplicate_file(self, file):
|
||||
if os.path.exists(file):
|
||||
gui.error_message_box('QR code already exists.')
|
||||
raise FileExistsError
|
||||
|
|
|
@ -55,11 +55,13 @@ class InQRyGUI: # TODO: Extract GUI attributes to methods
|
|||
|
||||
def save(self):
|
||||
data = self.gather_user_input()
|
||||
filename = data[2] + '-' + data[1]
|
||||
try:
|
||||
file_name = data[2] + '-' + data[1]
|
||||
return self.asset_qr.save(file_name, self.form_instructions.gui_helper(*data))
|
||||
return self.asset_qr.save(filename, self.form_instructions.gui_helper(*data))
|
||||
except TypeError:
|
||||
print('Improper formatting.')
|
||||
except FileExistsError:
|
||||
error_message_box('File already exists.')
|
||||
|
||||
def display(self):
|
||||
data = self.gather_user_input()
|
||||
|
|
Загрузка…
Ссылка в новой задаче