muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fetching macros file

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-23 00:51:33 +05:30
parent 31f5d1a6b8
commit c7ebabdfcf
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/macros.js
View File

@@ -53,7 +53,7 @@ module.exports = {
loadMacrosGcode: async function () { loadMacrosGcode: async function () {
const file = this.selectedValues[this.tab - 1]; const file = this.selectedValues[this.tab - 1];
if (this.selectedValues[this.tab - 1] != "default") { if (this.selectedValues[this.tab - 1] != "default") {
const response = await fetch(`/api/file/${file}`, { const response = await fetch(`/api/file/{%MACROS%}${file}`, {
cache: "no-cache", cache: "no-cache",
}); });
const text = (await response.text()).split(" ").join("\n"); const text = (await response.text()).split(" ").join("\n");

19
src/py/bbctrl/FileHandler.py
View File

@@ -37,9 +37,10 @@ class FileHandler(bbctrl.APIHandler):
self.uploadFile.write(data) self.uploadFile.write(data)
def delete_ok(self, filename): def delete_ok(self, filename):
self.get_log('FileHandler').info('filename ' + filename)
if(filename.split('$MACROS$')[0] == 'macros'):
macrosList = filename.split('$MACROS$')[1]
allFiles = self.get_ctrl().state.return_files() allFiles = self.get_ctrl().state.return_files()
for file in allFiles:
self.get_log('FileHandler').info('filename ' + file)
if not filename: if not filename:
# Delete everything # Delete everything
@@ -78,17 +79,21 @@ class FileHandler(bbctrl.APIHandler):
@gen.coroutine @gen.coroutine
def get(self, filename): def get(self, filename):
self.get_log('FileHandler').info(
'FileName: ' + filename)
if not filename: if not filename:
raise HTTPError(400, 'Missing filename') raise HTTPError(400, 'Missing filename')
if filename.startswith('{%MACROS%}'):
filename = os.path.basename(url_unescape(filename)) filebasename = os.path.basename(url_unescape(filename.replace("{%MACROS%}", "")))
else:
filebasename = os.path.basename(url_unescape(filename))
try: try:
with open(self.get_upload(filename).encode('utf8'), 'r') as f: with open(self.get_upload(filebasename).encode('utf8'), 'r') as f:
self.write(f.read()) self.write(f.read())
except Exception: except Exception:
self.get_ctrl().state.select_file('') self.get_ctrl().state.select_file('')
raise HTTPError( raise HTTPError(
400, "Unable to read file - doesn't appear to be GCode.") 400, "Unable to read file - doesn't appear to be GCode.")
if not filename.startswith('{%MACROS%}'):
self.get_ctrl().state.select_file(filename) self.get_ctrl().state.select_file(filebasename)