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 408d95dca3d2dd049b49eb8486c1a4f4788b6658..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
+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,20 +20,54 @@ 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.hide_nonfree = isNo(args.get("nonfree"))
+               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") or "score"
+               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")
+               if self.show_added is not None:
+                       self.show_added = isYes(self.show_added)
 
                if self.search is not None and self.search.strip() == "":
                        self.search = None
 
+       def setSortIfNone(self, name):
+               if self.order_by is None:
+                       self.order_by = name
+
+       def getMinetestVersion(self):
+               if not self.protocol_version:
+                       return None
+
+               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
+               else:
+                       return 10000000
+
        def buildPackageQuery(self):
                query = Package.query.filter_by(soft_deleted=False, approved=True)
 
@@ -40,13 +75,13 @@ 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())
                else:
                        to_order = None
-                       if self.order_by == "score":
+                       if self.order_by is None or self.order_by == "score":
                                to_order = Package.score
                        elif self.order_by == "created_at":
                                to_order = Package.created_at
@@ -62,19 +97,24 @@ 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))
 
                if self.protocol_version:
-                       self.protocol_version = int(self.protocol_version)
-                       version = MinetestRelease.query.filter(MinetestRelease.protocol>=self.protocol_version).first()
-                       if version is not None:
-                               version = version.id
-                       else:
-                               version = 10000000
-
+                       version = self.getMinetestVersion()
                        query = query.join(Package.releases) \
+                               .filter(PackageRelease.approved==True) \
                                .filter(or_(PackageRelease.min_rel_id==None, PackageRelease.min_rel_id<=version)) \
                                .filter(or_(PackageRelease.max_rel_id==None, PackageRelease.max_rel_id>=version))
 
@@ -83,18 +123,30 @@ class QueryBuilder:
 
                return query
 
-       def buildTopicQuery(self):
-               topics = ForumTopic.query \
-                               .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \
-                               .order_by(db.asc(ForumTopic.wip), db.asc(ForumTopic.name), db.asc(ForumTopic.title))
+       def buildTopicQuery(self, show_added=False):
+               query = ForumTopic.query
+
+               if not self.show_discarded:
+                       query = query.filter_by(discarded=False)
+
+               show_added = self.show_added == True or (self.show_added is None and show_added)
+               if not show_added:
+                       query = query.filter(~ db.exists().where(Package.forums==ForumTopic.topic_id))
+
+               if self.order_by is None or self.order_by == "name":
+                       query = query.order_by(db.asc(ForumTopic.wip), db.asc(ForumTopic.name), db.asc(ForumTopic.title))
+               elif self.order_by == "views":
+                       query = query.order_by(db.desc(ForumTopic.views))
+               elif self.order_by == "date":
+                       query = query.order_by(db.asc(ForumTopic.created_at))
 
                if self.search:
-                       topics = topics.filter(ForumTopic.title.ilike('%' + self.search + '%'))
+                       query = query.filter(ForumTopic.title.ilike('%' + self.search + '%'))
 
                if len(self.types) > 0:
-                       topics = topics.filter(ForumTopic.type.in_(self.types))
+                       query = query.filter(ForumTopic.type.in_(self.types))
 
                if self.limit:
-                       topics = topics.limit(self.limit)
+                       query = query.limit(self.limit)
 
-               return topics
+               return query