From d211cc17c61f25fa2c9fed8a3671b0042ab1eaec Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Sun, 12 Sep 2021 22:41:02 +0300 Subject: [PATCH] send data in json_responses in case of error instead of text --- src/ahriman/web/views/service/add.py | 2 +- src/ahriman/web/views/service/remove.py | 2 +- src/ahriman/web/views/service/search.py | 2 +- src/ahriman/web/views/status/ahriman.py | 2 +- src/ahriman/web/views/status/package.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ahriman/web/views/service/add.py b/src/ahriman/web/views/service/add.py index 19a3ba2c..8406f296 100644 --- a/src/ahriman/web/views/service/add.py +++ b/src/ahriman/web/views/service/add.py @@ -45,7 +45,7 @@ class AddView(BaseView): now = data.get("build_now", True) packages = data["packages"] 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) diff --git a/src/ahriman/web/views/service/remove.py b/src/ahriman/web/views/service/remove.py index 403f15b2..484989b2 100644 --- a/src/ahriman/web/views/service/remove.py +++ b/src/ahriman/web/views/service/remove.py @@ -43,7 +43,7 @@ class RemoveView(BaseView): try: packages = data["packages"] 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) diff --git a/src/ahriman/web/views/service/search.py b/src/ahriman/web/views/service/search.py index 8374ec01..c5018a30 100644 --- a/src/ahriman/web/views/service/search.py +++ b/src/ahriman/web/views/service/search.py @@ -42,7 +42,7 @@ class SearchView(BaseView): search_string = " ".join(search) 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) comparator: Callable[[aur.Package], str] = lambda item: str(item.package_base) diff --git a/src/ahriman/web/views/status/ahriman.py b/src/ahriman/web/views/status/ahriman.py index 80a09b8e..8ffcb3c9 100644 --- a/src/ahriman/web/views/status/ahriman.py +++ b/src/ahriman/web/views/status/ahriman.py @@ -51,7 +51,7 @@ class AhrimanView(BaseView): try: status = BuildStatusEnum(data["status"]) 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) diff --git a/src/ahriman/web/views/status/package.py b/src/ahriman/web/views/status/package.py index 234bb5f8..2d8a97e2 100644 --- a/src/ahriman/web/views/status/package.py +++ b/src/ahriman/web/views/status/package.py @@ -80,11 +80,11 @@ class PackageView(BaseView): package = Package.from_json(data["package"]) if "package" in data else None status = BuildStatusEnum(data["status"]) except Exception as e: - return json_response(text=str(e), status=400) + return json_response(data=str(e), status=400) try: self.service.update(base, status, package) 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()