From 1dc2cb0ab6025af4d5e4c705eb0134108c53c024 Mon Sep 17 00:00:00 2001 From: James Taylor Date: Tue, 31 Jul 2018 17:03:47 -0700 Subject: Return blank page for searching when visiting just localhost/youtube.com --- youtube/search.py | 10 ++++++---- youtube/youtube.py | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'youtube') diff --git a/youtube/search.py b/youtube/search.py index 406dc82..8bb3aff 100644 --- a/youtube/search.py +++ b/youtube/search.py @@ -9,9 +9,6 @@ from youtube import common, proto with open("yt_search_results_template.html", "r") as file: yt_search_results_template = file.read() - -with open("yt_search_template.html", "r") as file: - yt_search_template = file.read() page_button_template = Template('''$page''') current_page_button_template = Template('''
$page
''') @@ -83,7 +80,12 @@ did_you_mean = Template(''' def get_search_page(query_string, parameters=()): qs_query = urllib.parse.parse_qs(query_string) if len(qs_query) == 0: - return yt_search_template + return common.yt_basic_template.substitute( + page_title = "Search", + header = common.get_header(), + style = '', + page = '', + ) query = qs_query["query"][0] page = qs_query.get("page", "1")[0] autocorrect = int(qs_query.get("autocorrect", "1")[0]) diff --git a/youtube/youtube.py b/youtube/youtube.py index 93b947f..03956b6 100644 --- a/youtube/youtube.py +++ b/youtube/youtube.py @@ -15,6 +15,9 @@ def youtube(env, start_response): mime_type = mimetypes.guess_type(path)[0] or 'application/octet-stream' start_response('200 OK', (('Content-type',mime_type),) ) return f.read() + elif path.lstrip('/') == "": + start_response('200 OK', (('Content-type','text/html'),) ) + return search.get_search_page(query_string).encode() elif path == "/comments": start_response('200 OK', (('Content-type','text/html'),) ) -- cgit v1.2.3