From 64f131ae27a7332245b5a4eb8e1e4879d7d99578 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Fri, 15 Nov 2019 23:51:42 +0000 Subject: Refactor endpoints to use blueprints instead --- .gitignore | 4 +- Dockerfile | 6 +- app/__init__.py | 35 ++- app/blueprints/__init__.py | 10 + app/blueprints/admin/__init__.py | 22 ++ app/blueprints/admin/admin.py | 128 ++++++++++ app/blueprints/admin/licenseseditor.py | 62 +++++ app/blueprints/admin/tagseditor.py | 57 +++++ app/blueprints/admin/versioneditor.py | 60 +++++ app/blueprints/api/__init__.py | 100 ++++++++ app/blueprints/homepage/__init__.py | 20 ++ app/blueprints/metapackages/__init__.py | 36 +++ app/blueprints/notifications/__init__.py | 34 +++ app/blueprints/packages/__init__.py | 21 ++ app/blueprints/packages/editrequests.py | 173 ++++++++++++++ app/blueprints/packages/packages.py | 372 +++++++++++++++++++++++++++++ app/blueprints/packages/releases.py | 219 +++++++++++++++++ app/blueprints/packages/screenshots.py | 106 ++++++++ app/blueprints/tasks/__init__.py | 75 ++++++ app/blueprints/threads/__init__.py | 214 +++++++++++++++++ app/blueprints/thumbnails/__init__.py | 74 ++++++ app/blueprints/todo/__init__.py | 101 ++++++++ app/blueprints/users/__init__.py | 5 + app/blueprints/users/githublogin.py | 74 ++++++ app/blueprints/users/profile.py | 309 ++++++++++++++++++++++++ app/models.py | 26 +- app/sass.py | 63 +++++ app/tasks/emails.py | 2 +- app/tasks/importtasks.py | 2 +- app/template_filters.py | 22 ++ app/templates/admin/licenses/edit.html | 4 +- app/templates/admin/licenses/list.html | 4 +- app/templates/admin/list.html | 10 +- app/templates/admin/switch_user.html | 17 ++ app/templates/admin/switch_user_page.html | 17 -- app/templates/admin/tags/edit.html | 4 +- app/templates/admin/tags/list.html | 4 +- app/templates/admin/versions/edit.html | 4 +- app/templates/admin/versions/list.html | 4 +- app/templates/base.html | 22 +- app/templates/emails/verify.html | 4 +- app/templates/flask_user/login.html | 4 +- app/templates/index.html | 8 +- app/templates/macros/threads.html | 12 +- app/templates/macros/topics.html | 8 +- app/templates/meta/list.html | 2 +- app/templates/notifications/list.html | 2 +- app/templates/packages/list.html | 2 +- app/templates/packages/release_edit.html | 2 +- app/templates/packages/view.html | 16 +- app/templates/tasks/view.html | 2 +- app/templates/todo/list.html | 4 +- app/templates/todo/topics.html | 16 +- app/templates/users/claim.html | 6 +- app/templates/users/list.html | 2 +- app/templates/users/user_profile_page.html | 10 +- app/views/__init__.py | 84 ------- app/views/admin/__init__.py | 18 -- app/views/admin/admin.py | 128 ---------- app/views/admin/licenseseditor.py | 62 ----- app/views/admin/tagseditor.py | 57 ----- app/views/admin/todo.py | 101 -------- app/views/admin/versioneditor.py | 60 ----- app/views/api.py | 99 -------- app/views/meta.py | 34 --- app/views/packages/__init__.py | 18 -- app/views/packages/editrequests.py | 174 -------------- app/views/packages/packages.py | 369 ---------------------------- app/views/packages/releases.py | 218 ----------------- app/views/packages/screenshots.py | 105 -------- app/views/sass.py | 67 ------ app/views/tasks.py | 75 ------ app/views/threads.py | 212 ---------------- app/views/thumbnails.py | 73 ------ app/views/users/__init__.py | 18 -- app/views/users/githublogin.py | 73 ------ app/views/users/notifications.py | 33 --- app/views/users/users.py | 308 ------------------------ 78 files changed, 2504 insertions(+), 2504 deletions(-) create mode 100644 app/blueprints/__init__.py create mode 100644 app/blueprints/admin/__init__.py create mode 100644 app/blueprints/admin/admin.py create mode 100644 app/blueprints/admin/licenseseditor.py create mode 100644 app/blueprints/admin/tagseditor.py create mode 100644 app/blueprints/admin/versioneditor.py create mode 100644 app/blueprints/api/__init__.py create mode 100644 app/blueprints/homepage/__init__.py create mode 100644 app/blueprints/metapackages/__init__.py create mode 100644 app/blueprints/notifications/__init__.py create mode 100644 app/blueprints/packages/__init__.py create mode 100644 app/blueprints/packages/editrequests.py create mode 100644 app/blueprints/packages/packages.py create mode 100644 app/blueprints/packages/releases.py create mode 100644 app/blueprints/packages/screenshots.py create mode 100644 app/blueprints/tasks/__init__.py create mode 100644 app/blueprints/threads/__init__.py create mode 100644 app/blueprints/thumbnails/__init__.py create mode 100644 app/blueprints/todo/__init__.py create mode 100644 app/blueprints/users/__init__.py create mode 100644 app/blueprints/users/githublogin.py create mode 100644 app/blueprints/users/profile.py create mode 100644 app/sass.py create mode 100644 app/template_filters.py create mode 100644 app/templates/admin/switch_user.html delete mode 100644 app/templates/admin/switch_user_page.html delete mode 100644 app/views/__init__.py delete mode 100644 app/views/admin/__init__.py delete mode 100644 app/views/admin/admin.py delete mode 100644 app/views/admin/licenseseditor.py delete mode 100644 app/views/admin/tagseditor.py delete mode 100644 app/views/admin/todo.py delete mode 100644 app/views/admin/versioneditor.py delete mode 100644 app/views/api.py delete mode 100644 app/views/meta.py delete mode 100644 app/views/packages/__init__.py delete mode 100644 app/views/packages/editrequests.py delete mode 100644 app/views/packages/packages.py delete mode 100644 app/views/packages/releases.py delete mode 100644 app/views/packages/screenshots.py delete mode 100644 app/views/sass.py delete mode 100644 app/views/tasks.py delete mode 100644 app/views/threads.py delete mode 100644 app/views/thumbnails.py delete mode 100644 app/views/users/__init__.py delete mode 100644 app/views/users/githublogin.py delete mode 100644 app/views/users/notifications.py delete mode 100644 app/views/users/users.py diff --git a/.gitignore b/.gitignore index 7ab19d3..c8dd729 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,8 @@ custom.css tmp log.txt *.rdb -uploads -thumbnails +app/public/uploads +app/public/thumbnails celerybeat-schedule /data diff --git a/Dockerfile b/Dockerfile index 0bcaa9e..c88d0a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,10 @@ RUN pip install -r ./requirements.txt RUN pip install gunicorn COPY utils utils -COPY app app -COPY migrations migrations COPY config.cfg ./config.cfg +COPY migrations migrations +COPY app app +RUN mkdir /home/cdb/app/public/uploads/ RUN chown cdb:cdb /home/cdb -R - USER cdb diff --git a/app/__init__.py b/app/__init__.py index c5d8000..a0b4ba5 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -48,6 +48,10 @@ gravatar = Gravatar(app, use_ssl=True, base_url=None) +from .sass import sass +sass(app) + + if not app.debug and app.config["MAIL_UTILS_ERROR_SEND_TO"]: from .maillogger import register_mail_error_handler register_mail_error_handler(app, mail) @@ -55,8 +59,33 @@ if not app.debug and app.config["MAIL_UTILS_ERROR_SEND_TO"]: @babel.localeselector def get_locale(): - return request.accept_languages.best_match(app.config['LANGUAGES'].keys()) + return request.accept_languages.best_match(app.config['LANGUAGES'].keys()) + +from . import models, tasks, template_filters + +from .blueprints import create_blueprints +create_blueprints(app) + +from flask_login import logout_user + +@app.route("/uploads/") +def send_upload(path): + return send_from_directory("public/uploads", path) +@menu.register_menu(app, ".help", "Help", order=19, endpoint_arguments_constructor=lambda: { 'path': 'help' }) +@app.route('//') +def flatpage(path): + page = pages.get_or_404(path) + template = page.meta.get('template', 'flatpage.html') + return render_template(template, page=page) -from . import models, tasks -from .views import * +@app.before_request +def check_for_ban(): + if current_user.is_authenticated: + if current_user.rank == models.UserRank.BANNED: + flash("You have been banned.", "error") + logout_user() + return redirect(url_for('user.login')) + elif current_user.rank == models.UserRank.NOT_JOINED: + current_user.rank = models.UserRank.MEMBER + models.db.session.commit() diff --git a/app/blueprints/__init__.py b/app/blueprints/__init__.py new file mode 100644 index 0000000..74aa9ae --- /dev/null +++ b/app/blueprints/__init__.py @@ -0,0 +1,10 @@ +import os, importlib + +def create_blueprints(app): + dir = os.path.dirname(os.path.realpath(__file__)) + modules = next(os.walk(dir))[1] + + for modname in modules: + if all(c.islower() for c in modname): + module = importlib.import_module("." + modname, __name__) + app.register_blueprint(module.bp) diff --git a/app/blueprints/admin/__init__.py b/app/blueprints/admin/__init__.py new file mode 100644 index 0000000..66eb1ea --- /dev/null +++ b/app/blueprints/admin/__init__.py @@ -0,0 +1,22 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import Blueprint + +bp = Blueprint("admin", __name__) + +from . import admin, licenseseditor, tagseditor, versioneditor diff --git a/app/blueprints/admin/admin.py b/app/blueprints/admin/admin.py new file mode 100644 index 0000000..2a2bace --- /dev/null +++ b/app/blueprints/admin/admin.py @@ -0,0 +1,128 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +import flask_menu as menu +from . import bp +from app.models import * +from celery import uuid +from app.tasks.importtasks import importRepoScreenshot, importAllDependencies, makeVCSRelease +from app.tasks.forumtasks import importTopicList, checkAllForumAccounts +from flask_wtf import FlaskForm +from wtforms import * +from app.utils import loginUser, rank_required, triggerNotif +import datetime + +@bp.route("/admin/", methods=["GET", "POST"]) +@rank_required(UserRank.ADMIN) +def admin_page(): + if request.method == "POST": + action = request.form["action"] + if action == "delstuckreleases": + PackageRelease.query.filter(PackageRelease.task_id != None).delete() + db.session.commit() + return redirect(url_for("admin.admin_page")) + elif action == "importmodlist": + task = importTopicList.delay() + return redirect(url_for("tasks.check", id=task.id, r=url_for("todo.topics"))) + elif action == "checkusers": + task = checkAllForumAccounts.delay() + return redirect(url_for("tasks.check", id=task.id, r=url_for("admin.admin_page"))) + elif action == "importscreenshots": + packages = Package.query \ + .filter_by(soft_deleted=False) \ + .outerjoin(PackageScreenshot, Package.id==PackageScreenshot.package_id) \ + .filter(PackageScreenshot.id==None) \ + .all() + for package in packages: + importRepoScreenshot.delay(package.id) + + return redirect(url_for("admin.admin_page")) + elif action == "restore": + package = Package.query.get(request.form["package"]) + if package is None: + flash("Unknown package", "error") + else: + package.soft_deleted = False + db.session.commit() + return redirect(url_for("admin.admin_page")) + elif action == "importdepends": + task = importAllDependencies.delay() + return redirect(url_for("tasks.check", id=task.id, r=url_for("admin.admin_page"))) + elif action == "modprovides": + packages = Package.query.filter_by(type=PackageType.MOD).all() + mpackage_cache = {} + for p in packages: + if len(p.provides) == 0: + p.provides.append(MetaPackage.GetOrCreate(p.name, mpackage_cache)) + + db.session.commit() + return redirect(url_for("admin.admin_page")) + elif action == "recalcscores": + for p in Package.query.all(): + p.recalcScore() + + db.session.commit() + return redirect(url_for("admin.admin_page")) + elif action == "vcsrelease": + for package in Package.query.filter(Package.repo.isnot(None)).all(): + if package.releases.count() != 0: + continue + + rel = PackageRelease() + rel.package = package + rel.title = datetime.date.today().isoformat() + rel.url = "" + rel.task_id = uuid() + rel.approved = True + db.session.add(rel) + db.session.commit() + + makeVCSRelease.apply_async((rel.id, "master"), task_id=rel.task_id) + + msg = "{}: Release {} created".format(package.title, rel.title) + triggerNotif(package.author, current_user, msg, rel.getEditURL()) + db.session.commit() + + else: + flash("Unknown action: " + action, "error") + + deleted_packages = Package.query.filter_by(soft_deleted=True).all() + return render_template("admin/list.html", deleted_packages=deleted_packages) + +class SwitchUserForm(FlaskForm): + username = StringField("Username") + submit = SubmitField("Switch") + + +@bp.route("/admin/switchuser/", methods=["GET", "POST"]) +@rank_required(UserRank.ADMIN) +def switch_user(): + form = SwitchUserForm(formdata=request.form) + if request.method == "POST" and form.validate(): + user = User.query.filter_by(username=form["username"].data).first() + if user is None: + flash("Unable to find user", "error") + elif loginUser(user): + return redirect(url_for("users.profile", username=current_user.username)) + else: + flash("Unable to login as user", "error") + + + # Process GET or invalid POST + return render_template("admin/switch_user.html", form=form) diff --git a/app/blueprints/admin/licenseseditor.py b/app/blueprints/admin/licenseseditor.py new file mode 100644 index 0000000..c6fca02 --- /dev/null +++ b/app/blueprints/admin/licenseseditor.py @@ -0,0 +1,62 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +from . import bp +from app.models import * +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from app.utils import rank_required + +@bp.route("/licenses/") +@rank_required(UserRank.MODERATOR) +def license_list(): + return render_template("admin/licenses/list.html", licenses=License.query.order_by(db.asc(License.name)).all()) + +class LicenseForm(FlaskForm): + name = StringField("Name", [InputRequired(), Length(3,100)]) + is_foss = BooleanField("Is FOSS") + submit = SubmitField("Save") + +@bp.route("/licenses/new/", methods=["GET", "POST"]) +@bp.route("/licenses//edit/", methods=["GET", "POST"]) +@rank_required(UserRank.MODERATOR) +def create_edit_license(name=None): + license = None + if name is not None: + license = License.query.filter_by(name=name).first() + if license is None: + abort(404) + + form = LicenseForm(formdata=request.form, obj=license) + if request.method == "GET" and license is None: + form.is_foss.data = True + elif request.method == "POST" and form.validate(): + if license is None: + license = License(form.name.data) + db.session.add(license) + flash("Created license " + form.name.data, "success") + else: + flash("Updated license " + form.name.data, "success") + + form.populate_obj(license) + db.session.commit() + return redirect(url_for("admin.license_list")) + + return render_template("admin/licenses/edit.html", license=license, form=form) diff --git a/app/blueprints/admin/tagseditor.py b/app/blueprints/admin/tagseditor.py new file mode 100644 index 0000000..8fb89f4 --- /dev/null +++ b/app/blueprints/admin/tagseditor.py @@ -0,0 +1,57 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +from . import bp +from app.models import * +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from app.utils import rank_required + +@bp.route("/tags/") +@rank_required(UserRank.MODERATOR) +def tag_list(): + return render_template("admin/tags/list.html", tags=Tag.query.order_by(db.asc(Tag.title)).all()) + +class TagForm(FlaskForm): + title = StringField("Title", [InputRequired(), Length(3,100)]) + name = StringField("Name", [Optional(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) + submit = SubmitField("Save") + +@bp.route("/tags/new/", methods=["GET", "POST"]) +@bp.route("/tags//edit/", methods=["GET", "POST"]) +@rank_required(UserRank.MODERATOR) +def create_edit_tag(name=None): + tag = None + if name is not None: + tag = Tag.query.filter_by(name=name).first() + if tag is None: + abort(404) + + form = TagForm(formdata=request.form, obj=tag) + if request.method == "POST" and form.validate(): + if tag is None: + tag = Tag(form.title.data) + db.session.add(tag) + else: + form.populate_obj(tag) + db.session.commit() + return redirect(url_for("admin.create_edit_tag", name=tag.name)) + + return render_template("admin/tags/edit.html", tag=tag, form=form) diff --git a/app/blueprints/admin/versioneditor.py b/app/blueprints/admin/versioneditor.py new file mode 100644 index 0000000..98a9a7c --- /dev/null +++ b/app/blueprints/admin/versioneditor.py @@ -0,0 +1,60 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +from . import bp +from app.models import * +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from app.utils import rank_required + +@bp.route("/versions/") +@rank_required(UserRank.MODERATOR) +def version_list(): + return render_template("admin/versions/list.html", versions=MinetestRelease.query.order_by(db.asc(MinetestRelease.id)).all()) + +class VersionForm(FlaskForm): + name = StringField("Name", [InputRequired(), Length(3,100)]) + protocol = IntegerField("Protocol") + submit = SubmitField("Save") + +@bp.route("/versions/new/", methods=["GET", "POST"]) +@bp.route("/versions//edit/", methods=["GET", "POST"]) +@rank_required(UserRank.MODERATOR) +def create_edit_version(name=None): + version = None + if name is not None: + version = MinetestRelease.query.filter_by(name=name).first() + if version is None: + abort(404) + + form = VersionForm(formdata=request.form, obj=version) + if request.method == "POST" and form.validate(): + if version is None: + version = MinetestRelease(form.name.data) + db.session.add(version) + flash("Created version " + form.name.data, "success") + else: + flash("Updated version " + form.name.data, "success") + + form.populate_obj(version) + db.session.commit() + return redirect(url_for("admin.version_list")) + + return render_template("admin/versions/edit.html", version=version, form=form) diff --git a/app/blueprints/api/__init__.py b/app/blueprints/api/__init__.py new file mode 100644 index 0000000..5092f21 --- /dev/null +++ b/app/blueprints/api/__init__.py @@ -0,0 +1,100 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +from app.models import * +from app.utils import is_package_page +from app.querybuilder import QueryBuilder + +bp = Blueprint("api", __name__) + +@bp.route("/api/packages/") +def packages(): + qb = QueryBuilder(request.args) + query = qb.buildPackageQuery() + ver = qb.getMinetestVersion() + + pkgs = [package.getAsDictionaryShort(current_app.config["BASE_URL"], version=ver) \ + for package in query.all()] + return jsonify(pkgs) + + +@bp.route("/api/packages///") +@is_package_page +def package(package): + return jsonify(package.getAsDictionary(current_app.config["BASE_URL"])) + + +@bp.route("/api/packages///dependencies/") +@is_package_page +def package_dependencies(package): + ret = [] + + for dep in package.dependencies: + name = None + fulfilled_by = None + + if dep.package: + name = dep.package.name + fulfilled_by = [ dep.package.getAsDictionaryKey() ] + + elif dep.meta_package: + name = dep.meta_package.name + fulfilled_by = [ pkg.getAsDictionaryKey() for pkg in dep.meta_package.packages] + + else: + raise "Malformed dependency" + + ret.append({ + "name": name, + "is_optional": dep.optional, + "packages": fulfilled_by + }) + + return jsonify(ret) + + +@bp.route("/api/topics/") +def topics(): + qb = QueryBuilder(request.args) + query = qb.buildTopicQuery(show_added=True) + return jsonify([t.getAsDictionary() for t in query.all()]) + + +@bp.route("/api/topic_discard/", methods=["POST"]) +@login_required +def topic_set_discard(): + tid = request.args.get("tid") + discard = request.args.get("discard") + if tid is None or discard is None: + abort(400) + + topic = ForumTopic.query.get(tid) + if not topic.checkPerm(current_user, Permission.TOPIC_DISCARD): + abort(403) + + topic.discarded = discard == "true" + db.session.commit() + + return jsonify(topic.getAsDictionary()) + + +@bp.route("/api/minetest_versions/") +def versions(): + return jsonify([{ "name": rel.name, "protocol_version": rel.protocol }\ + for rel in MinetestRelease.query.all() if rel.getActual() is not None]) diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py new file mode 100644 index 0000000..0d50bbd --- /dev/null +++ b/app/blueprints/homepage/__init__.py @@ -0,0 +1,20 @@ +from flask import Blueprint, render_template + +bp = Blueprint("homepage", __name__) + +from app.models import * +import flask_menu as menu +from sqlalchemy.sql.expression import func + +@bp.route("/") +@menu.register_menu(bp, ".", "Home") +def home_page(): + query = Package.query.filter_by(approved=True, soft_deleted=False) + count = query.count() + new = query.order_by(db.desc(Package.created_at)).limit(8).all() + pop_mod = query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score)).limit(8).all() + pop_gam = query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score)).limit(4).all() + pop_txp = query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score)).limit(4).all() + downloads = db.session.query(func.sum(PackageRelease.downloads)).first()[0] + return render_template("index.html", count=count, downloads=downloads, \ + new=new, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam) diff --git a/app/blueprints/metapackages/__init__.py b/app/blueprints/metapackages/__init__.py new file mode 100644 index 0000000..ff54e6d --- /dev/null +++ b/app/blueprints/metapackages/__init__.py @@ -0,0 +1,36 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * + +bp = Blueprint("metapackages", __name__) + +from flask_user import * +from app.models import * + +@bp.route("/metapackages/") +def list_all(): + mpackages = MetaPackage.query.order_by(db.asc(MetaPackage.name)).all() + return render_template("meta/list.html", mpackages=mpackages) + +@bp.route("/metapackages//") +def view(name): + mpackage = MetaPackage.query.filter_by(name=name).first() + if mpackage is None: + abort(404) + + return render_template("meta/view.html", mpackage=mpackage) diff --git a/app/blueprints/notifications/__init__.py b/app/blueprints/notifications/__init__.py new file mode 100644 index 0000000..77263e5 --- /dev/null +++ b/app/blueprints/notifications/__init__.py @@ -0,0 +1,34 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import Blueprint +from flask_user import current_user, login_required +from app.models import db + +bp = Blueprint("notifications", __name__) + +@bp.route("/notifications/") +@login_required +def list_all(): + return render_template("notifications/list.html") + +@bp.route("/notifications/clear/", methods=["POST"]) +@login_required +def clear(): + current_user.notifications.clear() + db.session.commit() + return redirect(url_for("notifications.list_all")) diff --git a/app/blueprints/packages/__init__.py b/app/blueprints/packages/__init__.py new file mode 100644 index 0000000..e4fc4f2 --- /dev/null +++ b/app/blueprints/packages/__init__.py @@ -0,0 +1,21 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from flask import Blueprint + +bp = Blueprint("packages", __name__) + +from . import packages, screenshots, releases diff --git a/app/blueprints/packages/editrequests.py b/app/blueprints/packages/editrequests.py new file mode 100644 index 0000000..5ee9cd1 --- /dev/null +++ b/app/blueprints/packages/editrequests.py @@ -0,0 +1,173 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from flask import * +from flask_user import * +from app import app +from app.models import * + +from app.utils import * + +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField + +from . import PackageForm + + +class EditRequestForm(PackageForm): + edit_title = StringField("Edit Title", [InputRequired(), Length(1, 100)]) + edit_desc = TextField("Edit Description", [Optional()]) + +@app.route("/packages///requests/new/", methods=["GET","POST"]) +@app.route("/packages///requests//edit/", methods=["GET","POST"]) +@login_required +@is_package_page +def create_edit_editrequest_page(package, id=None): + edited_package = package + + erequest = None + if id is not None: + erequest = EditRequest.query.get(id) + if erequest.package != package: + abort(404) + + if not erequest.checkPerm(current_user, Permission.EDIT_EDITREQUEST): + abort(403) + + if erequest.status != 0: + flash("Can't edit EditRequest, it has already been merged or rejected", "error") + return redirect(erequest.getURL()) + + edited_package = Package(package) + erequest.applyAll(edited_package) + + form = EditRequestForm(request.form, obj=edited_package) + if request.method == "GET": + deps = edited_package.dependencies + form.harddep_str.data = ",".join([str(x) for x in deps if not x.optional]) + form.softdep_str.data = ",".join([str(x) for x in deps if x.optional]) + form.provides_str.data = MetaPackage.ListToSpec(edited_package.provides) + + if request.method == "POST" and form.validate(): + if erequest is None: + erequest = EditRequest() + erequest.package = package + erequest.author = current_user + + erequest.title = form["edit_title"].data + erequest.desc = form["edit_desc"].data + db.session.add(erequest) + + EditRequestChange.query.filter_by(request=erequest).delete() + + wasChangeMade = False + for e in PackagePropertyKey: + newValue = form[e.name].data + oldValue = getattr(package, e.name) + + newValueComp = newValue + oldValueComp = oldValue + if type(newValue) is str: + newValue = newValue.replace("\r\n", "\n") + newValueComp = newValue.strip() + oldValueComp = "" if oldValue is None else oldValue.strip() + + if newValueComp != oldValueComp: + change = EditRequestChange() + change.request = erequest + change.key = e + change.oldValue = e.convert(oldValue) + change.newValue = e.convert(newValue) + db.session.add(change) + wasChangeMade = True + + if wasChangeMade: + msg = "{}: Edit request #{} {}" \ + .format(package.title, erequest.id, "created" if id is None else "edited") + triggerNotif(package.author, current_user, msg, erequest.getURL()) + triggerNotif(erequest.author, current_user, msg, erequest.getURL()) + db.session.commit() + return redirect(erequest.getURL()) + else: + flash("No changes detected", "warning") + elif erequest is not None: + form["edit_title"].data = erequest.title + form["edit_desc"].data = erequest.desc + + return render_template("packages/editrequest_create_edit.html", package=package, form=form) + + +@app.route("/packages///requests//") +@is_package_page +def view_editrequest_page(package, id): + erequest = EditRequest.query.get(id) + if erequest is None or erequest.package != package: + abort(404) + + clearNotifications(erequest.getURL()) + return render_template("packages/editrequest_view.html", package=package, request=erequest) + + +@app.route("/packages///requests//approve/", methods=["POST"]) +@is_package_page +def approve_editrequest_page(package, id): + if not package.checkPerm(current_user, Permission.APPROVE_CHANGES): + flash("You don't have permission to do that.", "error") + return redirect(package.getDetailsURL()) + + erequest = EditRequest.query.get(id) + if erequest is None or erequest.package != package: + abort(404) + + if erequest.status != 0: + flash("Edit request has already been resolved", "error") + + else: + erequest.status = 1 + erequest.applyAll(package) + + msg = "{}: Edit request #{} merged".format(package.title, erequest.id) + triggerNotif(erequest.author, current_user, msg, erequest.getURL()) + triggerNotif(package.author, current_user, msg, erequest.getURL()) + db.session.commit() + + return redirect(package.getDetailsURL()) + +@app.route("/packages///requests//reject/", methods=["POST"]) +@is_package_page +def reject_editrequest_page(package, id): + if not package.checkPerm(current_user, Permission.APPROVE_CHANGES): + flash("You don't have permission to do that.", "error") + return redirect(package.getDetailsURL()) + + erequest = EditRequest.query.get(id) + if erequest is None or erequest.package != package: + abort(404) + + if erequest.status != 0: + flash("Edit request has already been resolved", "error") + + else: + erequest.status = 2 + + msg = "{}: Edit request #{} rejected".format(package.title, erequest.id) + triggerNotif(erequest.author, current_user, msg, erequest.getURL()) + triggerNotif(package.author, current_user, msg, erequest.getURL()) + db.session.commit() + + return redirect(package.getDetailsURL()) diff --git a/app/blueprints/packages/packages.py b/app/blueprints/packages/packages.py new file mode 100644 index 0000000..1cc2f26 --- /dev/null +++ b/app/blueprints/packages/packages.py @@ -0,0 +1,372 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import render_template, abort, request, redirect, url_for, flash +from flask_user import current_user +import flask_menu as menu + +from . import bp + +from app.models import * +from app.querybuilder import QueryBuilder +from app.tasks.importtasks import importRepoScreenshot +from app.utils import * + +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField +from sqlalchemy import or_ + + +@menu.register_menu(bp, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' }) +@menu.register_menu(bp, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' }) +@menu.register_menu(bp, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' }) +@menu.register_menu(bp, ".random", "Random", order=14, endpoint_arguments_constructor=lambda: { 'random': '1' }) +@bp.route("/packages/") +def list_all(): + qb = QueryBuilder(request.args) + query = qb.buildPackageQuery() + title = qb.title + + if qb.lucky: + package = query.first() + if package: + return redirect(package.getDetailsURL()) + + topic = qb.buildTopicQuery().first() + if qb.search and topic: + return redirect("https://forum.minetest.net/viewtopic.php?t=" + str(topic.topic_id)) + + page = int(request.args.get("page") or 1) + num = min(40, int(request.args.get("n") or 100)) + query = query.paginate(page, num, True) + + search = request.args.get("q") + type_name = request.args.get("type") + + next_url = url_for("packages.list_all", type=type_name, q=search, page=query.next_num) \ + if query.has_next else None + prev_url = url_for("packages.list_all", type=type_name, q=search, page=query.prev_num) \ + if query.has_prev else None + + topics = None + if qb.search and not query.has_next: + topics = qb.buildTopicQuery().all() + + tags = Tag.query.all() + return render_template("packages/list.html", \ + title=title, packages=query.items, topics=topics, \ + query=search, tags=tags, type=type_name, \ + next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, packages_count=query.total) + + +def getReleases(package): + if package.checkPerm(current_user, Permission.MAKE_RELEASE): + return package.releases.limit(5) + else: + return package.releases.filter_by(approved=True).limit(5) + + +@bp.route("/packages///") +@is_package_page +def view(package): + clearNotifications(package.getDetailsURL()) + + 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) \ + .order_by(db.desc(Package.score)) \ + .all() + + + show_similar_topics = current_user == package.author or \ + package.checkPerm(current_user, Permission.APPROVE_NEW) + + similar_topics = None if not show_similar_topics else \ + ForumTopic.query \ + .filter_by(name=package.name) \ + .filter(ForumTopic.topic_id != package.forums) \ + .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ + .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ + .all() + + releases = getReleases(package) + requests = [r for r in package.requests if r.status == 0] + + review_thread = package.review_thread + if review_thread is not None and not review_thread.checkPerm(current_user, Permission.SEE_THREAD): + review_thread = None + + topic_error = None + topic_error_lvl = "warning" + if not package.approved and package.forums is not None: + errors = [] + if Package.query.filter_by(forums=package.forums, soft_deleted=False).count() > 1: + errors.append("Error: Another package already uses this forum topic!") + topic_error_lvl = "danger" + + topic = ForumTopic.query.get(package.forums) + if topic is not None: + if topic.author != package.author: + errors.append("Error: Forum topic author doesn't match package author.") + topic_error_lvl = "danger" + + if topic.wip: + errors.append("Warning: Forum topic is in WIP section, make sure package meets playability standards.") + elif package.type != PackageType.TXP: + errors.append("Warning: Forum topic not found. This may happen if the topic has only just been created.") + + topic_error = "
".join(errors) + + + threads = Thread.query.filter_by(package_id=package.id) + if not current_user.is_authenticated: + threads = threads.filter_by(private=False) + elif not current_user.rank.atLeast(UserRank.EDITOR) and not current_user == package.author: + threads = threads.filter(or_(Thread.private == False, Thread.author == current_user)) + + + return render_template("packages/view.html", \ + package=package, releases=releases, requests=requests, \ + alternatives=alternatives, similar_topics=similar_topics, \ + review_thread=review_thread, topic_error=topic_error, topic_error_lvl=topic_error_lvl, \ + threads=threads.all()) + + +@bp.route("/packages///download/") +@is_package_page +def download(package): + release = package.getDownloadRelease() + + if release is None: + if "application/zip" in request.accept_mimetypes and \ + not "text/html" in request.accept_mimetypes: + return "", 204 + else: + flash("No download available.", "error") + return redirect(package.getDetailsURL()) + else: + PackageRelease.query.filter_by(id=release.id).update({ + "downloads": PackageRelease.downloads + 1 + }) + db.session.commit() + + return redirect(release.url, code=302) + + +class PackageForm(FlaskForm): + name = StringField("Name (Technical)", [InputRequired(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) + title = StringField("Title (Human-readable)", [InputRequired(), Length(3, 50)]) + short_desc = StringField("Short Description (Plaintext)", [InputRequired(), Length(1,200)]) + desc = TextAreaField("Long Description (Markdown)", [Optional(), Length(0,10000)]) + type = SelectField("Type", [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD) + license = QuerySelectField("License", [InputRequired()], 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", [InputRequired()], 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=lambda a: a.title) + 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]) + forums = IntegerField("Forum Topic ID", [Optional(), NumberRange(0,999999)]) + submit = SubmitField("Save") + +@bp.route("/packages/new/", methods=["GET", "POST"]) +@bp.route("/packages///edit/", methods=["GET", "POST"]) +@login_required +def create_edit(author=None, name=None): + package = None + form = None + if author is None: + form = PackageForm(formdata=request.form) + author = request.args.get("author") + if author is None or author == current_user.username: + author = current_user + else: + author = User.query.filter_by(username=author).first() + if author is None: + flash("Unable to find that user", "error") + return redirect(url_for("packages.create_edit")) + + if not author.checkPerm(current_user, Permission.CHANGE_AUTHOR): + flash("Permission denied", "error") + return redirect(url_for("packages.create_edit")) + + else: + package = getPackageByInfo(author, name) + if not package.checkPerm(current_user, Permission.EDIT_PACKAGE): + return redirect(package.getDetailsURL()) + + author = package.author + + form = PackageForm(formdata=request.form, obj=package) + + # Initial form class from post data and default data + if request.method == "GET": + if package is None: + form.name.data = request.args.get("bname") + form.title.data = request.args.get("title") + form.repo.data = request.args.get("repo") + form.forums.data = request.args.get("forums") + else: + deps = package.dependencies + form.harddep_str.data = ",".join([str(x) for x in deps if not x.optional]) + form.softdep_str.data = ",".join([str(x) for x in deps if x.optional]) + form.provides_str.data = MetaPackage.ListToSpec(package.provides) + + if request.method == "POST" and form.validate(): + wasNew = False + 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: + Package.query.filter_by(name=form["name"].data, author_id=author.id).delete() + else: + flash("Package already exists!", "error") + return redirect(url_for("packages.create_edit")) + + package = Package() + package.author = author + wasNew = True + + elif package.approved and 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)) + + else: + triggerNotif(package.author, current_user, + "{} edited".format(package.title), package.getDetailsURL()) + + form.populate_obj(package) # copy to row + + 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) + + 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) + package.provides.append(m) + + package.tags.clear() + for tag in form.tags.raw_data: + package.tags.append(Tag.query.get(tag)) + + db.session.commit() # save + + next_url = package.getDetailsURL() + if wasNew and package.repo is not None: + task = importRepoScreenshot.delay(package.id) + next_url = url_for("tasks.check", id=task.id, r=next_url) + + if wasNew and ("WTFPL" in package.license.name or "WTFPL" in package.media_license.name): + next_url = url_for("flatpage", path="help/wtfpl", r=next_url) + + return redirect(next_url) + + package_query = Package.query.filter_by(approved=True, soft_deleted=False) + if package is not None: + package_query = package_query.filter(Package.id != package.id) + + enableWizard = name is None and request.method != "POST" + return render_template("packages/create_edit.html", package=package, \ + form=form, author=author, enable_wizard=enableWizard, \ + packages=package_query.all(), \ + mpackages=MetaPackage.query.order_by(db.asc(MetaPackage.name)).all()) + +@bp.route("/packages///approve/", 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.", "error") + + elif package.approved: + flash("Package has already been approved", "error") + + else: + package.approved = True + + screenshots = PackageScreenshot.query.filter_by(package=package, approved=False).all() + for s in screenshots: + s.approved = True + + triggerNotif(package.author, current_user, + "{} approved".format(package.title), package.getDetailsURL()) + db.session.commit() + + return redirect(package.getDetailsURL()) + + +@bp.route("/packages///remove/", methods=["GET", "POST"]) +@login_required +@is_package_page +def remove(package): + if request.method == "GET": + return render_template("packages/remove.html", package=package) + + if "delete" in request.form: + if not package.checkPerm(current_user, Permission.DELETE_PACKAGE): + flash("You don't have permission to do that.", "error") + return redirect(package.getDetailsURL()) + + package.soft_deleted = True + + url = url_for("users.profile", username=package.author.username) + triggerNotif(package.author, current_user, + "{} deleted".format(package.title), url) + db.session.commit() + + flash("Deleted package", "success") + + return redirect(url) + elif "unapprove" in request.form: + if not package.checkPerm(current_user, Permission.UNAPPROVE_PACKAGE): + flash("You don't have permission to do that.", "error") + return redirect(package.getDetailsURL()) + + package.approved = False + + triggerNotif(package.author, current_user, + "{} deleted".format(package.title), package.getDetailsURL()) + db.session.commit() + + flash("Unapproved package", "success") + + return redirect(package.getDetailsURL()) + else: + abort(400) diff --git a/app/blueprints/packages/releases.py b/app/blueprints/packages/releases.py new file mode 100644 index 0000000..89a9a00 --- /dev/null +++ b/app/blueprints/packages/releases.py @@ -0,0 +1,219 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * + +from . import bp + +from app.models import * +from app.tasks.importtasks import makeVCSRelease +from app.utils import * + +from celery import uuid +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from wtforms.ext.sqlalchemy.fields import QuerySelectField + + +def get_mt_releases(is_max): + query = MinetestRelease.query.order_by(db.asc(MinetestRelease.id)) + if is_max: + query = query.limit(query.count() - 1) + else: + query = query.filter(MinetestRelease.name != "0.4.17") + + return query + + +class CreatePackageReleaseForm(FlaskForm): + title = StringField("Title", [InputRequired(), Length(1, 30)]) + uploadOpt = RadioField ("Method", choices=[("upload", "File Upload")], default="upload") + vcsLabel = StringField("VCS Commit Hash, Branch, or Tag", default="master") + fileUpload = FileField("File Upload") + min_rel = QuerySelectField("Minimum Minetest Version", [InputRequired()], + query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) + max_rel = QuerySelectField("Maximum Minetest Version", [InputRequired()], + query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) + submit = SubmitField("Save") + +class EditPackageReleaseForm(FlaskForm): + title = StringField("Title", [InputRequired(), Length(1, 30)]) + url = StringField("URL", [URL]) + task_id = StringField("Task ID", filters = [lambda x: x or None]) + approved = BooleanField("Is Approved") + min_rel = QuerySelectField("Minimum Minetest Version", [InputRequired()], + query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) + max_rel = QuerySelectField("Maximum Minetest Version", [InputRequired()], + query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) + submit = SubmitField("Save") + +@bp.route("/packages///releases/new/", methods=["GET", "POST"]) +@login_required +@is_package_page +def create_release(package): + if not package.checkPerm(current_user, Permission.MAKE_RELEASE): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = CreatePackageReleaseForm() + if package.repo is not None: + form["uploadOpt"].choices = [("vcs", "From Git Commit or Branch"), ("upload", "File Upload")] + if request.method != "POST": + form["uploadOpt"].data = "vcs" + + if request.method == "POST" and form.validate(): + if form["uploadOpt"].data == "vcs": + rel = PackageRelease() + rel.package = package + rel.title = form["title"].data + rel.url = "" + rel.task_id = uuid() + rel.min_rel = form["min_rel"].data.getActual() + rel.max_rel = form["max_rel"].data.getActual() + db.session.add(rel) + db.session.commit() + + makeVCSRelease.apply_async((rel.id, form["vcsLabel"].data), task_id=rel.task_id) + + msg = "{}: Release {} created".format(package.title, rel.title) + triggerNotif(package.author, current_user, msg, rel.getEditURL()) + db.session.commit() + + return redirect(url_for("tasks.check", id=rel.task_id, r=rel.getEditURL())) + else: + uploadedPath = doFileUpload(form.fileUpload.data, "zip", "a zip file") + if uploadedPath is not None: + rel = PackageRelease() + rel.package = package + rel.title = form["title"].data + rel.url = uploadedPath + rel.min_rel = form["min_rel"].data.getActual() + rel.max_rel = form["max_rel"].data.getActual() + rel.approve(current_user) + db.session.add(rel) + db.session.commit() + + msg = "{}: Release {} created".format(package.title, rel.title) + triggerNotif(package.author, current_user, msg, rel.getEditURL()) + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/release_new.html", package=package, form=form) + +@bp.route("/packages///releases//download/") +@is_package_page +def download_release(package, id): + release = PackageRelease.query.get(id) + if release is None or release.package != package: + abort(404) + + if release is None: + if "application/zip" in request.accept_mimetypes and \ + not "text/html" in request.accept_mimetypes: + return "", 204 + else: + flash("No download available.", "error") + return redirect(package.getDetailsURL()) + else: + PackageRelease.query.filter_by(id=release.id).update({ + "downloads": PackageRelease.downloads + 1 + }) + db.session.commit() + + return redirect(release.url, code=300) + +@bp.route("/packages///releases//", methods=["GET", "POST"]) +@login_required +@is_package_page +def edit_release(package, id): + release = PackageRelease.query.get(id) + if release is None or release.package != package: + abort(404) + + clearNotifications(release.getEditURL()) + + canEdit = package.checkPerm(current_user, Permission.MAKE_RELEASE) + canApprove = package.checkPerm(current_user, Permission.APPROVE_RELEASE) + if not (canEdit or canApprove): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = EditPackageReleaseForm(formdata=request.form, obj=release) + if request.method == "POST" and form.validate(): + wasApproved = release.approved + if canEdit: + release.title = form["title"].data + release.min_rel = form["min_rel"].data.getActual() + release.max_rel = form["max_rel"].data.getActual() + + if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL): + release.url = form["url"].data + release.task_id = form["task_id"].data + if release.task_id is not None: + release.task_id = None + + if canApprove: + release.approved = form["approved"].data + else: + release.approved = wasApproved + + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/release_edit.html", package=package, release=release, form=form) + + + +class BulkReleaseForm(FlaskForm): + set_min = BooleanField("Set Min") + min_rel = QuerySelectField("Minimum Minetest Version", [InputRequired()], + query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) + set_max = BooleanField("Set Max") + max_rel = QuerySelectField("Maximum Minetest Version", [InputRequired()], + query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) + only_change_none = BooleanField("Only change values previously set as none") + submit = SubmitField("Update") + + +@bp.route("/packages///releases/bulk_change/", methods=["GET", "POST"]) +@login_required +@is_package_page +def bulk_change_release(package): + if not package.checkPerm(current_user, Permission.MAKE_RELEASE): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = BulkReleaseForm() + + if request.method == "GET": + form.only_change_none.data = True + elif request.method == "POST" and form.validate(): + only_change_none = form.only_change_none.data + + for release in package.releases.all(): + if form["set_min"].data and (not only_change_none or release.min_rel is None): + release.min_rel = form["min_rel"].data.getActual() + if form["set_max"].data and (not only_change_none or release.max_rel is None): + release.max_rel = form["max_rel"].data.getActual() + + db.session.commit() + + return redirect(package.getDetailsURL()) + + return render_template("packages/release_bulk_change.html", package=package, form=form) diff --git a/app/blueprints/packages/screenshots.py b/app/blueprints/packages/screenshots.py new file mode 100644 index 0000000..c7fc7eb --- /dev/null +++ b/app/blueprints/packages/screenshots.py @@ -0,0 +1,106 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * + +from . import bp + +from app.models import * +from app.utils import * + +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * + + +class CreateScreenshotForm(FlaskForm): + title = StringField("Title/Caption", [Optional()]) + fileUpload = FileField("File Upload", [InputRequired()]) + submit = SubmitField("Save") + + +class EditScreenshotForm(FlaskForm): + title = StringField("Title/Caption", [Optional()]) + approved = BooleanField("Is Approved") + delete = BooleanField("Delete") + submit = SubmitField("Save") + +@bp.route("/packages///screenshots/new/", methods=["GET", "POST"]) +@login_required +@is_package_page +def create_screenshot(package, id=None): + if not package.checkPerm(current_user, Permission.ADD_SCREENSHOTS): + return redirect(package.getDetailsURL()) + + # Initial form class from post data and default data + form = CreateScreenshotForm() + if request.method == "POST" and form.validate(): + uploadedPath = doFileUpload(form.fileUpload.data, "image", + "a PNG or JPG image file") + if uploadedPath is not None: + ss = PackageScreenshot() + ss.package = package + ss.title = form["title"].data or "Untitled" + ss.url = uploadedPath + ss.approved = package.checkPerm(current_user, Permission.APPROVE_SCREENSHOT) + db.session.add(ss) + + msg = "{}: Screenshot added {}" \ + .format(package.title, ss.title) + triggerNotif(package.author, current_user, msg, package.getDetailsURL()) + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/screenshot_new.html", package=package, form=form) + +@bp.route("/packages///screenshots//edit/", methods=["GET", "POST"]) +@login_required +@is_package_page +def edit_screenshot(package, id): + screenshot = PackageScreenshot.query.get(id) + if screenshot is None or screenshot.package != package: + abort(404) + + canEdit = package.checkPerm(current_user, Permission.ADD_SCREENSHOTS) + canApprove = package.checkPerm(current_user, Permission.APPROVE_SCREENSHOT) + if not (canEdit or canApprove): + return redirect(package.getDetailsURL()) + + clearNotifications(screenshot.getEditURL()) + + # Initial form class from post data and default data + form = EditScreenshotForm(formdata=request.form, obj=screenshot) + if request.method == "POST" and form.validate(): + if canEdit and form["delete"].data: + PackageScreenshot.query.filter_by(id=id).delete() + + else: + wasApproved = screenshot.approved + + if canEdit: + screenshot.title = form["title"].data or "Untitled" + + if canApprove: + screenshot.approved = form["approved"].data + else: + screenshot.approved = wasApproved + + db.session.commit() + return redirect(package.getDetailsURL()) + + return render_template("packages/screenshot_edit.html", package=package, screenshot=screenshot, form=form) diff --git a/app/blueprints/tasks/__init__.py b/app/blueprints/tasks/__init__.py new file mode 100644 index 0000000..8d002db --- /dev/null +++ b/app/blueprints/tasks/__init__.py @@ -0,0 +1,75 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +import flask_menu as menu +from app import csrf +from app.models import * +from app.tasks import celery, TaskError +from app.tasks.importtasks import getMeta +from app.utils import shouldReturnJson +from app.utils import * + +bp = Blueprint("tasks", __name__) + +@csrf.exempt +@bp.route("/tasks/getmeta/new/", methods=["POST"]) +@login_required +def start_getmeta(): + author = request.args.get("author") + author = current_user.forums_username if author is None else author + aresult = getMeta.delay(request.args.get("url"), author) + return jsonify({ + "poll_url": url_for("tasks.check", id=aresult.id), + }) + +@bp.route("/tasks//") +def check(id): + result = celery.AsyncResult(id) + status = result.status + traceback = result.traceback + result = result.result + + info = None + if isinstance(result, Exception): + info = { + 'id': id, + 'status': status, + } + + if current_user.is_authenticated and current_user.rank.atLeast(UserRank.ADMIN): + info["error"] = str(traceback) + elif str(result)[1:12] == "TaskError: ": + info["error"] = str(result)[12:-1] + else: + info["error"] = "Unknown server error" + else: + info = { + 'id': id, + 'status': status, + 'result': result, + } + + if shouldReturnJson(): + return jsonify(info) + else: + r = request.args.get("r") + if r is not None and status == "SUCCESS": + return redirect(r) + else: + return render_template("tasks/view.html", info=info) diff --git a/app/blueprints/threads/__init__.py b/app/blueprints/threads/__init__.py new file mode 100644 index 0000000..0eee201 --- /dev/null +++ b/app/blueprints/threads/__init__.py @@ -0,0 +1,214 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * + +bp = Blueprint("threads", __name__) + +from flask_user import * +from app.models import * +from app.utils import triggerNotif, clearNotifications + +import datetime + +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * + +@bp.route("/threads/") +def list_all(): + query = Thread.query + if not Permission.SEE_THREAD.check(current_user): + query = query.filter_by(private=False) + return render_template("threads/list.html", threads=query.all()) + + +@bp.route("/threads//subscribe/", methods=["POST"]) +@login_required +def subscribe(id): + thread = Thread.query.get(id) + if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD): + abort(404) + + if current_user in thread.watchers: + flash("Already subscribed!", "success") + else: + flash("Subscribed to thread", "success") + thread.watchers.append(current_user) + db.session.commit() + + return redirect(url_for("threads.view", id=id)) + + +@bp.route("/threads//unsubscribe/", methods=["POST"]) +@login_required +def unsubscribe(id): + thread = Thread.query.get(id) + if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD): + abort(404) + + if current_user in thread.watchers: + flash("Unsubscribed!", "success") + thread.watchers.remove(current_user) + db.session.commit() + else: + flash("Not subscribed to thread", "success") + + return redirect(url_for("threads.view", id=id)) + + +@bp.route("/threads//", methods=["GET", "POST"]) +def view(id): + clearNotifications(url_for("threads.view", id=id)) + + thread = Thread.query.get(id) + if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD): + abort(404) + + if current_user.is_authenticated and request.method == "POST": + comment = request.form["comment"] + + if not current_user.canCommentRL(): + flash("Please wait before commenting again", "danger") + if package: + return redirect(package.getDetailsURL()) + else: + return redirect(url_for("home_page")) + + if len(comment) <= 500 and len(comment) > 3: + reply = ThreadReply() + reply.author = current_user + reply.comment = comment + db.session.add(reply) + + thread.replies.append(reply) + if not current_user in thread.watchers: + thread.watchers.append(current_user) + + msg = None + if thread.package is None: + msg = "New comment on '{}'".format(thread.title) + else: + msg = "New comment on '{}' on package {}".format(thread.title, thread.package.title) + + + for user in thread.watchers: + if user != current_user: + triggerNotif(user, current_user, msg, url_for("threads.view", id=thread.id)) + + db.session.commit() + + return redirect(url_for("threads.view", id=id)) + + else: + flash("Comment needs to be between 3 and 500 characters.") + + return render_template("threads/view.html", thread=thread) + + +class ThreadForm(FlaskForm): + title = StringField("Title", [InputRequired(), Length(3,100)]) + comment = TextAreaField("Comment", [InputRequired(), Length(10, 500)]) + private = BooleanField("Private") + submit = SubmitField("Open Thread") + +@bp.route("/threads/new/", methods=["GET", "POST"]) +@login_required +def new(): + form = ThreadForm(formdata=request.form) + + package = None + if "pid" in request.args: + package = Package.query.get(int(request.args.get("pid"))) + if package is None: + flash("Unable to find that package!", "error") + + # Don't allow making orphan threads on approved packages for now + if package is None: + abort(403) + + def_is_private = request.args.get("private") or False + if package is None: + def_is_private = True + allow_change = package and package.approved + is_review_thread = package and not package.approved + + # Check that user can make the thread + if not package.checkPerm(current_user, Permission.CREATE_THREAD): + flash("Unable to create thread!", "error") + return redirect(url_for("home_page")) + + # Only allow creating one thread when not approved + elif is_review_thread and package.review_thread is not None: + flash("A review thread already exists!", "error") + return redirect(url_for("threads.view", id=package.review_thread.id)) + + elif not current_user.canOpenThreadRL(): + flash("Please wait before opening another thread", "danger") + + if package: + return redirect(package.getDetailsURL()) + else: + return redirect(url_for("home_page")) + + # Set default values + elif request.method == "GET": + form.private.data = def_is_private + form.title.data = request.args.get("title") or "" + + # Validate and submit + elif request.method == "POST" and form.validate(): + thread = Thread() + thread.author = current_user + thread.title = form.title.data + thread.private = form.private.data if allow_change else def_is_private + thread.package = package + db.session.add(thread) + + thread.watchers.append(current_user) + if package is not None and package.author != current_user: + thread.watchers.append(package.author) + + reply = ThreadReply() + reply.thread = thread + reply.author = current_user + reply.comment = form.comment.data + db.session.add(reply) + + thread.replies.append(reply) + + db.session.commit() + + if is_review_thread: + package.review_thread = thread + + notif_msg = None + if package is not None: + notif_msg = "New thread '{}' on package {}".format(thread.title, package.title) + triggerNotif(package.author, current_user, notif_msg, url_for("threads.view", id=thread.id)) + else: + notif_msg = "New thread '{}'".format(thread.title) + + for user in User.query.filter(User.rank >= UserRank.EDITOR).all(): + triggerNotif(user, current_user, notif_msg, url_for("threads.view", id=thread.id)) + + db.session.commit() + + return redirect(url_for("threads.view", id=thread.id)) + + + return render_template("threads/new.html", form=form, allow_private_change=allow_change, package=package) diff --git a/app/blueprints/thumbnails/__init__.py b/app/blueprints/thumbnails/__init__.py new file mode 100644 index 0000000..1f46102 --- /dev/null +++ b/app/blueprints/thumbnails/__init__.py @@ -0,0 +1,74 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * + +bp = Blueprint("thumbnails", __name__) + +import os +from PIL import Image + +ALLOWED_RESOLUTIONS=[(100,67), (270,180), (350,233)] + +def mkdir(path): + if not os.path.isdir(path): + os.mkdir(path) + +mkdir("app/public/thumbnails/") + +def resize_and_crop(img_path, modified_path, size): + img = Image.open(img_path) + + # Get current and desired ratio for the images + img_ratio = img.size[0] / float(img.size[1]) + ratio = size[0] / float(size[1]) + + # Is more portrait than target, scale and crop + if ratio > img_ratio: + img = img.resize((int(size[0]), int(size[0] * img.size[1] / img.size[0])), + Image.BICUBIC) + box = (0, (img.size[1] - size[1]) / 2, img.size[0], (img.size[1] + size[1]) / 2) + img = img.crop(box) + + # Is more landscape than target, scale and crop + elif ratio < img_ratio: + img = img.resize((int(size[1] * img.size[0] / img.size[1]), int(size[1])), + Image.BICUBIC) + box = ((img.size[0] - size[0]) / 2, 0, (img.size[0] + size[0]) / 2, img.size[1]) + img = img.crop(box) + + # Is exactly the same ratio as target + else: + img = img.resize(size, Image.BICUBIC) + + img.save(modified_path) + + +@bp.route("/thumbnails//") +def make_thumbnail(img, level): + if level > len(ALLOWED_RESOLUTIONS) or level <= 0: + abort(403) + + w, h = ALLOWED_RESOLUTIONS[level - 1] + + mkdir("app/public/thumbnails/{:d}/".format(level)) + + cache_filepath = "public/thumbnails/{:d}/{}".format(level, img) + source_filepath = "public/uploads/" + img + + resize_and_crop("app/" + source_filepath, "app/" + cache_filepath, (w, h)) + return send_file(cache_filepath) diff --git a/app/blueprints/todo/__init__.py b/app/blueprints/todo/__init__.py new file mode 100644 index 0000000..f4f818a --- /dev/null +++ b/app/blueprints/todo/__init__.py @@ -0,0 +1,101 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +from flask import * +from flask_user import * +import flask_menu as menu +from app.models import * +from app.querybuilder import QueryBuilder + +bp = Blueprint("todo", __name__) + +@bp.route("/todo/", methods=["GET", "POST"]) +@login_required +def view(): + canApproveNew = Permission.APPROVE_NEW.check(current_user) + canApproveRel = Permission.APPROVE_RELEASE.check(current_user) + canApproveScn = Permission.APPROVE_SCREENSHOT.check(current_user) + + packages = None + if canApproveNew: + packages = Package.query.filter_by(approved=False, soft_deleted=False).order_by(db.desc(Package.created_at)).all() + + releases = None + if canApproveRel: + releases = PackageRelease.query.filter_by(approved=False).all() + + screenshots = None + if canApproveScn: + screenshots = PackageScreenshot.query.filter_by(approved=False).all() + + if not canApproveNew and not canApproveRel and not canApproveScn: + abort(403) + + if request.method == "POST": + if request.form["action"] == "screenshots_approve_all": + if not canApproveScn: + abort(403) + + PackageScreenshot.query.update({ "approved": True }) + db.session.commit() + return redirect(url_for("todo.view")) + else: + abort(400) + + topic_query = ForumTopic.query \ + .filter_by(discarded=False) + + total_topics = topic_query.count() + topics_to_add = topic_query \ + .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ + .count() + + return render_template("todo/list.html", title="Reports and Work Queue", + packages=packages, releases=releases, screenshots=screenshots, + canApproveNew=canApproveNew, canApproveRel=canApproveRel, canApproveScn=canApproveScn, + topics_to_add=topics_to_add, total_topics=total_topics) + + +@bp.route("/todo/topics/") +@login_required +def topics(): + qb = QueryBuilder(request.args) + qb.setSortIfNone("date") + query = qb.buildTopicQuery() + + tmp_q = ForumTopic.query + if not qb.show_discarded: + tmp_q = tmp_q.filter_by(discarded=False) + total = tmp_q.count() + topic_count = query.count() + + page = int(request.args.get("page") or 1) + num = int(request.args.get("n") or 100) + if num > 100 and not current_user.rank.atLeast(UserRank.EDITOR): + num = 100 + + query = query.paginate(page, num, True) + next_url = url_for("todo.topics", page=query.next_num, query=qb.search, \ + show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \ + if query.has_next else None + prev_url = url_for("todo.topics", page=query.prev_num, query=qb.search, \ + show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \ + if query.has_prev else None + + return render_template("todo/topics.html", topics=query.items, total=total, \ + topic_count=topic_count, query=qb.search, show_discarded=qb.show_discarded, \ + next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, \ + n=num, sort_by=qb.order_by) diff --git a/app/blueprints/users/__init__.py b/app/blueprints/users/__init__.py new file mode 100644 index 0000000..98cf34a --- /dev/null +++ b/app/blueprints/users/__init__.py @@ -0,0 +1,5 @@ +from flask import Blueprint + +bp = Blueprint("users", __name__) + +from . import githublogin, profile diff --git a/app/blueprints/users/githublogin.py b/app/blueprints/users/githublogin.py new file mode 100644 index 0000000..458c637 --- /dev/null +++ b/app/blueprints/users/githublogin.py @@ -0,0 +1,74 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +from flask_login import login_user, logout_user +from sqlalchemy import func +import flask_menu as menu +from flask_github import GitHub +from . import bp +from app import github +from app.models import * +from app.utils import loginUser + +@bp.route("/user/github/start/") +def github_signin(): + return github.authorize("") + +@bp.route("/user/github/callback/") +@github.authorized_handler +def github_authorized(oauth_token): + next_url = request.args.get("next") + if oauth_token is None: + flash("Authorization failed [err=gh-oauth-login-failed]", "danger") + return redirect(url_for("user.login")) + + import requests + + # Get Github username + url = "https://api.github.com/user" + r = requests.get(url, headers={"Authorization": "token " + oauth_token}) + username = r.json()["login"] + + # Get user by github username + userByGithub = User.query.filter(func.lower(User.github_username) == func.lower(username)).first() + + # If logged in, connect + if current_user and current_user.is_authenticated: + if userByGithub is None: + current_user.github_username = username + db.session.commit() + flash("Linked github to account", "success") + return redirect(url_for("home_page")) + else: + flash("Github account is already associated with another user", "danger") + return redirect(url_for("home_page")) + + # If not logged in, log in + else: + if userByGithub is None: + flash("Unable to find an account for that Github user", "error") + return redirect(url_for("users.claim")) + elif loginUser(userByGithub): + if current_user.password is None: + return redirect(next_url or url_for("users.set_password", optional=True)) + else: + return redirect(next_url or url_for("home_page")) + else: + flash("Authorization failed [err=gh-login-failed]", "danger") + return redirect(url_for("user.login")) diff --git a/app/blueprints/users/profile.py b/app/blueprints/users/profile.py new file mode 100644 index 0000000..fd8d7d9 --- /dev/null +++ b/app/blueprints/users/profile.py @@ -0,0 +1,309 @@ +# Content DB +# Copyright (C) 2018 rubenwardy +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + + +from flask import * +from flask_user import * +from flask_login import login_user, logout_user +from app import markdown +from . import bp +from app.models import * +from flask_wtf import FlaskForm +from wtforms import * +from wtforms.validators import * +from app.utils import randomString, loginUser, rank_required +from app.tasks.forumtasks import checkForumAccount +from app.tasks.emails import sendVerifyEmail, sendEmailRaw +from app.tasks.phpbbparser import getProfile + +# Define the User profile form +class UserProfileForm(FlaskForm): + display_name = StringField("Display name", [Optional(), Length(2, 20)]) + email = StringField("Email", [Optional(), Email()], filters = [lambda x: x or None]) + website_url = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None]) + donate_url = StringField("Donation URL", [Optional(), URL()], filters = [lambda x: x or None]) + rank = SelectField("Rank", [Optional()], choices=UserRank.choices(), coerce=UserRank.coerce, default=UserRank.NEW_MEMBER) + submit = SubmitField("Save") + + +@bp.route("/users/", methods=["GET"]) +def list_all(): + users = User.query.order_by(db.desc(User.rank), db.asc(User.display_name)).all() + return render_template("users/list.html", users=users) + + +@bp.route("/users//", methods=["GET", "POST"]) +def profile(username): + user = User.query.filter_by(username=username).first() + if not user: + abort(404) + + form = None + if user.checkPerm(current_user, Permission.CHANGE_DNAME) or \ + user.checkPerm(current_user, Permission.CHANGE_EMAIL) or \ + user.checkPerm(current_user, Permission.CHANGE_RANK): + # Initialize form + form = UserProfileForm(formdata=request.form, obj=user) + + # Process valid POST + if request.method=="POST" and form.validate(): + # Copy form fields to user_profile fields + if user.checkPerm(current_user, Permission.CHANGE_DNAME): + user.display_name = form["display_name"].data + user.website_url = form["website_url"].data + user.donate_url = form["donate_url"].data + + if user.checkPerm(current_user, Permission.CHANGE_RANK): + newRank = form["rank"].data + if current_user.rank.atLeast(newRank): + user.rank = form["rank"].data + else: + flash("Can't promote a user to a rank higher than yourself!", "error") + + if user.checkPerm(current_user, Permission.CHANGE_EMAIL): + newEmail = form["email"].data + if newEmail != user.email and newEmail.strip() != "": + token = randomString(32) + + ver = UserEmailVerification() + ver.user = user + ver.token = token + ver.email = newEmail + db.session.add(ver) + db.session.commit() + + task = sendVerifyEmail.delay(newEmail, token) + return redirect(url_for("tasks.check", id=task.id, r=url_for("users.profile", username=username))) + + # Save user_profile + db.session.commit() + + # Redirect to home page + return redirect(url_for("users.profile", username=username)) + + packages = user.packages.filter_by(soft_deleted=False) + if not current_user.is_authenticated or (user != current_user and not current_user.canAccessTodoList()): + packages = packages.filter_by(approved=True) + packages = packages.order_by(db.asc(Package.title)) + + topics_to_add = None + if current_user == user or user.checkPerm(current_user, Permission.CHANGE_AUTHOR): + topics_to_add = ForumTopic.query \ + .filter_by(author_id=user.id) \ + .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ + .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ + .all() + + # Process GET or invalid POST + return render_template("users/users.profile.html", + user=user, form=form, packages=packages, topics_to_add=topics_to_add) + + +@bp.route("/users//check/", methods=["POST"]) +@login_required +def user_check(username): + user = User.query.filter_by(username=username).first() + if user is None: + abort(404) + + if current_user != user and not current_user.rank.atLeast(UserRank.MODERATOR): + abort(403) + + if user.forums_username is None: + abort(404) + + task = checkForumAccount.delay(user.forums_username) + next_url = url_for("users.profile", username=username) + + return redirect(url_for("tasks.check", id=task.id, r=next_url)) + + +class SendEmailForm(FlaskForm): + subject = StringField("Subject", [InputRequired(), Length(1, 300)]) + text = TextAreaField("Message", [InputRequired()]) + submit = SubmitField("Send") + + +@bp.route("/users//email/", methods=["GET", "POST"]) +@rank_required(UserRank.MODERATOR) +def send_email(username): + user = User.query.filter_by(username=username).first() + if user is None: + abort(404) + + next_url = url_for("users.profile", username=user.username) + + if user.email is None: + flash("User has no email address!", "error") + return redirect(next_url) + + form = SendEmailForm(request.form) + if form.validate_on_submit(): + text = form.text.data + html = markdown(text) + task = sendEmailRaw.delay([user.email], form.subject.data, text, html) + return redirect(url_for("tasks.check", id=task.id, r=next_url)) + + return render_template("users/send_email.html", form=form) + + + +class SetPasswordForm(FlaskForm): + email = StringField("Email", [Optional(), Email()]) + password = PasswordField("New password", [InputRequired(), Length(2, 100)]) + password2 = PasswordField("Verify password", [InputRequired(), Length(2, 100)]) + submit = SubmitField("Save") + +@bp.route("/user/set-password/", methods=["GET", "POST"]) +@login_required +def set_password(): + if current_user.password is not None: + return redirect(url_for("user.change_password")) + + form = SetPasswordForm(request.form) + if current_user.email == None: + form.email.validators = [InputRequired(), Email()] + + if request.method == "POST" and form.validate(): + one = form.password.data + two = form.password2.data + if one == two: + # Hash password + hashed_password = user_manager.hash_password(form.password.data) + + # Change password + user_manager.update_password(current_user, hashed_password) + + # Send 'password_changed' email + if user_manager.enable_email and user_manager.send_password_changed_email and current_user.email: + emails.send_password_changed_email(current_user) + + # Send password_changed signal + signals.user_changed_password.send(current_app._get_current_object(), user=current_user) + + # Prepare one-time system message + flash('Your password has been changed successfully.', 'success') + + newEmail = form["email"].data + if newEmail != current_user.email and newEmail.strip() != "": + token = randomString(32) + + ver = UserEmailVerification() + ver.user = current_user + ver.token = token + ver.email = newEmail + db.session.add(ver) + db.session.commit() + + task = sendVerifyEmail.delay(newEmail, token) + return redirect(url_for("tasks.check", id=task.id, r=url_for("users.profile", username=current_user.username))) + else: + return redirect(url_for("users.profile", username=current_user.username)) + else: + flash("Passwords do not match", "error") + + return render_template("users/set_password.html", form=form, optional=request.args.get("optional")) + + +@bp.route("/user/claim/", methods=["GET", "POST"]) +def claim(): + username = request.args.get("username") + if username is None: + username = "" + else: + method = request.args.get("method") + user = User.query.filter_by(forums_username=username).first() + if user and user.rank.atLeast(UserRank.NEW_MEMBER): + flash("User has already been claimed", "error") + return redirect(url_for("users.claim")) + elif user is None and method == "github": + flash("Unable to get Github username for user", "error") + return redirect(url_for("users.claim")) + elif user is None: + flash("Unable to find that user", "error") + return redirect(url_for("users.claim")) + + if user is not None and method == "github": + return redirect(url_for("users.github_signin")) + + token = None + if "forum_token" in session: + token = session["forum_token"] + else: + token = randomString(32) + session["forum_token"] = token + + if request.method == "POST": + ctype = request.form.get("claim_type") + username = request.form.get("username") + + if username is None or len(username.strip()) < 2: + flash("Invalid username", "error") + elif ctype == "github": + task = checkForumAccount.delay(username) + return redirect(url_for("tasks.check", id=task.id, r=url_for("users.claim", username=username, method="github"))) + elif ctype == "forum": + user = User.query.filter_by(forums_username=username).first() + if user is not None and user.rank.atLeast(UserRank.NEW_MEMBER): + flash("That user has already been claimed!", "error") + return redirect(url_for("users.claim")) + + # Get signature + sig = None + try: + profile = getProfile("https://forum.minetest.net", username) + sig = profile.signature + except IOError: + flash("Unable to get forum signature - does the user exist?", "error") + return redirect(url_for("users.claim", username=username)) + + # Look for key + if token in sig: + if user is None: + user = User(username) + user.forums_username = username + db.session.add(user) + db.session.commit() + + if loginUser(user): + return redirect(url_for("users.set_password")) + else: + flash("Unable to login as user", "error") + return redirect(url_for("users.claim", username=username)) + + else: + flash("Could not find the key in your signature!", "error") + return redirect(url_for("users.claim", username=username)) + else: + flash("Unknown claim type", "error") + + return render_template("users/claim.html", username=username, key=token) + +@bp.route("/users/verify/") +def verify_email(): + token = request.args.get("token") + ver = UserEmailVerification.query.filter_by(token=token).first() + if ver is None: + flash("Unknown verification token!", "error") + else: + ver.user.email = ver.email + db.session.delete(ver) + db.session.commit() + + if current_user.is_authenticated: + return redirect(url_for("users.profile", username=current_user.username)) + else: + return redirect(url_for("home_page")) diff --git a/app/models.py b/app/models.py index 9148f05..3632ebc 100644 --- a/app/models.py +++ b/app/models.py @@ -501,27 +501,27 @@ class Package(db.Model): return screenshot.url if screenshot is not None else None def getDetailsURL(self): - return url_for("package_page", + return url_for("packages.view", author=self.author.username, name=self.name) def getEditURL(self): - return url_for("create_edit_package_page", + return url_for("packages.create_edit", author=self.author.username, name=self.name) def getApproveURL(self): - return url_for("approve_package_page", + return url_for("packages.approve", author=self.author.username, name=self.name) def getRemoveURL(self): - return url_for("remove_package_page", + return url_for("packages.remove", author=self.author.username, name=self.name) def getNewScreenshotURL(self): - return url_for("create_screenshot_page", + return url_for("packages.create_screenshot", author=self.author.username, name=self.name) def getCreateReleaseURL(self): - return url_for("create_release_page", + return url_for("packages.create_release", author=self.author.username, name=self.name) def getCreateEditRequestURL(self): @@ -529,11 +529,11 @@ class Package(db.Model): author=self.author.username, name=self.name) def getBulkReleaseURL(self): - return url_for("bulk_change_release_page", + return url_for("packages.bulk_change_release", author=self.author.username, name=self.name) def getDownloadURL(self): - return url_for("package_download_page", + return url_for("packages.download", author=self.author.username, name=self.name) def getDownloadRelease(self, version=None, protonum=None): @@ -716,13 +716,13 @@ class PackageRelease(db.Model): def getEditURL(self): - return url_for("edit_release_page", + return url_for("packages.edit_release", author=self.package.author.username, name=self.package.name, id=self.id) def getDownloadURL(self): - return url_for("download_release_page", + return url_for("packages.download_release", author=self.package.author.username, name=self.package.name, id=self.id) @@ -758,7 +758,7 @@ class PackageScreenshot(db.Model): def getEditURL(self): - return url_for("edit_screenshot_page", + return url_for("packages.edit_screenshot", author=self.package.author.username, name=self.package.name, id=self.id) @@ -880,11 +880,11 @@ class Thread(db.Model): def getSubscribeURL(self): - return url_for("thread_subscribe_page", + return url_for("threads.subscribe", id=self.id) def getUnsubscribeURL(self): - return url_for("thread_unsubscribe_page", + return url_for("threads.unsubscribe", id=self.id) def checkPerm(self, user, perm): diff --git a/app/sass.py b/app/sass.py new file mode 100644 index 0000000..f4a272f --- /dev/null +++ b/app/sass.py @@ -0,0 +1,63 @@ +# -*- coding: utf-8 -*- +""" +A small Flask extension that makes it easy to use Sass (SCSS) with your +Flask application. + +Code unabashedly adapted from https://github.com/weapp/flask-coffee2js + +:copyright: (c) 2012 by Ivan Miric. +:license: MIT, see LICENSE for more details. +""" + +import os +import os.path +import codecs +from flask import * +from scss import Scss + +def _convert(dir, src, dst): + original_wd = os.getcwd() + os.chdir(dir) + + css = Scss() + source = codecs.open(src, 'r', encoding='utf-8').read() + output = css.compile(source) + + os.chdir(original_wd) + + outfile = codecs.open(dst, 'w', encoding='utf-8') + outfile.write(output) + outfile.close() + +def _getDirPath(app, originalPath, create=False): + path = originalPath + + if not os.path.isdir(path): + path = os.path.join(app.root_path, path) + + if not os.path.isdir(path): + if create: + os.mkdir(path) + else: + raise IOError("Unable to find " + originalPath) + + return path + +def sass(app, inputDir='scss', outputPath='static', force=False, cacheDir="public/static"): + static_url_path = app.static_url_path + inputDir = _getDirPath(app, inputDir) + cacheDir = _getDirPath(app, cacheDir or outputPath, True) + + def _sass(filepath): + sassfile = "%s/%s.scss" % (inputDir, filepath) + cacheFile = "%s/%s.css" % (cacheDir, filepath) + + # Source file exists, and needs regenerating + if os.path.isfile(sassfile) and (force or not os.path.isfile(cacheFile) or \ + os.path.getmtime(sassfile) > os.path.getmtime(cacheFile)): + _convert(inputDir, sassfile, cacheFile) + app.logger.debug('Compiled %s into %s' % (sassfile, cacheFile)) + + return send_from_directory(cacheDir, filepath + ".css") + + app.add_url_rule("/%s/.css" % (outputPath), 'sass', _sass) diff --git a/app/tasks/emails.py b/app/tasks/emails.py index 5eb915e..f81deaa 100644 --- a/app/tasks/emails.py +++ b/app/tasks/emails.py @@ -34,7 +34,7 @@ def sendVerifyEmail(newEmail, token): If this was you, then please click this link to verify the address: {} - """.format(url_for('verify_email_page', token=token, _external=True)) + """.format(url_for('users.verify_email', token=token, _external=True)) msg.html = render_template("emails/verify.html", token=token) mail.send(msg) diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py index e53dbfa..ed43584 100644 --- a/app/tasks/importtasks.py +++ b/app/tasks/importtasks.py @@ -15,7 +15,7 @@ # along with this program. If not, see . -import flask, json, os, git, tempfile, shutil +import flask, json, os, git, tempfile, shutil, gitdb from git import GitCommandError from flask_sqlalchemy import SQLAlchemy from urllib.error import HTTPError diff --git a/app/template_filters.py b/app/template_filters.py new file mode 100644 index 0000000..e535ce8 --- /dev/null +++ b/app/template_filters.py @@ -0,0 +1,22 @@ +from . import app +from urllib.parse import urlparse + +@app.context_processor +def inject_debug(): + return dict(debug=app.debug) + +@app.template_filter() +def throw(err): + raise Exception(err) + +@app.template_filter() +def domain(url): + return urlparse(url).netloc + +@app.template_filter() +def date(value): + return value.strftime("%Y-%m-%d") + +@app.template_filter() +def datetime(value): + return value.strftime("%Y-%m-%d %H:%M") + " UTC" diff --git a/app/templates/admin/licenses/edit.html b/app/templates/admin/licenses/edit.html index c68b17f..eabe782 100644 --- a/app/templates/admin/licenses/edit.html +++ b/app/templates/admin/licenses/edit.html @@ -10,8 +10,8 @@ {% block content %}

