yt-cli

commit a1ab6ce89377f16561d8c3e97069ceaf5a70c2c9

Author: Connor Etherington <[email protected]>

Date:   Fri May 26 05:28:52 2023 +0200

    Auto-Commit Update - 20230526

---

 PKGBUILD                                           |  2 +-

 usr/bin/yt-cli                                     |  2 +-

 .../yt-cli/{bin/yt-cli => lib/yt-cli.js}           | 48 ++++++++++++++++++----

 usr/lib/node_modules/yt-cli/package.json           |  9 ++--

 4 files changed, 48 insertions(+), 13 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD

index e99ef3e..1330d0a 100644

--- a/PKGBUILD

+++ b/PKGBUILD

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

 # Maintainer: Connor Etherington <[email protected]>

 # ---

 pkgname=yt-cli

-pkgver=0.2.0

+pkgver=0.2.1

 pkgrel=1

 pkgdesc="An easy to use CLI YouTube client"

 arch=('any')

diff --git a/usr/bin/yt-cli b/usr/bin/yt-cli

index d8df8ee..93725c2 100755

--- a/usr/bin/yt-cli

+++ b/usr/bin/yt-cli

@@ -1,2 +1,2 @@

 #!/usr/bin/env node

-require('/usr/lib/node_modules/yt-cli/bin/yt-cli');

+require('/usr/lib/node_modules/yt-cli');

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

similarity index 68%

rename from usr/lib/node_modules/yt-cli/bin/yt-cli

rename to usr/lib/node_modules/yt-cli/lib/yt-cli.js

index 1a322a8..48c2524 100755

--- a/usr/lib/node_modules/yt-cli/bin/yt-cli

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

@@ -1,5 +1,8 @@

 #!/usr/bin/env node

+import { createRequire } from 'module';

+const require = createRequire(import.meta.url);

+

 const fs = require('fs');

 const beautifier = require('html-formatter');

 const axios = require('axios');

@@ -73,11 +76,7 @@ const main = async (search) => {

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

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

-      const exe = async (cmd, cb) => await require('child_process').exec( cmd, async (e, so, se) => cb(so));

-      const cl = (x) => console.log(x);

-

-      const c = `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    -h | --help     : display this message"`

-      await exe(c, cl);

+      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"`);

       var help = true;

     } else {

@@ -108,12 +107,49 @@ const main = async (search) => {

       var download = false;

     }

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

+

+      var 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?$/, '');

+

+      var download = true;

+    } else {

+      var download = false;

+    }

+

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

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

+

+      var 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;

+

+      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"`);

+      }

+

+    } else {

+      var to = false;

+    }

+

   } else {

     var help = false;

     var auto = false;

     var download = false;

+    var to = false;

   }

+  if(help) process.exit(0);

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

+

   const data = await getData(response.searchTerm);

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

     return `${i + 1}. ${d.title}`;

@@ -129,8 +165,6 @@ const main = async (search) => {

   const selectedVideo = data[response2.video];

-  if(help) process.exit(0);

-

   if(download) {

     if(!fs.existsSync(os.homedir() + '/yt-cli')) fs.mkdirSync(os.homedir() + '/yt-cli');

     await dV(selectedVideo.url, os.homedir() + '/yt-cli/' + selectedVideo.title + '.mp4');

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

index 82d8425..0c2abe9 100644

--- a/usr/lib/node_modules/yt-cli/package.json

+++ b/usr/lib/node_modules/yt-cli/package.json

@@ -1,13 +1,14 @@

 {

-  "name": "yt-cli",

-  "version": "0.2.0",

-  "main": "bin/yt-cli",

+  "name": "@a4to/yt-cli",

+  "version": "0.2.1",

+  "main": "lib/yt-cli.js",

+  "type": "module",

   "scripts": {

     "start": "node ${npm_package_main}",

     "dev": "nodemon ${npm_package_main}"

   },

   "bin": {

-    "yt-cli": "./${npm_package_main}"

+    "yt-cli": "lib/yt-cli.js"

   },

   "author": "Connor Etherington <[email protected]>",

   "license": "MIT",