diff --git a/qutebrowser/browser/qutescheme.py b/qutebrowser/browser/qutescheme.py index 45ce71c27..9fddb2c38 100644 --- a/qutebrowser/browser/qutescheme.py +++ b/qutebrowser/browser/qutescheme.py @@ -24,6 +24,7 @@ Module attributes: _HANDLERS: The handlers registered via decorators. """ +from datetime import date, datetime, timedelta import json import os import sys @@ -35,7 +36,7 @@ from PyQt5.QtCore import QUrlQuery import qutebrowser from qutebrowser.config import config from qutebrowser.utils import (version, utils, jinja, log, message, docutils, - objreg) + objreg, usertypes, qtutils) from qutebrowser.misc import objects @@ -165,26 +166,29 @@ def qute_bookmarks(_url): return 'text/html', html -@add_handler('history') # noqa -def qute_history(url): - """Handler for qute:history. Display and serve history.""" +def history_data(start_time): # noqa + """Return history data + + Arguments: + start_time -- select history starting from this timestamp. + """ def history_iter(start_time, reverse=False): """Iterate through the history and get items we're interested. Arguments: reverse -- whether to reverse the history_dict before iterating. - start_time -- select history starting from this timestamp. """ history = objreg.get('web-history').history_dict.values() if reverse: history = reversed(history) - end_time = start_time - 24*60*60 # end is 24hrs earlier than start - # when history_dict is not reversed, we need to keep track of last item # so that we can yield its atime last_item = None + # end is 24hrs earlier than start + end_time = start_time - 24*60*60 + for item in history: # Skip redirects # Skip qute:// links @@ -226,6 +230,23 @@ def qute_history(url): # if we reached here, we had reached the end of history yield {"next": int(last_item.atime if last_item else -1)} + if sys.hexversion >= 0x03050000: + # On Python >= 3.5 we can reverse the ordereddict in-place and thus + # apply an additional performance improvement in history_iter. + # On my machine, this gets us down from 550ms to 72us with 500k old + # items. + history = history_iter(start_time, reverse=True) + else: + # On Python 3.4, we can't do that, so we'd need to copy the entire + # history to a list. There, filter first and then reverse it here. + history = reversed(list(history_iter(start_time, reverse=False))) + + return list(history) + + +@add_handler('history') +def qute_history(url): + """Handler for qute:history. Display and serve history.""" if url.path() == '/data': # Use start_time in query or current time. try: @@ -234,21 +255,55 @@ def qute_history(url): except ValueError as e: raise QuteSchemeError("Query parameter start_time is invalid", e) - if sys.hexversion >= 0x03050000: - # On Python >= 3.5 we can reverse the ordereddict in-place and thus - # apply an additional performance improvement in history_iter. - # On my machine, this gets us down from 550ms to 72us with 500k old - # items. - history = history_iter(start_time, reverse=True) - else: - # On Python 3.4, we can't do that, so we'd need to copy the entire - # history to a list. There, filter first and then reverse it here. - history = reversed(list(history_iter(start_time, reverse=False))) - - return 'text/html', json.dumps(list(history)) + return 'text/html', json.dumps(history_data(start_time)) else: - return 'text/html', jinja.render('history.html', title='History', - session_interval=config.get('ui', 'history-session-interval')) + try: + from PyQt5.QtWebKit import qWebKitVersion + is_webkit_ng = qtutils.is_qtwebkit_ng(qWebKitVersion()) + except ImportError: # pragma: no cover + is_webkit_ng = False + + if ( + config.get('content', 'allow-javascript') and + (objects.backend == usertypes.Backend.QtWebEngine or is_webkit_ng) + ): + return 'text/html', jinja.render( + 'history.html', + title='History', + session_interval=config.get('ui', 'history-session-interval') + ) + else: + # Get current date from query parameter, if not given choose today. + curr_date = date.today() + try: + query_date = QUrlQuery(url).queryItemValue("date") + if query_date: + curr_date = datetime.strptime(query_date, + "%Y-%m-%d").date() + except ValueError: + log.misc.debug("Invalid date passed to qute:history: " + + query_date) + + one_day = timedelta(days=1) + next_date = curr_date + one_day + prev_date = curr_date - one_day + + # start_time is the last second of curr_date + start_time = time.mktime(next_date.timetuple()) - 1 + history = [ + (i["url"], i["title"], datetime.fromtimestamp(i["time"]/1000)) + for i in history_data(start_time) if "next" not in i + ] + + return 'text/html', jinja.render( + 'history_nojs.html', + title='History', + history=history, + curr_date=curr_date, + next_date=next_date, + prev_date=prev_date, + today=date.today(), + ) @add_handler('javascript') diff --git a/qutebrowser/html/history.html b/qutebrowser/html/history.html index 58e467135..35ac419be 100644 --- a/qutebrowser/html/history.html +++ b/qutebrowser/html/history.html @@ -47,22 +47,9 @@ table { text-align: center; } -.error { - background-color: #ffbbbb; - border-radius: 5px; - font-weight: bold; - padding: 10px; - text-align: center; - width: 100%; - border: 1px solid #ff7777; -} - {% endblock %} {% block content %}

Browsing history

-
diff --git a/qutebrowser/html/history_nojs.html b/qutebrowser/html/history_nojs.html new file mode 100644 index 000000000..3fed67797 --- /dev/null +++ b/qutebrowser/html/history_nojs.html @@ -0,0 +1,58 @@ +{% extends "styled.html" %} + +{% block style %} +{{super()}} +body { + max-width: 1440px; +} + +td.title { + word-break: break-all; +} + +td.time { + color: #555; + text-align: right; + white-space: nowrap; +} + +table { + margin-bottom: 30px; +} + +.date { + color: #555; + font-size: 12pt; + padding-bottom: 15px; + font-weight: bold; + text-align: left; +} + +.pagination-link { + color: #555; + font-weight: bold; + margn-bottom: 15px; + text-decoration: none; +} +{% endblock %} +{% block content %} + +

Browsing history

+ + + + + {% for url, title, time in history %} + + + + + {% endfor %} + +
{{curr_date.strftime("%a, %d %B %Y")}}
{{title}}{{time.strftime("%X")}}
+ + +{% if today >= next_date %} + +{% endif %} +{% endblock %} diff --git a/tests/end2end/features/history.feature b/tests/end2end/features/history.feature index a28f2c89e..27454c522 100644 --- a/tests/end2end/features/history.feature +++ b/tests/end2end/features/history.feature @@ -79,7 +79,7 @@ Feature: Page history Scenario: Listing history When I open data/numbers/3.txt And I open data/numbers/4.txt - And I open qute://history/data + And I open qute://history Then the page should contain the plaintext "3.txt" Then the page should contain the plaintext "4.txt"