removed logs in .py files
This commit is contained in:
@@ -41,8 +41,6 @@ class FileHandler(bbctrl.APIHandler):
|
|||||||
|
|
||||||
if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
|
if filename.startswith('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
|
||||||
exceptionList=filename.replace('/EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','').split(',')
|
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]:
|
for filename in [item for item in allFiles if item not in exceptionList]:
|
||||||
filename = os.path.basename(filename)
|
filename = os.path.basename(filename)
|
||||||
@@ -52,8 +50,6 @@ class FileHandler(bbctrl.APIHandler):
|
|||||||
|
|
||||||
elif filename.startswith('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH'):
|
elif filename.startswith('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH'):
|
||||||
deletionList=filename.replace('/DINCAIQABiDARixAxiABDIHCAMQABiABDIHCAQQABiABDIH','').split(',')
|
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]:
|
for filename in [item for item in allFiles if item in deletionList]:
|
||||||
filename = os.path.basename(filename)
|
filename = os.path.basename(filename)
|
||||||
@@ -81,12 +77,10 @@ class FileHandler(bbctrl.APIHandler):
|
|||||||
if not os.path.exists(self.get_upload()):
|
if not os.path.exists(self.get_upload()):
|
||||||
os.mkdir(self.get_upload())
|
os.mkdir(self.get_upload())
|
||||||
|
|
||||||
self.get_log('FileHandler').info('uploadFilename ' + self.uploadFilename)
|
|
||||||
if self.uploadFilename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):#macros
|
if self.uploadFilename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):#macros
|
||||||
self.uploadFilename=self.uploadFilename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
|
self.uploadFilename=self.uploadFilename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
|
||||||
filename = self.get_upload(self.uploadFilename).encode('utf8')
|
filename = self.get_upload(self.uploadFilename).encode('utf8')
|
||||||
safe_remove(filename)
|
safe_remove(filename)
|
||||||
self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name)
|
|
||||||
os.link(self.uploadFile.name, filename)
|
os.link(self.uploadFile.name, filename)
|
||||||
|
|
||||||
self.uploadFile.close()
|
self.uploadFile.close()
|
||||||
@@ -95,12 +89,10 @@ class FileHandler(bbctrl.APIHandler):
|
|||||||
|
|
||||||
self.get_ctrl().preplanner.invalidate(self.uploadFilename)
|
self.get_ctrl().preplanner.invalidate(self.uploadFilename)
|
||||||
self.get_ctrl().state.add_file('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'+self.uploadFilename)
|
self.get_ctrl().state.add_file('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'+self.uploadFilename)
|
||||||
self.get_log('FileHandler').info(
|
|
||||||
'GCode received: ' + self.uploadFilename)
|
|
||||||
else:
|
else:
|
||||||
filename = self.get_upload(self.uploadFilename).encode('utf8')
|
filename = self.get_upload(self.uploadFilename).encode('utf8')
|
||||||
safe_remove(filename)
|
safe_remove(filename)
|
||||||
self.get_log('FileHandler').info('uploadFile.name ' + self.uploadFile.name)
|
|
||||||
os.link(self.uploadFile.name, filename)
|
os.link(self.uploadFile.name, filename)
|
||||||
|
|
||||||
self.uploadFile.close()
|
self.uploadFile.close()
|
||||||
@@ -109,14 +101,11 @@ class FileHandler(bbctrl.APIHandler):
|
|||||||
|
|
||||||
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(self.uploadFilename)
|
||||||
self.get_log('FileHandler').info(
|
|
||||||
'GCode received: ' + self.uploadFilename)
|
|
||||||
|
|
||||||
del (self.uploadFilename)
|
del (self.uploadFilename)
|
||||||
|
|
||||||
@gen.coroutine
|
@gen.coroutine
|
||||||
def get(self, filename):
|
def get(self, filename):
|
||||||
self.get_log('FileHandler').info('138 FileName: ' + filename)
|
|
||||||
filebasename=filename
|
filebasename=filename
|
||||||
if not filename:
|
if not filename:
|
||||||
raise HTTPError(400, 'Missing filename')
|
raise HTTPError(400, 'Missing filename')
|
||||||
|
|||||||
@@ -241,9 +241,7 @@ class Preplanner(object):
|
|||||||
|
|
||||||
def delete_all_plans(self):
|
def delete_all_plans(self):
|
||||||
files = glob.glob(self.ctrl.get_plan('*'))
|
files = glob.glob(self.ctrl.get_plan('*'))
|
||||||
for path in files:
|
for path in files: safe_remove(path)
|
||||||
self.log.info('deleting files: '+path)
|
|
||||||
safe_remove(path)
|
|
||||||
self.invalidate_all()
|
self.invalidate_all()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -147,14 +147,12 @@ class State(object):
|
|||||||
def add_file(self, filename):
|
def add_file(self, filename):
|
||||||
if filename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
|
if filename.startswith('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE'):
|
||||||
filename=filename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
|
filename=filename.replace('EgZjaHJvbWUqCggBEAAYsQMYgAQyBggAEEUYOTIKCAE','')
|
||||||
self.log.info('filename %s' % filename)
|
|
||||||
files = copy.deepcopy(self.get('files'))
|
files = copy.deepcopy(self.get('files'))
|
||||||
if not filename in files:
|
if not filename in files:
|
||||||
files.append(filename)
|
files.append(filename)
|
||||||
files.sort()
|
files.sort()
|
||||||
self.set('files', files)
|
self.set('files', files)
|
||||||
else:
|
else:
|
||||||
self.log.info('filename %s' % filename)
|
|
||||||
files = copy.deepcopy(self.get('files'))
|
files = copy.deepcopy(self.get('files'))
|
||||||
if not filename in files:
|
if not filename in files:
|
||||||
files.append(filename)
|
files.append(filename)
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { get, type Writable } from "svelte/store";
|
|||||||
|
|
||||||
export function waitForChange<T>(writable: Writable<T>): Promise<T> {
|
export function waitForChange<T>(writable: Writable<T>): Promise<T> {
|
||||||
let unsubscribe:()=>{};
|
let unsubscribe:()=>{};
|
||||||
const promise = new Promise((resolve,reject) => {
|
const promise = new Promise(resolve => {
|
||||||
let receivedInitial = false;
|
let receivedInitial = false;
|
||||||
let previousValue : any;
|
let previousValue : any;
|
||||||
unsubscribe = writable.subscribe(value => {
|
unsubscribe = writable.subscribe(value => {
|
||||||
|
|||||||
Reference in New Issue
Block a user