If we have filmstrip from the Chrome trace log, let us use that (#2661)

* If we have filmstrip from the Chrome trace log, let us use that

* removed debug output
This commit is contained in:
Peter Hedenskog 2019-09-26 22:49:06 +02:00 committed by GitHub
parent 01df1be5a4
commit 8cdace351d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 11 deletions

View File

@ -124,13 +124,16 @@ function findTimings(timings, start, end) {
}
module.exports = {
async getFilmstrip(browsertimeData, run, dir, options) {
if (
!options.browsertime.video ||
options.browsertime.videoParams.createFilmstrip === false ||
options.browsertime.videoParams.debug
) {
let doWeHaveFilmstrip =
options.browsertime.chrome.enableTraceScreenshots === true ||
(options.browsertime.video ||
options.browsertime.videoParams.createFilmstrip === true ||
options.browsertime.videoParams.debug);
if (doWeHaveFilmstrip === false) {
return [];
}
const toTheFront = [];
try {
@ -174,7 +177,6 @@ module.exports = {
} catch (e) {
log.error('Could not read filmstrip dir', e);
}
return toTheFront;
}
};

View File

@ -248,6 +248,7 @@ class HTMLBuilder {
options
)
: [];
let rootPath = this.storageManager.rootPathFromUrl(url);
let data = {
daurl: url,

View File

@ -9,7 +9,7 @@ mixin frame(filmstrip, iteration)
a
h2 Filmstrip
- const videoIndex = medianRun ? medianRun.runIndex : iteration;
- const path = 'data/filmstrip/' + videoIndex +'/';

View File

@ -131,7 +131,7 @@ block content
section#video-panel
include ../video/index.pug
if options.browsertime.video && options.videoParams.createFilmstrip
if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
section#filmstrip-panel
include ../filmstrip/index.pug

View File

@ -10,7 +10,7 @@
if options.browsertime.video
a(id='video', href='#video', onclick='return selectTab(this, true);')
| Video
if options.browsertime.video && options.videoParams.createFilmstrip
if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
a(id='filmstrip', href='#filmstrip', onclick='return selectTab(this, true);')
| Filmstrip
if d.coach && d.coach.run

View File

@ -136,7 +136,7 @@ block content
section#video-panel
include ../video/index.pug
if options.browsertime.video && options.videoParams.createFilmstrip
if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
section#filmstrip-panel
include ../filmstrip/index.pug

View File

@ -10,7 +10,7 @@
if options.browsertime.video
a(id='video', href='#video', onclick='return selectTab(this, true);')
| Video
if options.browsertime.video && options.videoParams.createFilmstrip
if options.browsertime.video && options.videoParams.createFilmstrip || options.browsertime.chrome.enableTraceScreenshots
a(id='filmstrip', href='#filmstrip', onclick='return selectTab(this, true);')
| Filmstrip
if d.coach && d.coach.pageSummary