diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py index f8058e9dd..e46102737 100644 --- a/files/routes/asset_submissions.py +++ b/files/routes/asset_submissions.py @@ -9,18 +9,6 @@ from files.helpers.get import * from files.helpers.wrappers import * from files.routes.static import marsey_list -@app.get('/marseys/original') -@auth_required -def original_marseys(v): - images = sorted(listdir("/asset_submissions/marseys/original")) - return render_template("original_assets.html", v=v, images=images, type="marseys") - -@app.get('/hats/original') -@auth_required -def original_hats(v): - images = sorted(listdir("/asset_submissions/hats/original")) - return render_template("original_assets.html", v=v, images=images, type="hats") - @app.get('/asset_submissions/') @limiter.exempt def asset_submissions(path): diff --git a/files/routes/static.py b/files/routes/static.py index 3b970664d..b42ab4451 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -26,6 +26,17 @@ def marseys(v): sort = request.values.get("sort", "usage") if sort == "usage": marseys = marseys.order_by(Marsey.count.desc(), User.username) else: marseys = marseys.order_by(User.username, Marsey.count.desc()) + + original = listdir("/asset_submissions/marseys/original") + for m in marseys: + if f'{marsey.name}.png' in original: + marsey.og = f'{marsey.name}.png' + elif f'{marsey.name}.webp' in original: + marsey.og = f'{marsey.name}.webp' + elif f'{marsey.name}.gif' in original: + marsey.og = f'{marsey.name}.gif' + elif f'{marsey.name}.jpeg' in original: + marsey.og = f'{marsey.name}.jpeg' else: marseys = g.db.query(Marsey).filter(Marsey.submitter_id==None).order_by(Marsey.count.desc()) diff --git a/files/templates/marseys.html b/files/templates/marseys.html index f2358404d..d07927556 100644 --- a/files/templates/marseys.html +++ b/files/templates/marseys.html @@ -10,8 +10,11 @@ # Name Marsey - Usage - {% if SITE == 'rdrama.net' %}Author{% endif %} + Usage + {% if SITE == 'rdrama.net' %} + Author + Original File + {% endif %} @@ -22,9 +25,12 @@ {{marsey.name}} :#{{marsey.name}}: {{marsey.count}} - {% if SITE == 'rdrama.net' %} - {% include "user_in_table.html" %} - {% endif %} + {% include "user_in_table.html" %} + + {% if marsey.og %} + {{marsey.og}} + {% endif %} + {% endfor %} {% else %} @@ -41,4 +47,6 @@ + + {% endblock %} \ No newline at end of file diff --git a/files/templates/original_assets.html b/files/templates/original_assets.html deleted file mode 100644 index 72df9a9c0..000000000 --- a/files/templates/original_assets.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends "default.html" %} -{% block content %} - -
-
-	
-
-
- - - - - - - - - {% for image in images %} - - - - - - {% endfor %} - - -
#NameImage
{{loop.index}}{{image}}{{name}}
- -{% endblock %} \ No newline at end of file