CI Changes

source/classes/appversion.py

@@ -0,0 +1,17 @@
+import os
+
+from Main import __version__
+DR_VERSION = __version__
+
+def write_appversion():
+  APP_VERSION = DR_VERSION
+  if "-" in APP_VERSION:
+    APP_VERSION = APP_VERSION[:APP_VERSION.find("-")]
+  APP_VERSION_FILE = os.path.join(".","resources","app","meta","manifests","app_version.txt")
+  with open(APP_VERSION_FILE,"w") as f:
+    f.seek(0)
+    f.truncate()
+    f.write(APP_VERSION)
+
+if __name__ == "__main__":
+    write_appversion()

source/classes/diags.py

@@ -1,16 +1,24 @@
 import platform, sys, os, subprocess
-import pkg_resources
-from datetime import datetime
+try:
+    import pkg_resources
+except ModuleNotFoundError as e:
+    pass
+import datetime
+
+from Main import __version__
+DR_VERSION = __version__
+
+PROJECT_NAME = "ALttP Door Randomizer"
 
 def diagpad(str):
-  return str.ljust(len("ALttP Door Randomizer Version") + 5,'.')
+  return str.ljust(len(f"{PROJECT_NAME} Version") + 5,'.')
 
-def output(APP_VERSION):
+def output():
   lines = [
-    "ALttP Door Randomizer Diagnostics",
+    f"{PROJECT_NAME} Diagnostics",
     "=================================",
-    diagpad("UTC Time") + str(datetime.utcnow())[:19],
-    diagpad("ALttP Door Randomizer Version") + APP_VERSION,
+    diagpad("UTC Time") + str(datetime.datetime.now(datetime.UTC))[:19],
+    diagpad(f"{PROJECT_NAME} Version") + DR_VERSION,
     diagpad("Python Version") + platform.python_version()
   ]
   lines.append(diagpad("OS Version") + "%s %s" % (platform.system(), platform.release()))
@@ -35,6 +43,7 @@ def output(APP_VERSION):
    pkg = pkg.split("==")
    lines.append(diagpad(pkg[0]) + pkg[1])
   '''
+  installed_packages = []
   installed_packages = [str(d) for d in pkg_resources.working_set]   #this doesn't work from the .exe either, but it doesn't crash the program
   installed_packages.sort()
   for pkg in installed_packages: