simon/hottub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup and fixed query

Browse Source
This commit is contained in:
Simon
2025-06-03 12:59:31 +00:00
parent 261c81e391
commit a7610e1bb3
5 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/providers/perverzija.rs
View File

@@ -2,8 +2,7 @@ use std::vec;
use std::env;
use error_chain::error_chain;
use htmlentity::entity::{decode, ICodedDataTrait};
use reqwest::{header, Proxy};
use serde_json::json;
use reqwest::{Proxy};
use crate::providers::Provider;
use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
@@ -47,13 +46,12 @@ impl PerverzijaProvider {
let client = match env::var("BURP_URL").as_deref() {
Ok(burp_url) => {
println!("Using Burp Proxy: {}", burp_url);
Ok(burp_url) =>
reqwest::Client::builder()
.user_agent("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")
.proxy(Proxy::https(burp_url).unwrap())
.danger_accept_invalid_certs(true)
.build()?},
.build()?,
Err(_) => reqwest::Client::builder()
.user_agent("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")
.danger_accept_invalid_certs(true)
@@ -87,29 +85,7 @@ impl PerverzijaProvider {
return Err("Failed to solve FlareSolverr".into());
}
};
//##########
let flare_url = env::var("FLARE_URL").expect("FLARE_URL not set");
let flare = Flaresolverr::new(flare_url);
let req = FlareSolverrRequest {
cmd: "request.get".to_string(),
url: url.clone(),
maxTimeout: 60000,
};
let response = flare.solve(req).await;
// println!("Response: {:?}", response);
match response {
Ok(html) => {
let video_items: Vec<Video_Item> = self.get_video_items_from_html(html.solution.response.clone());
Ok(video_items)
}
Err(e) => {
println!("Error solving FlareSolverr: {}", e);
return Err("Failed to solve FlareSolverr".into());
}
}
Ok(video_items)
}
}
async fn query(&self, page: &u8, query: &str) -> Result<Vec<Video_Item>> {
@@ -123,24 +99,48 @@ impl PerverzijaProvider {
url = format!("{}advanced-search/?_sf_s={}", self.url, search_string);
}
let flare_url = env::var("FLARE_URL").expect("FLARE_URL not set");
let flare = Flaresolverr::new(flare_url);
let req = FlareSolverrRequest {
cmd: "request.get".to_string(),
url: url.clone(),
maxTimeout: 60000,
let client = match env::var("BURP_URL").as_deref() {
Ok(burp_url) =>
reqwest::Client::builder()
.user_agent("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")
.proxy(Proxy::https(burp_url).unwrap())
.danger_accept_invalid_certs(true)
.build()?,
Err(_) => reqwest::Client::builder()
.user_agent("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")
.danger_accept_invalid_certs(true)
.build()?,
};
let response = flare.solve(req).await;
match response {
Ok(html) => {
let video_items = self.get_video_items_from_html_query(html.solution.response.clone());
Ok(video_items)
}
Err(e) => {
println!("Error solving FlareSolverr: {}", e);
return Err("Failed to solve FlareSolverr".into());
}
let response = client.get(url.clone()).send().await?;
// print!("Response: {:?}\n", response);
if response.status().is_success() {
let text = response.text().await?;
let video_items: Vec<Video_Item> = self.get_video_items_from_html(text.clone());
Ok(video_items)
} else {
let flare_url = env::var("FLARE_URL").expect("FLARE_URL not set");
let flare = Flaresolverr::new(flare_url);
let result = flare
.solve(FlareSolverrRequest {
cmd: "request.get".to_string(),
url: url.clone(),
maxTimeout: 60000,
})
.await;
println!("FlareSolverr result: {:?}", result);
let video_items = match result {
Ok(res) => {
// println!("FlareSolverr response: {}", res);
self.get_video_items_from_html_query(res.solution.response)
}
Err(e) => {
println!("Error solving FlareSolverr: {}", e);
return Err("Failed to solve FlareSolverr".into());
}
};
Ok(video_items)
}
}
@@ -199,7 +199,7 @@ impl PerverzijaProvider {
.collect::<Vec<&str>>()[0]
.to_string(),
};
let mut embed_html = vid[1].split("data-embed='").collect::<Vec<&str>>()[1]
let embed_html = vid[1].split("data-embed='").collect::<Vec<&str>>()[1]
.split("'")
.collect::<Vec<&str>>()[0]
.to_string();
@@ -287,7 +287,7 @@ impl PerverzijaProvider {
.collect::<Vec<&str>>()[0]
.to_string(),
};
let mut embed_html = vid[4].split("data-embed='").collect::<Vec<&str>>()[1]
let embed_html = vid[4].split("data-embed='").collect::<Vec<&str>>()[1]
.split("'")
.collect::<Vec<&str>>()[0]
.to_string();
@@ -330,6 +330,7 @@ impl Provider for PerverzijaProvider {
per_page: String,
featured: String,
) -> Vec<Video_Item> {
let _ = per_page;
let _ = sort;
let videos: std::result::Result<Vec<Video_Item>, Error> = match query {
Some(q) => self.query(&page.parse::<u8>().unwrap_or(1), &q).await,