rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Send history item atime in milliseconds.

Browse Source
This commit is contained in:
Imran Sobir 2017-03-16 11:33:27 +05:00
parent ccbf8572c3
commit fb97c6dffc
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qutebrowser/browser/qutescheme.py
View File

@ -218,7 +218,7 @@ def qute_history(url):
# Use item's url as title if there's no title. # Use item's url as title if there's no title.
item_url = item.url.toDisplayString() item_url = item.url.toDisplayString()
item_title = item.title if item.title else item_url item_title = item.title if item.title else item_url
item_time = int(item.atime) item_time = int(item.atime * 1000)
yield {"url": item_url, "title": item_title, "time": item_time} yield {"url": item_url, "title": item_title, "time": item_time}

24
qutebrowser/javascript/history.js
View File

@ -20,14 +20,14 @@
"use strict"; "use strict";
window.loadHistory = (function() { window.loadHistory = (function() {
// The time of last history item. // Date of last seen item.
var lastTime = null; var lastItemDate = null;
// The time to load next. // The time to load next.
var nextTime = null; var nextTime = null;
// The cutoff interval for session-separator (30 minutes) // The cutoff interval for session-separator (30 minutes in milliseconds).
var SESSION_CUTOFF = 30 * 60; var SESSION_CUTOFF = 30 * 60 * 1000;
// The URL to fetch data from. // The URL to fetch data from.
var DATA_URL = "qute://history/data"; var DATA_URL = "qute://history/data";
@ -77,9 +77,8 @@ window.loadHistory = (function() {
} }
// Create session-separator and new tbody if necessary // Create session-separator and new tbody if necessary
if (tbody.lastChild !== null && lastTime !== null) { if (tbody.lastChild !== null && lastItemDate !== null) {
var lastItemDate = new Date(lastTime * 1000); var interval = lastItemDate.getTime() - date.getTime();
var interval = (lastItemDate.getTime() - date.getTime()) / 1000.00;
if (interval > SESSION_CUTOFF) { if (interval > SESSION_CUTOFF) {
// Add session-separator // Add session-separator
var sessionSeparator = document.createElement("td"); var sessionSeparator = document.createElement("td");
@ -158,12 +157,11 @@ window.loadHistory = (function() {
for (var i = 0, len = history.length - 1; i < len; i++) { for (var i = 0, len = history.length - 1; i < len; i++) {
var item = history[i]; var item = history[i];
var atime = new Date(item.time * 1000); var currentItemDate = new Date(item.time);
var session = getSessionNode(atime); getSessionNode(currentItemDate).appendChild(makeHistoryRow(
var row = makeHistoryRow(item.url, item.title, item.url, item.title, currentItemDate.toLocaleTimeString()
atime.toLocaleTimeString()); ));
session.appendChild(row); lastItemDate = currentItemDate;
lastTime = item.time;
} }
var next = history[history.length - 1].next; var next = history[history.length - 1].next;

4
tests/unit/browser/test_qutescheme.py
View File

@ -130,8 +130,8 @@ class TestHistoryHandler:
# test times # test times
end_time = start_time - 24*60*60 end_time = start_time - 24*60*60
for item in items: for item in items:
assert item['time'] <= start_time assert item['time'] <= start_time * 1000
assert item['time'] > end_time assert item['time'] > end_time * 1000
@pytest.mark.parametrize("start_time_offset, next_time", [ @pytest.mark.parametrize("start_time_offset, next_time", [
(0, 24*60*60), (0, 24*60*60),