From 33a1385885b47fd0634bfb5a584e289875ecdd97 Mon Sep 17 00:00:00 2001 From: serkus01 <7erkus@gmail.com> Date: Mon, 10 Jan 2022 10:24:06 +0900 Subject: [PATCH] fix response path=/ --- core/handler.py | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/core/handler.py b/core/handler.py index 99391e3..6f63b11 100755 --- a/core/handler.py +++ b/core/handler.py @@ -64,9 +64,6 @@ def search(pkg): def get_settings_app(): return str(json.dumps(load_config())) - - - class Handler(BaseHTTPRequestHandler): def _set_response(self): self.send_response(200) @@ -80,17 +77,7 @@ class Handler(BaseHTTPRequestHandler): def get_data(self): #length = int(self.headers['content-length']) data = self.rfile.read(length) - return(str(data)) - def route(self): - if self.path in route: - return true - else: - return false - - def parse_url(self): - pass - def do_HEAD(self): print("do_HEAD:\n") print(str(self.path), str(self.headers)) @@ -133,14 +120,7 @@ class Handler(BaseHTTPRequestHandler): self.r_t=f.read() print(self.client_address) """ - try: - with open('./pkgs.json', 'tr') as fn: - data = fn.read() - pkg_list = json.loads(data) - #print(pkg_list) - self.r_t = json.dumps(pkg_list) - except Exception(e): - print(e) + self.r_t = main() self.response() elif self.path == '/main': #print(self.rfile.read()) @@ -217,10 +197,12 @@ class Handler(BaseHTTPRequestHandler): # Send the html message #self.wfile.write(bytes(self.r_t, "utf-8")) def response(self): - #self._set_response() - try: - return self.wfile.write(BytesIO(self.r_t).getvalue()) - except TypeError: - #print("TypeError") - return self.wfile.write(bytes(self.r_t, 'UTF-8')) - + if self.r_t !=="": + #self._set_response() + try: + return self.wfile.write(BytesIO(self.r_t).getvalue()) + except TypeError: + #print("TypeError") + return self.wfile.write(bytes(self.r_t, 'UTF-8')) + else: + self.send_response(404)