add and use query to filter inodes by mime-type

Author: jrief

demoapp/models.py

@@ -8,4 +8,5 @@ class DemoAppModel(models.Model):
         verbose_name="Demo File",
         null=True,
         blank=True,
+        accept_mime_types=['image/*'],
     )

finder/browser/views.py

@@ -153,8 +153,7 @@ def list(self, request, folder_id):
         offset = int(request.GET.get('offset', 0))
         recursive = 'recursive' in request.GET
         lookup = lookup_by_label(request)
-        if mime_types := request.GET.getlist('mimetypes'):
-            lookup['mime_types'] = mime_types
+        lookup['mime_types'] = request.GET.getlist('mimetypes')
         if recursive:
             descendants = FolderModel.objects.get(id=folder_id).descendants
             if isinstance(descendants, QuerySet):

finder/forms/fields.py

@@ -6,16 +6,14 @@
 
 class FinderFileField(UUIDField):
     widget = FinderFileSelect
-    mime_types = None
     realm = 'admin'
 
-    def __init__(self, mime_types=None, *args, **kwargs):
-        if isinstance(mime_types, (list, tuple)):
-            self.mime_types = mime_types
+    def __init__(self, *args, **kwargs):
+        self.accept_mime_types = kwargs.pop('accept_mime_types', None)
         super().__init__(*args, **kwargs)
 
     def widget_attrs(self, widget):
-        widget.mime_types = self.mime_types
+        widget.accept_mime_types = self.accept_mime_types
         return super().widget_attrs(widget)
 
 

finder/forms/widgets.py

@@ -12,7 +12,7 @@
 
 class FinderFileSelect(TextInput):
     template_name = 'finder/widgets/finder_file_select.html'
-    mime_types = None
+    accept_mime_types = None
     realm = 'admin'
 
     class Media:
@@ -38,11 +38,11 @@ def get_context(self, name, value, attrs):
         context = super().get_context(name, value, attrs)
         context.update(
             base_url=reverse('finder-api:base-url'),
-            realm='admin',
+            realm=self.realm,
             style_url=static('finder/css/finder-browser.css'),
         )
-        if isinstance(self.mime_types, (list, tuple)) and self.mime_types:
-            context['mime_types'] = ','.join(self.mime_types)
+        if isinstance(self.accept_mime_types, (list, tuple)) and self.accept_mime_types:
+            context['mime_types'] = ','.join(self.accept_mime_types)
         return context
 
     def format_value(self, value):

finder/models/fields.py

@@ -1,5 +1,6 @@
 import uuid
 
+from django.core.exceptions import ValidationError
 from django.db.models.fields import UUIDField
 from django.utils.translation import gettext_lazy as _
 
@@ -10,10 +11,15 @@
 class FinderFileField(UUIDField):
     description = _("Reference to a file in the finder app.")
 
+    def __init__(self, *args, **kwargs):
+        self.accept_mime_types = kwargs.pop('accept_mime_types', None)
+        super().__init__(*args, **kwargs)
+
     def formfield(self, **kwargs):
         return super().formfield(
             **{
-                "form_class": FormFileField,
+                'form_class': FormFileField,
+                'accept_mime_types': self.accept_mime_types,
                 **kwargs,
             }
         )
@@ -25,4 +31,7 @@ def deconstruct(self):
     def from_db_value(self, value, expression, connection):
         if not isinstance(value, uuid.UUID):
             return value
-        return FileModel.objects.get_inode(id=value, is_folder=False)
+        try:
+            return FileModel.objects.get_inode(id=value, is_folder=False, mime_types=self.accept_mime_types)
+        except FileModel.DoesNotExist:
+            return

finder/models/inode.py

@@ -1,11 +1,13 @@
 import re
 import uuid
+from functools import reduce
+from operator import and_, or_
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db import connections, models
 from django.db.models.aggregates import Aggregate
-from django.db.models.expressions import F, Value
+from django.db.models.expressions import F, Value, Q
 from django.db.models.fields import BooleanField, CharField
 from django.db.models.functions import Cast, Lower
 from django.utils.functional import cached_property
@@ -87,6 +89,27 @@ class InodeManagerMixin:
     Mixin class to be added to managers for models ineriting from `Inode`.
     """
 
+    def get_query(self, model, lookup):
+        lookup = dict(lookup)  # copy to avoid modifying the original
+        model_field_names = [field.name for field in model._meta.get_fields()]
+        mime_types = lookup.pop('mime_types', None)
+        labels = lookup.pop('labels__in', None)
+        query = reduce(and_, (Q(**{key: value}) for key, value in lookup.items()), Q())
+        if mime_types and 'mime_type' in model_field_names:
+            queries = []
+            for mime_type in mime_types:
+                main_type, sub_type = mime_type.split('/', 1)
+                if main_type == '*':
+                    return Q()
+                if sub_type == '*':
+                    queries.append(Q(mime_type__startswith=f'{main_type}/'))
+                else:
+                    queries.append(Q(mime_type=mime_type))
+            query &= reduce(or_, queries, Q())
+        if labels and 'labels' in model_field_names:
+            query &= Q(labels__in=labels)
+        return query
+
     def filter_unified(self, **lookup):
         """
         Returns a unified QuerySet of all folders and files with fields from all involved models
@@ -118,12 +141,8 @@ def get_queryset(model):
                 elif name not in model_field_names:
                     value = None if field.default is models.NOT_PROVIDED else field.default
                     expressions[name] = Value(value, output_field=field)
-            queryset = model.objects.values(*concrete_fields, **expressions).annotate(**annotations)
-            model_lookup = dict(lookup)
-            labels = model_lookup.pop('labels__in', None)
-            if labels and 'labels' in model_field_names:
-                model_lookup['labels__in'] = labels
-            return queryset.filter(**model_lookup)
+            query = self.get_query(model, lookup)
+            return model.objects.values(*concrete_fields, **expressions).annotate(**annotations).filter(query)
 
         unified_fields = {
             field.name: field for field in FolderModel._meta.get_fields()
@@ -148,7 +167,8 @@ def get_inode(self, **lookup):
         elif (folder_qs := FolderModel.objects.filter(**lookup)).exists():
             return folder_qs.get()
         values = folder_qs.values('id', mime_type=Value(None, output_field=models.CharField())).union(*[
-            model.objects.values('id', 'mime_type').filter(**lookup) for model in FileModel.get_models()
+            model.objects.values('id', 'mime_type').filter(self.get_query(model, lookup))
+            for model in FileModel.get_models()
         ]).get()
         return FileModel.objects.get_model_for(values['mime_type']).objects.get(id=values['id'])