Changeset 682:08e73d58a9e4

Timestamp:

10/01/15 18:11:10 (9 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

cef

Phase:

public

Message:

CEF is now started from Selenium

Files:

• makeinst.bat (modified) (1 diff)
• mlx_cef_caller.bat (added)
• mlx_cef_caller.sh (added)
• mlx_cef_caller_secondary.bat (added)
• mlx_cef_caller_secondary.sh (added)
• patches/library/selenium/webdriver/chrome/service.py (added)
• setup.py (modified) (2 diffs)
• src/mlx/const.py (modified) (1 diff)
• src/mlx/gui/cef.py (modified) (4 diffs)
• src/mlx/gui/common.py (modified) (1 diff)
• src/mlx/gui/gui.py (modified) (2 diffs)

makeinst.bat

@@ -2 +2 @@
 set GTKRTDIR=c:\Python27\Lib\site-packages\gtk-2.0\runtime
 set CEFDIR=c:\Python27\Lib\site-packages\cefpython3
+set CHROMEDRIVER=c:\tmp\chromedriver.exe
 set NSISDIR=C:\Program Files\NSIS
 
 python setup.py py2exe
 
+del dist\library\selenium\webdriver\chrome\service.pyc
+copy patches\library\selenium\webdriver\chrome\service.py dist\library\selenium\webdriver\chrome\service.py
+python -m compileall dist\library\selenium\webdriver\chrome\service.py
+del dist\library\selenium\webdriver\chrome\service.py
+
 "%NSISDIR%\makensis" mlx.nsi

setup.py

@@ -20 +20 @@
                                      "mlx.mo")]))
 data_files.append(("", ["logo.png",
-                        "conn_grey.png", "conn_red.png", "conn_green.png"]))
+                        "conn_grey.png", "conn_red.png", "conn_green.png",
+                        "mlx_cef_caller.sh", "mlx_cef_caller_secondary.sh",
+                        "mlx_cef_caller.bat", "mlx_cef_caller_secondary.bat"]))
+
 if os.name=="nt":
     import py2exe
 
     data_files.append(("", ["logo.ico"]))
+
+    chromedriver = os.environ.get("CHROMEDRIVER")
+    if chromedriver:
+        data_files.append(("", [chromedriver]))
 
     msvcrDir = os.environ["MSVCRDIR"] if "MSVCRDIR" in os.environ else None
@@ -61 +68 @@
             print >>f, '!define MLX_VERSION "%s"' % (mlx.const.VERSION)
             f.close()
