ericlay
/
fuckyourday
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update app.py 

Tidying up 404 handling
This commit is contained in:
Eric Lay 2024-03-28 11:48:34 -05:00 committed by GitHub
parent d9b8edbc7d
commit 614c374077
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app.py
View File

@ -10,7 +10,9 @@ def current_website_dir():
# Script must run from root dir containing all websites dirs # Script must run from root dir containing all websites dirs
# OR change the ROOT_DIR path :) # OR change the ROOT_DIR path :)
ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) ROOT_DIR = os.path.dirname(os.path.abspath(__file__))
WEBSITE_DIRS = [name for name in os.listdir(ROOT_DIR) if not name.startswith('.') and os.path.isdir(os.path.join(ROOT_DIR, name))] WEBSITE_DIRS = [name for name in os.listdir(ROOT_DIR)
if not name.startswith('.')
and os.path.isdir(os.path.join(ROOT_DIR, name))]
session.pop('website_dir', None) # Clear website_dir if exist session.pop('website_dir', None) # Clear website_dir if exist
match session['requests']: #Match Nth page request match session['requests']: #Match Nth page request
case 5: case 5:
@ -34,7 +36,7 @@ def static_proxy(filename):
try: try:
return send_from_directory(session['website_dir'], filename) return send_from_directory(session['website_dir'], filename)
except KeyError: except KeyError:
return render_template('404.html') return render_template('404.html'),404
@app.route('/', methods=['GET']) # Serve site index.html @app.route('/', methods=['GET']) # Serve site index.html
def index(): def index():
@ -46,11 +48,11 @@ def index():
try: try:
return send_from_directory(session['website_dir'], 'index.html') return send_from_directory(session['website_dir'], 'index.html')
except KeyError: except KeyError:
return render_template('404.html') return render_template('404.html'),404
@app.errorhandler(404) @app.errorhandler(404)
def page_not_found(e): def page_not_found(e):
return render_template('404.html') return render_template('404.html'),404
if __name__ == "__main__": if __name__ == "__main__":
app.run() app.run()