mirror of
https://github.com/n08i40k/schedule-parser-rusted.git
synced 2026-09-14 08:58:53 +03:00
chore: bump version of dependencies
This commit is contained in:
Generated
+1890
-1437
File diff suppressed because it is too large
Load Diff
+2
-2
@@ -38,13 +38,13 @@ futures-util = "0"
|
|||||||
|
|
||||||
# authorization
|
# authorization
|
||||||
bcrypt = "0"
|
bcrypt = "0"
|
||||||
jsonwebtoken = { version = "9", features = ["use_pem"] }
|
jsonwebtoken = { version = "11", features = ["use_pem"] }
|
||||||
|
|
||||||
# creating users
|
# creating users
|
||||||
objectid = "0"
|
objectid = "0"
|
||||||
|
|
||||||
# schedule downloader
|
# schedule downloader
|
||||||
reqwest = { version = "0", features = ["json"] }
|
reqwest = { version = "0", features = ["json", "form"] }
|
||||||
mime = "0"
|
mime = "0"
|
||||||
|
|
||||||
# error handling
|
# error handling
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
pub use self::error::{Error, Result};
|
pub use self::error::{Error, Result};
|
||||||
use crate::or_continue;
|
use crate::or_continue;
|
||||||
use crate::parser::worksheet::{CellPos, CellRange, WorkSheet};
|
|
||||||
use crate::parser::LessonParseResult::{Lessons, Street};
|
use crate::parser::LessonParseResult::{Lessons, Street};
|
||||||
|
use crate::parser::worksheet::{CellPos, CellRange, WorkSheet};
|
||||||
use base::LessonType::Break;
|
use base::LessonType::Break;
|
||||||
use base::{
|
use base::{
|
||||||
Day, Lesson, LessonBoundaries, LessonSubGroup, LessonType, ParsedSchedule, ScheduleEntry,
|
Day, Lesson, LessonBoundaries, LessonSubGroup, LessonType, ParsedSchedule, ScheduleEntry,
|
||||||
};
|
};
|
||||||
use calamine::{open_workbook_from_rs, Reader, Xls};
|
use calamine::{Reader, Xls, open_workbook_from_rs};
|
||||||
use chrono::{DateTime, Duration, NaiveDate, NaiveTime, Utc};
|
use chrono::{DateTime, Duration, NaiveDate, NaiveTime, Utc};
|
||||||
use regex::Regex;
|
use regex::Regex;
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
@@ -243,12 +243,9 @@ fn parse_lesson(
|
|||||||
.first()
|
.first()
|
||||||
.ok_or(Error::LessonTimeNotFound(CellPos::new(row, group_column)))?;
|
.ok_or(Error::LessonTimeNotFound(CellPos::new(row, group_column)))?;
|
||||||
|
|
||||||
let range: Option<[u8; 2]> = if lesson_boundaries.default_index.is_some() {
|
let range: Option<[u8; 2]> = lesson_boundaries
|
||||||
let default = lesson_boundaries.default_index.unwrap() as u8;
|
.default_index
|
||||||
Some([default, end_time.default_index.unwrap() as u8])
|
.map(|default_index| [default_index as u8, end_time.default_index.unwrap() as u8]);
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
|
|
||||||
let time = LessonBoundaries {
|
let time = LessonBoundaries {
|
||||||
start: lesson_boundaries.time_range.start,
|
start: lesson_boundaries.time_range.start,
|
||||||
@@ -743,8 +740,8 @@ pub fn parse_xls(buffer: &Vec<u8>) -> Result<ParsedSchedule> {
|
|||||||
.clone();
|
.clone();
|
||||||
|
|
||||||
let worksheet_merges = workbook
|
let worksheet_merges = workbook
|
||||||
.worksheet_merge_cells(&worksheet_name)
|
.merge_cells_by_sheet_name(&worksheet_name)
|
||||||
.ok_or(Error::NoWorkSheets)?;
|
.map_err(|_| Error::NoWorkSheets)?;
|
||||||
|
|
||||||
WorkSheet {
|
WorkSheet {
|
||||||
data: worksheet,
|
data: worksheet,
|
||||||
|
|||||||
+5
-7
@@ -1,14 +1,14 @@
|
|||||||
use crate::middlewares::authorization::{JWTAuthorizationBuilder, ServiceConfig};
|
use crate::middlewares::authorization::{JWTAuthorizationBuilder, ServiceConfig};
|
||||||
use crate::middlewares::content_type::ContentTypeBootstrap;
|
use crate::middlewares::content_type::ContentTypeBootstrap;
|
||||||
use crate::state::{new_app_state, AppState};
|
use crate::state::{AppState, new_app_state};
|
||||||
use actix_web::dev::{ServiceFactory, ServiceRequest};
|
use actix_web::dev::{ServiceFactory, ServiceRequest};
|
||||||
use actix_web::{App, Error, HttpServer};
|
use actix_web::{App, Error, HttpServer};
|
||||||
use database::entity::sea_orm_active_enums::UserRole;
|
use database::entity::sea_orm_active_enums::UserRole;
|
||||||
use dotenvy::dotenv;
|
use dotenvy::dotenv;
|
||||||
use log::info;
|
use log::info;
|
||||||
use std::io;
|
use std::io;
|
||||||
use utoipa_actix_web::scope::Scope;
|
|
||||||
use utoipa_actix_web::AppExt;
|
use utoipa_actix_web::AppExt;
|
||||||
|
use utoipa_actix_web::scope::Scope;
|
||||||
use utoipa_rapidoc::RapiDoc;
|
use utoipa_rapidoc::RapiDoc;
|
||||||
|
|
||||||
mod state;
|
mod state;
|
||||||
@@ -158,11 +158,9 @@ async fn async_main() -> io::Result<()> {
|
|||||||
fn main() -> io::Result<()> {
|
fn main() -> io::Result<()> {
|
||||||
let _guard = sentry::init((
|
let _guard = sentry::init((
|
||||||
"https://9c33db76e89984b3f009b28a9f4b5954@sentry.n08i40k.ru/8",
|
"https://9c33db76e89984b3f009b28a9f4b5954@sentry.n08i40k.ru/8",
|
||||||
sentry::ClientOptions {
|
sentry::ClientOptions::new()
|
||||||
release: sentry::release_name!(),
|
.maybe_release(sentry::release_name!())
|
||||||
send_default_pii: true,
|
.send_default_pii(true),
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
));
|
));
|
||||||
|
|
||||||
let _ = dotenv();
|
let _ = dotenv();
|
||||||
|
|||||||
Reference in New Issue
Block a user