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

update_manager: replace references to "plugin" with "component" 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-03-18 08:26:04 -04:00
parent f5c27f27ce
commit bf67bce65f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
moonraker/plugins/update_manager.py
View File

@ -146,7 +146,7 @@ class UpdateManager:
await self.updaters['klipper'].refresh() await self.updaters['klipper'].refresh()
async def _check_klippy_printing(self): async def _check_klippy_printing(self):
klippy_apis = self.server.lookup_plugin('klippy_apis') klippy_apis = self.server.lookup_component('klippy_apis')
result = await klippy_apis.query_objects( result = await klippy_apis.query_objects(
{'print_stats': None}, default={}) {'print_stats': None}, default={})
pstate = result.get('print_stats', {}).get('state', "") pstate = result.get('print_stats', {}).get('state', "")
@ -262,7 +262,7 @@ class CommandHelper:
self.debug_enabled = config.getboolean('enable_repo_debug', False) self.debug_enabled = config.getboolean('enable_repo_debug', False)
if self.debug_enabled: if self.debug_enabled:
logging.warn("UPDATE MANAGER: REPO DEBUG ENABLED") logging.warn("UPDATE MANAGER: REPO DEBUG ENABLED")
shell_command = self.server.lookup_plugin('shell_command') shell_command = self.server.lookup_component('shell_command')
self.build_shell_command = shell_command.build_shell_command self.build_shell_command = shell_command.build_shell_command
AsyncHTTPClient.configure(None, defaults=dict(user_agent="Moonraker")) AsyncHTTPClient.configure(None, defaults=dict(user_agent="Moonraker"))
@ -794,7 +794,7 @@ class GitRepo:
# Store current remote in the database if in a detached state # Store current remote in the database if in a detached state
if self.head_detached: if self.head_detached:
database = self.server.lookup_plugin("database") database = self.server.lookup_component("database")
db_key = f"update_manager.git_repo_{self.alias}" \ db_key = f"update_manager.git_repo_{self.alias}" \
".detached_remote" ".detached_remote"
database.insert_item( database.insert_item(
@ -888,7 +888,7 @@ class GitRepo:
if len(bparts) == 2: if len(bparts) == 2:
self.git_remote, self.git_branch = bparts self.git_remote, self.git_branch = bparts
else: else:
database = self.server.lookup_plugin("database") database = self.server.lookup_component("database")
db_key = f"update_manager.git_repo_{self.alias}" \ db_key = f"update_manager.git_repo_{self.alias}" \
".detached_remote" ".detached_remote"
detached_remote = database.get_item( detached_remote = database.get_item(
@ -1396,5 +1396,5 @@ class WebUpdater:
'remote_version': self.remote_version 'remote_version': self.remote_version
} }
def load_plugin(config): def load_component(config):
return UpdateManager(config) return UpdateManager(config)

2
scripts/update_manager.conf
View File

@ -1,5 +1,5 @@
# Supplemental configuration for Moonraker's Update Manager # Supplemental configuration for Moonraker's Update Manager
# plugin. This file should not be modified. # component. This file should not be modified.
[update_manager static debian moonraker] [update_manager static debian moonraker]
origin: https://github.com/arksine/moonraker.git origin: https://github.com/arksine/moonraker.git