query bug fix
This commit is contained in:
@@ -68,13 +68,16 @@ impl MissavProvider {
|
|||||||
Ok(video_items)
|
Ok(video_items)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn query(&self, cache: VideoCache, pool:DbPool, page: u8, query: &str, sort: String, options: ServerOptions) -> Result<Vec<VideoItem>> {
|
async fn query(&self, cache: VideoCache, pool:DbPool, page: u8, query: &str, mut sort: String, options: ServerOptions) -> Result<Vec<VideoItem>> {
|
||||||
// Extract needed fields from options at the start
|
// Extract needed fields from options at the start
|
||||||
let language = options.language.clone().unwrap();
|
let language = options.language.clone().unwrap();
|
||||||
let mut requester = options.requester.clone().unwrap();
|
let mut requester = options.requester.clone().unwrap();
|
||||||
let search_string = query.replace(" ", "%20");
|
let search_string = query.replace(" ", "%20");
|
||||||
|
if !sort.is_empty(){
|
||||||
|
sort = format!("&sort={}", sort);
|
||||||
|
}
|
||||||
let url_str = format!(
|
let url_str = format!(
|
||||||
"{}/{}/search/{}?page={}&sort={}",
|
"{}/{}/search/{}?page={}{}",
|
||||||
self.url, language, 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.
|
// Check our Video Cache. If the result is younger than 1 hour, we return it.
|
||||||
@@ -92,7 +95,7 @@ impl MissavProvider {
|
|||||||
vec![]
|
vec![]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let text = requester.get(&url_str, None).await.unwrap();
|
let text = requester.get(&url_str, Some(Version::HTTP_2)).await.unwrap();
|
||||||
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone(), pool, requester).await;
|
let video_items: Vec<VideoItem> = self.get_video_items_from_html(text.clone(), pool, requester).await;
|
||||||
if !video_items.is_empty() {
|
if !video_items.is_empty() {
|
||||||
cache.remove(&url_str);
|
cache.remove(&url_str);
|
||||||
|
|||||||
Reference in New Issue
Block a user