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

various bugfixes

Browse Source
This commit is contained in:
Simon
2026-01-13 18:13:51 +00:00
parent aaff7d00c6
commit 34992242b7
21 changed files with 243 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/providers/all.rs
View File

@@ -94,11 +94,11 @@ impl Provider for AllProvider {
return video_items;
}
fn get_channel(&self,clientversion:ClientVersion) -> Channel {
fn get_channel(&self,clientversion:ClientVersion) -> Option<Channel> {
println!("Getting channel for placeholder with client version: {:?}",clientversion);
let _ = clientversion;
Channel {
Some(Channel {
id:"placeholder".to_string(),name:"PLACEHOLDER".to_string(),description:"PLACEHOLDER FOR PARENT CLASS".to_string(),premium:false,favicon:"https://www.google.com/s2/favicons?sz=64&domain=missav.ws".to_string(),status:"active".to_string(),categories:vec![],options:vec![],nsfw:true,cacheDuration:None,
}
})
}
}

10
src/providers/beeg.rs
View File

@@ -3,7 +3,6 @@ use crate::api::ClientVersion;
use crate::providers::Provider;
use crate::util::cache::VideoCache;
use crate::util::parse_abbreviated_number;
use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem};
use crate::{status::*, util};
use async_trait::async_trait;
@@ -311,7 +310,7 @@ impl BeegProvider {
};
let id = file.get("id").and_then(|v| v.as_i64()).unwrap_or(0).to_string();
let title = video
let title = file
.get("data")
.and_then(|v| v.get(0))
.and_then(|v| v.get("cd_value"))
@@ -321,8 +320,7 @@ impl BeegProvider {
let duration = file
.get("fl_duration")
.and_then(|v| v.as_str())
.and_then(|s| parse_time_to_seconds(s))
.and_then(|v| v.as_u64())
.unwrap_or(0);
let views = video
@@ -378,7 +376,7 @@ impl Provider for BeegProvider {
})
}
fn get_channel(&self, clientversion: ClientVersion) -> Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<Channel> {
Some(self.build_channel(clientversion))
}
}

6
src/providers/freshporno.rs
View File

@@ -192,11 +192,11 @@ impl Provider for FreshpornoProvider {
}
}
fn get_channel(&self,clientversion:ClientVersion) -> Channel {
fn get_channel(&self,clientversion:ClientVersion) -> Option<Channel> {
println!("Getting channel for placeholder with client version: {:?}",clientversion);
let _ = clientversion;
Channel {
Some(Channel {
id:"placeholder".to_string(),name:"PLACEHOLDER".to_string(),description:"PLACEHOLDER FOR PARENT CLASS".to_string(),premium:false,favicon:"https://www.google.com/s2/favicons?sz=64&domain=missav.ws".to_string(),status:"active".to_string(),categories:vec![],options:vec![],nsfw:true,cacheDuration:None,
}
})
}
}

4
src/providers/hqporner.rs
View File

@@ -458,7 +458,7 @@ impl Provider for HqpornerProvider {
}
}
}
fn get_channel(&self, clientversion: ClientVersion) -> crate::status::Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<crate::status::Channel> {
Some(self.build_channel(clientversion))
}
}

150
src/providers/hypnotube.rs
View File

