From 3d5ac54ec0cde8a39ce229f5cccde896e8c3ea94 Mon Sep 17 00:00:00 2001 From: fingadumbledore Date: Mon, 18 Jul 2022 09:11:28 +0200 Subject: [PATCH] automatic saving after closing --- setup.py | 10 ++++++---- webserver.py | 48 +++++++++++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/setup.py b/setup.py index e330cc4..c981577 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,14 @@ from argparse import ArgumentParser import os import shutil +from webserver import main sessionname = "Test Session" -dateiname = sessionname + '.py' + def create_session(): if not os.path.exists(sessionname): os.makedirs(sessionname) - shutil.copy('webserver.py', dateiname) - shutil.move(dateiname, sessionname) + + @@ -20,4 +21,5 @@ def main(): if __name__ == "__main__": sessionname = input("Session Name: ") - create_session() \ No newline at end of file + create_session() + main(sessionname) \ No newline at end of file diff --git a/webserver.py b/webserver.py index 117ae8f..8d6924d 100644 --- a/webserver.py +++ b/webserver.py @@ -8,6 +8,7 @@ import os, sys, sqlite3 from urllib import parse import json import requests +import shutil PORT = 8000 date = time.strftime("%d-%m-%Y %H:%M:%S", time.localtime(time.time())) @@ -15,17 +16,9 @@ log = date sessionID = "/S1" dbstatus = "Null" sessionConfig = "F" +name = "f" - -class Serve(BaseHTTPRequestHandler): - - def led_controll(): - print("in development") - - def restore_session(sessionConfig): - print("Restoring Session") - - def create_DB(): +def create_DB(): if os.path.exists("party.db"): print("Datei bereits vorhanden") sys.exit(0) @@ -50,9 +43,18 @@ class Serve(BaseHTTPRequestHandler): "Datum TEXT, " \ "info TEXT)" cursor.execute(sql) - dbstatus = "db erstellt" - log = log + dbstatus - self.log_server(log) + + +class Serve(BaseHTTPRequestHandler): + + def led_controll(): + print("in development") + + def restore_session(sessionConfig): + print("Restoring Session") + + + def log_server(self, log): @@ -104,10 +106,18 @@ class Serve(BaseHTTPRequestHandler): self.send_response(400) #print("POST error") - - -httpd = HTTPServer(('0.0.0.0', PORT), Serve) -log = log + "server is now running on" + str(PORT) -print("server is now running on http://127.0.0.1:" + str(PORT)) -httpd.serve_forever() +def main(name): + create_DB() + + try: + httpd = HTTPServer(('0.0.0.0', PORT), Serve) + #log = log + "server is now running on" + str(PORT) + print("server is now running on http://127.0.0.1:" + str(PORT)) + httpd.serve_forever() + except KeyboardInterrupt: + pass + + httpd.server_close() + print("Server stopped.") + shutil.move('party.db', name)