5 Commits

Author SHA1 Message Date
mrfluffy-dev
8dc4f4d6fe prevented crash on empty anime list selection 2023-03-06 15:44:10 +00:00
Zastian Pretorius
d22c9e6818 fuck you zen 2023-03-01 14:04:11 +00:00
mrfluffy
676edb1d98 Merge pull request #27 from newbee1905/consumet
Suggestions about refactoring
2023-02-05 19:16:18 +00:00
newbee1905
21f81cb68d chore: remove test.json 2023-02-05 03:29:56 +07:00
newbee1905
7b605f40b8 refactor(wip): refactor scraper 2023-02-05 03:25:06 +07:00
9 changed files with 83 additions and 59 deletions

1
.gitignore vendored
View File

@@ -1 +1,2 @@
/target
test.json

1
Cargo.lock generated
View File

@@ -629,6 +629,7 @@ dependencies = [
"crossterm 0.24.0",
"dirs",
"isahc",
"lazy_static",
"regex",
"rust_cast",
"serde_json",

View File

@@ -20,3 +20,4 @@ crossterm = "0.24.0"
unicode-width = "0.1.9"
rust_cast = "0.17.0"
viuer = { version = "0.6", features = ["sixel"] }
lazy_static = "1.4.0"

View File

@@ -3,43 +3,39 @@ use isahc::{ReadResponseExt, Request, RequestExt};
use std::fs::File;
use std::io::prelude::*;
use crate::helpers::{fixing_text::htmlise, scraper};
//use serde_json::json;
pub fn search_anime(query: String) -> (Vec<String>, Vec<String>, Vec<String>) {
let req = Request::builder()
.uri(format!(
"https://api.consumet.org/meta/anilist/{}",
query
.replace(" ", "%20")
.replace(":", "%3A")
.replace("!", "%21")
.replace("?", "%3F")
.replace("'", "%27")
htmlise(query)
))
.redirect_policy(isahc::config::RedirectPolicy::Follow)
.header(
"user-agent",
"Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0",
)
.header("user-agent", *scraper::USER_AGENT)
.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();
let mut images = Vec::new();
for i in 0..json["results"].as_array().unwrap().len() {
for anime in json["results"].as_array().unwrap().iter() {
titles.push(
json["results"][i]["title"]["userPreferred"]
anime["title"]["userPreferred"]
.as_str()
.unwrap()
.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());
ids.push(anime["id"].as_str().unwrap().to_string());
images.push(anime["image"].as_str().unwrap().to_string());
}
(ids, titles, images)
}
@@ -50,19 +46,18 @@ pub fn get_episodes(id: &i32, provider: &str) -> (Vec<String>, Vec<String>) {
id, provider
))
.redirect_policy(isahc::config::RedirectPolicy::Follow)
.header(
"user-agent",
"Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0",
)
.header("user-agent", *scraper::USER_AGENT)
.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());
for episode in json["episodes"].as_array().unwrap().iter() {
titles.push(episode["title"].as_str().unwrap().to_string());
ids.push(episode["id"].as_str().unwrap().to_string());
}
(titles, ids)
}
@@ -74,33 +69,31 @@ pub fn get_episode_link(ep_id: &str, provider: &str) -> (String, String) {
ep_id, provider
))
.redirect_policy(isahc::config::RedirectPolicy::Follow)
.header(
"user-agent",
"Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0",
)
.header("user-agent", *scraper::USER_AGENT)
.body(())
.unwrap();
let json = req.send().unwrap().text().unwrap();
let json: serde_json::Value = serde_json::from_str(&json).unwrap();
let mut url = String::new();
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() {
for sub in sub_array.iter() {
//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();
if sub["lang"].as_str().unwrap_or("null") == "English" {
subtitle = sub["url"].as_str().unwrap_or("null").to_string();
// add \ before the first : in the url
subtitle = subtitle.replace(":", "\\:");
}
}
let mut highest_quality = 0;
for i in 0..json["sources"].as_array().unwrap().len() {
let quality = json["sources"][i]["quality"]
for source in json["sources"].as_array().unwrap().iter() {
let quality = source["quality"]
.as_str()
.unwrap()
.replace("p", "")
@@ -108,10 +101,10 @@ pub fn get_episode_link(ep_id: &str, provider: &str) -> (String, String) {
.unwrap_or(0);
if quality > highest_quality {
highest_quality = quality;
url = json["sources"][i]["url"].as_str().unwrap().to_string();
url = source["url"].as_str().unwrap().to_string();
}
}
(url.to_string(), subtitle)
(url, subtitle)
}
pub fn get_image(url: &str, path: &str) {

View File

@@ -59,3 +59,12 @@ pub fn fix_html_encoding(ln_text: &Vec<String>) -> Vec<String> {
}
ln_text_new
}
pub fn htmlise(query: String) -> String {
query
.replace(" ", "%20")
.replace(":", "%3A")
.replace("!", "%21")
.replace("?", "%3F")
.replace("'", "%27")
}

View File

@@ -1,2 +1,3 @@
pub mod fixing_text;
pub mod scraper;
pub mod take_input;

4
src/helpers/scraper.rs Normal file
View File

@@ -0,0 +1,4 @@
lazy_static! {
pub static ref USER_AGENT: &'static str =
"Mozilla/5.0 (X11; Linux x86_64; rv:99.0) Gecko/20100101 Firefox/100.0";
}

View File

@@ -3,6 +3,9 @@ mod helpers;
mod ln;
mod ui;
#[macro_use]
extern crate lazy_static;
use anime::anime::anime_ui;
use colored::Colorize;
//use ln::ui::ln_ui;
@@ -11,6 +14,7 @@ use ln::ln::ln_ui;
use crate::anime::trackers::*;
use crate::get_token;
use crate::helpers::take_input::{int_input, string_input};
fn main() {
let mut help = false;
let mut anime = false;
@@ -106,25 +110,19 @@ fn main() {
}
fn print_help() {
println!("anime:\t\t{}", format_args!("{}", "-a --anime".red()));
println!("anime:\t\t{}\n", format_args!("{}", "-a --anime".red()));
//print blank line
println!("");
println!(
"cast:\t\t{}",
"cast:\t\t{}\n",
format_args!("{} {}", "-C --cast".red(), "<IP Adress>".green())
);
println!("");
println!("light novel:\t{}", format_args!("{}", "-l --ln".red()));
//print blank line
println!("");
println!("chapter:\t{}", format_args!("{}", "-c --chapter".red()));
println!("light novel:\t{}\n", format_args!("{}", "-l --ln".red()));
println!("chapter:\t{}\n", format_args!("{}", "-c --chapter".red()));
println!(
"{}",
"after this^^^ argument you can enter a chapter number".green()
);
println!("{}", "for exaple kami -c 200");
//print blank line
println!("");
println!("{}", "for exaple kami -c 200\n");
println!("provider:\t{}", format_args!("{}", "-r --provider".red()));
println!(
"{}",
@@ -138,8 +136,11 @@ fn print_help() {
"if the -r argument is not used it will default to {}",
"zoro".green()
);
println!("the providers are {} or {}", "gogo".green(), "zoro".green());
println!("");
println!(
"the providers are {} or {}\n",
"gogo".green(),
"zoro".green()
);
println!("reader:\t\t{}", format_args!("{}", "-R --reader".red()));
println!(
"{}",
@@ -153,8 +154,7 @@ fn print_help() {
"if the -R argument is not used it will default to {}",
"bat".green()
);
println!("the readers are {} or {}", "bat".green(), "glow".green());
println!("");
println!("the readers are {} or {}\n", "bat".green(), "glow".green());
println!("help:\t\t{}", format_args!("{}", "-h --help".red()));
//kill the program
std::process::exit(0);

View File

@@ -103,6 +103,24 @@ impl<'a> KamiApp for App {
terminal.draw(|f| self.ui(f))?;
if let Event::Key(key) = event::read()? {
fn match_anime_list(this: &mut App, selected: Option<usize>) {
match selected {
Some(0) => match this.animes.2.len() {
0 => {
_ = 0;
}
_ => {
this.image = this.animes.2[selected.unwrap()].clone();
this.change_image();
}
},
Some(std::usize::MAX) => _ = 0,
_ => {
this.image = this.animes.2[selected.unwrap()].clone();
this.change_image();
}
}
}
match self.input_mode {
InputMode::Normal => match key.code {
KeyCode::Char('i') => {
@@ -120,8 +138,7 @@ impl<'a> KamiApp for App {
false => {
self.messages.next();
let selected = self.messages.state.selected();
self.image = self.animes.2[selected.unwrap()].clone();
self.change_image();
match_anime_list(self, selected);
}
},
KeyCode::Char('j') => match ep_select {
@@ -131,8 +148,7 @@ impl<'a> KamiApp for App {
false => {
self.messages.next();
let selected = self.messages.state.selected();
self.image = self.animes.2[selected.unwrap()].clone();
self.change_image();
match_anime_list(self, selected)
}
},
KeyCode::Up => match ep_select {
@@ -142,8 +158,7 @@ impl<'a> KamiApp for App {
false => {
self.messages.previous();
let selected = self.messages.state.selected();
self.image = self.animes.2[selected.unwrap()].clone();
self.change_image();
match_anime_list(self, selected)
}
},
KeyCode::Char('k') => match ep_select {
@@ -153,8 +168,7 @@ impl<'a> KamiApp for App {
false => {
self.messages.previous();
let selected = self.messages.state.selected();
self.image = self.animes.2[selected.unwrap()].clone();
self.change_image();
match_anime_list(self, selected)
}
},
//if KeyCode::Enter => {