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

Fixed not selecting the file just uploaded

Browse Source
This commit is contained in:
David Carley
2022-09-12 01:19:26 +00:00
parent b770901576
commit 9ee617157e
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ class FileHandler(bbctrl.APIHandler):
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.load_files()
self.get_log('FileHandler').info('GCode received: ' + self.get_log('FileHandler').info('GCode received: ' +
self.uploadFilename) self.uploadFilename)

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

@@ -10,6 +10,7 @@ import threading
import time import time
import traceback import traceback
import uuid import uuid
import glob
def call_get_output(cmd): def call_get_output(cmd):
@@ -122,18 +123,16 @@ class State(object):
self.set('offset_' + axis, 0) self.set('offset_' + axis, 0)
def load_files(self): def load_files(self):
files = []
upload = self.ctrl.get_upload() upload = self.ctrl.get_upload()
if not os.path.exists(upload): if not os.path.exists(upload):
os.mkdir(upload) os.mkdir(upload)
for path in os.listdir(upload): files = filter(os.path.isfile, glob.glob(upload + '/*'))
if os.path.isfile(upload + '/' + path): # Sort list of files based on last modification time in ascending order
files.append(path) files = sorted(files, key=os.path.getmtime, reverse=True)
files = list(map(lambda f: f.replace("./upload/", ""), files))
files.sort()
self.set('files', files) self.set('files', files)
if len(files): if len(files):