- Back to list | - New License + Back to list | + New License

{% from "macros/forms.html" import render_field, render_submit_field %} diff --git a/app/templates/admin/licenses/list.html b/app/templates/admin/licenses/list.html index ff30805..869aac6 100644 --- a/app/templates/admin/licenses/list.html +++ b/app/templates/admin/licenses/list.html @@ -6,11 +6,11 @@ Licenses {% block content %}

- New License + New License

    {% for l in licenses %} -
  • {{ l.name }} [{{ l.is_foss and "Free" or "Non-free"}}]
    • +
  • {{ l.name }} [{{ l.is_foss and "Free" or "Non-free"}}]
    • {% endfor %}
{% endblock %} diff --git a/app/templates/admin/list.html b/app/templates/admin/list.html index ddfa30c..1048a88 100644 --- a/app/templates/admin/list.html +++ b/app/templates/admin/list.html @@ -6,11 +6,11 @@ {% block content %}
diff --git a/app/templates/admin/switch_user.html b/app/templates/admin/switch_user.html new file mode 100644 index 0000000..7d4a4a2 --- /dev/null +++ b/app/templates/admin/switch_user.html @@ -0,0 +1,17 @@ +{% extends "base.html" %} + +{% block title %} + Switch User +{% endblock %} + +{% block content %} +

