diff --git a/src/api.rs b/src/api.rs index 8b64b83..d9f8895 100644 --- a/src/api.rs +++ b/src/api.rs @@ -1,9 +1,8 @@ use std::cmp::Ordering; -use htmlentity::types::Byte; use ntex::http::header; use ntex::web; use ntex::web::HttpRequest; -use tokio::{task, time}; +use tokio::{task}; use crate::providers::hanime::HanimeProvider; use crate::providers::perverzija::PerverzijaProvider; diff --git a/src/main.rs b/src/main.rs index ce4ddc2..c78557a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,7 +17,8 @@ mod videos; type DbPool = r2d2::Pool>; -static USER_AGENT: &str = "Mozilla/5.0 (iPhone; CPU iPhone OS 14_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) FxiOS/33.0 Mobile/15E148 Safari/605.1.15"; + + #[ntex::main] async fn main() -> std::io::Result<()> { // std::env::set_var("RUST_BACKTRACE", "1"); diff --git a/src/providers/hanime.rs b/src/providers/hanime.rs index 3f1fad9..57dcb37 100644 --- a/src/providers/hanime.rs +++ b/src/providers/hanime.rs @@ -1,5 +1,4 @@ use std::vec; -use std::env; use error_chain::error_chain; use futures::future::join_all; use wreq::Client; @@ -9,7 +8,6 @@ use crate::providers::Provider; use crate::util::cache::VideoCache; use crate::videos::{self, VideoItem}; use crate::DbPool; -use crate::USER_AGENT; // Make sure Provider trait is imported error_chain! { foreign_links { diff --git a/src/providers/perverzija.rs b/src/providers/perverzija.rs index c778b65..c5080cd 100644 --- a/src/providers/perverzija.rs +++ b/src/providers/perverzija.rs @@ -12,7 +12,7 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{self, VideoEmbed, VideoItem}; use crate::DbPool; -use crate::USER_AGENT; // Make sure Provider trait is imported + error_chain! { foreign_links { @@ -391,7 +391,7 @@ impl PerverzijaProvider { let mut conn = pool.get().expect("couldn't get db connection from pool"); let insert_result = db::insert_video(&mut conn, &lookup_url, &url); match insert_result{ - Ok(x) => (), + Ok(_) => (), Err(e) => {println!("{:?}", e); } } drop(conn); diff --git a/src/providers/spankbang.rs b/src/providers/spankbang.rs index aa1b858..c6196cc 100644 --- a/src/providers/spankbang.rs +++ b/src/providers/spankbang.rs @@ -9,7 +9,6 @@ use crate::util::cache::VideoCache; use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::videos::{VideoItem}; use crate::DbPool; -use crate::USER_AGENT; // Make sure Provider trait is imported use std::collections::HashMap; use wreq::Client; use wreq_util::Emulation; @@ -33,7 +32,7 @@ impl SpankbangProvider { } async fn get(&self, cache:VideoCache, pool: DbPool, page: u8, sort: String) -> Result> { - let mut url = format!("{}{}/{}/", self.url, sort, page); + let url = format!("{}{}/{}/", self.url, sort, page); let old_items = match cache.get(&url) { Some((time, items)) => { @@ -57,8 +56,8 @@ impl SpankbangProvider { let response = client.get(url.clone()).send().await?; let mut cookies_string = String::new(); - if let Some(cookies) = response.headers().get_all("set-cookie").iter().next() { - for value in response.headers().get_all("set-cookie").iter() { + if let Some(_) = response.headers().get_all("set-cookie").iter().next() { + for _ in response.headers().get_all("set-cookie").iter() { let mut cookies_map = HashMap::new(); for value in response.headers().get_all("set-cookie").iter() { if let Ok(cookie_str) = value.to_str() { @@ -144,8 +143,8 @@ impl SpankbangProvider { let response = client.get(url.clone()).send().await?; let mut cookies_string = String::new(); - if let Some(cookies) = response.headers().get_all("set-cookie").iter().next() { - for value in response.headers().get_all("set-cookie").iter() { + if let Some(_) = response.headers().get_all("set-cookie").iter().next() { + for _ in response.headers().get_all("set-cookie").iter() { let mut cookies_map = HashMap::new(); for value in response.headers().get_all("set-cookie").iter() { if let Ok(cookie_str) = value.to_str() { @@ -270,9 +269,9 @@ impl SpankbangProvider { .find(|s| s.trim_start().starts_with("data-src=") && s.contains(".jpg\"")) .unwrap_or(&""); let thumb = thumb_line.split("data-src=\"").collect::>()[1].split("\"").collect::>()[0].to_string(); - let preview_line = vid.iter() - .find(|s| s.trim_start().starts_with(">()[1].split("\"").collect::>()[0].to_string(); @@ -297,16 +296,16 @@ impl SpankbangProvider { }; let id = url_part.split("/").collect::>()[0].to_string(); - let quality_str = match vid[25].contains("<"){ - true => vid[25].split(">").collect::>()[1].split("<").collect::>()[0], - false => "SD", - }; - let quality = match quality_str{ - "HD" => "1080", - "4k" => "2160", - "SD" => "720", - _ => "1080", - }; + // let quality_str = match vid[25].contains("<"){ + // true => vid[25].split(">").collect::>()[1].split("<").collect::>()[0], + // false => "SD", + // }; + // let quality = match quality_str{ + // "HD" => "1080", + // "4k" => "2160", + // "SD" => "720", + // _ => "1080", + // }; let video_item = VideoItem::new(id, title, url.clone().to_string(), "spankbang".to_string(), thumb, duration) // .views(views) @@ -322,8 +321,8 @@ impl SpankbangProvider { println!("HTML is empty"); return vec![]; } - let mut items: Vec = Vec::new(); - let mut split_html = html.split("\"video-list").collect::>(); + let items: Vec = Vec::new(); + let split_html = html.split("\"video-list").collect::>(); if split_html.len() < 2 { println!("Could not find video-list in HTML"); return items;