diff --git a/.gitignore b/.gitignore index 7b785c0be..10818956c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ - -\.idea/ +Python/__pycache__/WebSiteHandler\.cpython-37\.pyc +\.idea/ \ No newline at end of file diff --git a/Python/Main.py b/Python/Main.py index 43e9809eb..02005c994 100644 --- a/Python/Main.py +++ b/Python/Main.py @@ -1,18 +1,4 @@ -import http.server, socketserver , os -import websockets, asyncio # pip install websockets +import WebSiteHandler -def RunServer(): - WebDir = os.path.join(os.path.dirname(__file__), '../Site') - os.chdir(WebDir) - Handler = http.server.SimpleHTTPRequestHandler - httpd = socketserver.TCPServer(("", 80), Handler) - print('server has started') - httpd.serve_forever() - - -# def WebSocketHandler(socket,path): -# data = await websocket.recv() -# print (data) - -#start_socket = websockets.Serve(WebSocketHandler,'localhost',8765) -RunServer() \ No newline at end of file +if __name__ == "__main__": + WebSiteHandler.RunAll() \ No newline at end of file diff --git a/Python/WebSiteHandler.py b/Python/WebSiteHandler.py new file mode 100644 index 000000000..c396ff885 --- /dev/null +++ b/Python/WebSiteHandler.py @@ -0,0 +1,27 @@ +import http.server, socketserver , os +import websockets, asyncio # pip install websockets +import multiprocessing + +def RunServer(): + WebDir = os.path.join(os.path.dirname(__file__), '../Site') + os.chdir(WebDir) + Handler = http.server.SimpleHTTPRequestHandler + with socketserver.TCPServer(("", 80), Handler) as httpd: + print('server has started') + httpd.serve_forever() + +async def WebSocketHandler(socket,path): + print('test') + data = await socket.recv() + print (data) + +def test(): + print('socket started') + socket = websockets.serve(WebSocketHandler,'ws://localhost',8765) + print(socket) + +def RunAll(): + HTMLProcess = multiprocessing.Process(target=RunServer) + SocketProcess = multiprocessing.Process(target= test) + HTMLProcess.start() + SocketProcess.start() diff --git a/Site/Index.html b/Site/Index.html index 876ed9c5a..756dc5acb 100644 --- a/Site/Index.html +++ b/Site/Index.html @@ -21,5 +21,11 @@

fuck all of you web server is working like shit

+ \ No newline at end of file