From b8ebe023f29bf2ce9ca7befaeda9ced5475bb893 Mon Sep 17 00:00:00 2001
From: DenisMeln <90024383+DenisMeln@users.noreply.github.com>
Date: Wed, 22 Dec 2021 23:29:33 +0300
Subject: [PATCH 1/2] Add files via upload
---
1.html | 6 +++++
2.html | 6 +++++
server.py | 73 ++++++++++++++++++++++++++++++++-----------------------
3 files changed, 55 insertions(+), 30 deletions(-)
create mode 100644 1.html
create mode 100644 2.html
diff --git a/1.html b/1.html
new file mode 100644
index 0000000..be4b012
--- /dev/null
+++ b/1.html
@@ -0,0 +1,6 @@
+
+
+
+ This is first file.
+
+
\ No newline at end of file
diff --git a/2.html b/2.html
new file mode 100644
index 0000000..336c4f1
--- /dev/null
+++ b/2.html
@@ -0,0 +1,6 @@
+
+
+
+ This is second file.
+
+
\ No newline at end of file
diff --git a/server.py b/server.py
index 9ed7429..7b2d5b8 100644
--- a/server.py
+++ b/server.py
@@ -1,31 +1,44 @@
import socket
-
-sock = socket.socket()
-
-try:
- sock.bind(('', 80))
- print("Using port 80")
-except OSError:
- sock.bind(('', 8080))
- print("Using port 8080")
-
-sock.listen(5)
-
-conn, addr = sock.accept()
-print("Connected", addr)
-
-data = conn.recv(8192)
-msg = data.decode()
-
-print(msg)
-
-resp = """HTTP/1.1 200 OK
-Server: SelfMadeServer v0.0.1
-Content-type: text/html
-Connection: close
-
-Hello, webworld!"""
-
-conn.send(resp.encode())
-
-conn.close()
\ No newline at end of file
+import datetime
+
+def printHtml(data_in):
+ global HtmlVar
+ try:
+ path = data_in.split(' ')[1]
+ print(path)
+ if path == '/':
+ with open('C:/Users/OMEN/PycharmProjects/Web_server/1.html', 'r') as file:
+ HtmlVar = file.read()
+ else:
+ with open('C:/Users/OMEN/PycharmProjects/Web_server' + path, 'r') as file:
+ HtmlVar = file.read()
+ except IndexError:
+ with open('views/dev_team.html', 'r') as file:
+ HtmlVar = file.read()
+ time = datetime.datetime.now()
+ DataOut = f"""HTTP/1.1 200 OK
+ Date: {time.strftime("%a, %d %b %Y %H:%M:%S")}
+ Server: SelfMadeServer v0.0.1
+ Content-Length: {len(HtmlVar)}
+ Content-Type: text/html
+ Connection: close
+ {HtmlVar}"""
+ return DataOut
+
+def serverWork():
+ sock = socket.socket()
+ try:
+ sock.bind(('', 80))
+ except OSError:
+ sock.bind(('', 8080))
+ sock.listen(5)
+ conn, addr = sock.accept()
+ print("Connected", addr)
+ data = conn.recv(8192)
+ msg = data.decode()
+ print(msg)
+ data_out = printHtml(msg)
+ conn.send(data_out.encode())
+
+if __name__ == '__main__':
+ serverWork()
\ No newline at end of file
From 939342cb3a0a1e46689f9dcf016a97fbe22e1eb3 Mon Sep 17 00:00:00 2001
From: DenisMeln <90024383+DenisMeln@users.noreply.github.com>
Date: Thu, 23 Dec 2021 15:52:42 +0300
Subject: [PATCH 2/2] Update server.py
---
server.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/server.py b/server.py
index 7b2d5b8..263f115 100644
--- a/server.py
+++ b/server.py
@@ -13,7 +13,7 @@ def printHtml(data_in):
with open('C:/Users/OMEN/PycharmProjects/Web_server' + path, 'r') as file:
HtmlVar = file.read()
except IndexError:
- with open('views/dev_team.html', 'r') as file:
+ with open('C:/Users/OMEN/PycharmProjects/Web_server/1.html', 'r') as file:
HtmlVar = file.read()
time = datetime.datetime.now()
DataOut = f"""HTTP/1.1 200 OK
@@ -41,4 +41,4 @@ def serverWork():
conn.send(data_out.encode())
if __name__ == '__main__':
- serverWork()
\ No newline at end of file
+ serverWork()