print it lines by line, without table

- Rename type to category for courses
- Add category to the exported calendar
- Default to non-selected data when filtering TD/TP

Cargo.toml

@@ -1,21 +1,25 @@
 [package]
-name = "cal8tor"
+name = "cal7tor"
-version = "0.4.5"
+version = "0.10.0"
 authors = ["Mylloon"]
 edition = "2021"
-description = "Extractor of the calendar of the IT degree of university Paris 8"
+description = "Timetable extractor for the Paris Cité master's degree in IT"
 readme = "README.md"
-repository = "https://git.kennel.ml/Anri/cal8tor"
+repository = "https://git.mylloon.fr/Anri/cal7tor"
-keywords = ["scrape", "calendar"]
+keywords = ["scrape", "calendar", "paris diderot", "paris cité"]
 publish = false
 license = "AGPL-3.0-or-later"
 
 [dependencies]
-reqwest = { version = "0.11" }
+reqwest = { version = "0.12" }
-tokio = { version = "1.32", features = ["full"] }
+tokio = { version = "1.42", features = ["full"] }
-scraper = "0.17"
+scraper = "0.22"
-regex = "1.9"
+regex = "1.11"
-chrono = "0.4.28"
+chrono = "0.4.39"
-ics = "0.5"
+ics = { version = "0.5", default-features = false }
-uuid = { version = "1.4", features = ["v4", "fast-rng"] }
+uuid = { version = "1.11", features = ["v4", "fast-rng"] }
-clap = { version = "4.4", features = ["derive"] }
+clap = { version = "4.5", features = ["derive"] }
+dialoguer = "0.11"
+
+[lints.clippy]
+pedantic = "warn"

README.md

@@ -1,16 +1,13 @@
-# cal8tor • *cal*endar P*8* extrac*tor*
+# cal7tor • *cal*endar P*7* extrac*tor*
 
