0.3.2 pygame-script fixed

pygame-web · Sep 14, 2022 · 5f08f9c · 5f08f9c
1 parent 2cd757a
commit 5f08f9c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/pygbag/__init__.py b/pygbag/__init__.py
@@ -1,6 +1,6 @@
 """ packager+server for pygbag wasm loader """
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 
 # WaPy=>CPython compat

diff --git a/pygbag/app.py b/pygbag/app.py
@@ -12,17 +12,20 @@
 
 from .__init__ import __version__
 
+import pygbag
+
 from . import pack
 from . import web
 
+
+
 devmode = "--dev" in sys.argv
 
-cdn_dot = __version__.split('.')
+cdn_dot = __version__.split(".")
 cdn_dot.pop()
-cdn_version = '.'.join(cdn_dot)
+cdn_version = ".".join(cdn_dot)
 del cdn_dot
 
-
 if devmode:
     sys.argv.remove("--dev")
     DEFAULT_PORT = 8666
@@ -252,7 +255,6 @@ async def main_run(patharg, cdn=DEFAULT_CDN):
 """
     )
 
-    await pack.archive(f"{app_name}.apk", app_folder, build_dir)
 
     CC = {
         "cdn": args.cdn,
@@ -271,6 +273,11 @@ async def main_run(patharg, cdn=DEFAULT_CDN):
         "PYBUILD": args.PYBUILD,
     }
 
+    pygbag.config = CC
+
+    await pack.archive(f"{app_name}.apk", app_folder, build_dir)
+
+
     def cache_file(remote_url, suffix):
         nonlocal cache_dir
         cache = hashlib.md5(remote_url.encode()).hexdigest()

diff --git a/pygbag/html_embed.py b/pygbag/html_embed.py
@@ -1,5 +1,6 @@
 from pathlib import Path
 
+import pygbag
 
 def dump_fs(html, target_folder, packlist):
     html.write(
@@ -59,7 +60,7 @@ def make_header(html, line):
             # found script directives after #!
             SCRIPT = line[2:].strip()
         else:
-            SCRIPT = ' src="https://pygame-web.github.io/archives/0.3.0/pythons.js"'
+            SCRIPT = f' src="{pygbag.config["cdn"]}pythons.js"'
             SCRIPT += ' data-src="vtx,fs,gui"'
 
         line = (

diff --git a/pygbag/testserver.py b/pygbag/testserver.py
@@ -29,6 +29,7 @@
 import hashlib
 from pathlib import Path
 
+
 VERB = True
 CACHE = None
 
@@ -192,10 +193,10 @@ def send_head(self):
                 content = f.read()
 
                 # redirect known CDN to relative path
-# FIXME: py*-scripts
-#                content = content.replace(
-#                    b"https://pygame-web.github.io", b"http://localhost:8000"
-#                )
+                # FIXME: py*-scripts
+                #                content = content.replace(
+                #                    b"https://pygame-web.github.io", b"http://localhost:8000"
+                #                )
 
                 # redirect user CDN to localhost
                 content = content.replace(BCDN, BPROXY)

diff --git a/test/static/test.html b/test/static/test.html