mirror of
https://github.com/n08i40k/schedule-parser-rusted.git
synced 2025-12-06 17:57:47 +03:00
0.4.0
Авторизация через токен вк Слияние schedule_parser с проектом Перенос схемы запросов/ответов в файлы эндпоинтов Переход с библиотеки jwt на jsonwebtokens
This commit is contained in:
709
src/parser/mod.rs
Normal file
709
src/parser/mod.rs
Normal file
@@ -0,0 +1,709 @@
|
||||
use crate::parser::LessonParseResult::{Lessons, Street};
|
||||
use crate::parser::schema::LessonType::Break;
|
||||
use crate::parser::schema::{
|
||||
Day, Lesson, LessonSubGroup, LessonTime, LessonType, ParseResult, ScheduleEntry,
|
||||
};
|
||||
use calamine::{Reader, Xls, open_workbook_from_rs};
|
||||
use chrono::{Duration, NaiveDateTime};
|
||||
use fuzzy_matcher::FuzzyMatcher;
|
||||
use fuzzy_matcher::skim::SkimMatcherV2;
|
||||
use regex::Regex;
|
||||
use std::collections::HashMap;
|
||||
use std::io::Cursor;
|
||||
use std::sync::LazyLock;
|
||||
|
||||
pub mod schema;
|
||||
|
||||
struct InternalId {
|
||||
/**
|
||||
* Индекс строки
|
||||
*/
|
||||
row: u32,
|
||||
|
||||
/**
|
||||
* Индекс столбца
|
||||
*/
|
||||
column: u32,
|
||||
|
||||
/**
|
||||
* Текст в ячейке
|
||||
*/
|
||||
name: String,
|
||||
}
|
||||
|
||||
struct InternalTime {
|
||||
/**
|
||||
* Временной отрезок проведения пары
|
||||
*/
|
||||
time_range: LessonTime,
|
||||
|
||||
/**
|
||||
* Тип пары
|
||||
*/
|
||||
lesson_type: LessonType,
|
||||
|
||||
/**
|
||||
* Индекс пары
|
||||
*/
|
||||
default_index: Option<u32>,
|
||||
|
||||
/**
|
||||
* Рамка ячейки
|
||||
*/
|
||||
xls_range: ((u32, u32), (u32, u32)),
|
||||
}
|
||||
|
||||
type WorkSheet = calamine::Range<calamine::Data>;
|
||||
|
||||
fn get_string_from_cell(worksheet: &WorkSheet, row: u32, col: u32) -> Option<String> {
|
||||
let cell_data = if let Some(data) = worksheet.get((row as usize, col as usize)) {
|
||||
data.to_string()
|
||||
} else {
|
||||
return None;
|
||||
};
|
||||
|
||||
if cell_data.trim().is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
static NL_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"[\n\r]+").unwrap());
|
||||
static SP_RE: LazyLock<Regex, fn() -> Regex> = LazyLock::new(|| Regex::new(r"\s+").unwrap());
|
||||
|
||||
let trimmed_data = SP_RE
|
||||
.replace_all(&NL_RE.replace_all(&cell_data, " "), " ")
|
||||
.trim()
|
||||
.to_string();
|
||||
|
||||
if trimmed_data.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(trimmed_data)
|
||||
}
|
||||
}
|
||||
|
||||
fn get_merge_from_start(worksheet: &WorkSheet, row: u32, column: u32) -> ((u32, u32), (u32, u32)) {
|
||||
let worksheet_end = worksheet.end().unwrap();
|
||||
|
||||
let row_end: u32 = {
|
||||
let mut r: u32 = 0;
|
||||
|
||||
for _r in (row + 1)..worksheet_end.0 {
|
||||
r = _r;
|
||||
|
||||
if let Some(_) = worksheet.get((_r as usize, column as usize)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
r
|
||||
};
|
||||
|
||||
let column_end: u32 = {
|
||||
let mut c: u32 = 0;
|
||||
|
||||
for _c in (column + 1)..worksheet_end.1 {
|
||||
c = _c;
|
||||
|
||||
if let Some(_) = worksheet.get((row as usize, _c as usize)) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
c
|
||||
};
|
||||
|
||||
((row, column), (row_end, column_end))
|
||||
}
|
||||
|
||||
fn parse_skeleton(worksheet: &WorkSheet) -> (Vec<InternalId>, Vec<InternalId>) {
|
||||
let range = &worksheet;
|
||||
|
||||
let mut is_parsed = false;
|
||||
|
||||
let mut groups: Vec<InternalId> = Vec::new();
|
||||
let mut days: Vec<InternalId> = Vec::new();
|
||||
|
||||
let start = range.start().expect("Could not find start");
|
||||
let end = range.end().expect("Could not find end");
|
||||
|
||||
let mut row = start.0;
|
||||
while row < end.0 {
|
||||
row += 1;
|
||||
|
||||
let day_name_opt = get_string_from_cell(&worksheet, row, 0);
|
||||
if day_name_opt.is_none() {
|
||||
continue;
|
||||
}
|
||||
|
||||
let day_name = day_name_opt.unwrap();
|
||||
|
||||
if !is_parsed {
|
||||
is_parsed = true;
|
||||
|
||||
row -= 1;
|
||||
|
||||
for column in (start.1 + 2)..=end.1 {
|
||||
let group_name = get_string_from_cell(&worksheet, row, column);
|
||||
if group_name.is_none() {
|
||||
continue;
|
||||
}
|
||||
|
||||
groups.push(InternalId {
|
||||
row,
|
||||
column,
|
||||
name: group_name.unwrap(),
|
||||
});
|
||||
}
|
||||
|
||||
row += 1;
|
||||
}
|
||||
|
||||
days.push(InternalId {
|
||||
row,
|
||||
column: 0,
|
||||
name: day_name.clone(),
|
||||
});
|
||||
|
||||
if days.len() > 2 && day_name.starts_with("Суббота") {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
(days, groups)
|
||||
}
|
||||
|
||||
enum LessonParseResult {
|
||||
Lessons(Vec<Lesson>),
|
||||
Street(String),
|
||||
}
|
||||
|
||||
trait StringInnerSlice {
|
||||
fn inner_slice(&self, from: usize, to: usize) -> Self;
|
||||
}
|
||||
|
||||
impl StringInnerSlice for String {
|
||||
fn inner_slice(&self, from: usize, to: usize) -> Self {
|
||||
self.chars()
|
||||
.take(from)
|
||||
.chain(self.chars().skip(to))
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
||||
fn guess_lesson_type(name: &String) -> Option<(String, LessonType)> {
|
||||
let map: HashMap<String, LessonType> = HashMap::from([
|
||||
("(консультация)".to_string(), LessonType::Consultation),
|
||||
(
|
||||
"самостоятельная работа".to_string(),
|
||||
LessonType::IndependentWork,
|
||||
),
|
||||
("зачет".to_string(), LessonType::Exam),
|
||||
("зачет с оценкой".to_string(), LessonType::ExamWithGrade),
|
||||
("экзамен".to_string(), LessonType::ExamDefault),
|
||||
]);
|
||||
|
||||
let matcher = SkimMatcherV2::default();
|
||||
let name_lower = name.to_lowercase();
|
||||
|
||||
type SearchResult<'a> = (&'a LessonType, i64, Vec<usize>);
|
||||
|
||||
let mut search_results: Vec<SearchResult> = map
|
||||
.iter()
|
||||
.map(|entry| -> SearchResult {
|
||||
if let Some((score, indices)) = matcher.fuzzy_indices(&*name_lower, entry.0) {
|
||||
return (entry.1, score, indices);
|
||||
}
|
||||
|
||||
(entry.1, 0, Vec::new())
|
||||
})
|
||||
.collect();
|
||||
search_results.sort_by(|a, b| b.1.cmp(&a.1));
|
||||
|
||||
let guessed_type = search_results.first().unwrap();
|
||||
|
||||
if guessed_type.1 > 80 {
|
||||
Some((
|
||||
name.inner_slice(guessed_type.2[0], guessed_type.2[guessed_type.2.len() - 1]),
|
||||
guessed_type.0.clone(),
|
||||
))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_lesson(
|
||||
worksheet: &WorkSheet,
|
||||
day: &mut Day,
|
||||
day_times: &Vec<InternalTime>,
|
||||
time: &InternalTime,
|
||||
column: u32,
|
||||
) -> LessonParseResult {
|
||||
let row = time.xls_range.0.0;
|
||||
|
||||
let (name, lesson_type) = {
|
||||
let raw_name_opt = get_string_from_cell(&worksheet, row, column);
|
||||
if raw_name_opt.is_none() {
|
||||
return Lessons(Vec::new());
|
||||
}
|
||||
|
||||
let raw_name = raw_name_opt.unwrap();
|
||||
|
||||
static OTHER_STREET_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"^[А-Я][а-я]+,?\s?[0-9]+$").unwrap());
|
||||
|
||||
if OTHER_STREET_RE.is_match(&raw_name) {
|
||||
return Street(raw_name);
|
||||
}
|
||||
|
||||
if let Some(guess) = guess_lesson_type(&raw_name) {
|
||||
guess
|
||||
} else {
|
||||
(raw_name, time.lesson_type.clone())
|
||||
}
|
||||
};
|
||||
|
||||
let (default_range, lesson_time): (Option<[u8; 2]>, LessonTime) = {
|
||||
// check if multi-lesson
|
||||
let cell_range = get_merge_from_start(worksheet, row, column);
|
||||
|
||||
let end_time_arr = day_times
|
||||
.iter()
|
||||
.filter(|time| time.xls_range.1.0 == cell_range.1.0)
|
||||
.collect::<Vec<&InternalTime>>();
|
||||
|
||||
let end_time = end_time_arr.first().expect("Unable to find lesson time!");
|
||||
|
||||
let range: Option<[u8; 2]> = if time.default_index != None {
|
||||
let default = time.default_index.unwrap() as u8;
|
||||
Some([default, end_time.default_index.unwrap() as u8])
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
let time = LessonTime {
|
||||
start: time.time_range.start,
|
||||
end: end_time.time_range.end,
|
||||
};
|
||||
|
||||
(range, time)
|
||||
};
|
||||
|
||||
let (name, mut subgroups) = parse_name_and_subgroups(&name);
|
||||
|
||||
{
|
||||
let cabinets: Vec<String> = parse_cabinets(worksheet, row, column + 1);
|
||||
|
||||
// Если количество кабинетов равно 1, назначаем этот кабинет всем подгруппам
|
||||
if cabinets.len() == 1 {
|
||||
for subgroup in &mut subgroups {
|
||||
subgroup.cabinet = Some(cabinets.get(0).or(Some(&String::new())).unwrap().clone())
|
||||
}
|
||||
}
|
||||
// Если количество кабинетов совпадает с количеством подгрупп, назначаем кабинеты по порядку
|
||||
else if cabinets.len() == subgroups.len() {
|
||||
for subgroup in &mut subgroups {
|
||||
subgroup.cabinet = Some(
|
||||
cabinets
|
||||
.get((subgroup.number - 1) as usize)
|
||||
.unwrap()
|
||||
.clone(),
|
||||
);
|
||||
}
|
||||
}
|
||||
// Если количество кабинетов больше количества подгрупп, делаем ещё одну подгруппу.
|
||||
else if cabinets.len() > subgroups.len() {
|
||||
for index in 0..subgroups.len() {
|
||||
subgroups[index].cabinet = Some(cabinets[index].clone());
|
||||
}
|
||||
|
||||
while cabinets.len() > subgroups.len() {
|
||||
subgroups.push(LessonSubGroup {
|
||||
number: (subgroups.len() + 1) as u8,
|
||||
cabinet: Some(cabinets[subgroups.len()].clone()),
|
||||
teacher: "Ошибка в расписании".to_string(),
|
||||
});
|
||||
}
|
||||
}
|
||||
// Если кабинетов нет, но есть подгруппы, назначаем им значение "??"
|
||||
else {
|
||||
for subgroup in &mut subgroups {
|
||||
subgroup.cabinet = Some("??".to_string());
|
||||
}
|
||||
}
|
||||
|
||||
cabinets
|
||||
};
|
||||
|
||||
let lesson = Lesson {
|
||||
lesson_type,
|
||||
default_range,
|
||||
name: Some(name),
|
||||
time: lesson_time,
|
||||
subgroups: Some(subgroups),
|
||||
group: None,
|
||||
};
|
||||
|
||||
let prev_lesson = if day.lessons.len() == 0 {
|
||||
return Lessons(Vec::from([lesson]));
|
||||
} else {
|
||||
&day.lessons[day.lessons.len() - 1]
|
||||
};
|
||||
|
||||
Lessons(Vec::from([
|
||||
Lesson {
|
||||
lesson_type: Break,
|
||||
default_range: None,
|
||||
name: None,
|
||||
time: LessonTime {
|
||||
start: prev_lesson.time.end,
|
||||
end: lesson.time.start,
|
||||
},
|
||||
subgroups: Some(Vec::new()),
|
||||
group: None,
|
||||
},
|
||||
lesson,
|
||||
]))
|
||||
}
|
||||
|
||||
fn parse_cabinets(worksheet: &WorkSheet, row: u32, column: u32) -> Vec<String> {
|
||||
let mut cabinets: Vec<String> = Vec::new();
|
||||
|
||||
if let Some(raw) = get_string_from_cell(&worksheet, row, column) {
|
||||
let clean = raw.replace("\n", " ");
|
||||
let parts: Vec<&str> = clean.split(" ").collect();
|
||||
|
||||
for part in parts {
|
||||
let clean_part = part.to_string().trim().to_string();
|
||||
|
||||
cabinets.push(clean_part);
|
||||
}
|
||||
}
|
||||
|
||||
cabinets
|
||||
}
|
||||
|
||||
fn parse_name_and_subgroups(name: &String) -> (String, Vec<LessonSubGroup>) {
|
||||
static LESSON_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"(?:[А-Я][а-я]+[А-Я]{2}(?:\([0-9][а-я]+\))?)+$").unwrap());
|
||||
static TEACHER_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"([А-Я][а-я]+)([А-Я])([А-Я])(?:\(([0-9])[а-я]+\))?").unwrap());
|
||||
static CLEAN_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"[\s.,]+").unwrap());
|
||||
static NAME_CLEAN_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"\.\s+$").unwrap());
|
||||
|
||||
let (teachers, lesson_name) = {
|
||||
let clean_name = CLEAN_RE.replace_all(&name, "").to_string();
|
||||
|
||||
if let Some(captures) = LESSON_RE.captures(&clean_name) {
|
||||
let capture = captures.get(0).unwrap();
|
||||
let capture_str = capture.as_str().to_string();
|
||||
let capture_name: String = capture_str.chars().take(5).collect();
|
||||
|
||||
(
|
||||
NAME_CLEAN_RE.replace(&capture_str, "").to_string(),
|
||||
name[0..name.find(&*capture_name).unwrap()].to_string(),
|
||||
)
|
||||
} else {
|
||||
return (NAME_CLEAN_RE.replace(&name, "").to_string(), Vec::new());
|
||||
}
|
||||
};
|
||||
|
||||
let mut subgroups: Vec<LessonSubGroup> = Vec::new();
|
||||
|
||||
let teacher_it = TEACHER_RE.captures_iter(&teachers);
|
||||
|
||||
for captures in teacher_it {
|
||||
subgroups.push(LessonSubGroup {
|
||||
number: if let Some(capture) = captures.get(4) {
|
||||
capture
|
||||
.as_str()
|
||||
.to_string()
|
||||
.parse::<u8>()
|
||||
.expect("Unable to read subgroup index!")
|
||||
} else {
|
||||
0
|
||||
},
|
||||
cabinet: None,
|
||||
teacher: format!(
|
||||
"{} {}.{}.",
|
||||
captures.get(1).unwrap().as_str().to_string(),
|
||||
captures.get(2).unwrap().as_str().to_string(),
|
||||
captures.get(3).unwrap().as_str().to_string()
|
||||
),
|
||||
})
|
||||
}
|
||||
|
||||
// фикс, если у кого-то отсутствует индекс подгруппы
|
||||
|
||||
if subgroups.len() == 1 {
|
||||
let index = subgroups[0].number;
|
||||
|
||||
if index == 0 {
|
||||
subgroups[0].number = 1u8;
|
||||
} else {
|
||||
subgroups.push(LessonSubGroup {
|
||||
number: if index == 1 { 2 } else { 1 },
|
||||
cabinet: None,
|
||||
teacher: "Только у другой".to_string(),
|
||||
});
|
||||
}
|
||||
} else if subgroups.len() == 2 {
|
||||
// если индексы отсутствуют у обоих, ставим поочерёдно
|
||||
if subgroups[0].number == 0 && subgroups[1].number == 0 {
|
||||
subgroups[0].number = 1;
|
||||
subgroups[1].number = 2;
|
||||
}
|
||||
// если индекс отсутствует у первого, ставим 2, если у второго индекс 1 и наоборот
|
||||
else if subgroups[0].number == 0 {
|
||||
subgroups[0].number = if subgroups[1].number == 1 { 2 } else { 1 };
|
||||
}
|
||||
// если индекс отсутствует у второго, ставим 2, если у первого индекс 1 и наоборот
|
||||
else if subgroups[1].number == 0 {
|
||||
subgroups[1].number = if subgroups[0].number == 1 { 2 } else { 1 };
|
||||
}
|
||||
}
|
||||
|
||||
if subgroups.len() == 2 && subgroups[0].number == 2 && subgroups[1].number == 1 {
|
||||
subgroups.reverse()
|
||||
}
|
||||
|
||||
(lesson_name, subgroups)
|
||||
}
|
||||
|
||||
fn convert_groups_to_teachers(
|
||||
groups: &HashMap<String, ScheduleEntry>,
|
||||
) -> HashMap<String, ScheduleEntry> {
|
||||
let mut teachers: HashMap<String, ScheduleEntry> = HashMap::new();
|
||||
|
||||
let empty_days: Vec<Day> = groups
|
||||
.values()
|
||||
.next()
|
||||
.unwrap()
|
||||
.days
|
||||
.iter()
|
||||
.map(|day| Day {
|
||||
name: day.name.clone(),
|
||||
street: day.street.clone(),
|
||||
date: day.date.clone(),
|
||||
lessons: vec![],
|
||||
})
|
||||
.collect();
|
||||
|
||||
for group in groups.values() {
|
||||
for (index, day) in group.days.iter().enumerate() {
|
||||
for group_lesson in &day.lessons {
|
||||
if group_lesson.lesson_type == Break {
|
||||
continue;
|
||||
}
|
||||
|
||||
if group_lesson.subgroups.is_none() {
|
||||
continue;
|
||||
}
|
||||
|
||||
let subgroups = group_lesson.subgroups.as_ref().unwrap();
|
||||
|
||||
for subgroup in subgroups {
|
||||
if subgroup.teacher == "Ошибка в расписании" {
|
||||
continue;
|
||||
}
|
||||
|
||||
if !teachers.contains_key(&subgroup.teacher) {
|
||||
teachers.insert(
|
||||
subgroup.teacher.clone(),
|
||||
ScheduleEntry {
|
||||
name: subgroup.teacher.clone(),
|
||||
days: empty_days.to_vec(),
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
let teacher_day = teachers
|
||||
.get_mut(&subgroup.teacher)
|
||||
.unwrap()
|
||||
.days
|
||||
.get_mut(index)
|
||||
.unwrap();
|
||||
|
||||
teacher_day.lessons.push({
|
||||
let mut lesson = group_lesson.clone();
|
||||
lesson.group = Some(group.name.clone());
|
||||
|
||||
lesson
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
teachers
|
||||
}
|
||||
|
||||
pub fn parse_xls(buffer: &Vec<u8>) -> ParseResult {
|
||||
let cursor = Cursor::new(&buffer);
|
||||
let mut workbook: Xls<_> = open_workbook_from_rs(cursor).expect("Can't open workbook");
|
||||
|
||||
let worksheet: WorkSheet = workbook
|
||||
.worksheets()
|
||||
.first()
|
||||
.expect("No worksheet found")
|
||||
.1
|
||||
.to_owned();
|
||||
|
||||
let (days_markup, groups_markup) = parse_skeleton(&worksheet);
|
||||
|
||||
let mut groups: HashMap<String, ScheduleEntry> = HashMap::new();
|
||||
let mut days_times: Vec<Vec<InternalTime>> = Vec::new();
|
||||
|
||||
let saturday_end_row = worksheet.end().unwrap().0;
|
||||
|
||||
for group_markup in groups_markup {
|
||||
let mut group = ScheduleEntry {
|
||||
name: group_markup.name,
|
||||
days: Vec::new(),
|
||||
};
|
||||
|
||||
for day_index in 0..(&days_markup).len() {
|
||||
let day_markup = &days_markup[day_index];
|
||||
|
||||
let mut day = {
|
||||
let space_index = day_markup.name.find(' ').unwrap();
|
||||
|
||||
let name = day_markup.name[..space_index].to_string();
|
||||
|
||||
let date_raw = day_markup.name[space_index + 1..].to_string();
|
||||
let date_add = format!("{} 00:00:00", date_raw);
|
||||
|
||||
let date = NaiveDateTime::parse_from_str(&*date_add, "%d.%m.%Y %H:%M:%S");
|
||||
|
||||
Day {
|
||||
name,
|
||||
street: None,
|
||||
date: date.unwrap().and_utc(),
|
||||
lessons: Vec::new(),
|
||||
}
|
||||
};
|
||||
|
||||
let lesson_time_column = days_markup[0].column + 1;
|
||||
|
||||
let row_distance = if day_index != days_markup.len() - 1 {
|
||||
days_markup[day_index + 1].row
|
||||
} else {
|
||||
saturday_end_row
|
||||
} - day_markup.row;
|
||||
|
||||
if days_times.len() != 6 {
|
||||
let mut day_times: Vec<InternalTime> = Vec::new();
|
||||
|
||||
for row in day_markup.row..(day_markup.row + row_distance) {
|
||||
// time
|
||||
let time_opt = get_string_from_cell(&worksheet, row, lesson_time_column);
|
||||
if time_opt.is_none() {
|
||||
continue;
|
||||
}
|
||||
|
||||
let time = time_opt.unwrap();
|
||||
|
||||
// type
|
||||
let lesson_type = if time.contains("пара") {
|
||||
LessonType::Default
|
||||
} else {
|
||||
LessonType::Additional
|
||||
};
|
||||
|
||||
// lesson index
|
||||
let default_index = if lesson_type == LessonType::Default {
|
||||
Some(
|
||||
time.chars()
|
||||
.next()
|
||||
.unwrap()
|
||||
.to_string()
|
||||
.parse::<u32>()
|
||||
.unwrap(),
|
||||
)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
// time
|
||||
let time_range = {
|
||||
static TIME_RE: LazyLock<Regex, fn() -> Regex> =
|
||||
LazyLock::new(|| Regex::new(r"(\d+\.\d+)-(\d+\.\d+)").unwrap());
|
||||
|
||||
let parse_res = TIME_RE
|
||||
.captures(&time)
|
||||
.expect("Unable to obtain lesson start and end!");
|
||||
|
||||
let start_match = parse_res.get(1).unwrap().as_str();
|
||||
let start_parts: Vec<&str> = start_match.split(".").collect();
|
||||
|
||||
let end_match = parse_res.get(2).unwrap().as_str();
|
||||
let end_parts: Vec<&str> = end_match.split(".").collect();
|
||||
|
||||
LessonTime {
|
||||
start: day.date.clone()
|
||||
+ Duration::hours(start_parts[0].parse().unwrap())
|
||||
+ Duration::minutes(start_parts[1].parse().unwrap()),
|
||||
end: day.date.clone()
|
||||
+ Duration::hours(end_parts[0].parse().unwrap())
|
||||
+ Duration::minutes(end_parts[1].parse().unwrap()),
|
||||
}
|
||||
};
|
||||
|
||||
day_times.push(InternalTime {
|
||||
time_range,
|
||||
lesson_type,
|
||||
default_index,
|
||||
xls_range: get_merge_from_start(&worksheet, row, lesson_time_column),
|
||||
});
|
||||
}
|
||||
|
||||
days_times.push(day_times);
|
||||
}
|
||||
|
||||
let day_times = &days_times[day_index];
|
||||
|
||||
for time in day_times {
|
||||
match &mut parse_lesson(
|
||||
&worksheet,
|
||||
&mut day,
|
||||
&day_times,
|
||||
&time,
|
||||
group_markup.column,
|
||||
) {
|
||||
Lessons(l) => day.lessons.append(l),
|
||||
Street(s) => day.street = Some(s.to_owned()),
|
||||
}
|
||||
}
|
||||
|
||||
group.days.push(day);
|
||||
}
|
||||
|
||||
groups.insert(group.name.clone(), group);
|
||||
}
|
||||
|
||||
ParseResult {
|
||||
teachers: convert_groups_to_teachers(&groups),
|
||||
groups,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
pub mod tests {
|
||||
use super::*;
|
||||
|
||||
pub fn test_result() -> ParseResult {
|
||||
let buffer: Vec<u8> = include_bytes!("../../schedule.xls").to_vec();
|
||||
|
||||
parse_xls(&buffer)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn read() {
|
||||
let result = test_result();
|
||||
|
||||
assert_ne!(result.groups.len(), 0);
|
||||
assert_ne!(result.teachers.len(), 0);
|
||||
}
|
||||
}
|
||||
127
src/parser/schema.rs
Normal file
127
src/parser/schema.rs
Normal file
@@ -0,0 +1,127 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use serde_repr::{Deserialize_repr, Serialize_repr};
|
||||
use std::collections::HashMap;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct LessonTime {
|
||||
pub start: DateTime<Utc>,
|
||||
pub end: DateTime<Utc>,
|
||||
}
|
||||
|
||||
#[derive(Serialize_repr, Deserialize_repr, Debug, PartialEq, Clone)]
|
||||
#[repr(u8)]
|
||||
pub enum LessonType {
|
||||
Default = 0, // Обычная
|
||||
Additional, // Допы
|
||||
Break, // Перемена
|
||||
Consultation, // Консультация
|
||||
IndependentWork, // Самостоятельная работа
|
||||
Exam, // Зачёт
|
||||
ExamWithGrade, // Зачет с оценкой
|
||||
ExamDefault, // Экзамен
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct LessonSubGroup {
|
||||
/**
|
||||
* Номер подгруппы.
|
||||
*/
|
||||
pub number: u8,
|
||||
|
||||
/**
|
||||
* Кабинет, если присутствует.
|
||||
*/
|
||||
pub cabinet: Option<String>,
|
||||
|
||||
/**
|
||||
* Фио преподавателя.
|
||||
*/
|
||||
pub teacher: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Lesson {
|
||||
/**
|
||||
* Тип занятия.
|
||||
*/
|
||||
#[serde(rename = "type")]
|
||||
pub lesson_type: LessonType,
|
||||
|
||||
/**
|
||||
* Индексы пар, если присутствуют.
|
||||
*/
|
||||
#[serde(rename = "defaultRange")]
|
||||
pub default_range: Option<[u8; 2]>,
|
||||
|
||||
/**
|
||||
* Название занятия.
|
||||
*/
|
||||
pub name: Option<String>,
|
||||
|
||||
/**
|
||||
* Начало и конец занятия.
|
||||
*/
|
||||
pub time: LessonTime,
|
||||
|
||||
/**
|
||||
* Подгруппы.
|
||||
*/
|
||||
#[serde(rename = "subGroups")]
|
||||
pub subgroups: Option<Vec<LessonSubGroup>>,
|
||||
|
||||
/**
|
||||
* Группа, если это расписание для преподавателей.
|
||||
*/
|
||||
pub group: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug, Clone)]
|
||||
pub struct Day {
|
||||
/**
|
||||
* День недели.
|
||||
*/
|
||||
pub name: String,
|
||||
|
||||
/**
|
||||
* Адрес другого корпуса.
|
||||
*/
|
||||
pub street: Option<String>,
|
||||
|
||||
/**
|
||||
* Дата.
|
||||
*/
|
||||
pub date: DateTime<Utc>,
|
||||
|
||||
/**
|
||||
* Список пар в этот день.
|
||||
*/
|
||||
pub lessons: Vec<Lesson>,
|
||||
}
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct ScheduleEntry {
|
||||
/**
|
||||
* Название группы или ФИО преподавателя.
|
||||
*/
|
||||
pub name: String,
|
||||
|
||||
/**
|
||||
* Список из шести дней.
|
||||
*/
|
||||
pub days: Vec<Day>,
|
||||
}
|
||||
|
||||
pub struct ParseResult {
|
||||
/**
|
||||
* Список групп.
|
||||
* Ключом является название группы.
|
||||
*/
|
||||
pub groups: HashMap<String, ScheduleEntry>,
|
||||
|
||||
/**
|
||||
* Список преподавателей.
|
||||
* Ключом является ФИО преподавателя.
|
||||
*/
|
||||
pub teachers: HashMap<String, ScheduleEntry>,
|
||||
}
|
||||
Reference in New Issue
Block a user