fixes and cleanup

This commit is contained in:
Simon
2026-03-05 18:18:48 +00:00
parent 76fd5a4f4f
commit 2627505ade
49 changed files with 3245 additions and 1376 deletions

View File

@@ -1,14 +1,14 @@
use crate::api::ClientVersion;
use crate::DbPool;
use crate::api::ClientVersion;
use crate::providers::Provider;
use crate::status::*;
use crate::util::cache::VideoCache;
use crate::util::requester::Requester;
use crate::videos::VideoItem;
use crate::videos::ServerOptions;
use crate::videos::VideoItem;
use async_trait::async_trait;
use error_chain::error_chain;
use htmlentity::entity::{ICodedDataTrait, decode};
use async_trait::async_trait;
error_chain! {
foreign_links {
@@ -35,7 +35,8 @@ impl ParadisehillProvider {
name: "Paradisehill".to_string(),
description: "Porn Movies on Paradise Hill".to_string(),
premium: false,
favicon: "https://www.google.com/s2/favicons?sz=64&domain=en.paradisehill.cc".to_string(),
favicon: "https://www.google.com/s2/favicons?sz=64&domain=en.paradisehill.cc"
.to_string(),
status: "active".to_string(),
categories: vec![],
options: vec![],
@@ -49,7 +50,8 @@ impl ParadisehillProvider {
page: u8,
options: ServerOptions,
) -> Result<Vec<VideoItem>> {
let mut requester = crate::providers::requester_or_default(&options, module_path!(), "missing_requester");
let mut requester =
crate::providers::requester_or_default(&options, module_path!(), "missing_requester");
let url_str = format!("{}/all/?sort=created_at&page={}", self.url, page);
@@ -99,7 +101,8 @@ impl ParadisehillProvider {
options: ServerOptions,
) -> Result<Vec<VideoItem>> {
// Extract needed fields from options at the start
let mut requester = crate::providers::requester_or_default(&options, module_path!(), "missing_requester");
let mut requester =
crate::providers::requester_or_default(&options, module_path!(), "missing_requester");
let search_string = query.replace(" ", "+");
let url_str = format!(
"{}/search/?pattern={}&page={}",
@@ -200,7 +203,11 @@ impl ParadisehillProvider {
.unwrap_or_default()
.trim()
.to_string();
let tags = if genre.is_empty() { vec![] } else { vec![genre] };
let tags = if genre.is_empty() {
vec![]
} else {
vec![genre]
};
items.push(
VideoItem::new(id, title, video_url, "paradisehill".to_string(), thumb, 0)
@@ -211,7 +218,6 @@ impl ParadisehillProvider {
items
}
}
#[async_trait]