Fix some bugs when trying to extract mod info from the jar.

makefile

@@ -13,7 +13,7 @@ build-cli:
 	source venv/bin/activate && pyinstaller --onefile --icon=wrenchIcon.ico solderPacker.py
 
 build-gui:
-	source venv/bin/activate && pyinstaller --windowed --onefile --icon=wrenchIcon.ico solderPackerGUI.py
+	source venv/bin/activate && pyinstaller --windowed --onefile --icon=wrenchIcon.ico --add-data="wrenchIcon.ico:." solderPackerGUI.py
 
 clean:
 	- rm -r venv

solderPacker.py

@@ -38,7 +38,7 @@ class SolderPacker:
 
     def register_mod(self, mod_slug: str, mod_name: str, mod_author: str, mod_description: str, mod_url: str):
         resp = requests.get(f"{self.solder_url}/api/mod/{mod_slug}")
-        if resp.status_code == 404:
+        if resp.status_code != 200:
             mod_data = {
                 "name": mod_slug,
                 "pretty_name": mod_name,
@@ -46,12 +46,15 @@ class SolderPacker:
                 "description": mod_description,
                 "link": mod_url
             }
-            requests.post(f"{self.solder_url}/mod/create", cookies={"technic_solder_session": self.solder_key},
+            resp = requests.post(f"{self.solder_url}/mod/create",
-                          data=mod_data, headers={"Origin": self.solder_url, "X-Requested-With": "XMLHttpRequest"})
+                          cookies={"technic_solder_session": self.solder_key},
-
+                          data=mod_data,
-            resp = requests.get(f"{self.solder_url}/api/mod/{mod_slug}")
+                          headers={"Origin": self.solder_url, "Referer": f"{self.solder_url}/mod/create"})
             if resp.status_code == 404:
                 logging.debug("failed to register mod")
+                return False
+
+            resp = requests.get(f"{self.solder_url}/api/mod/{mod_slug}")
             return resp.json()
         else:
             logging.debug("mod already registered")

solderPackerGUI.py

@@ -16,14 +16,14 @@ from solderPacker import SolderPacker
 
 # Globals
 config = {}
-base_path = os.path.dirname(os.path.realpath(__file__))
+base_path = os.path.dirname(__file__)
 
 
 class Form(QtW.QMainWindow):
     def __init__(self):
         QtW.QMainWindow.__init__(self)
         self.setMinimumSize(400, 500)
-        self.setWindowIcon(QtG.QIcon(f"{base_path}{os.sep}wrenchIcon.ico"))
+        self.setWindowIcon(QtG.QIcon(os.path.join(base_path, "wrenchIcon.ico")))
         self.setWindowTitle("Solder Packer")
 
         self.thread_pool = QtC.QThreadPool()
@@ -110,30 +110,36 @@ class Form(QtW.QMainWindow):
 
     def file_dropped(self, file_path: str):
         self.jar_path = file_path
+        self.btn_process.setText("Process")
         if config["extract"]:
             jar = zipfile.ZipFile(file_path, "r")
+            loaders = []
             if "META-INF/mods.toml" in jar.namelist():
                 # This jar file uses FML
                 logging.debug("identified mod as forge mod")
+                loaders.append("forge")
                 mod_toml = toml.loads(jar.read("META-INF/mods.toml").decode("utf-8"))
                 # This mess is to catch if the mod is using the Jar version for versioning. It extracts it from the
                 #   MANIFEST.MF and places it where it should be in the toml.
-                if mod_toml["mods"][0]["version"] == "${file.jarVersion}":
+                if mod_toml.get("mods", [{}])[0].get("version") == "${file.jarVersion}":
-                    mod_toml["mods"][0]["version"] = re.findall(
+                    try:
-                        r"Implementation-Version: (.*)", jar.read("META-INF/MANIFEST.MF").decode("utf-8"))[0]
+                        mod_toml["mods"][0]["version"] = re.findall(
+                            r"Implementation-Version: (.*)", jar.read("META-INF/MANIFEST.MF").decode("utf-8"))[0]
+                    except IndexError:
+                        mod_toml["mods"][0]["version"] = "0.0.0"
 
                 # Update form with data
                 self.mod_title_edit.setText(mod_toml.get("mods", [{}])[0].get("displayName", ""))
                 self.mod_slug_edit.setText(slugify(mod_toml.get("mods", [{}])[0].get("displayName", ""),
                                                    replacements=[["&", "and"], ["$", "s"], ["'", ""]]))
                 self.mod_version_edit.setText(mod_toml.get("mods", [{}])[0].get("version", ""))
