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

changed filehandler to put ok for macros

Browse Source
This commit is contained in:
sanjayk03-dev
2024-01-23 15:48:08 +05:30
parent 1fbfbf8d09
commit abc52a1543
3 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/macros.js
View File

@@ -171,7 +171,7 @@ module.exports = {
} }
}; };
xhr.open("PUT", `/api/file/${encodeURIComponent(filename)}`, true); xhr.open("PUT", `/api/file/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE${encodeURIComponent(filename)}`, true);
xhr.send(file); xhr.send(file);
const gcodeData = { const gcodeData = {

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

@@ -88,19 +88,36 @@ class FileHandler(bbctrl.APIHandler):
os.mkdir(self.get_upload()) os.mkdir(self.get_upload())
self.get_log('FileHandler').info('uploadFilename ' + self.uploadFilename) self.get_log('FileHandler').info('uploadFilename ' + self.uploadFilename)
filename = self.get_upload(self.uploadFilename).encode('utf8') if self.uploadFilename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
safe_remove(filename) self.get_log('FileHandler').info('it is from macros')
self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name) self.uploadFilename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
os.link(self.uploadFile.name, filename) filename = self.get_upload(self.uploadFilename).encode('utf8')
safe_remove(filename)
self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name)
os.link(self.uploadFile.name, filename)
self.uploadFile.close() self.uploadFile.close()
del (self.uploadFile) del (self.uploadFile)
self.get_ctrl().preplanner.invalidate(self.uploadFilename) self.get_ctrl().preplanner.invalidate(self.uploadFilename)
self.get_ctrl().state.add_file(self.uploadFilename) self.get_ctrl().state.add_file('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'+self.uploadFilename)
self.get_log('FileHandler').info( self.get_log('FileHandler').info(
'GCode received: ' + self.uploadFilename) 'GCode received: ' + self.uploadFilename)
else:
filename = self.get_upload(self.uploadFilename).encode('utf8')
safe_remove(filename)
self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name)
os.link(self.uploadFile.name, filename)
self.uploadFile.close()
del (self.uploadFile)
self.get_ctrl().preplanner.invalidate(self.uploadFilename)
self.get_ctrl().state.add_file(self.uploadFilename)
self.get_log('FileHandler').info(
'GCode received: ' + self.uploadFilename)
del (self.uploadFilename) del (self.uploadFilename)

24
src/py/bbctrl/State.py
View File

@@ -157,14 +157,22 @@ class State(object):
def add_file(self, filename): def add_file(self, filename):
self.log.info('filename %s' % filename) if filename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
files = copy.deepcopy(self.get('files')) self.uploadFilename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
if not filename in files: self.log.info('filename %s' % filename)
files.append(filename) files = copy.deepcopy(self.get('files'))
files.sort() if not filename in files:
self.set('files', files) files.append(filename)
self.select_file(filename) files.sort()
self.set('files', files)
else:
self.log.info('filename %s' % filename)
files = copy.deepcopy(self.get('files'))
if not filename in files:
files.append(filename)
files.sort()
self.set('files', files)
self.select_file(filename)
def remove_file(self, filename): def remove_file(self, filename):
files = copy.deepcopy(self.get('files')) files = copy.deepcopy(self.get('files'))