From f3ab080cb2304ef9778ae9c0914f203e8fd8c2a6 Mon Sep 17 00:00:00 2001
From: Johan Vandegriff <johan@vandymail.com>
Date: Fri, 25 Jun 2021 13:08:25 -0400
Subject: [PATCH] added upload page to send images thru BoggleCV :)

---
 boggle.py                   | 53 ++++++++++++++++++++++++++++++++++---
 games.py                    |  3 +--
 templates/boggle/lobby.html |  1 +
 3 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/boggle.py b/boggle.py
index 2265187..3c464c0 100644
--- a/boggle.py
+++ b/boggle.py
@@ -9,6 +9,8 @@ ROOT_DIR = "/srv/boggle"
 # GAMES_FILE = ROOT_DIR + "/games.json"
 # GAMES_LOCK_FILE = ROOT_DIR + "/games.json.lock"
 
+IMAGE_UPLOAD_DIR = ROOT_DIR + '/upload-board/'
+
 DEFINITIONS_FILE = ROOT_DIR + '/lists/CollinsScrabbleWords2019WithDefinitions.json'
 WORD_LIST_FILE = ROOT_DIR + '/lists/CollinsScrabbleWords2019.json'
 
@@ -419,12 +421,16 @@ def getAllGames():
     games = [game for game in games if game] #remove entries that are "None"
     return games
 
+def isValidImage(image):
+    ext = os.path.splitext(image)[1]
+    return ext in (".png", ".jpg", ".jpeg", ".gif", ".PNG", ".JPG", ".JPEG", ".GIF")
+
 """
 This method doesn't return html, but JSON data for JS to digest.
 It is called with AJAX requests, and the data will be formatted
 to update part of the page without reloading the whole thing.
 """
-def request_data(form):
+def request_data(form, files):
     request = filterWord(form["request"])
     if request == "game":
         if "id" in form:
@@ -529,6 +535,36 @@ def request_data(form):
         if id in invitations:
             invitedTo = invitations[id]
             return json.dumps({"invitation": invitedTo})
+    if request == "upload":
+        # create image directory if not found
+        if not os.path.isdir(IMAGE_UPLOAD_DIR):
+            os.mkdir(IMAGE_UPLOAD_DIR)
+        print(files)
+        print(len(files))
+        if len(files) > 0:
+            upload = files.getlist("upload")[0]
+            print("File name: {}".format(upload.filename))
+            filename = upload.filename.replace("'","") #filter out '
+            # file support verification
+            if isValidImage(filename):
+                destination = IMAGE_UPLOAD_DIR + filename
+                i=0
+                while os.path.exists(destination):
+                    spl = os.path.splitext(destination)
+                    destination = spl[0] + "_" + str(i) + spl[1]
+                    i += 1
+                # save file
+                print("File saved to to:", destination)
+                upload.save(destination)
+                message = "File uploaded"
+                lettersGuessed, confidence = processImage(destination)
+                message += "; " + lettersGuessed
+                message += "; " + str(confidence)
+            else:
+                message = "File type not supported, please use .png, .jpg, .jpeg, or .gif"
+        else:
+            message = "no file provided"
+        return json.dumps({"result": message})
 
     return json.dumps({})
 
@@ -846,6 +882,15 @@ def load_page(form, page=None, id=None):
 
     if page == "json":
         return json.dumps([x for x in coll.find()], indent=2)
+    
+    if page == "upload":
+        return """
+        <form method="POST" enctype="multipart/form-data" action="">
+            <input type="hidden" name="request" value="upload">
+            <input type="file" name="upload" accept="image/*"/>
+            <input type="submit" value="Upload">
+        </form>
+        """
 
     if page == "lobby":
         return render_template("boggle/lobby.html", remove_completed_from_lobby_timeout=REMOVE_COMPLETED_FROM_LOBBY_TIMEOUT, **kwargs)
@@ -869,13 +914,15 @@ request - ask for a certain type of data, such as current
     do the action, then return the requested data,
     ignoring the page variable.
 """
-def app(form):
+def app(request):
+    form = request.args | request.form
+    print("boggle http request:", form)
     page = None
     id = None
     if "action" in form and "username" in form:
         page, id = do_action(form)
     
     if "request" in form:
-        return request_data(form)
+        return request_data(form, request.files)
     else:
         return load_page(form, page, id)
diff --git a/games.py b/games.py
index 4f5198a..69d526b 100644
--- a/games.py
+++ b/games.py
@@ -113,8 +113,7 @@ def showmaze_page():
 #START BOGGLE
 @app.route("/boggle", methods=["GET", "POST"])
 def boggle_page():
-    print('boggle http request: ', request.args)
-    return boggle.app(request.args)
+    return boggle.app(request)
 #END BOGGLE
 
 #START BOGGLE_OLD
diff --git a/templates/boggle/lobby.html b/templates/boggle/lobby.html
index a0706a5..318bbdc 100644
--- a/templates/boggle/lobby.html
+++ b/templates/boggle/lobby.html
@@ -74,6 +74,7 @@
     <div class="rightCol">
         <h2 class="scale">Video Call</h2>
         <p><a target="_blank" href="https://drive.confuzer.cloud/index.php/call/wscgqe9r">Join the video chat!</a></p>
+        <p><a href="?username={{ username}}&page=upload">process an image with BoggleCV</a></p>
         <h2 class="scale" style="margin-bottom: 1em">Current Games</h2>
 
         <div v-for="game in games" class="grayBox" v-cloak>
-- 
2.34.2