Restrict seeing the email addresses of others to admins only

[cheatdb.git] / app / querybuilder.py

diff --git a/app/querybuilder.py b/app/querybuilder.py
index 4db6742625a65c5187cb5b5c9743290273eb3e3d..26c0b8417d871c4fcc7b49b584fa374685c7f36d 100644 (file)
--- a/app/querybuilder.py
+++ b/app/querybuilder.py
@@ -1,5 +1,5 @@
-from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User
-from .utils import isNo, isYes
+from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag, 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,10 +19,17 @@ 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.tags   = tags
 
                self.random = "random" in args
                self.lucky  = "lucky" in args
@@ -34,7 +41,8 @@ class QueryBuilder:
                # Filters
 
                self.search = args.get("q")
-               self.protocol_version = args.get("protocol_version")
+               self.minetest_version = args.get("engine_version")
+               self.protocol_version = get_int_or_abort(args.get("protocol_version"))
                self.author = args.get("author")
 
                self.show_discarded = isYes(args.get("show_discarded"))
@@ -50,15 +58,10 @@ class QueryBuilder:
                        self.order_by = name
 
        def getMinetestVersion(self):
-               if not self.protocol_version:
+               if not self.protocol_version and not self.minetest_version:
                        return None
 
-               self.protocol_version = int(self.protocol_version)
-               version = MinetestRelease.query.filter(MinetestRelease.protocol>=self.protocol_version).first()
-               if version is not None:
-                       return version.id
-               else:
-                       return 10000000
+               return MinetestRelease.get(self.minetest_version, self.protocol_version)
 
        def buildPackageQuery(self):
                query = Package.query.filter_by(soft_deleted=False, approved=True)
@@ -67,27 +70,36 @@ class QueryBuilder:
                        query = query.filter(Package.type.in_(self.types))
 
                if self.search:
-                       query = query.search(self.search, sort=True)
+                       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 or self.order_by == "score":
+                       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 == "created_at":
+                       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
                        else:
                                abort(400)
 
-                       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)
+                       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)
+                               query = query.order_by(to_order)
 
                if self.author:
                        author = User.query.filter_by(username=self.author).first()
@@ -96,16 +108,20 @@ class QueryBuilder:
 
                        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:
+               if self.protocol_version or self.minetest_version:
                        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))
+                       if version:
+                               query = query.join(Package.releases) \
+                                       .filter(PackageRelease.approved==True) \
+                                       .filter(or_(PackageRelease.min_rel_id==None, PackageRelease.min_rel_id<=version.id)) \
+                                       .filter(or_(PackageRelease.max_rel_id==None, PackageRelease.max_rel_id>=version.id))
 
                if self.limit:
                        query = query.limit(self.limit)
@@ -126,9 +142,8 @@ class QueryBuilder:
                        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":
+               elif self.order_by == "created_at" or 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 + '%'))