diff options
| -rw-r--r-- | youtube/__init__.py | 13 | ||||
| -rw-r--r-- | youtube/templates/error.html | 6 |
2 files changed, 17 insertions, 2 deletions
diff --git a/youtube/__init__.py b/youtube/__init__.py index 3604b21..b0e8761 100644 --- a/youtube/__init__.py +++ b/youtube/__init__.py @@ -115,7 +115,18 @@ def error_page(e): error_message=exc_info()[1].error_message, slim=slim ), 502) - return flask.render_template('error.html', traceback=traceback.format_exc(), slim=slim), 500 + elif (exc_info()[0] == util.FetchError + and exc_info()[1].code == '404' + ): + error_message = ('Error: The page you are looking for isn\'t here. ¯\_(ツ)_/¯') + return flask.render_template('error.html', + error_code=exc_info()[1].code, + error_message=error_message, + slim=slim), 404 + return flask.render_template('error.html', traceback=traceback.format_exc(), + error_code=exc_info()[1].code, + slim=slim), 500 + # return flask.render_template('error.html', traceback=traceback.format_exc(), slim=slim), 500 font_choices = { diff --git a/youtube/templates/error.html b/youtube/templates/error.html index 55396ad..97f8ca9 100644 --- a/youtube/templates/error.html +++ b/youtube/templates/error.html @@ -1,4 +1,8 @@ -{% set page_title = 'Error' %} +{% if error_code %} + {% set page_title = 'Error: ' ~ error_code %} +{% else %} + {% set page_title = 'Error' %} +{% endif %} {% if not slim %} {% extends "base.html" %} |