Fix file naming

JTechPhotonics · Jul 6, 2022 · b26ffdd · b26ffdd
1 parent 34cba42
commit b26ffdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/laser/laser.inx b/laser/laser.inx
@@ -16,7 +16,6 @@
             <spacer/>
             <param name="directory" type="path" gui-text="Output Directory" mode="folder">-- Choose Output Directory --</param>
             <param name="filename" type="string" gui-text="Filename">output.gcode</param>
-            <param name="filename_dynamic" type="bool" gui-text="Reuse SVG filename for output">false</param>
             <param name="filename_suffix" type="bool" gui-text="Add Numeric Suffix to Filename">true</param>
         </page>
         <page name="advanced_settings" gui-text="Advanced Settings">

diff --git a/laser/laser.py b/laser/laser.py
@@ -49,20 +49,17 @@ def effect(self):
         TOLERANCES["approximation"] = float(self.options.approximation_tolerance.replace(',', '.'))
 
         # Construct output path
-        # Construct output path
-        if self.options.filename_dynamic and self.document_path():
+        if self.options.filename:
+            output_path = os.path.join(self.options.directory, self.options.filename)
+            if '.' not in output_path:
+                output_path += ".gcode"
+        else:
             filename, extension = self.document_path().split('.')
             filename = filename.split('/')[-1] + '.gcode'
             output_path = os.path.join(self.options.directory, filename)
-        else:
-            output_path = os.path.join(self.options.directory, self.options.filename)
 
         if self.options.filename_suffix:
-            try:
-                filename, extension = output_path.split('.')
-            except:
-                self.msg("Error in output directory!")
-                exit(1)
+            filename, extension = output_path.split('.')
 
             n = 1
             while os.path.isfile(output_path):