Log in as another user

+ + {% from "macros/forms.html" import render_field, render_submit_field %} +
+ {{ form.hidden_tag() }} + + {{ render_field(form.username) }} + {{ render_submit_field(form.submit) }} +
+{% endblock %} diff --git a/app/templates/admin/switch_user_page.html b/app/templates/admin/switch_user_page.html deleted file mode 100644 index 7d4a4a2..0000000 --- a/app/templates/admin/switch_user_page.html +++ /dev/null @@ -1,17 +0,0 @@ -{% extends "base.html" %} - -{% block title %} - Switch User -{% endblock %} - -{% block content %} -

Log in as another user

- - {% from "macros/forms.html" import render_field, render_submit_field %} -
- {{ form.hidden_tag() }} - - {{ render_field(form.username) }} - {{ render_submit_field(form.submit) }} -
-{% endblock %} diff --git a/app/templates/admin/tags/edit.html b/app/templates/admin/tags/edit.html index ccffa7f..5ffe2d0 100644 --- a/app/templates/admin/tags/edit.html +++ b/app/templates/admin/tags/edit.html @@ -10,8 +10,8 @@ {% block content %}

- Back to list | - New Tag + Back to list | + New Tag

{% from "macros/forms.html" import render_field, render_submit_field %} diff --git a/app/templates/admin/tags/list.html b/app/templates/admin/tags/list.html index 355f62d..daae8e7 100644 --- a/app/templates/admin/tags/list.html +++ b/app/templates/admin/tags/list.html @@ -6,11 +6,11 @@ Tags {% block content %}

