Remove CefPython and migrate to QwebView/ fix ser win and linux

Author: All4Gis

.gitignore

@@ -1 +1,4 @@
 Deploy/
+.project
+.pydevproject
+.settings

.project

@@ -8,10 +8,9 @@ Click on the image to see the demo video.
 
 ## Prerequisites
 
-The libraries [CefPython](https://github.com/cztomczak/cefpython) is required and Pillow,  install the **cefpython3** python package and **Pillow**.
+The library Pillow is required,  install the **Pillow** python package.
 Always from command prompt:
 
-`python3 -m pip install cefpython3`
 `python3 -m pip install pillow`
 
 Or using:
@@ -20,15 +19,15 @@ Or using:
 
 
 Once installed, you can test the correct functioning of the plugin with the example that is provided,a shapefile with some images.
- [Test Project](https://github.com/All4Gis/EquirectangularViewer/tree/master/code/Project_example)
+ [Test Project](https://github.com/All4Gis/EquirectangularViewer/tree/master/Project_example)
 
 
 ## How it works?
 
 It's simple:
 - You start a local server in Python in  `http://127.0.0.1:1520/viewer.html `
 - A copy of the image associated to the selected registry is created in the folder where our viewer and server are.
-- With cefpython, we open the browser and return the current yaw to our canvas anytime the image is moved.
+- We open the browser and return the current yaw to our canvas anytime the image is moved.
 
 
 ## Donations

.pydevproject

@@ -18,47 +18,38 @@
  ***************************************************************************/
 """
 
-import sys
-import os
 from qgis.gui import QgsMapToolIdentify
-from PyQt5.QtCore import QTimer, Qt, QSettings, QThread
-from PyQt5.QtGui import QIcon, QCursor, QPixmap
-from PyQt5.QtWidgets import QAction
+from qgis.PyQt.QtCore import Qt, QSettings, QThread
+from qgis.PyQt.QtGui import QIcon, QCursor, QPixmap
+from qgis.PyQt.QtWidgets import QAction
 
 from EquirectangularViewer.Geo360Dialog import Geo360Dialog
 import EquirectangularViewer.config as config
-from EquirectangularViewer.server.local_server import serverInFolder, serverShutdown
 from EquirectangularViewer.utils.log import log
 from EquirectangularViewer.utils.qgsutils import qgsutils
 from qgis.core import QgsApplication
-import platform
+from functools import partial
+from http.server import SimpleHTTPRequestHandler, ThreadingHTTPServer
+from threading import Thread
+import time
 
 try:
     from pydevd import *
 except ImportError:
     None
 
-# libs_path = os.path.join(os.path.dirname(__file__), "libs")
-# sys.path.append(libs_path)
 
-try:
-    from cefpython3 import cefpython as cef
-    import ctypes
-except ImportError:
-    None
+class QuietHandler(SimpleHTTPRequestHandler):
+    def log_message(self, format, *args):
+        pass
 
-WINDOWS = (platform.system() == "Windows")
-LINUX = (platform.system() == "Linux")
-MAC = (platform.system() == "Darwin")
 
 class Geo360:
 
     """QGIS Plugin Implementation."""
 
     def __init__(self, iface):
 
-        if not cef.GetAppSetting("external_message_pump"):
-            self.timer = self.createTimer()
         self.iface = iface
         self.canvas = self.iface.mapCanvas()
         threadcount = QThread.idealThreadCount()
@@ -68,70 +59,68 @@ def __init__(self, iface):
         # OpenCL acceleration
         QSettings().setValue("/core/OpenClEnabled", True)
         self.dlg = None
-
-    def createTimer(self):
-        timer = QTimer()
-        timer.timeout.connect(self.onTimer)
-        timer.start(10)
-        return timer
-
-    def onTimer(self):
-        try:
-            cef.MessageLoopWork()
-        except Exception:
-            None
-
-    def stopTimer(self):
-        self.timer.stop()
-
-    def StartCefPython(self):
-        ''' Start CefPython '''
-        settings = {}
-        settings["browser_subprocess_path"] = "%s/%s" % (
-            cef.GetModuleDirectory(), "subprocess")
-        settings["log_severity"] = cef.LOGSEVERITY_DISABLE
-        settings["context_menu"] = {
-            "enabled": True,
-            "navigation": False,  # Back, Forward, Reload
-            "print": True,
-            "view_source": True,
-            "external_browser": False,  # Open in external browser
-            "devtools": True,  # Developer Tools
-        }
-        
-        if MAC:
-        # requires enabling message pump on Mac
-        # in Qt example. Calling cef.DoMessageLoopWork in a timer
-        # doesn't work anymore.
-            settings["external_message_pump"] = True
-
-        cef.Initialize(settings)
+        self.server = None
+        self.make_server()
 
     def initGui(self):
-        ''' Add Geo360 tool '''
+        """Add Geo360 tool"""
         log.initLogging()
-        self.action = QAction(QIcon(":/EquirectangularViewer/images/icon.png"),
-                              u"Equirectangular Viewer",
-                              self.iface.mainWindow())
+        self.action = QAction(
+            QIcon(":/EquirectangularViewer/images/icon.png"),
+            u"Equirectangular Viewer",
+            self.iface.mainWindow(),
+        )
         self.action.triggered.connect(self.run)
         self.iface.addToolBarIcon(self.action)
         self.iface.addPluginToMenu(u"&Equirectangular Viewer", self.action)
 
     def unload(self):
-        ''' Unload Geo360 tool '''
+        """Unload Geo360 tool"""
         self.iface.removePluginMenu(u"&Equirectangular Viewer", self.action)
         self.iface.removeToolBarIcon(self.action)
-        #ShutDown server
-        serverShutdown()
-        #ShutDown Cef
-        cef.Shutdown()
+        # Close server
+        self.close_server()
+
+    def is_running(self):
+        return self.server_thread and self.server_thread.is_alive()
+
+    def close_server(self):
+        # Close server
+        if self.server is not None:
+            self.server.shutdown()
+            time.sleep(1)
+            self.server.server_close()
+            while self.server_thread.is_alive():
+                self.server_thread.join()
+            self.server = None
+
+    def make_server(self):
+        # Close server
+        self.close_server()
+        # Create Server
+        directory = (
+            QgsApplication.qgisSettingsDirPath().replace("\\", "/")
+            + "python/plugins/EquirectangularViewer/viewer"
+        )
+        try:
+            self.server = ThreadingHTTPServer(
+                (config.IP, config.PORT),
+                partial(QuietHandler, directory=directory),
+            )
+            self.server_thread = Thread(
+                target=self.server.serve_forever, name="http_server"
+            )
+            self.server_thread.daemon = True
+            print("Serving at port: %s" % self.server.server_address[1])
+            time.sleep(1)
+            self.server_thread.start()
+            # while self.server_thread.is_alive():
+            #     print ("isRunning")
+        except Exception:
+            print("Server Error")
 
     def run(self):
-        ''' Run click feature '''
-        #Trick fix AttributeError: module 'sys' has no attribute 'argv'
-        # We need fedback about this
-        sys.argv = []
-
+        """Run click feature"""
         self.found = False
 
         # Check if mapa foto is loaded
@@ -144,31 +133,27 @@ def run(self):
 
         if self.found is False:
             qgsutils.showUserAndLogMessage(
-                u"Information: ", u"You need to upload the photo layer.")
+                u"Information: ", u"You need to upload the photo layer."
+            )
             return
 
-        # Folder viewer for local server
-        folder = QgsApplication.qgisSettingsDirPath() + 'python/plugins/EquirectangularViewer/viewer'
-        # Start local server in plugin folder
-        serverInFolder(folder)
-        self.StartCefPython()
-
-
     def ShowDialog(self, featuresId=None, layer=None):
-        ''' Run dialog Geo360 '''
+        """Run dialog Geo360"""
         self.featuresId = featuresId
         self.layer = layer
 
         if self.dlg is None:
-            self.dlg = Geo360Dialog(self.iface, parent=self, featuresId=featuresId, layer=self.layer)
+            self.dlg = Geo360Dialog(
+                self.iface, parent=self, featuresId=featuresId, layer=self.layer
+            )
             self.dlg.setWindowFlags(Qt.Window | Qt.WindowCloseButtonHint)
             self.dlg.show()
         else:
             self.dlg.ReloadView(self.featuresId)
 
 
 class SelectTool(QgsMapToolIdentify):
-    ''' Select Photo on map '''
+    """Select Photo on map"""
 
     def __init__(self, iface, parent=None, layer=None):
         QgsMapToolIdentify.__init__(self, iface.mapCanvas())
@@ -177,33 +162,40 @@ def __init__(self, iface, parent=None, layer=None):
         self.layer = layer
         self.parent = parent
 
-        self.cursor = QCursor(QPixmap(["16 16 3 1",
-                                       "      c None",
-                                       ".     c #FF0000",
-                                       "+     c #FFFFFF",
-                                       "                ",
-                                       "       +.+      ",
-                                       "      ++.++     ",
-                                       "     +.....+    ",
-                                       "    +.     .+   ",
-                                       "   +.   .   .+  ",
-                                       "  +.    .    .+ ",
-                                       " ++.    .    .++",
-                                       " ... ...+... ...",
-                                       " ++.    .    .++",
-                                       "  +.    .    .+ ",
-                                       "   +.   .   .+  ",
-                                       "   ++.     .+   ",
-                                       "    ++.....+    ",
-                                       "      ++.++     ",
-                                       "       +.+      "]))
+        self.cursor = QCursor(
+            QPixmap(
+                [
+                    "16 16 3 1",
+                    "      c None",
+                    ".     c #FF0000",
+                    "+     c #FFFFFF",
+                    "                ",
+                    "       +.+      ",
+                    "      ++.++     ",
+                    "     +.....+    ",
+                    "    +.     .+   ",
+                    "   +.   .   .+  ",
+                    "  +.    .    .+ ",
+                    " ++.    .    .++",
+                    " ... ...+... ...",
+                    " ++.    .    .++",
+                    "  +.    .    .+ ",
+                    "   +.   .   .+  ",
+                    "   ++.     .+   ",
+                    "    ++.....+    ",
+                    "      ++.++     ",
+                    "       +.+      ",
+                ]
+            )
+        )
 
     def activate(self):
         self.canvas.setCursor(self.cursor)
 
     def canvasReleaseEvent(self, event):
         found_features = self.identify(
-            event.x(), event.y(), [self.layer], self.TopDownAll)
+            event.x(), event.y(), [self.layer], self.TopDownAll
+        )
 
         if len(found_features) > 0: