Fix windows build

.gitignore

@@ -0,0 +1,9 @@
+.vscode/settings.json
+build/
+dist/
+__pycache__
+*.pyc
+*.egg-info
+*.dist-info
+*.pyd
+*.so

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "webview"]
+	path = webview
+	url = https://github.com/webview/webview

.vscode/launch.json

@@ -0,0 +1,19 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "WebView: Test",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/test.py",
+            "args": [
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "justMyCode": true
+        }
+    ]
+}

.vscode/make_settings_json.py

@@ -0,0 +1,16 @@
+#!/usr/bin/python3
+import os
+import platform
+import string
+import sys
+import sysconfig
+
+webview_platform = {'Linux': 'GTK', 'Darwin': 'COCOA', 'Windows': 'WINAPI'}.get(platform.system(), 'GTK')
+python_include_dir = sysconfig.get_path('include').replace('\\', '\\\\')
+py_major_version = sys.version_info[0]
+
+with open('settings.json.template') as f:
+    settings = string.Template(f.read()).safe_substitute(locals())
+
+with open('settings.json', 'w') as f:
+    f.write(settings)

.vscode/settings.json.template

@@ -0,0 +1,9 @@
+{
+    "C_Cpp.default.defines": [
+        "PY_MAJOR_VERSION=${py_major_version}",
+        "WEBVIEW_${webview_platform}"
+    ],
+    "C_Cpp.default.includePath": [
+        "${python_include_dir}"
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,61 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build",
+            "type": "shell",
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "command": "${config:python.pythonPath} setup.py build_ext -f --inplace",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "problemMatcher": [
+                "$msCompile",
+                "$gcc"
+            ]
+        },
+        {
+            "label": "Build distributables",
+            "type": "shell",
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "command": "${config:python.pythonPath} setup.py sdist bdist_wheel",
+            "group": "build",
+            "problemMatcher": []
+        },
+        {
+            "label": "Test",
+            "type": "shell",
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "command": "${config:python.pythonPath} test.py",
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "problemMatcher": []
+        },
+        {
+            "label": "Create settings.json",
+            "type": "shell",
+            "command": "${config:python.pythonPath}",
+            "args": [
+                "make_settings_json.py"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}/.vscode"
+            },
+            "runOptions": {
+                "runOn": "folderOpen"
+            },
+            "problemMatcher": []
+        }
+    ]
+}

MANIFEST.in

@@ -1 +1 @@
-graft webview
+graft webview

Makefile

