From 5f06c8088239575e98fb08524869ae480327a75d Mon Sep 17 00:00:00 2001 From: Tyler Date: Fri, 26 May 2023 16:15:20 -0700 Subject: [PATCH] Some styling and code cleanup --- app.py | 80 +++++++++++++++++---------------------- html/navbar.html | 22 ++++++----- js/header.js | 19 ---------- styles/header.css | 46 +++++++++++----------- styles/human_readable.css | 6 +-- 5 files changed, 74 insertions(+), 99 deletions(-) delete mode 100644 js/header.js diff --git a/app.py b/app.py index 527592b..2242f0a 100644 --- a/app.py +++ b/app.py @@ -5,7 +5,7 @@ from datetime import date, datetime # used for daily verse import sqlite3 import string # for literals import json # for dictionary -import hunspell # for spell checking +import hunspell # for spell checking (not really used) import sys import logging @@ -48,7 +48,6 @@ cached = { "html_response": open("html/response.html", "r").read(), "html_navbar": open("html/navbar.html", "r").read(), "css_navbar": open("styles/header.css", "r").read(), - "js_navbar": open("js/header.js", "r").read(), "css_response": open("styles/human_readable.css", "r").read(), "css_collapsible": open("styles/collapsible.css", "r").read(), "js_collapsible": open("js/collapsible.js", "r").read(), @@ -221,6 +220,7 @@ def parse_query(): if len(result) > 17: return result result = "" + result += search() result += "" result += "

1828 Webster Definitions

Click on the word to get the definition." split_query = query.replace(",", " ").split(" ") @@ -235,11 +235,11 @@ def parse_query(): + word.capitalize() + "" ) - result += "
" + definition + "
" + result += "
" + definition + "
" logging.debug(f"parse_query.define = '{word}'") result += "" result += "
" - result += search() + #result += search() logging.debug(f"parse_query.search = '{result}'") return result @@ -354,7 +354,7 @@ def show(kw=None, get_start_verse_id=False): logging.debug(f"show.results({results})") for result in results: verse_results.append(result) - response_list = response_multi(verse_results) + response_list = scripture_response(verse_results) arg_view = request.args.get("view", None) if arg_view == "plain": response = "
".join(response_list) @@ -395,37 +395,7 @@ def response_rich(scripture): chapter=passage.split(":")[0], passage=passage, text=text ) - -def response_single(scripture): - logging.debug(f"response_single({scripture})") - arg_view = request.args.get("view", "json") - logging.debug(f"->requested_format = {arg_view}") - if arg_view == "plain": - return response_text(scripture) - elif arg_view == "rich": - l_r_nav = get_next_prev_chapter( - str(scripture[0]) - ) # get the first scripture, the id thereof - return ( - cached["html_navbar"].format( - query=request.args.get("kw", ""), - current_chapter_name=l_r_nav["current_chapter_name"], - next_chapter_name=l_r_nav["next_chapter_name"], - next_chapter_link=l_r_nav["next_chapter_link"], - prev_chapter_name=l_r_nav["prev_chapter_name"], - prev_chapter_link=l_r_nav["prev_chapter_link"], - ) - + cached["js_navbar"] - + cached["css_navbar"] - + cached["css_response"] - + response_rich(scripture) - ) - else: - response = response_dict(scripture) - return jsonify(response) - - -def response_multi(scriptures): +def scripture_response(scriptures): response = [] arg_view = request.args.get("view", "json") logging.debug(f"search ->requested_format = {arg_view}") @@ -436,7 +406,7 @@ def response_multi(scriptures): l_r_nav = get_next_prev_chapter( str(scriptures[0][0]) ) # get the first scripture, the id thereof - response.append(cached["css_response"]) + #response.append(cached["css_response"]) response.append( cached["html_navbar"].format( query=request.args.get("kw", ""), @@ -449,9 +419,11 @@ def response_multi(scriptures): ) response.append(cached["css_navbar"]) - response.append(cached["js_navbar"]) + response.append("
") else: for scripture in scriptures: response.append(response_dict(scripture)) @@ -482,9 +454,19 @@ def salvation(): @app.get("/random") def random_verse(): rand_id = random.SystemRandom().choice(cached["verse_ids"]) - scripture = lookup_one_verse(rand_id) + #scripture = lookup_one_verse(rand_id) + scripture = lookup_by_verse_id(rand_id) logging.info(f"Random Served: {scripture[0]}") - return response_single(scripture) + response_list = scripture_response(scripture) + arg_view = request.args.get("view", None) + if arg_view == "plain": + response = "
".join(response_list) + elif arg_view == "rich": + response = "
".join(response_list) + else: + response = jsonify(response_list) + logging.debug(f"Search Response: {response}") + return response # backwards-compatibility @@ -496,9 +478,17 @@ def verse_of_the_day(): today = int(str(date.today()).replace("-", "")) # this is deterministic because of today's date being used as the seed random.seed(today) - scripture = lookup_one_verse(random.choice(cached["verse_ids"])) - return response_single(scripture) - + scripture = lookup_by_verse_id(random.choice(cached["verse_ids"])) + response_list = scripture_response(scripture) + arg_view = request.args.get("view", None) + if arg_view == "plain": + response = "
".join(response_list) + elif arg_view == "rich": + response = "
".join(response_list) + else: + response = jsonify(response_list) + logging.debug(f"Search Response: {response}") + return response @app.get("/search") def search(): @@ -517,7 +507,7 @@ def search(): return "{} not found, try one of the following: {}".format( cleaned_keywords, ", ".join(suggestions) ) - response_list = response_multi(results) + response_list = scripture_response(results) arg_view = request.args.get("view", None) if arg_view == "plain": response = "
".join(response_list) @@ -608,7 +598,7 @@ def sequential_read(start=0, num=1, uid=None, getuid=False): start_verse = cached["verse_ids"][nextverse] end_verse = cached["verse_ids"][nextverse + num] result_list = lookup_by_verse_id(start_verse, end_verse) - response_list = response_multi(result_list) + response_list = scripture_response(result_list) logging.info(f"Served {num+1} verses to UID {uid}") seq_cur.execute( diff --git a/html/navbar.html b/html/navbar.html index 9a5ceef..8945159 100644 --- a/html/navbar.html +++ b/html/navbar.html @@ -1,20 +1,22 @@
- Home | Quick Search | - Random Verse | - Verse of the Day +
- \ No newline at end of file + → +
+ \ No newline at end of file diff --git a/js/header.js b/js/header.js deleted file mode 100644 index c0d998a..0000000 --- a/js/header.js +++ /dev/null @@ -1,19 +0,0 @@ - \ No newline at end of file diff --git a/styles/header.css b/styles/header.css index 9774f1d..ea7f6a5 100644 --- a/styles/header.css +++ b/styles/header.css @@ -1,30 +1,40 @@ \ No newline at end of file diff --git a/styles/human_readable.css b/styles/human_readable.css index 29d7e7b..73c3ea8 100644 --- a/styles/human_readable.css +++ b/styles/human_readable.css @@ -1,10 +1,10 @@ + \ No newline at end of file