ani-cli-npm 2.0.4 → 2.0.6

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

@@ -34,7 +34,6 @@ class Anime {
         anime_id:
          */
         let cache_object = (0, cache_1.search_cache)(cache_folder, anime_id);
-        console.log(cache_object);
         this.id = anime_id;
         if (cache_object == 0) {
             await this.get_ep_bases(this.id);
@@ -82,7 +81,9 @@ class Anime {
         lines = "{" + lines.slice(lines.indexOf(",") + 1, lines.length) + "}";
         let json = JSON.parse(lines);
         for (const value of Object.entries(json)) {
-            this.episode_list.push(value[1]);
+            if (typeof value[1] == "string") {
+                this.episode_list.push(value[1]);
+            }
         }
     }
     async play_head(episode, config, config_dir) {
@@ -153,7 +154,7 @@ class Anime {
                     break;
             }
         }
-        else if (episode >= this.episode_list.length - 1) {
+        else if (episode >= this.episode_list.length - 2) {
             switch (await (0, input_1.selection)([
                 "Previous",
                 "Quit"
@@ -226,7 +227,7 @@ class Anime {
                     break;
             }
         }
-        else if (episode >= this.episode_list.length - 1) {
+        else if (episode >= this.episode_list.length - 2) {
             switch (await (0, input_1.selection)([
                 "Previous",
                 "Quit"
@@ -255,38 +256,46 @@ class Anime {
             }
         }
     }
-    async download(episode, download_folder) {
+    async download(episode, download_folder, final_ep) {
         /*
         ## Downloads an episode (counting from 0) to download_folder, with progress bar.
          */
-        // @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,
-            // @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;
-            },
+        try {
             // @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);
+            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);
+        }
     }
 }
 exports.Anime = Anime;

package/bin/download.js

@@ -1,14 +1,9 @@
 "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();
@@ -31,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`));
@@ -48,10 +49,12 @@ async function main() {
             }
             else {
                 console.log(`Select episode [1-${anime.episode_list.length}]`);
-                episode_number = await (0, input_1.number_input)(anime.episode_list.length) - 1;
+                episode_number = await (0, input_1.number_input)(anime.episode_list.length);
+            }
+            await anime.play_head(episode_number - 1, config, cache_folder);
+            if (anime.player != 1 && anime.player != 0) {
+                await anime.player.quit();
             }
-            await anime.play_head(episode_number, config, cache_folder);
-            await anime.player.quit();
             await main();
             break;
         case 1: // Continue
@@ -74,7 +77,6 @@ async function main() {
             if (code == 1) {
                 console.log(chalk.red("Error downloading episodes"));
             }
-            await main();
             break;
         case 3: // Options
             let temp = structuredClone(config);
@@ -107,6 +109,7 @@ async function main() {
         case 4: // Quit
             console.log("Exit");
     }
+    return 0;
     // await search()
 }
 main();

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/package.json

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