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

now safes the cookies for the requester

Browse Source
This commit is contained in:
Simon
2025-08-21 10:18:06 +00:00
parent c05991ee23
commit 59d30695e9
8 changed files with 465 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/api.rs
View File

@@ -16,6 +16,7 @@ use crate::providers::redtube::RedtubeProvider;
use crate::providers::rule34video::Rule34videoProvider;
use crate::providers::spankbang::SpankbangProvider;
use crate::util::cache::VideoCache;
use crate::util::requester::Requester;
use crate::{db, providers::*, status::*, videos::*, DbPool};
use cute::c;
@@ -862,8 +863,9 @@ async fn videos_post(
video_request: web::types::Json<VideosRequest>,
cache: web::types::State<VideoCache>,
pool: web::types::State<DbPool>,
requester: web::types::State<Requester>,
) -> Result<impl web::Responder, web::Error> {
let requester = requester.get_ref().clone();
let mut conn = pool.get().expect("couldn't get db connection from pool");
// Ensure "videos" table exists with two string columns
if !(db::has_table(&mut conn, "videos").unwrap()){
@@ -928,7 +930,7 @@ async fn videos_post(
.as_deref()
.unwrap_or("en")
.to_string();
let options = ServerOptions { featured: Some(featured), category: Some(category), sites: Some(sites), filter: Some(filter), language: Some(language) };
let options = ServerOptions { featured: Some(featured), category: Some(category), sites: Some(sites), filter: Some(filter), language: Some(language), requester: Some(requester) };
let video_items = provider
.get_videos(
cache.get_ref().clone(),

3
src/main.rs
View File

@@ -38,6 +38,8 @@ async fn main() -> std::io::Result<()> {
.build(manager)
.expect("Failed to create pool.");
let requester = util::requester::Requester::new();
let cache: util::cache::VideoCache = crate::util::cache::VideoCache::new();
@@ -46,6 +48,7 @@ async fn main() -> std::io::Result<()> {
web::App::new()
.state(pool.clone())
.state(cache.clone())
.state(requester.clone())
.wrap(web::middleware::Logger::default())
.service(web::scope("/api").configure(api::config))
.service(

38
src/providers/missav.rs
View File

@@ -10,6 +10,7 @@ use crate::db;
use crate::providers::Provider;
use crate::util::cache::VideoCache;
use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::requester;
use crate::videos::ServerOptions;
use crate::videos::{VideoItem};
use crate::DbPool;
@@ -27,20 +28,21 @@ error_chain! {
#[derive(Debug, Clone)]
pub struct MissavProvider {
url: String,
requester: Requester,
}
impl MissavProvider {
pub fn new() -> Self {
let mut requester = Requester::new();
requester.set_proxy(true);
MissavProvider {
url: "https://missav.ws".to_string(),
requester
url: "https://missav.ws".to_string()
}
}
async fn get(&self, cache:VideoCache, pool:DbPool, page: u8, sort: String, options: ServerOptions) -> Result<Vec<VideoItem>> {
let url_str = format!("{}/{}/{}?page={}&sort={}", self.url, options.language.unwrap(), options.filter.unwrap(), page, sort);
// Extract needed fields from options at the start
let language = options.language.clone().unwrap();
let filter = options.filter.clone().unwrap();
let requester = options.requester.clone().unwrap();
let url_str = format!("{}/{}/{}?page={}&sort={}", self.url, language, filter, page, sort);
let old_items = match cache.get(&url_str) {
Some((time, items)) => {
@@ -56,9 +58,9 @@ impl MissavProvider {
}
};
let text = self.requester.get(&url_str).await.unwrap();
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone(), pool).await;
let text = requester.get(&url_str).await.unwrap();
// Pass a reference to options if needed, or reconstruct as needed
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone(), pool, requester).await;
if !video_items.is_empty() {
cache.remove(&url_str);
cache.insert(url_str.clone(), video_items.clone());
@@ -69,10 +71,14 @@ impl MissavProvider {
}
async fn query(&self, cache: VideoCache, pool:DbPool, page: u8, query: &str, sort: String, options: ServerOptions) -> Result<Vec<VideoItem>> {
// Extract needed fields from options at the start
let language = options.language.clone().unwrap();
let filter = options.filter.clone().unwrap();
let requester = options.requester.clone().unwrap();
let search_string = query.replace(" ", "%20");
let url_str = format!(
"{}/{}/search/{}?page={}&sort={}",
self.url, options.language.unwrap(), search_string, page, sort
self.url, language, search_string, page, sort
);
// Check our Video Cache. If the result is younger than 1 hour, we return it.
let old_items = match cache.get(&url_str) {
@@ -89,8 +95,8 @@ impl MissavProvider {
vec![]
}
};
let text = self.requester.get(&url_str).await.unwrap();
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone(), pool).await;
let text = requester.get(&url_str).await.unwrap();
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone(), pool, requester).await;
if !video_items.is_empty() {
cache.remove(&url_str);
cache.insert(url_str.clone(), video_items.clone());
@@ -100,7 +106,7 @@ impl MissavProvider {
Ok(video_items)
}
async fn get_video_items_from_html(&self, html: String, pool: DbPool) -> Vec<VideoItem> {
async fn get_video_items_from_html(&self, html: String, pool: DbPool, requester: Requester) -> Vec<VideoItem> {
if html.is_empty() {
println!("HTML is empty");
return vec![];
@@ -123,7 +129,7 @@ impl MissavProvider {
urls.push(url_str.clone());
}
let futures = urls.into_iter().map(|el| self.get_video_item(el.clone(), pool.clone()));
let futures = urls.into_iter().map(|el| self.get_video_item(el.clone(), pool.clone(), requester.clone()));
let results: Vec<Result<VideoItem>> = join_all(futures).await;
let video_items: Vec<VideoItem> = results
.into_iter()
@@ -133,7 +139,7 @@ impl MissavProvider {
return video_items;
}
async fn get_video_item(&self, url_str: String, pool: DbPool) -> Result<VideoItem> {
async fn get_video_item(&self, url_str: String, pool: DbPool, requester: Requester) -> Result<VideoItem> {
let mut conn = pool.get().expect("couldn't get db connection from pool");
let db_result = db::get_video(&mut conn,url_str.clone());
match db_result {
@@ -148,7 +154,7 @@ impl MissavProvider {
}
}
drop(conn);
let vid = self.requester.get(&url_str).await.unwrap();
let vid = requester.get(&url_str).await.unwrap();
let mut title = vid.split("<meta property=\"og:title\" content=\"").collect::<Vec<&str>>()[1]
.split("\"")
.collect::<Vec<&str>>()[0].trim()

8
src/providers/pornhat.rs
View File

@@ -196,10 +196,10 @@ impl PornhatProvider {
.collect::<Vec<&str>>()[1..]
.to_vec();
for video_segment in &raw_videos {
let vid = video_segment.split("\n").collect::<Vec<&str>>();
for (index, line) in vid.iter().enumerate() {
println!("Line {}: {}", index, line);
}
// let vid = video_segment.split("\n").collect::<Vec<&str>>();
// for (index, line) in vid.iter().enumerate() {
// println!("Line {}: {}", index, line);
// }
let video_url: String = format!("{}{}", self.url, video_segment.split("<a href=\"").collect::<Vec<&str>>()[1]
.split("\"")
.collect::<Vec<&str>>()[0]);

3
src/util/requester.rs
View File

@@ -9,8 +9,9 @@ use std::env;
use crate::util::flaresolverr::FlareSolverrRequest;
use crate::util::flaresolverr::Flaresolverr;
#[derive(Debug, Clone)]
#[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
pub struct Requester {
#[serde(skip)]
client: Client,
proxy: bool,
flaresolverr_session: Option<String>,

3
src/videos.rs
View File

@@ -1,5 +1,7 @@
use std::collections::HashMap;
use crate::util::requester::Requester;
#[derive(serde::Serialize, serde::Deserialize, Debug)]
@@ -39,6 +41,7 @@ pub struct ServerOptions{
pub sites: Option<String>, //
pub filter: Option<String>,
pub language: Option<String>, // "en"
pub requester: Option<Requester>
}
#[derive(serde::Serialize, Debug)]