From cef1e490f56e9e417433c85061996775ff742ebd Mon Sep 17 00:00:00 2001 From: sanjayk03-dev Date: Tue, 23 Jan 2024 01:08:25 +0530 Subject: [PATCH] url encoding --- src/js/macros.js | 2 +- src/py/bbctrl/FileHandler.py | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/js/macros.js b/src/js/macros.js index 981d8ec..c9fa4cf 100644 --- a/src/js/macros.js +++ b/src/js/macros.js @@ -53,7 +53,7 @@ module.exports = { loadMacrosGcode: async function () { const file = this.selectedValues[this.tab - 1]; if (this.selectedValues[this.tab - 1] != "default") { - const response = await fetch(`/api/file/{%MACROS%}${file}`, { + const response = await fetch(`/api/file/%7B%MACROS%7D${file}`, { cache: "no-cache", }); const text = (await response.text()).split(" ").join("\n"); diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py index 9dfa7ff..5adbcd9 100644 --- a/src/py/bbctrl/FileHandler.py +++ b/src/py/bbctrl/FileHandler.py @@ -80,11 +80,13 @@ class FileHandler(bbctrl.APIHandler): 'FileName: ' + filename) if not filename: raise HTTPError(400, 'Missing filename') - if filename.startswith('/{%MACROS%}'): - filebasename = os.path.basename(url_unescape(filename.replace("{%MACROS%}", ""))) + if filename.startswith('/%7B%MACROS%7D'): + filebasename = os.path.basename(url_unescape(filename.replace("%7B%MACROS%7D", ""))) else: filebasename = os.path.basename(url_unescape(filename)) - + + self.get_log('FileHandler').info( + 'FileBaseName: ' + filebasename) try: with open(self.get_upload(filebasename).encode('utf8'), 'r') as f: self.write(f.read()) @@ -92,5 +94,5 @@ class FileHandler(bbctrl.APIHandler): self.get_ctrl().state.select_file('') raise HTTPError( 400, "Unable to read file - doesn't appear to be GCode.") - if not filename.startswith('/{%MACROS%}'): + if not filename.startswith('/%7B%MACROS%7D'): self.get_ctrl().state.select_file(filebasename)