v1.0.2 : Force color of entry, better log-in errors display

Author: BenSouchet

core.py

@@ -11,7 +11,7 @@
 
 SCRIPT_NAME = 'CW Wizard'
 
-VERSION = '1.0.1'
+VERSION = '1.0.2'
 
 EXIT_ERROR_MSG = 'The Wizard encountered issue(s) please check previous logs.\n'
 EXIT_SUCCESS_MSG = 'The Wizard has finish is work, have a great day!\n'
@@ -67,7 +67,7 @@ def addError(self, message):
 
     def addDetailedRequestError(self, task, response, as_warning=False):
         status_code = response.status_code
-        message = 'Unable to {}. Request status code "{}":'.format(task, str(status_code))
+        message = 'Unable to {}.\nRequest status code "{}":'.format(task, str(status_code))
 
         # Check if we have more info on the request error
         status_code_info = REQUEST_ERRORS.get(status_code)
@@ -120,8 +120,9 @@ def logMessages(self):
     def getMessages(self, message_type='all'):
         messages = []
         for message in self.messages:
-            if message_type != 'all' and message['type'] == message_type:
-                messages.append(message)
+            if message_type == 'all' or (message_type != 'all' and message['type'] == message_type):
+                messages.append(message['content'])
+        return messages
 
 class ColoredFormatter(logging.Formatter):
     """Custom formatter handling color"""
@@ -185,7 +186,12 @@ def cardmarket_log_in(session, credentials, silently=False):
         LOG.debug('  |____ No cookies will be stored/remains at the end.\n')
 
     # Step 1: Get the login page html (to retrieve the login token)
-    response_get_login_page = session.get(CARDMARKET_BASE_URL + '/Login')
+    try:
+        response_get_login_page = session.get(CARDMARKET_BASE_URL + '/Login')
+    except Exception as e:
+        funct_result.addError('Unable to connect to Cardmarket.\nReason: {}'.format(e))
+        return funct_result
+
     if response_get_login_page.status_code != 200:
         # Issue with the request
         funct_result.addDetailedRequestError('access to Cardmarket', response_get_login_page)
@@ -214,7 +220,7 @@ def cardmarket_log_in(session, credentials, silently=False):
     log_in_error_msg = extract_log_in_error_msg(response_post_login)
     if log_in_error_msg:
         # It's most likely an issue with the payload (wrong username and/or password)
-        funct_result.addError('Unable to log-in to Cardmarket. Message: {}.'.format(log_in_error_msg))
+        funct_result.addError('Unable to log-in to Cardmarket.\nMessage: {}.'.format(log_in_error_msg))
         return funct_result
 
     if not silently:
@@ -590,7 +596,7 @@ def build_result_page(wantlists_info, max_sellers, sellers, relevant_sellers):
     # Step 4: Open the result page
     import webbrowser
     try:
-        webbrowser.open(result_path.as_uri())
+        webbrowser.open_new_tab(result_path.as_uri())
     except webbrowser.Error:
         # Since it's not critical at all only display a warning.
         funct_result.addWarning('Failed to automatically open the result page for you.')

cw-wizard-gui.py

@@ -16,9 +16,10 @@
 
 THREAD_QUEUE = queue.Queue()
 
-GUI_WINDOW_WIDTH = 500
+GUI_WINDOW_WIDTH = 600
 GUI_WINDOW_HEIGHT = 300
 
+GUI_ENTRY_BORDER_WIDTH = 2
 GUI_ENTRY_BORDER_CLR = '#645c53'
 
 GUI_FONT_LIST = ['Trebuchet MS', 'Helvetica', 'Lucida Sans', 'Tahoma', 'Arial']
@@ -88,7 +89,7 @@ def validate_entry_is_integer(new_value):
     return False
 
 def create_entry(parent, variable, bg_color, password=False, width=0, int_only=False):
-    entry = tkinter.Entry(parent, textvariable=variable, background=bg_color, highlightcolor=GUI_ENTRY_BORDER_CLR, highlightbackground=GUI_ENTRY_BORDER_CLR)
+    entry = tkinter.Entry(parent, textvariable=variable, background=bg_color, foreground=GUI_FONT_STYLES['content']['font-color'], insertbackground=GUI_FONT_STYLES['content']['font-color'], highlightcolor=GUI_ENTRY_BORDER_CLR, highlightbackground=GUI_ENTRY_BORDER_CLR, highlightthickness=GUI_ENTRY_BORDER_WIDTH)
     if password:
         entry.configure(show='*')
     if width != 0:
@@ -179,7 +180,7 @@ def credentials_validity_has_finished(params):
 
     if not result.isValid():
         # Couldn't connect, display error message
-        window_request_credentials(params[0], 'Error: connection failed, ensure you enter the right credentials.')
+        window_request_credentials(params[0], '\n'.join(result.getMessages(message_type='error')))
         return False
 
     # Step 3: Store credentials dict in the window object
@@ -313,12 +314,12 @@ def window_request_credentials(window, error_msg=None):
     label_username = create_label(frame_credentials, 'Username', 'content', window.content_bg_color)
     label_username.grid(row=0, column=0, pady=(0, 4), sticky=tkinter.E)
     entry_username = create_entry(frame_credentials, username, window.content_bg_color)
-    entry_username.grid(row=0, column=1, pady=(0, 4), sticky=tkinter.NSEW)
+    entry_username.grid(row=0, column=1, ipadx=4, padx=(4, 0), pady=(0, 4), sticky=tkinter.NSEW)
 
     label_password = create_label(frame_credentials, 'Password', 'content', window.content_bg_color)
     label_password.grid(row=1, column=0, sticky=tkinter.E)
     entry_password = create_entry(frame_credentials, password, window.content_bg_color, password=True)
-    entry_password.grid(row=1, column=1, sticky=tkinter.NSEW)
+    entry_password.grid(row=1, column=1, padx=(4, 0), sticky=tkinter.NSEW)
 
     # Step 4: Add disclaimer message
     text_disclaimer = 'Disclaimer: If you have 2FA activate on your account this script won\'t work.'