Merge pull request #34 from ModuloFS/main

New feature selectable local export location

Author: PatrickFranken

README.md

@@ -43,8 +43,10 @@ In order to speed up the development to production process we support the automa
 ![Attribute list for MPNs](docs/mpn_assign.png)
 
 ### How to export data locally
-Due to company-wide firewall restrictions etc. the direct upload may not work. For this case it's possible to export all data locally as a ZIP file. This file can then be uploaded manually.
-To enable this option, open the "Board Setup", select "Text Variables" and add a new variable called "aisler_export_locally". The value itself doesn't matter. Now this is set the plugin will place a ZIP file next to the kicad_pcb file instead of uploading the file directly.
+Due to company-wide firewall restrictions, direct upload may not work. In this case, it is possible to export all data locally as a ZIP file, which can then be uploaded manually.
+To enable this option, open the "Board Setup", select "Text Variables", and add a new variable called "aisler_export_locally". The value itself does not matter. Once this is set, the plugin will place a ZIP file next to the kicad_pcb file instead of uploading it directly.
+If you want to specify a custom location for the local export relative to the project directory, you can add another text variable called "aisler_local_export_path". The value of this variable specifies the target directory relative to your project location.
+If it is left empty, the plugin will place the ZIP file next to the kicad_pcb file. If you enter "\Fabrication", for example, the plugin will create a folder called "Fabrication" next to the kicad_pcb file and place the ZIP file in that folder.
 
 ### About AISLER
 AISLER makes hardware less hard by providing simple electronics manufacturing for everyone. We are based in Europe and focus on amazingly affordable prices, super swift delivery and outstanding customer support. We are KiCad Platinum Sponsor as we donate a significant amount of our revenues made from KiCad designs back to the project.

pcm/metadata_template.json

@@ -28,7 +28,7 @@
     },
     "versions": [
         {
-            "version": "0.2.3",
+            "version": "0.2.4",
             "status": "stable",
             "kicad_version": "8.00"
         }

src/push_thread.py

@@ -20,7 +20,10 @@ def __init__(self, wxObject):
 
     def run(self):
         temp_dir = tempfile.mkdtemp()
-        _, temp_file = tempfile.mkstemp()
+        fd, temp_file = tempfile.mkstemp()
+        # close temporary created file to be able to delete it later
+        os.close(fd)
+        
         board = pcbnew.GetBoard()
         title_block = board.GetTitleBlock()
         self.report(10)
@@ -126,19 +129,35 @@ def run(self):
             json.dump(components, outfile)
 
         # # Create ZIP file
-        temp_file = shutil.make_archive(temp_file, 'zip', temp_dir)
+        zip_file = shutil.make_archive(temp_file, 'zip', temp_dir)
         props = board.GetProperties()
-        if props.has_key('aisler_export_locally'):
-            path = os.path.dirname(os.path.abspath(board.GetFileName()))
+        if props.has_key('aisler_local_export_path'):
+            if props['aisler_local_export_path'] is not '':
+                path = os.path.dirname(os.path.abspath(board.GetFileName())) + '/' + props['aisler_local_export_path']
+                path = os.path.normpath(path)
+                if not os.path.isdir(path):
+                    os.makedirs(path)
+            else:
+                path = os.path.dirname(os.path.abspath(board.GetFileName()))                
+            filename = "aisler_export_" + os.path.splitext(os.path.basename(board.GetFileName()))[0] + '.zip'
+            shutil.copy(zip_file, os.path.join(path, filename))
+            self.report(-1)
+        elif props.has_key('aisler_export_locally'):
+            path = os.path.dirname(os.path.abspath(board.GetFileName()))                
             filename = "aisler_export_" + os.path.splitext(os.path.basename(board.GetFileName()))[0] + '.zip'
-            shutil.copy(temp_file, os.path.join(path, filename))
+            shutil.copy(zip_file, os.path.join(path, filename))
             self.report(-1)
         else:
-            self.push_to_webservice(temp_file, project_id, board)
+            self.push_to_webservice(zip_file, project_id, board)
+            
+        # delete temporary data 
+        os.remove(zip_file)
+        os.remove(temp_file)
+        shutil.rmtree(temp_dir, ignore_errors = True)
 
-    def push_to_webservice(self, temp_file, project_id, board):
+    def push_to_webservice(self, zip_file, project_id, board):
         title_block = board.GetTitleBlock()
-        files = {'upload[file]': open(temp_file, 'rb')}
+        files = {'upload[file]': open(zip_file, 'rb')}
 
         self.report(40)
         if project_id: