From 38758d08a13eff8457e4f7099c4fda098261e41f Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Tue, 16 Apr 2019 17:12:24 -0700 Subject: [PATCH] Handle file paths uploaded from Windows correctly --- CHANGELOG.md | 1 + src/py/bbctrl/FileHandler.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3d7367..4d294af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Buildbotics CNC Controller Firmware Changelog - EStop on motor fault. - Fixed ETA line wrapping on Web interface. - Fixed zeroing with non-zero offset when unhomed. #211 + - Handle file paths uploaded from Windows correctly. #212 ## v0.4.6 - Fixed a rare ``Negative s-curve time`` error. diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py index b9ba4e5..ec6f228 100644 --- a/src/py/bbctrl/FileHandler.py +++ b/src/py/bbctrl/FileHandler.py @@ -60,7 +60,7 @@ class FileHandler(bbctrl.APIHandler): def put_ok(self, *args): gcode = self.request.files['gcode'][0] - filename = os.path.basename(gcode['filename']) + filename = os.path.basename(gcode['filename'].replace('\\', '/')) if not os.path.exists(self.get_upload()): os.mkdir(self.get_upload()) -- 2.27.0