forked from CreatBot/CreatBotKlipperScreen
files: refactor and cleanups
This commit is contained in:
16
screen.py
16
screen.py
@@ -1,6 +1,7 @@
|
||||
#!/usr/bin/python
|
||||
|
||||
import argparse
|
||||
import gc
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
@@ -204,14 +205,13 @@ class KlipperScreen(Gtk.Window):
|
||||
|
||||
def connect_printer(self, name):
|
||||
self.connecting_to_printer = name
|
||||
if self.files:
|
||||
self.files.__init__(self)
|
||||
gc.collect()
|
||||
if self._ws is not None and self._ws.connected:
|
||||
self._ws.close()
|
||||
self.connected_printer = None
|
||||
self.printer.state = "disconnected"
|
||||
if self.files:
|
||||
self.files.reset()
|
||||
self.files = None
|
||||
|
||||
self.connecting = True
|
||||
self.initialized = False
|
||||
|
||||
@@ -242,8 +242,8 @@ class KlipperScreen(Gtk.Window):
|
||||
self.printers[ind][name]["moonraker_host"],
|
||||
self.printers[ind][name]["moonraker_port"],
|
||||
)
|
||||
|
||||
self.files = KlippyFiles(self)
|
||||
if self.files is None:
|
||||
self.files = KlippyFiles(self)
|
||||
self._ws.initial_connect()
|
||||
|
||||
def ws_subscribe(self):
|
||||
@@ -660,8 +660,6 @@ class KlipperScreen(Gtk.Window):
|
||||
self.printer.state = "disconnected"
|
||||
self.connecting = True
|
||||
self.connected_printer = None
|
||||
self.files.reset()
|
||||
self.files = None
|
||||
self.initialized = False
|
||||
self.connect_printer(self.connecting_to_printer)
|
||||
|
||||
@@ -977,7 +975,7 @@ class KlipperScreen(Gtk.Window):
|
||||
if len(self.printer.get_temp_devices()) > 0:
|
||||
self.init_tempstore()
|
||||
|
||||
self.files.initialize()
|
||||
self.files.set_gcodes_path()
|
||||
self.files.refresh_files()
|
||||
|
||||
logging.info("Printer initialized")
|
||||
|
Reference in New Issue
Block a user