diff --git a/app/__init__.py b/app/__init__.py index d5faca5..f77b281 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from app.filter import clean_query from app.request import send_tor_signal from app.utils.session import generate_user_key from app.utils.bangs import gen_bangs_json +from app.utils.misc import gen_file_hash from flask import Flask from flask_session import Session import json @@ -30,6 +31,9 @@ app.config['APP_ROOT'] = os.getenv( app.config['STATIC_FOLDER'] = os.getenv( 'STATIC_FOLDER', os.path.join(app.config['APP_ROOT'], 'static')) +app.config['BUILD_FOLDER'] = os.path.join( + app.config['STATIC_FOLDER'], 'build') +app.config['CACHE_BUSTING_MAP'] = {} app.config['LANGUAGES'] = json.load(open( os.path.join(app.config['STATIC_FOLDER'], 'settings/languages.json'))) app.config['COUNTRIES'] = json.load(open( @@ -73,9 +77,6 @@ app.config['CSP'] = 'default-src \'none\';' \ 'connect-src \'self\';' \ 'form-action \'self\';' -# Templating functions -app.jinja_env.globals.update(clean_query=clean_query) - if not os.path.exists(app.config['CONFIG_PATH']): os.makedirs(app.config['CONFIG_PATH']) @@ -88,6 +89,31 @@ if not os.path.exists(app.config['BANG_PATH']): if not os.path.exists(app.config['BANG_FILE']): gen_bangs_json(app.config['BANG_FILE']) +# Build new mapping of static files for cache busting +if not os.path.exists(app.config['BUILD_FOLDER']): + os.makedirs(app.config['BUILD_FOLDER']) + +cache_busting_dirs = ['css', 'js'] +for cb_dir in cache_busting_dirs: + full_cb_dir = os.path.join(app.config['STATIC_FOLDER'], cb_dir) + for cb_file in os.listdir(full_cb_dir): + # Create hash from current file state + full_cb_path = os.path.join(full_cb_dir, cb_file) + cb_file_link = gen_file_hash(full_cb_dir, cb_file) + build_path = os.path.join(app.config['BUILD_FOLDER'], cb_file_link) + os.symlink(full_cb_path, build_path) + + # Create mapping for relative path urls + map_path = build_path.replace(app.config['APP_ROOT'], '') + if map_path.startswith('/'): + map_path = map_path[1:] + app.config['CACHE_BUSTING_MAP'][cb_file] = map_path + +# Templating functions +app.jinja_env.globals.update(clean_query=clean_query) +app.jinja_env.globals.update( + cb_url=lambda f: app.config['CACHE_BUSTING_MAP'][f]) + Session(app) # Attempt to acquire tor identity, to determine if Tor config is available diff --git a/app/static/css/system-theme.css b/app/static/css/system-theme.css deleted file mode 100644 index 9c243a0..0000000 --- a/app/static/css/system-theme.css +++ /dev/null @@ -1,2 +0,0 @@ -@import "/static/css/light-theme.css" screen; -@import "/static/css/dark-theme.css" screen and (prefers-color-scheme: dark); diff --git a/app/templates/display.html b/app/templates/display.html index eee90a8..288f24d 100644 --- a/app/templates/display.html +++ b/app/templates/display.html @@ -5,14 +5,21 @@ - - - - - {% if config.theme %} - + + + + + {% if config.theme %} + {% if config.theme == 'system' %} + + {% else %} + + {% endif %} {% else %} - + {% endif %} {{ clean_query(query) }} - Whoogle Search @@ -33,7 +40,7 @@ {{ translation['github-link'] }}

- - - + + + diff --git a/app/templates/header.html b/app/templates/header.html index 3ffebdb..a3d596a 100644 --- a/app/templates/header.html +++ b/app/templates/header.html @@ -62,4 +62,4 @@ {% endif %} - + diff --git a/app/templates/index.html b/app/templates/index.html index bf8375e..64e1650 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -17,17 +17,24 @@ - - + + - + {% if config.theme %} - + {% if config.theme == 'system' %} + + {% else %} + + {% endif %} {% else %} - + {% endif %} - +