diff --git a/src/py/bbctrl/FileHandler.py b/src/py/bbctrl/FileHandler.py index 21b38c7..3e4b144 100644 --- a/src/py/bbctrl/FileHandler.py +++ b/src/py/bbctrl/FileHandler.py @@ -41,8 +41,6 @@ class FileHandler(bbctrl.APIHandler): if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'): exceptionList=filename.replace('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','').split(',') - for i in exceptionList: - self.get_log('FileHandler').info('macrosListItem ' + i) for filename in [item for item in allFiles if item not in exceptionList]: filename = os.path.basename(filename) @@ -52,8 +50,6 @@ class FileHandler(bbctrl.APIHandler): elif filename.startswith('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH'): deletionList=filename.replace('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH','').split(',') - for i in deletionList: - self.get_log('FileHandler').info('macrosListItem ' + i) for filename in [item for item in allFiles if item in deletionList]: filename = os.path.basename(filename) @@ -81,12 +77,10 @@ class FileHandler(bbctrl.APIHandler): if not os.path.exists(self.get_upload()): os.mkdir(self.get_upload()) - self.get_log('FileHandler').info('uploadFilename ' + self.uploadFilename) if self.uploadFilename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):#macros self.uploadFilename=self.uploadFilename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','') 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() @@ -95,12 +89,10 @@ class FileHandler(bbctrl.APIHandler): self.get_ctrl().preplanner.invalidate(self.uploadFilename) self.get_ctrl().state.add_file('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'+self.uploadFilename) - self.get_log('FileHandler').info( - '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() @@ -109,14 +101,11 @@ class FileHandler(bbctrl.APIHandler): 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) @gen.coroutine def get(self, filename): - self.get_log('FileHandler').info('138 FileName: ' + filename) filebasename=filename if not filename: raise HTTPError(400, 'Missing filename') diff --git a/src/py/bbctrl/Preplanner.py b/src/py/bbctrl/Preplanner.py index 921007a..094fe9a 100644 --- a/src/py/bbctrl/Preplanner.py +++ b/src/py/bbctrl/Preplanner.py @@ -241,9 +241,7 @@ class Preplanner(object): def delete_all_plans(self): files = glob.glob(self.ctrl.get_plan('*')) - for path in files: - self.log.info('deleting files: '+path) - safe_remove(path) + for path in files: safe_remove(path) self.invalidate_all() diff --git a/src/py/bbctrl/State.py b/src/py/bbctrl/State.py index d29c27e..c66bdc1 100644 --- a/src/py/bbctrl/State.py +++ b/src/py/bbctrl/State.py @@ -119,7 +119,7 @@ class State(object): def load_files(self): files = [] - upload = self.ctrl.get_upload() + upload = self.ctrl.get_upload() if not os.path.exists(upload): os.mkdir(upload) @@ -147,14 +147,12 @@ class State(object): def add_file(self, filename): if filename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'): filename=filename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','') - 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) else: - self.log.info('filename %s' % filename) files = copy.deepcopy(self.get('files')) if not filename in files: files.append(filename) diff --git a/src/svelte-components/src/lib/StoreHelpers.ts b/src/svelte-components/src/lib/StoreHelpers.ts index 53fe896..f0e8bb2 100644 --- a/src/svelte-components/src/lib/StoreHelpers.ts +++ b/src/svelte-components/src/lib/StoreHelpers.ts @@ -2,7 +2,7 @@ import { get, type Writable } from "svelte/store"; export function waitForChange(writable: Writable): Promise { let unsubscribe:()=>{}; - const promise = new Promise((resolve,reject) => { + const promise = new Promise(resolve => { let receivedInitial = false; let previousValue : any; unsubscribe = writable.subscribe(value => {