ani-cli-npm 2.1.2 → 2.1.4

package/bin/index.js

@@ -1,119 +1,159 @@
-#!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-process.removeAllListeners(); // Ignore warning
-// External
-const appdata_path_1 = __importDefault(require("appdata-path"));
-const chalk = require("chalk");
-// Internal
-const Anime_1 = require("./Anime");
-const search_anime_1 = require("./search_anime");
-const load_config_1 = require("./file_managment/load_config");
-const input_1 = require("./input");
-const change_config_1 = require("./file_managment/change_config");
-const download_1 = require("./download");
-const help_1 = require("./help");
-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)(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`));
-    }
-    let choice = await (0, input_1.selection)([
-        "Search",
-        "Continue",
-        "Download",
-        "Option",
-        "Help",
-        "Quit",
-    ], ["s", "c", "d", "o", "h", "q"], ((thing) => { return chalk.magenta(thing); }), ((thing) => { return chalk.magenta(thing); }));
-    switch (choice) {
-        case 0: // 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;
-            if (anime.episode_list.length == 1) {
-                episode_number = 1;
-            }
-            else {
-                console.log(`Select episode [1-${anime.episode_list.length}] ${(anime.most_recent != 0) ? `Or C to continue from ep${anime.most_recent + 1}` : ""}`);
-                episode_number = await (0, input_1.number_input)(anime.episode_list.length, 1, (anime.most_recent != 0) ? ["c"] : [], (anime.most_recent != 0) ? [anime.most_recent + 1] : []);
-            }
-            await anime.play_head(episode_number - 1, config, cache_folder);
-            if (anime.player.hasOwnProperty("quit")) {
-                await anime.player.quit();
-            }
-            await main();
-            break;
-        case 1: // Continue
-            if (config.most_recent.anime_id == "") {
-                console.clear();
-                console.log(chalk.red("No episode played recently"));
-                await main();
-                break;
-            }
-            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);
-            if (continue_anime.player.hasOwnProperty("quit")) {
-                await continue_anime.player.quit();
-            }
-            await main();
-            break;
-        case 2: // Download
-            let code = await (0, download_1.download)(cache_folder, config);
-            if (code == 1) {
-                console.log(chalk.red("Error downloading episodes"));
-            }
-            break;
-        case 3: // Options
-            let temp = structuredClone(config);
-            let exit_code;
-            while (true) {
-                // @ts-ignore
-                temp, exit_code = await (0, change_config_1.config_)(temp);
-                if (exit_code === 1) {
-                    config = temp;
-                    //proxyAgent = new HttpsProxyAgent(config.proxy);
-                    console.clear();
-                    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) {
-                    temp = config;
-                    console.clear();
-                    console.log(chalk.yellow("Config changes disregarded."));
-                    break;
-                }
-            }
-            await main();
-            break;
-        case 4:
-            await (0, help_1.help)();
-            break;
-        case 5: // Quit
-            console.log("Exit");
-    }
-    return 0;
-    // await search()
-}
-main();
+#!/usr/bin/env node
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const process = __importStar(require("process"));
+//process.removeAllListeners() // Ignore warning
+// External
+const appdata_path_1 = __importDefault(require("appdata-path"));
+const chalk = require("chalk");
+// Internal
+const Anime_1 = require("./Anime");
+const search_anime_1 = require("./search_anime");
+const load_config_1 = require("./file_managment/load_config");
+const input_1 = require("./input");
+const change_config_1 = require("./file_managment/change_config");
+const cache_1 = require("./file_managment/cache");
+const download_1 = require("./download");
+const help_1 = require("./help");
+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)(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`));
+    }
+    let choice = await (0, input_1.selection)([
+        "Search",
+        "Continue",
+        "Download",
+        "Option",
+        "Clear cache",
+        "Help",
+        "Quit",
+    ], ["s", "c", "d", "o", " ", "h", "q"], ((thing) => { return chalk.magenta(thing); }), ((thing) => { return chalk.magenta(thing); }));
+    switch (choice) {
+        case 0: // 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;
+            if (anime.episode_list.length == 1) {
+                episode_number = 1;
+            }
+            else {
+                console.log(`Select episode [1-${anime.episode_list.length}] ${(anime.most_recent != 0) ? `Or C to continue from ep${anime.most_recent + 1}` : ""}`);
+                episode_number = await (0, input_1.number_input)(anime.episode_list.length, 1, (anime.most_recent != 0) ? ["c"] : [], (anime.most_recent != 0) ? [anime.most_recent + 1] : []);
+            }
+            await anime.play_head(episode_number - 1, config, cache_folder);
+            if (anime.player.hasOwnProperty("quit")) {
+                await anime.player.player.quit();
+            }
+            await main();
+            break;
+        case 1: // Continue
+            if (config.most_recent.anime_id == "") {
+                console.clear();
+                console.log(chalk.red("No episode played recently"));
+                await main();
+                break;
+            }
+            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);
+            try {
+                await continue_anime.player.player.quit();
+            }
+            catch { }
+            await main();
+            break;
+        case 2: // Download
+            let code = await (0, download_1.download)(cache_folder, config);
+            if (code == 1) {
+                console.log(chalk.red("Error downloading episodes"));
+            }
+            break;
+        case 3: // Options
+            let temp = structuredClone(config);
+            let exit_code;
+            while (true) {
+                // @ts-ignore
+                temp, exit_code = await (0, change_config_1.config_)(temp);
+                if (exit_code === 1) {
+                    config = temp;
+                    //proxyAgent = new HttpsProxyAgent(config.proxy);
+                    console.clear();
+                    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) {
+                    temp = config;
+                    console.clear();
+                    console.log(chalk.yellow("Config changes disregarded."));
+                    break;
+                }
+            }
+            await main();
+            break;
+        case 4:
+            console.clear();
+            console.log(chalk.yellow("Warning, this will also clear your current position in each anime, are you sure you want to do this?"));
+            if (await (0, input_1.selection)(["yes", "no"], ["y", "n"]) == 0) {
+                await (0, cache_1.clear_cache)(cache_folder);
+                console.clear();
+                console.log(chalk.grey("Cache cleared"));
+            }
+            else {
+                console.clear();
+            }
+            await main();
+            break;
+        case 5:
+            await (0, help_1.help)();
+            break;
+        case 6: // Quit
+            console.log("Exit");
+    }
+    return 0;
+    // await search()
+}
+main();

