ani-cli-npm 2.0.3 → 2.0.5

package/README.MD

@@ -36,6 +36,7 @@ npx ani-cli-npm@latest
 ```
 git clone https://github.com/Bumpkin-Pi/ani-cli-npm.git
 cd ani-cli-npm
+npm i
 npm run build
 npm run start
 ```
@@ -69,4 +70,5 @@ npm run start
 #### Download folder  - The folder in which to download episodes.
 
 
-## Happy watching :)
+
+<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

@@ -11,24 +11,40 @@ const open = require("open");
 const PlayerController = require("media-player-controller");
 const dl = require("download-file-with-progressbar");
 const chalk = require("chalk");
-// const gogohd_url="https://gogohd.net/"
-const base_url = "https://animixplay.to";
 class Anime {
+    /*
+    Class for handling a show/film
+
+    Stores anime dpage links assigned with anime_id.
+
+    Initialised with Anime.init()
+
+     */
     id = "";
     episode_list = [];
     player = 0;
     async init(anime_id, cache_folder) {
+        /*
+        Initiate Anime object
+
+        Will first search cache folder for cache file (this will contain id and dpage links)
+
+        If no cache is found, it will use get_ep_bases(anime_id) to get links. (Webscrapes from animixplay.to), then creates cache
+
+        anime_id:
+         */
         let cache_object = (0, cache_1.search_cache)(cache_folder, anime_id);
         this.id = anime_id;
         if (cache_object == 0) {
-            await this.get_ap_bases(anime_id);
+            await this.get_ep_bases(this.id);
+            (0, cache_1.new_cache)(cache_folder, this);
         }
         else {
             try {
                 this.episode_list = cache_object.episode_list;
             }
             catch {
-                await this.get_ap_bases(anime_id);
+                await this.get_ep_bases(this.id);
             }
         }
         return 0;
@@ -49,8 +65,12 @@ class Anime {
         }
         return link;
     }
-    async get_ap_bases(anime_id) {
-        let html = (await ((0, curl_1.curl)(base_url + "/v1/" + anime_id))).split("\n");
+    async get_ep_bases(anime_id) {
+        /*
+        Scrapes animixplay.to for dpage links.
+        returns array with all dpage links
+         */
+        let html = (await ((0, curl_1.curl)("https://animixplay.to/v1/" + anime_id))).split("\n"); //POTENTIAL BREAK POINT. animixplay.to may change domain address
         let lines = "";
         for (let x in html) {
             if ((0, regex_1.RegexParse)(html[x], "*<div id=\"epslistplace\"*")) {
@@ -65,6 +85,20 @@ class Anime {
         }
     }
     async play_head(episode, config, config_dir) {
+        /*
+        # Starts play cascade.
+
+        ## Takes in:
+        ### Episode number, counding from 0
+        ### Config object
+        ### Config save directory
+
+         - If config.player is set to MPV or VLC, it will use the media-player-controller package.
+
+         - If set to Browser, it will use the "open" packer.
+
+         - If set to Link, it will simply print the media stream link to console, primarily for debuting peruses.
+         */
         console.clear();
         console.log(`Playing ${this.id} episode ${episode + 1}`);
         switch (config.player) {
@@ -148,6 +182,10 @@ class Anime {
         }
     }
     async play(episode, config, config_dir) {
+        /*
+        # Continues play cascade
+        ## Continues on from play_head()
+         */
         console.clear();
         console.log(`Playing ${this.id} episode ${episode + 1}`);
         if (this.player == 0) {
@@ -216,42 +254,46 @@ class Anime {
             }
         }
     }
-    async download(episode, download_folder) {
-        // @ts-ignore
-        let ep_link = await this.get_episode_link(episode);
-        let file_name = `${this.id}-${episode + 1}.mp4`;
-        if (ep_link.includes(".m3u8"))
-            console.log(chalk.red("Warning: Animixplay will download an m3u8 file. This will require some extra steps to play. It is advised to use a 3rd party website or tool to download these from the link."));
-        // @ts-ignore
-        let option = {
-            filename: ep_link.includes("m3u8") ? file_name.replace("mp4", "m3u8") : file_name,
-            dir: download_folder,
+    async download(episode, download_folder, final_ep) {
+        /*
+        ## Downloads an episode (counting from 0) to download_folder, with progress bar.
+         */
+        try {
             // @ts-ignore
-            onDone: (info) => {
-                // @ts-ignore
-                console.log(chalk.green(`\n -- Download finished -- \nLocation: ${info.path}. Size: ${Math.round(info.size / 100000) * 10} Bytes\n`) + ">");
-                return 0;
-            },
-            // @ts-ignore
-            onError: (err) => {
-                console.log(chalk.red('error', err));
-            },
+            let ep_link = await this.get_episode_link(episode);
+            let file_name = `${this.id}-${episode + 1}.mp4`;
+            if (ep_link.includes(".m3u8"))
+                console.log(chalk.red("Warning: Animixplay will download an m3u8 file. This will require some extra steps to play. It is advised to use a 3rd party website or tool to download these from the link."));
             // @ts-ignore
-            onProgress: (curr, total) => {
-                process.stdout.clearLine(0);
-                process.stdout.cursorTo(0);
-                process.stdout.write("\x1b[32m -- " + (curr / total * 100).toFixed(2) + "% " + "#".repeat(Math.ceil((curr / total) * ((process.stdout.columns - 20) / 1.5))) + "~".repeat(Math.ceil(((process.stdout.columns - 20) / 1.5) - (curr / total) * ((process.stdout.columns - 20) / 1.5))) + " -- \x1b[0m");
-            }
-        };
-        //console.log((`${option.dir}/${option.filename}`))
-        return await dl(ep_link, option);
-    }
-    async bulk_download(start_episode, end_episode, download_folder) {
-        let downloaders = [];
-        for (let episode = start_episode; episode <= end_episode; episode++) {
-            downloaders.push(await this.download(episode, download_folder));
+            let option = {
+                filename: (ep_link.includes("m3u8") ? file_name.replace("mp4", "m3u8") : file_name),
+                dir: download_folder,
+                onDone: (final_ep > episode) ? ((info) => {
+                    // @ts-ignore
+                    console.log(chalk.green(`\n -- 1Download finished -- \nLocation: ${info.path}. Size: ${Math.round(info.size / 100000) * 10} Bytes\n`));
+                    this.download(episode + 1, download_folder, final_ep);
+                }) : ((info) => {
+                    // @ts-ignore
+                    console.log(chalk.green(`\n -- 2Download finished -- \n${info.path}. Size: ${Math.round(info.size / 100000) * 10} Bytes\n`));
+                }),
+                // @ts-ignore
+                onError: (err) => {
+                    console.log(chalk.red('error', err));
+                    this.download(episode, download_folder, final_ep);
+                },
+                // @ts-ignore
+                onProgress: (curr, total) => {
+                    process.stdout.clearLine(0);
+                    process.stdout.cursorTo(0);
+                    process.stdout.write("\x1b[32m -- " + (curr / total * 100).toFixed(2) + "% " + "#".repeat(Math.ceil((curr / total) * ((process.stdout.columns - 20) / 1.5))) + "~".repeat(Math.ceil(((process.stdout.columns - 20) / 1.5) - (curr / total) * ((process.stdout.columns - 20) / 1.5))) + " -- \x1b[0m");
+                }
+            };
+            //console.log((`${option.dir}/${option.filename}`))
+            return await dl(ep_link, option);
+        }
+        catch {
+            this.download(episode, download_folder, final_ep);
         }
-        return await Promise.all(downloaders);
     }
 }
 exports.Anime = Anime;

package/bin/cache.js

@@ -39,24 +39,33 @@ function clear_cache(location, show) {
     }
 }
 exports.clear_cache = clear_cache;
-function new_cache(location, anime, show) {
+function new_cache(location, anime) {
+    /*
+    Creates cache of Anime object, in cache file.
+     */
     try {
         fs.writeFileSync(location + "/" + anime.id + ".cache", JSON.stringify(anime));
     }
     catch {
-        if (show) {
-            console.log("Failed to write to cache");
-        }
+        console.log("Failed to write to cache");
     }
 }
 exports.new_cache = new_cache;
 function get_cache(location, anime_id) {
+    /*
+    ## Get cache by anime_id. Does not check if the cache exists.
+     */
     return JSON.parse(fs.readFileSync(location + "/" + anime_id + ".cache").toString());
 }
-function search_cache(location, anime_id) {
+function search_cache(cache_folder, anime_id) {
+    /*
+    ## Searches cache folder for cache file with name of anime_id, at the location of cache_folder
+
+    ### returns boolean for weather it is found.
+     */
     try {
-        if (check_cache(location, anime_id)) {
-            return get_cache(location, anime_id);
+        if (check_cache(cache_folder, anime_id)) {
+            return get_cache(cache_folder, anime_id);
         }
         return false;
     }

package/bin/change_config.js

@@ -4,6 +4,9 @@ exports.config_ = void 0;
 const chalk = require("chalk");
 const input_1 = require("./input");
 async function config_(temp) {
+    /*
+    ## Lets user change a single attribute of config. Returns new config object, and an exit code
+     */
     console.clear();
     console.log(chalk.blue("ANI-CLI-NPM \n"));
     console.log(chalk.yellow("Config:\n"));

package/bin/curl.js

@@ -2,33 +2,34 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.curl = void 0;
 const fetch = require("node-fetch");
+const chalk = require("chalk");
 async function curl(url, method = "GET", redirect = false) {
-    //try{
-    let response = await fetch(url, {
-        //"agent": proxyAgent,
-        "headers": {
-            'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0',
-            "X-Requested-With": "XMLHttpRequest"
-        },
-        "referrerPolicy": "origin",
-        "body": null,
-        "method": method,
-        "redirect": 'follow',
-        // "follow": 10,
-    }); /*.catch(async function(err) {
-        console.warn(colors.Red, `Something went wrong connecting to ${url}.`);
-        await search();
-        process.exit()
-    })*/
-    if (redirect) {
-        return response.url;
+    try {
+        let response = await fetch(url, {
+            //"agent": proxyAgent,
+            "headers": {
+                'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0',
+                "X-Requested-With": "XMLHttpRequest"
+            },
+            "referrerPolicy": "origin",
+            "body": null,
+            "method": method,
+            "redirect": 'follow',
+            // "follow": 10,
+        }).catch(async function (err) {
+            console.warn(chalk.red(`Something went wrong connecting to ${url}. ${err}`));
+            process.exit();
+        });
+        if (redirect) {
+            return response.url;
+        }
+        else {
+            return await response.text();
+        }
     }
-    else {
-        return await response.text();
+    catch {
+        console.log(chalk.red("Something went wrong in curl()"));
+        process.exit();
     }
-    /*}catch{
-        console.log(colors.Red, "Something went wrong in curl()")
-        await main()
-    }*/
 }
 exports.curl = curl;

package/bin/download.js

@@ -1,18 +1,17 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.download = void 0;
 const search_anime_1 = require("./search_anime");
 const Anime_1 = require("./Anime");
 const input_1 = require("./input");
-const libs_1 = require("./libs");
-const chalk_1 = __importDefault(require("chalk"));
 async function download(cache_folder, config) {
     try {
         console.clear();
-        let download_id = await (0, search_anime_1.search)();
+        let temp_ = await (0, search_anime_1.search)();
+        if (temp_ == 1) {
+            return 2;
+        }
+        let download_id = temp_;
         let download = new Anime_1.Anime();
         await download.init(download_id, cache_folder);
         let start_ep_number;
@@ -27,21 +26,7 @@ async function download(cache_folder, config) {
             console.log(`Select end episode [${start_ep_number}-${download.episode_list.length}]`);
             end_ep_number = await (0, input_1.number_input)(download.episode_list.length, start_ep_number) - 1;
         }
-        let to_do = (0, libs_1.range)(start_ep_number, end_ep_number + 1);
-        do {
-            for (let x in to_do) {
-                try {
-                    await download.download(to_do[x] - 1, config.download_folder);
-                    to_do.splice(Number(x), 1);
-                }
-                catch {
-                    console.log(chalk_1.default.red("Failed to download episode " + to_do[x]));
-                }
-            }
-            if (to_do[0] !== undefined) { //TODO fix buggy downloads
-                console.log(chalk_1.default.red("Failed to download episodes: " + to_do) + "\nRetrying...");
-            }
-        } while (to_do[0] !== undefined);
+        await download.download(start_ep_number - 1, config.download_folder, end_ep_number);
     }
     catch {
         return 1;

package/bin/index.js

@@ -18,9 +18,10 @@ 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);
 console.clear();
 async function main() {
-    let config = (0, load_config_1.load_config)(app_data_folder);
+    let config = (0, load_config_1.load_config)(cache_folder);
     console.log(chalk.magenta("Ani-cli-npm!\n"));
     if (config.most_recent.anime_id !== "") {
         console.log(chalk.grey(`Most recently played: ${config.most_recent.anime_id} episode ${config.most_recent.episode_number + 1}\n`));
@@ -34,7 +35,12 @@ async function main() {
     ], ["s", "c", "d", "o", "q"], ((thing) => { return chalk.magenta(thing); }), ((thing) => { return chalk.magenta(thing); }));
     switch (choice) {
         case 0: // Search
-            let anime_id = await (0, search_anime_1.search)();
+            let temp_ = await (0, search_anime_1.search)();
+            if (temp_ == 1) {
+                await main();
+                process.exit();
+            }
+            let anime_id = temp_;
             let anime = new Anime_1.Anime();
             await anime.init(anime_id, cache_folder);
             let episode_number;
@@ -59,7 +65,9 @@ async function main() {
             let continue_anime = new Anime_1.Anime();
             await continue_anime.init(config.most_recent.anime_id, cache_folder);
             await continue_anime.play_head(config.most_recent.episode_number, config, cache_folder);
-            await continue_anime.player.quit();
+            if (continue_anime.player != 0 && continue_anime.player != 1) {
+                await continue_anime.player.quit();
+            }
             await main();
             break;
         case 2: // Download
@@ -67,7 +75,6 @@ async function main() {
             if (code == 1) {
                 console.log(chalk.red("Error downloading episodes"));
             }
-            await main();
             break;
         case 3: // Options
             let temp = structuredClone(config);
@@ -100,6 +107,7 @@ async function main() {
         case 4: // Quit
             console.log("Exit");
     }
+    return 0;
     // await search()
 }
 main();

package/bin/input.js

@@ -7,6 +7,24 @@ 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); })) {
+    /*
+    selection(options, extra_options, color1, color2)
+
+    Gives use prompt to choose from a list of options. Either by inputting a number ranging from 1, to the length of the list. Or by inputting a letter (non-caps-sensitive) relating to the option.
+
+
+     - options: array of options; e.g. ["play", "download", "continue", "quit"] REQUIRED
+
+
+     - extra_options: array of characters as alternatives to numbers (both will be displayed). e.g. ["p", "d", "c", "q"].
+
+       default: []
+
+     - color1 and color2: functions that will dictate what 2 colors the options with alternate between (option1 will be color1, option2;color2, option3;color1, etc).
+     recommended for this function to return a chalk.____() parsed string.
+
+       default: ((thing:string) => {return chalk.yellow(thing)}) and ((thing:string) => {return chalk.green(thing)})
+    */
     let color = true;
     for (let x in options) {
         if (color) {
@@ -57,12 +75,3 @@ async function number_input(max, min = 1) {
     return selection;
 }
 exports.number_input = number_input;
-async function number_input_range(max, min = 1) {
-    let selection;
-    do {
-        selection = await _prompt(">");
-        if (!(min <= parseInt(selection[0]) && parseInt(selection[0]) <= max)) {
-            console.log(chalk_1.default.red("Invalid choice."));
-        }
-    } while (!(min <= parseInt(selection[0]) && parseInt(selection[0]) <= max));
-}

package/bin/load_config.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.write_config = exports.load_config = void 0;
+exports.make_config_dir = exports.write_config = exports.load_config = void 0;
 const fs = __importStar(require("fs"));
 function make_config_dir(cache_dir, debug) {
     try {
@@ -36,9 +36,10 @@ function make_config_dir(cache_dir, debug) {
         }
     }
 }
+exports.make_config_dir = make_config_dir;
 function write_config(cache_dir, config) {
     try {
-        make_config_dir(cache_dir, config.debug_mode);
+        //make_config_dir(cache_dir, config.debug_mode)
         fs.writeFileSync(cache_dir + "/config.conf", JSON.stringify(config));
     }
     catch {

package/bin/search_anime.js

@@ -30,6 +30,10 @@ async function search() {
     console.log(chalk_1.default.magenta("Search..."));
     let _selection = await (0, input_1.input)();
     let results = await search_anime(_selection);
+    if (results[0] === undefined) {
+        console.log(chalk_1.default.red("No results found."));
+        return 1;
+    }
     return results[await (0, input_1.selection)(results)];
 }
 exports.search = search;

package/naruto-dub-1.m3u8

@@ -0,0 +1,9 @@
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=120532,RESOLUTION=640x360,NAME="360p"
+ep.1.1657688701.360.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=195379,RESOLUTION=854x480,NAME="480p"
+ep.1.1657688701.480.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=418741,RESOLUTION=1280x720,NAME="720p"
+ep.1.1657688701.720.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=903363,RESOLUTION=1920x1080,NAME="1080p"
+ep.1.1657688701.1080.m3u8

package/naruto-dub-2.m3u8

@@ -0,0 +1,9 @@
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=112046,RESOLUTION=640x360,NAME="360p"
+ep.2.1657689264.360.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=180246,RESOLUTION=854x480,NAME="480p"
+ep.2.1657689264.480.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=382280,RESOLUTION=1280x720,NAME="720p"
+ep.2.1657689264.720.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=829748,RESOLUTION=1920x1080,NAME="1080p"
+ep.2.1657689264.1080.m3u8

package/naruto-dub-3.m3u8

@@ -0,0 +1,9 @@
+#EXTM3U
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=113161,RESOLUTION=640x360,NAME="360p"
+ep.3.1657689714.360.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=177223,RESOLUTION=854x480,NAME="480p"
+ep.3.1657689714.480.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=372889,RESOLUTION=1280x720,NAME="720p"
+ep.3.1657689714.720.m3u8
+#EXT-X-STREAM-INF:PROGRAM-ID=1,BANDWIDTH=798185,RESOLUTION=1920x1080,NAME="1080p"
+ep.3.1657689714.1080.m3u8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ani-cli-npm",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "ani-cli tool rewritten as npm package",
   "main": "bin/index.js",
   "scripts": {
@@ -35,7 +35,6 @@
     "media-player-controller": "^1.5.3",
     "node-fetch": "^2.6.6",
     "open": "^8.4.0",
-    "persistent-cache": "^0.1.0",
     "simple-input": "^1.0.1",
     "typescript": "^4.9.3"
   },