ani-cli-npm 2.0.7 → 2.0.9

package/README.MD

@@ -3,6 +3,8 @@
 ### An Anime client, writen in nodeJS, to access any* anime without the need for ad filled websites! Just install, search for the anime of your choice, and watch in the video player of your choice.
 ### Typescript rewrite of the [ani-cli](https://github.com/pystardust/ani-cli) package for linux.
 
+![image](https://user-images.githubusercontent.com/74017165/205444723-20520eb1-55dd-4103-811b-07e2cf6c466d.png)
+
 
 ## Instalation:
 ### Windows:
@@ -23,7 +25,6 @@ pkg install nodejs
 ```
 npx ani-cli-npm@latest
 ```
-##### Note: At preset (1.0.6), you will need to change the player to browser, and will have to do any downloads through your browser of choice.
 
 ### Linux:
 #### - Install [nodejs](https://nodejs.org/en/download/ with your distrabutions package manager.
@@ -69,6 +70,8 @@ npm run start
 
 #### Download folder  - The folder in which to download episodes.
 
+![image](https://user-images.githubusercontent.com/74017165/205444327-d67c5099-beaf-4895-9c74-c24b79a95e07.png)
+
 
 
 <a href="https://www.buymeacoffee.com/bumpkinpi" target="_blank"><img src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png" alt="Buy Me A Coffee" style="height: 60px !important;width: 217px !important;" ></a>

package/bin/Anime.js

@@ -38,7 +38,11 @@ class Anime {
         this.id = anime_id;
         if (cache_object == 0) {
             await this.get_ep_bases(this.id);
-            (0, cache_1.new_cache)(cache_folder, this);
+            (0, cache_1.new_cache)(cache_folder, {
+                id: this.id,
+                episode_list: this.episode_list,
+                most_recent: this.most_recent
+            });
         }
         else {
             try {
@@ -51,7 +55,11 @@ class Anime {
                 await this.get_ep_bases(this.id);
             }
         }
-        (0, cache_1.new_cache)(cache_folder, this);
+        (0, cache_1.new_cache)(cache_folder, {
+            id: this.id,
+            episode_list: this.episode_list,
+            most_recent: this.most_recent
+        });
         return 0;
     }
     async get_episode_link(episode, player = "VLC") {
@@ -144,126 +152,122 @@ class Anime {
                 console.log(await this.get_episode_link(episode, config.player));
                 break;
         }
-        config.most_recent.anime_id = this.id;
-        config.most_recent.episode_number = episode;
-        this.most_recent = episode;
-        (0, cache_1.new_cache)(config_dir, this);
-        (0, load_config_1.write_config)(config_dir, config);
-        if (episode <= 0) {
-            switch (await (0, input_1.selection)([
-                "Next",
-                "Quit"
-            ], ["n", "q"])) {
-                case 0:
-                    await this.play(episode + 1, config, config_dir);
-                    break;
-                case 1:
-                    break;
-            }
-        }
-        else if (episode >= this.episode_list.length - 2) {
-            switch (await (0, input_1.selection)([
-                "Previous",
-                "Quit"
-            ], ["p", "q"])) {
-                case 0:
-                    await this.play(episode - 1, config, config_dir);
-                    break;
-                case 1:
-                    break;
-            }
-        }
-        else {
-            switch (await (0, input_1.selection)([
-                "Next",
-                "Previous",
-                "Quit"
-            ], ["n", "p", "q"])) {
-                case 0:
-                    await this.play(episode + 1, config, config_dir);
-                    break;
-                case 1:
-                    await this.play(episode - 1, config, config_dir);
-                    break;
-                case 2:
-                    break;
-            }
-        }
+        await this.play(episode, config, config_dir, true);
     }
-    async play(episode, config, config_dir) {
+    async play(episode, config, config_dir, first = false) {
         /*
         # Continues play cascade
         ## Continues on from play_head()
          */
-        console.clear();
-        console.log(`Playing ${this.id} episode ${episode + 1}`);
-        if (this.player == 0) {
-            await open(await this.get_episode_link(episode, "BROWSER"));
-        }
-        else if (this.player == 1) {
-            console.log(await this.get_episode_link(episode));
-        }
-        else if (this.player.opts.app == "mpv") {
-            await this.player.load(await this.get_episode_link(episode));
-        }
-        else {
-            this.player.quit();
-            this.player = await new PlayerController({
-                app: 'vlc',
-                args: ['--fullscreen'],
-                media: await this.get_episode_link(episode, config.player)
-            });
-            // @ts-ignore
-            await this.player.launch(err => {
-                if (err)
-                    return console.error(err.message);
-            });
+        if (!first) {
+            console.clear();
+            console.log(chalk.blue(`Playing ${this.id} episode ${episode + 1}`));
+            if (this.player == 0) {
+                await open(await this.get_episode_link(episode, "BROWSER"));
+            }
+            else if (this.player == 1) {
+                console.log(await this.get_episode_link(episode));
+            }
+            else if (this.player.opts.app == "mpv") {
+                await this.player.load(await this.get_episode_link(episode));
+            }
+            else {
+                this.player.quit();
+                this.player = await new PlayerController({
+                    app: 'vlc',
+                    args: ['--fullscreen'],
+                    media: await this.get_episode_link(episode, config.player)
+                });
+                // @ts-ignore
+                await this.player.launch(err => {
+                    if (err)
+                        return console.error(err.message);
+                });
+            }
         }
         config.most_recent.anime_id = this.id;
         config.most_recent.episode_number = episode;
         (0, load_config_1.write_config)(config_dir, config);
         this.most_recent = episode;
-        (0, cache_1.new_cache)(config_dir, this);
-        if (episode <= 0) {
-            switch (await (0, input_1.selection)([
-                "Next",
-                "Quit"
-            ], ["n", "q"])) {
-                case 0:
-                    await this.play(episode + 1, config, config_dir);
-                    break;
-                case 1:
-                    break;
+        (0, cache_1.new_cache)(config_dir, {
+            id: this.id,
+            episode_list: this.episode_list,
+            most_recent: this.most_recent
+        });
+        let selected; // Look, I'm sorry, but there is no way I can possibly document this in a sane way. It's a dumb patch.
+        do {
+            selected = await (0, input_1.selection)((episode <= 0) ? [chalk.yellow("1/n) Next"), chalk.grey("2/p) Previous"), chalk.yellow("3/s) Select"), chalk.green("4/q) Quit")] :
+                (episode >= this.episode_list.length - 1) ? [chalk.grey("1/n) Next"), chalk.green("2/p) Previous"), chalk.yellow("3/s) Select"), chalk.green("4/q) Quit")] :
+                    [chalk.yellow("1/n) Next"), chalk.green("2/p) Previous"), chalk.yellow("3/s) Select"), chalk.green("4/q) Quit")], ["n", "p", "s", "q"], ((thing) => { return (thing); }), ((thing) => { return (thing); }), true);
+            if (!(selected != ((episode <= 0) ? 1 : (episode >= this.episode_list.length - 1) ? 0 : -1))) {
+                console.log(chalk.red("Invalid choice."));
             }
-        }
-        else if (episode >= this.episode_list.length - 2) {
-            switch (await (0, input_1.selection)([
-                "Previous",
-                "Quit"
-            ], ["p", "q"])) {
-                case 0:
+        } while (!(selected != ((episode <= 0) ? 1 : (episode >= this.episode_list.length - 1) ? 0 : -1)));
+        switch (selected) {
+            case 0:
+                if (episode >= this.episode_list.length - 1) {
                     await this.play(episode - 1, config, config_dir);
-                    break;
-                case 1:
-                    break;
-            }
-        }
-        else {
-            switch (await (0, input_1.selection)([
-                "Next",
-                "Previous",
-                "Quit"
-            ], ["n", "p", "q"])) {
-                case 0:
+                }
+                else {
                     await this.play(episode + 1, config, config_dir);
+                }
+                break;
+            case 1:
+                if ((episode >= this.episode_list.length - 1) || (episode <= 0)) {
                     break;
-                case 1:
-                    await this.play(episode - 1, config, config_dir);
-                    break;
-                case 2:
-                    break;
-            }
+                }
+                await this.play(episode - 1, config, config_dir);
+                break;
+            case 2:
+                if (this.episode_list.length == 1) {
+                    await this.play(0, config, config_dir);
+                }
+                else {
+                    console.log(`Select episode [1-${this.episode_list.length}]`);
+                    await this.play(await (0, input_1.number_input)(this.episode_list.length, 1) - 1, config, config_dir);
+                }
+                break;
+            case 3:
+                break;
         }
+        // if (episode <= 0){
+        //     switch(await selection([
+        //         "Next",
+        //         "Quit"
+        //     ], ["n", "q"])){
+        //         case 0:
+        //             await this.play(episode+1, config, config_dir)
+        //             break
+        //         case 1:
+        //             break
+        //     }
+        // }else if(episode >= this.episode_list.length-2){
+        //     switch(await selection([
+        //         "Previous",
+        //         "Quit"
+        //     ], ["p", "q"])){
+        //         case 0:
+        //             await this.play(episode-1, config, config_dir)
+        //             break
+        //         case 1:
+        //             break
+        //     }
+        // }else{
+        //     switch(await selection([
+        //         "Next",
+        //         "Previous",
+        //         "Quit"
+        //     ], ["n", "p", "q"])){
+        //         case 0:
+        //             await this.play(episode+1, config, config_dir)
+        //             break
+        //         case 1:
+        //             await this.play(episode-1, config, config_dir)
+        //             break
+        //         case 2:
+        //             break
+        //     }
+        // }
     }
     async download(episode, download_folder, final_ep) {
         /*

package/bin/index.js

@@ -15,7 +15,6 @@ const load_config_1 = require("./load_config");
 const input_1 = require("./input");
 const change_config_1 = require("./change_config");
 const download_1 = require("./download");
-const fs_1 = __importDefault(require("fs"));
 const app_data_folder = (0, appdata_path_1.default)();
 const cache_folder = app_data_folder + "/ani-cli-npm";
 (0, load_config_1.make_config_dir)(cache_folder, true);
@@ -88,7 +87,13 @@ async function main() {
                     config = temp;
                     //proxyAgent = new HttpsProxyAgent(config.proxy);
                     console.clear();
-                    console.log(chalk.yellow("Config changed."));
+                    try {
+                        (0, load_config_1.write_config)(cache_folder, config);
+                        console.log(chalk.yellow("Config changed."));
+                    }
+                    catch {
+                        console.log(chalk.red("Error writing to .conf file."));
+                    }
                     break;
                 }
                 else if (exit_code === 2) {
@@ -98,12 +103,6 @@ async function main() {
                     break;
                 }
             }
-            try {
-                fs_1.default.writeFileSync(cache_folder + "/config.conf", JSON.stringify(config));
-            }
-            catch {
-                console.log(chalk.red("Error writing to .conf file."));
-            }
             await main();
             break;
         case 4: // Quit

package/bin/input.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.number_input = exports.input = exports.selection = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const _prompt = require("simple-input");
-async function selection(options, extra_options = [], color1 = ((thing) => { return chalk_1.default.yellow(thing); }), color2 = ((thing) => { return chalk_1.default.green(thing); })) {
+async function selection(options, extra_options = [], color1 = ((thing) => { return chalk_1.default.yellow(thing); }), color2 = ((thing) => { return chalk_1.default.green(thing); }), overwrite = false) {
     /*
     selection(options, extra_options, color1, color2)
 
@@ -24,18 +24,25 @@ async function selection(options, extra_options = [], color1 = ((thing) => { ret
      recommended for this function to return a chalk.____() parsed string.
 
        default: ((thing:string) => {return chalk.yellow(thing)}) and ((thing:string) => {return chalk.green(thing)})
+
+     - Overwrite: boolean. Please dont use this. I should not be using it. It prints out the raw string instead of adding numbers to them to allow for bogus.
     */
     let color = true;
     for (let x in options) {
-        if (color) {
-            console.log(color1((parseInt(x) + 1).toString() +
-                ((extra_options[x] == undefined) ? "" : "/" + extra_options[x]) +
-                ") " + options[x].replaceAll("-", " ")));
+        if (!overwrite) {
+            if (color) {
+                console.log(color1((parseInt(x) + 1).toString() +
+                    ((extra_options[x] == undefined) ? "" : "/" + extra_options[x]) +
+                    ") " + options[x].replaceAll("-", " ")));
+            }
+            else {
+                console.log(color2((parseInt(x) + 1).toString() +
+                    ((extra_options[x] == undefined) ? "" : "/" + extra_options[x]) +
+                    ") " + options[x].replaceAll("-", " ")));
+            }
         }
         else {
-            console.log(color2((parseInt(x) + 1).toString() +
-                ((extra_options[x] == undefined) ? "" : "/" + extra_options[x]) +
-                ") " + options[x].replaceAll("-", " ")));
+            console.log(options[x]);
         }
         color = !color;
     }

package/bin/load_config.js

@@ -40,7 +40,7 @@ exports.make_config_dir = make_config_dir;
 function write_config(cache_dir, config) {
     try {
         //make_config_dir(cache_dir, config.debug_mode)
-        fs.writeFileSync(cache_dir + "/config.conf", JSON.stringify(config));
+        fs.writeFileSync(cache_dir + "/config.conf", JSON.stringify(config), "utf-8");
     }
     catch {
         console.log(("Failed to write to config file."));
@@ -59,9 +59,9 @@ function load_config(cache_dir) {
         download_folder: ".",
         debug_mode: false
     };
-    if (fs.existsSync(cache_dir + "/ani-cli-npm/config.conf")) {
+    if (fs.existsSync(cache_dir + "/config.conf")) {
         // @ts-ignore
-        let tmp = JSON.parse(fs.readFileSync(cache_dir + "/ani-cli-npm/config.conf"), "utf8");
+        let tmp = JSON.parse(fs.readFileSync(cache_dir + "/config.conf"), "utf8");
         // @ts-ignore
         if (tmp.player !== undefined)
             config.player = tmp.player;

package/bin/video_quality.js

@@ -0,0 +1,6 @@
+"use strict";
+function video_quality_mp4(quality, link) {
+    switch (quality) {
+        case "best":
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ani-cli-npm",
-  "version": "2.0.7",
+  "version": "2.0.9",
   "description": "ani-cli tool rewritten as npm package",
   "main": "bin/index.js",
   "scripts": {

package/temp

@@ -0,0 +1,16 @@
+et_video_quality_mp4() {
+	case $quality in
+		best)
+			video_url=$(printf '%s' "$1" | tail -n 1 | cut -d">" -f2) ;;
+		worst)
+			video_url=$(printf '%s' "$1" | head -n 1 | cut -d">" -f2) ;;
+		*)
+			video_url=$(printf '%s' "$1" | grep -i "${quality}p" | head -n 1 | cut -d">" -f2)
+			if [ -z "$video_url" ]; then
+				err "Current video quality is not available (defaulting to best quality)"
+				video_url=$(printf '%s' "$1" | tail -n 1 | cut -d">" -f2)
+			fi
+			;;
+	esac
+	printf '%s' "$video_url"
+}