yt-cli

commit 855ac4c0bfdecbd63812e1138de4dbd0d36cffc1

Author: Connor Etherington <[email protected]>

Date:   Fri May 26 08:20:15 2023 +0200

    Auto-Commit Update - 20230526

---

 PKGBUILD                                  |  2 +-

 usr/lib/node_modules/yt-cli/lib/yt-cli.js | 86 +++++++++++++++++--------------

 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index ae7aa8c..4fe6f55 100644

--- a/PKGBUILD

+++ b/PKGBUILD

@@ -1,7 +1,7 @@

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=yt-cli

-pkgver=0.2.1

+pkgver=0.2.2

 pkgrel=1

 pkgdesc="An easy to use CLI YouTube client"

 arch=('any')

diff --git a/usr/lib/node_modules/yt-cli/lib/yt-cli.js b/usr/lib/node_modules/yt-cli/lib/yt-cli.js

index f894667..284715b 100755

--- a/usr/lib/node_modules/yt-cli/lib/yt-cli.js

+++ b/usr/lib/node_modules/yt-cli/lib/yt-cli.js

@@ -68,12 +68,19 @@ const main = async (search) => {

   if(!response.searchTerm) process.exit(0);

-  let help, auto, download, to;

+  let help = false,

+      to = false,

+      auto = false,

+      download = false;

   if(search) {

-    if(search.match(/^-h\s*?/) || search.match(/\s*?-h\s*?/) ||

-      search.match(/^--help\s*?/) || search.match(/\s*?--help\s*?/)) {

+    if(response.searchTerm.match(/-h\s*?/) || response.searchTerm.match(/--help\s*?/)) if(response.searchTerm.split(/--?h(elp)?\s?/)[0]

+      .replace(/--?to?\s/, '')

+      .replace(/--?a(uto)?\s?/, '')

+      .replace(/--?d(ownload)?\s?/, '')

+      .replace(/-dt\s?/, '')

+      .replace(/ /g, '') === '') {

       await sh(`echo -e "\n  Usage: yt-cli [options] [search-term]\n\n    -a | --auto     : auto select first result\n    -d | --download : download selected video to \${HOME}/yt-cli\n    -t | --to       : download selected video to specified directory\n    -h | --help     : show this help message\n\n"`);

@@ -82,61 +89,56 @@ const main = async (search) => {

       help = false;

     }

-    if(search.match(/^-a\s*?/) || search.match(/\s*?-a\s*?/) ||

-      search.match(/^--auto\s*?/) || search.match(/\s*?--auto\s*?/)) {

+    if(response.searchTerm.match(/-t\s*/) || response.searchTerm.match(/--to\s*/)) if(response.searchTerm.split(/--?to?\s/)[0]

+      .replace(/--?a(uto)?\s?/, '')

+      .replace(/--?d(ownload)?\s?/, '')

+      .replace(/-dt\s?/, '')

+      .replace(/ /g, '') === '') {

-      response.searchTerm = search.replace(/^-a\s?/, '')

-        .replace(/\s?-a\s?$/, '') .replace(/\^--auto\s?/, '')

-        .replace(/\s?--auto\s?$/, '');

+      to = response.searchTerm.split(/--?to?\s/)[1] ? response.searchTerm.split(/--?to?\s/)[1].split(' ')[0] : false;

+      response.searchTerm = response.searchTerm.replace(/--?to?\s/, '').replace(`${to}`, '').replace(/^\s+|\s+$/g, '');

-      auto = true;

     } else {

-      auto = false;

+      to = false;

     }

-    if(search.match(/^-d\s*?/) || search.match(/\s*?-d\s*?/) ||

-      search.match(/^--download\s*?/) || search.match(/\s*?--download\s*?/)) {

+    if(response.searchTerm.match(/-dt\s*/) || response.searchTerm.match(/--download-to\s*/)) if(response.searchTerm.split(/-dt\s/)[0]

+      .replace(/--?a(uto)?\s?/, '')

+      .replace(/--?d(ownload)?\s?/, '')

+      .replace(/ /g, '') === '') {

-      response.searchTerm = search.replace(/^-d\s?/, '')

-        .replace(/\s?-d\s?$/, '') .replace(/\^--download\s?/, '')

-        .replace(/\s?--download\s?$/, '');

+

+      to = response.searchTerm.split(/-dt\s/)[1] ? response.searchTerm.split(/-dt\s/)[1].split(' ')[0] : false;

+      response.searchTerm = response.searchTerm.replace(/-dt\s/, '').replace(`${to}`, '').replace(/^\s+|\s+$/g, '');

       download = true;

+

     } else {

-      download = false;

+      to = false;

     }

-    if(search.match(/^-dt\s*?/) || search.match(/\s*?-dt\s*?/)) {

-

-      to = response.searchTerm.split(/-dt\s?/)[1] ? response.searchTerm.split(/-td\s?/)[1].split(' ')[0] : false;

-      response.searchTerm = search.replace(/^-dt\s?/, '').replace(/\s?-dt\s?$/, '');

+    if(response.searchTerm.match(/-a\s*?/) || response.searchTerm.match(/--auto\s*?/)) if(response.searchTerm.split(/--?a(uto)?\s?/)[0]

+      .replace(/--?d(ownload)?\s?/, '')

+      .replace(/-dt\s?/, '')

+      .replace(/ /g, '') === '') {

-      download = true;

+      response.searchTerm = response.searchTerm.replace(/--?a(uto)?\s/, '');

+      auto = true;

     }

-    if(search.match(/^-t\s*?/) || search.match(/\s*?-t\s*?/) ||

-      search.match(/^--to\s*?/) || search.match(/\s*?--to\s*?/)) {

+    if(response.searchTerm.match(/-d\s*/) || response.searchTerm.match(/--download\s*?/)) if(response.searchTerm.split(/--?d(ownload)?\s?/)[0]

+      .replace(/-dt\s?/, '')

+      .replace(/ /g, '') === '') {

-      to = response.searchTerm.split(/-t\s?/)[1] ? response.searchTerm.split(/-t\s?/)[1].split(' ')[0] :

-        response.searchTerm.split(/--to\s?/)[1] ? response.searchTerm.split(/--to\s?/)[1].split(' ')[0] : false;

+      response.searchTerm = response.searchTerm.replace(/--?d(ownload)?\s/, '');

-      if(to === false) {

-        await sh(`echo -e "\n [-] Error: the --to flag requires an argument\n"`);

-        process.exit(0);

-      }

-

-      response.searchTerm = search.replace(/^-t\s?/, '')

-        .replace(/\s?-t\s?$/, '') .replace(/\^--to\s?/, '')

-        .replace(/\s?--to\s?$/, '').replace(to, '');

-

-      if(to && !download) {

-        await sh(`echo -e "\n [-] Error: the --to flag cannot be used without the --download flag\n"`);

-      }

+      download = true;

     } else {

-      to = false;

+      download = false;

     }

+

   } else {

     help = false;

     auto = false;

@@ -144,8 +146,14 @@ const main = async (search) => {

     to = false;

   }

+

   if(help) process.exit(0);

-  if(to && !download) process.exit(0);

+

+  if(to && !download) {

+    await sh(`echo -e "\n [-] Error: the --to flag cannot be used without the --download flag\n"`);

+    process.exit(0);

+  }

+

   const data = await getData(response.searchTerm);

   const list = data.map((d, i) => {