songs2slides

commit 3963fb2492ee6ba15a319b388b6dab94bbd072f9
parent 7577b9cdb9f78f952f30ef35dea15217a9ebf0ba
Author: AsherMorgan <59518073+AsherMorgan@users.noreply.github.com>
Date:   Tue, 21 Jul 2020 12:55:55 -0700

Fix bugs in routes.pptx method.

Diffstat:
M
Songs2Slides/routes.py
 | 
13
++++++++++---

1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/Songs2Slides/routes.py b/Songs2Slides/routes.py
@@ -34,15 +34,22 @@ def settingsJSON():
 # Get Powerpoint
 @app.route("/pptx", methods=["POST"])
 def pptx():
+    # Get settings
+    settings = deepcopy(defaultSettings)
     try:
-        # Get settings and lyrics
-        settings = json.loads(request.form["settings"])
-        lyrics = json.loads(request.form["lyrics"])
+        for setting in request.json["settings"]:
+            settings[setting] = request.json["settings"][setting]
+    except:
+        pass
 
+    try:
         # Get temp
         temp = tempfile.NamedTemporaryFile(mode="w+t", suffix=".pptx", delete=False)
         temp.close()
 
+        # Get lyrics
+        lyrics = json.loads(request.form["lyrics"])
+
         # Save uploaded powerpoint
         if (request.files["pptxFile"].filename != ""):
             request.files["pptxFile"].save(temp.name)