3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machine: add moonraker-obico to default services 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2023-01-12 18:05:27 -05:00
parent c9a1d0f3bb
commit a154c5fa51
No known key found for this signature in database
GPG Key ID: 5A1EB336DFB4C71B
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moonraker/components/machine.py
View File

@ -60,6 +60,7 @@ DEFAULT_ALLOWED_SERVICES = [
"MoonCord", "MoonCord",
"KlipperScreen", "KlipperScreen",
"moonraker-telegram-bot", "moonraker-telegram-bot",
"moonraker-obico",
"sonar", "sonar",
"crowsnest" "crowsnest"
] ]
@ -234,13 +235,15 @@ class Machine:
def get_moonraker_service_info(self): def get_moonraker_service_info(self):
return dict(self.moonraker_service_info) return dict(self.moonraker_service_info)
async def wait_for_init(self, timeout: float = None) -> None: async def wait_for_init(
self, timeout: Optional[float] = None
) -> None:
try: try:
await asyncio.wait_for(self.init_evt.wait(), timeout) await asyncio.wait_for(self.init_evt.wait(), timeout)
except asyncio.TimeoutError: except asyncio.TimeoutError:
pass pass
async def component_init(self): async def component_init(self) -> None:
await self.validator.validation_init() await self.validator.validation_init()
await self.sys_provider.initialize() await self.sys_provider.initialize()
if not self.inside_container: if not self.inside_container:
@ -931,7 +934,7 @@ class SystemdCliProvider(BaseProvider):
timeout=10. timeout=10.
) )
raw_props: Dict[str, Any] = {} raw_props: Dict[str, Any] = {}
lines = [p.strip() for p in props.split("\n") if p.strip] lines = [p.strip() for p in props.split("\n") if p.strip()]
for line in lines: for line in lines:
parts = line.split("=", 1) parts = line.split("=", 1)
if len(parts) == 2: if len(parts) == 2:
@ -1369,14 +1372,14 @@ class InstallValidator:
self.announcement_id = "" self.announcement_id = ""
self.validation_enabled = False self.validation_enabled = False
def _update_backup_path(self): def _update_backup_path(self) -> None:
str_time = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime()) str_time = time.strftime("%Y%m%dT%H%M%SZ", time.gmtime())
if not hasattr(self, "backup_path"): if not hasattr(self, "backup_path"):
self.backup_path = self.data_path.joinpath(f"backup/{str_time}") self.backup_path = self.data_path.joinpath(f"backup/{str_time}")
elif not self.backup_path.exists(): elif not self.backup_path.exists():
self.backup_path = self.data_path.joinpath(f"backup/{str_time}") self.backup_path = self.data_path.joinpath(f"backup/{str_time}")
async def validation_init(self): async def validation_init(self) -> None:
db: MoonrakerDatabase = self.server.lookup_component("database") db: MoonrakerDatabase = self.server.lookup_component("database")
install_ver: int = await db.get_item( install_ver: int = await db.get_item(
"moonraker", "validate_install.install_version", 0 "moonraker", "validate_install.install_version", 0
@ -1836,7 +1839,7 @@ class InstallValidator:
) )
self.server.send_event("server:gcode_response", gc_announcement) self.server.send_event("server:gcode_response", gc_announcement)
async def remove_announcement(self): async def remove_announcement(self) -> None:
if not self.announcement_id: if not self.announcement_id:
return return
ancmp: Announcements = self.server.lookup_component("announcements") ancmp: Announcements = self.server.lookup_component("announcements")