+else:
+    for (dirpath, dirnames, filenames) in os.walk("patches"):
+        if filenames:
+            filenames = [os.path.join(dirpath, filename)
+                         for filename in filenames]
+            data_files.append((dirpath, filenames))
+
+
 
 long_description="""MAVA Logger X

src/mlx/const.py

@@ -11 +11 @@
 
 ## The version of the program
-VERSION="0.35.2"
+VERSION="0.35.2cef"
 
 #-------------------------------------------------------------------------------

src/mlx/gui/cef.py

@@ -1 +1 @@
 from common import *
+
+from mlx.util import secondaryInstallation
+
+from cefpython3 import cefpython
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options
 
 import platform
 import json
-
-from cefpython3 import cefpython
-
+import time
 import os
 import re
+import threading
+import tempfile
+import traceback
 
 #------------------------------------------------------------------------------
@@ -20 +27 @@
 _toQuit = False
 
-#------------------------------------------------------------------------------
-
-def initialize():
+# The Selenium thread
+_seleniumHandler = None
+
+#------------------------------------------------------------------------------
+
+def getArgsFilePath():
+    """Get the path of the argument file."""
+    if os.name=="nt":
+        return os.path.join(tempfile.gettempdir(),
+                            "mlxcef.args" +
+                            (".secondary" if secondaryInstallation else ""))
+    else:
+        import pwd
+        return os.path.join(tempfile.gettempdir(),
+                            "mlxcef." + pwd.getpwuid(os.getuid())[0] + ".args" +
+                            (".secondary" if secondaryInstallation else ""))
+
+#------------------------------------------------------------------------------
+
+class ArgsFileWaiter(threading.Thread):
+    """A thread to wait for the appearance of the arguments file."""
+    def __init__(self, initializedCallback):
+        """Construct the thread."""
+        threading.Thread.__init__(self)
+        self.daemon = True
+
+        self._initializedCallback = initializedCallback
+
+    def run(self):
+        """Repeatedly check for the existence of the arguments file.
+
+        If it is found, read it, extract the arguments and insert a job into
+        the GUI loop to perform the actual initialization of CEF."""
+        argsFilePath = getArgsFilePath()
+        print "Waiting for the arguments file '%s' to appear" % (argsFilePath,)
+
+        while not os.path.exists(argsFilePath):
+            time.sleep(0.1)
+
+        print "Got arguments, reading them."""
+
+        with open(argsFilePath, "rt") as f:
+            args = f.read().split()
+
+        gobject.idle_add(_initializeCEF, args, self._initializedCallback)
+
+#------------------------------------------------------------------------------
+
+class SeleniumHandler(threading.Thread):
+    """Thread to handle Selenium operations."""
+    def __init__(self, programDirectory):
+        """Construct the thread."""
+        threading.Thread.__init__(self)
+        self.daemon = False
+
+        self._programDirectory = programDirectory
+
+        self._commandsCondition = threading.Condition()
+        self._commands = []
+
+        self._toQuit = False
+
+    def run(self):
+        """Create the Selenium driver and the perform any operations
+        requested."""
+        scriptName = "mlx_cef_caller"
+        if secondaryInstallation:
+            scriptName += "_secondary"
+        scriptName += ".bat" if os.name=="nt" else ".sh"
+
+        scriptPath = os.path.join(self._programDirectory, scriptName)
+        print "Creating the Selenium driver to call script", scriptPath
+
+        options = Options()
+        options.binary_location = scriptPath
+        driver = webdriver.Chrome(chrome_options = options)
+        # try:
+        # except:
+        #     traceback.print_exc()
+
+        print "Created Selenium driver."
+        while not self._toQuit:
+            with self._commandsCondition:
+                while not self._commands:
+                    self._commandsCondition.wait()
+
+                command = self._commands[0]
+                del self._commands[0]
+
+            command()
+
+        driver.quit()
+
+    def quit(self):
+        """Instruct the thread to quit and then join it."""
+        self._enqueue(self._quit)
+        self.join()
+
+    def _enqueue(self, command):
+        """Enqueue the given command.
+
+        command should be a function to be executed in the thread."""
+        with self._commandsCondition:
+            self._commands.append(command)
+            self._commandsCondition.notify()
+
+    def _quit(self):
+        """Set the _toQuit member variable to indicate that the thread should
+        quit."""
+        self._toQuit = True
+
+#------------------------------------------------------------------------------
+
+def initialize(programDirectory, initializedCallback):
     """Initialize the Chrome Embedded Framework."""
-    global _toQuit
+    global _toQuit, _seleniumHandler
     _toQuit = False
 
     gobject.threads_init()
+
+    argsFilePath = getArgsFilePath()
+    try:
+        os.unlink(argsFilePath)
+    except:
+        pass
+
+    _seleniumHandler = SeleniumHandler(programDirectory)
+    _seleniumHandler.start()
+
+    ArgsFileWaiter(initializedCallback).start()
+
+#------------------------------------------------------------------------------
+
+def _initializeCEF(args, initializedCallback):
+    """Perform the actual initialization of CEF using the given arguments."""
+    print "Initializing CEF with args:", args
 
     settings = {
@@ -41 +176 @@
     }
 
-    cefpython.Initialize(settings, {})
+    switches={}
+    for arg in args:
+        if arg.startswith("--"):
+            if arg != "--enable-logging":
+                assignIndex = arg.find("=")
+                if assignIndex<0:
+                    switches[arg[2:]] = ""
+                else:
+                    switches[arg[2:assignIndex]] = arg[assignIndex+1:]
+        else:
+            print "Unhandled switch", arg
+
+    cefpython.Initialize(settings, switches)
 
     gobject.timeout_add(10, _handleTimeout)
+
+    print "Initialized, executing callback..."
+    initializedCallback()
 
 #------------------------------------------------------------------------------
@@ -83 +233 @@
 def finalize():
     """Finalize the Chrome Embedded Framework."""
-    global _toQuit
+    global _toQuit, _seleniumHandler
     toQuit = True
+    _seleniumHandler.quit()
     cefpython.Shutdown()
 

src/mlx/gui/common.py

@@ -32 +32 @@
     pygobject = False
     import pygtk
+    pygtk.require("2.0")
     import gtk.gdk as gdk
     import gtk

src/mlx/gui/gui.py

@@ -443 +443 @@
             self._updater.start()
 
-        cef.initialize()
-        self._acars.start()
+        cef.initialize(self._programDirectory, self._cefInitialized)
 
         singleton.raiseCallback = self.raiseCallback
@@ -1488 +1487 @@
                                       summary, description, email)
 
+    def _cefInitialized(self):
+        """Called when CEF has been initialized."""
+        self._acars.start()
+
     def _bugReportSentCallback(self, returned, result):
         """Callback function for the bug report sending result."""