diff --git a/src/providers/all.rs b/src/providers/all.rs index 2d8cb9e..09bddd4 100644 --- a/src/providers/all.rs +++ b/src/providers/all.rs @@ -1,15 +1,11 @@ -use std::{fs, vec}; +use std::fs; use error_chain::error_chain; use futures::future::join_all; -use serde_json::error::Category; -use wreq::Client; -use wreq_util::Emulation; use crate::api::get_provider; -use crate::db; use crate::providers::{AnyProvider, Provider}; use crate::util::cache::VideoCache; use crate::util::interleave; -use crate::videos::{self, ServerOptions, VideoItem}; +use crate::videos::{ServerOptions, VideoItem}; use crate::DbPool; error_chain! { diff --git a/src/providers/hanime.rs b/src/providers/hanime.rs index 53b5b93..5634603 100644 --- a/src/providers/hanime.rs +++ b/src/providers/hanime.rs @@ -1,7 +1,6 @@ use std::vec; use error_chain::error_chain; use futures::future::join_all; -use serde_json::error::Category; use wreq::Client; use wreq_util::Emulation; use crate::db; diff --git a/src/providers/hentaimoon.rs b/src/providers/hentaimoon.rs index 2b504d6..4ac9bb0 100644 --- a/src/providers/hentaimoon.rs +++ b/src/providers/hentaimoon.rs @@ -1,4 +1,3 @@ -use crate::schema::videos::url; use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; @@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use std::env; use std::vec; @@ -121,7 +119,7 @@ impl HentaimoonProvider { query: &str, ) -> Result> { 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. let old_items = match cache.get(&video_url) { Some((time, items)) => { diff --git a/src/providers/homoxxx.rs b/src/providers/homoxxx.rs index 647be4f..095abc4 100644 --- a/src/providers/homoxxx.rs +++ b/src/providers/homoxxx.rs @@ -1,4 +1,3 @@ -use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; use crate::util::cache::VideoCache; diff --git a/src/providers/missav.rs b/src/providers/missav.rs index 944bf0d..3247a53 100644 --- a/src/providers/missav.rs +++ b/src/providers/missav.rs @@ -324,7 +324,7 @@ impl MissavProvider { video_url_parts[6], video_url_parts[7] ); - let mut video_item = VideoItem::new( + let video_item = VideoItem::new( id, title, video_url.clone(), diff --git a/src/providers/okporn.rs b/src/providers/okporn.rs index 59b16e2..7b8566d 100644 --- a/src/providers/okporn.rs +++ b/src/providers/okporn.rs @@ -1,5 +1,3 @@ -use crate::schema::videos::url; -use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; 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::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use std::env; use std::vec; diff --git a/src/providers/perfectgirls.rs b/src/providers/perfectgirls.rs index 68b7179..af2a5d5 100644 --- a/src/providers/perfectgirls.rs +++ b/src/providers/perfectgirls.rs @@ -1,4 +1,3 @@ -use crate::schema::videos::url; use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; @@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use std::env; use std::vec; diff --git a/src/providers/perverzija.rs b/src/providers/perverzija.rs index 9d2322c..0f35e18 100644 --- a/src/providers/perverzija.rs +++ b/src/providers/perverzija.rs @@ -8,9 +8,7 @@ use wreq::Client; use wreq_util::Emulation; use serde::Deserialize; use crate::db; -use crate::providers::perverzija; use crate::providers::Provider; -use crate::schema::videos::url; use crate::util::cache::VideoCache; use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; diff --git a/src/providers/pmvhaven.rs b/src/providers/pmvhaven.rs index 26ad964..9833617 100644 --- a/src/providers/pmvhaven.rs +++ b/src/providers/pmvhaven.rs @@ -1,16 +1,11 @@ use crate::DbPool; use crate::providers::Provider; -use crate::schema::videos; use crate::util::cache::VideoCache; -use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; -use crate::util::parse_abbreviated_number; -use crate::util::time::parse_time_to_seconds; -use crate::videos::{ServerOptions, VideoFormat, VideoItem}; +use crate::videos::{ServerOptions, VideoItem}; use cute::c; use error_chain::error_chain; -use htmlentity::entity::{ICodedDataTrait, decode}; +use htmlentity::entity::ICodedDataTrait; use percent_encoding::{utf8_percent_encode, AsciiSet, CONTROLS}; -use std::env; use std::vec; use wreq::{Client, Proxy}; use wreq_util::Emulation; diff --git a/src/providers/pornhat.rs b/src/providers/pornhat.rs index 0bce986..03407bb 100644 --- a/src/providers/pornhat.rs +++ b/src/providers/pornhat.rs @@ -1,4 +1,3 @@ -use crate::schema::videos::url; use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; @@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use std::env; use std::vec; diff --git a/src/providers/pornhub.rs b/src/providers/pornhub.rs index 7de3452..a5633f0 100644 --- a/src/providers/pornhub.rs +++ b/src/providers/pornhub.rs @@ -1,4 +1,3 @@ -use crate::schema::videos::url; use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; @@ -7,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use std::env; use std::vec; diff --git a/src/providers/redtube.rs b/src/providers/redtube.rs index d662e63..5715f59 100644 --- a/src/providers/redtube.rs +++ b/src/providers/redtube.rs @@ -1,4 +1,3 @@ -use crate::schema::videos::url; use crate::util::parse_abbreviated_number; use crate::DbPool; use crate::providers::Provider; @@ -7,12 +6,9 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use serde_json::Value; use std::env; -use std::os::linux::raw; -use std::time::Duration; use std::vec; use wreq::{Client, Proxy}; use wreq_util::Emulation; @@ -191,7 +187,7 @@ impl RedtubeProvider { let video_listing_content = html.split("").collect::>()[0]; let mut videos: Value = serde_json::from_str(video_listing_content).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(); // html decode 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 thumb = vid["thumbnailUrl"].as_str().unwrap_or("").to_string(); - let mut video_item = VideoItem::new( + let video_item = VideoItem::new( id, title, video_url.to_string(), diff --git a/src/providers/rule34video.rs b/src/providers/rule34video.rs index b120cfc..c735875 100644 --- a/src/providers/rule34video.rs +++ b/src/providers/rule34video.rs @@ -6,7 +6,6 @@ use crate::util::flaresolverr::{FlareSolverrRequest, Flaresolverr}; use crate::util::time::parse_time_to_seconds; use crate::videos::{ServerOptions, VideoItem}; use error_chain::error_chain; -use futures::stream::SplitSink; use htmlentity::entity::{ICodedDataTrait, decode}; use std::env; use std::vec; @@ -261,7 +260,7 @@ impl Rule34videoProvider { .to_string(); - let mut video_item = VideoItem::new( + let video_item = VideoItem::new( id, title, url.to_string(),