Triplehx3/contentdb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Maintenance State field

Browse Source 
Fixes #160
This commit is contained in:
rubenwardy
2021-12-20 21:07:12 +00:00
parent a800685947
commit 5d32d7922f
12 changed files with 156 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/querybuilder.py
View File

@@ -3,7 +3,8 @@ from sqlalchemy import or_
from sqlalchemy.orm import subqueryload
from sqlalchemy.sql.expression import func
from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag, ContentWarning, PackageState
from .models import db, PackageType, Package, ForumTopic, License, MinetestRelease, PackageRelease, User, Tag, \
ContentWarning, PackageState, PackageDevState
from .utils import isYes, get_int_or_abort
@@ -30,7 +31,6 @@ class QueryBuilder:
# Hide
hide_flags = args.getlist("hide")
self.title = title
self.types = types
self.tags = tags
@@ -41,9 +41,16 @@ class QueryBuilder:
self.order_by = args.get("sort")
self.order_dir = args.get("order") or "desc"
use_platform_defaults = "android_default" in hide_flags or "desktop_default" in hide_flags
self.hide_nonfree = "nonfree" in hide_flags
self.hide_wip = "wip" in hide_flags or use_platform_defaults
self.hide_deprecated = "deprecated" in hide_flags or use_platform_defaults
self.hide_flags = set(hide_flags)
self.hide_flags.discard("nonfree")
self.hide_flags.discard("wip")
self.hide_flags.discard("deprecated")
# Filters
self.search = args.get("q")
@@ -136,6 +143,11 @@ class QueryBuilder:
query = query.filter(Package.license.has(License.is_foss == True))
query = query.filter(Package.media_license.has(License.is_foss == True))
if self.hide_wip:
query = query.filter(or_(Package.dev_state == None, Package.dev_state != PackageDevState.WIP))
if self.hide_deprecated:
query = query.filter(or_(Package.dev_state == None, Package.dev_state != PackageDevState.DEPRECATED))
if self.version:
query = query.join(Package.releases) \
.filter(PackageRelease.approved == True) \