Add ability to search packages by author
This commit is contained in:
parent
9de219fd80
commit
3e07bed51b
|
@ -30,7 +30,7 @@ from flask_wtf import FlaskForm
|
||||||
from wtforms import *
|
from wtforms import *
|
||||||
from wtforms.validators import *
|
from wtforms.validators import *
|
||||||
from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
|
from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
|
||||||
from sqlalchemy import or_
|
from sqlalchemy import or_, func
|
||||||
|
|
||||||
|
|
||||||
@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
|
@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' })
|
||||||
|
@ -64,6 +64,14 @@ def list_all():
|
||||||
prev_url = url_for("packages.list_all", type=type_name, q=search, page=query.prev_num) \
|
prev_url = url_for("packages.list_all", type=type_name, q=search, page=query.prev_num) \
|
||||||
if query.has_prev else None
|
if query.has_prev else None
|
||||||
|
|
||||||
|
authors = []
|
||||||
|
if search:
|
||||||
|
authors = User.query \
|
||||||
|
.filter(or_(*[func.lower(User.username) == name.lower().strip() for name in search.split(" ")])) \
|
||||||
|
.all()
|
||||||
|
|
||||||
|
authors = [(author.username, search.lower().replace(author.username, "")) for author in authors]
|
||||||
|
|
||||||
topics = None
|
topics = None
|
||||||
if qb.search and not query.has_next:
|
if qb.search and not query.has_next:
|
||||||
qb.show_discarded = True
|
qb.show_discarded = True
|
||||||
|
@ -73,6 +81,7 @@ def list_all():
|
||||||
return render_template("packages/list.html", \
|
return render_template("packages/list.html", \
|
||||||
title=title, packages=query.items, topics=topics, \
|
title=title, packages=query.items, topics=topics, \
|
||||||
query=search, tags=tags, type=type_name, \
|
query=search, tags=tags, type=type_name, \
|
||||||
|
authors = authors, \
|
||||||
next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, packages_count=query.total)
|
next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, packages_count=query.total)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease
|
from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User
|
||||||
from .utils import isNo, isYes
|
from .utils import isNo, isYes
|
||||||
from sqlalchemy.sql.expression import func
|
from sqlalchemy.sql.expression import func
|
||||||
from flask import abort
|
from flask import abort
|
||||||
|
@ -23,14 +23,19 @@ class QueryBuilder:
|
||||||
|
|
||||||
self.title = title
|
self.title = title
|
||||||
self.types = types
|
self.types = types
|
||||||
self.search = args.get("q")
|
|
||||||
self.random = "random" in args
|
self.random = "random" in args
|
||||||
self.lucky = "lucky" in args
|
self.lucky = "lucky" in args
|
||||||
self.hide_nonfree = "nonfree" in hide_flags
|
self.hide_nonfree = "nonfree" in hide_flags
|
||||||
self.limit = 1 if self.lucky else None
|
self.limit = 1 if self.lucky else None
|
||||||
self.order_by = args.get("sort")
|
self.order_by = args.get("sort")
|
||||||
self.order_dir = args.get("order") or "desc"
|
self.order_dir = args.get("order") or "desc"
|
||||||
|
|
||||||
|
# Filters
|
||||||
|
|
||||||
|
self.search = args.get("q")
|
||||||
self.protocol_version = args.get("protocol_version")
|
self.protocol_version = args.get("protocol_version")
|
||||||
|
self.author = args.get("author")
|
||||||
|
|
||||||
self.show_discarded = isYes(args.get("show_discarded"))
|
self.show_discarded = isYes(args.get("show_discarded"))
|
||||||
self.show_added = args.get("show_added")
|
self.show_added = args.get("show_added")
|
||||||
|
@ -84,6 +89,13 @@ class QueryBuilder:
|
||||||
|
|
||||||
query = query.order_by(to_order)
|
query = query.order_by(to_order)
|
||||||
|
|
||||||
|
if self.author:
|
||||||
|
author = User.query.filter_by(username=self.author).first()
|
||||||
|
if not author:
|
||||||
|
abort(404)
|
||||||
|
|
||||||
|
query = query.filter_by(author=author)
|
||||||
|
|
||||||
if self.hide_nonfree:
|
if self.hide_nonfree:
|
||||||
query = query.filter(Package.license.has(License.is_foss == True))
|
query = query.filter(Package.license.has(License.is_foss == True))
|
||||||
query = query.filter(Package.media_license.has(License.is_foss == True))
|
query = query.filter(Package.media_license.has(License.is_foss == True))
|
||||||
|
|
|
@ -129,7 +129,7 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
<footer class="container footer-copyright my-5 page-footer font-small text-center">
|
<footer class="container footer-copyright my-5 page-footer font-small text-center">
|
||||||
ContentDB © 2018-9 to <a href="https://rubenwardy.com/">rubenwardy</a> |
|
ContentDB © 2018-20 to <a href="https://rubenwardy.com/">rubenwardy</a> |
|
||||||
<a href="https://github.com/minetest/contentdb">GitHub</a> |
|
<a href="https://github.com/minetest/contentdb">GitHub</a> |
|
||||||
<a href="{{ url_for('flatpage', path='help') }}">{{ _("Help") }}</a> |
|
<a href="{{ url_for('flatpage', path='help') }}">{{ _("Help") }}</a> |
|
||||||
<a href="{{ url_for('flatpage', path='policy_and_guidance') }}">{{ _("Policy and Guidance") }}</a> |
|
<a href="{{ url_for('flatpage', path='policy_and_guidance') }}">{{ _("Policy and Guidance") }}</a> |
|
||||||
|
|
|
@ -5,6 +5,21 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
|
{% if authors %}
|
||||||
|
<p class="alert alert-primary">
|
||||||
|
Did you mean to search for packages by
|
||||||
|
|
||||||
|
{% for author in authors %}
|
||||||
|
<a href="{{ url_for('packages.list_all', type=type, author=author[0], q=author[1]) }}">{{ author[0] }}</a>
|
||||||
|
{% if not loop.last %}
|
||||||
|
,
|
||||||
|
{% endif %}
|
||||||
|
{% endfor %}
|
||||||
|
?
|
||||||
|
</p>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
{% from "macros/packagegridtile.html" import render_pkggrid %}
|
{% from "macros/packagegridtile.html" import render_pkggrid %}
|
||||||
{{ render_pkggrid(packages) }}
|
{{ render_pkggrid(packages) }}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue