fix: MS datasource
Some checks failed
ci/woodpecker/push/test Pipeline failed
ci/woodpecker/push/linux Pipeline was successful
ci/woodpecker/push/mingw Pipeline was successful

This commit is contained in:
nyyu 2025-05-31 19:56:46 +02:00
parent 16ca1a1545
commit 68708f1991
3 changed files with 94 additions and 36 deletions

44
Cargo.lock generated
View file

@ -8,6 +8,15 @@ version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
[[package]]
name = "aho-corasick"
version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "base64" name = "base64"
version = "0.22.1" version = "0.22.1"
@ -36,6 +45,7 @@ dependencies = [
"indexmap", "indexmap",
"log", "log",
"rayon", "rayon",
"regex",
"serde", "serde",
"serde_derive", "serde_derive",
"serde_json", "serde_json",
@ -384,6 +394,35 @@ dependencies = [
"crossbeam-utils", "crossbeam-utils",
] ]
[[package]]
name = "regex"
version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick",
"memchr",
"regex-automata",
"regex-syntax",
]
[[package]]
name = "regex-automata"
version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick",
"memchr",
"regex-syntax",
]
[[package]]
name = "regex-syntax"
version = "0.8.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
[[package]] [[package]]
name = "ring" name = "ring"
version = "0.17.14" version = "0.17.14"
@ -726,8 +765,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]] [[package]]
name = "winreg" name = "winreg"
version = "0.52.0" version = "0.55.0"
source = "git+https://github.com/phoval/winreg-rs.git#654fc8f983c91346c729198a7b58f7b76fb7a8f5" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"windows-sys 0.59.0", "windows-sys 0.59.0",

View file

@ -10,6 +10,7 @@ include = ["src/**/*"]
indexmap = {version = "2.2", features = ["serde", "rayon"]} indexmap = {version = "2.2", features = ["serde", "rayon"]}
log = "0.4" log = "0.4"
rayon = "1.10" rayon = "1.10"
regex = "1.11.1"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
serde_json = {version = "1.0", features = ["preserve_order"]} serde_json = {version = "1.0", features = ["preserve_order"]}
@ -17,7 +18,7 @@ simple_logger = {git = 'https://github.com/phoval/rust-simple_logger.git', defau
ureq = {version = "2.9", features = ["json"]} ureq = {version = "2.9", features = ["json"]}
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winreg = { git = 'https://github.com/phoval/winreg-rs.git' } winreg = { version = "0.55" }
[profile.release] [profile.release]
codegen-units = 1 codegen-units = 1

View file

@ -1,4 +1,6 @@
use indexmap::IndexMap; use indexmap::IndexMap;
use regex::Regex;
use serde_derive::Deserialize;
use serde_json::Value; use serde_json::Value;
use crate::data_source::{DataSource, Stat}; use crate::data_source::{DataSource, Stat};
@ -7,7 +9,31 @@ use crate::Champion;
pub struct MSDataSource; pub struct MSDataSource;
const CHAMP_PATTERN: &str = " href=https://www.metasrc.com/5v5/champion/"; #[derive(Deserialize)]
struct MSChampion {
name: String,
#[serde(rename = "search-terms")]
search_terms: String,
}
fn get_champ_from_name(champs: &Champion, name: String) -> Option<u32> {
for champ in champs.data.values() {
if name == champ.name || name == champ.id {
return Some(champ.key.parse::<u32>().unwrap());
}
}
None
}
fn find_next_number(rest: &str) -> f32 {
let re = Regex::new(r"(\d+\.?\d+)").unwrap();
if let Some(cap) = re.captures(rest) {
if let Some(matched) = cap.get(1) {
return matched.as_str().parse::<f32>().unwrap_or(0.0);
}
}
0.0
}
impl DataSource for MSDataSource { impl DataSource for MSDataSource {
fn get_alias(&self) -> &str { fn get_alias(&self) -> &str {
@ -25,33 +51,23 @@ impl DataSource for MSDataSource {
) -> IndexMap<u32, Vec<String>> { ) -> IndexMap<u32, Vec<String>> {
let mut champs = IndexMap::new(); let mut champs = IndexMap::new();
let page = client let champions: Vec<MSChampion> = client
.get("https://www.metasrc.com/5v5") .get("https://www.metasrc.com/lol/search/lol")
.call() .call()
.unwrap() .unwrap()
.into_string() .into_json()
.unwrap(); .unwrap();
let mut pos: Option<usize> = page.find(CHAMP_PATTERN); for champ in champions {
while let Some(mut p) = pos { let id = get_champ_from_name(champion, champ.name).unwrap();
p += CHAMP_PATTERN.len(); let allowed_roles = ["TOP", "ADC", "SUPPORT", "JUNGLE", "MID"];
let role = let roles = champ
&page[p + page[p..].find('/').unwrap() + 1..p + page[p..].find('>').unwrap()]; .search_terms
.split('|')
let k = p + page[p..].find("data-search-terms-like=").unwrap() + 23; .map(|s| s.to_uppercase())
let pipe = k + page[k..].find('|').unwrap() + 1; .filter(|role| allowed_roles.contains(&role.as_str()))
let key = &page[pipe..pipe + page[pipe..].find(' ').unwrap()].replace('\"', ""); .collect::<Vec<String>>();
champs.insert(id, roles);
let id = champion.data.get(key).unwrap().key.parse::<u32>().unwrap();
champs.insert(id, vec![role.to_uppercase()]);
let next = page[p..].find(CHAMP_PATTERN);
if let Some(n) = next {
pos = Some(p + n);
} else {
pos = None;
}
} }
champs champs
@ -68,7 +84,7 @@ impl DataSource for MSDataSource {
let rep = client let rep = client
.get( .get(
format!( format!(
"https://www.metasrc.com/5v5/champion/{}/{}", "https://www.metasrc.com/lol/build/{}/{}",
champ.id.to_lowercase(), champ.id.to_lowercase(),
positions[0].to_lowercase() positions[0].to_lowercase()
) )
@ -77,18 +93,19 @@ impl DataSource for MSDataSource {
.call(); .call();
if let Ok(p) = rep { if let Ok(p) = rep {
let page = p.into_string().unwrap(); let page = p.into_string().unwrap();
let mut pos = page.find("Patch ").unwrap(); let mut pos = page.find("Patch ").unwrap();
let patch = &page[pos + 6..pos + 11]; let patch = find_next_number(&page[pos..]).to_string();
pos = page.find("Win Rate:").unwrap(); pos = page.find("Win").unwrap();
let win_rate: f32 = page[pos + 26..pos + 31].parse().unwrap(); let win_rate: f32 = find_next_number(&page[pos..]);
pos = page.find("KDA:").unwrap(); pos = page.find("KDA:").unwrap();
let kda: f32 = page[pos + 21..pos + 25].parse().unwrap(); let kda: f32 = find_next_number(&page[pos..]);
pos = page.find("Games:").unwrap();
let games: u32 = find_next_number(&page[pos..]) as u32;
let mut items = vec![]; let mut items = vec![];
let mut pos: Option<usize> = page.find("/item/"); let mut pos: Option<usize> = page.find("/item/");
while let Some(mut p) = pos { while let Some(mut p) = pos {
p += 6; p += 6;
@ -109,9 +126,9 @@ impl DataSource for MSDataSource {
vec![self.make_item_set(items, "Set".to_owned())], vec![self.make_item_set(items, "Set".to_owned())],
Stat { Stat {
win_rate, win_rate,
games: 1, games,
kda, kda,
patch: patch.to_owned(), patch,
}, },
)); ));
} }