from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField
from sqlalchemy import or_, func
from sqlalchemy.orm import joinedload, subqueryload
+from urllib.parse import quote as urlescape
from celery import uuid
qb.show_discarded = True
topics = qb.buildTopicQuery().all()
- tags = db.session.query(func.count(Tags.c.tag_id), Tag) \
- .select_from(Tag).outerjoin(Tags).group_by(Tag.id).order_by(db.asc(Tag.title)).all()
+ tags_query = db.session.query(func.count(Tags.c.tag_id), Tag) \
+ .select_from(Tag).join(Tags).join(Package).group_by(Tag.id).order_by(db.asc(Tag.title))
+ tags = qb.filterPackageQuery(tags_query).all()
selected_tags = set(qb.tags)
alternatives = None
if package.type == PackageType.MOD:
alternatives = Package.query \
- .filter_by(name=package.name, type=PackageType.MOD, soft_deleted=False) \
- .filter(Package.id != package.id) \
+ .filter_by(name=package.name, type=PackageType.MOD) \
+ .filter(Package.id != package.id, Package.state!=PackageState.DELETED) \
.order_by(db.desc(Package.score)) \
.all()
topic_error = None
topic_error_lvl = "warning"
- if not package.approved and package.forums is not None:
+ if package.state != PackageState.APPROVED and package.forums is not None:
errors = []
- if Package.query.filter_by(forums=package.forums, soft_deleted=False).count() > 1:
+ if Package.query.filter(Package.forums==package.forums, Package.state!=PackageState.DELETED).count() > 1:
errors.append("<b>Error: Another package already uses this forum topic!</b>")
topic_error_lvl = "danger"
threads=threads.all(), has_review=has_review)
+@bp.route("/packages/<author>/<name>/shields/<type>/")
+@is_package_page
+def shield(package, type):
+ if type == "title":
+ url = "https://img.shields.io/badge/ContentDB-{}-{}" \
+ .format(urlescape(package.title), urlescape("#375a7f"))
+ elif type == "downloads":
+ #api_url = abs_url_for("api.package", author=package.author.username, name=package.name)
+ api_url = "https://content.minetest.net" + url_for("api.package", author=package.author.username, name=package.name)
+ url = "https://img.shields.io/badge/dynamic/json?color={}&label=ContentDB&query=downloads&suffix=+downloads&url={}" \
+ .format(urlescape("#375a7f"), urlescape(api_url))
+ else:
+ abort(404)
+
+ return redirect(url)
+
+
+
@bp.route("/packages/<author>/<name>/download/")
@is_package_page
def download(package):
type = SelectField("Type", [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD)
license = QuerySelectField("License", [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
media_license = QuerySelectField("Media License", [DataRequired()], allow_blank=True, query_factory=lambda: License.query.order_by(db.asc(License.name)), get_pk=lambda a: a.id, get_label=lambda a: a.name)
- provides_str = StringField("Provides (mods included in package)", [Optional()])
tags = QuerySelectMultipleField('Tags', query_factory=lambda: Tag.query.order_by(db.asc(Tag.name)), get_pk=lambda a: a.id, get_label=makeLabel)
content_warnings = QuerySelectMultipleField('Content Warnings', query_factory=lambda: ContentWarning.query.order_by(db.asc(ContentWarning.name)), get_pk=lambda a: a.id, get_label=makeLabel)
- harddep_str = StringField("Hard Dependencies", [Optional()])
- softdep_str = StringField("Soft Dependencies", [Optional()])
+ # harddep_str = StringField("Hard Dependencies", [Optional()])
+ # softdep_str = StringField("Soft Dependencies", [Optional()])
repo = StringField("VCS Repository URL", [Optional(), URL()], filters = [lambda x: x or None])
website = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None])
issueTracker = StringField("Issue Tracker URL", [Optional(), URL()], filters = [lambda x: x or None])
else:
package = getPackageByInfo(author, name)
+ if package is None:
+ abort(404)
if not package.checkPerm(current_user, Permission.EDIT_PACKAGE):
return redirect(package.getDetailsURL())
form.license.data = None
form.media_license.data = None
else:
- form.harddep_str.data = ",".join([str(x) for x in package.getSortedHardDependencies() ])
- form.softdep_str.data = ",".join([str(x) for x in package.getSortedOptionalDependencies() ])
- form.provides_str.data = MetaPackage.ListToSpec(package.provides)
+ # form.harddep_str.data = ",".join([str(x) for x in package.getSortedHardDependencies() ])
+ # form.softdep_str.data = ",".join([str(x) for x in package.getSortedOptionalDependencies() ])
form.tags.data = list(package.tags)
form.content_warnings.data = list(package.content_warnings)
if not package:
package = Package.query.filter_by(name=form["name"].data, author_id=author.id).first()
if package is not None:
- if package.soft_deleted:
+ if package.state == PackageState.READY_FOR_REVIEW:
Package.query.filter_by(name=form["name"].data, author_id=author.id).delete()
else:
flash("Package already exists!", "danger")
package.maintainers.append(author)
wasNew = True
- elif package.approved and package.name != form.name.data and \
- not package.checkPerm(current_user, Permission.CHANGE_NAME):
+ elif package.name != form.name.data and not package.checkPerm(current_user, Permission.CHANGE_NAME):
flash("Unable to change package name", "danger")
return redirect(url_for("packages.create_edit", author=author, name=name))
if package.type == PackageType.TXP:
package.license = package.media_license
- mpackage_cache = {}
- package.provides.clear()
- mpackages = MetaPackage.SpecToList(form.provides_str.data, mpackage_cache)
- for m in mpackages:
- package.provides.append(m)
-
- Dependency.query.filter_by(depender=package).delete()
- deps = Dependency.SpecToList(package, form.harddep_str.data, mpackage_cache)
- for dep in deps:
- dep.optional = False
- db.session.add(dep)
+ # Dependency.query.filter_by(depender=package).delete()
+ # deps = Dependency.SpecToList(package, form.harddep_str.data, mpackage_cache)
+ # for dep in deps:
+ # dep.optional = False
+ # db.session.add(dep)
- deps = Dependency.SpecToList(package, form.softdep_str.data, mpackage_cache)
- for dep in deps:
- dep.optional = True
- db.session.add(dep)
+ # deps = Dependency.SpecToList(package, form.softdep_str.data, mpackage_cache)
+ # for dep in deps:
+ # dep.optional = True
+ # db.session.add(dep)
- if wasNew and package.type == PackageType.MOD and not package.name in mpackage_cache:
- m = MetaPackage.GetOrCreate(package.name, mpackage_cache)
+ if wasNew and package.type == PackageType.MOD:
+ m = MetaPackage.GetOrCreate(package.name, {})
package.provides.append(m)
package.tags.clear()
return redirect(next_url)
- package_query = Package.query.filter_by(approved=True, soft_deleted=False)
+ package_query = Package.query.filter_by(state=PackageState.APPROVED)
if package is not None:
package_query = package_query.filter(Package.id != package.id)
packages=package_query.all(), \
mpackages=MetaPackage.query.order_by(db.asc(MetaPackage.name)).all())
-@bp.route("/packages/<author>/<name>/approve/", methods=["POST"])
+
+@bp.route("/packages/<author>/<name>/state/", methods=["POST"])
@login_required
@is_package_page
-def approve(package):
- if not package.checkPerm(current_user, Permission.APPROVE_NEW):
- flash("You don't have permission to do that.", "danger")
+def move_to_state(package):
+ state = PackageState.get(request.args.get("state"))
+ if state is None:
+ abort(400)
+
+ if not package.canMoveToState(current_user, state):
+ flash("You don't have permission to do that", "danger")
+ return redirect(package.getDetailsURL())
- elif package.approved:
- flash("Package has already been approved", "danger")
+ package.state = state
+ msg = "Marked {} as {}".format(package.title, state.value)
- else:
- package.approved = True
- package.approved_at = datetime.datetime.now()
+ if state == PackageState.APPROVED:
+ if not package.approved_at:
+ package.approved_at = datetime.datetime.now()
screenshots = PackageScreenshot.query.filter_by(package=package, approved=False).all()
for s in screenshots:
s.approved = True
msg = "Approved {}".format(package.title)
- addNotification(package.maintainers, current_user, msg, package.getDetailsURL(), package)
- severity = AuditSeverity.NORMAL if current_user == package.author else AuditSeverity.EDITOR
- addAuditLog(severity, current_user, msg, package.getDetailsURL(), package)
- db.session.commit()
+
+ addNotification(package.maintainers, current_user, msg, package.getDetailsURL(), package)
+ severity = AuditSeverity.NORMAL if current_user in package.maintainers else AuditSeverity.EDITOR
+ addAuditLog(severity, current_user, msg, package.getDetailsURL(), package)
+
+ db.session.commit()
+
+ if package.state == PackageState.CHANGES_NEEDED:
+ flash("Please comment what changes are needed in the review thread", "warning")
+ if package.review_thread:
+ return redirect(package.review_thread.getViewURL())
+ else:
+ return redirect(url_for('threads.new', pid=package.id, title='Package approval comments'))
return redirect(package.getDetailsURL())
flash("You don't have permission to do that.", "danger")
return redirect(package.getDetailsURL())
- package.soft_deleted = True
+ package.state = PackageState.DELETED
url = url_for("users.profile", username=package.author.username)
msg = "Deleted {}".format(package.title)
flash("You don't have permission to do that.", "danger")
return redirect(package.getDetailsURL())
- package.approved = False
+ package.state = PackageState.READY_FOR_REVIEW
msg = "Unapproved {}".format(package.title)
addNotification(package.maintainers, current_user, msg, package.getDetailsURL(), package)
projects / cheatdb.git / blobdiff