support groups itemKey with special value , 1879

pandora/config.padma.jsonc

@@ -431,6 +431,11 @@
             "capability": "canSeeMedia",
             "find": true
         },
+        {
+            "id": "groups",
+            "title": "Group",
+            "type": ["string"]
+        },
         {
             "id": "filename",
             "title": "Filename",

pandora/item/managers.py

@@ -8,11 +8,34 @@ from django.conf import settings
 
 from archive.models import Volume
 from itemlist.models import List
+from django.contrib.auth.models import Group
 import models
 import utils
 
 from ox.django.query import QuerySet
 
+def get_operator(op, type='str'):
+    return {
+        'str': {
+            '==': '__iexact',
+            '>': '__gt',
+            '>=': '__gte',
+            '<': '__lt',
+            '<=': '__lte',
+            '^': '__istartswith',
+            '$': '__iendswith',
+        },
+        'int':  {
+            '==': '__exact',
+            '>': '__gt',
+            '>=': '__gte',
+            '<': '__lt',
+            '<=': '__lte',
+        }
+    }[type].get(op, {
+        'str': '__icontains',
+        'int': ''
+    }[type])
 
 def parseCondition(condition, user, owner=None):
     '''
@@ -57,16 +80,20 @@ def parseCondition(condition, user, owner=None):
     if k == 'list':
         key_type = ''
 
-    if v == '{me}' and op == '==':
+    if k == 'groups':
-        if not owner:
+        if op == '==' and v == '$my':
-            owner = user
+            if not owner:
-        if k == 'user':
+                owner = user
-            v = owner.username
+            groups = owner.groups.all()
-        elif k == 'groups':
+        else:
-            q = Q(groups__in=owner.groups.all())
+            key = 'name' + get_operator(op)
-            if exclude:
+            groups = Group.objects.filter(**{key: v})
-                q = ~q
+        if not groups.count():
-            return q
+            return Q(id=0)
+        q = Q(groups__in=groups)
+        if exclude:
+            q = ~q
+        return q
 
     if (not exclude and op == '=' or op in ('$', '^')) and v == '':
         return Q()
@@ -115,28 +142,11 @@ def parseCondition(condition, user, owner=None):
             value_key = k
         if k in facet_keys:
             in_find = False
-            facet_value = 'facets__value%s' % {
+            facet_value = 'facets__value' + get_operator(op)
-                '==': '__iexact',
-                '>': '__gt',
-                '>=': '__gte',
-                '<': '__lt',
-                '<=': '__lte',
-                '^': '__istartswith',
-                '$': '__iendswith',
-            }.get(op, '__icontains')
             v = models.Item.objects.filter(**{'facets__key':k, facet_value:v})
             value_key = 'id__in'
         else:
-            value_key = '%s%s' % (value_key, {
+            value_key = value_key + get_operator(op)
-                '==': '__iexact',
-                '>': '__gt',
-                '>=': '__gte',
-                '<': '__lt',
-                '<=': '__lte',
-                '^': '__istartswith',
-                '$': '__iendswith',
-            }.get(op, '__icontains'))
-
         k = str(k)
         value_key = str(value_key)
         if isinstance(v, unicode):
@@ -183,13 +193,7 @@ def parseCondition(condition, user, owner=None):
 
         #using sort here since find only contains strings
         v = parse_date(v.split('-'))
-        vk = 'sort__%s%s' % (k, {
+        vk = 'sort__%s%s' % (k, get_operator(op, 'int'))
-            '==': '__exact',
-            '>': '__gt',
-            '>=': '__gte',
-            '<': '__lt',
-            '<=': '__lte',
-        }.get(op,''))
         vk = str(vk)
         q = Q(**{vk: v})
         if exclude:
@@ -200,13 +204,7 @@ def parseCondition(condition, user, owner=None):
         if key_type == 'time':
             v = int(utils.parse_time(v))
 
-        vk = 'sort__%s%s' % (k, {
+        vk = 'sort__%s%s' % (k, get_operator(op, 'int'))
-            '==': '__exact',
-            '>': '__gt',
-            '>=': '__gte',
-            '<': '__lt',
-            '<=': '__lte',
-        }.get(op,''))
         vk = str(vk)
         q = Q(**{vk: v})
         if exclude: