show the original file in /marseys

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/<path:path>')
 @limiter.exempt
 def asset_submissions(path):

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())
 

files/templates/marseys.html

@@ -10,8 +10,11 @@
 		<th>#</th>
 		<th>Name</th>
 		<th>Marsey</th>
-		<th><a href="?sort=usage">Usage</a></th>
-		{% if SITE == 'rdrama.net' %}<th><a href="?sort=author">Author</a></th>{% endif %}
+		<th onclick="sort_table(3)">Usage</th>
+		{% if SITE == 'rdrama.net' %}
+			<th><a href="?sort=author">Author</a></th>
+			<th>Original File</th>
+		{% endif %}
 	</tr>
 </thead>
 <tbody id="marseys-table">
@@ -22,9 +25,12 @@
 			<td>{{marsey.name}}</td>
 			<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":#{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}.webp"></td>
 			<td>{{marsey.count}}</td>
-			{% if SITE == 'rdrama.net' %}
-				<td>{% include "user_in_table.html" %}</td>
-			{% endif %}
+			<td>{% include "user_in_table.html" %}</td>
+			<td>
+				{% if marsey.og %}
+					<a href="/asset_submissions/marseys/original/{{marsey.og}}">{{marsey.og}}</a>
+				{% endif %}
+			</td>
 		</tr>
 	{% endfor %}
 {% else %}
@@ -41,4 +47,6 @@
 </tbody>
 </table>
 
+<script defer src="{{asset('js/sort_table.js')}}"></script>
+
 {% endblock %}

files/templates/original_assets.html

@@ -1,33 +0,0 @@
-{% extends "default.html" %}
-{% block content %}
-<style>
-	.asset-submission {
-		max-width: 150px !important;
-		max-height: 150px !important;
-	}
-</style>
-<pre>
-
-	
-</pre>
-<div class="overflow-x-auto"><table class="table table-striped mb-5">
-<thead class="bg-primary text-white">
-	<tr>
-		<th>#</th>
-		<th>Name</th>
-		<th>Image</th>
-	</tr>
-</thead>
-<tbody>
-	{% for image in images %}
-		<tr>
-			<td>{{loop.index}}</td>
-			<td>{{image}}</td>
-			<td><img class="asset-submission" loading="lazy" alt="{{name}}" src="/asset_submissions/{{type}}/original/{{image}}"></td>
-		</tr>
-	{% endfor %}
-
-</tbody>
-</table>
-
-{% endblock %}