From 634643657e91ca0589dc2d3f330ef49bd5f5539c Mon Sep 17 00:00:00 2001 From: Zastian Pretorius Date: Fri, 27 Jan 2023 21:46:53 +0000 Subject: [PATCH 1/3] implementing consument api as a test --- src/anime/anime.rs | 58 +++++++++++------ src/anime/scraper.rs | 141 +++++++++++++++++++++++------------------- src/anime/trackers.rs | 48 -------------- 3 files changed, 115 insertions(+), 132 deletions(-) diff --git a/src/anime/anime.rs b/src/anime/anime.rs index e12bb50..cc2bcd7 100644 --- a/src/anime/anime.rs +++ b/src/anime/anime.rs @@ -1,8 +1,8 @@ use crate::{ - get_an_history, get_an_progress, get_anime_id, get_user_anime_progress, update_anime_progress, + get_an_history, get_an_progress, get_user_anime_progress, update_anime_progress, write_an_progress, }; -use crate::{get_anime_link, get_animes, get_image}; +use crate::{get_episode_link, get_episodes, get_image, search_anime}; use crate::{open_cast, open_video}; use crossterm::{ @@ -22,8 +22,6 @@ use tui::{ use unicode_width::UnicodeWidthStr; use viuer::{print_from_file, terminal_size, Config}; -use super::scraper::get_anime_info; - enum InputMode { Normal, Editing, @@ -90,8 +88,8 @@ struct App { input_mode: InputMode, /// History of recorded messages messages: StatefulList, + episodes: (Vec, Vec), title: String, - link: String, ep: u64, progress: i32, anime_id: i32, @@ -108,8 +106,8 @@ impl<'a> App { image: String::new(), input_mode: InputMode::Normal, messages: StatefulList::with_items(Vec::new()), + episodes: (Vec::new(), Vec::new()), title: String::new(), - link: String::new(), ep: 0, progress: 0, anime_id: 0, @@ -257,9 +255,13 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( app.progress = 0; let selected = app.messages.state.selected(); app.title = app.messages.items[selected.unwrap()].clone(); - app.link = app.animes.0[selected.unwrap()].clone(); - let anime_info = get_anime_info(&app.animes.0[selected.unwrap()]); - app.anime_id = get_anime_id(anime_info.0); + app.anime_id = app.animes.0[selected.unwrap()] + .clone() + .parse::() + .unwrap(); + app.episodes = get_episodes( + &app.animes.0[selected.unwrap()].parse::().unwrap(), + ); app.messages.items.clear(); if app.token == "local" || app.anime_id == 0 { app.progress = get_an_progress(&app.title) as i32; @@ -269,8 +271,8 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( get_user_anime_progress(app.anime_id, app.token.as_str()); app.messages.state.select(Some(app.progress as usize)); } - if anime_info.1 == 1 { - let link = get_anime_link(&app.link, 1); + if app.episodes.0.len() == 1 { + let link = get_episode_link(&app.episodes.1[0]); if !app.cast.0 { open_video((link, format!("{} Episode 1", &app.title))); } else { @@ -282,14 +284,24 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( let selected = app.messages.state.selected(); let image_url = app.animes.2[selected.unwrap()].clone(); if app.token == "local" || app.anime_id == 0 { - write_an_progress((&app.title, &app.link, &image_url), &1); + write_an_progress( + (&app.title, &app.anime_id.to_string(), &image_url), + &1, + ); } else { update_anime_progress(app.anime_id, 1, app.token.as_str()); - write_an_progress((&app.title, &app.link, &image_url), &1); + write_an_progress( + (&app.title, &app.anime_id.to_string(), &image_url), + &1, + ); } } else { - for ep in 1..anime_info.1 + 1 { - app.messages.push(format!("Episode {}", ep)); + for ep in 1..app.episodes.1.len() + 1 { + app.messages.push(format!( + "Episode {}: {}", + ep, + app.episodes.0[ep - 1] + )); } ep_select = true; } @@ -301,9 +313,11 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( .nth(selected.unwrap()) .unwrap() .replace("Episode ", "") + .split(":") + .collect::>()[0] .parse::() .unwrap(); - let link = get_anime_link(&app.link, app.ep); + let link = get_episode_link(&app.episodes.1[app.ep as usize - 1]); if !app.cast.0 { open_video((link, format!("{} Episode {}", &app.title, app.ep))); } else { @@ -315,14 +329,20 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( let image_url = &app.image; if app.ep > app.progress as u64 { if app.token == "local" || app.anime_id == 0 { - write_an_progress((&app.title, &app.link, &image_url), &app.ep); + write_an_progress( + (&app.title, &app.anime_id.to_string(), &image_url), + &app.ep, + ); } else { update_anime_progress( app.anime_id, app.ep as usize, app.token.as_str(), ); - write_an_progress((&app.title, &app.link, &image_url), &app.ep); + write_an_progress( + (&app.title, &app.anime_id.to_string(), &image_url), + &app.ep, + ); } app.progress = app.ep as i32; } @@ -333,7 +353,7 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( InputMode::Editing => match key.code { KeyCode::Enter => { //push app.input into app.messages with ' - app.animes = get_animes(app.input.drain(..).collect()); + app.animes = search_anime(app.input.drain(..).collect()); app.messages.items.clear(); for anime in &app.animes.1 { app.messages.push(anime.to_string()); diff --git a/src/anime/scraper.rs b/src/anime/scraper.rs index 2f43f8d..ce83e2a 100644 --- a/src/anime/scraper.rs +++ b/src/anime/scraper.rs @@ -1,14 +1,21 @@ use isahc::config::Configurable; use isahc::{ReadResponseExt, Request, RequestExt}; -use regex::Regex; use std::fs::File; use std::io::prelude::*; //use serde_json::json; -pub fn get_anime_html(url: &str) -> String { +pub fn search_anime(query: String) -> (Vec, Vec, Vec) { let req = Request::builder() - .uri(url) + .uri(format!( + "https://api.consumet.org/meta/anilist/{}", + query + .replace(" ", "%20") + .replace(":", "%3A") + .replace("!", "%21") + .replace("?", "%3F") + .replace("'", "%27") + )) .redirect_policy(isahc::config::RedirectPolicy::Follow) .header( "user-agent", @@ -16,74 +23,78 @@ pub fn get_anime_html(url: &str) -> String { ) .body(()) .unwrap(); - req.send().unwrap().text().unwrap() -} + let json = req.send().unwrap().text().unwrap(); + let json: serde_json::Value = serde_json::from_str(&json).unwrap(); + let mut titles = Vec::new(); + let mut ids = Vec::new(); + let mut images = Vec::new(); + for i in 0..json["results"].as_array().unwrap().len() { + titles.push( + json["results"][i]["title"]["userPreferred"] + .as_str() + .unwrap() + .to_string(), + ); -pub fn get_post(id: &str) -> String { - let resp = Request::builder() - .method("POST") - .uri("https://yugen.to/api/embed/") - .header("x-requested-with", "XMLHttpRequest") - .body(id) - .unwrap() - .send() - .unwrap() - .text(); - let resp: String = resp.as_ref().unwrap().to_string(); - resp -} - -pub fn get_animes(query: String) -> (Vec, Vec, Vec) { - let query = query.replace(" ", "+"); - let html = get_anime_html(&format!("https://yugen.to/search/?q={}", query)); - let re = Regex::new(r#"href="(/anime[^"]*)""#).unwrap(); - let mut animes_links = Vec::new(); - for cap in re.captures_iter(&html) { - animes_links.push(cap[1].to_string()); + ids.push(json["results"][i]["id"].as_str().unwrap().to_string()); + //convert ids to i32 + images.push(json["results"][i]["image"].as_str().unwrap().to_string()); } - let re = Regex::new(r#"/" title="([^"]*)""#).unwrap(); - let mut animes_names = Vec::new(); - for cap in re.captures_iter(&html) { - animes_names.push(cap[1].to_string()); - } - let re = Regex::new(r#"data-src="([^"]*)"#).unwrap(); - let mut animes_images = Vec::new(); - for cap in re.captures_iter(&html) { - animes_images.push(cap[1].to_string()); - } - (animes_links, animes_names, animes_images) + (ids, titles, images) } -pub fn get_anime_info(url: &str) -> (i32, u16) { - let url = format!("https://yugen.to{}watch", url); - let html = get_anime_html(&url); - //print html and exit - let re = Regex::new(r#""mal_id":(\d*)"#).unwrap(); - let mal_id = re.captures(&html).unwrap()[1].parse().unwrap(); - let re = - Regex::new(r#"Episodes(\d*)"#) - .unwrap(); - let episodes = re.captures(&html).unwrap()[1].parse().unwrap(); - (mal_id, episodes) +pub fn get_episodes(id: &i32) -> (Vec, Vec) { + let req = Request::builder() + .uri(format!( + "https://api.consumet.org/meta/anilist/info/{}?provider=gogoanime", + id + )) + .redirect_policy(isahc::config::RedirectPolicy::Follow) + .header( + "user-agent", + "Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0", + ) + .body(()) + .unwrap(); + let json = req.send().unwrap().text().unwrap(); + let json: serde_json::Value = serde_json::from_str(&json).unwrap(); + let mut titles = Vec::new(); + let mut ids = Vec::new(); + for i in 0..json["episodes"].as_array().unwrap().len() { + titles.push(json["episodes"][i]["title"].as_str().unwrap().to_string()); + ids.push(json["episodes"][i]["id"].as_str().unwrap().to_string()); + } + (titles, ids) } -pub fn get_anime_link(url: &str, episode: u64) -> String { - let url = &format!( - "https://yugen.to/watch{}{}/", - url.replace("/anime", ""), - episode - ); - let html = get_anime_html(url); - let re = Regex::new(r#"/e/([^/]*)"#).unwrap(); - let capture = re.captures(&html).unwrap(); - let id = &capture[1]; - let id = format!("id={}%3D&ac=0", id); - let json = get_post(&id); - let re = Regex::new(r#"hls": \["(.*)","#).unwrap(); - let capture = re.captures(&json).unwrap(); - let link = &capture[1]; - //return the link - link.to_string() +pub fn get_episode_link(ep_id: &str) -> String { + let req = Request::builder() + .uri(format!( + "https://api.consumet.org/meta/anilist/watch/{}?provider=gogoanime", + ep_id + )) + .redirect_policy(isahc::config::RedirectPolicy::Follow) + .header( + "user-agent", + "Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0", + ) + .body(()) + .unwrap(); + let json = req.send().unwrap().text().unwrap(); + let json: serde_json::Value = serde_json::from_str(&json).unwrap(); + let url = ""; + std::fs::write("test.json", json.to_string()).unwrap(); + for i in 0..json["sources"].as_array().unwrap().len() { + //return json["sources"][i]["url"].as_str().unwrap().to_string(); where json["sources"][i]["quality"].as_str().unwrap().contains("1080") + if json["sources"][i]["quality"] + .as_str() + .unwrap() + .contains("1080") + { + return json["sources"][i]["url"].as_str().unwrap().to_string(); + } + } + url.to_string() } pub fn get_image(url: &str, path: &str) { diff --git a/src/anime/trackers.rs b/src/anime/trackers.rs index 15f8577..33eb954 100644 --- a/src/anime/trackers.rs +++ b/src/anime/trackers.rs @@ -40,54 +40,6 @@ pub fn get_token() -> String { token } -pub fn get_anime_id(mal_id: i32) -> i32 { - const QUERY: &str = " -query ($id: Int, $search: Int) { - Media (id: $id, idMal: $search, type: ANIME) { - id - title { - native - romaji - english - } - } -} -"; - let json = json!({ - "query": QUERY, - "variables": { - "search": mal_id - } - }); - let resp = Request::builder() - .method("POST") - .uri("https://graphql.anilist.co/") - .header("Content-Type", "application/json") - .header("Accept", "application/json") - .body(json.to_string()) - .unwrap() - .send() - .unwrap() - .text(); - let regex = regex::Regex::new(r#"id":(.*?),"#).unwrap(); - let resp: String = resp.as_ref().unwrap().to_string(); - //if error let id = 0 - let id = match regex.captures(&resp) { - Some(captures) => captures[1].parse::().unwrap(), - None => 0, - }; - - // let id = regex - // .captures(&resp) - // .unwrap() - // .get(1) - // .unwrap() - // .as_str() - // .parse::() - // .unwrap(); - id -} - //get the user id from the token fn get_user_id(token: &str) -> i32 { const QUERY: &str = "query { From edbebf4b4ec876ed8c803305aa25946595fb4e80 Mon Sep 17 00:00:00 2001 From: Zastian Pretorius Date: Tue, 31 Jan 2023 16:47:08 +0000 Subject: [PATCH 2/3] added provider switching and soft subs --- src/anime/anime.rs | 24 ++++++++++++++++++------ src/anime/player.rs | 32 ++++++++++++++++++++++---------- src/anime/scraper.rs | 34 +++++++++++++++++++++++++--------- src/main.rs | 16 ++++++++-------- 4 files changed, 73 insertions(+), 33 deletions(-) diff --git a/src/anime/anime.rs b/src/anime/anime.rs index cc2bcd7..6f1c19e 100644 --- a/src/anime/anime.rs +++ b/src/anime/anime.rs @@ -261,6 +261,7 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( .unwrap(); app.episodes = get_episodes( &app.animes.0[selected.unwrap()].parse::().unwrap(), + &app.provider, ); app.messages.items.clear(); if app.token == "local" || app.anime_id == 0 { @@ -272,12 +273,16 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( app.messages.state.select(Some(app.progress as usize)); } if app.episodes.0.len() == 1 { - let link = get_episode_link(&app.episodes.1[0]); + let link = get_episode_link(&app.episodes.1[0], &app.provider); if !app.cast.0 { - open_video((link, format!("{} Episode 1", &app.title))); + open_video(( + link.0, + format!("{} Episode 1", &app.title), + link.1, + )); } else { open_cast( - (link, format!("{} Episode 1", &app.title)), + (link.1, format!("{} Episode 1", &app.title)), &app.cast.1, ) } @@ -317,12 +322,19 @@ fn run_app(terminal: &mut Terminal, mut app: App) -> io::Result<( .collect::>()[0] .parse::() .unwrap(); - let link = get_episode_link(&app.episodes.1[app.ep as usize - 1]); + let link = get_episode_link( + &app.episodes.1[app.ep as usize - 1], + &app.provider, + ); if !app.cast.0 { - open_video((link, format!("{} Episode {}", &app.title, app.ep))); + open_video(( + link.0, + format!("{} Episode {}", &app.title, app.ep), + link.1, + )); } else { open_cast( - (link, format!("{} Episode {}", &app.title, app.ep)), + (link.0, format!("{} Episode {}", &app.title, app.ep)), &app.cast.1, ) } diff --git a/src/anime/player.rs b/src/anime/player.rs index 665d777..0a3b6ce 100644 --- a/src/anime/player.rs +++ b/src/anime/player.rs @@ -8,16 +8,28 @@ use rust_cast::{ }; use std::str::FromStr; -pub fn open_video(link: (String, String)) { - let title = link.1; - let title = title.replace("-", " "); - let arg: String = format!("--force-media-title={}", title); - let _ = std::process::Command::new("mpv") - .arg(link.0) - .arg(arg) - .output() - .expect("failed to open mpv"); - +pub fn open_video(link: (String, String, String)) { + if link.2 == "null" { + let title = link.1; + let title = title.replace("-", " "); + let arg: String = format!("--force-media-title={}", title); + let _ = std::process::Command::new("mpv") + .arg(link.0) + .arg(arg) + .output() + .expect("failed to open mpv"); + } else { + let title = link.1; + let title = title.replace("-", " "); + let arg1: String = format!("--force-media-title={}", title); + let arg2: String = format!("--sub-files={}", link.2); + let _ = std::process::Command::new("mpv") + .arg(link.0) + .arg(arg1) + .arg(arg2) + .output() + .expect("failed to open mpv"); + } // clear terminal } diff --git a/src/anime/scraper.rs b/src/anime/scraper.rs index ce83e2a..c81e4da 100644 --- a/src/anime/scraper.rs +++ b/src/anime/scraper.rs @@ -43,11 +43,11 @@ pub fn search_anime(query: String) -> (Vec, Vec, Vec) { (ids, titles, images) } -pub fn get_episodes(id: &i32) -> (Vec, Vec) { +pub fn get_episodes(id: &i32, provider: &str) -> (Vec, Vec) { let req = Request::builder() .uri(format!( - "https://api.consumet.org/meta/anilist/info/{}?provider=gogoanime", - id + "https://api.consumet.org/meta/anilist/info/{}?provider={}", + id, provider )) .redirect_policy(isahc::config::RedirectPolicy::Follow) .header( @@ -67,11 +67,11 @@ pub fn get_episodes(id: &i32) -> (Vec, Vec) { (titles, ids) } -pub fn get_episode_link(ep_id: &str) -> String { +pub fn get_episode_link(ep_id: &str, provider: &str) -> (String, String) { let req = Request::builder() .uri(format!( - "https://api.consumet.org/meta/anilist/watch/{}?provider=gogoanime", - ep_id + "https://api.consumet.org/meta/anilist/watch/{}?provider={}", + ep_id, provider )) .redirect_policy(isahc::config::RedirectPolicy::Follow) .header( @@ -84,17 +84,33 @@ pub fn get_episode_link(ep_id: &str) -> String { let json: serde_json::Value = serde_json::from_str(&json).unwrap(); let url = ""; std::fs::write("test.json", json.to_string()).unwrap(); + let mut subtitle = String::new(); + let _error_vec = Vec::new(); + let sub_array = json["subtitles"].as_array().unwrap_or(&_error_vec); + for i in 0..sub_array.len() { + //set subtitle to lang = English + if json["subtitles"][i]["lang"].as_str().unwrap_or("null") == "English" { + subtitle = json["subtitles"][i]["url"] + .as_str() + .unwrap_or("null") + .to_string(); + // add \ before the first : in the url + subtitle = subtitle.replace(":", "\\:"); + } + } for i in 0..json["sources"].as_array().unwrap().len() { - //return json["sources"][i]["url"].as_str().unwrap().to_string(); where json["sources"][i]["quality"].as_str().unwrap().contains("1080") if json["sources"][i]["quality"] .as_str() .unwrap() .contains("1080") { - return json["sources"][i]["url"].as_str().unwrap().to_string(); + return ( + json["sources"][i]["url"].as_str().unwrap().to_string(), + subtitle, + ); } } - url.to_string() + (url.to_string(), subtitle) } pub fn get_image(url: &str, path: &str) { diff --git a/src/main.rs b/src/main.rs index d53215f..a010a16 100644 --- a/src/main.rs +++ b/src/main.rs @@ -29,17 +29,17 @@ fn main() { if arg == "--provider" || arg == "-r" { if let Some(arg) = std::env::args().nth(count + 1) { //get the next argument and see if it is = to gogo of vrv - if arg == "vrv" { - provider = "vrv".to_string(); + if arg == "zoro" { + provider = "zoro".to_string(); count += 1; } else if arg == "gogo" { - provider = "gogo".to_string(); + provider = "gogoanime".to_string(); count += 1; } else { - provider = "gogo".to_string(); + provider = "zoro".to_string(); } } else { - provider = "vrv".to_string(); + provider = "zoro".to_string(); } } if arg == "--cast" || arg == "-C" { @@ -122,13 +122,13 @@ fn print_help() { ); println!( "if no provider is entered it will default to {}", - "vrv".green() + "gogo".green() ); println!( "if the -r argument is not used it will default to {}", - "gogo".green() + "zoro".green() ); - println!("the providers are {} or {}", "gogo".green(), "vrv".green()); + println!("the providers are {} or {}", "gogo".green(), "zoro".green()); println!(""); println!("help:\t\t{}", format_args!("{}", "-h --help".red())); //kill the program From 6fadcadba10ab9e132d54ee4f629944ff63b8b02 Mon Sep 17 00:00:00 2001 From: Zastian Pretorius Date: Wed, 1 Feb 2023 20:18:36 +0000 Subject: [PATCH 3/3] some scraper stuff --- src/anime/scraper.rs | 17 +++++++++-------- src/main.rs | 6 +++--- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/anime/scraper.rs b/src/anime/scraper.rs index c81e4da..6cc4577 100644 --- a/src/anime/scraper.rs +++ b/src/anime/scraper.rs @@ -82,7 +82,7 @@ pub fn get_episode_link(ep_id: &str, provider: &str) -> (String, String) { .unwrap(); let json = req.send().unwrap().text().unwrap(); let json: serde_json::Value = serde_json::from_str(&json).unwrap(); - let url = ""; + let mut url = String::new(); std::fs::write("test.json", json.to_string()).unwrap(); let mut subtitle = String::new(); let _error_vec = Vec::new(); @@ -98,16 +98,17 @@ pub fn get_episode_link(ep_id: &str, provider: &str) -> (String, String) { subtitle = subtitle.replace(":", "\\:"); } } + let mut highest_quality = 0; for i in 0..json["sources"].as_array().unwrap().len() { - if json["sources"][i]["quality"] + let quality = json["sources"][i]["quality"] .as_str() .unwrap() - .contains("1080") - { - return ( - json["sources"][i]["url"].as_str().unwrap().to_string(), - subtitle, - ); + .replace("p", "") + .parse::() + .unwrap_or(0); + if quality > highest_quality { + highest_quality = quality; + url = json["sources"][i]["url"].as_str().unwrap().to_string(); } } (url.to_string(), subtitle) diff --git a/src/main.rs b/src/main.rs index a010a16..26341ad 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,7 @@ fn main() { let mut chapter: u32 = 0; //let search = option string let mut count = 0; - let mut provider: String = "gogo".to_string(); + let mut provider: String = "zoro".to_string(); let mut cast = (false, "0".to_string()); for arg in std::env::args() { if arg == "--help" || arg == "-h" { @@ -36,10 +36,10 @@ fn main() { provider = "gogoanime".to_string(); count += 1; } else { - provider = "zoro".to_string(); + provider = "gogo".to_string(); } } else { - provider = "zoro".to_string(); + provider = "gogo".to_string(); } } if arg == "--cast" || arg == "-C" {