обнова 1.1.1 #2

Merged
admin merged 3 commits from testing into main 2025-08-07 16:49:11 +00:00
Showing only changes of commit 45156ab4ae - Show all commits

15
main.py
View File

@@ -44,8 +44,8 @@ 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)
data = unquote(data.decode())
rdata = await reader.read(self._read_buffer)
data = rdata.decode()
if not data: return
real_addr = None
@@ -56,9 +56,14 @@ class WebServer:
if real_addr and self.proxied:
addr = (real_addr, addr[1])
request = data.split("\n")[0]
file_name = request.split()[1][1:]
file_path = os.path.join(self.directory, file_name)
parts = request.split()
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)
@@ -113,7 +118,7 @@ class WebServer:
modify_datetime = datetime.datetime.fromtimestamp(modify_time)
formatted_time = modify_datetime.strftime("%d.%m.%Y %H:%M:%S")
files += f'<a href="/{rel_path}">{item}</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.encode()