Compare commits
11 Commits
46dc757bb7
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 6561471e8b | |||
| e16878c947 | |||
| 5a308b5b4c | |||
| 1422183a90 | |||
| ffb926b2a2 | |||
| 9736adf7b2 | |||
| 215c355f6f | |||
| c1904e4589 | |||
|
|
eb88c041f6 | ||
|
|
596f1b3a6b | ||
|
|
6f332b314d |
@@ -5,9 +5,6 @@ on:
|
||||
tags:
|
||||
- 'v*.*.*'
|
||||
|
||||
env:
|
||||
RUSTUP_TOOLCHAIN: nightly
|
||||
|
||||
jobs:
|
||||
build_release:
|
||||
runs-on: ubuntu-latest
|
||||
@@ -16,7 +13,8 @@ jobs:
|
||||
GITEA_SERVER: ${{ secrets.GITEA_SERVER }}
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
with:
|
||||
fetch-depth: 0
|
||||
- uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: nightly
|
||||
@@ -24,7 +22,17 @@ jobs:
|
||||
- name: Build release
|
||||
run: |
|
||||
cargo build --release
|
||||
- name: Generate a changelog
|
||||
uses: orhun/git-cliff-action@v4
|
||||
id: git-cliff
|
||||
with:
|
||||
config: cliff.toml
|
||||
args: --verbose --latest
|
||||
github_token: ""
|
||||
env:
|
||||
OUTPUT: CHANGELOG.md
|
||||
- uses: akkuman/gitea-release-action@v1
|
||||
with:
|
||||
files: |-
|
||||
target/release/teachertracker-rs
|
||||
target/release/teachertracker-rs
|
||||
body: ${{ steps.git-cliff.outputs.content }}
|
||||
|
||||
19
.scripts/commit-msg
Normal file
19
.scripts/commit-msg
Normal file
@@ -0,0 +1,19 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Path to the commit message file
|
||||
COMMIT_MSG_FILE=$1
|
||||
|
||||
# Read the commit message
|
||||
COMMIT_MSG=$(cat "$COMMIT_MSG_FILE")
|
||||
|
||||
# Regex pattern for Conventional Commits
|
||||
# Example: "feat: add new feature" or "fix!: break everything"
|
||||
PATTERN='^(feat|fix|docs|style|refactor|perf|test|chore|revert|build|ci|wip|workflow)(\(.*\))?([!]?): .{1,}$'
|
||||
|
||||
if ! echo "$COMMIT_MSG" | grep -Eq "$PATTERN"; then
|
||||
echo "❌ Invalid commit message format."
|
||||
echo "Please follow the Conventional Commits specification: https://www.conventionalcommits.org/"
|
||||
echo "Example: 'feat: add new feature'"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -3201,7 +3201,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "teachertracker-rs"
|
||||
version = "0.1.5"
|
||||
version = "0.1.7"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"chrono",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "teachertracker-rs"
|
||||
version = "0.1.5"
|
||||
version = "0.1.7"
|
||||
edition = "2024"
|
||||
authors = ["Lukas Wölfer <coding@thasky.one>"]
|
||||
description = "A MediaWiki bot that updates score information of teachers"
|
||||
@@ -14,8 +14,7 @@ categories = ["web-programming", "api-bindings", "automation"]
|
||||
chrono = "0.4.41"
|
||||
clap = { version = "4.5.54", features = ["derive"] }
|
||||
futures = "0.3.31"
|
||||
# mwbot = { git = "https://gitlab.wikimedia.org/repos/mwbot-rs/mwbot.git", rev = "05cbb12188f18e2da710de158d89a9a4f1b42689", default-features = false, features = ["generators", "mwbot_derive"] }
|
||||
mwbot = { version = "0.7.0", default-features = false, features = ["generators", "mwbot_derive"] }
|
||||
mwbot = { version = "0.7.1", default-features = false, features = ["generators", "mwbot_derive"] }
|
||||
rand = "0.9.2"
|
||||
reqwest = "0.12.22"
|
||||
scraper = "0.24.0"
|
||||
|
||||
94
cliff.toml
Normal file
94
cliff.toml
Normal file
@@ -0,0 +1,94 @@
|
||||
# git-cliff ~ configuration file
|
||||
# https://git-cliff.org/docs/configuration
|
||||
|
||||
|
||||
[changelog]
|
||||
# A Tera template to be rendered for each release in the changelog.
|
||||
# See https://keats.github.io/tera/docs/#introduction
|
||||
body = """
|
||||
{% if version %}\
|
||||
## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
|
||||
{% else %}\
|
||||
## [unreleased]
|
||||
{% endif %}\
|
||||
{% for group, commits in commits | group_by(attribute="group") %}
|
||||
### {{ group | striptags | trim | upper_first }}
|
||||
{% for commit in commits %}
|
||||
- {% if commit.scope %}*({{ commit.scope }})* {% endif %}\
|
||||
{% if commit.breaking %}[**breaking**] {% endif %}\
|
||||
{{ commit.message | upper_first }}\
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
"""
|
||||
# Remove leading and trailing whitespaces from the changelog's body.
|
||||
trim = true
|
||||
# Render body even when there are no releases to process.
|
||||
render_always = true
|
||||
# An array of regex based postprocessors to modify the changelog.
|
||||
postprocessors = [
|
||||
# Replace the placeholder <REPO> with a URL.
|
||||
#{ pattern = '<REPO>', replace = "https://github.com/orhun/git-cliff" },
|
||||
]
|
||||
# render body even when there are no releases to process
|
||||
# render_always = true
|
||||
# output file path
|
||||
# output = "test.md"
|
||||
|
||||
[git]
|
||||
# Parse commits according to the conventional commits specification.
|
||||
# See https://www.conventionalcommits.org
|
||||
conventional_commits = true
|
||||
# Exclude commits that do not match the conventional commits specification.
|
||||
filter_unconventional = false
|
||||
# Require all commits to be conventional.
|
||||
# Takes precedence over filter_unconventional.
|
||||
require_conventional = false
|
||||
# Split commits on newlines, treating each line as an individual commit.
|
||||
split_commits = false
|
||||
# An array of regex based parsers to modify commit messages prior to further processing.
|
||||
commit_preprocessors = [
|
||||
# Replace issue numbers with link templates to be updated in `changelog.postprocessors`.
|
||||
#{ pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](<REPO>/issues/${2}))"},
|
||||
# Check spelling of the commit message using https://github.com/crate-ci/typos.
|
||||
# If the spelling is incorrect, it will be fixed automatically.
|
||||
#{ pattern = '.*', replace_command = 'typos --write-changes -' },
|
||||
]
|
||||
# Prevent commits that are breaking from being excluded by commit parsers.
|
||||
protect_breaking_commits = false
|
||||
# An array of regex based parsers for extracting data from the commit message.
|
||||
# Assigns commits to groups.
|
||||
# Optionally sets the commit's scope and can decide to exclude commits from further processing.
|
||||
commit_parsers = [
|
||||
{ message = "^feat", group = "<!-- 0 -->🚀 Features" },
|
||||
{ message = "^fix", group = "<!-- 1 -->🐛 Bug Fixes" },
|
||||
{ message = "^doc", group = "<!-- 3 -->📚 Documentation" },
|
||||
{ message = "^perf", group = "<!-- 4 -->⚡ Performance" },
|
||||
{ message = "^refactor", group = "<!-- 2 -->🚜 Refactor" },
|
||||
{ message = "^style", group = "<!-- 5 -->🎨 Styling" },
|
||||
{ message = "^test", group = "<!-- 6 -->🧪 Testing" },
|
||||
{ message = "^chore\\(release\\): prepare for", skip = true },
|
||||
{ message = "^chore\\(deps.*\\)", skip = true },
|
||||
{ message = "^chore\\(pr\\)", skip = true },
|
||||
{ message = "^chore\\(pull\\)", skip = true },
|
||||
{ message = "^chore|^ci", group = "<!-- 7 -->⚙️ Miscellaneous Tasks" },
|
||||
{ body = ".*security", group = "<!-- 8 -->🛡️ Security" },
|
||||
{ message = "^revert", group = "<!-- 9 -->◀️ Revert" },
|
||||
{ message = ".*", group = "<!-- 10 -->💼 Other" },
|
||||
]
|
||||
# Exclude commits that are not matched by any commit parser.
|
||||
filter_commits = false
|
||||
# Fail on a commit that is not matched by any commit parser.
|
||||
fail_on_unmatched_commit = false
|
||||
# An array of link parsers for extracting external references, and turning them into URLs, using regex.
|
||||
link_parsers = []
|
||||
# Include only the tags that belong to the current branch.
|
||||
use_branch_tags = false
|
||||
# Order releases topologically instead of chronologically.
|
||||
topo_order = false
|
||||
# Order commits topologically instead of chronologically.
|
||||
topo_order_commits = true
|
||||
# Order of commits in each group/release within the changelog.
|
||||
# Allowed values: newest, oldest
|
||||
sort_commits = "oldest"
|
||||
# Process submodules commits
|
||||
recurse_submodules = false
|
||||
60
src/main.rs
60
src/main.rs
@@ -26,8 +26,8 @@ use std::path::Path;
|
||||
use tracing::level_filters::LevelFilter;
|
||||
use tracing_subscriber::{Layer, layer::SubscriberExt, util::SubscriberInitExt};
|
||||
|
||||
use crate::fetching::{DynWsdcFetcher, ScoringDanceFetcher, WorldsdcFetcher};
|
||||
use crate::watchdog::{update_wanted_ids, watch_wanted};
|
||||
use crate::fetching::{DynWsdcFetcher, WorldsdcFetcher, ScoringDanceFetcher};
|
||||
|
||||
mod dance_info;
|
||||
mod fetching;
|
||||
@@ -128,8 +128,19 @@ enum WsdcPointsBackend {
|
||||
|
||||
#[derive(Subcommand)]
|
||||
enum Commands {
|
||||
/// Continuously watch for missing or outdated teachers and update them
|
||||
Watch,
|
||||
/// Build pages for all missing teachers
|
||||
Missing,
|
||||
FixMissing,
|
||||
/// List all missing teachers
|
||||
ListMissing,
|
||||
/// Update info for all teachers
|
||||
FetchInfo(FetchInfoArgs),
|
||||
}
|
||||
|
||||
#[derive(Parser)]
|
||||
struct FetchInfoArgs {
|
||||
id: u32,
|
||||
}
|
||||
|
||||
fn main() -> Result<(), AppError> {
|
||||
@@ -149,9 +160,10 @@ fn main() -> Result<(), AppError> {
|
||||
WsdcPointsBackend::ScoringDance => std::sync::Arc::new(ScoringDanceFetcher {}),
|
||||
WsdcPointsBackend::WorldSDC => std::sync::Arc::new(WorldsdcFetcher {}),
|
||||
};
|
||||
let command = cli.command.as_ref().map_or(&Commands::Watch, |cmd| cmd);
|
||||
|
||||
match &cli.command {
|
||||
Some(Commands::Missing) => {
|
||||
match command {
|
||||
Commands::ListMissing => {
|
||||
rt.block_on(async {
|
||||
let wanted = wikiinfo::wanted_ids(bot.clone(), fetcher.clone()).await;
|
||||
tracing::info!(
|
||||
@@ -165,18 +177,48 @@ fn main() -> Result<(), AppError> {
|
||||
);
|
||||
update_wanted_ids(&wanted, &[], fetcher.clone()).await;
|
||||
});
|
||||
|
||||
return Ok(());
|
||||
}
|
||||
None => {
|
||||
Commands::FetchInfo(args) => {
|
||||
rt.block_on(async {
|
||||
let info = fetcher.fetch(args.id).await;
|
||||
#[allow(
|
||||
clippy::print_stdout,
|
||||
clippy::print_stderr,
|
||||
reason = "We want to print here"
|
||||
)]
|
||||
match info {
|
||||
Ok(info) => println!("Fetched info: {info:?}"),
|
||||
Err(err) => eprintln!("Error fetching info: {err}"),
|
||||
}
|
||||
});
|
||||
}
|
||||
Commands::FixMissing => {
|
||||
rt.block_on(async {
|
||||
let wanted = wikiinfo::wanted_ids(bot.clone(), fetcher.clone()).await;
|
||||
tracing::info!(
|
||||
"Missing ids: {}",
|
||||
wanted
|
||||
.iter()
|
||||
.map(|(v, _)| v)
|
||||
.map(u32::to_string)
|
||||
.collect::<Vec<_>>()
|
||||
.join("\n")
|
||||
);
|
||||
update_wanted_ids(&wanted, &[], fetcher.clone()).await;
|
||||
});
|
||||
}
|
||||
Commands::Watch => {
|
||||
#[allow(
|
||||
unreachable_code,
|
||||
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(), fetcher.clone()), updater::update_wsdc(bot, fetcher.clone()))
|
||||
futures::join!(
|
||||
watch_wanted(bot.clone(), fetcher.clone()),
|
||||
updater::update_wsdc(bot, fetcher.clone())
|
||||
)
|
||||
});
|
||||
}
|
||||
}
|
||||
unreachable!();
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -4,8 +4,8 @@ use mwbot::{
|
||||
};
|
||||
use crate::fetching::DynWsdcFetcher;
|
||||
|
||||
pub async fn wanted_ids(_bot: Bot, _fetcher: DynWsdcFetcher) -> Vec<(u32, Page)> {
|
||||
let mut gene = QueryPage::new("Wantedpages").generate(&_bot);
|
||||
pub async fn wanted_ids(bot: Bot, _fetcher: DynWsdcFetcher) -> Vec<(u32, Page)> {
|
||||
let mut gene = QueryPage::new("Wantedpages").generate(&bot);
|
||||
let mut result = vec![];
|
||||
while let Some(x) = gene.recv().await {
|
||||
let p = match x {
|
||||
@@ -51,18 +51,6 @@ fn parse_wsdc_page_name(name: &str) -> Result<u32, TitleParseError> {
|
||||
}
|
||||
}
|
||||
|
||||
// fn get_wsdc_page_date(bot: &Bot, page: &Page) -> Option<SystemTime> {
|
||||
// todo!();
|
||||
// let prefix = "Updated-On: ";
|
||||
// page.filter_comments()
|
||||
// .iter()
|
||||
// .filter_map(|x| {
|
||||
// let c = x.text_contents();
|
||||
// if c.starts_with(prefix) { Some(c) } else { None }
|
||||
// })
|
||||
// .map(|x| x.trim_start_matches(prefix).parse::<u64>());
|
||||
// }
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub async fn index_wsdc_ids(bot: &Bot, _fetcher: DynWsdcFetcher) -> Vec<(u32, Page)> {
|
||||
let mut gene = Search::new("WSDC/").generate(bot);
|
||||
|
||||
Reference in New Issue
Block a user