n08i40k/schedule-parser-rusted
1
0
Fork 0
mirror of https://github.com/n08i40k/schedule-parser-rusted.git synced 2025-12-06 09:47:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

chore(parser): fix crash caused by another mistype in schedule

Browse Source
This commit is contained in:
n08i40k
2025-09-25 02:50:43 +04:00
parent 2d0041dc8b
commit 6c71bc19f5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
providers/provider-engels-polytechnic/src/parser/mod.rs
View File

@@ -448,7 +448,7 @@ fn parse_name_and_subgroups(text: &str) -> Result<ParsedLessonName, Error> {
static NAMES_REGEX: LazyLock<Regex> = LazyLock::new(|| { static NAMES_REGEX: LazyLock<Regex> = LazyLock::new(|| {
Regex::new( Regex::new(
r"(?:[А-Я][а-я]+\s?(?:[А-Я][\s.]*){2}(?:\(\s*\d\s*[а-я\s]+\))?(?:[\s,]+)?){1,2}+[\s.,]*", r"(?:[А-Я][а-я]+\s?(?:[А-Я][\s.]*){2}(?:\(?\s*\d\s*[а-я\s]+\)?)?(?:[\s,.]+)?){1,2}+[\s.,]*",
) )
.unwrap() .unwrap()
}); });
@@ -457,7 +457,7 @@ fn parse_name_and_subgroups(text: &str) -> Result<ParsedLessonName, Error> {
static CLEAN_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[\s\n\t]+").unwrap()); static CLEAN_RE: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"[\s\n\t]+").unwrap());
let text = CLEAN_RE let text = CLEAN_RE
.replace(&text.replace([' ', '\t', '\n'], " "), " ") .replace(&text.replace([' ', '\t', '\n'], " ").replace(",", ""), " ")
.to_string(); .to_string();
let (lesson_name, subgroups, lesson_type) = match NAMES_REGEX.captures(&text) { let (lesson_name, subgroups, lesson_type) = match NAMES_REGEX.captures(&text) {
@@ -471,13 +471,15 @@ fn parse_name_and_subgroups(text: &str) -> Result<ParsedLessonName, Error> {
let mut subgroups: [Option<LessonSubGroup>; 2] = [None, None]; let mut subgroups: [Option<LessonSubGroup>; 2] = [None, None];
for name in src.split(',') { for name in src.split(',') {
let open_bracket_index = name.find('('); let digit_index = name.find(|c: char| c.is_ascii_digit());
let number: u8 = open_bracket_index let number: u8 =
.map_or(0, |index| name[(index + 1)..(index + 2)].parse().unwrap()); digit_index.map_or(0, |index| name[(index)..(index + 1)].parse().unwrap());
let teacher_name = { let teacher_name = {
let name_end = open_bracket_index.unwrap_or(name.len()); let name_end = name
.find(|c: char| !c.is_alphabetic())
.unwrap_or(name.len());
// Я ебал. Как же я долго до этого доходил. // Я ебал. Как же я долго до этого доходил.
format!( format!(