Prepare for using options down to result storage (#3058)

lib/core/resultsStorage/index.js

@@ -15,13 +15,9 @@ function getDomainOrFileName(input) {
   return domainOrFile;
 }
 
-module.exports = function(
-  input,
-  timestamp,
-  outputFolder,
-  resultBaseURL,
-  useHash
-) {
+module.exports = function(input, timestamp, options) {
+  const outputFolder = options.outputFolder;
+  const resultBaseURL = options.resultBaseURL;
   const resultsSubFolders = [];
   let storageBasePath;
   let storagePathPrefix;
@@ -48,7 +44,7 @@ module.exports = function(
   }
 
   return {
-    storageManager: storageManager(storageBasePath, storagePathPrefix, useHash),
-    resultUrls: resultUrls(resultUrl, useHash)
+    storageManager: storageManager(storageBasePath, storagePathPrefix, options),
+    resultUrls: resultUrls(resultUrl, options.useHash)
   };
 };

lib/core/resultsStorage/storageManager.js

@@ -14,7 +14,8 @@ function isValidDirectoryName(name) {
   return name !== undefined && name !== '';
 }
 
-module.exports = function storageManager(baseDir, storagePathPrefix, useHash) {
+module.exports = function storageManager(baseDir, storagePathPrefix, options) {
+  const useHash = options.useHash;
   return {
     rootPathFromUrl(url) {
       return pathToFolder(url, useHash)

lib/sitespeed.js

@@ -51,9 +51,7 @@ module.exports = {
     const { storageManager, resultUrls } = resultsStorage(
       url,
       timestamp,
-      options.outputFolder,
-      options.resultBaseURL,
-      options.useHash
+      options
     );
 
     // Setup logging

test/resultUrlTests.js

@@ -8,7 +8,8 @@ const timestamp = dayjs();
 const timestampString = timestamp.format('YYYY-MM-DD-HH-mm-ss');
 
 function createResultUrls(url, outputFolder, resultBaseURL) {
-  return resultsStorage(url, timestamp, outputFolder, resultBaseURL).resultUrls;
+  return resultsStorage(url, timestamp, { outputFolder, resultBaseURL })
+    .resultUrls;
 }
 
 describe('resultUrls', function() {

test/storageManagerTests.js

@@ -9,7 +9,7 @@ const timestamp = dayjs();
 const timestampString = timestamp.format('YYYY-MM-DD-HH-mm-ss');
 
 function createManager(url, outputFolder) {
-  return resultsStorage(url, timestamp, outputFolder).storageManager;
+  return resultsStorage(url, timestamp, { outputFolder }).storageManager;
 }
 
 describe('storageManager', function() {