@@ -0,0 +1,27 @@
+ifeq ($(OS),Windows_NT)
+    PY = python
+else
+    PY = python3
+endif
+
+all: dist
+
+build:
+	$(PY) setup.py build
+
+dist:
+	$(PY) setup.py sdist bdist_wheel
+
+install:
+	$(PY) -m pip install .
+
+test:
+	$(PY) test.py
+
+upload:
+	$(PY) -m twine upload dist/*
+
+clean:
+	$(RM) -r build dist *.egg-info *.dist-info __pycache__ *.pyc *.pyd *.so
+
+.PHONY: all build dist install test upload clean

README.md

@@ -1,72 +1,10 @@
-# webview
+# webview-python
 
-Python extension that provides API for the [webview] library.
+Python extension that provides API for the [webview](https://github.com/webview/webview) library.
 
-## Getting started
 
-Install the bindings:
+## TODO
 
-```bash
-pip install webview
-```
-
-Try the following example:
-
-```python
-import webview
-
-w = webview.WebView(width=320, height=240, title="Hello", url="https://google.com", resizable=True, debug=False)
-w.run()
-```
-
-You may use most of the webview APIs:
-
-```python
-# Change window title
-w.set_title("New title")
-# Make window fullscreen
-w.set_fullscreen(True)
-# Change initial window background color
-w.set_color(255, 0, 0)
-# Inject some JS
-w.eval("alert('hello')")
-# Inject some CSS
-w.inject_css('* {background-color: yellow; }')
-# Show native OS dialog
-file_path = w.dialog(0, 0, "open file", "")
-# Post funciton to the UI thread
-w.dispatch(some_func)
-w.dispatch(lambda: some_func())
-# Control run loop
-while w.loop(True):
-  pass
-```
-
-Dispatch is currently only a stub and is implemented as direct function call.
-Also, proper Python-to-JS object mapping is not implemented yet, but is highly
-
-## Development
-
-To build and install the library locally:
-
-```bash
-python setup.py install
-```
-
-To upload a new version:
-
-```bash
-python setup.py sdist
-twine upload dist/webview-*.tar.gz
-```
-
-To build and install it locally:
-
-```bash
-python setup.py install
-```
-
-Please, ensure that all sources are formatted using `yapf`.
-
-
-[webview]: https://github.com/zserge/webview
+- [ ] Figure out why `examples/with_server.py` doesn't work
+- [ ] Better function binding support (automate `json.dumps` and `json.loads`)
+- [ ] Remove support for Python 2.x

examples/minimal.py

@@ -0,0 +1,43 @@
+import json
+import time
+from urllib.parse import quote
+
+import webview
+
+
+HTML = '''
+This is a test<br/>
+<div id="timestr">Time should tick here</div><br/>
+<button onclick="quit();">Quit</button>
+<script type="text/javascript">
+    timediv = document.getElementById('timestr');
+    updateTime = () => {
+        get_time('%Y-%m-%d %H:%M:%S').then((s) => {
+            timediv.innerHTML = s;
+        });
+    };
+    setInterval(updateTime, 1000);
+    updateTime();
+</script>
+'''
+
+
+def get_time(w, req):
+    fmt = json.loads(req)[0]
+    return json.dumps(time.strftime(fmt))
+
+
+def quit(w, req):
+    w.terminate()
+
+
+def main():
+    w = webview.WebView(width=320, height=240, resizable=True, title="My App", debug=True)
+    w.bind('get_time', get_time)
+    w.bind('quit', quit)
+    w.navigate('data:text/html,' + quote(HTML))
+    w.run()
+
+
+if __name__ == "__main__":
+    main()

examples/with_server.py

@@ -0,0 +1,71 @@
+import json
+import random
+import threading
+import time
+from http import HTTPStatus
+from http.server import BaseHTTPRequestHandler, HTTPServer
+from urllib.parse import quote
+from itertools import count
+
+import webview
+
+
+HTML = '''
+This is a test<br><button onclick="invoke('print_hello');">Click me</button>
+'''
+
+
+class MyHTTPRequestHandler(BaseHTTPRequestHandler):
+    def send_data(self, data, status=HTTPStatus.OK, mimetype='text/plain'):
+        if isinstance(data, str):
+            data = data.encode('utf8')
+        self.send_response(status)
+        self.send_header('Content-Type', mimetype)
+        self.send_header('Content-Length', len(data))
+        self.end_headers()
+        self.wfile.write(data)
+
+    def send_html(self, text):
+        self.send_data(text.encode('utf8'), mimetype='text/html')
+
+    def do_GET(self):
+        self.send_html(HTML)
+
+
+def run_server():
+    while 1:
+        port = random.randint(20000, 30000)
+        try:
+            server = HTTPServer(('localhost', port), MyHTTPRequestHandler)
+        except Exception:
+            continue
+        break
+    threading.Thread(target=server.serve_forever, daemon=True).start()
+    return server
+
+
+def callback(w, req):
+    # print(f'callback was called with {req!r}')
+    arg = json.loads(req)[0]
+    print(f'callback was called with {arg!r}')
+
+
+def threadfunc():
+    for n in count():
+        print(n)
+        time.sleep(0.1)
+
+
+def main():
+    s = run_server()
+    url = f'http://127.0.0.1:{s.server_port}'
+    print(url)
+    w = webview.WebView(width=320, height=240, title="My App", resizable=True, debug=True)
+    w.bind('invoke', callback)
+    w.navigate(url)
+    w.run()
+    s.shutdown()
+
+
+if __name__ == "__main__":
+    main()

pywebview.py

@@ -0,0 +1,28 @@
+import argparse
+import os
+
+import webview
+
+
+def main():
+    p = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+    p.add_argument('url')
+    p.add_argument('-s', '--size', default='800x600', help='Window size in the form <WIDTH>x<HEIGHT>')
+    p.add_argument('-f', '--fixed-size', action='store_true', help='Makes the window non-resizable')
+    p.add_argument('-t', '--title', default='Webview', help='Set the window title')
+    args = p.parse_args()
+
+    try:
+        width, height = map(int, args.size.split('x'))
+    except Exception:
+        p.error('Size must be of the form <WIDTH>x<HEIGHT>')
+
+    if not os.path.exists(args.url) and '://' not in args.url:
+        args.url = 'http://' + args.url
+
+    w = webview.WebView(width, height, resizable=not args.fixed_size, url=args.url, title=args.title)
+    w.run()
+
+
+if __name__ == "__main__":
+    main()