-                self.mod_loader_edit.setText("forge")
                 self.mod_author_edit.setText(mod_toml.get("mods", [{}])[0].get("authors", ""))
                 self.mod_url_edit.setText(mod_toml.get("mods", [{}])[0].get("displayURL", ""))
                 self.mod_desc_edit.setPlainText(mod_toml.get("mods", [{}])[0].get("description", ""))
-            elif "fabric.mod.json" in jar.namelist():
+            if "fabric.mod.json" in jar.namelist():
                 # This jar file uses Fabric
                 logging.debug("identified mod as fabric mod")
+                loaders.append("fabric")
                 mod_json = json.loads(jar.read("fabric.mod.json").decode("utf-8"))
 
                 # Update form with data
@@ -141,7 +147,6 @@ class Form(QtW.QMainWindow):
                 self.mod_slug_edit.setText(slugify(mod_json.get("name", ""),
                                                    replacements=[["&", "and"], ["$", "s"], ["'", ""]]))
                 self.mod_version_edit.setText(mod_json.get("version", ""))
-                self.mod_loader_edit.setText("fabric")
 
                 # Some spaghetti code for dealing with the possibility of authors being a []string or a dict.
                 authors = mod_json.get("authors", [])
@@ -152,11 +157,13 @@ class Form(QtW.QMainWindow):
                 elif len(authors) > 0 and type(authors[0]) == str:
                     author_list = authors
                 self.mod_author_edit.setText(", ".join(author_list))
+
                 self.mod_url_edit.setText(mod_json.get("contact", {}).get("homepage", ""))
                 self.mod_desc_edit.setPlainText(mod_json.get("description", ""))
-            elif "quilt.mod.json" in jar.namelist():
+            if "quilt.mod.json" in jar.namelist():
                 # This jar file uses Quilt
                 logging.debug("identified mod as quilt mod")
+                loaders.append("quilt")
                 mod_json = json.loads(jar.read("quilt.mod.json").decode("utf-8"))
 
                 # Update form with data
@@ -164,15 +171,13 @@ class Form(QtW.QMainWindow):
                 self.mod_slug_edit.setText(slugify(mod_json.get("quilt_loader", {}).get("metadata", {}).get("name", ""),
                                                    replacements=[["&", "and"], ["$", "s"], ["'", ""]]))
                 self.mod_version_edit.setText(mod_json.get("quilt_loader", {}).get("version", ""))
-                self.mod_loader_edit.setText("quilt")
                 self.mod_author_edit.setText(
                     ", ".join(mod_json.get("quilt_loader", {}).get("metadata", {}).get("contributors", {}).keys()))
                 self.mod_url_edit.setText(
                     mod_json.get("quilt_loader", {}).get("metadata", {}).get("contact", {}).get("homepage", ""))
                 self.mod_desc_edit.setPlainText(
                     mod_json.get("quilt_loader", {}).get("metadata", {}).get("description", ""))
-            else:
+            self.mod_loader_edit.setText("+".join(loaders))
-                logging.debug("failed to identify mod loader")
             jar.close()
 
     def process_click(self):
@@ -203,7 +208,7 @@ class Form(QtW.QMainWindow):
 
     def finished_processing(self):
         self.btn_process.setEnabled(True)
-        self.btn_process.setText("Process")
+        self.btn_process.setText("Finished")
 
     def failed_processing(self):
         dialog = QtW.QMessageBox(self)
@@ -240,7 +245,7 @@ class OptionsDialog(QtW.QDialog):
 
         self.setMinimumSize(300, 200)
 
-        self.setWindowIcon(QtG.QIcon(f"{base_path}{os.sep}wrenchIcon.ico"))
+        self.setWindowIcon(QtG.QIcon(os.path.join(base_path, "wrenchIcon.ico")))
         self.setWindowTitle("Options")
 
         layout = QtW.QGridLayout()
@@ -318,7 +323,7 @@ if __name__ == '__main__':
     logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
 
     try:
-        config = toml.load(f"{base_path}{os.sep}config.toml")
+        config = toml.load(os.path.join(os.getcwd(), "config.toml"))
     except FileNotFoundError:
         config = {}
 
@@ -327,7 +332,7 @@ if __name__ == '__main__':
     config["token"] = get_default(config, "token", os.environ.get("SOLDER_KEY") or "")
     config["extract"] = get_default(config, "extract", True)
     config["upload"] = get_default(config, "upload", False)
-    with open(f"{base_path}{os.sep}config.toml", "w") as f:
+    with open(os.path.join(os.getcwd(), "config.toml"), "w") as f:
         toml.dump(config, f)
         f.close()