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

file_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:18:43 -04:00
parent 7949b6400b
commit 8e609c503f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
moonraker/plugins/file_manager.py
View File

@ -26,7 +26,7 @@ class FileManager:
def __init__(self, config): def __init__(self, config):
self.server = config.get_server() self.server = config.get_server()
self.file_paths = {} self.file_paths = {}
database = self.server.load_plugin(config, "database") database = self.server.load_component(config, "database")
gc_path = database.get_item("moonraker", "file_manager.gcode_path", "") gc_path = database.get_item("moonraker", "file_manager.gcode_path", "")
self.gcode_metadata = MetadataStorage(self.server, gc_path, database) self.gcode_metadata = MetadataStorage(self.server, gc_path, database)
self.fixed_path_args = {} self.fixed_path_args = {}
@ -118,7 +118,7 @@ class FileManager:
self.file_paths[root] = path self.file_paths[root] = path
self.server.register_static_file_handler(root, path) self.server.register_static_file_handler(root, path)
if root == "gcodes": if root == "gcodes":
database = self.server.lookup_plugin( database = self.server.lookup_component(
"database").wrap_namespace("moonraker") "database").wrap_namespace("moonraker")
database["file_manager.gcode_path"] = path database["file_manager.gcode_path"] = path
# scan for metadata changes # scan for metadata changes
@ -201,7 +201,7 @@ class FileManager:
async def _handle_operation_check(self, requested_path): async def _handle_operation_check(self, requested_path):
# Get virtual_sdcard status # Get virtual_sdcard status
klippy_apis = self.server.lookup_plugin('klippy_apis') klippy_apis = self.server.lookup_component('klippy_apis')
result = await klippy_apis.query_objects({'print_stats': None}) result = await klippy_apis.query_objects({'print_stats': None})
pstats = result.get('print_stats', {}) pstats = result.get('print_stats', {})
loaded_file = pstats.get('filename', "") loaded_file = pstats.get('filename', "")
@ -426,7 +426,7 @@ class FileManager:
await evt.wait() await evt.wait()
if start_print: if start_print:
# Make a Klippy Request to "Start Print" # Make a Klippy Request to "Start Print"
klippy_apis = self.server.lookup_plugin('klippy_apis') klippy_apis = self.server.lookup_component('klippy_apis')
try: try:
await klippy_apis.start_print(upload_info['filename']) await klippy_apis.start_print(upload_info['filename'])
except self.server.error: except self.server.error:
@ -744,7 +744,7 @@ class MetadataStorage:
filename = filename.replace("\"", "\\\"") filename = filename.replace("\"", "\\\"")
cmd = " ".join([sys.executable, METADATA_SCRIPT, "-p", cmd = " ".join([sys.executable, METADATA_SCRIPT, "-p",
self.gc_path, "-f", f"\"{filename}\""]) self.gc_path, "-f", f"\"{filename}\""])
shell_command = self.server.lookup_plugin('shell_command') shell_command = self.server.lookup_component('shell_command')
scmd = shell_command.build_shell_command(cmd, log_stderr=True) scmd = shell_command.build_shell_command(cmd, log_stderr=True)
result = await scmd.run_with_response(timeout=10.) result = await scmd.run_with_response(timeout=10.)
try: try:
@ -764,5 +764,5 @@ class MetadataStorage:
self.server.send_event( self.server.send_event(
"file_manager:metadata_update", metadata) "file_manager:metadata_update", metadata)
def load_plugin(config): def load_component(config):
return FileManager(config) return FileManager(config)