package/bin/input.js

@@ -1,89 +1,89 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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); }), overwrite = false) {
-    /*
-    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)})
-
-     - 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 (!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(options[x]);
-        }
-        color = !color;
-    }
-    let input = "";
-    do {
-        // @ts-ignore
-        input = (await _prompt(">")).toLowerCase();
-        for (let x in extra_options) {
-            if (extra_options[x].toLowerCase() == input) {
-                input = (parseInt(x) + 1).toString();
-            }
-        }
-        if (!(1 <= parseInt(input) && parseInt(input) <= options.length)) {
-            console.log(chalk_1.default.red("Invalid choice."));
-        }
-    } while (!(1 <= parseInt(input) && parseInt(input) <= options.length));
-    return parseInt(input) - 1;
-}
-exports.selection = selection;
-async function input() {
-    return await _prompt(">");
-}
-exports.input = input;
-async function number_input(max, min = 1, extra_options = [], extra_option_values = []) {
-    let selector;
-    let selection;
-    do {
-        selector = await _prompt(">");
-        if (extra_options.includes(selector.toLowerCase())) {
-            selection = extra_option_values[extra_options.indexOf(selector)];
-        }
-        else {
-            selection = parseInt(selector);
-        }
-        if (selector == "") {
-            selection = min;
-        }
-        if (!(min <= selection && selection <= max)) {
-            console.log(chalk_1.default.red("Invalid choice."));
-        }
-    } while (!(min <= selection && selection <= max));
-    return selection;
-}
-exports.number_input = number_input;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+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); }), overwrite = false) {
+    /*
+    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)})
+
+     - 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 (!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(options[x]);
+        }
+        color = !color;
+    }
+    let input = "";
+    do {
+        // @ts-ignore
+        input = (await _prompt(">")).toLowerCase();
+        for (let x in extra_options) {
+            if (extra_options[x].toLowerCase() == input) {
+                input = (parseInt(x) + 1).toString();
+            }
+        }
+        if (!(1 <= parseInt(input) && parseInt(input) <= options.length)) {
+            console.log(chalk_1.default.red("Invalid choice."));
+        }
+    } while (!(1 <= parseInt(input) && parseInt(input) <= options.length));
+    return parseInt(input) - 1;
+}
+exports.selection = selection;
+async function input() {
+    return await _prompt(">");
+}
+exports.input = input;
+async function number_input(max, min = 1, extra_options = [], extra_option_values = []) {
+    let selector;
+    let selection;
+    do {
+        selector = await _prompt(">");
+        if (extra_options.includes(selector.toLowerCase())) {
+            selection = extra_option_values[extra_options.indexOf(selector)];
+        }
+        else {
+            selection = parseInt(selector);
+        }
+        if (selector == "") {
+            selection = min;
+        }
+        if (!(min <= selection && selection <= max)) {
+            console.log(chalk_1.default.red("Invalid choice."));
+        }
+    } while (!(min <= selection && selection <= max));
+    return selection;
+}
+exports.number_input = number_input;

package/bin/search_anime.js

@@ -1,39 +1,39 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.search = void 0;
-const regex_1 = require("./core_utils/regex");
-const curl_1 = require("./core_utils/curl");
-const input_1 = require("./input");
-const chalk_1 = __importDefault(require("chalk"));
-async function search_anime(search) {
-    let filter = "*<ahref=\"/category/*\"title=\"*\">";
-    let html = (await (0, curl_1.curl)("https://gogoanime.dk//search.html?keyword=" + search)).split("\n");
-    let lines = [];
-    for (let x in html) {
-        html[x] = html[x].replaceAll(/ /g, '').replaceAll(/\t/g, '');
-        if ((0, regex_1.RegexParse)(html[x], filter)) {
-            html[x] = html[x].slice(html[x].indexOf("/category/") + 10);
-            html[x] = html[x].slice(0, html[x].indexOf("\"title="));
-            lines.push(html[x]);
-        }
-    }
-    if (!lines[0]) {
-        lines.pop();
-    }
-    return lines;
-}
-async function search() {
-    console.clear();
-    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;
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.search = void 0;
+const regex_1 = require("./core_utils/regex");
+const curl_1 = require("./core_utils/curl");
+const input_1 = require("./input");
+const chalk_1 = __importDefault(require("chalk"));
+async function search_anime(search) {
+    let filter = "*<ahref=\"/category/*\"title=\"*\">";
+    let html = (await (0, curl_1.curl)("https://gogoanime.dk//search.html?keyword=" + search)).split("\n");
+    let lines = [];
+    for (let x in html) {
+        html[x] = html[x].replaceAll(/ /g, '').replaceAll(/\t/g, '');
+        if ((0, regex_1.RegexParse)(html[x], filter)) {
+            html[x] = html[x].slice(html[x].indexOf("/category/") + 10);
+            html[x] = html[x].slice(0, html[x].indexOf("\"title="));
+            lines.push(html[x]);
+        }
+    }
+    if (!lines[0]) {
+        lines.pop();
+    }
+    return lines;
+}
+async function search() {
+    console.clear();
+    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/package.json

@@ -1,45 +1,45 @@
-{
-  "name": "ani-cli-npm",
-  "version": "2.1.2",
-  "description": "ani-cli tool rewritten as npm package",
-  "main": "bin/index.js",
-  "scripts": {
-    "build": "tsc",
-    "start": "node bin/index.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/Bumpkin-Pi/ani-cli-npm"
-  },
-  "homepage": "https://github.com/Bumpkin-Pi/ani-cli-npm",
-  "keywords": [
-    "anime",
-    "ani-cli",
-    "anime",
-    "client",
-    "weeb",
-    "sad-weeb",
-    "video",
-    "download"
-  ],
-  "author": "bumpkin-pi",
-  "license": "ISC",
-  "bin": {
-    "ani-cli-npm": "/bin/index.js"
-  },
-  "dependencies": {
-    "@types/node-fetch": "^2.6.2",
-    "appdata-path": "^1.0.0",
-    "chalk": "^4.1.0",
-    "download-file-with-progressbar": "^1.2.3",
-    "media-player-controller": "^1.5.3",
-    "node-fetch": "^2.6.6",
-    "open": "^8.4.0",
-    "simple-input": "^1.0.1",
-    "typescript": "^4.9.3",
-    "w2g-client": "^1.1.0"
-  },
-  "devDependencies": {
-    "@types/node": "^18.11.9"
-  }
-}
+{
+  "name": "ani-cli-npm",
+  "version": "2.1.4",
+  "description": "ani-cli tool rewritten as npm package",
+  "main": "bin/index.js",
+  "scripts": {
+    "build": "tsc",
+    "start": "node bin/index.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Bumpkin-Pi/ani-cli-npm"
+  },
+  "homepage": "https://github.com/Bumpkin-Pi/ani-cli-npm",
+  "keywords": [
+    "anime",
+    "ani-cli",
+    "anime",
+    "client",
+    "weeb",
+    "sad-weeb",
+    "video",
+    "download"
+  ],
+  "author": "bumpkin-pi",
+  "license": "ISC",
+  "bin": {
+    "ani-cli-npm": "/bin/index.js"
+  },
+  "dependencies": {
+    "@types/node-fetch": "^2.6.2",
+    "appdata-path": "^1.0.0",
+    "chalk": "^4.1.0",
+    "download-file-with-progressbar": "^1.2.3",
+    "media-player-controller": "^1.5.3",
+    "node-fetch": "^2.6.6",
+    "open": "^8.4.0",
+    "simple-input": "^1.0.1",
+    "w2g-client": "^1.1.0"
+  },
+  "devDependencies": {
+    "@types/node": "^18.11.9",
+    "typescript": "^4.9.4"
+  }
+}