ani-cli-npm 1.2.0 → 1.3.0

package/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="76" name="JavaScript" />
+      </Languages>
+    </inspection_tool>
+  </profile>
+</component>

package/bin/ani-cli-npm.conf

@@ -0,0 +1 @@
+{"proxy":"","user_agent":"Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0"}

package/bin/index.js

@@ -17,6 +17,54 @@ const fetch = require('node-fetch');
 const PlayerController = require("media-player-controller")
 const open = require("open")
 const prompt = require("simple-input");
+const getAppDataPath = require("appdata-path")
+const fs = require("fs")
+
+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,
+        anime_id: "",
+        episodes: []
+    }
+}
+
+
+function read_config(){
+    try{
+        try {
+            config = JSON.parse(fs.readFileSync(getAppDataPath() + "/ani-cli-npm.conf")) //getAppDataPath()
+            if (!config.hasOwnProperty("player")) {
+                config.player = "BROWSER"
+            }
+            if (!config.hasOwnProperty("user_agent")) {
+                config.user_agent = "Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0"
+            }
+            if (!config.hasOwnProperty("proxy")) {
+                config.user_agent = ""
+            }
+            if (!config.hasOwnProperty("most_recent")) {
+                config.most_recent = null
+            }
+            fs.writeFileSync(getAppDataPath() + "/ani-cli-npm.conf", JSON.stringify(config))
+        } catch {
+            fs.writeFileSync(getAppDataPath() + "/ani-cli-npm.conf", JSON.stringify(config))
+        }
+    }catch{
+        console.log(colors.Red, "Failed to read config file")
+    }
+}
+
+function write_config(){
+    try{
+        fs.writeFileSync(getAppDataPath() + "/ani-cli-npm.conf", JSON.stringify(config))
+    }catch{
+        console.log(colors.Red, "Failed to write to config file")
+    }
+}
+
 
 
 const gogohd_url="https://gogohd.net/"
@@ -31,11 +79,7 @@ const colors = {
     Cyan: "\x1b[36m%s\x1b[0m",
     White: "\x1b[37m%s\x1b[0m"
 }
-let config = {
-    player: "MPV",
-    proxy: "",
-    user_agent: 'Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0'
-}
+
 
 //const HttpsProxyAgent = require('https-proxy-agent');
 //let proxyAgent = new HttpsProxyAgent(config.proxy);
