Changeset 692:eea9d6135944 for src/mlx/gui/mava_simbrief.py

Timestamp:

10/22/15 18:43:58 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

Phase:

public

Message:

Progress reporting is more detailed and uses translatable strings (re #279)

File:

• src/mlx/gui/mava_simbrief.py (modified) (7 diffs)

src/mlx/gui/mava_simbrief.py

@@ -21 +21 @@
     """Implements the integration with the excellent Simbrief pilot briefing
     system for MALEV Virtual."""
+
+    # Progress stage: searching the suitable browser window
+    PROGRESS_SEARCHING_BROWSER = 1
+
+    # Progress stage: retrieving the form from the server
+    PROGRESS_LOADING_FORM = 2
+
+    # Progress stage: filling the form
+    PROGRESS_FILLING_FORM = 3
+
+    # Progress stage: waiting for the login
+    PROGRESS_WAITING_LOGIN = 4
+
+    # Progress stage: logging in
+    PROGRESS_LOGGING_IN = 5
+
+    # Progress stage: waiting for result
+    PROGRESS_WAITING_RESULT = 6
+
+    # The maximal reserved progress stage
+    PROGRESS_MAX = 16
+
+    # Result code: none (i.e. the SimBrief query is in progress).
+    RESULT_NONE = 0
+
+    # Result code: success
+    RESULT_OK = 1
+
+    # Result code: other error
+    RESULT_ERROR_OTHER = 2
+
+    # Result code: form could not be loaded
+    RESULT_ERROR_NO_FORM = 11
+
+    # Result code: no popup (i.e. login) window found
+    RESULT_ERROR_NO_POPUP = 12
+
+    # Result code: login failed
+    RESULT_ERROR_LOGIN_FAILED = 13
+
+    # The maximal reserved result code
+    RESULT_MAX = 32
 
     def __init__(self,
@@ -114 +156 @@
             is_briefing_available = True
         else:
-            update_progress("Looking for a browser...", False)
+            update_progress(MavaSimbriefIntegrator.PROGRESS_SEARCHING_BROWSER,
+                            MavaSimbriefIntegrator.RESULT_NONE, None)
             # There must be window whose title is 'SimBrief' so that we
             # could find our one among several
             if self._find_window_by_title("SimBrief") is None:
                 print "No SimBrief window was found!"
+                update_progress(MavaSimbriefIntegrator.PROGRESS_SEARCHING_BROWSER,
+                                MavaSimbriefIntegrator.RESULT_ERROR_OTHER, None)
                 return None
 
             # normal operation with a real xml file
-            update_progress("Retrieving form...", False)
+            update_progress(MavaSimbriefIntegrator.PROGRESS_LOADING_FORM,
+                            MavaSimbriefIntegrator.RESULT_NONE, None)
             if local_html_debug:
                 self.driver.get(
@@ -133 +179 @@
             if main_handle is None:
                 print "No SimBrief Integration window was found!"
+                update_progress(MavaSimbriefIntegrator.PROGRESS_LOADING_FORM,
+                                MavaSimbriefIntegrator.RESULT_ERROR_NO_FORM, None)
                 return None
 
@@ -140 +188 @@
 
             # Entering form data
-            update_progress("Filling form...", False)
+            update_progress(MavaSimbriefIntegrator.PROGRESS_FILLING_FORM,
+                            MavaSimbriefIntegrator.RESULT_NONE, None)
             self.driver.switch_to_window(main_handle)
             self.fill_form(self.plan,
@@ -149 +198 @@
             button.send_keys(Keys.RETURN)
 
-            update_progress("Waiting for login...", False)
+            update_progress(MavaSimbriefIntegrator.PROGRESS_WAITING_LOGIN,
+                            MavaSimbriefIntegrator.RESULT_NONE, None)
             popup_handle = self._find_popup(handles)
             if popup_handle is None:
-                print "No popup window was found!"
+                update_progress(MavaSimbriefIntegrator.PROGRESS_WAITING_LOGIN,
+                                MavaSimbriefIntegrator.RESULT_ERROR_NO_POPUP, None)
                 return None
 
@@ -164 +215 @@
 
                     if userElement is not None:
-                        update_progress("Logging in...", False)
+                        update_progress(MavaSimbriefIntegrator.PROGRESS_LOGGING_IN,
+                                        MavaSimbriefIntegrator.RESULT_NONE, None)
                         (userName, password) = get_credentials(login_count)
+                        if userName is None or password is None:
+                            update_progress(MavaSimbriefIntegrator.PROGRESS_WAITING_LOGIN,
+                                            MavaSimbriefIntegrator.RESULT_ERROR_LOGIN_FAILED, None)
+                            return None
+
                         userElement.send_keys(userName)
                         self.driver.find_element_by_name("pass").send_keys(password)
@@ -178 +235 @@
                     pass
 
-                update_progress("Waiting for the result...", False)
+                update_progress(MavaSimbriefIntegrator.PROGRESS_WAITING_RESULT,
+                                MavaSimbriefIntegrator.RESULT_NONE, None)
                 self.driver.switch_to.window(main_handle)
                 try: