Version/romnaming refactor

source/classes/appversion.py

@@ -1,17 +0,0 @@
-import os
-
-from OverworldShuffle import __version__
-OWR_VERSION = __version__
-
-def write_appversion():
-  APP_VERSION = OWR_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

@@ -5,56 +5,50 @@ except ModuleNotFoundError as e:
     pass
 import datetime
 
-from Main import __version__
-DR_VERSION = __version__
-
-from OverworldShuffle import __version__
-OWR_VERSION = __version__
-
-PROJECT_NAME = "ALttP Overworld Randomizer"
+from Versions import DRVersion, GKVersion, ORVersion
 
 def diagpad(str):
-  return str.ljust(len(f"{PROJECT_NAME} Version") + 5,'.')
+    return str.ljust(40, '.')
 
 def output():
-  lines = [
-    f"{PROJECT_NAME} Diagnostics",
-    "=================================",
-    diagpad("UTC Time") + str(datetime.datetime.now(datetime.UTC))[:19],
-    diagpad("ALttP Door Randomizer Version") + DR_VERSION,
-    diagpad(f"{PROJECT_NAME} Version") + OWR_VERSION,
-    diagpad("Python Version") + platform.python_version()
-  ]
-  lines.append(diagpad("OS Version") + "%s %s" % (platform.system(), platform.release()))
-  if hasattr(sys, "executable"):
-    lines.append(diagpad("Executable") + sys.executable)
-  lines.append(diagpad("Build Date") + platform.python_build()[1])
-  lines.append(diagpad("Compiler") + platform.python_compiler())
-  if hasattr(sys, "api_version"):
-    lines.append(diagpad("Python API") + str(sys.api_version))
-  if hasattr(os, "sep"):
-    lines.append(diagpad("Filepath Separator") + os.sep)
-  if hasattr(os, "pathsep"):
-    lines.append(diagpad("Path Env Separator") + os.pathsep)
-  lines.append("")
-  lines.append("Packages")
-  lines.append("--------")
-  '''
-  #this breaks when run from the .exe
-  reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
-  installed_packages = [r.decode() for r in reqs.split()]
-  for pkg in installed_packages:
-   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:
-    pkg = pkg.split(' ')
-    lines.append(diagpad(pkg[0]) + pkg[1])
+    lines = [
+        "ALttP GwaaKiwi Randomizer Diagnostics",
+        "=====================================",
+        diagpad("UTC Time") + str(datetime.datetime.now(datetime.UTC))[:19],
+        diagpad("ALttP Door Randomizer Version") + DRVersion,
+        diagpad("ALttP Overworld Randomizer Version") + ORVersion,
+        diagpad("ALttP GwaaKiwi Randomizer Version") + GKVersion,
+        diagpad("Python Version") + platform.python_version(),
+    ]
+    lines.append(diagpad("OS Version") + "%s %s" % (platform.system(), platform.release()))
+    if hasattr(sys, "executable"):
+        lines.append(diagpad("Executable") + sys.executable)
+    lines.append(diagpad("Build Date") + platform.python_build()[1])
+    lines.append(diagpad("Compiler") + platform.python_compiler())
+    if hasattr(sys, "api_version"):
+        lines.append(diagpad("Python API") + str(sys.api_version))
+    if hasattr(os, "sep"):
+        lines.append(diagpad("Filepath Separator") + os.sep)
+    if hasattr(os, "pathsep"):
+        lines.append(diagpad("Path Env Separator") + os.pathsep)
+    lines.append("")
 
-  return lines
+    lines.append("Packages")
+    lines.append("--------")
+    reqs = subprocess.check_output([sys.executable, '-m', 'pip', 'freeze'])
+    installed_packages = [r.decode() for r in reqs.split()]
+    for pkg in installed_packages:
+        pkg = pkg.split("==")
+        lines.append(diagpad(pkg[0]) + pkg[1])
+
+    installed_packages = []
+    installed_packages = [str(d) for d in pkg_resources.working_set]
+    installed_packages.sort()
+    for pkg in installed_packages:
+        pkg = pkg.split(' ')
+        lines.append(diagpad(pkg[0]) + pkg[1])
+
+    return lines
 
 if __name__ == "__main__":
     raise AssertionError(f"Called main() on utility library {__file__}")

source/gui/randomize/generation.py

@@ -5,7 +5,7 @@ import json
 import os
 from functools import partial
 from source.classes.Empty import Empty
-from Main import __version__
+from Versions import DRVersion
 
 def generation_page(parent,settings):
     # Generation Setup
@@ -148,9 +148,9 @@ def generation_page(parent,settings):
                 "width": 120,
                 "height": 50
             }
-		    }
+        }
         diag = Tk()
-        diag.title("Door Shuffle " + __version__)
+        diag.title("Door Shuffle " + DRVersion)
         diag.geometry(str(dims["window"]["width"]) + 'x' + str(dims["window"]["height"]))
         text = Text(diag, width=dims["textarea.characters"]["width"], height=dims["textarea.characters"]["height"])
         text.pack()