cargo auto fix

This commit is contained in:
Simon
2025-08-20 14:02:51 +00:00
parent c135f60894
commit 24e4c5dfd7
13 changed files with 9 additions and 38 deletions

View File

@@ -1,15 +1,11 @@
use std::{fs, vec}; use std::fs;
use error_chain::error_chain; use error_chain::error_chain;
use futures::future::join_all; use futures::future::join_all;
use serde_json::error::Category;
use wreq::Client;
use wreq_util::Emulation;
use crate::api::get_provider; use crate::api::get_provider;
use crate::db;
use crate::providers::{AnyProvider, Provider}; use crate::providers::{AnyProvider, Provider};
use crate::util::cache::VideoCache; use crate::util::cache::VideoCache;
use crate::util::interleave; use crate::util::interleave;
use crate::videos::{self, ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use crate::DbPool; use crate::DbPool;
error_chain! { error_chain! {

View File

@@ -1,7 +1,6 @@
use std::vec; use std::vec;
use error_chain::error_chain; use error_chain::error_chain;
use futures::future::join_all; use futures::future::join_all;
use serde_json::error::Category;
use wreq::Client; use wreq::Client;
use wreq_util::Emulation; use wreq_util::Emulation;
use crate::db; use crate::db;

View File

@@ -1,4 +1,3 @@
use crate::schema::videos::url;
use crate::util::parse_abbreviated_number; use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
@@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use std::env; use std::env;
use std::vec; use std::vec;
@@ -121,7 +119,7 @@ impl HentaimoonProvider {
query: &str, query: &str,
) -> Result<Vec<VideoItem>> { ) -> Result<Vec<VideoItem>> {
let search_string = query.to_lowercase().trim().replace(" ", "-"); let search_string = query.to_lowercase().trim().replace(" ", "-");
let mut video_url = format!("{}/search/{}/?mode=async&function=get_block&block_id=list_videos_videos_list_search_result&q=a&category_ids=&sort_by=&from_videos={}&from_albums={}&", self.url, search_string, page, page); let video_url = format!("{}/search/{}/?mode=async&function=get_block&block_id=list_videos_videos_list_search_result&q=a&category_ids=&sort_by=&from_videos={}&from_albums={}&", self.url, search_string, page, page);
// Check our Video Cache. If the result is younger than 1 hour, we return it. // Check our Video Cache. If the result is younger than 1 hour, we return it.
let old_items = match cache.get(&video_url) { let old_items = match cache.get(&video_url) {
Some((time, items)) => { Some((time, items)) => {

View File

@@ -1,4 +1,3 @@
use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
use crate::util::cache::VideoCache; use crate::util::cache::VideoCache;

View File

@@ -324,7 +324,7 @@ impl MissavProvider {
video_url_parts[6], video_url_parts[6],
video_url_parts[7] video_url_parts[7]
); );
let mut video_item = VideoItem::new( let video_item = VideoItem::new(
id, id,
title, title,
video_url.clone(), video_url.clone(),

View File

@@ -1,5 +1,3 @@
use crate::schema::videos::url;
use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
use crate::util::cache::VideoCache; use crate::util::cache::VideoCache;
@@ -7,7 +5,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use std::env; use std::env;
use std::vec; use std::vec;

View File

@@ -1,4 +1,3 @@
use crate::schema::videos::url;
use crate::util::parse_abbreviated_number; use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
@@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use std::env; use std::env;
use std::vec; use std::vec;

View File

@@ -8,9 +8,7 @@ use wreq::Client;
use wreq_util::Emulation; use wreq_util::Emulation;
use serde::Deserialize; use serde::Deserialize;
use crate::db; use crate::db;
use crate::providers::perverzija;
use crate::providers::Provider; use crate::providers::Provider;
use crate::schema::videos::url;
use crate::util::cache::VideoCache; use crate::util::cache::VideoCache;
use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;

View File

@@ -1,16 +1,11 @@
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
use crate::schema::videos;
use crate::util::cache::VideoCache; use crate::util::cache::VideoCache;
use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::videos::{ServerOptions, VideoItem};
use crate::util::parse_abbreviated_number;
use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoFormat, VideoItem};
use cute::c; use cute::c;
use error_chain::error_chain; use error_chain::error_chain;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::ICodedDataTrait;
use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS}; use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS};
use std::env;
use std::vec; use std::vec;
use wreq::{Client, Proxy}; use wreq::{Client, Proxy};
use wreq_util::Emulation; use wreq_util::Emulation;

View File

@@ -1,4 +1,3 @@
use crate::schema::videos::url;
use crate::util::parse_abbreviated_number; use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
@@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use std::env; use std::env;
use std::vec; use std::vec;

View File

@@ -1,4 +1,3 @@
use crate::schema::videos::url;
use crate::util::parse_abbreviated_number; use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
@@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use std::env; use std::env;
use std::vec; use std::vec;

View File

@@ -1,4 +1,3 @@
use crate::schema::videos::url;
use crate::util::parse_abbreviated_number; use crate::util::parse_abbreviated_number;
use crate::DbPool; use crate::DbPool;
use crate::providers::Provider; use crate::providers::Provider;
@@ -7,12 +6,9 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use serde_json::Value; use serde_json::Value;
use std::env; use std::env;
use std::os::linux::raw;
use std::time::Duration;
use std::vec; use std::vec;
use wreq::{Client, Proxy}; use wreq::{Client, Proxy};
use wreq_util::Emulation; use wreq_util::Emulation;
@@ -191,7 +187,7 @@ impl RedtubeProvider {
let video_listing_content = html.split("<script type=\"application/ld+json\">").collect::<Vec<&str>>()[1].split("</script>").collect::<Vec<&str>>()[0]; let video_listing_content = html.split("<script type=\"application/ld+json\">").collect::<Vec<&str>>()[1].split("</script>").collect::<Vec<&str>>()[0];
let mut videos: Value = serde_json::from_str(video_listing_content).unwrap(); let mut videos: Value = serde_json::from_str(video_listing_content).unwrap();
for vid in videos.as_array_mut().unwrap() { for vid in videos.as_array_mut().unwrap() {
let mut video_url: String = vid["embedUrl"].as_str().unwrap_or("").to_string(); let video_url: String = vid["embedUrl"].as_str().unwrap_or("").to_string();
let mut title: String = vid["name"].as_str().unwrap_or("").to_string(); let mut title: String = vid["name"].as_str().unwrap_or("").to_string();
// html decode // html decode
title = decode(title.as_bytes()).to_string().unwrap_or(title); title = decode(title.as_bytes()).to_string().unwrap_or(title);
@@ -201,7 +197,7 @@ impl RedtubeProvider {
let views: u64 = vid["interactionCount"].as_u64().unwrap_or(0); let views: u64 = vid["interactionCount"].as_u64().unwrap_or(0);
let thumb = vid["thumbnailUrl"].as_str().unwrap_or("").to_string(); let thumb = vid["thumbnailUrl"].as_str().unwrap_or("").to_string();
let mut video_item = VideoItem::new( let video_item = VideoItem::new(
id, id,
title, title,
video_url.to_string(), video_url.to_string(),

View File

@@ -6,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr};
use crate::util::time::parse_time_to_seconds; use crate::util::time::parse_time_to_seconds;
use crate::videos::{ServerOptions, VideoItem}; use crate::videos::{ServerOptions, VideoItem};
use error_chain::error_chain; use error_chain::error_chain;
use futures::stream::SplitSink;
use htmlentity::entity::{ICodedDataTrait, decode}; use htmlentity::entity::{ICodedDataTrait, decode};
use std::env; use std::env;
use std::vec; use std::vec;
@@ -261,7 +260,7 @@ impl Rule34videoProvider {
.to_string(); .to_string();
let mut video_item = VideoItem::new( let video_item = VideoItem::new(
id, id,
title, title,
url.to_string(), url.to_string(),