From d181f2bdcdf0f6e1342c0bda090d83cf2d5212c3 Mon Sep 17 00:00:00 2001 From: Itamar Oren Date: Sun, 26 Feb 2023 19:14:52 -0500 Subject: [PATCH] bug fixes --- anime/downloadVideo.js | 3 --- anime/getAndSave.js | 32 +++----------------------------- anime/userQuery.js | 2 +- 3 files changed, 4 insertions(+), 33 deletions(-) diff --git a/anime/downloadVideo.js b/anime/downloadVideo.js index 4f61f59..541e471 100644 --- a/anime/downloadVideo.js +++ b/anime/downloadVideo.js @@ -5,10 +5,7 @@ import chalk from 'chalk'; export default async function donwloadFromStream(url, newpath) { try { const vpath = await getJSON("vpath"); - const command = `${vpath} ${url}`; // start "C:\Program Files\VideoLAN\VLC\vlc.exe" url - console.log(chalk.green('done! Hit enter to watch!')); - console.log(command); execFileSync(vpath, [url], { stdio: ['ignore'] diff --git a/anime/getAndSave.js b/anime/getAndSave.js index e42b073..fec14b5 100644 --- a/anime/getAndSave.js +++ b/anime/getAndSave.js @@ -71,7 +71,6 @@ async function getAnime9(id, episode = null) { console.log(chalk.green('Fetching video sources...')); url = `https://api.consumet.org/anime/9anime/watch/${episodeData.id}`; //?server={serverName}` const epResp = await axios.get(url); - console.log(epResp.data) const epSource = epResp.data.sources[0]; const vidPath = await getJSON("apath"); @@ -79,15 +78,10 @@ async function getAnime9(id, episode = null) { const newpath = path.resolve(vidPath, data.title + ' - ' + episodeData.title + '.m3u8'); console.log(chalk.green('done!')); - console.log(chalk.green('writing to local file...')); - - console.log(epSource); + console.log(chalk.green(`Now playing ${chalk.bold(`${data.title} episode ${epNumber} - ${episodeData.title}`)}`)); //Download the file downloadStream(epSource.url, newpath); - - - console.log(chalk.green('done!')); } catch (err) { console.error(err); return console.log(chalk.red(`ERROR: ${err.message}\n\nTask aborted`)); @@ -114,7 +108,6 @@ async function getSearchTerm(name, episode = null) { url = `https://api.consumet.org/anime/9anime/${name}`; try { const { data } = await axios.get(url); - if (data.results.length == 0) { // console.log(data); return console.log(chalk.red("No results found (is the API down?)")); @@ -131,24 +124,10 @@ async function getSearchTerm(name, episode = null) { async function getUrl(name, episode = null) { - const animeTerm = await getSearchTerm(name, episode); - return console.log(animeTerm); - const animeEpisode = animeTerm.episodesList.find((a) => (a.episodeNum == episode)); - - console.log(animeEpisode); - - fetch(`https://api.consumet.stream/vidcdn/watch/${animeEpisode.episodeId}`) - .then((response) => response.json()) - .then((animelist) => console.log(animelist)); + getSearchTerm(name, episode); } -// fetch(`https://gogoanime.consumet.stream/search?keyw=${"jojo"}`) -// .then((response) => response.json()) -// .then((animelist) => console.log(animelist)); - - - async function getAnime(name, subcommand, episode = null) { switch (subcommand) { @@ -187,17 +166,12 @@ export default async function animeMain(command) { const episodeOpt = command.find((o) => (o.indexOf('episode=') != -1)); if (command.length == 0 || nameOpt.length == 0) { - console.log(chalk.red("Please specify an anime title!")); + console.log(chalk.red("Please specify an anime title like so: " + chalk.bold("--anime name=name_here"))); return false; } - console.log(episodeOpt); - const name = nameOpt.split('=')[1]; const subCommand = (subCommandOpt && subCommandOpt.length != 0) ? subCommandOpt.split('=')[1] : null; const episode = (episodeOpt && episodeOpt.length != 0) ? Number(episodeOpt.split('=')[1]) : null; getAnime(name, subCommand, episode); - return true; - // m3u8stream('http://somesite.com/link/to/the/playlist.m3u8') - // .pipe(fs.createWriteStream('videofile.mp4')); } \ No newline at end of file diff --git a/anime/userQuery.js b/anime/userQuery.js index 684fe97..d5a3fcf 100644 --- a/anime/userQuery.js +++ b/anime/userQuery.js @@ -10,7 +10,7 @@ export default function generateQuery(context) { query += chalk.yellow("episodes-all"); query += ", therwise, enter the " + chalk.yellow("episode number\n"); query += chalk.italic("Note: to compile with an episode number use"); - query += chalk.blueBright(" --anime name=\"name\" episode=#\n"); + query += chalk.blueBright(" --anime name=name episode=#\n"); } return query;