feat: --default-filter

viasite · Nov 27, 2020 · 02b0129 · 02b0129
1 parent d79aab0
commit 02b0129
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/src/actions/saveAsJson.js b/src/actions/saveAsJson.js
@@ -6,7 +6,7 @@ const columns = require('../presets/columns');
 
 const defaultField = 'url';
 
-module.exports = async (csvPath, jsonPath, lang, preset) => {
+module.exports = async (csvPath, jsonPath, lang, preset, defaultFilter) => {
   // read csv to workbook
   const data = {};
 
@@ -19,6 +19,17 @@ module.exports = async (csvPath, jsonPath, lang, preset) => {
 
   // filters
   data.filters = filters;
+  if (defaultFilter) {
+    const found = data.filters.find(f => f.q === defaultFilter);
+    if (found) found.default = true;
+    else {
+      data.filters.push({
+        name: defaultFilter,
+        q: defaultFilter,
+        default: true
+      });
+    }
+  }
 
   // columns
   data.columns = buildColumns(columns, preset);

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
@@ -76,6 +76,7 @@ program.option('-u --urls <urls>', 'Comma separated url list for scan', list).
   option('-f, --fields <json>',
     'Field in format --field \'title=$("title").text()\'', fieldsCustomCollect,
     []).
+  option('--default-filter <defaultFilter>', 'Default filter when JSON viewed, example: depth>1').
   option('--no-skip-static', `Scan static files`).
   option('--no-limit-domain', `Scan not only current domain`).
   option('--docs-extensions',
@@ -234,6 +235,7 @@ async function start() {
       lang: program.lang,                         // язык
       openFile: program.openFile,                 // открыть файл после сканирования
       fields: program.fields,                     // дополнительные поля, --fields 'title=$("title").text()'
+      defaultFilter: program.defaultFilter,       //
       removeCsv: program.removeCsv,               // удалять csv после генерации xlsx
       removeJson: program.removeJson,             // удалять json после поднятия сервера
       xlsx: program.xlsx,                         // сохранять в XLSX

diff --git a/src/scrap-site.js b/src/scrap-site.js
@@ -473,7 +473,7 @@ module.exports = async (baseUrl, options = {}) => {
     }
 
     if (options.json) {
-      await saveAsJson(csvPath, jsonPath, options.lang, options.preset);
+      await saveAsJson(csvPath, jsonPath, options.lang, options.preset, options.defaultFilter);
       if (!options.removeJson) console.log('Saved to ' + jsonPath);
       if (options.upload) webPath = await uploadJson(jsonPath, options);
       // if (options.gdrive) webPath = await publishGoogleDrive(jsonPath);