Update process for Discarding Javascript (#2178)

* Update prepare_live.py

* Update prepare_live.py

* 24.2.1

Author: Killklli

requirements-dev.txt

@@ -22,6 +22,6 @@ boto3==1.28.43
 GitPython==3.1.41
 cryptography==43.0.1
 apscheduler==3.10.4
-pyopenssl==24.0.0
+pyopenssl==24.2.1
 pytest-xdist==3.5.0
 parameterized==0.9.0

requirements.txt

@@ -9,4 +9,4 @@ GitPython==3.1.41
 cryptography==43.0.1
 apscheduler==3.10.4
 vidua==0.4.5
-pyopenssl==24.0.0
+pyopenssl==24.2.1

tools/prepare_live.py

@@ -2,6 +2,7 @@
 
 import glob
 import os
+import re
 import shutil
 import subprocess
 from hashlib import md5
@@ -11,6 +12,13 @@
 import requests
 from bs4 import BeautifulSoup
 
+# Load version from version.py
+version = None
+with open("version.py", "r") as version_file:
+    for line in version_file:
+        if line.startswith("version"):
+            version = line.split("=")[1].strip().strip('"')
+
 
 def get_files(path, extension, recursive=False):
     """Generate filepaths for each file into path with the target extension."""
@@ -25,25 +33,28 @@ def get_files(path, extension, recursive=False):
 
 def find_list_resources(tag, attribute, soup):
     """Find resources based off of their tag and attributes."""
-    list = []
+    resources = []
     for x in soup.findAll(tag):
         try:
-            list.append(x[attribute])
+            resources.append(x[attribute])
         except KeyError:
             pass
-    return list
+    return resources
 
 
 for f in [*get_files(os.getcwd(), "html.jinja2", recursive=True), *get_files(os.getcwd(), "html", recursive=True)]:
     with open(f, "r") as reader:
-        html: str = reader.read()
+        html = reader.read()
         soup = BeautifulSoup(html, features="html.parser")
 
         image_src = find_list_resources("img", "src", soup)
         script_src = find_list_resources("script", "src", soup)
         css_link = find_list_resources("link", "href", soup)
+
+        # Update HTML file links
         for link in [*css_link, *script_src, *image_src]:
             if "http://" in link or "https://" in link:
+                # External link
                 pre = ""
                 if "wiki/" in f:
                     pre = "."
@@ -52,19 +63,20 @@ def find_list_resources(tag, attribute, soup):
                 req = requests.get(link, allow_redirects=False)
                 open(f".{file_name}", "wb").write(req.content)
                 html = html.replace(link, f".{pre}{file_name}")
-                with open(f, "w") as writer:
-                    writer.write(html)
+            elif link.endswith(".js"):
+                # Local JavaScript file - append version query parameter
+                html = html.replace(link, f"{link}?v={version}")
+
+        # Update JavaScript blocks
+        pattern = r'(\{ src: [\'"])(\.\/static\/js\/.*?\.js)([\'"], defer: true \})'
+        updated_html = re.sub(pattern, rf"\1\2?v={version}\3", html)
+
+        # Write the modified HTML content back to the file
+        with open(f, "w") as writer:
+            writer.write(updated_html)
 
-# subprocess.run(["css-html-js-minify", "static/styles/", "--overwrite"])
-# subprocess.run(["pyminify", "-i", "."])
 subprocess.run(["python3", "setup.py", "bdist_wheel"])
 shutil.copyfile("dist/dk64rando-1.0.0-py3-none-any.whl", "static/py_libraries/dk64rando-1.0.0-py3-none-any.whl")
-with open("./static/py_libraries/dk64rando-1.0.0-py3-none-any.whl", "rb") as file:
-    wheel = file.read()
-    hash = md5(wheel).hexdigest()
-    with open("version.py", "a") as version:
-        version.write(f'\nwhl_hash = "{hash}"')
-
 
 # Create the file Gemfile
 with open("Gemfile", "w") as file: