ani-cli-npm 2.0.5 → 2.0.7

package/bin/Anime.js

@@ -22,6 +22,7 @@ class Anime {
      */
     id = "";
     episode_list = [];
+    most_recent = 0;
     player = 0;
     async init(anime_id, cache_folder) {
         /*
@@ -42,11 +43,15 @@ class Anime {
         else {
             try {
                 this.episode_list = cache_object.episode_list;
+                if (cache_object.most_recent != undefined) {
+                    this.most_recent = cache_object.most_recent;
+                }
             }
             catch {
                 await this.get_ep_bases(this.id);
             }
         }
+        (0, cache_1.new_cache)(cache_folder, this);
         return 0;
     }
     async get_episode_link(episode, player = "VLC") {
@@ -81,7 +86,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) {
@@ -139,6 +146,8 @@ class Anime {
         }
         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)([
@@ -152,7 +161,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"
@@ -213,6 +222,8 @@ class Anime {
         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",
@@ -225,7 +236,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"

package/bin/index.js

@@ -48,11 +48,13 @@ async function main() {
                 episode_number = 0;
             }
             else {
-                console.log(`Select episode [1-${anime.episode_list.length}]`);
-                episode_number = await (0, input_1.number_input)(anime.episode_list.length) - 1;
+                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 != 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

package/bin/input.js

@@ -30,12 +30,12 @@ async function selection(options, extra_options = [], color1 = ((thing) => { ret
         if (color) {
             console.log(color1((parseInt(x) + 1).toString() +
                 ((extra_options[x] == undefined) ? "" : "/" + extra_options[x]) +
-                ") " + options[x]));
+                ") " + options[x].replaceAll("-", " ")));
         }
         else {
             console.log(color2((parseInt(x) + 1).toString() +
                 ((extra_options[x] == undefined) ? "" : "/" + extra_options[x]) +
-                ") " + options[x]));
+                ") " + options[x].replaceAll("-", " ")));
         }
         color = !color;
     }
@@ -59,12 +59,17 @@ async function input() {
     return await _prompt(">");
 }
 exports.input = input;
-async function number_input(max, min = 1) {
+async function number_input(max, min = 1, extra_options = [], extra_option_values = []) {
     let selector;
     let selection;
     do {
         selector = await _prompt(">");
-        selection = parseInt(selector);
+        if (extra_options.includes(selector.toLowerCase())) {
+            selection = extra_option_values[extra_options.indexOf(selector)];
+        }
+        else {
+            selection = parseInt(selector);
+        }
         if (selector == "") {
             selection = min;
         }

package/package.json

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

package/naruto-dub-1.m3u8

@@ -1,9 +0,0 @@
-#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

@@ -1,9 +0,0 @@
-#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

@@ -1,9 +0,0 @@
-#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