Mirrorlandia_minetest/contentdb
1
0
Fork 0
mirror of https://github.com/minetest/contentdb.git synced 2024-11-10 01:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Filter tags by available packages in package search

Browse Source
This commit is contained in:
rubenwardy 2020-07-18 03:14:56 +01:00
parent dd7146205a
commit 64dab0c4b6
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/blueprints/packages/packages.py
View File

@ -96,8 +96,9 @@ def list_all():
qb.show_discarded = True
topics = qb.buildTopicQuery().all()
tags = db.session.query(func.count(Tags.c.tag_id), Tag) \
.select_from(Tag).outerjoin(Tags).group_by(Tag.id).order_by(db.asc(Tag.title)).all()
tags_query = db.session.query(func.count(Tags.c.tag_id), Tag) \
.select_from(Tag).join(Tags).join(Package).group_by(Tag.id).order_by(db.asc(Tag.title))
tags = qb.filterPackageQuery(tags_query).all()
selected_tags = set(qb.tags)

79
app/querybuilder.py
View File

@ -76,45 +76,12 @@ class QueryBuilder:
else:
query = Package.query.filter_by(soft_deleted=False, approved=True)
return self.filterPackageQuery(self.orderPackageQuery(query))
def filterPackageQuery(self, query):
if len(self.types) > 0:
query = query.filter(Package.type.in_(self.types))
if self.search:
query = query.search(self.search, sort=self.order_by is None)
if self.random:
query = query.order_by(func.random())
else:
to_order = None
if self.order_by is None and self.search:
pass
elif self.order_by is None or self.order_by == "score":
to_order = Package.score
elif self.order_by == "name":
to_order = Package.name
elif self.order_by == "title":
to_order = Package.title
elif self.order_by == "downloads":
to_order = Package.downloads
elif self.order_by == "created_at" or self.order_by == "date":
to_order = Package.created_at
elif self.order_by == "approved_at" or self.order_by == "date":
to_order = Package.approved_at
elif self.order_by == "last_release":
to_order = PackageRelease.releaseDate
else:
abort(400)
if to_order:
if self.order_dir == "asc":
to_order = db.asc(to_order)
elif self.order_dir == "desc":
to_order = db.desc(to_order)
else:
abort(400)
query = query.order_by(to_order)
if self.author:
author = User.query.filter_by(username=self.author).first()
if not author:
@ -150,6 +117,46 @@ class QueryBuilder:
return query
def orderPackageQuery(self, query):
if self.search:
query = query.search(self.search, sort=self.order_by is None)
if self.random:
query = query.order_by(func.random())
return query
to_order = None
if self.order_by is None and self.search:
pass
elif self.order_by is None or self.order_by == "score":
to_order = Package.score
elif self.order_by == "name":
to_order = Package.name
elif self.order_by == "title":
to_order = Package.title
elif self.order_by == "downloads":
to_order = Package.downloads
elif self.order_by == "created_at" or self.order_by == "date":
to_order = Package.created_at
elif self.order_by == "approved_at" or self.order_by == "date":
to_order = Package.approved_at
elif self.order_by == "last_release":
to_order = PackageRelease.releaseDate
else:
abort(400)
if to_order:
if self.order_dir == "asc":
to_order = db.asc(to_order)
elif self.order_dir == "desc":
to_order = db.desc(to_order)
else:
abort(400)
query = query.order_by(to_order)
return query
def buildTopicQuery(self, show_added=False):
query = ForumTopic.query