fix & optimize

This commit is contained in:
2018-09-27 14:42:08 +08:00
parent 1148ae79d6
commit e9270e22b2
5 changed files with 112 additions and 102 deletions

View File

@ -20,11 +20,15 @@ async function extract(itemsSelector, fieldSelectors, ...args) {
* @param {...any} args url list / url templates, page numers, either [from, to, interval] or [...pages]
*/
async function getData(itemsSelector, fieldSelectors, ...args) {
if (!testArgs(itemsSelector, fieldSelectors, ...args))
throw new Error(`Invalid call arguments.\n\n${signitures}\n\n`);
let urls = [];
if (args.length) {
let arg = args.shift();
if (arg instanceof Array) {
urls = arg;
} else if (arg instanceof ExractResult) {
urls = arg.column(0);
} else {
let urlTempl = arg;
if (urlTempl) {
@ -62,7 +66,7 @@ async function getData(itemsSelector, fieldSelectors, ...args) {
pms.then(
results => {
data.push(...results);
resolve(new CSV(data));
resolve(new ExractResult(data));
},
err => reject(err)
);