Skip to content

Commit 3e34cc7

Browse files
committed
fix: always return the proper response format
1 parent 0cf5d9a commit 3e34cc7

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

octoprint_moonraker_connector/__init__.py

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,21 @@ def get_settings_defaults(self):
7777
##~~ SimpleApiPlugin
7878

7979
def on_api_get(self, request):
80-
params = self._get_connector_params()
81-
if params is None:
82-
return []
80+
webcams = []
8381

84-
host = params["host"]
85-
port = params["port"]
86-
apikey = params["apikey"]
82+
params = self._get_connector_params()
83+
if params is not None:
84+
host = params["host"]
85+
port = params["port"]
86+
apikey = params["apikey"]
8787

88-
webcams = []
88+
if host is not None and port is not None:
89+
webcams = self._get_all_webcams(host, port, apikey=apikey)
8990

90-
if host is not None and port is not None:
91-
webcams = self._get_all_webcams(host, port, apikey=apikey)
92-
return jsonify(
93-
webcams=[
94-
self._to_api_webcam(webcam).model_dump(by_alias=True)
95-
for webcam in webcams
96-
]
91+
response = schema.ApiResponse(
92+
webcams=[self._to_api_webcam(webcam) for webcam in webcams]
9793
)
94+
return jsonify(response.model_dump(by_alias=True))
9895

9996
def is_api_protected(self):
10097
return True

0 commit comments

Comments
 (0)