@@ -3,14 +3,14 @@ use crate::api::ClientVersion;
use crate::providers::Provider;
use crate::status::*;
use crate::util::cache::VideoCache;
use crate::util::discord::send_discord_error_report;
use crate::util::discord::{format_error_chain, send_discord_error_report};
use crate::util::requester::Requester;
use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem};
use async_trait::async_trait;
use error_chain::error_chain;
use htmlentity::entity::{decode, ICodedDataTrait};
use htmlentity::entity::{ICodedDataTrait, decode};
use std::sync::{Arc, RwLock};
use std::{thread, vec};
use titlecase::Titlecase;
@@ -50,7 +50,7 @@ impl HypnotubeProvider {
let url = self.url.clone();
let categories = Arc::clone(&self.categories);
thread::spawn(move || {
thread::spawn(async move || {
let rt = match tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
@@ -58,14 +58,16 @@ impl HypnotubeProvider {
Ok(rt) => rt,
Err(e) => {
eprintln!("tokio runtime failed: {e}");
let _ = futures::executor::block_on(send_discord_error_report(
&e,
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("HypnoTube Provider"),
Some("Failed to create tokio runtime"),
file!(),
line!(),
module_path!(),
));
)
.await;
return;
}
};
@@ -74,13 +76,15 @@ impl HypnotubeProvider {
if let Err(e) = Self::load_categories(&url, Arc::clone(&categories)).await {
eprintln!("load_categories failed: {e}");
send_discord_error_report(
&e,
e.to_string(),
Some(format_error_chain(&e)),
Some("HypnoTube Provider"),
Some("Failed to load categories during initial load"),
file!(),
line!(),
module_path!(),
).await;
)
.await;
}
});
});
@@ -89,10 +93,7 @@ impl HypnotubeProvider {
async fn load_categories(base: &str, cats: Arc<RwLock<Vec<FilterOption>>>) -> Result<()> {
let mut requester = Requester::new();
let text = requester
.get(
&format!("{base}/channels/"),
Some(Version::HTTP_11),
)
.get(&format!("{base}/channels/"), Some(Version::HTTP_11))
.await
.map_err(|e| Error::from(format!("{}", e)))?;
@@ -123,7 +124,7 @@ impl HypnotubeProvider {
}
Ok(())
}
fn build_channel(&self, clientversion: ClientVersion) -> Channel {
let _ = clientversion;
Channel {
@@ -140,8 +141,7 @@ impl HypnotubeProvider {
.iter()
.map(|c| c.title.clone())
.collect(),
options: vec![
ChannelOption {
options: vec![ChannelOption {
id: "sort".to_string(),
title: "Sort".to_string(),
description: "Sort the Videos".to_string(),
@@ -193,10 +193,7 @@ impl HypnotubeProvider {
"longest" => "longest",
_ => "videos",
};
let video_url = format!(
"{}/{}/page{}.html",
self.url, sort_string, page
);
let video_url = format!("{}/{}/page{}.html", self.url, sort_string, page);
let old_items = match cache.get(&video_url) {
Some((time, items)) => {
if time.elapsed().unwrap_or_default().as_secs() < 60 * 5 {
@@ -210,14 +207,15 @@ impl HypnotubeProvider {
}
};
let mut requester = options.requester.clone().unwrap();
let text = requester.get(&video_url, Some(Version::HTTP_11)).await.unwrap();
let text = requester
.get(&video_url, Some(Version::HTTP_11))
.await
.unwrap();
if text.contains("Sorry, no results were found.") {
eprint!("Hypnotube query returned no results for page {}", page);
return vec![];
}
let video_items: Vec<VideoItem> = self
.get_video_items_from_html(text.clone())
.await;
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone()).await;
if !video_items.is_empty() {
cache.remove(&video_url);
cache.insert(video_url.clone(), video_items.clone());
@@ -242,7 +240,10 @@ impl HypnotubeProvider {
};
let video_url = format!(
"{}/search/videos/{}/{}/page{}.html",
self.url, query.trim().replace(" ","%20"), sort_string, page
self.url,
query.trim().replace(" ", "%20"),
sort_string,
page
);
// Check our Video Cache. If the result is younger than 1 hour, we return it.
let old_items = match cache.get(&video_url) {
@@ -258,9 +259,19 @@ impl HypnotubeProvider {
vec![]
}
};
let mut requester = options.requester.clone().unwrap();
let text = match requester.post(format!("{}/searchgate.php", self.url).as_str(), format!("q={}&type=videos", query.replace(" ","+")).as_str(), vec![("Content-Type", "application/x-www-form-urlencoded")]).await.unwrap().text().await {
let text = match requester
.post(
format!("{}/searchgate.php", self.url).as_str(),
format!("q={}&type=videos", query.replace(" ", "+")).as_str(),
vec![("Content-Type", "application/x-www-form-urlencoded")],
)
.await
.unwrap()
.text()
.await
{
Ok(t) => t,
Err(e) => {
eprint!("Hypnotube search POST request failed: {}", e);
@@ -273,9 +284,7 @@ impl HypnotubeProvider {
eprint!("Hypnotube query returned no results for page {}", page);
return vec![];
}
let video_items: Vec<VideoItem> = self
.get_video_items_from_html(text.clone())
.await;
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone()).await;
if !video_items.is_empty() {
cache.remove(&video_url);
cache.insert(video_url.clone(), video_items.clone());
@@ -285,10 +294,7 @@ impl HypnotubeProvider {
video_items
}
async fn get_video_items_from_html(
&self,
html: String
) -> Vec<VideoItem> {
async fn get_video_items_from_html(&self, html: String) -> Vec<VideoItem> {
if html.is_empty() || html.contains("404 Not Found") {
eprint!("Hypnotube returned empty or 404 html");
return vec![];
@@ -302,47 +308,59 @@ impl HypnotubeProvider {
Some(b) => b,
None => {
eprint!("Hypnotube Provider: Failed to get block from html");
let err = Error::from(ErrorKind::Parse("html".into()));
let _ = futures::executor::block_on(send_discord_error_report(
&err,
Some("Hypnotube Provider"),
Some(&format!("Failed to get block from html:\n```{html}\n```")),
file!(),
line!(),
module_path!(),
));
let e = Error::from(ErrorKind::Parse("html".into()));
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("Hypnotube Provider"),
Some(&format!("Failed to get block from html:\n```{html}\n```")),
file!(),
line!(),
module_path!(),
)
.await;
return vec![];
},
}
};
let mut items = vec![];
for seg in block.split("<!-- item -->").skip(1){
for seg in block.split("<!-- item -->").skip(1) {
let video_url = match seg
.split(" href=\"")
.nth(1)
.and_then(|s| s.split('"').next()) {
Some(url) => url.to_string(),
None => {
eprint!("Hypnotube Provider: Failed to parse video url from segment");
let err = Error::from(ErrorKind::Parse("video url".into()));
let _ = futures::executor::block_on(send_discord_error_report(
&err,
Some("Hypnotube Provider"),
Some(&format!("Failed to parse video url from segment:\n```{seg}\n```")),
file!(),
line!(),
module_path!(),
));
continue;
}
};
.and_then(|s| s.split('"').next())
{
Some(url) => url.to_string(),
None => {
eprint!("Hypnotube Provider: Failed to parse video url from segment");
let e = Error::from(ErrorKind::Parse("video url".into()));
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("Hypnotube Provider"),
Some(&format!(
"Failed to parse video url from segment:\n```{seg}\n```"
)),
file!(),
line!(),
module_path!(),
)
.await;
continue;
}
};
let mut title = seg
.split(" title=\"")
.nth(1)
.and_then(|s| s.split('"').next())
.unwrap_or_default().trim().to_string();
.unwrap_or_default()
.trim()
.to_string();
title = decode(title.clone().as_bytes()).to_string().unwrap_or(title).titlecase();
title = decode(title.clone().as_bytes())
.to_string()
.unwrap_or(title)
.titlecase();
let id = video_url
.split('/')
.nth(4)
@@ -364,7 +382,7 @@ impl HypnotubeProvider {
.unwrap_or("")
.to_string();
let duration = parse_time_to_seconds(&raw_duration).unwrap_or(0) as u32;
let views = seg
.split("<span class=\"icon i-eye\"></span>")
.nth(1)
@@ -411,7 +429,7 @@ impl Provider for HypnotubeProvider {
return res;
}
fn get_channel(&self, v: ClientVersion) -> Channel {
self.build_channel(v)
fn get_channel(&self, v: ClientVersion) -> Option<Channel> {
Some(self.build_channel(v))
}
}

49
src/providers/javtiful.rs
View File

@@ -3,7 +3,7 @@ use crate::api::ClientVersion;
use crate::providers::Provider;
use crate::status::*;
use crate::util::cache::VideoCache;
use crate::util::discord::send_discord_error_report;
use crate::util::discord::{format_error_chain, send_discord_error_report};
use crate::util::requester::Requester;
use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoFormat, VideoItem};
@@ -215,15 +215,16 @@ impl JavtifulProvider {
Some(b) => b,
None => {
eprint!("Javtiful Provider: Failed to get block from html");
let err = Error::from(ErrorKind::Parse("html".into()));
let _ = futures::executor::block_on(send_discord_error_report(
&err,
Some("Javtiful Provider"),
Some(&format!("Failed to get block from html:\n```{html}\n```")),
file!(),
line!(),
module_path!(),
));
let e = Error::from(ErrorKind::Parse("html".into()));
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("Javtiful Provider"),
Some(&format!("Failed to get block from html:\n```{html}\n```")),
file!(),
line!(),
module_path!(),
).await;
return vec![]
},
};
@@ -239,14 +240,22 @@ impl JavtifulProvider {
.inspect(|r| {
if let Err(e) = r {
eprint!("Javtiful Provider: Failed to get video item:{}\n", e);
let _ = futures::executor::block_on(send_discord_error_report(
&e,
Some("Javtiful Provider"),
Some("Failed to get video item"),
file!(),
line!(),
module_path!(),
));
// Prepare data to move into the background task
let msg = e.to_string();
let chain = format_error_chain(&e);
// Spawn the report into the background - NO .await here
tokio::spawn(async move {
let _ = send_discord_error_report(
msg,
Some(chain),
Some("Javtiful Provider"),
Some("Failed to get video item"),
file!(), // Note: these might report the utility line
line!(), // better to hardcode or pass from outside
module_path!(),
).await;
});
}
})
.filter_map(Result::ok)
@@ -400,7 +409,7 @@ impl Provider for JavtifulProvider {
})
}
fn get_channel(&self, v: ClientVersion) -> Channel {
self.build_channel(v)
fn get_channel(&self, v: ClientVersion) -> Option<Channel> {
Some(self.build_channel(v))
}
}

6
src/providers/mod.rs
View File

@@ -82,13 +82,13 @@ pub trait Provider: Send + Sync {
options: ServerOptions,
) -> Vec<VideoItem>;
fn get_channel(&self, clientversion: ClientVersion) -> Channel {
fn get_channel(&self, clientversion: ClientVersion) -> Option<Channel> {
println!(
"Getting channel for placeholder with client version: {:?}",
clientversion
);
let _ = clientversion;
Channel {
Some(Channel {
id: "placeholder".to_string(),
name: "PLACEHOLDER".to_string(),
description: "PLACEHOLDER FOR PARENT CLASS".to_string(),
@@ -99,6 +99,6 @@ pub trait Provider: Send + Sync {
options: vec![],
nsfw: true,
cacheDuration: None,
}
})
}
}

4
src/providers/noodlemagazine.rs
View File

@@ -302,7 +302,7 @@ impl Provider for NoodlemagazineProvider {
})
}
fn get_channel(&self, clientversion: ClientVersion) -> Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<Channel> {
Some(self.build_channel(clientversion))
}
}

4
src/providers/omgxxx.rs
View File

@@ -621,7 +621,7 @@ impl Provider for OmgxxxProvider {
}
}
}
fn get_channel(&self, clientversion: ClientVersion) -> crate::status::Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<crate::status::Channel> {
Some(self.build_channel(clientversion))
}
}

21
src/providers/pimpbunny.rs
View File

@@ -3,7 +3,7 @@ use crate::api::ClientVersion;
use crate::providers::Provider;
use crate::status::*;
use crate::util::cache::VideoCache;
use crate::util::discord::send_discord_error_report;
use crate::util::discord::{format_error_chain, send_discord_error_report};
use crate::util::requester::Requester;
use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoFormat, VideoItem};
@@ -101,7 +101,7 @@ impl PimpbunnyProvider {
let stars = Arc::clone(&self.stars);
let categories = Arc::clone(&self.categories);
thread::spawn(move || {
thread::spawn(async move || {
let rt = match tokio::runtime::Builder::new_current_thread()
.enable_all()
.build()
@@ -109,14 +109,15 @@ impl PimpbunnyProvider {
Ok(rt) => rt,
Err(e) => {
eprintln!("tokio runtime failed: {e}");
let _ = futures::executor::block_on(send_discord_error_report(
&e,
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("Pimpbunny Provider"),
Some("Failed to create tokio runtime"),
file!(),
line!(),
module_path!(),
));
).await;
return;
}
};
@@ -125,7 +126,8 @@ impl PimpbunnyProvider {
if let Err(e) = Self::load_stars(&url, Arc::clone(&stars)).await {
eprintln!("load_stars failed: {e}");
send_discord_error_report(
&e,
e.to_string(),
Some(format_error_chain(&e)),
Some("Pimpbunny Provider"),
Some("Failed to load stars during initial load"),
file!(),
@@ -136,7 +138,8 @@ impl PimpbunnyProvider {
if let Err(e) = Self::load_categories(&url, Arc::clone(&categories)).await {
eprintln!("load_categories failed: {e}");
send_discord_error_report(
&e,
e.to_string(),
Some(format_error_chain(&e)),
Some("Pimpbunny Provider"),
Some("Failed to load categories during initial load"),
file!(),
@@ -529,7 +532,7 @@ impl Provider for PimpbunnyProvider {
})
}
fn get_channel(&self, v: ClientVersion) -> Channel {
self.build_channel(v)
fn get_channel(&self, v: ClientVersion) -> Option<Channel> {
Some(self.build_channel(v))
}
}

16
src/providers/pmvhaven.rs
View File

@@ -11,6 +11,7 @@ use error_chain::error_chain;
use htmlentity::entity::{decode, ICodedDataTrait};
use std::sync::{Arc, RwLock};
use std::vec;
use std::fmt::Write;
error_chain! {
foreign_links {
@@ -277,20 +278,25 @@ impl Provider for PmvhavenProvider {
Ok(v) => v,
Err(e) => {
eprintln!("pmvhaven error: {e}");
let _ = futures::executor::block_on(send_discord_error_report(
&e,
let mut chain_str = String::new();
for (i, cause) in e.iter().enumerate() {
let _ = writeln!(chain_str, "{}. {}", i + 1, cause);
}
send_discord_error_report(
e.to_string(),
Some(chain_str),
Some("PMVHaven Provider"),
Some("Failed to load videos from PMVHaven"),
file!(),
line!(),
module_path!(),
));
).await;
vec![]
}
}
}
fn get_channel(&self, clientversion: ClientVersion) -> Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<Channel> {
Some(self.build_channel(clientversion))
}
}

4
src/providers/pornxp.rs
View File

@@ -265,7 +265,7 @@ impl Provider for PornxpProvider {
}
}
}
fn get_channel(&self, clientversion: ClientVersion) -> crate::status::Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<crate::status::Channel> {
Some(self.build_channel(clientversion))
}
}

4
src/providers/rule34gen.rs
View File

@@ -282,7 +282,7 @@ impl Provider for Rule34genProvider {
}
}
fn get_channel(&self, clientversion: ClientVersion) -> crate::status::Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<crate::status::Channel> {
Some(self.build_channel(clientversion))
}
}

32
src/providers/sxyprn.rs
View File

@@ -1,6 +1,7 @@
use crate::DbPool;
use crate::providers::Provider;
use crate::util::cache::VideoCache;
use crate::util::discord::format_error_chain;
use crate::util::discord::send_discord_error_report;
use crate::util::requester::Requester;
use crate::util::time::parse_time_to_seconds;
@@ -26,14 +27,6 @@ error_chain! {
}
}
// fn has_blacklisted_class(element: &ElementRef, blacklist: &[&str]) -> bool {
// element
// .value()
// .attr("class")
// .map(|classes| classes.split_whitespace().any(|c| blacklist.contains(&c)))
// .unwrap_or(false)
// }
#[derive(Debug, Clone)]
pub struct SxyprnProvider {
url: String,
@@ -97,6 +90,15 @@ impl SxyprnProvider {
Ok(items) => items,
Err(e) => {
println!("Error parsing video items: {}", e);
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("Sxyprn Provider"),
Some(&format!("URL: {}", url_str)),
file!(),
line!(),
module_path!(),
).await;
return Ok(old_items);
}
};
@@ -159,14 +161,16 @@ impl SxyprnProvider {
{
Ok(items) => items,
Err(e) => {
println!("Error parsing video items: {}", e);
let _ = futures::executor::block_on(send_discord_error_report(
&e,
println!("Error parsing video items: {}", e);// 1. Convert the error to a string immediately
send_discord_error_report(
e.to_string(),
Some(format_error_chain(&e)),
Some("Sxyprn Provider"),
Some(format!("Failed to query videos:\nURL: {}\nQuery: {},", url_str, query).as_str()),
Some(&format!("URL: {}", url_str)),
file!(),
line!(),
module_path!(),));
module_path!(),
).await;
return Ok(old_items);
}
};
@@ -223,7 +227,7 @@ impl SxyprnProvider {
let title_parts = video_segment
.split("post_text")
.nth(1)
.and_then(|s| s.split("style=''>").nth(1))
.and_then(|s| s.split("style=''>").nth(100000))
.and_then(|s| s.split("</div>").next())
.ok_or_else(|| ErrorKind::Parse("failed to extract title_parts".into()))?;

4
src/providers/tnaflix.rs
View File

@@ -554,7 +554,7 @@ impl Provider for TnaflixProvider {
}
}
}
fn get_channel(&self, clientversion: ClientVersion) -> crate::status::Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<crate::status::Channel> {
Some(self.build_channel(clientversion))
}
}

4
src/providers/xxdbx.rs
View File

@@ -278,7 +278,7 @@ impl Provider for XxdbxProvider {
}
}
}
fn get_channel(&self, clientversion: ClientVersion) -> crate::status::Channel {
self.build_channel(clientversion)
fn get_channel(&self, clientversion: ClientVersion) -> Option<crate::status::Channel> {
Some(self.build_channel(clientversion))
}
}