-Extracteur d'emploi du temps pour la licence d'informatique de Paris 8
+> Fork de [cal8tor](https://git.mylloon.fr/Anri/cal8tor)
 
-[![dependency status](https://deps.rs/repo/gitea/git.mylloon.fr/Anri/cal8tor/status.svg)](https://deps.rs/repo/gitea/git.mylloon.fr/Anri/cal8tor)
+Extracteur d'emploi du temps pour les masters d'informatique de Paris Cité (Diderot)
+
+[![dependency status](https://deps.rs/repo/gitea/git.mylloon.fr/Anri/cal7tor/status.svg)](https://deps.rs/repo/gitea/git.mylloon.fr/Anri/cal7tor)
 
 ## Installation
 
-### Arch
-
-cal8tor est disponible sur le AUR : [`cal8tor`](https://aur.archlinux.org/packages/cal8tor)
-et [`cal8tor-git`](https://aur.archlinux.org/packages/cal8tor-git).
-
 ### Manuellement
 
 Cf. [Compilation et installation](#compilation-et-installation).
@@ -20,26 +17,28 @@ Cf. [Compilation et installation](#compilation-et-installation).
 Pour afficher la page d'aide
 
 ```
-$ cal8tor --help
+$ cal7tor --help
 ```
 
-## Voir le calendrier dans le terminal
+<!-- ## Voir le calendrier dans le terminal
 
-Pour les L2-X par exemple, lance :
+> Cette partie est héritée de cal8tor et n'est actuellement pas compatible avec cal7tor.
+
+Pour les M1 par exemple, lance :
 
 ```bash
-$ cal8tor l2-X
+$ cal7tor M1
 ```
 
 > Le rendu peut parfois être difficile à lire, n'hésites pas à utiliser l'option
-> `-c` (ou `--cl`) pour ajuster la longueur des cellules du planning.
+> `-c` (ou `--cl`) pour ajuster la longueur des cellules du planning. -->
 
 ## Exporter le calendrier au format `.ics`
 
-Pour les L1-A par exemple, lance :
+Pour les M1 par exemple, lance :
 
 ```bash
-$ cal8tor L1A --export calendar.ics
+$ cal7tor M1 --export calendar.ics
 ```
 
 > Le fichier comprend le fuseau horaire pour `Europe/Paris` et est
@@ -58,7 +57,7 @@ Vous aurez besoin de Rust pour compiler le programme.
 1. Clone le dépôt et s'y rendre
 
 ```bash
-$ git clone https://git.mylloon.fr/Anri/cal8tor.git && cd cal8tor
+$ git clone https://git.mylloon.fr/Anri/cal7tor.git && cd cal7tor
 ```
 
 2. Compiler et installer l'application
@@ -67,7 +66,7 @@ $ git clone https://git.mylloon.fr/Anri/cal8tor.git && cd cal8tor
 $ cargo install --path .
 ```
 
-3. Tu peux maintenant supprimer le dossier `cal8tor` !
+3. Tu peux maintenant supprimer le dossier `cal7tor` !
 
 ---
 

src/filter.rs

@@ -0,0 +1,172 @@
+use dialoguer::MultiSelect;
+
+use crate::timetable::models::Category;
+use crate::timetable::models::Timetable;
+use crate::utils::get_count;
+use crate::utils::get_entry;
+use crate::utils::get_entry_nocat;
+use crate::utils::get_selection;
+
+const DISCLAIMER: &str = "(selection avec ESPACE, ENTRER pour valider)";
+
+/// Filter the timetable
+pub fn timetable(timetable: Timetable, merge_td_tp: bool) -> Timetable {
+    let mut my_timetable = timetable;
+
+    /* Note on Cours/TD:
+     * We use the "as long as x interests us, we accept" approach.
+     *
+     * Because when a course and its TD are on the same slot,
+     * it's probably because there's an alternation between course
+     * and TD and no other choice is possible. */
+
+    choice(&mut my_timetable);
+    courses(&mut my_timetable);
+    tdtp(&mut my_timetable, merge_td_tp);
+
+    my_timetable
+}
+
+/// Exclude some courses
+fn choice(timetable: &mut Timetable) {
+    let mut multiselected = vec![];
+    timetable.1 .1.iter().for_each(|day| {
+        day.courses.iter().for_each(|course_opt| {
+            if let Some(course) = course_opt {
+                if !multiselected.contains(&course.name) {
+                    multiselected.push(course.name.clone());
+                }
+            }
+        });
+    });
+
+    let defaults = vec![true; multiselected.len()];
+    let selections = MultiSelect::new()
+        .with_prompt(format!("Choisis tes matières {DISCLAIMER}"))
+        .items(&multiselected[..])
+        .defaults(&defaults[..])
+        .interact()
+        .unwrap();
+
+    for day in &mut timetable.1 .1 {
+        day.courses.retain(|course_opt| {
+            if let Some(course) = course_opt {
+                // Remove courses not followed
+                for i in &selections {
+                    if course.name == multiselected[*i] {
+                        return true;
+                    }
+                }
+            }
+
+            false
+        });
+    }
+}
+
+/// Filter the multiple courses
+fn courses(timetable: &mut Timetable) {
+    let entry_getter = get_entry;
+
+    // List of courses and Counter of how much they appears
+    // to know if multiples slots are available
+    let (mut courses, counts) = get_count(timetable, &[Category::Cours], entry_getter);
+
+    // Keep only elements who have multiples slots
+    courses.retain(|course| *counts.get(&entry_getter(course.0)).unwrap() > 1);
+
+    let mut multiselected: Vec<String> = courses.iter().map(get_selection).collect();
+    multiselected.sort();
+
+    let mut selections = vec![];
+    if !multiselected.is_empty() {
+        let defaults = vec![false; multiselected.len()];
+        selections = MultiSelect::new()
+            .with_prompt(format!("Choisis tes horaires de Cours {DISCLAIMER}"))
+            .items(&multiselected[..])
+            .defaults(&defaults[..])
+            .interact()
+            .unwrap();
+    }
+
+    // Keep only wanted courses
+    for day in &mut timetable.1 .1 {
+        day.courses.retain(|course_opt| {
+            if let Some(course) = course_opt {
+                // Keep if it's a TD/TP
+                if course.category.contains(&Category::TD)
+                    || course.category.contains(&Category::TP)
+                {
+                    return true;
+                }
+
+                // Keep if only one slot is available
+                if *counts.get(&entry_getter(course)).unwrap() == 1 {
+                    return true;
+                }
+
+                // Keep only chosen courses if multiple was available
+                for i in &selections {
+                    if get_selection(&(course, day.name.clone())) == multiselected[*i] {
+                        return true;
+                    }
+                }
+            }
+
+            false
+        });
+    }
+}
+
+/// Filter the multiples TD/TP
+fn tdtp(timetable: &mut Timetable, merge: bool) {
+    // If we differentiate TD from TP
+    let entry_getter = if merge { get_entry_nocat } else { get_entry };
+
+    // List of TP/TD and Counter of how much they appears
+    // to know if multiples slots are available
+    let (mut td_or_tp, counts) = get_count(timetable, &[Category::TD, Category::TP], entry_getter);
+
+    // Keep only elements who have multiples TD/TP
+    td_or_tp.retain(|course| *counts.get(&entry_getter(course.0)).unwrap() > 1);
+
+    let mut multiselected: Vec<String> = td_or_tp.iter().map(get_selection).collect();
+    multiselected.sort();
+
+    let mut selections = vec![];
+    if !multiselected.is_empty() {
+        let defaults = vec![false; multiselected.len()];
+        selections = MultiSelect::new()
+            .with_prompt(format!("Choisis tes horaires de TD/TP {DISCLAIMER}"))
+            .items(&multiselected[..])
+            .defaults(&defaults[..])
+            .interact()
+            .unwrap();
+    }
+
+    // Keep only wanted courses
+    for day in &mut timetable.1 .1 {
+        day.courses.retain(|course_opt| {
+            if let Some(course) = course_opt {
+                // Keep if it's a course
+                if course.category.contains(&Category::Cours) {
+                    return true;
+                }
+
+                // Keep if only one slot is available of the TD/TP
+                if *counts.get(&entry_getter(course)).unwrap() == 1 {
+                    return true;
+                }
+
+                // Keep only chosen TD/TP if multiple was available
+                for i in &selections {
+                    if get_selection(&(course, day.name.clone())) == multiselected[*i] {
+                        return true;
+                    }
+                }
+            }
+
+            false
+        });
+    }
+}

src/ics.rs

@@ -1,12 +1,16 @@
+use std::sync::Arc;
+
 use chrono::TimeZone;
 use ics::{
-    parameters,
+    parameters::{Language, PartStat, Role, TzIDParam, CN},
-    properties::{Class, Description, DtEnd, DtStart, Location, Summary, Transp},
+    properties::{
+        Attendee, Categories, Class, Description, DtEnd, DtStart, Location, Summary, Transp,
+    },
     Event, ICalendar, Standard,
 };
 
 pub fn export(courses: Vec<crate::timetable::models::Course>, filename: &mut String) {
-    let mut calendar = ICalendar::new("2.0", "cal8tor");
+    let mut calendar = ICalendar::new("2.0", "cal7tor");
 
     // Add Europe/Paris timezone
     let timezone_name = "Europe/Paris";
@@ -36,34 +40,57 @@ pub fn export(courses: Vec<crate::timetable::models::Course>, filename: &mut Str
 
         // Professor's name
         if course.professor.is_some() {
-            event.push(Description::new(course.professor.unwrap()));
+            let name = course.professor.unwrap();
+            let mut contact = Attendee::new("mailto:place@holder.com");
+            contact.add(CN::new(name));
+            contact.add(PartStat::ACCEPTED);
+            contact.add(Role::CHAIR);
+            event.push(contact);
         }
 
         // Start time of the course
         let mut date_start = DtStart::new(dt_ical(course.dtstart.unwrap()));
-        date_start.append(parameters!("TZID" => timezone_name));
+        date_start.add(TzIDParam::new(timezone_name));
         event.push(date_start);
 
         // End time of the course
         let mut date_end = DtEnd::new(dt_ical(course.dtend.unwrap()));
-        date_end.append(parameters!("TZID" => timezone_name));
+        date_end.add(TzIDParam::new(timezone_name));
         event.push(date_end);
 
         // Room location
         event.push(Location::new(course.room));
 
+        let categories = course
+            .category
+            .iter()
+            .map(std::string::ToString::to_string)
+            .collect::<Arc<[String]>>()
+            .join("/");
+
         // Course's name
-        let mut course_name = Summary::new(course.name);
+        let mut course_name = Summary::new(format!("{} - {}", categories, course.name));
-        course_name.append(parameters!("LANGUAGE" => "fr"));
+        course_name.add(Language::new("fr"));
         event.push(course_name);
 
+        // Course's category
+        event.push(Categories::new(categories));
+
+        // Course extra data
+        if course.data.is_some() {
+            event.push(Description::new(course.data.unwrap()));
+        }
+
         // Add the course to the calendar
         calendar.add_event(event);
     }
 
     // Add the extension if needed
-    if !filename.ends_with(".ics") {
+    if !std::path::Path::new(filename)
-        *filename = format!("{}.ics", filename)
+        .extension()
+        .map_or(false, |ext| ext.eq_ignore_ascii_case("ics"))
+    {
+        *filename = format!("{filename}.ics");
     };
 
     calendar.save_file(filename).unwrap();

src/info.rs

@@ -1,76 +1,100 @@
-use chrono::{DateTime, Utc};
+use chrono::{DateTime, Duration, Utc};
 use regex::{Captures, Regex};
-use scraper::{Html, Selector};
+use scraper::Selector;
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::Arc};
 
-pub async fn info(user_agent: &str) -> HashMap<usize, Vec<(DateTime<Utc>, i64)>> {
+use crate::utils::{
-    let document = get_webpage(user_agent)
+    get_semester, get_webpage, get_year,
+    models::{Info, InfoList, InfoType},
+};
+
+pub async fn get_start_date(
+    level: i8,
+    semester_opt: Option<i8>,
+    year_opt: Option<i32>,
+    user_agent: &str,
+) -> String {
+    let semester = get_semester(semester_opt);
+    let year = get_year(year_opt, semester);
+
+    // Fetch the timetable of the FIRST semester
+    let document = get_webpage(level, 1, &year, user_agent)
         .await
         .expect("Can't reach info website.");
 
     // Selectors
-    let sel_ul = Selector::parse("ul").unwrap();
+    let sel_b = Selector::parse("b").unwrap();
-    let sel_li = Selector::parse("li").unwrap();
+    let sel_font = Selector::parse("font").unwrap();
 
-    // Find the raw infos in html page
+    // Find when is the back-to-school date
-    let mut raw_data = Vec::new();
+    let raw_data = document
-    for (i, data) in document.select(&sel_ul).enumerate() {
+        .select(&sel_b)
-        if [1, 2].contains(&i) {
+        .find(|element| element.select(&sel_font).next().is_some())
-            raw_data.push(data);
+        .unwrap()
-        }
+        .inner_html();
-    }
 
-    let mut data = HashMap::new();
+    let re = Regex::new(r"\d{1,2} (septembre|octobre)").unwrap();
-    // d => date
-    // r => repetition
-    let re = Regex::new(r"(?P<d>\d{1,2} \w+ \d{4}).+(?P<r>\d)").unwrap();
-    for (i, ul) in raw_data.into_iter().enumerate() {
-        for element in ul.select(&sel_li) {
-            match element.inner_html() {
-                e if e.starts_with("Début") => {
-                    let captures = re.captures(&e).unwrap();
 
-                    let start_date = get_date(captures.name("d").unwrap().as_str());
+    re.captures(&raw_data)
-
+        .and_then(|caps| caps.get(0))
-                    let rep: i64 = captures.name("r").unwrap().as_str().parse().unwrap();
+        .map_or("1 septembre".to_owned(), |m| m.as_str().to_owned())
-
-                    data.insert(i + 1, vec![(start_date, rep)]);
-                }
-                e if e.starts_with("Reprise") => {
-                    let captures = re.captures(&e).unwrap();
-                    captures.name("g");
-
-                    let start_date = get_date(captures.name("d").unwrap().as_str());
-
-                    let rep: i64 = captures.name("r").unwrap().as_str().parse().unwrap();
-
-                    let it = i + 1;
-
-                    let mut vec = data.get(&it).unwrap().to_owned();
-                    vec.push((start_date, rep));
-
-                    data.insert(it, vec);
-                }
-                _ => (),
-            }
-        }
-    }
-
-    data
 }
 
-/// Get info webpage
+pub fn info(semester_opt: Option<i8>, year_opt: Option<i32>, date: &str, skip_week: bool) -> Info {
-async fn get_webpage(user_agent: &str) -> Result<Html, Box<dyn std::error::Error>> {
+    let semester = get_semester(semester_opt);
-    let url = "https://informatique.up8.edu/licence-iv/edt";
+    let year = get_year(year_opt, semester);
 
-    // Use custom User-Agent
+    // 1st semester
-    let client = reqwest::Client::builder().user_agent(user_agent).build()?;
+    let weeks_s1_1 = 6; // Weeks before break
-    let html = client.get(url).send().await?.text().await?;
+    let weeks_s1_2 = 7; // Weeks after break
+    let date_s1_1 = get_date(&format!("{} {}", date, year.split_once('-').unwrap().0)); // Get first week of school
+    let date_s1_2 = date_s1_1 + Duration::weeks(weeks_s1_1 + 1); // Back-to-school week - add week of holidays
 
-    // Panic on error
+    // 2nd semester
-    crate::utils::check_errors(&html, url);
+    let weeks_s2_1 = 11; // Weeks before break
+    let weeks_s2_2 = 1; // Weeks after break
+    let date_s2_1 = date_s1_2 + Duration::weeks(weeks_s1_2 + 4); // Get first week - add week of 'christmas/new year holidays'
+    let date_s2_2 = date_s2_1 + Duration::weeks(weeks_s2_1 + 2); // Back-to-school week - add week of holidays
 
-    Ok(Html::parse_document(&html))
+    // Group courses values and derive it for TD/TP
+    let cours_s1 = vec![(date_s1_1, weeks_s1_1), (date_s1_2, weeks_s1_2)];
+    let cours_s2 = vec![(date_s2_1, weeks_s2_1), (date_s2_2, weeks_s2_2)];
+
+    let delta = i64::from(skip_week);
+
+    let tdtp_s1 = derive_from_cours(&cours_s1, delta);
+    let tdtp_s2 = derive_from_cours(&cours_s2, delta);
+
+    HashMap::from([
+        (
+            1_usize,
+            InfoType {
+                course: cours_s1,
+                td_tp: tdtp_s1,
+            },
+        ),
+        (
+            2_usize,
+            InfoType {
+                course: cours_s2,
+                td_tp: tdtp_s2,
+            },
+        ),
+    ])
+}
+
+/// Find TD/TP dates, based on the ones from courses
+fn derive_from_cours(courses: &InfoList, delta: i64) -> Vec<(DateTime<Utc>, i64)> {
+    // TD/TP start one week after courses
+    let before_break = courses.first().unwrap();
+    let after_break = courses.last().unwrap();
+    vec![
+        (
+            before_break.0 + Duration::weeks(delta),
+            before_break.1 - delta,
+        ),
+        (after_break.0, after_break.1 + delta),
+    ]
 }
 
 /// Turn a french date to an english one
@@ -93,7 +117,7 @@ fn anglophonization(date: &str) -> String {
     // New regex of all the french month
     let re = Regex::new(&format!(
         "({})",
-        dico.keys().cloned().collect::<Vec<_>>().join("|")
+        dico.keys().copied().collect::<Arc<[_]>>().join("|")
     ))
     .unwrap();
 
@@ -101,19 +125,19 @@ fn anglophonization(date: &str) -> String {
         // Use 12:00 and UTC TZ for chrono parser
         "{} 12:00 +0000",
         // Replace french by english month
-        re.replace_all(date, |cap: &Captures| match &cap[0] {
+        re.replace_all(&date.to_lowercase(), |cap: &Captures| match &cap[0] {
             month if dico.contains_key(month) => dico.get(month).unwrap(),
             month => {
-                panic!("Unknown month: {}", month)
+                panic!("Unknown month: {month}")
             }
         })
     )
 }
 
-/// Turn a string to a DateTime
+/// Turn a string to a `DateTime`
 fn get_date(date: &str) -> DateTime<Utc> {
     // Use and keep UTC time, we have the hour set to 12h and
-    // Paris 8 is in France so there is no problems
+    // Paris 7 is in France so there is no problems
     DateTime::parse_from_str(&anglophonization(date), "%e %B %Y %H:%M %z")
         .unwrap()
         .into()

src/main.rs

@@ -1,6 +1,8 @@
 use clap::Parser;
+use dialoguer::Input;
 use regex::Regex;
 
+mod filter;
 mod ics;
 mod info;
 mod timetable;
@@ -9,73 +11,81 @@ mod utils;
 #[derive(Parser)]
 #[clap(version, about, long_about = None)]
 struct Args {
-    /// The class you want to get the timetable, i.e.: L2-A
+    /// The class you want to get the timetable, i.e.: M1
     #[clap(value_parser)]
     class: String,
 
-    /// The semester you want (useful only in 3rd year, 1-2 use letter in class)
+    /// The semester you want (1 or 2), default to current semester
     #[clap(short, long, value_parser, value_name = "SEMESTER NUMBER")]
     semester: Option<i8>,
 
+    /// The year, default to current year
+    #[clap(short, long, value_parser, value_name = "YEAR")]
+    year: Option<i32>,
+
     /// Export to iCalendar format (.ics)
     #[clap(short, long, value_name = "FILE NAME")]
     export: Option<String>,
 
-    /// Size of cell of the timetable (irrelevant when exporting the timetable)
+    /// Doesn't distinguish TD from TP
-    #[clap(short, long, value_name = "CELL LENGTH", default_value_t = 35)]
+    #[clap(short, long)]
-    cl: usize,
+    td_are_tp: bool,
+
+    /// First day of your year
+    #[clap(short, long)]
+    first_day: Option<String>,
+
+    /// If TD/TP start a week after courses
+    #[clap(short, long)]
+    week_skip: bool,
 }
 
 #[tokio::main]
 async fn main() {
     let args = Args::parse();
 
-    let matches = Regex::new(r"[Ll](?P<year>\d)[-–•·]?(?P<letter>.)?")
+    let matches = Regex::new(r"(?i)M(?P<level>[1,2])")
         .unwrap()
         .captures(&args.class)
         .unwrap();
 
-    let year = matches
+    let level = matches
-        .name("year")
+        .name("level")
         .unwrap()
         .as_str()
         .parse::<i8>()
         .unwrap();
-    let letter = matches
-        .name("letter")
-        .map(|c| c.as_str().chars().next().expect("Error in letter"));
 
-    // Show a separator only if we need one
+    let user_agent = format!("cal7tor/{}", env!("CARGO_PKG_VERSION"));
-    let seperator = match letter {
+
-        Some(_) => "-",
+    println!("Récupération de l'emploi du temps des M{level}...");
-        None => "",
+    let mut timetable = timetable::timetable(level, args.semester, args.year, &user_agent).await;
+
+    timetable = filter::timetable(timetable, args.td_are_tp);
+
+    let date = match args.first_day {
+        None => Input::new()
+            .with_prompt("Début des cours de l'année")
+            .default(info::get_start_date(level, args.semester, args.year, &user_agent).await)
+            .interact_text()
+            .unwrap(),
+        Some(day) => day,
     };
 
-    let user_agent = format!("cal8tor/{}", env!("CARGO_PKG_VERSION"));
-
-    println!(
-        "Récupération de l'emploi du temps des L{}{}{}...",
-        year,
-        seperator,
-        letter.unwrap_or_default().to_uppercase()
-    );
-    let timetable = timetable::timetable(year, args.semester, letter, &user_agent).await;
-
     println!("Récupération des informations par rapport à l'année...");
-    let info = info::info(&user_agent).await;
+    let info = info::info(args.semester, args.year, &date, args.week_skip);
 
     if args.export.is_some() {
         // Export the calendar
         let mut filename = args.export.unwrap();
 
-        let builded_timetable = timetable::build(timetable, info);
+        let builded_timetable = timetable::build(&timetable, &info);
         ics::export(builded_timetable, &mut filename);
 
-        println!("Fichier .ICS construit et exporté => {}", filename);
+        println!("Fichier .ICS construit et exporté => {filename}");
     } else {
         // Show the calendar
         println!("Affichage...");
-        timetable::display(timetable, args.cl);
+        timetable::display(&timetable);
-        println!("Vous devrez peut-être mettre votre terminal en plein écran si ce n'est pas déjà le cas.");
     }
 }

src/timetable.rs

@@ -1,242 +1,152 @@
+#![allow(clippy::cast_sign_loss)]
+
 use chrono::{Datelike, Duration, TimeZone, Utc};
 use regex::Regex;
-use scraper::{Html, Selector};
+use scraper::Selector;
-use std::collections::HashMap;
+use std::{collections::HashMap, sync::Arc};
 
 use crate::utils::{
-    self, capitalize,
+    format_time_slot, get_hours, get_semester, get_webpage, get_year,
-    models::{Position, TabChar},
+    models::{Info, InfoList},
+    Capitalize,
 };
 
+use self::models::Day;
+
 pub mod models;
 
 /// Fetch the timetable for a class
 pub async fn timetable(
-    year: i8,
+    level: i8,
     semester_opt: Option<i8>,
-    letter: Option<char>,
+    year_opt: Option<i32>,
     user_agent: &str,
-) -> (Vec<String>, (usize, Vec<models::Day>)) {
+) -> models::Timetable {
-    let semester = get_semester(semester_opt, letter);
+    let semester = get_semester(semester_opt);
 
-    let document = get_webpage(year, semester, letter, user_agent)
+    let year = get_year(year_opt, semester);
+
+    let document = get_webpage(level, semester, &year, user_agent)
         .await
         .expect("Can't reach timetable website.");
 
     // Selectors
     let sel_table = Selector::parse("table").unwrap();
-    let sel_tr = Selector::parse("tr").unwrap();
     let sel_tbody = Selector::parse("tbody").unwrap();
-    let sel_th = Selector::parse("th").unwrap();
     let sel_td = Selector::parse("td").unwrap();
-    let sel_em = Selector::parse("em").unwrap();
     let sel_small = Selector::parse("small").unwrap();
-    let sel_strong = Selector::parse("strong").unwrap();
+    let sel_b = Selector::parse("b").unwrap();
+    let sel_span = Selector::parse("span").unwrap();
 
     // Find the timetable
     let raw_timetable = document.select(&sel_table).next().unwrap();
 
-    // Find the slots available for the timetable
+    let schedules = get_hours();
-    let raw_schedules = raw_timetable.select(&sel_tr).next().unwrap();
 
-    // Find availables schedules
+    let mut timetable: Vec<models::Day> = Vec::new();
-    let mut schedules = Vec::new();
-    for time in raw_schedules.select(&sel_th) {
-        schedules.push(time.inner_html());
-    }
 
-    // Find the timetable values
+    raw_timetable
-    let raw_timetable_values = raw_timetable.select(&sel_tbody).next().unwrap();
+        .select(&sel_tbody)
+        .next()
+        .unwrap()
+        .select(&sel_td)
+        .filter(|element| element.value().attr("title").is_some())
+        .for_each(|i| {
+            let extra_data = i.select(&sel_span).next().map(|span|
+                 span.inner_html().replace("<br>", "").trim().to_owned()
+            );
 
-    // For each days
+            /* TODO: Instead of searching *_M2, just find any TD_* and TP_* */
-    let mut timetable = Vec::new();
+            let matches =
-    let span_regex = Regex::new(r"<span.*</span>").unwrap();
+                Regex::new(
-    for day in raw_timetable_values.select(&sel_tr) {
+                    r"(?P<type>COURS|COURS_TD|TD|TD_M2|TP|TP_M2)? (?P<name>.*) : (?P<day>(lundi|mardi|mercredi|jeudi|vendredi)) (?P<startime>.*) \(durée : (?P<duration>.*)\)")
-        let mut courses_vec = Vec::new();
+                    .unwrap()
-        let mut location_tracker = 0;
+                    .captures(i.value().attr("title").unwrap())
-        for course in day.select(&sel_td) {
+                    .unwrap();
-            if course.inner_html() == "—" {
+
-                courses_vec.push(None);
+            let day = matches
-                location_tracker += 1;
+                .name("day")
-            } else {
+                .unwrap()
-                courses_vec.push(Some(models::Course {
+                .as_str()
-                    name: match course.select(&sel_em).next() {
+                .capitalize();
-                        Some(value) => span_regex.replace(&value.inner_html(), " ").to_string(),
+
-                        None => span_regex
+            let startime = matches
-                            .replace(course.inner_html().split("<br>").next().unwrap(), " ")
+                .name("startime")
-                            .to_string(),
+                .unwrap()
+                .as_str();
+
+            let binding = i.select(&sel_b).last().unwrap().inner_html();
+            let course = models::Course{
+                category: match matches
+                .name("type")
+                .map_or("", |m| m.as_str()) {
+                    /* TODO: Instead of searching *_M2, just find any TD_* and TP_* */
+                    "COURS" => [models::Category::Cours].into(),
+                    "TP" | "TP_M2" => [models::Category::TP].into(),
+                    "TD" | "TD_M2" => [models::Category::TD].into(),
+                    "COURS_TD" => [models::Category::Cours, models::Category::TD].into(),
+                    _ => {
+                        println!("Unknown type of course, falling back to 'COURS': {}", i.value().attr("title").unwrap());
+                        [models::Category::Cours].into()
                     },
-                    professor: match course
+                },
-                        .select(&sel_small)
+                name: Regex::new(r"[ -][ML][1-3]$").unwrap().replace(
-                        .next()
+                    matches
+                        .name("name")
                         .unwrap()
-                        .inner_html()
+                        .as_str(),
-                        .split("<br>")
+                    ""
-                        .next()
+                ).to_string(),
-                    {
+                professor: if let Some(raw_prof) = i.select(&sel_small).last() {
-                        Some(data) => {
+                        match raw_prof.inner_html() {
-                            if data.contains("</strong>") {
+                            i if i.starts_with("<span") => None,
-                                // This is the room, so there is no professor assigned
+                            i => Some(i),
-                                // to this courses yet
-                                None
-                            } else {
-                                Some(data.to_string())
-                            }
                         }
-                        None => None,
+                    } else { None },
-                    },
+                room: Regex::new(r"(<table.*<\/table>|<br>.*?<br>.*?)?<br>(?P<location>.*?)<br>")
-                    room: capitalize(&mut match course.select(&sel_strong).next() {
+                    .unwrap()
-                        Some(el) => el.inner_html().replace("<br>", ""),
+                    .captures(&binding)
-                        // Error in the site, silently passing... (the room is probably at the professor member)
+                    .unwrap().name("location")
-                        None => String::new(),
+                    .unwrap()
-                    }),
+                    .as_str().to_owned(),
-                    start: location_tracker,
+                start: schedules.iter().position(|r| r.starts_with(startime)).unwrap(),
-                    size: match course.value().attr("colspan") {
+                size: i.value().attr("rowspan").unwrap().parse::<usize>().unwrap(),
-                        Some(i) => i.parse().unwrap(),
+                dtstart: None,
-                        None => 1,
+                dtend: None,
-                    },
+                data: extra_data,
-                    dtstart: None,
+            };
-                    dtend: None,
-                }));
 
-                match &courses_vec[courses_vec.len() - 1] {
+            // Search for the day in the timetable
-                    Some(course) => location_tracker += course.size,
+            if let Some(existing_day) = timetable.iter_mut().find(|x| x.name == day) {
-                    None => location_tracker += 1,
+                existing_day.courses.push(Some(course));
-                }
+            } else {
+                // Day with the name doesn't exist, create a new Day
+                timetable.push(models::Day {
+                    name: day.clone(),
+                    courses: vec![Some(course)],
+                });
             }
-        }
+        });
 
-        timetable.push(models::Day {
+    // Sort by days
-            name: day.select(&sel_th).next().unwrap().inner_html(),
+    let day_positions = ["Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi"]
-            courses: courses_vec,
+        .iter()
-        })
+        .enumerate()
-    }
+        .map(|(i, &day)| (day.to_owned(), i))
-
+        .collect::<HashMap<String, usize>>();
-    if !check_consistency(&schedules, &timetable) {
+    timetable.sort_by(|a, b| day_positions[&a.name].cmp(&day_positions[&b.name]));
-        panic!("Error when building the timetable.");
-    }
 
     (schedules, (semester as usize, timetable))
 }
 
-/// Get timetable webpage
-async fn get_webpage(
-    year: i8,
-    semester: i8,
-    letter: Option<char>,
-    user_agent: &str,
-) -> Result<Html, Box<dyn std::error::Error>> {
-    let url = {
-        let panic_semester_message = "Unknown semester.";
-        let panic_letter_message = "Unknown letter.";
-
-        let base_url = "https://informatique.up8.edu/licence-iv/edt";
-        let allow_letters_1 = match semester {
-            1 => ['a', 'b', 'c'],
-            2 => ['x', 'y', 'z'],
-            _ => panic!("{}", panic_semester_message),
-        };
-        let allow_letters_2_3 = match semester {
-            1 => ['a', 'b'],
-            2 => ['x', 'y'],
-            _ => panic!("{}", panic_semester_message),
-        };
-        match year {
-            1 => {
-                let c = letter.expect(panic_letter_message).to_ascii_lowercase();
-                if allow_letters_1.contains(&c) {
-                    format!("{}/l1-{}.html", base_url, c)
-                } else {
-                    panic!("{}", panic_letter_message)
-                }
-            }
-            2 => {
-                let c = letter.expect(panic_letter_message).to_ascii_lowercase();
-                if allow_letters_2_3.contains(&c) {
-                    format!("{}/l2-{}.html", base_url, c)
-                } else {
-                    panic!("{}", panic_letter_message)
-                }
-            }
-            3 => {
-                let c = letter.expect(panic_letter_message).to_ascii_lowercase();
-                if allow_letters_2_3.contains(&c) {
-                    format!("{}/l3-{}.html", base_url, c)
-                } else {
-                    panic!("{}", panic_letter_message)
-                }
-            }
-            _ => panic!("Unknown year."),
-        }
-    };
-
-    // Use custom User-Agent
-    let client = reqwest::Client::builder().user_agent(user_agent).build()?;
-    let html = client.get(&url).send().await?.text().await?;
-
-    // Panic on error
-    crate::utils::check_errors(&html, &url);
-
-    // Parse document
-    let document = Html::parse_document(&html);
-
-    Ok(document)
-}
-
-/// Check if the timetable is well built
-fn check_consistency(schedules: &[String], timetable: &Vec<models::Day>) -> bool {
-    let mut checker = true;
-    for day in timetable {
-        let mut i = 0;
-        for course in &day.courses {
-            match course {
-                Some(course_it) => {
-                    // Checks the consistency of course start times
-                    if i != course_it.start {
-                        checker = false;
-                        break;
-                    }
-                    // Keep the track of how many courses are in the day
-                    i += course_it.size
-                }
-                None => i += 1,
-            }
-        }
-        // The counter should be the same as the amount of possible hours of the day
-        if i != schedules.len() {
-            checker = false;
-            break;
-        }
-    }
-
-    checker
-}
-
-// Data builded in the timetable webpage
-type T = (
-    // Schedules
-    Vec<String>,
-    // Timetable per days with the semester as the key
-    (usize, Vec<models::Day>),
-);
-// Data builded in the info webpage
-type D = HashMap<
-    // Semester
-    usize,
-    // List of start and repetition of course weeks
-    Vec<(chrono::DateTime<Utc>, i64)>,
->;
-
 /// Build the timetable
-pub fn build(timetable: T, dates: D) -> Vec<models::Course> {
+pub fn build(timetable: &models::Timetable, dates: &Info) -> Vec<models::Course> {
     let mut schedules = Vec::new();
     // h1 => heure de début | m1 => minute de début
     // h2 => heure de fin   | m2 => minute de fin
-    let re =
+    let re = Regex::new(r"(?P<h1>\d{1,2})h(?P<m1>\d{2})-(?P<h2>\d{1,2})h(?P<m2>\d{2})").unwrap();
-        Regex::new(r"(?P<h1>\d{1,2})(h|:)(?P<m1>\d{1,2})?.(?P<h2>\d{1,2})(h|:)(?P<m2>\d{1,2})?")
+    for hour in timetable.0.iter() {
-            .unwrap();
+        let captures = re.captures(hour).unwrap();
-    for hour in timetable.0 {
-        let captures = re.captures(&hour).unwrap();
 
         let h1 = match captures.name("h1") {
             Some(h) => h.as_str().parse().unwrap(),
@@ -262,19 +172,66 @@ pub fn build(timetable: T, dates: D) -> Vec<models::Course> {
 
     // Start date of the back-to-school week
     let datetimes = dates.get(&timetable.1 .0).unwrap();
-    let before_break = datetimes.get(0).unwrap();
+    add_courses(
+        &mut semester,
+        &schedules,
+        &timetable.1 .1,
+        &datetimes.course,
+        Some(&vec![models::Category::Cours]),
+        None,
+    );
+    add_courses(
+        &mut semester,
+        &schedules,
+        &timetable.1 .1,
+        &datetimes.td_tp,
+        None,
+        Some(&vec![models::Category::Cours]),
+    );
+
+    semester
+}
+
+type Schedule = [((u32, u32), (u32, u32))];
+
+/// Add a course to the semester list
+fn add_courses(
+    // Accumulator of courses of semester
+    semester: &mut Vec<models::Course>,
+    // Hours used
+    schedules: &Schedule,
+    // List of days
+    days: &Vec<Day>,
+    // Current courses list
+    info: &InfoList,
+    // List of category allowed
+    keep: Option<&Vec<models::Category>>,
+    // List of category excluded
+    exclude: Option<&Vec<models::Category>>,
+) {
+    let before_break = info.first().unwrap();
     let mut date = before_break.0;
     let mut rep = before_break.1;
     // For each weeks
     for _ in 0..2 {
         for _ in 0..rep {
-            for day in &timetable.1 .1 {
+            for day in days {
-                for mut course in day.courses.clone().into_iter().flatten() {
+                for mut course in day.courses.iter().flatten().cloned() {
                     // Get the hours
                     let start = schedules.get(course.start).unwrap().0;
                     // -1 because we only add when the size is > 1
                     let end = schedules.get(course.start + course.size - 1).unwrap().1;
 
+                    // Check keep and exclude filters
+                    if keep
+                        .is_some_and(|list| !course.category.iter().any(|item| list.contains(item)))
+                        || exclude.is_some_and(|list| {
+                            course.category.iter().any(|item| list.contains(item))
+                        })
+                    {
+                        continue;
+                    }
+
                     // Add the changed datetimes
                     course.dtstart = Some(
                         Utc.with_ymd_and_hms(
@@ -306,141 +263,35 @@ pub fn build(timetable: T, dates: D) -> Vec<models::Course> {
             // From friday to monday
             date += Duration::days(2);
         }
-        let after_break = datetimes.get(1).unwrap();
+        let after_break = info.last().unwrap();
         date = after_break.0;
         rep = after_break.1;
     }
-
-    semester
-}
-
-/// Get the current semester depending on the letter or the current date
-fn get_semester(semester: Option<i8>, letter: Option<char>) -> i8 {
-    match semester {
-        // Force the asked semester
-        Some(n) => n,
-        // Find the potential semester
-        None => match letter {
-            // Based on letter (kinda accurate)
-            Some(c) => {
-                if c.to_ascii_uppercase() as i8 > 77 {
-                    // If letter is N or after
-                    2
-                } else {
-                    // If letter is before N
-                    1
-                }
-            }
-            // Based on the time (kinda less accurate)
-            None => {
-                if Utc::now().month() > 6 {
-                    // From july to december
-                    1
-                } else {
-                    // from january to june
-                    2
-                }
-            }
-        },
-    }
 }
 
 /// Display the timetable
-pub fn display(timetable: (Vec<String>, (usize, Vec<models::Day>)), cell_length: usize) {
+pub fn display(timetable: &(Arc<[String]>, (usize, Vec<Day>))) {
-    // Cell length for hours
+    for day in &timetable.1 .1 {
-    let clh = 11;
+        for (index, course_option) in day.courses.iter().enumerate() {
-    // Cell number
+            if let Some(course) = course_option {
-    let cn = 6;
+                if index == 0 {
-    // 3/4 of cell length
+                    println!("\n{}:", day.name);
-    let quarter = (3 * cell_length) / 4;
+                }
 
-    let sep = TabChar::Bv.val();
+                println!(
-
+                    "  {} - {} : {} ({}) // {}",
-    // Top of the tab
+                    format_time_slot(course.start, course.size),
-    utils::line_table(clh, cell_length, cn, Position::Top, HashMap::new());
+                    course
-
+                        .category
-    // First empty case
+                        .iter()
-    print!("{}{:^clh$}{}", sep, "", sep);
+                        .map(std::string::ToString::to_string)
-
+                        .collect::<Vec<String>>()
-    // Print day's of the week
+                        .join(", "),
-    let mut days = HashMap::new();
+                    course.name,
-    for (i, data) in timetable.1 .1.iter().enumerate() {
+                    course.room,
-        days.insert(i, &data.name);
+                    course.professor.as_deref().unwrap_or("N/A"),
-        print!("{:^cell_length$}{}", &data.name, sep);
+                );
-    }
-
-    // Store the data of the course for utils::line_table
-    let mut next_skip = HashMap::new();
-    // For each hours -- i the hour's number
-    for (i, hour) in timetable.0.into_iter().enumerate() {
-        // Draw separator line
-        utils::line_table(clh, cell_length, cn, Position::Middle, next_skip);
-
-        // Reset
-        next_skip = HashMap::new();
-
-        // Print hour
-        print!("{}{:^clh$}", sep, hour);
-
-        // For all the days - `j` the day's number
-        for (j, day) in timetable.1 .1.iter().enumerate() {
-            // True if we found something about the slot we are looking for
-            let mut info_slot = false;
-
-            // For all the courses of each days - `k` the possible course.start
-            for (k, course_opt) in day.courses.iter().enumerate() {
-                match course_opt {
-                    // If there is a course
-                    Some(course) => {
-                        // Check the course's hour
-                        if i == course.start {
-                            // If the course uses more than one time slot
-                            if course.size > 1 {
-                                // If the data is too long
-                                if course.name.len() > quarter {
-                                    let data = utils::split_half(&course.name);
-                                    next_skip.insert(j, data.1.trim());
-                                    print!("{}{:^cell_length$}", sep, data.0.trim());
-                                } else {
-                                    next_skip.insert(j, &course.name);
-                                    print!("{}{:^cell_length$}", sep, "");
-                                }
-                                info_slot = true;
-                                break;
-                            } else {
-                                // Else simply print the course
-                                // If the data is too long
-                                if course.name.len() > quarter {
-                                    print!("{}{:^cell_length$}", sep, utils::etc_str(&course.name));
-                                } else {
-                                    print!("{}{:^cell_length$}", sep, &course.name);
-                                }
-                                info_slot = true;
-                                break;
-                            }
-                        }
-                    }
-                    // If no course was found
-                    None => {
-                        // Verify the "no course" is in the correct day and hour
-                        if *days.get(&j).unwrap() == &day.name.to_string() && k == i {
-                            // If yes print empty row because there is no course
-                            print!("{}{:^cell_length$}", sep, "");
-                            info_slot = true;
-                            break;
-                        }
-                        // Else it was a course of another day/time
-                    }
-                };
-            }
-            if !info_slot {
-                // We found nothing about the slot because the precedent course
-                // takes more place than one slot
-                print!("{}{:^cell_length$}", sep, "");
             }
         }
-        print!("{}", sep);
     }
-    // Bottom of the table
-    utils::line_table(clh, cell_length, cn, Position::Bottom, HashMap::new());
 }

src/timetable/models.rs

@@ -1,5 +1,23 @@
-#[derive(Clone)]
+use std::sync::Arc;
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum Category {
+    Cours,
+    TP,
+    TD,
+}
+
+impl std::fmt::Display for Category {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        std::fmt::Debug::fmt(self, f)
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
 pub struct Course {
+    /// Type du cours
+    pub category: Arc<[Category]>,
+
     /// Course's name
     pub name: String,
 
@@ -25,11 +43,23 @@ pub struct Course {
     /// Datetime when the course end
     /// Filled only when building for the ICS
     pub dtend: Option<chrono::DateTime<chrono::Utc>>,
+
+    /// Extra data
+    pub data: Option<String>,
 }
 
+#[derive(Debug)]
 pub struct Day {
     /// Day's name
     pub name: String,
     /// Ordered list of all the courses of the day
     pub courses: Vec<Option<Course>>,
 }
+
+// Data builded in the timetable webpage
+pub type Timetable = (
+    // Schedules
+    Arc<[String]>,
+    // Timetable per days with the semester as the key
+    (usize, Vec<Day>),
+);

src/utils.rs

@@ -1,122 +1,172 @@
+use std::{collections::HashMap, sync::Arc};
+
+use chrono::{Datelike, Utc};
+use scraper::Html;
+
+use crate::timetable::models::{Category, Course, Timetable};
+
 pub mod models;
 
 /// Panic if an error happened
 pub fn check_errors(html: &String, loc: &str) {
+    let no_timetable = "Aucun créneau horaire affecté";
     match html {
-        t if t.contains(&err_code(429)) => panic!(
+        t if t.contains(no_timetable) => panic!("URL: {loc} • {no_timetable}"),
-            "URL: {} • HTTP 429: Slow down - Rate limited (too many access attempts detected)",
-            loc
-        ),
         _ => (),
     }
 }
 
-/// Create String error code
+/// Get timetable webpage
-fn err_code(code: i32) -> String {
+pub async fn get_webpage(
-    format!("HTTP Code : {}", code)
+    level: i8,
+    semester: i8,
+    year: &str,
+    user_agent: &str,
+) -> Result<Html, Box<dyn std::error::Error>> {
+    let url = format!("https://silice.informatique.univ-paris-diderot.fr/ufr/U{year}/EDT/visualiserEmploiDuTemps.php?quoi=M{level},{semester}");
+
+    // Use custom User-Agent
+    let client = reqwest::Client::builder().user_agent(user_agent).build()?;
+    let html = client.get(&url).send().await?.text().await?;
+
+    // Panic on error
+    crate::utils::check_errors(&html, &url);
+
+    // Parse document
+    let document = Html::parse_document(&html);
+
+    Ok(document)
 }
 
-/// Print a line for the table
+/// Get the current semester depending on the current date
-pub fn line_table(
+pub fn get_semester(semester: Option<i8>) -> i8 {
-    cell_length_hours: usize,
+    match semester {
-    cell_length: usize,
+        // Force the asked semester
-    number_cell: usize,
+        Some(n) => n,
-    pos: models::Position,
+        // Find the potential semester
-    skip_with: std::collections::HashMap<usize, &str>,
+        None => {
-) {
+            if Utc::now().month() > 6 {
-    // Left side
+                // From july to december
-    let ls = match pos {
+                1
-        models::Position::Top => models::TabChar::Jtl.val(),
+            } else {
-        models::Position::Middle => models::TabChar::Jl.val(),
+                // from january to june
-        models::Position::Bottom => models::TabChar::Jbl.val(),
+                2
-    };
-
-    // Middle
-    let ms = match pos {
-        models::Position::Top => models::TabChar::Jtb.val(),
-        models::Position::Middle => models::TabChar::Jm.val(),
-        models::Position::Bottom => models::TabChar::Jtt.val(),
-    };
-
-    // Right side
-    let rs = match pos {
-        models::Position::Top => models::TabChar::Jtr.val(),
-        models::Position::Middle => models::TabChar::Jr.val(),
-        models::Position::Bottom => models::TabChar::Jbr.val(),
-    };
-
-    // Right side before big cell
-    let rs_bbc = models::TabChar::Jr.val();
-    // Right side big cell before big cell
-    let rsbc_bbc = models::TabChar::Bv.val();
-    // Right side big cell
-    let rsbc = models::TabChar::Jl.val();
-
-    let line = models::TabChar::Bh.val().to_string().repeat(cell_length);
-    let line_h = models::TabChar::Bh
-        .val()
-        .to_string()
-        .repeat(cell_length_hours);
-
-    // Hours column
-    match skip_with.get(&0) {
-        Some(_) => print!("\n{}{}{}", ls, line_h, rs_bbc),
-        None => print!("\n{}{}{}", ls, line_h, ms),
-    };
-
-    // Courses columns
-    let range = number_cell - 1;
-    let mut last_day = false;
-    for i in 0..range {
-        // Check if it's a big cell
-        if i == range - 1 {
-            // Friday only
-            if let Some(text) = skip_with.get(&i) {
-                println!("{:^cell_length$}{}", text, rsbc_bbc);
-                last_day = true;
-            }
-        } else {
-            match skip_with.get(&i) {
-                Some(text) => match skip_with.get(&(i + 1)) {
-                    // Match check if the next cell will be big
-                    Some(_) => print!("{:^cell_length$}{}", text, rsbc_bbc),
-                    None => print!("{:^cell_length$}{}", text, rsbc),
-                },
-                None => match skip_with.get(&(i + 1)) {
-                    // Match check if the next cell will be big
-                    Some(_) => print!("{}{}", line, rs_bbc),
-                    None => print!("{}{}", line, ms),
-                },
             }
         }
     }
-    if !last_day {
+}
-        println!("{}{}", line, rs);
+
+/// Get the current year depending on the current date
+pub fn get_year(year: Option<i32>, semester: i8) -> String {
+    let wanted_year = match year {
+        // Force the asked semester
+        Some(n) => n,
+        // Find the potential semester
+        None => Utc::now().year(),
+    };
+
+    if semester == 1 {
+        format!("{}-{}", wanted_year, wanted_year + 1)
+    } else {
+        format!("{}-{}", wanted_year - 1, wanted_year)
     }
 }
 
-// Split a string in half with respect of words
+pub trait Capitalize {
-pub fn split_half(text: &str) -> (&str, &str) {
+    /// Capitalize string
-    let mid = text.len() / 2;
+    fn capitalize(&self) -> String;
-    for (i, j) in (mid..text.len()).enumerate() {
+}
-        if text.as_bytes()[j] == b' ' {
+
-            return text.split_at(mid + i);
+impl Capitalize for str {
+    fn capitalize(&self) -> String {
+        let mut string = self.to_owned();
+        if let Some(r) = string.get_mut(0..1) {
+            r.make_ascii_uppercase();
+        }
+
+        string
+    }
+}
+
+/// Get all hours used the source, from 08:00 to at least 20:00
+pub fn get_hours() -> Arc<[String]> {
+    let mut hours = vec![];
+    for hour in 8..=20 {
+        for minute in &[0, 15, 30, 45] {
+            let hour_str = format!("{hour}h{minute:02}");
+            if let Some(last_hour) = hours.pop() {
+                hours.push(format!("{last_hour}-{hour_str}"));
+            }
+            hours.push(hour_str);
         }
     }
-
+    for _ in 0..4 {
-    text.split_at(mid)
+        hours.pop();
-}
-
-// Reduce size of string by adding etc. to it, and cutting some info
-pub fn etc_str(text: &str) -> String {
-    format!("{}...", split_half(text).0.trim())
-}
-
-// Capitalize string
-pub fn capitalize(text: &mut str) -> String {
-    if let Some(r) = text.get_mut(0..1) {
-        r.make_ascii_uppercase();
     }
 
-    text.to_string()
+    hours.into()
+}
+
+/// Names showed to the users
+pub fn get_selection(data: &(&Course, String)) -> String {
+    let hours = get_hours();
+
+    format!(
+        "{} - {} {}-{}",
+        data.0.name,
+        data.1,
+        hours[data.0.start].split_once('-').unwrap().0,
+        hours[data.0.start + data.0.size - 1]
+            .split_once('-')
+            .unwrap()
+            .1
+    )
+}
+
+/// Entry's name used for finding duplicates
+pub fn get_entry(course: &Course) -> String {
+    format!("{} - {:?}", course.name, course.category)
+}
+
+/// Entry's name used for finding duplicates, ignoring categories
+pub fn get_entry_nocat(course: &Course) -> String {
+    course.name.clone()
+}
+
+/// Returns a couple of (list of courses) and (a hashmap of how much they appears in the vector)
+pub fn get_count<'a>(
+    timetable: &'a mut Timetable,
+    allowed_list: &'a [Category],
+    getter: fn(&Course) -> String,
+) -> (Vec<(&'a Course, String)>, HashMap<String, i32>) {
+    // List of courses who will be courses
+    let mut courses = vec![];
+
+    let mut counts = HashMap::new();
+    timetable.1 .1.iter().for_each(|day| {
+        day.courses.iter().for_each(|course_opt| {
+            if let Some(course) = course_opt {
+                if course
+                    .category
+                    .iter()
+                    .any(|category| allowed_list.contains(category))
+                {
+                    courses.push((course, day.name.clone()));
+                    let count = counts.entry(getter(course)).or_insert(0);
+                    *count += 1;
+                }
+            }
+        });
+    });
+
+    (courses, counts)
+}
+
+pub fn format_time_slot(start: usize, size: usize) -> String {
+    let start_hour = 8 + (start * 15) / 60;
+    let start_minute = (start * 15) % 60;
+    let end_hour = start_hour + (size * 15) / 60;
+    let end_minute = (start_minute + (size * 15)) % 60;
+
+    format!("{start_hour:02}h{start_minute:02}-{end_hour:02}h{end_minute:02}")
 }

src/utils/models.rs

@@ -1,51 +1,18 @@
-/// Collection of char for the table
+use std::collections::HashMap;
-pub enum TabChar {
+
-    /// Vertical bar
+use chrono::Utc;
-    Bv,
+
-    /// Horizontal bar
+pub type InfoList = Vec<(chrono::DateTime<Utc>, i64)>;
-    Bh,
+
-    /// Joint left
+pub struct InfoType {
-    Jl,
+    pub course: InfoList,
-    /// Joint right
+    pub td_tp: InfoList,
-    Jr,
-    /// Joint bottom left
-    Jbl,
-    /// Joint bottom right
-    Jbr,
-    /// Joint top left
-    Jtl,
-    /// Joint top right
-    Jtr,
-    /// Joint to top
-    Jtt,
-    /// Joint to bottom
-    Jtb,
-    /// Joint of the middle
-    Jm,
 }
 
-impl TabChar {
+// Info who old the start and end of courses
-    /// Value of the element
+pub type Info = HashMap<
-    pub fn val(&self) -> char {
+    // Semester
-        match *self {
+    usize,
-            Self::Bv => '│',
+    // List of start and repetition of course and TD/TP weeks
-            Self::Bh => '─',
+    InfoType,
-            Self::Jl => '├',
+>;
-            Self::Jr => '┤',
-            Self::Jbl => '└',
-            Self::Jbr => '┘',
-            Self::Jtl => '┌',
-            Self::Jtr => '┐',
-            Self::Jtt => '┴',
-            Self::Jtb => '┬',
-            Self::Jm => '┼',
-        }
-    }
-}
-
-/// Position for lines inside the table
-pub enum Position {
-    Top,
-    Middle,
-    Bottom
-}