overhault to fix warnings etc

This commit is contained in:
Simon
2025-10-04 14:28:29 +00:00
parent d84cc715a8
commit 28a4c57616
29 changed files with 889 additions and 1338 deletions

View File

@@ -1,8 +1,10 @@
use std::fs;
use async_trait::async_trait;
use error_chain::error_chain;
use futures::future::join_all;
use crate::api::get_provider;
use crate::providers::{AnyProvider, Provider};
use crate::api::{get_provider, ClientVersion};
use crate::providers::{DynProvider, Provider};
use crate::status::Channel;
use crate::util::cache::VideoCache;
use crate::util::interleave;
use crate::videos::{ServerOptions, VideoItem};
@@ -27,6 +29,7 @@ impl AllProvider {
}
}
#[async_trait]
impl Provider for AllProvider {
async fn get_videos(
&self,
@@ -48,11 +51,11 @@ impl Provider for AllProvider {
.collect::<Vec<String>>();
sites_str = providers.join(",");
}
let sites = sites_str
let providers: Vec<DynProvider> = sites_str
.split(',')
.map(|s| s.to_string()) // or s.to_owned()
.collect::<Vec<String>>();
let providers = sites.iter().map(|el| get_provider(el.as_str()).unwrap()).collect::<Vec<AnyProvider>>();
.filter(|s| !s.is_empty())
.filter_map(|s| get_provider(s)) // assumes get_provider -> Option<DynProvider>
.collect();
let futures = providers.iter().map(|provider| {
provider.get_videos(
@@ -71,4 +74,12 @@ impl Provider for AllProvider {
return video_items;
}
fn get_channel(&self,clientversion:ClientVersion) -> Channel {
println!("Getting channel for placeholder with client version: {:?}",clientversion);
let _ = clientversion;
Channel {
id:"placeholder".to_string(),name:"PLACEHOLDER".to_string(),description:"PLACEHOLDER FOR PARENT CLASS".to_string(),premium:false,favicon:"https://www.google.com/s2/favicons?sz=64&domain=missav.ws".to_string(),status:"active".to_string(),categories:vec![],options:vec![],nsfw:true,cacheDuration:None,
}
}
}