From 6ac585d9f5ee6133993017b82a206dc441b1ccf8 Mon Sep 17 00:00:00 2001
From: iou1name <iou1name@national.shitposting.agency>
Date: Tue, 5 Jun 2018 06:58:18 -0400
Subject: [PATCH] allow uploading multiple files

---
 fileHost.py          | 60 +++++++++++++++++++++++---------------------
 templates/index.html |  2 +-
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/fileHost.py b/fileHost.py
index d0d5ae9..f03fdb0 100755
--- a/fileHost.py
+++ b/fileHost.py
@@ -362,39 +362,41 @@ def index():
 	if request.method == "GET":
 		return render_template("index.html")
 
-	file = request.files.get('file')
-	fname = secure_filename(file.filename)
-	pre = get_rand_chars(8)
-	fdir = app.config.get("UPLOAD_DIR")
+	urls = []
+	for file in request.files.getlist("file"):
+		fname = secure_filename(file.filename)
+		pre = get_rand_chars(8)
+		fdir = app.config.get("UPLOAD_DIR")
 
-	if request.form.get("randname") == "on":
-		fname = pre + os.path.splitext(fname)[1]
-	else:
-		fname = pre + "_" + fname
+		if request.form.get("randname") == "on":
+			fname = pre + os.path.splitext(fname)[1]
+		else:
+			fname = pre + "_" + fname
 
-	if request.form.get("delflag") == "on":
-		try:
-			delete_time = int(request.form.get("delnum"))
-			assert  delete_time >= 1 and delete_time <= 59
-		except (ValueError, AssertionError):
-			return 'Invalid entry: "delnum=' + request.form.get("delnum") + '"'
-		del_dict = {"minute": 60, "hour": 3600, "day": 3600*24, "week": 3600*24*7}
-		try:
-			delete_time *= del_dict[request.form.get("deltype")]
-		except KeyError:
-			return 'Invalid entry: "deltype=' + request.form.get("deltype")+'"'
-		delete_time = int(time.time()) + delete_time
+		if request.form.get("delflag") == "on":
+			try:
+				delete_time = int(request.form.get("delnum"))
+				assert  delete_time >= 1 and delete_time <= 59
+			except (ValueError, AssertionError):
+				return 'Invalid entry: "delnum=' + request.form.get("delnum") + '"'
+			del_dict = {"minute": 60, "hour": 3600, "day": 3600*24, "week": 3600*24*7}
+			try:
+				delete_time *= del_dict[request.form.get("deltype")]
+			except KeyError:
+				return 'Invalid entry: "deltype=' + request.form.get("deltype")+'"'
+			delete_time = int(time.time()) + delete_time
 
-		db_execute(
-			"INSERT INTO UPLOADS (filename, uploaded_by, delete_date)"
-			"VALUES (?,?,?)", (fname, username, delete_time))
-	else:
-		db_execute("INSERT INTO uploads (filename, uploaded_by) VALUES (?,?)",
-			(fname, username))
+			db_execute(
+				"INSERT INTO UPLOADS (filename, uploaded_by, delete_date)"
+				"VALUES (?,?,?)", (fname, username, delete_time))
+		else:
+			db_execute("INSERT INTO uploads (filename, uploaded_by) VALUES (?,?)",
+				(fname, username))
 
-	file.save(os.path.join(fdir, fname))
-	url = app.config.get("UPLOAD_URL") + fname
-	return url
+		file.save(os.path.join(fdir, fname))
+		url = app.config.get("UPLOAD_URL") + fname
+		urls.append(url)
+	return "<br />".join(urls)
 
 
 def get_rand_chars(n):
diff --git a/templates/index.html b/templates/index.html
index ffeb396..52fc20f 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,7 @@
     <a href="{{ url_for('logout') }}">Logout</a><br />
     <a href="{{ url_for('manage_uploads') }}">Manage Uploads</a><br />
 	<p>Select file to upload:
-    <p><input type="file" name="file" required/><br />
+    <p><input type="file" name="file" required multiple/><br />
 	<input type="checkbox" name="randname"/> Generate random filename.<br />
 	<input type="checkbox" name="delflag"/> Delete this file in <input type="number" name="delnum" min="1" max="59" value="1"/>
 	<select name="deltype">