)
-from django.db.models import FilteredRelation, Q
+from django.db.models import Q
from django.views.decorators.cache import cache_control
from django.views.decorators.vary import vary_on_headers
from django.utils.decorators import method_decorator
Q(text__icontains=term)
).distinct()
else:
- qs = qs.annotate(
- meta=FilteredRelation('tag_relations', condition=Q(tag_relations__in=meta_rels))
- )
- qs = qs.filter(Q(title__icontains=term) | Q(meta__tag__name_pl__icontains=term)).distinct()
+ rels = meta_rels.filter(tag__name_pl__icontains=term)
+ qs = qs.filter(Q(title__icontains=term) | Q(tag_relations__in=rels)).distinct()
return qs
zs = ZipStream()
+ audiobook_list = list(iterate_audiobooks(book, ()))
+
licenses = set()
- for i, (file_path, lic, names) in enumerate(iterate_audiobooks(book, ())):
+ for i, (file_path, lic, names) in enumerate(audiobook_list):
index = i + 1
part_name = '_'.join(names)
+ if part_name:
+ part_name = '_' + part_name
ext = file_path.rsplit('.', 1)[-1]
- zip_name = f'{book.slug}_{index:03d}_{part_name}'[:240] + '.' + ext
+ if len(audiobook_list) > 1:
+ zip_name = f'{book.slug}_{index:03d}{part_name}'[:240] + '.' + ext
+ else:
+ zip_name = book.slug[:240] + '.' + ext
zs.add_path(file_path, zip_name)
lic_name = constants.LICENSES.get(lic, {}).get('locative')