arrdem/source
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: arrdem:712a1cca6a537a9ee4f8173ef0fdacf513b80ea5
Branches Tags
arrdem:trunk
..
compare: arrdem:393072a9f87950417e398448c7aba6f6cfcc5793
Branches Tags
arrdem:trunk

No commits in common. "712a1cca6a537a9ee4f8173ef0fdacf513b80ea5" and "393072a9f87950417e398448c7aba6f6cfcc5793" have entirely different histories.
712a1cca6a ... 393072a9f8

3 changed files with 6 additions and 8 deletions
Show stats Expand all files Collapse all files

11
projects/tentacles/src/python/tentacles/workers.py
View file

@ -70,7 +70,7 @@ def poll_printers(app: App, db: Db) -> None:
def _set_status(status: str): def _set_status(status: str):
if printer.status != status: if printer.status != status:
log.info(f"Printer {printer.id} {printer.status} -> {status}") log.info(f"Printer {printer.id} {printer.status} -> {status}")
db.update_printer_status(pid=printer.id, status=status) db.update_printer_status(pid=printer.id, status=status)
def _bed_clear(): def _bed_clear():
if not ( if not (
@ -117,7 +117,7 @@ def poll_printers(app: App, db: Db) -> None:
if mapped_job: if mapped_job:
db.start_job(jid=mapped_job.id) db.start_job(jid=mapped_job.id)
elif printer_job.get("state", "").lower() == "connecting": elif printer_job.get("state").lower() == "connecting":
_set_status("connecting") _set_status("connecting")
elif printer_state.get("ready"): elif printer_state.get("ready"):
@ -171,8 +171,8 @@ def assign_jobs(app: App, db: Db) -> None:
db.assign_job(jid=job.id, pid=printer.id) db.assign_job(jid=job.id, pid=printer.id)
log.info(f"Mapped job {job.id} to printer {printer.id}") log.info(f"Mapped job {job.id} to printer {printer.id}")
break break
else: else:
log.info(f"Could not map job {job!r}") print("Could not map\n", job, "\n", printer)
def push_jobs(app: App, db: Db) -> None: def push_jobs(app: App, db: Db) -> None:
@ -307,8 +307,7 @@ def analyze_files(app: App, db: Db):
for file in db.list_unanalyzed_files(): for file in db.list_unanalyzed_files():
p = Path(file.path) p = Path(file.path)
if not p.is_file(): if not p.is_file():
log.error(f"Deleting missing file {file.id}!") log.error(f"Invalid file {file.id}!")
db.delete_file(uid=file.user_id, fid=file.id)
continue continue
record = analyze_gcode_file(p) record = analyze_gcode_file(p)

1
tools/python/requirements.in
View file

@ -54,4 +54,3 @@ unify
yamllint yamllint
yaspin yaspin
pytimeparse pytimeparse
git+https://github.com/arrdem/jaraco.text.git@0dd8d0b25a93c3fad896f3a92d11caff61ff273d#egg=jaraco.text

2
tools/python/requirements_lock.txt
View file

@ -42,7 +42,7 @@ itsdangerous==2.1.2
jaraco.collections==4.3.0 jaraco.collections==4.3.0
jaraco.context==4.3.0 jaraco.context==4.3.0
jaraco.functools==3.8.0 jaraco.functools==3.8.0
jaraco.text @ git+https://github.com/arrdem/jaraco.text.git@0dd8d0b25a93c3fad896f3a92d11caff61ff273d jaraco.text==3.11.1
jedi==0.18.2 jedi==0.18.2
Jinja2==3.1.2 Jinja2==3.1.2
jsonschema==4.18.4 jsonschema==4.18.4