Cleaned up project structure

.gitea/workflows/test.yaml

@@ -0,0 +1,11 @@
+name: Rust
+
+on: [push, pull_request]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions-rust-lang/setup-rust-toolchain@v1
+      - run: cargo test --all-features

Cargo.lock

@@ -245,6 +245,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -3192,6 +3203,7 @@ dependencies = [
 name = "teachertracker-rs"
 version = "0.1.4"
 dependencies = [
+ "async-trait",
  "chrono",
  "clap",
  "futures",

Cargo.toml

@@ -27,3 +27,4 @@ thiserror = "2.0.12"
 tokio = { version = "1.46.1", features = ["rt"] }
 tracing = { version = "0.1.41", default-features = false, features = ["std"] }
 tracing-subscriber = "0.3.19"
+async-trait = "0.1.79"

idea.md

@@ -1 +0,0 @@
-https://dancing.thasky.one/api.php?action=query&format=json&list=querypage&formatversion=2&qppage=Wantedpages

src/fetching/mod.rs

@@ -0,0 +1,39 @@
+use crate::dance_info::DanceInfo;
+use crate::fetching::types::DanceInfoError;
+
+mod scoringdance;
+mod worldsdc;
+pub mod types;
+
+use async_trait::async_trait;
+use std::sync::Arc;
+
+#[async_trait]
+pub trait WsdcFetcher: Send + Sync {
+    async fn fetch(&self, id: u32) -> Result<DanceInfo, DanceInfoError>;
+}
+
+pub struct WorldsdcFetcher;
+pub struct ScoringDanceFetcher;
+
+#[async_trait]
+impl WsdcFetcher for WorldsdcFetcher {
+    async fn fetch(&self, id: u32) -> Result<DanceInfo, DanceInfoError> {
+        worldsdc::fetch_wsdc_info_wsdc(id).await
+    }
+}
+
+#[async_trait]
+impl WsdcFetcher for ScoringDanceFetcher {
+    async fn fetch(&self, id: u32) -> Result<DanceInfo, DanceInfoError> {
+        scoringdance::fetch_wsdc_info_scoring_dance(id).await
+    }
+}
+
+/// Convenience alias for a shared, dynamic fetcher
+pub type DynWsdcFetcher = Arc<dyn WsdcFetcher>;
+
+/// Back-compat helper that uses the `WorldsdcFetcher`.
+pub async fn fetch_wsdc_info(id: u32) -> Result<DanceInfo, DanceInfoError> {
+    WorldsdcFetcher.fetch(id).await
+}

src/fetching/scoringdance.rs

@@ -6,7 +6,7 @@ use scraper::{ElementRef, Html, Selector};
 use crate::{
     app_signature,
     dance_info::{CompState, DanceInfo, DanceRank, DanceRole},
-    worldsdc::DanceInfoError,
+    fetching::DanceInfoError,
 };
 #[derive(thiserror::Error, Debug)]
 pub enum ScoringParseError {
@@ -180,7 +180,7 @@ fn parse_info(html: &str) -> Result<DanceInfo, ScoringParseError> {
 
 #[test]
 fn test_parse_table() {
-    dbg!(parse_info(include_str!("../../robert-2026-01-07.html")));
+    dbg!(parse_info(include_str!("../../test_data/2026-01-07_robert.html")));
 }
 
 pub async fn fetch_wsdc_info_scoring_dance(id: u32) -> Result<DanceInfo, DanceInfoError> {

src/fetching/types.rs

@@ -0,0 +1,67 @@
+use crate::dance_info::{CompState, DanceInfo, DanceRank, DanceRole};
+
+#[derive(thiserror::Error, Debug)]
+pub enum DanceInfoError {
+    #[error("Failed to build client: {0}")]
+    ClientBuild(reqwest::Error),
+    #[error("Failed to build request: {0}")]
+    RequestBuild(reqwest::Error),
+    #[error("Request error: {0:#?}")]
+    Request(reqwest::Error),
+    #[error("Failed to parse response: {0}")]
+    JsonParse(reqwest::Error),
+    #[error("Failed to parse html: {0}")]
+    HtmlParse(#[from] super::scoringdance::ScoringParseError),
+}
+
+#[derive(serde::Deserialize, Debug)]
+enum OptionalDanceRank {
+    #[serde(rename = "N/A")]
+    NotAvailable,
+    #[serde(untagged)]
+    Rank(DanceRank),
+}
+
+#[derive(serde::Deserialize, Debug)]
+enum OptionalDancePoints {
+    #[serde(rename = "N/A")]
+    NotAvailable,
+    #[serde(untagged)]
+    Points(u16),
+}
+
+#[derive(serde::Deserialize, Debug)]
+pub struct DanceInfoParser {
+    pub dancer_first: String,
+    pub dancer_last: String,
+    pub short_dominate_role: DanceRole,
+    #[allow(dead_code)]
+    pub short_non_dominate_role: DanceRole,
+    pub dominate_role_highest_level_points: u16,
+    pub dominate_role_highest_level: DanceRank,
+    pub non_dominate_role_highest_level_points: OptionalDancePoints,
+    pub non_dominate_role_highest_level: OptionalDanceRank,
+}
+
+impl From<DanceInfoParser> for DanceInfo {
+    fn from(value: DanceInfoParser) -> Self {
+        let non_dominant_role_comp = if let OptionalDanceRank::Rank(r) =
+            value.non_dominate_role_highest_level
+            && let OptionalDancePoints::Points(l) = value.non_dominate_role_highest_level_points
+        {
+            Some(CompState { rank: r, points: l })
+        } else {
+            None
+        };
+        Self {
+            firstname: value.dancer_first,
+            lastname: value.dancer_last,
+            dominant_role: value.short_dominate_role,
+            dominant_role_comp: CompState {
+                rank: value.dominate_role_highest_level,
+                points: value.dominate_role_highest_level_points,
+            },
+            non_dominant_role_comp,
+        }
+    }
+}

src/fetching/worldsdc.rs

@@ -0,0 +1,61 @@
+use std::collections::HashMap;
+
+use crate::{
+    app_signature,
+    dance_info::{CompState, DanceInfo, DanceRank, DanceRole},
+    fetching::{DanceInfoError, types::DanceInfoParser, scoringdance::{self, fetch_wsdc_info_scoring_dance}},
+};
+use reqwest::ClientBuilder;
+
+pub async fn fetch_wsdc_info_wsdc(id: u32) -> Result<DanceInfo, DanceInfoError> {
+    let client = ClientBuilder::new()
+        .user_agent(app_signature())
+        .build()
+        .map_err(DanceInfoError::ClientBuild)?;
+
+    let mut params = HashMap::new();
+
+    let url = if cfg!(test) {
+        // "https://o5grQU3Y.free.beeceptor.com/lookup2020/find"
+        "http://localhost:8000"
+    } else {
+        "https://points.worldsdc.com/lookup2020/find"
+    };
+    params.insert("num", id.to_string());
+    let request = client
+        .request(reqwest::Method::POST, url)
+        .form(&params)
+        .build()
+        .map_err(DanceInfoError::RequestBuild)?;
+    let response = client
+        .execute(request)
+        .await
+        .map_err(DanceInfoError::Request)?;
+
+    let x: DanceInfoParser = response.json().await.map_err(DanceInfoError::JsonParse)?;
+    Ok(x.into())
+}
+
+#[cfg(test)]
+mod tests {
+    #![allow(clippy::unwrap_used, reason = "Allow unwrap in tests")]
+    use crate::fetching::fetch_wsdc_info;
+
+    #[test]
+    #[ignore = "Only run when the mock api is setup"]
+    fn test_fetch_wsdc() {
+        let rt = match tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+        {
+            Ok(o) => o,
+            Err(e) => {
+                tracing::error!("Could not start runtime: {e}");
+                return;
+            }
+        };
+        let x = rt.block_on(fetch_wsdc_info(7));
+        dbg!(&x);
+        x.unwrap();
+    }
+}

src/main.rs

@@ -27,13 +27,14 @@ use tracing::level_filters::LevelFilter;
 use tracing_subscriber::{Layer, layer::SubscriberExt, util::SubscriberInitExt};
 
 use crate::watchdog::{update_wanted_ids, watch_wanted};
+use crate::fetching::{DynWsdcFetcher, WorldsdcFetcher, ScoringDanceFetcher};
 
 mod dance_info;
+mod fetching;
 mod updater;
 mod watchdog;
 mod wikiinfo;
 mod wikipage;
-mod worldsdc;
 
 #[allow(dead_code)]
 #[allow(clippy::print_stdout, reason = "We want to print here")]
@@ -107,11 +108,22 @@ fn init_sentry() -> Option<sentry::ClientInitGuard> {
 use clap::{Parser, Subcommand};
 
 #[derive(Parser)]
-#[command(name = "myapp")]
+#[command(name = "teachertracking")]
-#[command(about = "A simple CLI app with subcommands", long_about = None)]
+#[command(about = "MediaWiki Bot to keep West Coast Swing Teacher Scores updated", long_about = None)]
 struct Cli {
     #[command(subcommand)]
     command: Option<Commands>,
+
+    #[clap(value_enum)]
+    #[arg(default_value_t)]
+    backend: WsdcPointsBackend,
+}
+
+#[derive(clap::ValueEnum, Debug, Clone, Default)]
+enum WsdcPointsBackend {
+    ScoringDance,
+    #[default]
+    WorldSDC,
 }
 
 #[derive(Subcommand)]
@@ -132,10 +144,16 @@ fn main() -> Result<(), AppError> {
 
     let bot = rt.block_on(Bot::from_path(Path::new("./mwbot.toml")))?;
 
+    // Build a dynamic fetcher based on CLI selection
+    let fetcher: DynWsdcFetcher = match cli.backend {
+        WsdcPointsBackend::ScoringDance => std::sync::Arc::new(ScoringDanceFetcher {}),
+        WsdcPointsBackend::WorldSDC => std::sync::Arc::new(WorldsdcFetcher {}),
+    };
+
     match &cli.command {
         Some(Commands::Missing) => {
             rt.block_on(async {
-                let wanted = wikiinfo::wanted_ids(bot.clone()).await;
+                let wanted = wikiinfo::wanted_ids(bot.clone(), fetcher.clone()).await;
                 tracing::info!(
                     "Missing ids: {}",
                     wanted
@@ -145,7 +163,7 @@ fn main() -> Result<(), AppError> {
                         .collect::<Vec<_>>()
                         .join("\n")
                 );
-                update_wanted_ids(&wanted, &[]).await;
+                update_wanted_ids(&wanted, &[], fetcher.clone()).await;
             });
 
             return Ok(());
@@ -156,7 +174,7 @@ fn main() -> Result<(), AppError> {
                 reason = "This is a false positive I think, I just want to loop infinitely on two futures"
             )]
             rt.block_on(async {
-                futures::join!(watch_wanted(bot.clone()), updater::update_wsdc(bot))
+                futures::join!(watch_wanted(bot.clone(), fetcher.clone()), updater::update_wsdc(bot, fetcher.clone()))
             });
         }
     }

src/updater.rs

@@ -5,32 +5,38 @@ use rand::seq::SliceRandom as _;
 use tokio::time::sleep;
 
 use crate::{watchdog::generate_page, wikiinfo::index_wsdc_ids};
+use crate::fetching::DynWsdcFetcher;
 
-pub async fn update_wsdc(bot: Bot) -> ! {
+pub async fn update_wsdc(bot: Bot, fetcher: DynWsdcFetcher) -> ! {
     loop {
-        update_all_teachers(&bot).await;
+        update_all_teachers(&bot, fetcher.clone()).await;
     }
 }
 
 /// Updates all teachers once
-async fn update_all_teachers(bot: &Bot) {
+async fn update_all_teachers(bot: &Bot, fetcher: DynWsdcFetcher) {
-    let mut l = index_wsdc_ids(bot).await;
+    let mut l = index_wsdc_ids(bot, fetcher.clone()).await;
     l.shuffle(&mut rand::rng());
     tracing::info!("We have to update {} pages", l.len());
     let wait_duration = Duration::from_hours(6);
 
     for (index, page) in l {
-        process_page(wait_duration, index, page).await;
+        process_page(wait_duration, index, page, fetcher.clone()).await;
     }
     tracing::info!("Updates all pages");
 }
 
-#[tracing::instrument(skip(page, wait_duration))]
+#[tracing::instrument(skip(page, wait_duration, fetcher))]
-async fn process_page(wait_duration: Duration, index: u32, page: mwbot::Page) {
+async fn process_page(
+    wait_duration: Duration,
+    index: u32,
+    page: mwbot::Page,
+    fetcher: DynWsdcFetcher,
+) {
     tracing::info!("Next up");
     sleep(wait_duration).await;
 
-    match generate_page(index, page).await {
+    match generate_page(index, page, fetcher).await {
         Ok(()) => (),
         Err(err) => {
             tracing::error!("Error updating: {err}");

src/watchdog.rs

@@ -2,8 +2,9 @@ use std::time::Duration;
 
 use crate::app_signature;
 use crate::wikipage::InfoCompileError;
-use crate::worldsdc::DanceInfoError;
+use crate::fetching::types::DanceInfoError;
-use crate::{wikiinfo::wanted_ids, wikipage::page_from_info, worldsdc::fetch_wsdc_info};
+use crate::{wikiinfo::wanted_ids, wikipage::page_from_info};
+use crate::fetching::DynWsdcFetcher;
 use mwbot::SaveOptions;
 use mwbot::{Bot, Page};
 
@@ -31,27 +32,31 @@ impl Ticker {
 
 /// Continuously monitors teacher IDs that do not have a corresponding teacher WSDC page, ignoring those that fail processing.
 #[tracing::instrument(skip_all)]
-pub async fn watch_wanted(bot: Bot) -> ! {
+pub async fn watch_wanted(bot: Bot, fetcher: DynWsdcFetcher) -> ! {
     let mut ignored_ids = vec![];
     let mut heartbeat_ticker = Ticker::new(120);
     loop {
         if heartbeat_ticker.tick() {
             tracing::info!(failed_id_count = ignored_ids.len(), "Watchdog check...");
         }
-        let wanted = wanted_ids(bot.clone()).await;
+        let wanted = wanted_ids(bot.clone(), fetcher.clone()).await;
-        let new_ignored = update_wanted_ids(&wanted, &ignored_ids).await;
+        let new_ignored = update_wanted_ids(&wanted, &ignored_ids, fetcher.clone()).await;
         ignored_ids.extend(new_ignored);
         tokio::time::sleep(Duration::from_secs(30)).await;
     }
 }
 
-pub async fn update_wanted_ids(wanted: &[(u32, Page)], ignored_ids: &[u32]) -> Vec<u32> {
+pub async fn update_wanted_ids(
+    wanted: &[(u32, Page)],
+    ignored_ids: &[u32],
+    fetcher: DynWsdcFetcher,
+) -> Vec<u32> {
     let mut new_ignored = vec![];
 
     for (id, page) in wanted.iter().filter(|(x, _)| !ignored_ids.contains(x)) {
         let span = tracing::info_span!("update", id);
         let _enter = span.enter();
-        if let Err(e) = generate_page(*id, page.clone()).await {
+        if let Err(e) = generate_page(*id, page.clone(), fetcher.clone()).await {
             tracing::error!("{e}");
             new_ignored.push(*id);
         }
@@ -71,9 +76,13 @@ pub enum GeneratePageError {
     Save(#[from] mwbot::Error),
 }
 
-pub async fn generate_page(id: u32, page: mwbot::Page) -> Result<(), GeneratePageError> {
+pub async fn generate_page(
+    id: u32,
+    page: mwbot::Page,
+    fetcher: DynWsdcFetcher,
+) -> Result<(), GeneratePageError> {
     tracing::info!("Generating page for {id}");
-    let info = fetch_wsdc_info(id).await?;
+    let info = fetcher.fetch(id).await?;
 
     let code = page_from_info(info)?;
 

src/wikiinfo.rs

@@ -2,9 +2,10 @@ use mwbot::{
     Bot, Page,
     generators::{Generator, querypage::QueryPage, search::Search},
 };
+use crate::fetching::DynWsdcFetcher;
 
-pub async fn wanted_ids(bot: Bot) -> Vec<(u32, Page)> {
+pub async fn wanted_ids(_bot: Bot, _fetcher: DynWsdcFetcher) -> Vec<(u32, Page)> {
-    let mut gene = QueryPage::new("Wantedpages").generate(&bot);
+    let mut gene = QueryPage::new("Wantedpages").generate(&_bot);
     let mut result = vec![];
     while let Some(x) = gene.recv().await {
         let p = match x {
@@ -63,7 +64,7 @@ fn parse_wsdc_page_name(name: &str) -> Result<u32, TitleParseError> {
 // }
 
 #[allow(dead_code)]
-pub async fn index_wsdc_ids(bot: &Bot) -> Vec<(u32, Page)> {
+pub async fn index_wsdc_ids(bot: &Bot, _fetcher: DynWsdcFetcher) -> Vec<(u32, Page)> {
     let mut gene = Search::new("WSDC/").generate(bot);
     let mut result = vec![];
     while let Some(x) = gene.recv().await {

src/worldsdc/mod.rs

@@ -1,133 +0,0 @@
-use std::collections::HashMap;
-
-use crate::{
-    app_signature,
-    dance_info::{CompState, DanceInfo, DanceRank, DanceRole},
-    worldsdc::scoringdance::fetch_wsdc_info_scoring_dance,
-};
-use reqwest::ClientBuilder;
-mod scoringdance;
-
-pub async fn fetch_wsdc_info_wsdc(id: u32) -> Result<DanceInfo, DanceInfoError> {
-    let client = ClientBuilder::new()
-        .user_agent(app_signature())
-        .build()
-        .map_err(DanceInfoError::ClientBuild)?;
-
-    let mut params = HashMap::new();
-
-    let url = if cfg!(test) {
-        // "https://o5grQU3Y.free.beeceptor.com/lookup2020/find"
-        "http://localhost:8000"
-    } else {
-        "https://points.worldsdc.com/lookup2020/find"
-    };
-    params.insert("num", id.to_string());
-    let request = client
-        .request(reqwest::Method::POST, url)
-        .form(&params)
-        .build()
-        .map_err(DanceInfoError::RequestBuild)?;
-    let response = client
-        .execute(request)
-        .await
-        .map_err(DanceInfoError::Request)?;
-
-    let x: DanceInfoParser = response.json().await.map_err(DanceInfoError::JsonParse)?;
-    Ok(x.into())
-}
-
-pub async fn fetch_wsdc_info(id: u32) -> Result<DanceInfo, DanceInfoError> {
-    // fetch_wsdc_info_scoring_dance(id).await
-    fetch_wsdc_info_wsdc(id).await
-}
-
-#[cfg(test)]
-mod tests {
-    #![allow(clippy::unwrap_used, reason = "Allow unwrap in tests")]
-    use crate::worldsdc::fetch_wsdc_info;
-
-    #[test]
-    #[ignore = "Only run when the mock api is setup"]
-    fn test_fetch_wsdc() {
-        let rt = match tokio::runtime::Builder::new_current_thread()
-            .enable_all()
-            .build()
-        {
-            Ok(o) => o,
-            Err(e) => {
-                tracing::error!("Could not start runtime: {e}");
-                return;
-            }
-        };
-        let x = rt.block_on(fetch_wsdc_info(7));
-        dbg!(&x);
-        x.unwrap();
-    }
-}
-
-#[derive(thiserror::Error, Debug)]
-pub enum DanceInfoError {
-    #[error("Failed to build client: {0}")]
-    ClientBuild(reqwest::Error),
-    #[error("Failed to build request: {0}")]
-    RequestBuild(reqwest::Error),
-    #[error("Request error: {0:#?}")]
-    Request(reqwest::Error),
-    #[error("Failed to parse response: {0}")]
-    JsonParse(reqwest::Error),
-    #[error("Failed to parse html: {0}")]
-    HtmlParse(#[from] scoringdance::ScoringParseError),
-}
-
-#[derive(serde::Deserialize, Debug)]
-enum OptionalDanceRank {
-    #[serde(rename = "N/A")]
-    NotAvailable,
-    #[serde(untagged)]
-    Rank(DanceRank),
-}
-
-#[derive(serde::Deserialize, Debug)]
-enum OptionalDancePoints {
-    #[serde(rename = "N/A")]
-    NotAvailable,
-    #[serde(untagged)]
-    Points(u16),
-}
-
-#[derive(serde::Deserialize, Debug)]
-struct DanceInfoParser {
-    pub dancer_first: String,
-    pub dancer_last: String,
-    pub short_dominate_role: DanceRole,
-    #[allow(dead_code)]
-    pub short_non_dominate_role: DanceRole,
-    pub dominate_role_highest_level_points: u16,
-    pub dominate_role_highest_level: DanceRank,
-    pub non_dominate_role_highest_level_points: OptionalDancePoints,
-    pub non_dominate_role_highest_level: OptionalDanceRank,
-}
-
-impl From<DanceInfoParser> for DanceInfo {
-    fn from(value: DanceInfoParser) -> Self {
-        let non_dominant_role_comp = if let OptionalDanceRank::Rank(r) =
-            value.non_dominate_role_highest_level
-            && let OptionalDancePoints::Points(l) = value.non_dominate_role_highest_level_points
-        {
-            Some(CompState { rank: r, points: l })
-        } else {
-            None
-        };
-        Self {
-            firstname: value.dancer_first,
-            lastname: value.dancer_last,
-            dominant_role: value.short_dominate_role,
-            dominant_role_comp: CompState {
-                rank: value.dominate_role_highest_level,
-                points: value.dominate_role_highest_level_points,
-            },
-            non_dominant_role_comp,
-        }
-    }
-}