Gildas 5 роки тому
батько
коміт
21c9d6088d
2 змінених файлів з 5 додано та 4 видалено
  1. 3 2
      cli/single-file
  2. 2 2
      cli/single-file-cli-api.js

+ 3 - 2
cli/single-file

@@ -27,13 +27,13 @@
 
 const fileUrl = require("file-url");
 const fs = require("fs");
+const api = require("./single-file-cli-api");
 run(require("./args"))
 	.catch(error => console.error(error.message || error)); // eslint-disable-line no-console	
 
 async function run(options) {
-	const singlefile = await require("./single-file-cli-api").initialize(options);
 	let urls;
-	if (options.url && !singlefile.VALID_URL_TEST.test(options.url)) {
+	if (options.url && !api.VALID_URL_TEST.test(options.url)) {
 		options.url = fileUrl(options.url);
 	}
 	if (options.urlsFile) {
@@ -50,6 +50,7 @@ async function run(options) {
 		}
 	}
 	options.retrieveLinks = true;
+	const singlefile = await api.initialize(options);
 	await singlefile.capture(urls);
 	await singlefile.finish();
 }

+ 2 - 2
cli/single-file-cli-api.js

@@ -80,6 +80,7 @@ let backend, tasks = [], maxParallelWorkers = 8, sessionFilename;
 
 exports.getBackEnd = backEndName => require(backEnds[backEndName]);
 exports.DEFAULT_OPTIONS = DEFAULT_OPTIONS;
+exports.VALID_URL_TEST = VALID_URL_TEST;
 exports.initialize = initialize;
 
 async function initialize(options) {
@@ -101,8 +102,7 @@ async function initialize(options) {
 	}
 	return {
 		capture: urls => capture(urls, options),
-		finish: () => finish(options),
-		VALID_URL_TEST
+		finish: () => finish(options),		
 	};
 }