bcup-cli 1.0.13 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bcup-cli",
-  "version": "1.0.13",
+  "version": "1.1.0",
   "description": "Lightweight Buttercup password manager cli",
   "bin": {
     "bcup-cli": "bin/bcup-cli"

package/src/cli.ts

@@ -15,6 +15,7 @@ export function cli(args) {
   const chalk = require('chalk');
   const prompt = require('prompt-sync')();
   const password = prompt('Vault password: ', { echo: '*' })
+  if (password == undefined || password.length == 0) return
 
   init();
   const datasourceCredentials = Credentials.fromDatasource({
@@ -34,7 +35,7 @@ export function cli(args) {
         do {
           console.log("\n");
           const titleSearch = prompt('Search text in folder or title. You can use RegExp: ')
-          const re = new RegExp(titleSearch, 'ig');
+          const re = new RegExp(titleSearch, 'i');
           entries = vault.findEntriesByProperty('title', re);
           const groups = vault.findGroupsByTitle(re);
           const groupEntries = groups.map(group => group.getEntries());
@@ -43,18 +44,23 @@ export function cli(args) {
           entries = uniqBy(entries, entry => entry.id);
           console.log('0 exit');
           entries.forEach((entry, idx) => {
-              const title = emphSearch(entry.getProperty('title'), re);
+              const title = emphSearch(entry.getProperty('title'), titleSearch);
               const username = entry.getProperty('username');
               const url = entry.getProperty('URL');
-              const group = emphSearch(entry.getGroup().getTitle(), re);
+              const group = emphSearch(entry.getGroup().getTitle(), titleSearch);
               const sep = ` ${chalk.bold('|')} `
               console.log(`${idx + 1} ${group}${chalk.bold('->')}${title}${sep}url: ${url}${sep}username: ${username}`);
           });
 
           console.log("\n");
-          num = prompt('Select entry to copy or enter for search again: ')
-          if (debug) console.log('num: "'+ num + '"');
-          if (num === '0') return;
+          do {
+            num = prompt('Select entry to copy or enter for search again: ')
+            if (debug) console.log('num: "'+ num + '"');
+            if (num == undefined || (num.length > 0 && (!num.match(/\d+/) || num > entries.length || num < 0))) {
+              console.log(`wrong selection (0-${entries.length})`)
+            }
+            if (num === '0') return;
+          } while (num == undefined || num.length > 0 && (!num.match(/\d+/) || num > entries.length || num < 0))
           if (num === '') continue;
           const pass = entries[num - 1].getProperty('password');
           clipboardy.writeSync(pass);
@@ -66,8 +72,9 @@ export function cli(args) {
     }
 }
 
-function emphSearch(string, re) {
+function emphSearch(string, titleSearch) {
   const chalk = require('chalk');
+  const re = new RegExp(titleSearch, 'ig');
 
   let res;
   let newString = string;