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

app: refactor upload handler registration 

Move upload handler registration out of the file manager.
Register the primary hander in the app module, and the
Octoprint Comptaiblity handler in octoprint_compat.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-12-21 12:53:59 -05:00
parent ac9eaa7681
commit b369173f94
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
moonraker/app.py
View File

@ -176,6 +176,7 @@ class MoonrakerApp:
"moonraker.log", logfile, force=True) "moonraker.log", logfile, force=True)
self.register_static_file_handler( self.register_static_file_handler(
"klippy.log", DEFAULT_KLIPPY_LOG_PATH, force=True) "klippy.log", DEFAULT_KLIPPY_LOG_PATH, force=True)
self.register_upload_handler("/server/files/upload")
def _get_path_option(self, config: ConfigHelper, option: str) -> str: def _get_path_option(self, config: ConfigHelper, option: str) -> str:
path: Optional[str] = config.get(option, None) path: Optional[str] = config.get(option, None)

3
moonraker/components/file_manager/file_manager.py
View File

@ -87,9 +87,6 @@ class FileManager:
transports=["websocket"]) transports=["websocket"])
# register client notificaitons # register client notificaitons
self.server.register_notification("file_manager:filelist_changed") self.server.register_notification("file_manager:filelist_changed")
# Register APIs to handle file uploads
self.server.register_upload_handler("/server/files/upload")
self.server.register_upload_handler("/api/files/local")
self.server.register_event_handler( self.server.register_event_handler(
"server:klippy_identified", self._update_fixed_paths) "server:klippy_identified", self._update_fixed_paths)

4
moonraker/components/octoprint_compat.py
View File

@ -95,6 +95,10 @@ class OctoprintCompat:
'/api/printerprofiles', ['GET'], self._get_printerprofiles, '/api/printerprofiles', ['GET'], self._get_printerprofiles,
transports=['http'], wrap_result=False) transports=['http'], wrap_result=False)
# Upload Handlers
self.server.register_upload_handler(
"/api/files/local", location_prefix="api/moonraker/files/")
# System # System
# TODO: shutdown/reboot/restart operations # TODO: shutdown/reboot/restart operations