- New Tag + New Tag

    {% for t in tags %} -
  • {{ t.title }} [{{ t.packages | count }} packages]
    • +
  • {{ t.title }} [{{ t.packages | count }} packages]
    • {% endfor %}
{% endblock %} diff --git a/app/templates/admin/versions/edit.html b/app/templates/admin/versions/edit.html index ea84c11..f1042fa 100644 --- a/app/templates/admin/versions/edit.html +++ b/app/templates/admin/versions/edit.html @@ -10,8 +10,8 @@ {% block content %}

- Back to list | - New Version + Back to list | + New Version

{% from "macros/forms.html" import render_field, render_submit_field %} diff --git a/app/templates/admin/versions/list.html b/app/templates/admin/versions/list.html index 5a95efd..f3dd236 100644 --- a/app/templates/admin/versions/list.html +++ b/app/templates/admin/versions/list.html @@ -6,11 +6,11 @@ Minetest Versions {% block content %}

- New Version + New Version

{% endblock %} diff --git a/app/templates/base.html b/app/templates/base.html index e39097c..faa867a 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -60,10 +60,10 @@ @@ -134,7 +134,7 @@ {{ _("Help") }} | {{ _("Policy and Guidance") }} | {{ _("Report / DMCA") }} | - {{ _("User List") }} + {{ _("User List") }} {% if debug %}

