supervisor and other update
This commit is contained in:
@@ -28,6 +28,14 @@ impl PerverzijaProvider {
|
||||
}
|
||||
async fn get(&self, page: &u8, featured: String) -> Result<Vec<Video_Item>> {
|
||||
println!("get");
|
||||
|
||||
//TODO
|
||||
// let mut url = Url::parse("https://example.net")?;
|
||||
// url.query_pairs_mut().append_pair("foo", "bar");
|
||||
// url.query_pairs_mut().append_pair("key", "dkhdsihdsaiufds");
|
||||
// url.query_pairs_mut().append_pair("hello", "world");
|
||||
// println!("{}", url.as_str());
|
||||
|
||||
let mut prefix_uri = "".to_string();
|
||||
if featured == "featured" {
|
||||
prefix_uri = "featured-scenes/".to_string();
|
||||
@@ -36,24 +44,69 @@ impl PerverzijaProvider {
|
||||
if page == &1 {
|
||||
url = format!("{}{}", self.url, prefix_uri);
|
||||
}
|
||||
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(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(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;
|
||||
// println!("Response: {:?}", response);
|
||||
match response {
|
||||
Ok(html) => {
|
||||
let video_items = self.get_video_items_from_html(html.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(res.solution.response)
|
||||
}
|
||||
Err(e) => {
|
||||
println!("Error solving FlareSolverr: {}", e);
|
||||
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());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,7 +132,7 @@ impl PerverzijaProvider {
|
||||
let response = flare.solve(req).await;
|
||||
match response {
|
||||
Ok(html) => {
|
||||
let video_items = self.get_video_items_from_html_query(html.clone());
|
||||
let video_items = self.get_video_items_from_html_query(html.solution.response.clone());
|
||||
Ok(video_items)
|
||||
}
|
||||
Err(e) => {
|
||||
@@ -97,7 +150,7 @@ impl PerverzijaProvider {
|
||||
.split("video-item post")
|
||||
.collect::<Vec<&str>>()[1..]
|
||||
.to_vec();
|
||||
println!("Raw Videos: {:?}", raw_videos);
|
||||
// println!("Raw Videos: {:?}", raw_videos);
|
||||
for video_segment in &raw_videos {
|
||||
let vid = video_segment.split("\n").collect::<Vec<&str>>();
|
||||
// let mut index = 0;
|
||||
|
||||
Reference in New Issue
Block a user