diff --git a/src/main.rs b/src/main.rs index 30adf0b..0e54e2a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -131,7 +131,6 @@ async fn main() { let rescanner = Rescanner { is_active: true, database: Database { connection: pool }, - rescan_priority: CONFIG.scanner.rescan_priority, }; rescanner.rescan_database().await; diff --git a/src/scanning/rescanner.rs b/src/scanning/rescanner.rs index 39ae2e9..f61241c 100644 --- a/src/scanning/rescanner.rs +++ b/src/scanning/rescanner.rs @@ -6,19 +6,18 @@ use indicatif::{ProgressBar, ProgressStyle}; use sqlx::{Row, types::ipnet::IpNet}; use crate::{ - config::ServerRescanPriority, database::{Database, ServerUpdateOperation}, protocol::{minecraft::simple_ping, response::MinecraftServer} + CONFIG, config::ServerRescanPriority, database::{Database, ServerUpdateOperation}, protocol::{minecraft::simple_ping, response::MinecraftServer} }; pub struct Rescanner { pub is_active: bool, pub database: Database, - pub rescan_priority: ServerRescanPriority, } impl Rescanner { #[rustfmt::skip] pub async fn rescan_database(&self) { - let stream_order = match self.rescan_priority { + let stream_order = match CONFIG.scanner.rescan_priority { ServerRescanPriority::OldestFirst => "ORDER BY lastseen ASC", ServerRescanPriority::NewestFirst => "ORDER BY lastseen DESC", ServerRescanPriority::LeastPlayers => "ORDER BY online_players ASC",