feat: --out-name

viasite · Nov 27, 2020 · 4968cb3 · 4968cb3
1 parent 90aa34c
commit 4968cb3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/actions/uploadJson.js b/src/actions/uploadJson.js
@@ -13,7 +13,7 @@ module.exports = async (jsonPath, options) => {
     replace('T', '_').
     replace('Z', '');
   // const dateStr = date.slice(0,10);
-  const name = path.basename(jsonPath).replace(/[^0-9a-zа-я_.]/ig, '');
+  const name = path.basename(jsonPath).replace(/[^0-9a-zа-я_-.]/ig, '');
   const uploadName = date + '_' + name;
 
   console.log('\nUploading to https://site-audit.viasite.ru...');

diff --git a/src/index.js b/src/index.js
@@ -97,6 +97,7 @@ program.option('-u --urls <urls>', 'Comma separated url list for scan', list).
   option('--no-remove-json', `No delete json after serve`).
   option('--out-dir <dir>', `Output directory`,
     getConfigVal('outDir', '~/site-audit-seo/')).
+  option('--out-name <name>', `Output file name, default: domain`).
   option('--csv <path>', `Skip scan, only convert csv to xlsx`).
   option('--xlsx', `Save as XLSX`, getConfigVal('xlsx', false)).
   option('--gdrive', `Publish sheet to google docs`,
@@ -228,6 +229,7 @@ async function start() {
       headless: program.headless,                 // на десктопе открывает браузер визуально
       docsExtensions: program.docsExtensions,     // расширения, которые будут добавлены в таблицу
       outDir: program.outDir,                     // папка, куда сохраняются csv
+      outName: program.outName,                   // имя файла
       color: program.color,                       // раскрашивать консоль
       lang: program.lang,                         // язык
       openFile: program.openFile,                 // открыть файл после сканирования

diff --git a/src/scrap-site.js b/src/scrap-site.js
@@ -29,9 +29,10 @@ module.exports = async (baseUrl, options = {}) => {
   const domain = url.parse(baseUrl).hostname;
   const protocol = url.parse(baseUrl).protocol;
 
-  const csvPath = path.normalize(`${options.outDir}/${domain}.csv`);
-  const xlsxPath = path.normalize(`${options.outDir}/${domain}.xlsx`);
-  const jsonPath = path.normalize(`${options.outDir}/${domain}.json`);
+  const baseName = options.outName || domain;
+  const csvPath = path.normalize(`${options.outDir}/${baseName}.csv`);
+  const xlsxPath = path.normalize(`${options.outDir}/${baseName}.xlsx`);
+  const jsonPath = path.normalize(`${options.outDir}/${baseName}.json`);
   let webPath;
 
   if (!options.color) color.white = color.red = color.reset = color.yellow = '';