Fix broken link to content flags in API help page

[cheatdb.git] / app / querybuilder.py

diff --git a/app/querybuilder.py b/app/querybuilder.py
index b9a31ef649e2effd722cd3db9204ddbef51b4741..cb1d07a2a8c58ed7078dc79f495b3f54ad06d079 100644 (file)
--- a/app/querybuilder.py
+++ b/app/querybuilder.py
@@ -1,5 +1,6 @@
-from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease
-from .utils import isNo, isYes
+from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag
+from .models import tags as Tags
+from .utils import isNo, isYes, get_int_or_abort
 from sqlalchemy.sql.expression import func
 from flask import abort
 from sqlalchemy import or_
@@ -19,18 +20,30 @@ class QueryBuilder:
                if len(types) > 0:
                        title = ", ".join([type.value + "s" for type in types])
 
+               # Get tags types
+               tags = args.getlist("tag")
+               tags = [Tag.query.filter_by(name=tname).first() for tname in tags]
+               tags = [tag for tag in tags if tag is not None]
+
+               # Hid
                hide_flags = args.getlist("hide")
 
                self.title  = title
                self.types  = types
-               self.search = args.get("q")
+               self.tags   = tags
+
                self.random = "random" in args
-               self.lucky  = self.random or "lucky" in args
+               self.lucky  = "lucky" in args
                self.hide_nonfree = "nonfree" in hide_flags
                self.limit  = 1 if self.lucky else None
                self.order_by  = args.get("sort")
                self.order_dir = args.get("order") or "desc"
+
+               # Filters
+
+               self.search = args.get("q")
                self.protocol_version = args.get("protocol_version")
+               self.author = args.get("author")
 
                self.show_discarded = isYes(args.get("show_discarded"))
                self.show_added = args.get("show_added")
@@ -48,7 +61,7 @@ class QueryBuilder:
                if not self.protocol_version:
                        return None
 
-               self.protocol_version = int(self.protocol_version)
+               self.protocol_version = get_int_or_abort(self.protocol_version)
                version = MinetestRelease.query.filter(MinetestRelease.protocol>=self.protocol_version).first()
                if version is not None:
                        return version.id
@@ -62,7 +75,7 @@ class QueryBuilder:
                        query = query.filter(Package.type.in_(self.types))
 
                if self.search:
-                       query = query.search(self.search)
+                       query = query.search(self.search, sort=True)
 
                if self.random:
                        query = query.order_by(func.random())
@@ -84,6 +97,16 @@ class QueryBuilder:
 
                        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)
+
+               for tag in self.tags:
+                       query = query.filter(Package.tags.any(Tag.id == tag.id))
+
                if self.hide_nonfree:
                        query = query.filter(Package.license.has(License.is_foss == True))
                        query = query.filter(Package.media_license.has(License.is_foss == True))
@@ -116,7 +139,6 @@ class QueryBuilder:
                        query = query.order_by(db.desc(ForumTopic.views))
                elif self.order_by == "date":
                        query = query.order_by(db.asc(ForumTopic.created_at))
-                       sort_by = "date"
 
                if self.search:
                        query = query.filter(ForumTopic.title.ilike('%' + self.search + '%'))