@@ -305,22 +305,21 @@ def processExportLayer(self):
305305 #create images folder
306306 if not os .path .exists (os .path .join (output_path , self .export_image_folder )):
307307 os .makedirs (os .path .join (output_path , self .export_image_folder ))
308-
309308 #create cache folder
310309 if not os .path .exists (os .path .join (output_path , self .export_cache_folder )):
311310 os .makedirs (os .path .join (output_path , self .export_cache_folder ))
312311
313- OUTPUT_FOLDER_LOCATION = output_path
314- LIBRARY_FOLDER_LOCATION = os .path .join (output_path , self .library_folder )
315- IMAGE_FOLDER_LOCATION = os .path .join (output_path , self .export_image_folder )
316- CACHE_FOLDER_LOCATION = os .path .join (output_path , self .export_cache_folder )
312+ OUTPUT_FOLDER_PATH = output_path
313+ LIBRARY_FOLDER_PATH = os .path .join (output_path , self .library_folder )
314+ IMAGE_FOLDER_PATH = os .path .join (output_path , self .export_image_folder )
315+ CACHE_FOLDER_PATH = os .path .join (output_path , self .export_cache_folder )
317316
318- KICAD_PCB_PATH = os .path .join (OUTPUT_FOLDER_LOCATION , self .kicad_pcb_file )
319- KICAD_LIB_PATH = os .path .join (OUTPUT_FOLDER_LOCATION , self .library_table_file )
320- KICAD_PRO_PATH = os .path .join (OUTPUT_FOLDER_LOCATION , self .kicad_project_file )
321- KICAD_MOD_PATH = os .path .join (OUTPUT_FOLDER_LOCATION , self .kicad_mod_file )
317+ KICAD_PCB_PATH = os .path .join (OUTPUT_FOLDER_PATH , self .kicad_pcb_file )
318+ KICAD_LIB_PATH = os .path .join (OUTPUT_FOLDER_PATH , self .library_table_file )
319+ KICAD_PRO_PATH = os .path .join (OUTPUT_FOLDER_PATH , self .kicad_project_file )
320+ KICAD_MOD_PATH = os .path .join (OUTPUT_FOLDER_PATH , self .kicad_mod_file )
322321
323- options_path = os .path .join (CACHE_FOLDER_LOCATION , 'svg2shenzhen-options' )
322+ options_path = os .path .join (CACHE_FOLDER_PATH , 'svg2shenzhen-options' )
324323
325324 if os .path .exists (options_path ):
326325 with open (options_path , 'r' ) as f :
@@ -347,7 +346,7 @@ def processExportLayer(self):
347346 if ("-invert" in layer_label ):
348347 layer_label = layer_label .replace ("-invert" , "" )
349348 invert = "false"
350- hash_sum_path = os .path .join (CACHE_FOLDER_LOCATION , 'svg2shenzhen-{}-{}-{}-{}' .format (layer_id , layer_label , layer_type , invert ))
349+ hash_sum_path = os .path .join (CACHE_FOLDER_PATH , 'svg2shenzhen-{}-{}-{}-{}' .format (layer_id , layer_label , layer_type , invert ))
351350
352351 prev_hash_sum = None
353352 if os .path .exists (hash_sum_path ):
@@ -356,15 +355,15 @@ def processExportLayer(self):
356355
357356 # generate unique filename each layer
358357 temp_name = next (tempfile ._get_candidate_names ())
359- layer_dest_svg_path = os .path .join (CACHE_FOLDER_LOCATION , temp_name )
358+ layer_dest_svg_path = os .path .join (CACHE_FOLDER_PATH , temp_name )
360359 hash_sum = self .export_layers (layer_dest_svg_path , show_layer_ids )
361360 temp_svg_paths .append (layer_dest_svg_path )
362361
363362 if self .options .filetype == "kicad_pcb" or self .options .filetype == "kicad_module" :
364- layer_dest_png_path = os .path .join (IMAGE_FOLDER_LOCATION , "%s_%s.png" % (layer_label , layer_id ))
363+ layer_dest_png_path = os .path .join (IMAGE_FOLDER_PATH , "%s_%s.png" % (layer_label , layer_id ))
365364 else :
366- layer_dest_png_path = os .path .join (IMAGE_FOLDER_LOCATION , "%s_%s.png" % (layer_label , layer_id ))
367- layer_dest_kicad_path = os .path .join (LIBRARY_FOLDER_LOCATION , "%s_%s.kicad_mod" % (layer_label , layer_id ))
365+ layer_dest_png_path = os .path .join (IMAGE_FOLDER_PATH , "%s_%s.png" % (layer_label , layer_id ))
366+ layer_dest_kicad_path = os .path .join (LIBRARY_FOLDER_PATH , "%s_%s.kicad_mod" % (layer_label , layer_id ))
368367 kicad_mod_files .append (layer_dest_kicad_path )
369368
370369
0 commit comments