Annotation-Pushers
/
Annotation-System
1
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'test_search_perf'

This commit is contained in:
Matt Mascarenhas 2018-06-23 16:09:02 +01:00
parent 8c17194180 6136a45886
commit 6ca1446450
1 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cinera/cinera_search.js
View File

@ -35,7 +35,7 @@ indexSort.addEventListener("click", function(ev) {
var lastQuery = null; var lastQuery = null;
var resultsToRender = []; var resultsToRender = [];
var resultsIndex = 0; var resultsIndex = 0;
var resultsMarkerIndex = 0; var resultsMarkerIndex = -1;
var resultsContainer = document.getElementById("cineraResults"); var resultsContainer = document.getElementById("cineraResults");
var rendering = false; var rendering = false;
@ -93,7 +93,7 @@ function runSearch() {
oldResultsContainer.parentNode.insertBefore(resultsContainer, oldResultsContainer); oldResultsContainer.parentNode.insertBefore(resultsContainer, oldResultsContainer);
oldResultsContainer.remove(); oldResultsContainer.remove();
resultsIndex = 0; resultsIndex = 0;
resultsMarkerIndex = 0; resultsMarkerIndex = -1;
} }
lastQuery = queryStr; lastQuery = queryStr;
resultsToRender = []; resultsToRender = [];
@ -145,22 +145,29 @@ function runSearch() {
document.getElementById("cineraResultsSummary").textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total."; document.getElementById("cineraResultsSummary").textContent = "Found: " + numEpisodes + " episodes, " + numMarkers + " markers, " + totalTime + "total.";
} }
function renderMatches(renderStart) { function renderResults() {
if (resultsIndex < resultsToRender.length) {
rendering = true;
var maxItems = 10;
var numItems = 0;
while (numItems < maxItems && resultsIndex < resultsToRender.length) {
var query = resultsToRender[resultsIndex].query; var query = resultsToRender[resultsIndex].query;
var episode = resultsToRender[resultsIndex].episode; var episode = resultsToRender[resultsIndex].episode;
var matches = resultsToRender[resultsIndex].matches; var matches = resultsToRender[resultsIndex].matches;
var markerList = null; var markerList = null;
if (resultsMarkerIndex == 0) { if (resultsMarkerIndex == -1) {
var dayContainer = dayContainerPrototype.cloneNode(true); var dayContainer = dayContainerPrototype.cloneNode(true);
var dayName = dayContainer.children[0]; var dayName = dayContainer.children[0];
markerList = dayContainer.children[1]; markerList = dayContainer.children[1];
dayName.textContent = episode.day + ": " + episode.title; dayName.textContent = episode.day + ": " + episode.title;
resultsContainer.appendChild(dayContainer); resultsContainer.appendChild(dayContainer);
resultsMarkerIndex = 0;
numItems++;
} else { } else {
markerList = document.querySelector("#cineraResults > .dayContainer:nth-child(" + (resultsIndex+1) + ") .markerList"); markerList = document.querySelector("#cineraResults > .dayContainer:nth-child(" + (resultsIndex+1) + ") .markerList");
} }
do { while (numItems < maxItems && resultsMarkerIndex < matches.length) {
var match = matches[resultsMarkerIndex]; var match = matches[resultsMarkerIndex];
var marker = markerPrototype.cloneNode(); var marker = markerPrototype.cloneNode();
var playerURLPrefix = (baseURL ? baseURL + "/" : "") + (playerLocation ? playerLocation + "/" : ""); var playerURLPrefix = (baseURL ? baseURL + "/" : "") + (playerLocation ? playerLocation + "/" : "");
@ -184,24 +191,16 @@ function renderMatches(renderStart) {
marker.appendChild(document.createTextNode(text.slice(cursor, text.length))); marker.appendChild(document.createTextNode(text.slice(cursor, text.length)));
} }
markerList.appendChild(marker); markerList.appendChild(marker);
numItems++;
resultsMarkerIndex++; resultsMarkerIndex++;
} while (resultsMarkerIndex < matches.length && performance.now() - renderStart < 1); }
return resultsMarkerIndex == matches.length; if (resultsMarkerIndex == matches.length) {
} resultsMarkerIndex = -1;
function renderResults() {
if (resultsIndex < resultsToRender.length) {
rendering = true;
var renderStart = performance.now();
while (resultsIndex < resultsToRender.length && performance.now() - renderStart < 1) {
var done = renderMatches(renderStart);
if (done) {
resultsMarkerIndex = 0;
resultsIndex++; resultsIndex++;
} }
} }
requestAnimationFrame(renderResults); setTimeout(renderResults, 0);
} else { } else {
rendering = false; rendering = false;
} }