diff mbox

[archweb] Return different dep types under different keys in JSON results

Message ID 20171125231115.27917-1-johannes@kyriasis.com
State Accepted
Headers show

Commit Message

Emil Velikov via arch-projects Nov. 25, 2017, 11:11 p.m. UTC 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
---
 packages/utils.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/packages/utils.py b/packages/utils.py
index 0f47f17..5e533b7 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -478,7 +478,7 @@  class PackageJSONEncoder(DjangoJSONEncoder):
             'installed_size', 'build_date', 'last_update', 'flag_date',
             'maintainers', 'packager']
     pkg_list_attributes = ['groups', 'licenses', 'conflicts',
-            'provides', 'replaces', 'depends']
+            'provides', 'replaces']
 
     def default(self, obj):
         if hasattr(obj, '__iter__'):
@@ -488,6 +488,10 @@  def default(self, obj):
             data = {attr: getattr(obj, attr) for attr in self.pkg_attributes}
             for attr in self.pkg_list_attributes:
                 data[attr] = getattr(obj, attr).all()
+            all_deps = obj.depends.all()
+            for (deptype, name) in [('D', 'depends'), ('O', 'optdepends'),
+                                     ('M', 'makedepends'), ('C', 'checkdepends')]:
+                data[name] = all_deps.filter(deptype=deptype)
             return data
         if isinstance(obj, PackageFile):
             filename = obj.filename or ''