мерж пул реквест 1.1.1

main.py

@@ -44,16 +44,26 @@ class WebServer:
     async def handle(self, reader: asyncio.StreamReader, writer: asyncio.StreamWriter) -> None:
         addr = writer.get_extra_info("peername")
         await self.log(self.conn_msg, addr)
-        data = await reader.read(self._read_buffer)
+        rdata = await reader.read(self._read_buffer)
-        data = unquote(data.decode())
+        data = rdata.decode()
         if not data: return
 
-        real_addr = "".join([l.replace("X-Real-IP: ", "") for l in data.split("\n") if l.startswith("X-Real-IP: ")][0]).strip() # ТАКОЙ ГАВНАКОД XD
+        real_addr = None
+        for line in data.split("\n"):
+            if line.startswith("X-Real-IP: "):
+                real_addr = line[len("X-Real-IP: "):].strip()
+                break
+
         if real_addr and self.proxied:
             addr = (real_addr, addr[1])
+
         request = data.split("\n")[0]
-        file_name = request.split()[1][1:]
+        parts = request.split()
-        file_path = self.directory + file_name
+        if len(parts) < 2: return
+
+        path = unquote(parts[1])
+        file_name = path[1:] if path.startswith('/') else path
+        file_path = os.path.abspath(os.path.join(self.directory, file_name))
 
         if os.path.isfile(file_path):
             mime, _ = mimetypes.guess_type(file_path)
@@ -90,20 +100,27 @@ class WebServer:
                 resp = await f.read()
 
             files = ""
-            for file_name in sorted(os.listdir(file_path)): # TODO: добавить настройки отображения файла
+            norm_path = file_path.replace('\\', '/')
-                file = "/".join(file_path.split("/")[1:]) +"/" + file_name
+            base_path = norm_path.replace(self.directory.replace('\\', '/'), '').strip('/')
             
-                if os.path.isdir(file_path + "/" + file_name):
+            for item in sorted(os.listdir(file_path)):
-                    file_name = "/" + file_name
+                item_path = os.path.join(file_path, item)
+                is_dir = os.path.isdir(item_path)
                 
-                modify_time = (os.path.getmtime(file_path + "/" + file_name))
+                rel_path = f"{base_path}/{item}" if base_path else item
+                rel_path = rel_path.replace('\\', '/')
+                
+                if is_dir:
+                    rel_path += "/"
+                    item += "/"
+                
+                modify_time = os.path.getmtime(item_path)
                 modify_datetime = datetime.datetime.fromtimestamp(modify_time)
                 formatted_time = modify_datetime.strftime("%d.%m.%Y %H:%M:%S")
                 
-                files += f'<a href="/{file}">{file_name}</a> | {formatted_time}<br>'
+                files += f'<a class={"dir" if is_dir else "file"} href="/{rel_path}">{item}</a> | {formatted_time}<br>\n'
 
             resp = resp.replace("<FILES>", files)
-            resp = resp.replace("//", "/")
             resp = resp.encode()
             headers = (
                 "HTTP/1.1 200 OK\r\n"
@@ -113,15 +130,17 @@ class WebServer:
                 "\r\n"
             )
 
-            writer.write("".join(headers).encode() + resp)
+            writer.write(headers.encode() + resp)
         else:
             await self.log(self.e404_msg, addr, file_path)
+            async with aiofiles.open(self._e404_file, "r", encoding="utf-8") as f:
+                content = await f.read()
             response = (
                 "HTTP/1.1 404 Not Found\r\n"
                 "Content-Type: text/html; charset=utf-8\r\n"
                 f"Server: {self.name}\r\n"
                 "\r\n"
-                f"{open(self._e404_file, encoding="utf-8").read()}"
+                f"{content}"
             )
             writer.write(response.encode())
             await writer.drain()