From 5424f0aa3499ef9cad33ebad4db055860b8000c8 Mon Sep 17 00:00:00 2001
From: rubenwardy <rw@rubenwardy.com>
Date: Fri, 11 May 2018 13:25:42 +0100
Subject: [PATCH] Read from description.txt

---
 app/static/package_create.js |  3 ++-
 app/tasks/importtasks.py     | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/static/package_create.js b/app/static/package_create.js
index 25cdd3e2..89b21bc4 100644
--- a/app/static/package_create.js
+++ b/app/static/package_create.js
@@ -68,7 +68,8 @@ $(function() {
 
 			performTask("/tasks/getmeta/new/?url=" + encodeURI(repoURL)).then(function(result) {
 				console.log(result)
-				$("#name").val(result.name)
+				$("#name").val(result.name || "")
+				$("#title").val(result.title || "")
 				const desc = result.description || ""
 				if (desc.length > 0) {
 					const idx = desc.indexOf(".")
diff --git a/app/tasks/importtasks.py b/app/tasks/importtasks.py
index 50b5f5d0..2027f743 100644
--- a/app/tasks/importtasks.py
+++ b/app/tasks/importtasks.py
@@ -25,6 +25,12 @@ class GithubURLMaker:
 	def getModConfURL(self):
 		return self.baseUrl + "/mod.conf"
 
+	def getDescURL(self):
+		return self.baseUrl + "/description.txt"
+
+	def getScreenshotURL(self):
+		return self.baseUrl + "/screenshot.png"
+
 def parseConf(string):
 	retval = {}
 	for line in string.split("\n"):
@@ -55,7 +61,7 @@ def getMeta(urlstr):
 	try:
 		contents = urllib.request.urlopen(urlmaker.getModConfURL()).read().decode("utf-8")
 		conf = parseConf(contents)
-		for key in ["name", "description"]:
+		for key in ["name", "description", "title"]:
 			try:
 				result[key] = conf[key]
 			except KeyError:
@@ -65,4 +71,11 @@ def getMeta(urlstr):
 	except OSError:
 		print("mod.conf does not exist")
 
+	if not "description" in result:
+		try:
+			contents = urllib.request.urlopen(urlmaker.getDescURL()).read().decode("utf-8")
+			result["description"] = contents.strip()
+		except OSError:
+			print("description.txt does not exist!")
+
 	return result