Handle file paths uploaded from Windows correctly

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3d7367f7e9298695aaa32a15f77daf4bc87ff94..4d294aff42b752c097519da4d3c63e499ccc641a 100644 (file)
--- 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 b9ba4e5b63dd5b9a11fb2cb0cdd71ea3f7d24a4d..ec6f228d8b2ebc01fe6be269d2e28add7ed9c1a1 100644 (file)
--- 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())