ani-cli-npm 2.1.1 → 2.1.3

package/bin/Anime.js

@@ -24,8 +24,14 @@ class Anime {
     id = "";
     episode_list = [];
     most_recent = 0;
-    player = 0;
+    player = new class {
+        play(episode_link) {
+            return {};
+        }
+        player;
+    };
     current_pos = 0;
+    current_episode = 0;
     async init(anime_id, cache_folder) {
         /*
         Initiate Anime object
@@ -100,7 +106,7 @@ class Anime {
         let json = JSON.parse(lines);
         for (const value of Object.entries(json)) {
             if (typeof value[1] == "string") {
-                this.episode_list.push(value[1]);
+                this.episode_list.push(value[1].replace("//gogohd.net/streaming.php?id=", ""));
             }
         }
     }
@@ -109,7 +115,7 @@ class Anime {
         # Starts play cascade.
 
         ## Takes in:
-        ### Episode number, counding from 0
+        ### Episode number, counting from 0
         ### Config object
         ### Config save directory
 
@@ -120,115 +126,174 @@ class Anime {
          - 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} from ${new Date(this.current_pos * 1000).toISOString().slice(11, 19)}`);
+        console.log(`Playing ${this.id} episode ${episode + 1}`); // from ${new Date(this.current_pos * 1000).toISOString().slice(11, 19)}`)
+        if (this.current_pos != 0) {
+            console.log(`Most recent position: ${new Date(this.current_pos * 1000).toISOString().slice(11, 19)}`);
+        }
         switch (config.player) {
             case "MPV":
                 console.log(("Opening MPV.."));
-                this.player = await new PlayerController({
+                this.player.player = await new PlayerController({
                     app: 'mpv',
-                    args: ['--fullscreen', '--keep-open=yes', `--start=+${this.current_pos}`],
+                    args: ['--fullscreen', '--keep-open=yes'],
                     media: await this.get_episode_link(episode, config.player),
                     ipcPath: config.mpv_socket_path
                 });
+                this.player.play = (async (episode_link) => {
+                    this.player.player.load(episode_link);
+                });
+                this.player.player.on('playback', (data) => {
+                    if (data.name == "time-pos" && data.value >= 0) {
+                        this.current_pos = data.value;
+                    }
+                    //console.log(data)
+                });
+                this.player.player.on('app-exit', (code) => {
+                    config.most_recent.anime_id = this.id;
+                    config.most_recent.episode_number = episode;
+                    config.most_recent.episode_second = this.current_pos;
+                    (0, load_config_1.write_config)(config_dir, config);
+                    this.most_recent = episode;
+                    (0, cache_1.new_cache)(config_dir, {
+                        id: this.id,
+                        episode_list: this.episode_list,
+                        most_recent: this.most_recent,
+                        position: this.current_pos
+                    });
+                });
                 // @ts-ignore
-                await this.player.launch(err => {
+                await this.player.player.launch(err => {
                     if (err)
                         return console.error(err.message);
                 });
                 break;
             case "VLC":
                 console.log(("Opening VLC.."));
-                this.player = await new PlayerController({
+                this.player.player = await new PlayerController({
                     app: 'vlc',
-                    args: ['--fullscreen', `--start-time ${this.current_pos}`],
+                    args: ['--fullscreen'],
                     media: await this.get_episode_link(episode, config.player),
-                    //httpPort: (config.vlc_socket !== 0)? config.vlc_socket : null,                     // HTTP port for local communication (vlc only)
+                    //httpPort: (config.vlc_socket !== 0)? config.vlc_socket : null,
                     //httpPass: (config.vlc_pass !== "")? config.vlc_socket : null,
                 });
                 // @ts-ignore
-                await this.player.launch(err => {
+                await this.player.player.launch(err => {
                     if (err)
                         return console.error(err.message);
                 });
+                this.player.play = (async (episode_link) => {
+                    this.player.player.quit();
+                    this.player.player = await new PlayerController({
+                        app: 'vlc',
+                        args: ['--fullscreen'],
+                        media: episode_link
+                        //httpPort: (config.vlc_socket !== 0)? config.vlc_socket : null,
+                        //httpPass: (config.vlc_pass !== "")? config.vlc_socket : null,
+                    });
+                    this.player.player.on('playback', (data) => {
+                        if (data.name == "time-pos" && data.value >= 0) {
+                            this.current_pos = data.value;
+                        }
+                        //console.log(data)
+                    });
+                    this.player.player.on('app-exit', (code) => {
+                        config.most_recent.anime_id = this.id;
+                        config.most_recent.episode_number = episode;
+                        config.most_recent.episode_second = this.current_pos;
+                        (0, load_config_1.write_config)(config_dir, config);
+                        this.most_recent = episode;
+                        (0, cache_1.new_cache)(config_dir, {
+                            id: this.id,
+                            episode_list: this.episode_list,
+                            most_recent: this.most_recent,
+                            position: this.current_pos
+                        });
+                    });
+                    // @ts-ignore
+                    await this.player.player.launch(err => {
+                        if (err)
+                            return console.error(err.message);
+                    });
+                });
                 break;
             case "BROWSER":
+                this.player.play = (async (episode_link) => {
+                    console.log(("Opening browser..."));
+                    await open(episode_link);
+                });
                 console.log(("Opening browser..."));
                 await open(await this.get_episode_link(episode, config.player));
                 break;
             case "W2G":
                 try {
-                    this.player = new W2GClient.W2GClient(config.w2g_api_key);
-                    await this.player.create(await this.get_episode_link(episode, config.player));
-                    console.log(chalk.green("Room link: " + await this.player.getLink()));
+                    this.player.player = new W2GClient.W2GClient(config.w2g_api_key);
+                    await this.player.player.create(await this.get_episode_link(episode, config.player));
+                    console.log(chalk.green("Room link: " + await this.player.player.getLink()));
                 }
                 catch {
                     console.log(chalk.red("Failed to create w2g.tv room. \nthis can often be because your API token is invalid. You can change it in options."));
                     process.exit();
                 }
-                await open(await this.player.getLink());
+                this.player.play = (async (episode_link) => {
+                    console.log(("Updating W2G room..."));
+                    console.log(chalk.green("Room link: " + await this.player.player.getLink()));
+                    try {
+                        await this.player.player.update(episode_link);
+                    }
+                    catch {
+                        console.log(chalk.red("Error updating W2G room. Very sorry, w2g functionality is a bit broken at present. Worst case you should be able to just restart with a new room for each episode."));
+                    }
+                });
+                console.log("Opening W2G.tv...");
+                await open(await this.player.player.getLink());
                 break;
             case "LINK":
-                this.player = 1;
-                console.log(await this.get_episode_link(episode, config.player));
-                break;
-        }
-        if (this.player.on !== undefined) {
-            this.player.on('playback', (data) => {
-                if (data.name == "time-pos" && data.value >= 0) {
-                    this.current_pos = data.value;
-                }
-            });
-            this.player.on('app-exit', (code) => {
-                config.most_recent.anime_id = this.id;
-                config.most_recent.episode_number = episode;
-                config.most_recent.episode_second = this.current_pos;
-                (0, load_config_1.write_config)(config_dir, config);
-                this.most_recent = episode;
-                (0, cache_1.new_cache)(config_dir, {
-                    id: this.id,
-                    episode_list: this.episode_list,
-                    most_recent: this.most_recent,
-                    position: this.current_pos
+                this.player.play = (async (episode_link) => {
+                    console.log(chalk.green(episode_link));
                 });
-            });
+                this.player.play(await this.get_episode_link(episode));
+                break;
         }
-        await this.play(episode, config, config_dir, true);
+        await this.play_controller(episode, config, config_dir, true);
     }
-    async play(episode, config, config_dir, first = false) {
-        /*
-        # Continues play cascade
-        ## Continues on from play_head()
-         */
-        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.roomID != undefined) {
-                console.log(chalk.green("Room link: " + await this.player.getLink()));
-                this.player.update(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);
-                });
-            }
-        }
+    async next(player) {
+        this.current_episode += 1;
+        this.current_pos = 0;
+        this.player.play(await this.get_episode_link(this.current_episode, player));
+    }
+    async previous(player) {
+        this.current_episode -= 1;
+        this.current_pos = 0;
+        this.player.play(await this.get_episode_link(this.current_episode, player));
+    }
+    async play_controller(episode, config, config_dir, first = false) {
+        console.log(`Playing ${this.id} episode ${episode + 1}`); // from ${new Date(this.current_pos * 1000).toISOString().slice(11, 19)}`)
+        // 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.roomID != undefined){
+        //         console.log(chalk.green("Room link: "+ await this.player.getLink()));
+        //         this.player.update(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);
+        //         });
+        //     }
+        // }
+        this.current_episode = episode;
         config.most_recent.anime_id = this.id;
         config.most_recent.episode_number = episode;
         config.most_recent.episode_second = this.current_pos;
@@ -252,25 +317,31 @@ class Anime {
         switch (selected) {
             case 0:
                 if (episode >= this.episode_list.length - 1) {
-                    await this.play(episode - 1, config, config_dir);
+                    await this.next(config.player);
+                    await this.play_controller(episode - 1, config, config_dir);
                 }
                 else {
-                    await this.play(episode + 1, config, config_dir);
+                    await this.next(config.player);
+                    await this.play_controller(episode + 1, config, config_dir);
                 }
                 break;
             case 1:
                 if ((episode >= this.episode_list.length - 1) || (episode <= 0)) {
                     break;
                 }
-                await this.play(episode - 1, config, config_dir);
+                await this.previous(config.player);
+                await this.play_controller(episode - 1, config, config_dir);
                 break;
             case 2:
                 if (this.episode_list.length == 1) {
-                    await this.play(0, config, config_dir);
+                    this.player.play(await this.get_episode_link(0, config.player));
+                    await this.play_controller(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);
+                    let episode = await (0, input_1.number_input)(this.episode_list.length, 1) - 1;
+                    this.player.play(await this.get_episode_link(episode, config.player));
+                    await this.play_controller(episode, config, config_dir);
                 }
                 break;
             case 3:

package/bin/core_utils/interfaces.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/bin/file_managment/cache.js

@@ -22,21 +22,29 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 });
 exports.search_cache = exports.new_cache = exports.clear_cache = void 0;
 const fs = __importStar(require("fs"));
-function clear_cache(location, show) {
+const chalk_1 = __importDefault(require("chalk"));
+async function clear_cache(location) {
     try {
-        console.log("ye sorry that doesnt exist yet.");
-        if (show) {
-            console.log("Cleared cache");
-        }
+        await fs.readdir(location, (err, files) => {
+            if (err)
+                throw err;
+            for (const file of files) {
+                if (file.includes(".cache")) {
+                    fs.unlinkSync(location + "/" + file);
+                }
+            }
+        });
     }
     catch {
-        if (show) {
-            console.log("Failed to clear cache.");
-        }
+        console.log(chalk_1.default.red("Error clearing cache."));
     }
+    return 0;
 }
 exports.clear_cache = clear_cache;
 function new_cache(location, anime) {

package/bin/file_managment/change_config.js

@@ -63,6 +63,27 @@ const configs = [
         // @ts-ignore
         return temp, 0;
     }),
+    (async (temp) => {
+        let config = {
+            player: "BROWSER",
+            proxy: "",
+            user_agent: "Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0",
+            most_recent: {
+                episode_number: 0,
+                episode_second: 0,
+                anime_id: ""
+            },
+            download_folder: ".",
+            debug_mode: false,
+            mpv_socket_path: "",
+            vlc_socket: 0,
+            vlc_pass: "",
+            w2g_api_key: ""
+        };
+        console.log(config);
+        // @ts-ignore
+        return config, 0;
+    }),
     (async (temp) => {
         // @ts-ignore
         return temp, 1;
@@ -92,6 +113,7 @@ async function config_(temp) {
         "VLC socket; " + temp.vlc_socket,
         "VLC pass; " + temp.vlc_pass,
         "W2G api token: " + temp.w2g_api_key,
+        "Reset to defaults",
         "Save and exit",
         "Exit without saving"
     ], [], ((item) => { return chalk.cyan(item); }), ((item) => { return chalk.cyan(item); }))](temp);

package/bin/index.js

@@ -1,10 +1,34 @@
 #!/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 });
-process.removeAllListeners(); // Ignore warning
+const process = __importStar(require("process"));
+//process.removeAllListeners() // Ignore warning
 // External
 const appdata_path_1 = __importDefault(require("appdata-path"));
 const chalk = require("chalk");
@@ -14,6 +38,7 @@ 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)();
@@ -31,9 +56,10 @@ async function main() {
         "Continue",
         "Download",
         "Option",
+        "Clear cache",
         "Help",
         "Quit",
-    ], ["s", "c", "d", "o", "h", "q"], ((thing) => { return chalk.magenta(thing); }), ((thing) => { return chalk.magenta(thing); }));
+    ], ["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)();
@@ -46,7 +72,7 @@ async function main() {
             await anime.init(anime_id, cache_folder);
             let episode_number;
             if (anime.episode_list.length == 1) {
-                episode_number = 0;
+                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}` : ""}`);
@@ -54,7 +80,7 @@ async function main() {
             }
             await anime.play_head(episode_number - 1, config, cache_folder);
             if (anime.player.hasOwnProperty("quit")) {
-                await anime.player.quit();
+                await anime.player.player.quit();
             }
             await main();
             break;
@@ -68,9 +94,10 @@ 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);
-            if (continue_anime.player.hasOwnProperty("quit")) {
-                await continue_anime.player.quit();
+            try {
+                await continue_anime.player.player.quit();
             }
+            catch { }
             await main();
             break;
         case 2: // Download
@@ -108,9 +135,22 @@ async function main() {
             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 5: // Quit
+        case 6: // Quit
             console.log("Exit");
     }
     return 0;

package/package.json

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