@@ -43,7 +87,7 @@ let config = {
 
 async function config_(temp){
     console.clear()
-console.log(colors.Blue, "ANI-CLI-NPM \n")
+    console.log(colors.Blue, "ANI-CLI-NPM \n")
     console.log(colors.Yellow, "Config:\n")
     console.log(colors.Cyan, `1) Player; ${temp.player}`)
     console.log(colors.Cyan, `2) Proxy; ${temp.proxy}`)
@@ -119,7 +163,14 @@ async function curl(url, method="GET", redirect = false){
 
 }
 
-function matchRuleShort(str, rule) {
+async function _continue(){
+    let link = await get_video_link(config.most_recent.episodes[config.most_recent.episode_number])
+    await play(link, config.most_recent)
+    process.exit()
+}
+
+
+function RegexParse(str, rule) {
     let escapeRegex = (str) => str.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1");
     return new RegExp("^" + rule.split("*").map(escapeRegex).join(".*") + "$").test(str);
 }
@@ -130,7 +181,7 @@ async function search_anime(search){
     let lines = []
     for (x in html){
         html[x] = html[x].replaceAll(/ /g,'').replaceAll(/\t/g,'')
-        if (matchRuleShort(html[x], filter)){
+        if (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])
@@ -149,7 +200,7 @@ async function episode_list(anime_id){
     let lines = ""
 
     for (let x in html){
-        if(matchRuleShort(html[x], "*<div id=\"epslistplace\"*")){
+        if(RegexParse(html[x], "*<div id=\"epslistplace\"*")){
             lines = (html[x])
         }
     }
@@ -229,7 +280,7 @@ async function generate_link(provider, id){
             html = html.split("\n")
             let fb_id = ""
             for (x in html){
-                if (matchRuleShort(html[x], "*<li class=\"linkserver\" data-status=\"1\" data-video=\"https://fembed9hd.com/v/*")){
+                if (RegexParse(html[x], "*<li class=\"linkserver\" data-status=\"1\" data-video=\"https://fembed9hd.com/v/*")){
                     fb_id = html[x].slice(html[x].indexOf("/v/")+3, html[x].indexOf("\">X"))
                     break
                 }
@@ -251,16 +302,20 @@ async function generate_link(provider, id){
             buffer = new Buffer(id+"LTXs3GrU8we9O"+enc_id)
             let ani_id = buffer.toString("base64")
             buffer = Buffer.from((await curl(`${base_url}/api/live${ani_id}`, "GET", true)).split("#")[1], "base64")
-            if (config.player === "MPV"){
-                return buffer.toString("utf-8") //TODO m3u8 player
+            if (config.player === "BROWSER"){
+                return `${base_url}/api/live${ani_id}`
             }
+                return buffer.toString("utf-8") //TODO m3u8 player
 
-            return `${base_url}/api/live${ani_id}`
+            
     }
 }
 
-async function post_play(link, anime, player="VLC"){
+async function post_play(link, anime){
     while (true){
+        config.most_recent = anime
+        write_config()
+
         console.log(colors.Yellow, `Playing episode ${anime.episode_number+1} of ${anime.anime_id.replaceAll("-", " ")}\n`)
         console.log(colors.Cyan, "1/l) Show Link")
         console.log(colors.Cyan, "2/n) Next Episode")
@@ -282,7 +337,7 @@ async function post_play(link, anime, player="VLC"){
                 }
                 anime.episode_number += 1
                 link = await get_video_link(anime.episodes[anime.episode_number])
-                await play(link, anime, config.player)
+                await play(link, anime)
                 process.exit()
                 break
             //EVEN MORE NEEDLESS QUIT STATEMENTS!!!!!!
@@ -295,7 +350,7 @@ async function post_play(link, anime, player="VLC"){
                 }
                 anime.episode_number -= 1
                 link = await get_video_link(anime.episodes[anime.episode_number])
-                await play(link, anime, config.player)
+                await play(link, anime)
                 process.exit()
                 break
             case "q":
@@ -308,10 +363,10 @@ async function post_play(link, anime, player="VLC"){
     }
 }
 
-async function play(link, anime, player="VLC"){
+async function play(link, anime){
     console.clear()
     console.log(colors.Blue, "ANI-CLI-NPM \n")
-    if (player === "VLC"){
+    if (config.player === "VLC"){
         console.log(colors.Yellow, "Loading VLC... ")
         let player = new PlayerController({
             app: 'vlc',
@@ -325,12 +380,12 @@ async function play(link, anime, player="VLC"){
         process.exit()
 
 
-    }else if (player === "BROWSER"){
+    }else if (config.player === "BROWSER"){
         console.log(colors.Yellow, "Opening video in browser... ")
         open(link)
-        await post_play(link, anime, player)
+        await post_play(link, anime)
         process.exit()
-    }else if (player === "MPV"){
+    }else if (config.player === "MPV"){
         console.log(colors.Yellow, "Loading MPV... ")
         let player = new PlayerController({
             app: 'mpv',
@@ -340,7 +395,7 @@ async function play(link, anime, player="VLC"){
         await player.launch(err => {
             if(err) return console.error(err.message);
         });
-        await post_play(link, anime, player)
+        await post_play(link, anime)
         process.exit()
     }
 }
@@ -376,11 +431,11 @@ async function search(){
     switch (choice){
         case "p":
         case "1":
-            await play(link, anime, config.player)
+            await play(link, anime)
             break
         case "d":
         case "2":
-            download(link, anime.anime_id+anime.episode_number+".mp4")
+            await download(link, anime.anime_id+anime.episode_number+".mp4")
             break
         case "l":
         case "3":
@@ -394,21 +449,42 @@ async function search(){
 }
 
 
-
 console.clear()
-console.log(colors.Blue, "Welcome to Ani-Cli-npm")
+read_config()
+console.log(colors.Blue, "Welcome to Ani-Cli-npm\n")
+if (config.most_recent.episode_number !== 0){
+    console.log(colors.White, `Most recently played: ${config.most_recent.anime_id}, ep${config.most_recent.episode_number+1}`)
+}
 async function main(){
-    console.log(colors.Cyan, "1/s) Search")
-    console.log(colors.Cyan, "2/c) config")
-    console.log(colors.Cyan, "3/q) quit")
-    let choice = await selection(3, "select;", ["s", "c", "q"])
+    if (config.player === "VLC"){
+        console.log(colors.Red, "Warning; if you do not have mpv video player installed, you will have to change your video player to either vlc or browser in config.\n")
+    }
+    console.log(colors.Cyan, "\n1/s) Search")
+    if (config.most_recent.episode_number !== 0){
+        console.log(colors.Cyan, "2/c) Continue")
+    }else{
+        console.log(colors.White, "2/c) Continue")
+    }
+    console.log(colors.Cyan, "3/C) Config")
+    console.log(colors.Cyan, "4/q) Quit")
+    let choice = await selection(3, "select;", ["s", "c", "C", "q"])
     switch (choice){
         case "s":
         case "1":
             await search()
             break
         case "c":
-        case "2":
+        case 2:
+            if (config.most_recent.episode_number !== 0){
+                await _continue()
+            }else{
+                console.log(colors.White, "No episodes watched recently")
+                await main()
+            }
+
+            break
+        case "C":
+        case "3":
             let temp = structuredClone(config);
             let exit_code;
             while (true) {
@@ -428,10 +504,15 @@ async function main(){
                     break
                 }
             }
+            try{
+                fs.writeFileSync(getAppDataPath()+"/ani-cli-npm.conf", JSON.stringify(config))
+            }catch{
+                console.log(colors.Red, "Error writing to .conf file.")
+            }
             await main()
             break
         case "q":
-        case 3:
+        case 4:
             console.log(colors.Black, "Exiting...")
             process.exit()
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ani-cli-npm",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "ani-cli tool rewritten as npm package",
   "main": "index.js",
   "scripts": {
@@ -24,6 +24,7 @@
     "multiply": "bin/index.js"
   },
   "dependencies": {
+    "appdata-path": "^1.0.0",
     "media-player-controller": "^1.5.3",
     "node-fetch": "^2.6.6",
     "open": "^8.4.0",