fixes and cleanup

src/providers/all.rs

@@ -1,18 +1,18 @@
-use std::fs;
-use std::time::Duration;
+use crate::DbPool;
+use crate::api::{ClientVersion, get_provider};
+use crate::providers::{DynProvider, Provider, report_provider_error, run_provider_guarded};
+use crate::status::{Channel, ChannelOption, FilterOption};
+use crate::util::cache::VideoCache;
+use crate::util::interleave;
+use crate::videos::{ServerOptions, VideoItem};
 use async_trait::async_trait;
 use capitalize::Capitalize;
 use cute::c;
 use error_chain::error_chain;
 use futures::StreamExt;
 use futures::stream::FuturesUnordered;
-use crate::api::{get_provider, ClientVersion};
-use crate::providers::{DynProvider, Provider, report_provider_error, run_provider_guarded};
-use crate::status::{Channel, ChannelOption, FilterOption};
-use crate::util::cache::VideoCache;
-use crate::util::interleave;
-use crate::videos::{ServerOptions, VideoItem};
-use crate::DbPool;
+use std::fs;
+use std::time::Duration;
 
 error_chain! {
     foreign_links {
@@ -21,11 +21,9 @@ error_chain! {
     }
 }
 
-
 #[derive(Debug, Clone)]
 #[allow(dead_code)]
-pub struct AllProvider {
-}
+pub struct AllProvider {}
 
 impl AllProvider {
     pub fn new() -> Self {
@@ -81,7 +79,8 @@ impl Provider for AllProvider {
                 None => {
                     // fire-and-forget reporting of missing provider keys
                     tokio::spawn(async move {
-                        report_provider_error("all", "all.get_videos.unknown_provider", &name).await;
+                        report_provider_error("all", "all.get_videos.unknown_provider", &name)
+                            .await;
                     });
                     None
                 }
@@ -128,7 +127,7 @@ impl Provider for AllProvider {
                 },
                 _ = &mut timeout_timer => {
                     // 55 seconds passed. Stop waiting and return what we have.
-                    // The tasks remaining in 'futures' will continue running in the 
+                    // The tasks remaining in 'futures' will continue running in the
                     // background because they were 'tokio::spawn'ed.
                     break;
                 },
@@ -146,10 +145,7 @@ impl Provider for AllProvider {
             .filter_map(|entry| entry.ok())
             .filter_map(|entry| entry.file_name().into_string().ok())
             .filter(|name| name.ends_with(".rs"))
-            .filter(|name| {
-                !name.contains("mod.rs")
-                    && !name.contains("all.rs")
-            })
+            .filter(|name| !name.contains("mod.rs") && !name.contains("all.rs"))
             .map(|name| name.replace(".rs", ""))
             .collect::<Vec<String>>();
         let sites = c![FilterOption {
@@ -166,7 +162,7 @@ impl Provider for AllProvider {
             status: "active".to_string(),
             categories: vec![],
             options: vec![ChannelOption {
-                id: "sites".to_string(),
+                id: "all_provider_sites".to_string(),
                 title: "Sites".to_string(),
                 description: "What Sites to use".to_string(),
                 systemImage: "list.number".to_string(),