diff --git a/app/templates/emails/verify.html b/app/templates/emails/verify.html index 38d488b..04a4bc5 100644 --- a/app/templates/emails/verify.html +++ b/app/templates/emails/verify.html @@ -16,12 +16,12 @@ If this was you, then please click this link to verify the address:

- + Confirm Email Address

- Or paste this into your browser: {{ url_for('verify_email_page', token=token, _external=True) }} + Or paste this into your browser: {{ url_for('users.verify_email', token=token, _external=True) }}

{% endblock %} diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html index 642dc70..6214c8c 100644 --- a/app/templates/flask_user/login.html +++ b/app/templates/flask_user/login.html @@ -60,7 +60,7 @@ Sign in {% from "flask_user/_macros.html" import render_field, render_checkbox_field, render_submit_field %}

{%trans%}Sign in with Github{%endtrans%}

- GitHub + GitHub
@@ -72,7 +72,7 @@ Sign in

Create an account using your forum account or email.

- {%trans%}Claim your account{%endtrans%} + {%trans%}Claim your account{%endtrans%}
diff --git a/app/templates/index.html b/app/templates/index.html index 0cb39dd..a7574d6 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -37,28 +37,28 @@ {% from "macros/packagegridtile.html" import render_pkggrid %} - + {{ _("See more") }}

{{ _("Recently Added") }}

{{ render_pkggrid(new) }} - + {{ _("See more") }}

{{ _("Top Mods") }}

{{ render_pkggrid(pop_mod) }} - + {{ _("See more") }}

{{ _("Top Games") }}

{{ render_pkggrid(pop_gam) }} - + {{ _("See more") }}

{{ _("Top Texture Packs") }}

