-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, Tags
+from .utils import isNo, isYes, get_int_or_abort
from sqlalchemy.sql.expression import func
from flask import abort
from sqlalchemy import or_
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"
- self.protocol_version = args.get("protocol_version")
+
+ # Filters
+
+ self.search = args.get("q")
+ 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"))
+ 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 and not self.minetest_version:
+ return None
+
+ return MinetestRelease.get(self.minetest_version, self.protocol_version)
+
def buildPackageQuery(self):
query = Package.query.filter_by(soft_deleted=False, approved=True)
query = query.filter(Package.type.in_(self.types))
if self.search:
- query = query.filter(Package.title.ilike('%' + 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 == "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)
+
+ if self.author:
+ author = User.query.filter_by(username=self.author).first()
+ if not author:
+ abort(404)
- query = query.order_by(to_order)
+ 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
-
- query = query.join(Package.releases) \
- .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 self.protocol_version or self.minetest_version:
+ version = self.getMinetestVersion()
+ 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)
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 == "created_at" or 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
projects / cheatdb.git / blobdiff