JLC2KiCadLib 1.0.31__tar.gz → 1.0.33__tar.gz

jlc2kicadlib-1.0.33/JLC2KiCadLib/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.0.33"

{JLC2KiCadLib-1.0.31 → jlc2kicadlib-1.0.33}/JLC2KiCadLib/footprint/model3d.py

@@ -46,11 +46,11 @@ def get_StepModel(
 
     if footprint_info.model_base_variable:
         if footprint_info.model_base_variable.startswith("$"):
-            path_name = f'"{footprint_info.model_base_variable}/{footprint_info.footprint_name}.step"'
+            path_name = f'"{footprint_info.model_base_variable}/{footprint_info.model_dir}/{footprint_info.footprint_name}.step"'
         else:
-            path_name = f'"$({footprint_info.model_base_variable})/{footprint_info.footprint_name}.step"'
+            path_name = f'"$({footprint_info.model_base_variable})/{footprint_info.model_dir}/{footprint_info.footprint_name}.step"'
     else:
-        path_name = filename
+        path_name = f"{footprint_info.model_dir}/{footprint_info.footprint_name}.step"
 
     translationX = (translationX - footprint_info.origin[0]) / 100
     translationY = -(translationY - footprint_info.origin[1]) / 100
@@ -182,15 +182,11 @@ Shape{{
 
     if footprint_info.model_base_variable:
         if footprint_info.model_base_variable.startswith("$"):
-            path_name = f'"{footprint_info.model_base_variable}/{footprint_info.footprint_name}.wrl"'
+            path_name = f'"{footprint_info.model_base_variable}/{footprint_info.model_dir}/{footprint_info.footprint_name}.wrl"'
         else:
-            path_name = f'"$({footprint_info.model_base_variable})/{footprint_info.footprint_name}.wrl"'
+            path_name = f'"$({footprint_info.model_base_variable})/{footprint_info.model_dir}/{footprint_info.footprint_name}.wrl"'
     else:
-        dirname = os.getcwd().replace("\\", "/").replace("/footprint", "")
-        if os.path.isabs(filename):
-            path_name = filename
-        else:
-            path_name = f"{dirname}/{filename}"
+        path_name = f"{footprint_info.model_dir}/{footprint_info.footprint_name}.wrl"
 
     translationX = (translationX - footprint_info.origin[0]) / 100
     translationY = -(translationY - footprint_info.origin[1]) / 100

{JLC2KiCadLib-1.0.31 → jlc2kicadlib-1.0.33}/JLC2KiCadLib/symbol/symbol.py

@@ -34,8 +34,8 @@ def create_symbol(
 ):
     class kicad_symbol:
         drawing = ""
-        pinNamesHide =  "(pin_names hide)"
-        pinNumbersHide =  "(pin_numbers hide)"
+        pinNamesHide = "(pin_names hide)"
+        pinNumbersHide = "(pin_numbers hide)"
 
     kicad_symbol = kicad_symbol()
 
@@ -56,9 +56,14 @@ def create_symbol(
         ].replace("?", "")
         component_title = (
             data["result"]["title"]
-            .replace("/", "_")
             .replace(" ", "_")
             .replace(".", "_")
+            .replace("/", "{slash}")
+            .replace("\\", "{backslash}")
+            .replace("<", "{lt}")
+            .replace(">", "{gt}")
+            .replace(":", "{colon}")
+            .replace('"', "{dblquote}")
         )
 
         component_types_values = []

{JLC2KiCadLib-1.0.31 → jlc2kicadlib-1.0.33}/JLC2KiCadLib/symbol/symbol_handlers.py

@@ -116,11 +116,11 @@ def h_P(data, translation, kicad_symbol):
             kicad_symbol.pinNamesHide = ""
         if data[17].split("^^")[1] != "0":
             kicad_symbol.pinNumbersHide = ""
-    except Exception :
-            kicad_symbol.pinNamesHide = ""
-            kicad_symbol.pinNumbersHide = ""
+    except Exception:
+        kicad_symbol.pinNamesHide = ""
+        kicad_symbol.pinNumbersHide = ""
 
-    try :
+    try:
         nameSize = mil2mm(float(data[16].replace("pt", "")))
         numberSize = mil2mm(float(data[24].replace("pt", "")))
     except Exception:

{JLC2KiCadLib-1.0.31 → jlc2kicadlib-1.0.33}/JLC2KiCadLib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: JLC2KiCadLib
-Version: 1.0.31
+Version: 1.0.33
 Summary: JLC2KiCad_lib is a python script that generate a component library (symbol, footprint and 3D model) for KiCad from the JLCPCB/easyEDA library.
 Home-page: https://github.com/TousstNicolas/JLC2KiCad_lib
 Author: TousstNicolas
@@ -14,6 +14,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: KicadModTree
 Requires-Dist: requests
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # JLC2KiCadLib
 

{JLC2KiCadLib-1.0.31 → jlc2kicadlib-1.0.33}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: JLC2KiCadLib
-Version: 1.0.31
+Version: 1.0.33
 Summary: JLC2KiCad_lib is a python script that generate a component library (symbol, footprint and 3D model) for KiCad from the JLCPCB/easyEDA library.
 Home-page: https://github.com/TousstNicolas/JLC2KiCad_lib
 Author: TousstNicolas
@@ -14,6 +14,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: KicadModTree
 Requires-Dist: requests
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # JLC2KiCadLib
 

JLC2KiCadLib-1.0.31/JLC2KiCadLib/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.0.31"