arcanis/ahriman
1
0
Fork 0
mirror of https://github.com/arcan1s/ahriman.git synced 2025-04-24 15:27:17 +00:00
Code Issues Projects Releases Wiki Activity

send data in json_responses in case of error instead of text

Browse Source
This commit is contained in:
Evgenii Alekseev 2021-09-12 22:41:02 +03:00
parent 117e69c906
commit d211cc17c6
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ahriman/web/views/service/add.py
View File

@ -45,7 +45,7 @@ class AddView(BaseView):
now = data.get("build_now", True) now = data.get("build_now", True)
packages = data["packages"] packages = data["packages"]
except Exception as e: except Exception as e:
return json_response(text=str(e), status=400) return json_response(data=str(e), status=400)
self.spawner.packages_add(packages, now) self.spawner.packages_add(packages, now)

2
src/ahriman/web/views/service/remove.py
View File

@ -43,7 +43,7 @@ class RemoveView(BaseView):
try: try:
packages = data["packages"] packages = data["packages"]
except Exception as e: except Exception as e:
return json_response(text=str(e), status=400) return json_response(data=str(e), status=400)
self.spawner.packages_remove(packages) self.spawner.packages_remove(packages)

2
src/ahriman/web/views/service/search.py
View File

@ -42,7 +42,7 @@ class SearchView(BaseView):
search_string = " ".join(search) search_string = " ".join(search)
if not search_string: if not search_string:
return json_response(text="Search string must not be empty", status=400) return json_response(data="Search string must not be empty", status=400)
packages = aur.search(search_string) packages = aur.search(search_string)
comparator: Callable[[aur.Package], str] = lambda item: str(item.package_base) comparator: Callable[[aur.Package], str] = lambda item: str(item.package_base)

2
src/ahriman/web/views/status/ahriman.py
View File

@ -51,7 +51,7 @@ class AhrimanView(BaseView):
try: try:
status = BuildStatusEnum(data["status"]) status = BuildStatusEnum(data["status"])
except Exception as e: except Exception as e:
return json_response(text=str(e), status=400) return json_response(data=str(e), status=400)
self.service.update_self(status) self.service.update_self(status)

4
src/ahriman/web/views/status/package.py
View File

@ -80,11 +80,11 @@ class PackageView(BaseView):
package = Package.from_json(data["package"]) if "package" in data else None package = Package.from_json(data["package"]) if "package" in data else None
status = BuildStatusEnum(data["status"]) status = BuildStatusEnum(data["status"])
except Exception as e: except Exception as e:
return json_response(text=str(e), status=400) return json_response(data=str(e), status=400)
try: try:
self.service.update(base, status, package) self.service.update(base, status, package)
except UnknownPackage: except UnknownPackage:
return json_response(text=f"Package {base} is unknown, but no package body set", status=400) return json_response(data=f"Package {base} is unknown, but no package body set", status=400)
return HTTPNoContent() return HTTPNoContent()