diff --git a/app/templates/macros/threads.html b/app/templates/macros/threads.html index fd7b648..16b67a0 100644 --- a/app/templates/macros/threads.html +++ b/app/templates/macros/threads.html @@ -4,7 +4,7 @@ {% for r in thread.replies %}
  • - +
    @@ -12,11 +12,11 @@
    + href="{{ url_for('users.profile', username=r.author.username) }}"> {{ r.author.display_name }} + href="{{ url_for('threads.view', id=thread.id) }}#reply-{{ r.id }}"> {{ r.created_at | datetime }}
    @@ -43,7 +43,7 @@
    {% if current_user.canCommentRL() %} -
    +
    @@ -65,14 +65,14 @@ {% for t in threads %}
  • {% if list_group %} - + {% if t.private %}🔒 {% endif %} {{ t.title }} by {{ t.author.display_name }} {% else %} {% if t.private %}🔒 {% endif %} - {{ t.title }} + {{ t.title }} by {{ t.author.display_name }} {% endif %}
    • diff --git a/app/templates/macros/topics.html b/app/templates/macros/topics.html index a6d0a42..987f810 100644 --- a/app/templates/macros/topics.html +++ b/app/templates/macros/topics.html @@ -18,14 +18,14 @@ {% if topic.wip %}[WIP]{% endif %} {% if show_author %} - {{ topic.author.display_name}} + {{ topic.author.display_name}} {% endif %} {{ topic.name or ""}} {{ topic.created_at | date }} {% if current_user == topic.author or topic.author.checkPerm(current_user, "CHANGE_AUTHOR") %} + href="{{ url_for('packages.create_edit', author=topic.author.username, repo=topic.getRepoURL(), forums=topic.topic_id, title=topic.title, bname=topic.name) }}"> Create {% endif %} @@ -56,10 +56,10 @@ {% if topic.wip %}[WIP]{% endif %} {% if topic.name %}[{{ topic.name }}]{% endif %} {% if show_author %} - by {{ topic.author.display_name }} + by {{ topic.author.display_name }} {% endif %} {% if topic.author == current_user or topic.author.checkPerm(current_user, "CHANGE_AUTHOR") %} - | Create + | Create {% endif %}
    • {% endfor %} diff --git a/app/templates/meta/list.html b/app/templates/meta/list.html index e6daf99..525bafd 100644 --- a/app/templates/meta/list.html +++ b/app/templates/meta/list.html @@ -7,7 +7,7 @@ Meta Packages {% block content %}
      {% for meta in mpackages %} -
    • {{ meta.name }} ({{ meta.packages.filter_by(soft_deleted=False, approved=True).all() | count }} packages)
      • +
    • {{ meta.name }} ({{ meta.packages.filter_by(soft_deleted=False, approved=True).all() | count }} packages)
      • {% else %}
    • No meta packages found.
      • {% endfor %} diff --git a/app/templates/notifications/list.html b/app/templates/notifications/list.html index d6de54e..7f09e5d 100644 --- a/app/templates/notifications/list.html +++ b/app/templates/notifications/list.html @@ -6,7 +6,7 @@ Notifications {% block content %} {% if current_user.notifications %} - + diff --git a/app/templates/packages/list.html b/app/templates/packages/list.html index cc0c6c9..4aea5a0 100644 --- a/app/templates/packages/list.html +++ b/app/templates/packages/list.html @@ -15,7 +15,7 @@ {% for n in range(1, page_max+1) %}
    • + href="{{ url_for('packages.list_all', type=type, q=query, page=n) }}"> {{ n }}
      • diff --git a/app/templates/packages/release_edit.html b/app/templates/packages/release_edit.html index 03f0d7a..37fc655 100644 --- a/app/templates/packages/release_edit.html +++ b/app/templates/packages/release_edit.html @@ -26,7 +26,7 @@ {% endif %} {% if release.task_id %} - Importing... view task
      + Importing... view task
      {% if package.checkPerm(current_user, "CHANGE_RELEASE_URL") %} {{ render_field(form.task_id) }} {% endif %} diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 8216c71..5da8797 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -103,7 +103,7 @@ {% if not review_thread and (package.author == current_user or package.checkPerm(current_user, "APPROVE_NEW")) %}
      - Open Thread + Open Thread Privately ask a question or give feedback
      @@ -172,14 +172,14 @@ Provides {% for meta in package.provides %} {{ meta.name }} + href="{{ url_for('metapackages.view', name=meta.name) }}">{{ meta.name }} {% endfor %} {% endif %} Author - + {{ package.author.display_name }} @@ -241,7 +241,7 @@ {{ dep.package.title }} by {{ dep.package.author.display_name }} {% elif dep.meta_package %} + href="{{ url_for('metapackages.view', name=dep.meta_package.name) }}"> {{ dep.meta_package.name }} {% else %} {{ "Excepted package or meta_package in dep!" | throw }} @@ -301,7 +301,7 @@ created {{ rel.releaseDate | date }}. {% if (package.checkPerm(current_user, "MAKE_RELEASE") or package.checkPerm(current_user, "APPROVE_RELEASE")) and rel.task_id %} - Importing... + Importing... {% elif not rel.approved %} Waiting for approval. {% endif %} @@ -320,7 +320,7 @@
      {% if package.approved and package.checkPerm(current_user, "CREATE_THREAD") %} + + href="{{ url_for('threads.new', pid=package.id) }}">+ {% endif %} Threads
      @@ -332,7 +332,7 @@ {% if package.approved and package.checkPerm(current_user, "CREATE_THREAD") and current_user != package.author and not current_user.rank.atLeast(current_user.rank.EDITOR) %} + href="{{ url_for('threads.new', pid=package.id) }}"> Report a problem with this listing {% endif %} @@ -381,7 +381,7 @@
    • {{ r.title }} by - {{ r.author.display_name }} + {{ r.author.display_name }}
      • {% else %}
    • No edit requests have been made.
      • diff --git a/app/templates/tasks/view.html b/app/templates/tasks/view.html index 97c3343..a348b1f 100644 --- a/app/templates/tasks/view.html +++ b/app/templates/tasks/view.html @@ -16,7 +16,7 @@ Working diff --git a/app/templates/todo/list.html b/app/templates/todo/list.html index 2e756af..2f09cb9 100644 --- a/app/templates/todo/list.html +++ b/app/templates/todo/list.html @@ -63,7 +63,7 @@ {% if canApproveScn and screenshots %}

      Screenshots -
      + @@ -112,6 +112,6 @@ style="width: {{ perc }}%" aria-valuenow="{{ perc }}" aria-valuemin="0" aria-valuemax="100">

      - View Unadded Topic List + View Unadded Topic List {% endblock %} diff --git a/app/templates/todo/topics.html b/app/templates/todo/topics.html index f9774d1..8afa3b0 100644 --- a/app/templates/todo/topics.html +++ b/app/templates/todo/topics.html @@ -8,15 +8,15 @@ Topics to be Added
      + href="{{ url_for('todo.topics', q=query, show_discarded=show_discarded, n=n, sort='date') }}"> Sort by date + href="{{ url_for('todo.topics', q=query, show_discarded=show_discarded, n=n, sort='name') }}"> Sort by name + href="{{ url_for('todo.topics', q=query, show_discarded=show_discarded, n=n, sort='views') }}"> Sort by views
      @@ -26,18 +26,18 @@ Topics to be Added {% if current_user.rank.atLeast(current_user.rank.EDITOR) %} {% if n >= 10000 %} + href="{{ url_for('todo.topics', q=query, show_discarded=show_discarded, n=100, sort=sort_by) }}"> Paginated list {% else %} + href="{{ url_for('todo.topics', q=query, show_discarded=show_discarded, n=10000, sort=sort_by) }}"> Unlimited list {% endif %} {% endif %} - + {% if not show_discarded %} Show {% else %} @@ -61,7 +61,7 @@ Topics to be Added style="width: {{ perc }}%" aria-valuenow="{{ perc }}" aria-valuemin="0" aria-valuemax="100">
      - + @@ -79,7 +79,7 @@ Topics to be Added {% for i in range(1, page_max+1) %}
    • + href="{{ url_for('todo.topics', page=i, query=query, show_discarded=show_discarded, n=n, sort=sort_by) }}"> {{ i }}
      • diff --git a/app/templates/users/claim.html b/app/templates/users/claim.html index db00d3f..ab66349 100644 --- a/app/templates/users/claim.html +++ b/app/templates/users/claim.html @@ -19,7 +19,7 @@ Creating an Account Please log out to continue.

      - Logout + Logout

      {% else %}

      @@ -44,7 +44,7 @@ Creating an Account Use GitHub field in forum profile - + @@ -73,7 +73,7 @@ Creating an Account Verification token - + diff --git a/app/templates/users/list.html b/app/templates/users/list.html index 5ec5662..345a039 100644 --- a/app/templates/users/list.html +++ b/app/templates/users/list.html @@ -8,7 +8,7 @@

        {% for user in users %}
      • - + {{ user.display_name }} - {{ user.rank.getTitle() }} diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html index fc197e8..d1edf54 100644 --- a/app/templates/users/user_profile_page.html +++ b/app/templates/users/user_profile_page.html @@ -9,7 +9,7 @@ {% if not current_user.is_authenticated and user.rank == user.rank.NOT_JOINED and user.forums_username %}
        Claim + href="{{ url_for('users.claim', username=user.forums_username) }}">Claim Is this you? Claim your account now!
        @@ -57,7 +57,7 @@ {% if user.github_username %} GitHub {% elif user == current_user %} - Link Github + Link Github {% endif %} {% if user.website_url %} @@ -78,7 +78,7 @@ Admin {% if user.email %} - + Email {% else %} @@ -97,7 +97,7 @@ Profile Picture: {% if user.forums_username %} - + @@ -122,7 +122,7 @@ {% if user.password %} Set | Change {% else %} - Not set | Set + Not set | Set {% endif %} diff --git a/app/views/__init__.py b/app/views/__init__.py deleted file mode 100644 index 3abb7ee..0000000 --- a/app/views/__init__.py +++ /dev/null @@ -1,84 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from app import app, pages -from flask import * -from flask_user import * -from app.models import * -import flask_menu as menu -from werkzeug.contrib.cache import SimpleCache -from urllib.parse import urlparse -from sqlalchemy.sql.expression import func -cache = SimpleCache() - -@app.context_processor -def inject_debug(): - return dict(debug=app.debug) - -@app.template_filter() -def throw(err): - raise Exception(err) - -@app.template_filter() -def domain(url): - return urlparse(url).netloc - -@app.template_filter() -def date(value): - return value.strftime("%Y-%m-%d") - -@app.template_filter() -def datetime(value): - return value.strftime("%Y-%m-%d %H:%M") + " UTC" - -@app.route("/uploads/") -def send_upload(path): - return send_from_directory("public/uploads", path) - -@app.route("/") -@menu.register_menu(app, ".", "Home") -def home_page(): - query = Package.query.filter_by(approved=True, soft_deleted=False) - count = query.count() - new = query.order_by(db.desc(Package.created_at)).limit(8).all() - pop_mod = query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score)).limit(8).all() - pop_gam = query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score)).limit(4).all() - pop_txp = query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score)).limit(4).all() - downloads = db.session.query(func.sum(PackageRelease.downloads)).first()[0] - return render_template("index.html", count=count, downloads=downloads, \ - new=new, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam) - -from . import users, packages, meta, threads, api -from . import sass, thumbnails, tasks, admin - -@menu.register_menu(app, ".help", "Help", order=19, endpoint_arguments_constructor=lambda: { 'path': 'help' }) -@app.route('//') -def flatpage(path): - page = pages.get_or_404(path) - template = page.meta.get('template', 'flatpage.html') - return render_template(template, page=page) - -@app.before_request -def do_something_whenever_a_request_comes_in(): - if current_user.is_authenticated: - if current_user.rank == UserRank.BANNED: - flash("You have been banned.", "error") - logout_user() - return redirect(url_for('user.login')) - elif current_user.rank == UserRank.NOT_JOINED: - current_user.rank = UserRank.MEMBER - db.session.commit() diff --git a/app/views/admin/__init__.py b/app/views/admin/__init__.py deleted file mode 100644 index 2e467da..0000000 --- a/app/views/admin/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from . import admin, licenseseditor, tagseditor, versioneditor, todo diff --git a/app/views/admin/admin.py b/app/views/admin/admin.py deleted file mode 100644 index b359700..0000000 --- a/app/views/admin/admin.py +++ /dev/null @@ -1,128 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -import flask_menu as menu -from app import app -from app.models import * -from celery import uuid -from app.tasks.importtasks import importRepoScreenshot, importAllDependencies, makeVCSRelease -from app.tasks.forumtasks import importTopicList, checkAllForumAccounts -from flask_wtf import FlaskForm -from wtforms import * -from app.utils import loginUser, rank_required, triggerNotif -import datetime - -@app.route("/admin/", methods=["GET", "POST"]) -@rank_required(UserRank.ADMIN) -def admin_page(): - if request.method == "POST": - action = request.form["action"] - if action == "delstuckreleases": - PackageRelease.query.filter(PackageRelease.task_id != None).delete() - db.session.commit() - return redirect(url_for("admin_page")) - elif action == "importmodlist": - task = importTopicList.delay() - return redirect(url_for("check_task", id=task.id, r=url_for("todo_topics_page"))) - elif action == "checkusers": - task = checkAllForumAccounts.delay() - return redirect(url_for("check_task", id=task.id, r=url_for("admin_page"))) - elif action == "importscreenshots": - packages = Package.query \ - .filter_by(soft_deleted=False) \ - .outerjoin(PackageScreenshot, Package.id==PackageScreenshot.package_id) \ - .filter(PackageScreenshot.id==None) \ - .all() - for package in packages: - importRepoScreenshot.delay(package.id) - - return redirect(url_for("admin_page")) - elif action == "restore": - package = Package.query.get(request.form["package"]) - if package is None: - flash("Unknown package", "error") - else: - package.soft_deleted = False - db.session.commit() - return redirect(url_for("admin_page")) - elif action == "importdepends": - task = importAllDependencies.delay() - return redirect(url_for("check_task", id=task.id, r=url_for("admin_page"))) - elif action == "modprovides": - packages = Package.query.filter_by(type=PackageType.MOD).all() - mpackage_cache = {} - for p in packages: - if len(p.provides) == 0: - p.provides.append(MetaPackage.GetOrCreate(p.name, mpackage_cache)) - - db.session.commit() - return redirect(url_for("admin_page")) - elif action == "recalcscores": - for p in Package.query.all(): - p.recalcScore() - - db.session.commit() - return redirect(url_for("admin_page")) - elif action == "vcsrelease": - for package in Package.query.filter(Package.repo.isnot(None)).all(): - if package.releases.count() != 0: - continue - - rel = PackageRelease() - rel.package = package - rel.title = datetime.date.today().isoformat() - rel.url = "" - rel.task_id = uuid() - rel.approved = True - db.session.add(rel) - db.session.commit() - - makeVCSRelease.apply_async((rel.id, "master"), task_id=rel.task_id) - - msg = "{}: Release {} created".format(package.title, rel.title) - triggerNotif(package.author, current_user, msg, rel.getEditURL()) - db.session.commit() - - else: - flash("Unknown action: " + action, "error") - - deleted_packages = Package.query.filter_by(soft_deleted=True).all() - return render_template("admin/list.html", deleted_packages=deleted_packages) - -class SwitchUserForm(FlaskForm): - username = StringField("Username") - submit = SubmitField("Switch") - - -@app.route("/admin/switchuser/", methods=["GET", "POST"]) -@rank_required(UserRank.ADMIN) -def switch_user_page(): - form = SwitchUserForm(formdata=request.form) - if request.method == "POST" and form.validate(): - user = User.query.filter_by(username=form["username"].data).first() - if user is None: - flash("Unable to find user", "error") - elif loginUser(user): - return redirect(url_for("user_profile_page", username=current_user.username)) - else: - flash("Unable to login as user", "error") - - - # Process GET or invalid POST - return render_template("admin/switch_user_page.html", form=form) diff --git a/app/views/admin/licenseseditor.py b/app/views/admin/licenseseditor.py deleted file mode 100644 index 343f4ee..0000000 --- a/app/views/admin/licenseseditor.py +++ /dev/null @@ -1,62 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from app.utils import rank_required - -@app.route("/licenses/") -@rank_required(UserRank.MODERATOR) -def license_list_page(): - return render_template("admin/licenses/list.html", licenses=License.query.order_by(db.asc(License.name)).all()) - -class LicenseForm(FlaskForm): - name = StringField("Name", [InputRequired(), Length(3,100)]) - is_foss = BooleanField("Is FOSS") - submit = SubmitField("Save") - -@app.route("/licenses/new/", methods=["GET", "POST"]) -@app.route("/licenses//edit/", methods=["GET", "POST"]) -@rank_required(UserRank.MODERATOR) -def createedit_license_page(name=None): - license = None - if name is not None: - license = License.query.filter_by(name=name).first() - if license is None: - abort(404) - - form = LicenseForm(formdata=request.form, obj=license) - if request.method == "GET" and license is None: - form.is_foss.data = True - elif request.method == "POST" and form.validate(): - if license is None: - license = License(form.name.data) - db.session.add(license) - flash("Created license " + form.name.data, "success") - else: - flash("Updated license " + form.name.data, "success") - - form.populate_obj(license) - db.session.commit() - return redirect(url_for("license_list_page")) - - return render_template("admin/licenses/edit.html", license=license, form=form) diff --git a/app/views/admin/tagseditor.py b/app/views/admin/tagseditor.py deleted file mode 100644 index 7d88f28..0000000 --- a/app/views/admin/tagseditor.py +++ /dev/null @@ -1,57 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from app.utils import rank_required - -@app.route("/tags/") -@rank_required(UserRank.MODERATOR) -def tag_list_page(): - return render_template("admin/tags/list.html", tags=Tag.query.order_by(db.asc(Tag.title)).all()) - -class TagForm(FlaskForm): - title = StringField("Title", [InputRequired(), Length(3,100)]) - name = StringField("Name", [Optional(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) - submit = SubmitField("Save") - -@app.route("/tags/new/", methods=["GET", "POST"]) -@app.route("/tags//edit/", methods=["GET", "POST"]) -@rank_required(UserRank.MODERATOR) -def createedit_tag_page(name=None): - tag = None - if name is not None: - tag = Tag.query.filter_by(name=name).first() - if tag is None: - abort(404) - - form = TagForm(formdata=request.form, obj=tag) - if request.method == "POST" and form.validate(): - if tag is None: - tag = Tag(form.title.data) - db.session.add(tag) - else: - form.populate_obj(tag) - db.session.commit() - return redirect(url_for("createedit_tag_page", name=tag.name)) - - return render_template("admin/tags/edit.html", tag=tag, form=form) diff --git a/app/views/admin/todo.py b/app/views/admin/todo.py deleted file mode 100644 index 9909eff..0000000 --- a/app/views/admin/todo.py +++ /dev/null @@ -1,101 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -import flask_menu as menu -from app import app -from app.models import * -from app.querybuilder import QueryBuilder - -@app.route("/todo/", methods=["GET", "POST"]) -@login_required -def todo_page(): - canApproveNew = Permission.APPROVE_NEW.check(current_user) - canApproveRel = Permission.APPROVE_RELEASE.check(current_user) - canApproveScn = Permission.APPROVE_SCREENSHOT.check(current_user) - - packages = None - if canApproveNew: - packages = Package.query.filter_by(approved=False, soft_deleted=False).order_by(db.desc(Package.created_at)).all() - - releases = None - if canApproveRel: - releases = PackageRelease.query.filter_by(approved=False).all() - - screenshots = None - if canApproveScn: - screenshots = PackageScreenshot.query.filter_by(approved=False).all() - - if not canApproveNew and not canApproveRel and not canApproveScn: - abort(403) - - if request.method == "POST": - if request.form["action"] == "screenshots_approve_all": - if not canApproveScn: - abort(403) - - PackageScreenshot.query.update({ "approved": True }) - db.session.commit() - return redirect(url_for("todo_page")) - else: - abort(400) - - topic_query = ForumTopic.query \ - .filter_by(discarded=False) - - total_topics = topic_query.count() - topics_to_add = topic_query \ - .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ - .count() - - return render_template("todo/list.html", title="Reports and Work Queue", - packages=packages, releases=releases, screenshots=screenshots, - canApproveNew=canApproveNew, canApproveRel=canApproveRel, canApproveScn=canApproveScn, - topics_to_add=topics_to_add, total_topics=total_topics) - - -@app.route("/todo/topics/") -@login_required -def todo_topics_page(): - qb = QueryBuilder(request.args) - qb.setSortIfNone("date") - query = qb.buildTopicQuery() - - tmp_q = ForumTopic.query - if not qb.show_discarded: - tmp_q = tmp_q.filter_by(discarded=False) - total = tmp_q.count() - topic_count = query.count() - - page = int(request.args.get("page") or 1) - num = int(request.args.get("n") or 100) - if num > 100 and not current_user.rank.atLeast(UserRank.EDITOR): - num = 100 - - query = query.paginate(page, num, True) - next_url = url_for("todo_topics_page", page=query.next_num, query=qb.search, \ - show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \ - if query.has_next else None - prev_url = url_for("todo_topics_page", page=query.prev_num, query=qb.search, \ - show_discarded=qb.show_discarded, n=num, sort=qb.order_by) \ - if query.has_prev else None - - return render_template("todo/topics.html", topics=query.items, total=total, \ - topic_count=topic_count, query=qb.search, show_discarded=qb.show_discarded, \ - next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, \ - n=num, sort_by=qb.order_by) diff --git a/app/views/admin/versioneditor.py b/app/views/admin/versioneditor.py deleted file mode 100644 index 6bcf93a..0000000 --- a/app/views/admin/versioneditor.py +++ /dev/null @@ -1,60 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from app.utils import rank_required - -@app.route("/versions/") -@rank_required(UserRank.MODERATOR) -def version_list_page(): - return render_template("admin/versions/list.html", versions=MinetestRelease.query.order_by(db.asc(MinetestRelease.id)).all()) - -class VersionForm(FlaskForm): - name = StringField("Name", [InputRequired(), Length(3,100)]) - protocol = IntegerField("Protocol") - submit = SubmitField("Save") - -@app.route("/versions/new/", methods=["GET", "POST"]) -@app.route("/versions//edit/", methods=["GET", "POST"]) -@rank_required(UserRank.MODERATOR) -def createedit_version_page(name=None): - version = None - if name is not None: - version = MinetestRelease.query.filter_by(name=name).first() - if version is None: - abort(404) - - form = VersionForm(formdata=request.form, obj=version) - if request.method == "POST" and form.validate(): - if version is None: - version = MinetestRelease(form.name.data) - db.session.add(version) - flash("Created version " + form.name.data, "success") - else: - flash("Updated version " + form.name.data, "success") - - form.populate_obj(version) - db.session.commit() - return redirect(url_for("version_list_page")) - - return render_template("admin/versions/edit.html", version=version, form=form) diff --git a/app/views/api.py b/app/views/api.py deleted file mode 100644 index ba42aca..0000000 --- a/app/views/api.py +++ /dev/null @@ -1,99 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * -from app.utils import is_package_page -from app.querybuilder import QueryBuilder - -@app.route("/api/packages/") -def api_packages_page(): - qb = QueryBuilder(request.args) - query = qb.buildPackageQuery() - ver = qb.getMinetestVersion() - - pkgs = [package.getAsDictionaryShort(app.config["BASE_URL"], version=ver) \ - for package in query.all()] - return jsonify(pkgs) - - -@app.route("/api/packages///") -@is_package_page -def api_package_page(package): - return jsonify(package.getAsDictionary(app.config["BASE_URL"])) - - -@app.route("/api/packages///dependencies/") -@is_package_page -def api_package_deps_page(package): - ret = [] - - for dep in package.dependencies: - name = None - fulfilled_by = None - - if dep.package: - name = dep.package.name - fulfilled_by = [ dep.package.getAsDictionaryKey() ] - - elif dep.meta_package: - name = dep.meta_package.name - fulfilled_by = [ pkg.getAsDictionaryKey() for pkg in dep.meta_package.packages] - - else: - raise "Malformed dependency" - - ret.append({ - "name": name, - "is_optional": dep.optional, - "packages": fulfilled_by - }) - - return jsonify(ret) - - -@app.route("/api/topics/") -def api_topics_page(): - qb = QueryBuilder(request.args) - query = qb.buildTopicQuery(show_added=True) - return jsonify([t.getAsDictionary() for t in query.all()]) - - -@app.route("/api/topic_discard/", methods=["POST"]) -@login_required -def topic_set_discard(): - tid = request.args.get("tid") - discard = request.args.get("discard") - if tid is None or discard is None: - abort(400) - - topic = ForumTopic.query.get(tid) - if not topic.checkPerm(current_user, Permission.TOPIC_DISCARD): - abort(403) - - topic.discarded = discard == "true" - db.session.commit() - - return jsonify(topic.getAsDictionary()) - - -@app.route("/api/minetest_versions/") -def api_minetest_versions_page(): - return jsonify([{ "name": rel.name, "protocol_version": rel.protocol }\ - for rel in MinetestRelease.query.all() if rel.getActual() is not None]) diff --git a/app/views/meta.py b/app/views/meta.py deleted file mode 100644 index 9083289..0000000 --- a/app/views/meta.py +++ /dev/null @@ -1,34 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * - -@app.route("/metapackages/") -def meta_package_list_page(): - mpackages = MetaPackage.query.order_by(db.asc(MetaPackage.name)).all() - return render_template("meta/list.html", mpackages=mpackages) - -@app.route("/metapackages//") -def meta_package_page(name): - mpackage = MetaPackage.query.filter_by(name=name).first() - if mpackage is None: - abort(404) - - return render_template("meta/view.html", mpackage=mpackage) diff --git a/app/views/packages/__init__.py b/app/views/packages/__init__.py deleted file mode 100644 index 5df5376..0000000 --- a/app/views/packages/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from . import packages, screenshots, releases diff --git a/app/views/packages/editrequests.py b/app/views/packages/editrequests.py deleted file mode 100644 index 7b52184..0000000 --- a/app/views/packages/editrequests.py +++ /dev/null @@ -1,174 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * - -from app.utils import * - -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField - -from . import PackageForm - - -class EditRequestForm(PackageForm): - edit_title = StringField("Edit Title", [InputRequired(), Length(1, 100)]) - edit_desc = TextField("Edit Description", [Optional()]) - -@app.route("/packages///requests/new/", methods=["GET","POST"]) -@app.route("/packages///requests//edit/", methods=["GET","POST"]) -@login_required -@is_package_page -def create_edit_editrequest_page(package, id=None): - edited_package = package - - erequest = None - if id is not None: - erequest = EditRequest.query.get(id) - if erequest.package != package: - abort(404) - - if not erequest.checkPerm(current_user, Permission.EDIT_EDITREQUEST): - abort(403) - - if erequest.status != 0: - flash("Can't edit EditRequest, it has already been merged or rejected", "error") - return redirect(erequest.getURL()) - - edited_package = Package(package) - erequest.applyAll(edited_package) - - form = EditRequestForm(request.form, obj=edited_package) - if request.method == "GET": - deps = edited_package.dependencies - form.harddep_str.data = ",".join([str(x) for x in deps if not x.optional]) - form.softdep_str.data = ",".join([str(x) for x in deps if x.optional]) - form.provides_str.data = MetaPackage.ListToSpec(edited_package.provides) - - if request.method == "POST" and form.validate(): - if erequest is None: - erequest = EditRequest() - erequest.package = package - erequest.author = current_user - - erequest.title = form["edit_title"].data - erequest.desc = form["edit_desc"].data - db.session.add(erequest) - - EditRequestChange.query.filter_by(request=erequest).delete() - - wasChangeMade = False - for e in PackagePropertyKey: - newValue = form[e.name].data - oldValue = getattr(package, e.name) - - newValueComp = newValue - oldValueComp = oldValue - if type(newValue) is str: - newValue = newValue.replace("\r\n", "\n") - newValueComp = newValue.strip() - oldValueComp = "" if oldValue is None else oldValue.strip() - - if newValueComp != oldValueComp: - change = EditRequestChange() - change.request = erequest - change.key = e - change.oldValue = e.convert(oldValue) - change.newValue = e.convert(newValue) - db.session.add(change) - wasChangeMade = True - - if wasChangeMade: - msg = "{}: Edit request #{} {}" \ - .format(package.title, erequest.id, "created" if id is None else "edited") - triggerNotif(package.author, current_user, msg, erequest.getURL()) - triggerNotif(erequest.author, current_user, msg, erequest.getURL()) - db.session.commit() - return redirect(erequest.getURL()) - else: - flash("No changes detected", "warning") - elif erequest is not None: - form["edit_title"].data = erequest.title - form["edit_desc"].data = erequest.desc - - return render_template("packages/editrequest_create_edit.html", package=package, form=form) - - -@app.route("/packages///requests//") -@is_package_page -def view_editrequest_page(package, id): - erequest = EditRequest.query.get(id) - if erequest is None or erequest.package != package: - abort(404) - - clearNotifications(erequest.getURL()) - return render_template("packages/editrequest_view.html", package=package, request=erequest) - - -@app.route("/packages///requests//approve/", methods=["POST"]) -@is_package_page -def approve_editrequest_page(package, id): - if not package.checkPerm(current_user, Permission.APPROVE_CHANGES): - flash("You don't have permission to do that.", "error") - return redirect(package.getDetailsURL()) - - erequest = EditRequest.query.get(id) - if erequest is None or erequest.package != package: - abort(404) - - if erequest.status != 0: - flash("Edit request has already been resolved", "error") - - else: - erequest.status = 1 - erequest.applyAll(package) - - msg = "{}: Edit request #{} merged".format(package.title, erequest.id) - triggerNotif(erequest.author, current_user, msg, erequest.getURL()) - triggerNotif(package.author, current_user, msg, erequest.getURL()) - db.session.commit() - - return redirect(package.getDetailsURL()) - -@app.route("/packages///requests//reject/", methods=["POST"]) -@is_package_page -def reject_editrequest_page(package, id): - if not package.checkPerm(current_user, Permission.APPROVE_CHANGES): - flash("You don't have permission to do that.", "error") - return redirect(package.getDetailsURL()) - - erequest = EditRequest.query.get(id) - if erequest is None or erequest.package != package: - abort(404) - - if erequest.status != 0: - flash("Edit request has already been resolved", "error") - - else: - erequest.status = 2 - - msg = "{}: Edit request #{} rejected".format(package.title, erequest.id) - triggerNotif(erequest.author, current_user, msg, erequest.getURL()) - triggerNotif(package.author, current_user, msg, erequest.getURL()) - db.session.commit() - - return redirect(package.getDetailsURL()) diff --git a/app/views/packages/packages.py b/app/views/packages/packages.py deleted file mode 100644 index 38aacbe..0000000 --- a/app/views/packages/packages.py +++ /dev/null @@ -1,369 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import render_template, abort, request, redirect, url_for, flash -from flask_user import current_user -import flask_menu as menu -from app import app -from app.models import * -from app.querybuilder import QueryBuilder -from app.tasks.importtasks import importRepoScreenshot -from app.utils import * -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from wtforms.ext.sqlalchemy.fields import QuerySelectField, QuerySelectMultipleField -from sqlalchemy import or_ - - -@menu.register_menu(app, ".mods", "Mods", order=11, endpoint_arguments_constructor=lambda: { 'type': 'mod' }) -@menu.register_menu(app, ".games", "Games", order=12, endpoint_arguments_constructor=lambda: { 'type': 'game' }) -@menu.register_menu(app, ".txp", "Texture Packs", order=13, endpoint_arguments_constructor=lambda: { 'type': 'txp' }) -@menu.register_menu(app, ".random", "Random", order=14, endpoint_arguments_constructor=lambda: { 'random': '1' }) -@app.route("/packages/") -def packages_page(): - qb = QueryBuilder(request.args) - query = qb.buildPackageQuery() - title = qb.title - - if qb.lucky: - package = query.first() - if package: - return redirect(package.getDetailsURL()) - - topic = qb.buildTopicQuery().first() - if qb.search and topic: - return redirect("https://forum.minetest.net/viewtopic.php?t=" + str(topic.topic_id)) - - page = int(request.args.get("page") or 1) - num = min(40, int(request.args.get("n") or 100)) - query = query.paginate(page, num, True) - - search = request.args.get("q") - type_name = request.args.get("type") - - next_url = url_for("packages_page", type=type_name, q=search, page=query.next_num) \ - if query.has_next else None - prev_url = url_for("packages_page", type=type_name, q=search, page=query.prev_num) \ - if query.has_prev else None - - topics = None - if qb.search and not query.has_next: - topics = qb.buildTopicQuery().all() - - tags = Tag.query.all() - return render_template("packages/list.html", \ - title=title, packages=query.items, topics=topics, \ - query=search, tags=tags, type=type_name, \ - next_url=next_url, prev_url=prev_url, page=page, page_max=query.pages, packages_count=query.total) - - -def getReleases(package): - if package.checkPerm(current_user, Permission.MAKE_RELEASE): - return package.releases.limit(5) - else: - return package.releases.filter_by(approved=True).limit(5) - - -@app.route("/packages///") -@is_package_page -def package_page(package): - clearNotifications(package.getDetailsURL()) - - 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) \ - .order_by(db.desc(Package.score)) \ - .all() - - - show_similar_topics = current_user == package.author or \ - package.checkPerm(current_user, Permission.APPROVE_NEW) - - similar_topics = None if not show_similar_topics else \ - ForumTopic.query \ - .filter_by(name=package.name) \ - .filter(ForumTopic.topic_id != package.forums) \ - .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ - .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ - .all() - - releases = getReleases(package) - requests = [r for r in package.requests if r.status == 0] - - review_thread = package.review_thread - if review_thread is not None and not review_thread.checkPerm(current_user, Permission.SEE_THREAD): - review_thread = None - - topic_error = None - topic_error_lvl = "warning" - if not package.approved and package.forums is not None: - errors = [] - if Package.query.filter_by(forums=package.forums, soft_deleted=False).count() > 1: - errors.append("Error: Another package already uses this forum topic!") - topic_error_lvl = "danger" - - topic = ForumTopic.query.get(package.forums) - if topic is not None: - if topic.author != package.author: - errors.append("Error: Forum topic author doesn't match package author.") - topic_error_lvl = "danger" - - if topic.wip: - errors.append("Warning: Forum topic is in WIP section, make sure package meets playability standards.") - elif package.type != PackageType.TXP: - errors.append("Warning: Forum topic not found. This may happen if the topic has only just been created.") - - topic_error = "
        ".join(errors) - - - threads = Thread.query.filter_by(package_id=package.id) - if not current_user.is_authenticated: - threads = threads.filter_by(private=False) - elif not current_user.rank.atLeast(UserRank.EDITOR) and not current_user == package.author: - threads = threads.filter(or_(Thread.private == False, Thread.author == current_user)) - - - return render_template("packages/view.html", \ - package=package, releases=releases, requests=requests, \ - alternatives=alternatives, similar_topics=similar_topics, \ - review_thread=review_thread, topic_error=topic_error, topic_error_lvl=topic_error_lvl, \ - threads=threads.all()) - - -@app.route("/packages///download/") -@is_package_page -def package_download_page(package): - release = package.getDownloadRelease() - - if release is None: - if "application/zip" in request.accept_mimetypes and \ - not "text/html" in request.accept_mimetypes: - return "", 204 - else: - flash("No download available.", "error") - return redirect(package.getDetailsURL()) - else: - PackageRelease.query.filter_by(id=release.id).update({ - "downloads": PackageRelease.downloads + 1 - }) - db.session.commit() - - return redirect(release.url, code=302) - - -class PackageForm(FlaskForm): - name = StringField("Name (Technical)", [InputRequired(), Length(1, 20), Regexp("^[a-z0-9_]", 0, "Lower case letters (a-z), digits (0-9), and underscores (_) only")]) - title = StringField("Title (Human-readable)", [InputRequired(), Length(3, 50)]) - short_desc = StringField("Short Description (Plaintext)", [InputRequired(), Length(1,200)]) - desc = TextAreaField("Long Description (Markdown)", [Optional(), Length(0,10000)]) - type = SelectField("Type", [InputRequired()], choices=PackageType.choices(), coerce=PackageType.coerce, default=PackageType.MOD) - license = QuerySelectField("License", [InputRequired()], 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", [InputRequired()], 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=lambda a: a.title) - 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]) - forums = IntegerField("Forum Topic ID", [Optional(), NumberRange(0,999999)]) - submit = SubmitField("Save") - -@app.route("/packages/new/", methods=["GET", "POST"]) -@app.route("/packages///edit/", methods=["GET", "POST"]) -@login_required -def create_edit_package_page(author=None, name=None): - package = None - form = None - if author is None: - form = PackageForm(formdata=request.form) - author = request.args.get("author") - if author is None or author == current_user.username: - author = current_user - else: - author = User.query.filter_by(username=author).first() - if author is None: - flash("Unable to find that user", "error") - return redirect(url_for("create_edit_package_page")) - - if not author.checkPerm(current_user, Permission.CHANGE_AUTHOR): - flash("Permission denied", "error") - return redirect(url_for("create_edit_package_page")) - - else: - package = getPackageByInfo(author, name) - if not package.checkPerm(current_user, Permission.EDIT_PACKAGE): - return redirect(package.getDetailsURL()) - - author = package.author - - form = PackageForm(formdata=request.form, obj=package) - - # Initial form class from post data and default data - if request.method == "GET": - if package is None: - form.name.data = request.args.get("bname") - form.title.data = request.args.get("title") - form.repo.data = request.args.get("repo") - form.forums.data = request.args.get("forums") - else: - deps = package.dependencies - form.harddep_str.data = ",".join([str(x) for x in deps if not x.optional]) - form.softdep_str.data = ",".join([str(x) for x in deps if x.optional]) - form.provides_str.data = MetaPackage.ListToSpec(package.provides) - - if request.method == "POST" and form.validate(): - wasNew = False - 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: - Package.query.filter_by(name=form["name"].data, author_id=author.id).delete() - else: - flash("Package already exists!", "error") - return redirect(url_for("create_edit_package_page")) - - package = Package() - package.author = author - wasNew = True - - elif package.approved and 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("create_edit_package_page", author=author, name=name)) - - else: - triggerNotif(package.author, current_user, - "{} edited".format(package.title), package.getDetailsURL()) - - form.populate_obj(package) # copy to row - - 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) - - 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) - package.provides.append(m) - - package.tags.clear() - for tag in form.tags.raw_data: - package.tags.append(Tag.query.get(tag)) - - db.session.commit() # save - - next_url = package.getDetailsURL() - if wasNew and package.repo is not None: - task = importRepoScreenshot.delay(package.id) - next_url = url_for("check_task", id=task.id, r=next_url) - - if wasNew and ("WTFPL" in package.license.name or "WTFPL" in package.media_license.name): - next_url = url_for("flatpage", path="help/wtfpl", r=next_url) - - return redirect(next_url) - - package_query = Package.query.filter_by(approved=True, soft_deleted=False) - if package is not None: - package_query = package_query.filter(Package.id != package.id) - - enableWizard = name is None and request.method != "POST" - return render_template("packages/create_edit.html", package=package, \ - form=form, author=author, enable_wizard=enableWizard, \ - packages=package_query.all(), \ - mpackages=MetaPackage.query.order_by(db.asc(MetaPackage.name)).all()) - -@app.route("/packages///approve/", methods=["POST"]) -@login_required -@is_package_page -def approve_package_page(package): - if not package.checkPerm(current_user, Permission.APPROVE_NEW): - flash("You don't have permission to do that.", "error") - - elif package.approved: - flash("Package has already been approved", "error") - - else: - package.approved = True - - screenshots = PackageScreenshot.query.filter_by(package=package, approved=False).all() - for s in screenshots: - s.approved = True - - triggerNotif(package.author, current_user, - "{} approved".format(package.title), package.getDetailsURL()) - db.session.commit() - - return redirect(package.getDetailsURL()) - - -@app.route("/packages///remove/", methods=["GET", "POST"]) -@login_required -@is_package_page -def remove_package_page(package): - if request.method == "GET": - return render_template("packages/remove.html", package=package) - - if "delete" in request.form: - if not package.checkPerm(current_user, Permission.DELETE_PACKAGE): - flash("You don't have permission to do that.", "error") - return redirect(package.getDetailsURL()) - - package.soft_deleted = True - - url = url_for("user_profile_page", username=package.author.username) - triggerNotif(package.author, current_user, - "{} deleted".format(package.title), url) - db.session.commit() - - flash("Deleted package", "success") - - return redirect(url) - elif "unapprove" in request.form: - if not package.checkPerm(current_user, Permission.UNAPPROVE_PACKAGE): - flash("You don't have permission to do that.", "error") - return redirect(package.getDetailsURL()) - - package.approved = False - - triggerNotif(package.author, current_user, - "{} deleted".format(package.title), package.getDetailsURL()) - db.session.commit() - - flash("Unapproved package", "success") - - return redirect(package.getDetailsURL()) - else: - abort(400) diff --git a/app/views/packages/releases.py b/app/views/packages/releases.py deleted file mode 100644 index 963f903..0000000 --- a/app/views/packages/releases.py +++ /dev/null @@ -1,218 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * -from app.tasks.importtasks import makeVCSRelease - -from app.utils import * - -from celery import uuid -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from wtforms.ext.sqlalchemy.fields import QuerySelectField - - -def get_mt_releases(is_max): - query = MinetestRelease.query.order_by(db.asc(MinetestRelease.id)) - if is_max: - query = query.limit(query.count() - 1) - else: - query = query.filter(MinetestRelease.name != "0.4.17") - - return query - - -class CreatePackageReleaseForm(FlaskForm): - title = StringField("Title", [InputRequired(), Length(1, 30)]) - uploadOpt = RadioField ("Method", choices=[("upload", "File Upload")], default="upload") - vcsLabel = StringField("VCS Commit Hash, Branch, or Tag", default="master") - fileUpload = FileField("File Upload") - min_rel = QuerySelectField("Minimum Minetest Version", [InputRequired()], - query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) - max_rel = QuerySelectField("Maximum Minetest Version", [InputRequired()], - query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) - submit = SubmitField("Save") - -class EditPackageReleaseForm(FlaskForm): - title = StringField("Title", [InputRequired(), Length(1, 30)]) - url = StringField("URL", [URL]) - task_id = StringField("Task ID", filters = [lambda x: x or None]) - approved = BooleanField("Is Approved") - min_rel = QuerySelectField("Minimum Minetest Version", [InputRequired()], - query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) - max_rel = QuerySelectField("Maximum Minetest Version", [InputRequired()], - query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) - submit = SubmitField("Save") - -@app.route("/packages///releases/new/", methods=["GET", "POST"]) -@login_required -@is_package_page -def create_release_page(package): - if not package.checkPerm(current_user, Permission.MAKE_RELEASE): - return redirect(package.getDetailsURL()) - - # Initial form class from post data and default data - form = CreatePackageReleaseForm() - if package.repo is not None: - form["uploadOpt"].choices = [("vcs", "From Git Commit or Branch"), ("upload", "File Upload")] - if request.method != "POST": - form["uploadOpt"].data = "vcs" - - if request.method == "POST" and form.validate(): - if form["uploadOpt"].data == "vcs": - rel = PackageRelease() - rel.package = package - rel.title = form["title"].data - rel.url = "" - rel.task_id = uuid() - rel.min_rel = form["min_rel"].data.getActual() - rel.max_rel = form["max_rel"].data.getActual() - db.session.add(rel) - db.session.commit() - - makeVCSRelease.apply_async((rel.id, form["vcsLabel"].data), task_id=rel.task_id) - - msg = "{}: Release {} created".format(package.title, rel.title) - triggerNotif(package.author, current_user, msg, rel.getEditURL()) - db.session.commit() - - return redirect(url_for("check_task", id=rel.task_id, r=rel.getEditURL())) - else: - uploadedPath = doFileUpload(form.fileUpload.data, "zip", "a zip file") - if uploadedPath is not None: - rel = PackageRelease() - rel.package = package - rel.title = form["title"].data - rel.url = uploadedPath - rel.min_rel = form["min_rel"].data.getActual() - rel.max_rel = form["max_rel"].data.getActual() - rel.approve(current_user) - db.session.add(rel) - db.session.commit() - - msg = "{}: Release {} created".format(package.title, rel.title) - triggerNotif(package.author, current_user, msg, rel.getEditURL()) - db.session.commit() - return redirect(package.getDetailsURL()) - - return render_template("packages/release_new.html", package=package, form=form) - -@app.route("/packages///releases//download/") -@is_package_page -def download_release_page(package, id): - release = PackageRelease.query.get(id) - if release is None or release.package != package: - abort(404) - - if release is None: - if "application/zip" in request.accept_mimetypes and \ - not "text/html" in request.accept_mimetypes: - return "", 204 - else: - flash("No download available.", "error") - return redirect(package.getDetailsURL()) - else: - PackageRelease.query.filter_by(id=release.id).update({ - "downloads": PackageRelease.downloads + 1 - }) - db.session.commit() - - return redirect(release.url, code=300) - -@app.route("/packages///releases//", methods=["GET", "POST"]) -@login_required -@is_package_page -def edit_release_page(package, id): - release = PackageRelease.query.get(id) - if release is None or release.package != package: - abort(404) - - clearNotifications(release.getEditURL()) - - canEdit = package.checkPerm(current_user, Permission.MAKE_RELEASE) - canApprove = package.checkPerm(current_user, Permission.APPROVE_RELEASE) - if not (canEdit or canApprove): - return redirect(package.getDetailsURL()) - - # Initial form class from post data and default data - form = EditPackageReleaseForm(formdata=request.form, obj=release) - if request.method == "POST" and form.validate(): - wasApproved = release.approved - if canEdit: - release.title = form["title"].data - release.min_rel = form["min_rel"].data.getActual() - release.max_rel = form["max_rel"].data.getActual() - - if package.checkPerm(current_user, Permission.CHANGE_RELEASE_URL): - release.url = form["url"].data - release.task_id = form["task_id"].data - if release.task_id is not None: - release.task_id = None - - if canApprove: - release.approved = form["approved"].data - else: - release.approved = wasApproved - - db.session.commit() - return redirect(package.getDetailsURL()) - - return render_template("packages/release_edit.html", package=package, release=release, form=form) - - - -class BulkReleaseForm(FlaskForm): - set_min = BooleanField("Set Min") - min_rel = QuerySelectField("Minimum Minetest Version", [InputRequired()], - query_factory=lambda: get_mt_releases(False), get_pk=lambda a: a.id, get_label=lambda a: a.name) - set_max = BooleanField("Set Max") - max_rel = QuerySelectField("Maximum Minetest Version", [InputRequired()], - query_factory=lambda: get_mt_releases(True), get_pk=lambda a: a.id, get_label=lambda a: a.name) - only_change_none = BooleanField("Only change values previously set as none") - submit = SubmitField("Update") - - -@app.route("/packages///releases/bulk_change/", methods=["GET", "POST"]) -@login_required -@is_package_page -def bulk_change_release_page(package): - if not package.checkPerm(current_user, Permission.MAKE_RELEASE): - return redirect(package.getDetailsURL()) - - # Initial form class from post data and default data - form = BulkReleaseForm() - - if request.method == "GET": - form.only_change_none.data = True - elif request.method == "POST" and form.validate(): - only_change_none = form.only_change_none.data - - for release in package.releases.all(): - if form["set_min"].data and (not only_change_none or release.min_rel is None): - release.min_rel = form["min_rel"].data.getActual() - if form["set_max"].data and (not only_change_none or release.max_rel is None): - release.max_rel = form["max_rel"].data.getActual() - - db.session.commit() - - return redirect(package.getDetailsURL()) - - return render_template("packages/release_bulk_change.html", package=package, form=form) diff --git a/app/views/packages/screenshots.py b/app/views/packages/screenshots.py deleted file mode 100644 index dbb002b..0000000 --- a/app/views/packages/screenshots.py +++ /dev/null @@ -1,105 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * - -from app.utils import * - -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * - - -class CreateScreenshotForm(FlaskForm): - title = StringField("Title/Caption", [Optional()]) - fileUpload = FileField("File Upload", [InputRequired()]) - submit = SubmitField("Save") - - -class EditScreenshotForm(FlaskForm): - title = StringField("Title/Caption", [Optional()]) - approved = BooleanField("Is Approved") - delete = BooleanField("Delete") - submit = SubmitField("Save") - -@app.route("/packages///screenshots/new/", methods=["GET", "POST"]) -@login_required -@is_package_page -def create_screenshot_page(package, id=None): - if not package.checkPerm(current_user, Permission.ADD_SCREENSHOTS): - return redirect(package.getDetailsURL()) - - # Initial form class from post data and default data - form = CreateScreenshotForm() - if request.method == "POST" and form.validate(): - uploadedPath = doFileUpload(form.fileUpload.data, "image", - "a PNG or JPG image file") - if uploadedPath is not None: - ss = PackageScreenshot() - ss.package = package - ss.title = form["title"].data or "Untitled" - ss.url = uploadedPath - ss.approved = package.checkPerm(current_user, Permission.APPROVE_SCREENSHOT) - db.session.add(ss) - - msg = "{}: Screenshot added {}" \ - .format(package.title, ss.title) - triggerNotif(package.author, current_user, msg, package.getDetailsURL()) - db.session.commit() - return redirect(package.getDetailsURL()) - - return render_template("packages/screenshot_new.html", package=package, form=form) - -@app.route("/packages///screenshots//edit/", methods=["GET", "POST"]) -@login_required -@is_package_page -def edit_screenshot_page(package, id): - screenshot = PackageScreenshot.query.get(id) - if screenshot is None or screenshot.package != package: - abort(404) - - canEdit = package.checkPerm(current_user, Permission.ADD_SCREENSHOTS) - canApprove = package.checkPerm(current_user, Permission.APPROVE_SCREENSHOT) - if not (canEdit or canApprove): - return redirect(package.getDetailsURL()) - - clearNotifications(screenshot.getEditURL()) - - # Initial form class from post data and default data - form = EditScreenshotForm(formdata=request.form, obj=screenshot) - if request.method == "POST" and form.validate(): - if canEdit and form["delete"].data: - PackageScreenshot.query.filter_by(id=id).delete() - - else: - wasApproved = screenshot.approved - - if canEdit: - screenshot.title = form["title"].data or "Untitled" - - if canApprove: - screenshot.approved = form["approved"].data - else: - screenshot.approved = wasApproved - - db.session.commit() - return redirect(package.getDetailsURL()) - - return render_template("packages/screenshot_edit.html", package=package, screenshot=screenshot, form=form) diff --git a/app/views/sass.py b/app/views/sass.py deleted file mode 100644 index 825f494..0000000 --- a/app/views/sass.py +++ /dev/null @@ -1,67 +0,0 @@ -# -*- coding: utf-8 -*- -""" -A small Flask extension that makes it easy to use Sass (SCSS) with your -Flask application. - -Code unabashedly adapted from https://github.com/weapp/flask-coffee2js - -:copyright: (c) 2012 by Ivan Miric. -:license: MIT, see LICENSE for more details. -""" - -import os -import os.path -import codecs -from flask import * -from scss import Scss - -from app import app - -def _convert(dir, src, dst): - original_wd = os.getcwd() - os.chdir(dir) - - css = Scss() - source = codecs.open(src, 'r', encoding='utf-8').read() - output = css.compile(source) - - os.chdir(original_wd) - - outfile = codecs.open(dst, 'w', encoding='utf-8') - outfile.write(output) - outfile.close() - -def _getDirPath(originalPath, create=False): - path = originalPath - - if not os.path.isdir(path): - path = os.path.join(app.root_path, path) - - if not os.path.isdir(path): - if create: - os.mkdir(path) - else: - raise IOError("Unable to find " + originalPath) - - return path - -def sass(app, inputDir='scss', outputPath='static', force=False, cacheDir="public/static"): - static_url_path = app.static_url_path - inputDir = _getDirPath(inputDir) - cacheDir = _getDirPath(cacheDir or outputPath, True) - - def _sass(filepath): - sassfile = "%s/%s.scss" % (inputDir, filepath) - cacheFile = "%s/%s.css" % (cacheDir, filepath) - - # Source file exists, and needs regenerating - if os.path.isfile(sassfile) and (force or not os.path.isfile(cacheFile) or \ - os.path.getmtime(sassfile) > os.path.getmtime(cacheFile)): - _convert(inputDir, sassfile, cacheFile) - app.logger.debug('Compiled %s into %s' % (sassfile, cacheFile)) - - return send_from_directory(cacheDir, filepath + ".css") - - app.add_url_rule("/%s/.css" % (outputPath), 'sass', _sass) - -sass(app) diff --git a/app/views/tasks.py b/app/views/tasks.py deleted file mode 100644 index 20eaef5..0000000 --- a/app/views/tasks.py +++ /dev/null @@ -1,75 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -import flask_menu as menu -from app import app, csrf -from app.models import * -from app.tasks import celery, TaskError -from app.tasks.importtasks import getMeta -from app.utils import shouldReturnJson -# from celery.result import AsyncResult - -from app.utils import * - -@csrf.exempt -@app.route("/tasks/getmeta/new/", methods=["POST"]) -@login_required -def new_getmeta_page(): - author = request.args.get("author") - author = current_user.forums_username if author is None else author - aresult = getMeta.delay(request.args.get("url"), author) - return jsonify({ - "poll_url": url_for("check_task", id=aresult.id), - }) - -@app.route("/tasks//") -def check_task(id): - result = celery.AsyncResult(id) - status = result.status - traceback = result.traceback - result = result.result - - info = None - if isinstance(result, Exception): - info = { - 'id': id, - 'status': status, - } - - if current_user.is_authenticated and current_user.rank.atLeast(UserRank.ADMIN): - info["error"] = str(traceback) - elif str(result)[1:12] == "TaskError: ": - info["error"] = str(result)[12:-1] - else: - info["error"] = "Unknown server error" - else: - info = { - 'id': id, - 'status': status, - 'result': result, - } - - if shouldReturnJson(): - return jsonify(info) - else: - r = request.args.get("r") - if r is not None and status == "SUCCESS": - return redirect(r) - else: - return render_template("tasks/view.html", info=info) diff --git a/app/views/threads.py b/app/views/threads.py deleted file mode 100644 index e430577..0000000 --- a/app/views/threads.py +++ /dev/null @@ -1,212 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from app import app -from app.models import * -from app.utils import triggerNotif, clearNotifications - -import datetime - -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * - -@app.route("/threads/") -def threads_page(): - query = Thread.query - if not Permission.SEE_THREAD.check(current_user): - query = query.filter_by(private=False) - return render_template("threads/list.html", threads=query.all()) - - -@app.route("/threads//subscribe/", methods=["POST"]) -@login_required -def thread_subscribe_page(id): - thread = Thread.query.get(id) - if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD): - abort(404) - - if current_user in thread.watchers: - flash("Already subscribed!", "success") - else: - flash("Subscribed to thread", "success") - thread.watchers.append(current_user) - db.session.commit() - - return redirect(url_for("thread_page", id=id)) - - -@app.route("/threads//unsubscribe/", methods=["POST"]) -@login_required -def thread_unsubscribe_page(id): - thread = Thread.query.get(id) - if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD): - abort(404) - - if current_user in thread.watchers: - flash("Unsubscribed!", "success") - thread.watchers.remove(current_user) - db.session.commit() - else: - flash("Not subscribed to thread", "success") - - return redirect(url_for("thread_page", id=id)) - - -@app.route("/threads//", methods=["GET", "POST"]) -def thread_page(id): - clearNotifications(url_for("thread_page", id=id)) - - thread = Thread.query.get(id) - if thread is None or not thread.checkPerm(current_user, Permission.SEE_THREAD): - abort(404) - - if current_user.is_authenticated and request.method == "POST": - comment = request.form["comment"] - - if not current_user.canCommentRL(): - flash("Please wait before commenting again", "danger") - if package: - return redirect(package.getDetailsURL()) - else: - return redirect(url_for("home_page")) - - if len(comment) <= 500 and len(comment) > 3: - reply = ThreadReply() - reply.author = current_user - reply.comment = comment - db.session.add(reply) - - thread.replies.append(reply) - if not current_user in thread.watchers: - thread.watchers.append(current_user) - - msg = None - if thread.package is None: - msg = "New comment on '{}'".format(thread.title) - else: - msg = "New comment on '{}' on package {}".format(thread.title, thread.package.title) - - - for user in thread.watchers: - if user != current_user: - triggerNotif(user, current_user, msg, url_for("thread_page", id=thread.id)) - - db.session.commit() - - return redirect(url_for("thread_page", id=id)) - - else: - flash("Comment needs to be between 3 and 500 characters.") - - return render_template("threads/view.html", thread=thread) - - -class ThreadForm(FlaskForm): - title = StringField("Title", [InputRequired(), Length(3,100)]) - comment = TextAreaField("Comment", [InputRequired(), Length(10, 500)]) - private = BooleanField("Private") - submit = SubmitField("Open Thread") - -@app.route("/threads/new/", methods=["GET", "POST"]) -@login_required -def new_thread_page(): - form = ThreadForm(formdata=request.form) - - package = None - if "pid" in request.args: - package = Package.query.get(int(request.args.get("pid"))) - if package is None: - flash("Unable to find that package!", "error") - - # Don't allow making orphan threads on approved packages for now - if package is None: - abort(403) - - def_is_private = request.args.get("private") or False - if package is None: - def_is_private = True - allow_change = package and package.approved - is_review_thread = package and not package.approved - - # Check that user can make the thread - if not package.checkPerm(current_user, Permission.CREATE_THREAD): - flash("Unable to create thread!", "error") - return redirect(url_for("home_page")) - - # Only allow creating one thread when not approved - elif is_review_thread and package.review_thread is not None: - flash("A review thread already exists!", "error") - return redirect(url_for("thread_page", id=package.review_thread.id)) - - elif not current_user.canOpenThreadRL(): - flash("Please wait before opening another thread", "danger") - - if package: - return redirect(package.getDetailsURL()) - else: - return redirect(url_for("home_page")) - - # Set default values - elif request.method == "GET": - form.private.data = def_is_private - form.title.data = request.args.get("title") or "" - - # Validate and submit - elif request.method == "POST" and form.validate(): - thread = Thread() - thread.author = current_user - thread.title = form.title.data - thread.private = form.private.data if allow_change else def_is_private - thread.package = package - db.session.add(thread) - - thread.watchers.append(current_user) - if package is not None and package.author != current_user: - thread.watchers.append(package.author) - - reply = ThreadReply() - reply.thread = thread - reply.author = current_user - reply.comment = form.comment.data - db.session.add(reply) - - thread.replies.append(reply) - - db.session.commit() - - if is_review_thread: - package.review_thread = thread - - notif_msg = None - if package is not None: - notif_msg = "New thread '{}' on package {}".format(thread.title, package.title) - triggerNotif(package.author, current_user, notif_msg, url_for("thread_page", id=thread.id)) - else: - notif_msg = "New thread '{}'".format(thread.title) - - for user in User.query.filter(User.rank >= UserRank.EDITOR).all(): - triggerNotif(user, current_user, notif_msg, url_for("thread_page", id=thread.id)) - - db.session.commit() - - return redirect(url_for("thread_page", id=thread.id)) - - - return render_template("threads/new.html", form=form, allow_private_change=allow_change, package=package) diff --git a/app/views/thumbnails.py b/app/views/thumbnails.py deleted file mode 100644 index 8303067..0000000 --- a/app/views/thumbnails.py +++ /dev/null @@ -1,73 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from app import app - -import os -from PIL import Image - -ALLOWED_RESOLUTIONS=[(100,67), (270,180), (350,233)] - -def mkdir(path): - if not os.path.isdir(path): - os.mkdir(path) - -mkdir("app/public/thumbnails/") - -def resize_and_crop(img_path, modified_path, size): - img = Image.open(img_path) - - # Get current and desired ratio for the images - img_ratio = img.size[0] / float(img.size[1]) - ratio = size[0] / float(size[1]) - - # Is more portrait than target, scale and crop - if ratio > img_ratio: - img = img.resize((int(size[0]), int(size[0] * img.size[1] / img.size[0])), - Image.BICUBIC) - box = (0, (img.size[1] - size[1]) / 2, img.size[0], (img.size[1] + size[1]) / 2) - img = img.crop(box) - - # Is more landscape than target, scale and crop - elif ratio < img_ratio: - img = img.resize((int(size[1] * img.size[0] / img.size[1]), int(size[1])), - Image.BICUBIC) - box = ((img.size[0] - size[0]) / 2, 0, (img.size[0] + size[0]) / 2, img.size[1]) - img = img.crop(box) - - # Is exactly the same ratio as target - else: - img = img.resize(size, Image.BICUBIC) - - img.save(modified_path) - - -@app.route("/thumbnails//") -def make_thumbnail(img, level): - if level > len(ALLOWED_RESOLUTIONS) or level <= 0: - abort(403) - - w, h = ALLOWED_RESOLUTIONS[level - 1] - - mkdir("app/public/thumbnails/{:d}/".format(level)) - - cache_filepath = "public/thumbnails/{:d}/{}".format(level, img) - source_filepath = "public/uploads/" + img - - resize_and_crop("app/" + source_filepath, "app/" + cache_filepath, (w, h)) - return send_file(cache_filepath) diff --git a/app/views/users/__init__.py b/app/views/users/__init__.py deleted file mode 100644 index 45af431..0000000 --- a/app/views/users/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from . import users, githublogin, notifications diff --git a/app/views/users/githublogin.py b/app/views/users/githublogin.py deleted file mode 100644 index 9ea2584..0000000 --- a/app/views/users/githublogin.py +++ /dev/null @@ -1,73 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from flask_login import login_user, logout_user -from sqlalchemy import func -import flask_menu as menu -from flask_github import GitHub -from app import app, github -from app.models import * -from app.utils import loginUser - -@app.route("/user/github/start/") -def github_signin_page(): - return github.authorize("") - -@app.route("/user/github/callback/") -@github.authorized_handler -def github_authorized(oauth_token): - next_url = request.args.get("next") - if oauth_token is None: - flash("Authorization failed [err=gh-oauth-login-failed]", "danger") - return redirect(url_for("user.login")) - - import requests - - # Get Github username - url = "https://api.github.com/user" - r = requests.get(url, headers={"Authorization": "token " + oauth_token}) - username = r.json()["login"] - - # Get user by github username - userByGithub = User.query.filter(func.lower(User.github_username) == func.lower(username)).first() - - # If logged in, connect - if current_user and current_user.is_authenticated: - if userByGithub is None: - current_user.github_username = username - db.session.commit() - flash("Linked github to account", "success") - return redirect(url_for("home_page")) - else: - flash("Github account is already associated with another user", "danger") - return redirect(url_for("home_page")) - - # If not logged in, log in - else: - if userByGithub is None: - flash("Unable to find an account for that Github user", "error") - return redirect(url_for("user_claim_page")) - elif loginUser(userByGithub): - if current_user.password is None: - return redirect(next_url or url_for("set_password_page", optional=True)) - else: - return redirect(next_url or url_for("home_page")) - else: - flash("Authorization failed [err=gh-login-failed]", "danger") - return redirect(url_for("user.login")) diff --git a/app/views/users/notifications.py b/app/views/users/notifications.py deleted file mode 100644 index 23dbb31..0000000 --- a/app/views/users/notifications.py +++ /dev/null @@ -1,33 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import current_user, login_required -from app import app -from app.models import * - -@app.route("/notifications/") -@login_required -def notifications_page(): - return render_template("notifications/list.html") - -@app.route("/notifications/clear/", methods=["POST"]) -@login_required -def clear_notifications_page(): - current_user.notifications.clear() - db.session.commit() - return redirect(url_for("notifications_page")) diff --git a/app/views/users/users.py b/app/views/users/users.py deleted file mode 100644 index 1a81c7d..0000000 --- a/app/views/users/users.py +++ /dev/null @@ -1,308 +0,0 @@ -# Content DB -# Copyright (C) 2018 rubenwardy -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - - -from flask import * -from flask_user import * -from flask_login import login_user, logout_user -from app import app, markdown -from app.models import * -from flask_wtf import FlaskForm -from wtforms import * -from wtforms.validators import * -from app.utils import randomString, loginUser, rank_required -from app.tasks.forumtasks import checkForumAccount -from app.tasks.emails import sendVerifyEmail, sendEmailRaw -from app.tasks.phpbbparser import getProfile - -# Define the User profile form -class UserProfileForm(FlaskForm): - display_name = StringField("Display name", [Optional(), Length(2, 20)]) - email = StringField("Email", [Optional(), Email()], filters = [lambda x: x or None]) - website_url = StringField("Website URL", [Optional(), URL()], filters = [lambda x: x or None]) - donate_url = StringField("Donation URL", [Optional(), URL()], filters = [lambda x: x or None]) - rank = SelectField("Rank", [Optional()], choices=UserRank.choices(), coerce=UserRank.coerce, default=UserRank.NEW_MEMBER) - submit = SubmitField("Save") - - -@app.route("/users/", methods=["GET"]) -def user_list_page(): - users = User.query.order_by(db.desc(User.rank), db.asc(User.display_name)).all() - return render_template("users/list.html", users=users) - - -@app.route("/users//", methods=["GET", "POST"]) -def user_profile_page(username): - user = User.query.filter_by(username=username).first() - if not user: - abort(404) - - form = None - if user.checkPerm(current_user, Permission.CHANGE_DNAME) or \ - user.checkPerm(current_user, Permission.CHANGE_EMAIL) or \ - user.checkPerm(current_user, Permission.CHANGE_RANK): - # Initialize form - form = UserProfileForm(formdata=request.form, obj=user) - - # Process valid POST - if request.method=="POST" and form.validate(): - # Copy form fields to user_profile fields - if user.checkPerm(current_user, Permission.CHANGE_DNAME): - user.display_name = form["display_name"].data - user.website_url = form["website_url"].data - user.donate_url = form["donate_url"].data - - if user.checkPerm(current_user, Permission.CHANGE_RANK): - newRank = form["rank"].data - if current_user.rank.atLeast(newRank): - user.rank = form["rank"].data - else: - flash("Can't promote a user to a rank higher than yourself!", "error") - - if user.checkPerm(current_user, Permission.CHANGE_EMAIL): - newEmail = form["email"].data - if newEmail != user.email and newEmail.strip() != "": - token = randomString(32) - - ver = UserEmailVerification() - ver.user = user - ver.token = token - ver.email = newEmail - db.session.add(ver) - db.session.commit() - - task = sendVerifyEmail.delay(newEmail, token) - return redirect(url_for("check_task", id=task.id, r=url_for("user_profile_page", username=username))) - - # Save user_profile - db.session.commit() - - # Redirect to home page - return redirect(url_for("user_profile_page", username=username)) - - packages = user.packages.filter_by(soft_deleted=False) - if not current_user.is_authenticated or (user != current_user and not current_user.canAccessTodoList()): - packages = packages.filter_by(approved=True) - packages = packages.order_by(db.asc(Package.title)) - - topics_to_add = None - if current_user == user or user.checkPerm(current_user, Permission.CHANGE_AUTHOR): - topics_to_add = ForumTopic.query \ - .filter_by(author_id=user.id) \ - .filter(~ db.exists().where(Package.forums==ForumTopic.topic_id)) \ - .order_by(db.asc(ForumTopic.name), db.asc(ForumTopic.title)) \ - .all() - - # Process GET or invalid POST - return render_template("users/user_profile_page.html", - user=user, form=form, packages=packages, topics_to_add=topics_to_add) - - -@app.route("/users//check/", methods=["POST"]) -@login_required -def user_check(username): - user = User.query.filter_by(username=username).first() - if user is None: - abort(404) - - if current_user != user and not current_user.rank.atLeast(UserRank.MODERATOR): - abort(403) - - if user.forums_username is None: - abort(404) - - task = checkForumAccount.delay(user.forums_username) - next_url = url_for("user_profile_page", username=username) - - return redirect(url_for("check_task", id=task.id, r=next_url)) - - -class SendEmailForm(FlaskForm): - subject = StringField("Subject", [InputRequired(), Length(1, 300)]) - text = TextAreaField("Message", [InputRequired()]) - submit = SubmitField("Send") - - -@app.route("/users//email/", methods=["GET", "POST"]) -@rank_required(UserRank.MODERATOR) -def send_email_page(username): - user = User.query.filter_by(username=username).first() - if user is None: - abort(404) - - next_url = url_for("user_profile_page", username=user.username) - - if user.email is None: - flash("User has no email address!", "error") - return redirect(next_url) - - form = SendEmailForm(request.form) - if form.validate_on_submit(): - text = form.text.data - html = markdown(text) - task = sendEmailRaw.delay([user.email], form.subject.data, text, html) - return redirect(url_for("check_task", id=task.id, r=next_url)) - - return render_template("users/send_email.html", form=form) - - - -class SetPasswordForm(FlaskForm): - email = StringField("Email", [Optional(), Email()]) - password = PasswordField("New password", [InputRequired(), Length(2, 100)]) - password2 = PasswordField("Verify password", [InputRequired(), Length(2, 100)]) - submit = SubmitField("Save") - -@app.route("/user/set-password/", methods=["GET", "POST"]) -@login_required -def set_password_page(): - if current_user.password is not None: - return redirect(url_for("user.change_password")) - - form = SetPasswordForm(request.form) - if current_user.email == None: - form.email.validators = [InputRequired(), Email()] - - if request.method == "POST" and form.validate(): - one = form.password.data - two = form.password2.data - if one == two: - # Hash password - hashed_password = user_manager.hash_password(form.password.data) - - # Change password - user_manager.update_password(current_user, hashed_password) - - # Send 'password_changed' email - if user_manager.enable_email and user_manager.send_password_changed_email and current_user.email: - emails.send_password_changed_email(current_user) - - # Send password_changed signal - signals.user_changed_password.send(current_app._get_current_object(), user=current_user) - - # Prepare one-time system message - flash('Your password has been changed successfully.', 'success') - - newEmail = form["email"].data - if newEmail != current_user.email and newEmail.strip() != "": - token = randomString(32) - - ver = UserEmailVerification() - ver.user = current_user - ver.token = token - ver.email = newEmail - db.session.add(ver) - db.session.commit() - - task = sendVerifyEmail.delay(newEmail, token) - return redirect(url_for("check_task", id=task.id, r=url_for("user_profile_page", username=current_user.username))) - else: - return redirect(url_for("user_profile_page", username=current_user.username)) - else: - flash("Passwords do not match", "error") - - return render_template("users/set_password.html", form=form, optional=request.args.get("optional")) - - -@app.route("/user/claim/", methods=["GET", "POST"]) -def user_claim_page(): - username = request.args.get("username") - if username is None: - username = "" - else: - method = request.args.get("method") - user = User.query.filter_by(forums_username=username).first() - if user and user.rank.atLeast(UserRank.NEW_MEMBER): - flash("User has already been claimed", "error") - return redirect(url_for("user_claim_page")) - elif user is None and method == "github": - flash("Unable to get Github username for user", "error") - return redirect(url_for("user_claim_page")) - elif user is None: - flash("Unable to find that user", "error") - return redirect(url_for("user_claim_page")) - - if user is not None and method == "github": - return redirect(url_for("github_signin_page")) - - token = None - if "forum_token" in session: - token = session["forum_token"] - else: - token = randomString(32) - session["forum_token"] = token - - if request.method == "POST": - ctype = request.form.get("claim_type") - username = request.form.get("username") - - if username is None or len(username.strip()) < 2: - flash("Invalid username", "error") - elif ctype == "github": - task = checkForumAccount.delay(username) - return redirect(url_for("check_task", id=task.id, r=url_for("user_claim_page", username=username, method="github"))) - elif ctype == "forum": - user = User.query.filter_by(forums_username=username).first() - if user is not None and user.rank.atLeast(UserRank.NEW_MEMBER): - flash("That user has already been claimed!", "error") - return redirect(url_for("user_claim_page")) - - # Get signature - sig = None - try: - profile = getProfile("https://forum.minetest.net", username) - sig = profile.signature - except IOError: - flash("Unable to get forum signature - does the user exist?", "error") - return redirect(url_for("user_claim_page", username=username)) - - # Look for key - if token in sig: - if user is None: - user = User(username) - user.forums_username = username - db.session.add(user) - db.session.commit() - - if loginUser(user): - return redirect(url_for("set_password_page")) - else: - flash("Unable to login as user", "error") - return redirect(url_for("user_claim_page", username=username)) - - else: - flash("Could not find the key in your signature!", "error") - return redirect(url_for("user_claim_page", username=username)) - else: - flash("Unknown claim type", "error") - - return render_template("users/claim.html", username=username, key=token) - -@app.route("/users/verify/") -def verify_email_page(): - token = request.args.get("token") - ver = UserEmailVerification.query.filter_by(token=token).first() - if ver is None: - flash("Unknown verification token!", "error") - else: - ver.user.email = ver.email - db.session.delete(ver) - db.session.commit() - - if current_user.is_authenticated: - return redirect(url_for("user_profile_page", username=current_user.username)) - else: - return redirect(url_for("home_page")) -- cgit v1.2.3