WebisD
diff --git a/‎databaseUser/Images/07052021134141.jpg
-125 KB b/‎databaseUser/Images/07052021134141.jpg
-125 KB
diff --git a/‎databaseUser/Images/07052021134144.jpg
-125 KB b/‎databaseUser/Images/07052021134144.jpg
-125 KB
diff --git a/‎databaseUser/Images/07052021134146.jpg
-125 KB b/‎databaseUser/Images/07052021134146.jpg
-125 KB
diff --git a/‎databaseUser/Images/08052021120359.png
-704 KB b/‎databaseUser/Images/08052021120359.png
-704 KB
diff --git a/‎databaseUser/Images/images.json
Lines changed: 0 additions & 6 deletions b/‎databaseUser/Images/images.json
Lines changed: 0 additions & 6 deletions
diff --git a/‎databaseUser/database.json
Lines changed: 0 additions & 8 deletions b/‎databaseUser/database.json
Lines changed: 0 additions & 8 deletions
diff --git a/‎handler/HandlerRequests.py
Lines changed: 2 additions & 2 deletions b/‎handler/HandlerRequests.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎handler/findFile.py
Lines changed: 12 additions & 0 deletions b/‎handler/findFile.py
Lines changed: 12 additions & 0 deletions
diff --git a/‎message/Response.py
Lines changed: 5 additions & 2 deletions b/‎message/Response.py
Lines changed: 5 additions & 2 deletions
diff --git a/‎message/StatusCode.py
Lines changed: 1 addition & 0 deletions b/‎message/StatusCode.py
Lines changed: 1 addition & 0 deletions
@@ -23,12 +23,6 @@
                 "type": "image/jpg",
                 "filePath": "./databaseUser/Images/07052021000202.jpg"
             }
-        },
-        {
-            "/08052021120359.png": {
-                "type": "image/png",
-                "filePath": "./databaseUser/Images/08052021120359.png"
-            }
         }
     ]
 }
@@ -31,14 +31,6 @@
                 "pokemon": "Giant",
                 "image": "/07052021000202.jpg"
             }
-        },
-        {
-            "08052021120359": {
-                "name": "Ashe",
-                "phone": "1196632651",
-                "pokemon": "Charmander",
-                "image": "/08052021120359.png"
-            }
         }
     ]
 }
@@ -21,8 +21,8 @@ def recv(sock, chunkSize=8192):
     while True:
         data = sock.recv(chunkSize)
 
-        if data is None:
-            return
+        if data is None or data == b'':
+            continue
 
         try:
             decoded_data = data.decode()
 
@@ -0,0 +1,12 @@
+import fnmatch
+import os
+
+
+def find(pattern, path):
+    result = []
+    for root, dirs, files in os.walk(path):
+        for name in files:
+            if fnmatch.fnmatch(name, pattern):
+                result.append(os.path.join(root, name))
+    return result
+
@@ -15,13 +15,16 @@ def encodeResponse(self):
 
         return response.encode()
 
-    def encodeResponseImages(self):
+    def encodeResponseImages(self, image, new_path=None):
         response = ""
         response += self.statusLine() + "\n"
         response += self.headerLine()
         response += self.server + "\n"
         response += "\n"
-        #esponse = response.encode()
+
+        print(f'Image -> {image}: {self.status_code.value[0]} {self.status_code.value[1]}')
+        if self.status_code.value[0] == "301" and new_path is not None:
+            print(5*" " + f"New path: {new_path}")
 
         return response.encode() + self.body
 
 
@@ -9,6 +9,7 @@ class StatusCode(enum.Enum):
     RESET_CONTENT = ["205", "Reset Content"]
     # Redirection 3xx
     MULTIPLE_CHOICES = ["300", "Multiple Choices"]
+    MOVED_PERMANENTLY = ["301", "Moved Permanently"]
     NOT_MODIFIED = ["304", "Not Modified"]
     # Client Error 4xx
     BAD_REQUEST = ["400", "Bad Request"]
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,6 @@`
`23`	`23`	`"type": "image/jpg",`
`24`	`24`	`"filePath": "./databaseUser/Images/07052021000202.jpg"`
`25`	`25`	`}`
`26`		`- },`
`27`		`- {`
`28`		`- "/08052021120359.png": {`
`29`		`- "type": "image/png",`
`30`		`- "filePath": "./databaseUser/Images/08052021120359.png"`
`31`		`- }`
`32`	`26`	`}`
`33`	`27`	`]`
`34`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,6 @@`
`31`	`31`	`"pokemon": "Giant",`
`32`	`32`	`"image": "/07052021000202.jpg"`
`33`	`33`	`}`
`34`		`- },`
`35`		`- {`
`36`		`- "08052021120359": {`
`37`		`- "name": "Ashe",`
`38`		`- "phone": "1196632651",`
`39`		`- "pokemon": "Charmander",`
`40`		`- "image": "/08052021120359.png"`
`41`		`- }`
`42`	`34`	`}`
`43`	`35`	`]`
`44`	`36`	`}`