Anri/cal7tor
1
0
Fork 0
forked from Anri/cal8tor
Code Issues 3 Pull requests 1 Releases 8 Activity

fix semester detection and rollback debug

Browse source
This commit is contained in:
Mylloon 2022-08-23 17:52:45 +02:00
parent 0e714fd4d3
commit 642387dcd3
Signed by: Anri
GPG key ID: A82D63DFF8D1317F
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/info.rs
View file

@ -59,7 +59,7 @@ pub async fn info() -> HashMap<usize, Vec<(DateTime<Utc>, i64)>> {
/// Get info webpage /// Get info webpage
async fn get_webpage() -> Result<Html, Box<dyn std::error::Error>> { async fn get_webpage() -> Result<Html, Box<dyn std::error::Error>> {
/* let url = "https://informatique.up8.edu/licence-iv/edt"; let url = "https://informatique.up8.edu/licence-iv/edt";
// We don't use reqwest::get() but a client with a custom user-agent // We don't use reqwest::get() but a client with a custom user-agent
// in order to avoid getting rate limit // in order to avoid getting rate limit
@ -69,9 +69,7 @@ async fn get_webpage() -> Result<Html, Box<dyn std::error::Error>> {
let html = client.get(url).send().await?.text().await?; let html = client.get(url).send().await?.text().await?;
// Panic on error // Panic on error
crate::utils::check_errors(&html, url); */ crate::utils::check_errors(&html, url);
let html = std::fs::read_to_string("target/debug-sch.htm").unwrap();
Ok(Html::parse_document(&html)) Ok(Html::parse_document(&html))
} }

7
src/timetable.rs
View file

@ -127,7 +127,7 @@ async fn get_webpage(
semester: i8, semester: i8,
letter: Option<char>, letter: Option<char>,
) -> Result<Html, Box<dyn std::error::Error>> { ) -> Result<Html, Box<dyn std::error::Error>> {
/* let url = { let url = {
let panic_semester_message = "Unknown semester."; let panic_semester_message = "Unknown semester.";
let panic_letter_message = "Unknown letter."; let panic_letter_message = "Unknown letter.";
@ -172,8 +172,7 @@ async fn get_webpage(
let html = reqwest::get(&url).await?.text().await?; let html = reqwest::get(&url).await?.text().await?;
// Panic on error // Panic on error
crate::utils::check_errors(&html, &url); */ crate::utils::check_errors(&html, &url);
let html = std::fs::read_to_string("target/debug-l1a.htm").unwrap();
// Parse document // Parse document
let document = Html::parse_document(&html); let document = Html::parse_document(&html);
@ -306,7 +305,7 @@ fn get_semester(semester: Option<i8>, letter: Option<char>) -> i8 {
None => match letter { None => match letter {
// Based on letter (kinda accurate) // Based on letter (kinda accurate)
Some(c) => { Some(c) => {
if c as i8 > 77 { if c.to_ascii_uppercase() as i8 > 77 {
// If letter is N or after // If letter is N or after
2 2
} else { } else {