Merge branch 'main' of https://github.com/python-paling/Paling

Author: savelkouls

paling/__init__.py

@@ -13,7 +13,10 @@
 import gevent as gvt
 import json as jsn
 import bottle as btl
-import bottle.ext.websocket as wbs
+try:
+    import bottle_websocket as wbs
+except ImportError:
+    import bottle.ext.websocket as wbs
 import re as rgx
 import os
 import paling.browsers as brw

paling/edge.py

@@ -1,20 +1,41 @@
-import platform
-import subprocess as sps
-import sys
-from typing import List
+import sys, subprocess as sps, os
 
-from paling.types import OptionsDictT
+name = 'Edge'
 
-name: str = 'Edge'
+def run(path, options, start_urls):
+    if path != 'edge_legacy':
+        if options['app_mode']:
+            for url in start_urls:
+                sps.Popen([path, '--app=%s' % url] + options['cmdline_args'], 
+                        stdout=sps.PIPE, stderr=sps.PIPE, stdin=sps.PIPE)
+        else:
+            args = options['cmdline_args'] + start_urls
+            sps.Popen([path, '--new-window'] + args,
+                    stdout=sps.PIPE, stderr=sys.stderr, stdin=sps.PIPE)
+    else:
+        cmd = 'start microsoft-edge:{}'.format(start_urls[0])
+        sps.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=sps.PIPE, shell=True)
 
+def find_path():
+    if sys.platform in ['win32', 'win64']:
+        return _find_edge_win()
+    else:
+        return None
 
-def run(_path: str, options: OptionsDictT, start_urls: List[str]) -> None:
-    cmd = 'start microsoft-edge:{}'.format(start_urls[0])
-    sps.Popen(cmd, stdout=sys.stdout, stderr=sys.stderr, stdin=sps.PIPE, shell=True)
+def _find_edge_win():
+    import winreg as reg
+    reg_path = r'SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\msedge.exe'
 
+    for install_type in reg.HKEY_CURRENT_USER, reg.HKEY_LOCAL_MACHINE:
+        try:
+            reg_key = reg.OpenKey(install_type, reg_path, 0, reg.KEY_READ)
+            edge_path = reg.QueryValue(reg_key, None)
+            reg_key.Close()
+            if not os.path.isfile(edge_path):
+                continue
+        except WindowsError:
+            edge_path = 'edge_legacy'
+        else:
+            break
 
-def find_path() -> bool:
-    if platform.system() == 'Windows':
-        return True
-
-    return False
+    return edge_path