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

provider refactors and fixes

Browse Source
This commit is contained in:
Simon
2026-03-05 13:28:38 +00:00
parent 060d8e7937
commit 8157e223fe
33 changed files with 3051 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
src/providers/freepornvideosxxx.rs
View File

@@ -1,6 +1,6 @@
use crate::DbPool;
use crate::api::ClientVersion;
use crate::providers::Provider;
use crate::providers::{Provider, report_provider_error, report_provider_error_background};
use crate::util::cache::VideoCache;
use crate::util::parse_abbreviated_number;
use crate::util::time::parse_time_to_seconds;
@@ -58,10 +58,20 @@ impl FreepornvideosxxxProvider {
thread::spawn(move || {
// Create a tiny runtime just for these async tasks
let rt = tokio::runtime::Builder::new_current_thread()
let rt = match tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
.expect("build tokio runtime");
{
Ok(rt) => rt,
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"spawn_initial_load.runtime_build",
&e.to_string(),
);
return;
}
};
rt.block_on(async move {
// If you have a streaming sites loader, call it here too
@@ -83,13 +93,23 @@ impl FreepornvideosxxxProvider {
async fn load_stars(base_url: &str, stars: Arc<RwLock<Vec<FilterOption>>>) -> Result<()> {
let mut requester = util::requester::Requester::new();
for page in [1..10].into_iter().flatten() {
let text = requester
let text = match requester
.get(
format!("{}/models/total-videos/{}/?gender_id=0", &base_url, page).as_str(),
None,
)
.await
.unwrap();
{
Ok(text) => text,
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"load_stars.request",
&format!("url={base_url}; page={page}; error={e}"),
);
break;
}
};
if text.contains("404 Not Found") || text.is_empty() {
break;
}
@@ -97,19 +117,20 @@ impl FreepornvideosxxxProvider {
.split("<div class=\"list-models\">")
.collect::<Vec<&str>>()
.last()
.unwrap()
.copied()
.unwrap_or_default()
.split("custom_list_models_models_list_pagination")
.collect::<Vec<&str>>()[0];
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default();
for stars_element in stars_div.split("<a ").collect::<Vec<&str>>()[1..].to_vec() {
let star_url = stars_element.split("href=\"").collect::<Vec<&str>>()[1]
let star_url = stars_element.split("href=\"").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0];
let star_id = star_url.split("/").collect::<Vec<&str>>()[4].to_string();
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default();
let star_id = star_url.split("/").collect::<Vec<&str>>().get(4).copied().unwrap_or_default().to_string();
let star_name = stars_element
.split("<strong class=\"title\">")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string();
Self::push_unique(
&stars,
@@ -130,26 +151,36 @@ impl FreepornvideosxxxProvider {
page += 1;
let text = requester
.get(format!("{}/sites/{}/", &base_url, page).as_str(), None)
.await
.unwrap();
.await;
let text = match text {
Ok(text) => text,
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"load_sites.request",
&format!("url={base_url}; page={page}; error={e}"),
);
break;
}
};
if text.contains("404 Not Found") || text.is_empty() {
break;
}
let sites_div = text
.split("id=\"list_content_sources_sponsors_list_items\"")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("class=\"pagination\"")
.collect::<Vec<&str>>()[0];
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default();
for sites_element in
sites_div.split("class=\"headline\"").collect::<Vec<&str>>()[1..].to_vec()
{
let site_url = sites_element.split("href=\"").collect::<Vec<&str>>()[1]
let site_url = sites_element.split("href=\"").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0];
let site_id = site_url.split("/").collect::<Vec<&str>>()[4].to_string();
let site_name = sites_element.split("<h2>").collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default();
let site_id = site_url.split("/").collect::<Vec<&str>>().get(4).copied().unwrap_or_default().to_string();
let site_name = sites_element.split("<h2>").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string();
Self::push_unique(
&sites,
@@ -165,23 +196,33 @@ impl FreepornvideosxxxProvider {
async fn load_networks(base_url: &str, networks: Arc<RwLock<Vec<FilterOption>>>) -> Result<()> {
let mut requester = util::requester::Requester::new();
let text = requester.get(&base_url, None).await.unwrap();
let networks_div = text.split("class=\"sites__list\"").collect::<Vec<&str>>()[1]
let text = match requester.get(&base_url, None).await {
Ok(text) => text,
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"load_networks.request",
&format!("url={base_url}; error={e}"),
);
return Ok(());
}
};
let networks_div = text.split("class=\"sites__list\"").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("</div>")
.collect::<Vec<&str>>()[0];
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default();
for network_element in
networks_div.split("sites__item").collect::<Vec<&str>>()[1..].to_vec()
{
if network_element.contains("sites__all") {
continue;
}
let network_url = network_element.split("href=\"").collect::<Vec<&str>>()[1]
let network_url = network_element.split("href=\"").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0];
let network_id = network_url.split("/").collect::<Vec<&str>>()[4].to_string();
let network_name = network_element.split(">").collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default();
let network_id = network_url.split("/").collect::<Vec<&str>>().get(4).copied().unwrap_or_default().to_string();
let network_name = network_element.split(">").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string();
Self::push_unique(
&networks,
@@ -306,35 +347,20 @@ impl FreepornvideosxxxProvider {
"most-popular" => "/most-popular".to_string(),
_ => "".to_string(),
};
if options.network.is_some()
&& !options.network.as_ref().unwrap().is_empty()
&& options.network.as_ref().unwrap() != "all"
{
sort_string = format!(
"networks/{}{}",
options.network.as_ref().unwrap(),
alt_sort_string
);
if let Some(network) = options.network.as_deref() {
if !network.is_empty() && network != "all" {
sort_string = format!("networks/{}{}", network, alt_sort_string);
}
}
if options.sites.is_some()
&& !options.sites.as_ref().unwrap().is_empty()
&& options.sites.as_ref().unwrap() != "all"
{
sort_string = format!(
"sites/{}{}",
options.sites.as_ref().unwrap(),
alt_sort_string
);
if let Some(site) = options.sites.as_deref() {
if !site.is_empty() && site != "all" {
sort_string = format!("sites/{}{}", site, alt_sort_string);
}
}
if options.stars.is_some()
&& !options.stars.as_ref().unwrap().is_empty()
&& options.stars.as_ref().unwrap() != "all"
{
sort_string = format!(
"models/{}{}",
options.stars.as_ref().unwrap(),
alt_sort_string
);
if let Some(star) = options.stars.as_deref() {
if !star.is_empty() && star != "all" {
sort_string = format!("models/{}{}", star, alt_sort_string);
}
}
let video_url = format!("{}/{}/{}/", self.url, sort_string, page);
let old_items = match cache.get(&video_url) {
@@ -350,8 +376,20 @@ impl FreepornvideosxxxProvider {
}
};
let mut requester = options.requester.clone().unwrap();
let text = requester.get(&video_url, None).await.unwrap();
let mut requester =
crate::providers::requester_or_default(&options, module_path!(), "missing_requester");
let text = match requester.get(&video_url, None).await {
Ok(text) => text,
Err(e) => {
report_provider_error(
"freepornvideosxxx",
"get.request",
&format!("url={video_url}; error={e}"),
)
.await;
return Ok(old_items);
}
};
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone());
if !video_items.is_empty() {
cache.remove(&video_url);
@@ -371,31 +409,41 @@ impl FreepornvideosxxxProvider {
) -> Result<Vec<VideoItem>> {
let mut search_type = "search";
let mut search_string = query.to_string().to_ascii_lowercase().trim().to_string();
match self
.stars
.read()
.unwrap()
.iter()
.find(|s| s.title.to_ascii_lowercase() == search_string)
{
Some(star) => {
search_type = "models";
search_string = star.id.clone();
match self.stars.read() {
Ok(stars) => {
if let Some(star) = stars
.iter()
.find(|s| s.title.to_ascii_lowercase() == search_string)
{
search_type = "models";
search_string = star.id.clone();
}
}
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"query.stars_read",
&e.to_string(),
);
}
_ => {}
}
match self
.sites
.read()
.unwrap()
.iter()
.find(|s| s.title.to_ascii_lowercase() == search_string)
{
Some(site) => {
search_type = "sites";
search_string = site.id.clone();
match self.sites.read() {
Ok(sites) => {
if let Some(site) = sites
.iter()
.find(|s| s.title.to_ascii_lowercase() == search_string)
{
search_type = "sites";
search_string = site.id.clone();
}
}
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"query.sites_read",
&e.to_string(),
);
}
_ => {}
}
let mut video_url = format!("{}/{}/{}/{}/", self.url, search_type, search_string, page);
video_url = video_url.replace(" ", "+");
@@ -414,9 +462,20 @@ impl FreepornvideosxxxProvider {
}
};
let mut requester = options.requester.clone().unwrap();
let text = requester.get(&video_url, None).await.unwrap();
let mut requester =
crate::providers::requester_or_default(&options, module_path!(), "missing_requester");
let text = match requester.get(&video_url, None).await {
Ok(text) => text,
Err(e) => {
report_provider_error(
"freepornvideosxxx",
"query.request",
&format!("url={video_url}; error={e}"),
)
.await;
return Ok(old_items);
}
};
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone());
if !video_items.is_empty() {
cache.remove(&video_url);
@@ -429,7 +488,18 @@ impl FreepornvideosxxxProvider {
fn get_site_id_from_name(&self, site_name: &str) -> Option<String> {
// site_name.to_lowercase().replace(" ", "")
for site in self.sites.read().unwrap().iter() {
let sites_guard = match self.sites.read() {
Ok(guard) => guard,
Err(e) => {
report_provider_error_background(
"freepornvideosxxx",
"get_site_id_from_name.sites_read",
&e.to_string(),
);
return None;
}
};
for site in sites_guard.iter() {
if site
.title
.to_lowercase()
@@ -452,11 +522,11 @@ impl FreepornvideosxxxProvider {
if !html.contains("class=\"item\"") {
return items;
}
let raw_videos = html.split("videos_list_pagination").collect::<Vec<&str>>()[0]
let raw_videos = html.split("videos_list_pagination").collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.split(" class=\"pagination\" ")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.split("class=\"list-videos\"")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("class=\"item\"")
.collect::<Vec<&str>>()[1..]
.to_vec();
@@ -465,39 +535,39 @@ impl FreepornvideosxxxProvider {
// for (index, line) in vid.iter().enumerate() {
// println!("Line {}: {}", index, line);
// }
let video_url: String = video_segment.split("<a href=\"").collect::<Vec<&str>>()[1]
let video_url: String = video_segment.split("<a href=\"").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string();
let mut title = video_segment.split(" title=\"").collect::<Vec<&str>>()[1]
let mut title = video_segment.split(" title=\"").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string();
// html decode
title = decode(title.as_bytes()).to_string().unwrap_or(title);
let id = video_url.split("/").collect::<Vec<&str>>()[4].to_string();
let id = video_url.split("/").collect::<Vec<&str>>().get(4).copied().unwrap_or_default().to_string();
let thumb = match video_segment.split("<img ").collect::<Vec<&str>>()[1]
let thumb = match video_segment.split("<img ").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.contains("data-src=\"")
{
true => video_segment.split("<img ").collect::<Vec<&str>>()[1]
true => video_segment.split("<img ").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("data-src=\"")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string(),
false => video_segment.split("<img ").collect::<Vec<&str>>()[1]
false => video_segment.split("<img ").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("src=\"")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string(),
};
let raw_duration = video_segment
.split("<span class=\"duration\">")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.split(" ")
.collect::<Vec<&str>>()
.last()
@@ -507,9 +577,9 @@ impl FreepornvideosxxxProvider {
let views = parse_abbreviated_number(
video_segment
.split("<div class=\"views\">")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string()
.as_str(),
)
@@ -517,9 +587,9 @@ impl FreepornvideosxxxProvider {
let preview = video_segment
.split("data-preview=\"")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("\"")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.to_string();
let site_name = title
.split("]")
@@ -533,9 +603,9 @@ impl FreepornvideosxxxProvider {
let mut tags = match video_segment.contains("class=\"models\">") {
true => video_segment
.split("class=\"models\">")
.collect::<Vec<&str>>()[1]
.collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("</div>")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.split("href=\"")
.collect::<Vec<&str>>()[1..]
.into_iter()
@@ -543,17 +613,17 @@ impl FreepornvideosxxxProvider {
Self::push_unique(
&self.stars,
FilterOption {
id: s.split("/").collect::<Vec<&str>>()[4].to_string(),
title: s.split(">").collect::<Vec<&str>>()[1]
id: s.split("/").collect::<Vec<&str>>().get(4).copied().unwrap_or_default().to_string(),
title: s.split(">").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.trim()
.to_string(),
},
);
s.split(">").collect::<Vec<&str>>()[1]
s.split(">").collect::<Vec<&str>>().get(1).copied().unwrap_or_default()
.split("<")
.collect::<Vec<&str>>()[0]
.collect::<Vec<&str>>().get(0).copied().unwrap_or_default()
.trim()
.to_string()
})