Everything is working fine now

Author: egeakman

.gitignore

@@ -2,3 +2,5 @@ __pycache__/
 *.egg-info/
 dist/
 build/
+*.exe
+*.spec

README.md

@@ -20,7 +20,7 @@ Run:  ``python -m pip install --upgrade gcode2zaxe``
 
 * ``-d, --nozzle_diameter:`` Nozzle diameter. Defaults to ``0.4``.
 
-* ``-m, --model:`` Zaxe printer model. Defaults to ``X1``. See available models in the [models list](https://github.com/egeakman/gcode2zaxe/blob/master/resources/models.json).
+* ``-m, --model:`` Zaxe printer model. Defaults to ``X1``. See available models in the [models list](https://github.com/egeakman/gcode2zaxe/blob/master/gcode2zaxegui/resources.json).
 
 ## Contributing
 

gcode2zaxe/cli.py

@@ -38,25 +38,15 @@
 
 
 def main():
-    encoded = lib.convert_to_bytes(args.gcode)
-
-    with open(tmp_gcode, "wb") as f:
-        f.write(encoded)
-
-    with open(infopath, "w") as f:
-        f.write(
-            json.dumps(
-                lib.make_info(
-                    args.filament,
-                    args.nozzle_diameter,
-                    args.gcode,
-                    args.model,
-                    tmp_gcode,
-                    args.name,
-                )
-            )
-        )
-
-    open(snapshot, "w").close()
+    lib.write_tmps(args.gcode, tmp_gcode, snapshot)
+    lib.make_info(
+        infopath,
+        args.filament,
+        args.nozzle_diameter,
+        args.gcode,
+        args.model,
+        tmp_gcode,
+        args.name,
+    )
     lib.create_zaxe(zaxepath, tmp_gcode, snapshot, infopath)
     lib.cleanup(tmp_gcode, infopath, snapshot)

gcode2zaxe/lib.py

@@ -48,8 +48,18 @@ def read_gcode(gcode):
         return gcode_info
 
 
-def make_info(filament_type, nozzle_diameter, gcode, model, tmp_gcode, name):
-    return {
+def write_tmps(gcode, tmp_gcode, snapshot):
+    encoded = convert_to_bytes(gcode)
+
+    with open(tmp_gcode, "wb") as f:
+        f.write(encoded)
+
+    open(snapshot, "w").close()
+    
+
+def make_info(infopath, filament_type, nozzle_diameter, gcode, model, tmp_gcode, name):
+    with open(infopath, "w") as f:
+        f.write(json.dumps({
         "material": filament_type,
         "nozzle_diameter": nozzle_diameter,
         "filament_used": read_gcode(gcode)["filament_used"]
@@ -66,19 +76,7 @@ def make_info(filament_type, nozzle_diameter, gcode, model, tmp_gcode, name):
         "extruder_temperature": 210 if filament_type == "zaxe_pla" else 240,
         "bed_temperature": 60 if filament_type == "zaxe_pla" else 80,
         "version": "2.0.0",
-    }
-
-
-def write_tmps(gcode, tmp_gcode, infopath, info, snapshot):
-    encoded = convert_to_bytes(gcode)
-
-    with open(tmp_gcode, "wb") as f:
-        f.write(encoded)
-
-    with open(infopath, "w") as f:
-        f.write(json.dumps(info))
-
-    open(snapshot, "w").close()
+    }))
 
 
 def cleanup(tmp_gcode, infopath, snapshot):

resources/resources.json gcode2zaxegui/resources.jsonresources/resources.json renamed to gcode2zaxegui/resources.json

@@ -3,7 +3,6 @@
         "Zaxe X1": "X1",
         "Zaxe X1+": "X1PLUS",
         "Zaxe X2": "X2",
-        "Zaxe X3": "X3",
         "Zaxe Z1": "Z1",
         "Zaxe Z1+": "Z1PLUS",
         "Zaxe Z3": "Z3"

gcode2zaxegui/ui.py

@@ -22,13 +22,13 @@
 class ui_functions:
     @staticmethod
     def return_model_list():
-        with open("../resources/resources.json", "r") as f:
+        with open("resources.json", "r") as f:
             datastore = json.load(f)
         return list(datastore["models"])
 
     @staticmethod
     def return_filament_types():
-        with open("../resources/resources.json", "r") as f:
+        with open("resources.json", "r") as f:
             datastore = json.load(f)
         return list(datastore["materials"])
 
@@ -226,25 +226,25 @@ def bottom_placement(self):
         self.bottom_hbox.addWidget(self.subtitle)
 
     def convert(self):
-        with open("../resources/resources.json", "r") as f:
+        with open("resources.json", "r") as f:
             datastore = json.load(f)
         if self.is_convertable():
-            try:
 
+            try:
                 g2z_lib.write_tmps(
                     self.dir[0],
                     self.tmp_gcode,
-                    self.infopath,
-                    g2z_lib.make_info(
-                        datastore["materials"][self.filament_type_input.currentText()],
-                        self.spin_box.value(),
-                        self.dir[0],
-                        datastore["models"][self.model_combobox.currentText()],
-                        self.tmp_gcode,
-                        self.output_dir[0],
-                    ),
                     self.snapshot,
                 )
+                g2z_lib.make_info(
+                    self.infopath,
+                    datastore["materials"][self.filament_type_input.currentText()],
+                    self.spin_box.value(),
+                    self.dir[0],
+                    datastore["models"][self.model_combobox.currentText()],
+                    self.tmp_gcode,
+                    self.output_dir[0],
+                ),
                 g2z_lib.create_zaxe(
                     self.output_dir[0], self.tmp_gcode, self.snapshot, self.infopath
                 )
@@ -256,7 +256,7 @@ def convert(self):
                     title="Success!",
                     icon=QMessageBox.Icon.Information,
                 )
-            except Exception as e:
+            except Exception:
                 self.message_box(
                     "An unknown error occured. Please try again.",
                     buttons=QMessageBox.StandardButton.Ok,

setup.py

@@ -26,10 +26,10 @@ def latest_version(package_name):
     description="Gcode to Zaxe Converter | executable: g2z",
     long_description=long_description,
     long_description_content_type="text/markdown",
-    version="2022.6.15-1",
+    version="2022.6.23",
     license="AGPLv3",
-    download_url="https://github.com/egeakman/gcode2zaxe/archive/2022.6.15-1.tar.gz",
-    packages=find_packages(where=".", exclude=["tests", "resources", "gcode2zaxegui"]),
+    download_url="https://github.com/egeakman/gcode2zaxe/archive/2022.6.23.tar.gz",
+    packages=find_packages(where=".", exclude=["tests", "gcode2zaxegui"]),
     python_requires=">=3.8",
     entry_points={
         "console_scripts": [