3D-Druck/OctoPrint-BambuPrinter
1
0
Fork 0
Code Pull Requests Actions 1 Packages Releases 1 Activity

Fix file list update. Decouple filesystem from printer file structure.

Browse Source
This commit is contained in:
Anton Skrypnyk
2024-07-27 02:22:46 +03:00
parent 4ea98036e5
commit f42d3167c5
8 changed files with 142 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
octoprint_bambu_printer/printer/states/idle_state.py
View File

@ -6,12 +6,8 @@ from octoprint_bambu_printer.printer.states.a_printer_state import APrinterState
class IdleState(APrinterState):
def init(self):
if self._printer.file_system.has_selected_file:
self.update_print_job_info()
def start_new_print(self):
selected_file = self._printer.file_system.selected_file
selected_file = self._printer.selected_file
if selected_file is None:
self._log.warn("Cannot start print job if file was not selected")
return
@ -55,9 +51,3 @@ class IdleState(APrinterState):
}
return print_command
def update_print_job_info(self):
if self._printer.file_system.selected_file is not None:
self._printer.current_print_job = PrintJob(
self._printer.file_system.selected_file, 0
)

6
octoprint_bambu_printer/printer/states/printing_state.py
View File

@ -27,7 +27,7 @@ class PrintingState(APrinterState):
def init(self):
self._is_printing = True
self._printer.file_system.remove_file_selection()
self._printer.remove_project_selection()
self.update_print_job_info()
self._start_worker_thread()
@ -64,7 +64,7 @@ class PrintingState(APrinterState):
def update_print_job_info(self):
print_job_info = self._printer.bambu_client.get_device().print_job
task_name: str = print_job_info.subtask_name
project_file_info = self._printer.file_system.project_files.get_file_by_suffix(
project_file_info = self._printer.project_files.get_file_by_suffix(
task_name, [".3mf", ".gcode.3mf"]
)
if project_file_info is None:
@ -74,6 +74,7 @@ class PrintingState(APrinterState):
progress = print_job_info.print_percentage
self._printer.current_print_job = PrintJob(project_file_info, progress)
self._printer.select_project_file(project_file_info.file_name)
def pause_print(self):
if self._printer.bambu_client.connected:
@ -98,5 +99,6 @@ class PrintingState(APrinterState):
f"SD File Print finishing: {self._printer.current_print_job.file_info.file_name}"
)
self._printer.sendIO("Done printing file")
self._printer.current_print_job = None
self._printer.change_state(self._printer._state_idle)