Local images success

Weverson · Weverson · commit 46aac97fe5a4 · 2021-05-05T15:14:10.000-03:00
diff --git a/assets/public/list.html b/assets/public/list.html
@@ -108,7 +108,7 @@ <h1 class="h2">Your friends list</h1>
                     let [pokemonID, pokemonData] = Object.entries(usersElements)[0]
                     console.log((pokemonID))
                     document.getElementById("cards").innerHTML += `<div class="card ml-3 mt-3" style="width: 18rem;">
-                                                      <img class="card-img-top" style='object-fit: cover'  src="${pokemonData['image']}" height="200" alt="Card image cap">
+                                                      <img class="card-img-top" style='object-fit: cover'  src="${pokemonData['image']}" alt="Card image cap">
                                                       <div class="card-body">
                                                       <h5 class="card-title">${pokemonData['name']}</h5>
                                                       <h6 class="card-subtitle mb-2 text-muted">${pokemonData['pokemon']}</h6>
diff --git a/assets/public/post.html b/assets/public/post.html
@@ -144,7 +144,7 @@ <h1 class="h2">Add a new friend</h1>
     function sendRequest() {
         const preview = document.querySelector('img');
         let json = toJSONString(document.getElementById("form-container"), preview.src);
-        json = json + "\r\n\0";
+        //json = json + "\r\n";
         let xhr = new XMLHttpRequest();
         let url = "/post";
         let button = document.getElementById("submit-button");
diff --git a/data_URLToImage.py b/data_URLToImage.py
diff --git a/databaseUser/database.json b/databaseUser/database.json
diff --git a/handler/HandlerRequests.py b/handler/HandlerRequests.py
@@ -9,23 +9,51 @@
 from methods.GET import GET
 from methods.POST import POST
 from methods.PUT import PUT
+import string
 
-import time
 
-
-def recv(sock, chunkSize=8192, timeout=2):
+def recv(sock, chunkSize=8192):
     fragments = []
 
     data = None
 
     while True:
+        print("Entrei no rcv")
         data = sock.recv(chunkSize)
-        print(data, end="\n\n\n\n\n\n\n")
 
-        if not data:
-            return b"".join(fragments)
+        if data is None:
+            print("Data vazia")
+            return
+
+        try:
+            decoded_data = data.decode()
+            if decoded_data.find("GET /") != -1 or decoded_data.find("PUT /") != -1 or decoded_data.find(
+                    "DELETE /") != -1:
+                # Not a post, return
+                print("NAP: ")
+                print(data)
+                return data
+
+            print("É um POST")
+            #print(50 * '-')
+            print(data)
+            #print(50 * '-')
+
+            #if decoded_data[0] == '{' and decoded_data[-1] != '}':
+            #    fragments.append(data[:-1])
+            #else:
+            fragments.append(data)
+            if decoded_data[-1] == '}':
+                print("vou sair")
+
+                a = b"".join(fragments)
 
-        fragments.append(data)
+                print("rcv() retornou:")
+                print(a)
+                return a
+
+        except Exception as e:
+            print(e)
 
 
 class Handler(Thread):
@@ -35,14 +63,18 @@ def __init__(self, server):
 
     def run(self):
         while True:
+            print("No aguardo")
             connectionSocket, addr = self.server.serverSocket.accept()
-            
+
             while True:
                 request = recv(connectionSocket, 8192).decode()
-                # request = connectionSocket.recv(100000).decode()
-                print(request)
-        
-                if not request: 
+                # request = connectionSocket.recv(8192).decode()
+
+                print("Sai do recv()")
+                ##print(request)
+
+                if not request:
+                    print("SAI")
                     break
 
                 request = Request(ParserMessage.parseRequest(request))
diff --git a/methods/POST.py b/methods/POST.py
@@ -30,5 +30,6 @@ def response(request):
                 return response.encodeResponse()
             else:
                 raise TypeError("Invalid data")
-        except:
+        except Exception as e:
+            print(e)
             return HandlerErrors.sendErrorCode(request, StatusCode.BAD_REQUEST)
