Update dependencies

Sort course list for a consistent display order
Fix compiler errors being treated improperly
Use tracing for logging

Author: Heliozoa

Cargo.lock

@@ -19,11 +19,14 @@ anyhow = { version = "1.0.56", features = ["backtrace"] }
 bytes = "1.4.0"
 clap = { version = "4.0.7", features = ["derive"] }
 clap_complete = "4.0.2"
-crossterm = "0.26.0"
-flexi_logger = "0.25.3"
+crossterm = "0.28.1"
+flexi_logger = "0.29.0"
 indicatif = "0.17.1"
 log = "0.4.17"
-reqwest = { version = "0.11.9", default-features = false, features = [
+ratatui = { version = "0.28.1", default-features = false, features = [
+  'crossterm',
+] }
+reqwest = { version = "0.12.7", default-features = false, features = [
   "blocking",
   "json",
   "rustls-tls",
@@ -33,10 +36,12 @@ rpassword = "7.0.0"
 serde = "1.0.136"
 serde_json = "1.0.79"
 termcolor = "1.1.3"
-terminal_size = "0.2.1"
-tmc-langs = { git = "https://github.com/rage/tmc-langs-rust", tag = "0.33.0" }
-toml = "0.7.2"
-tui = { version = "0.19.0", default-features = false, features = ['crossterm'] }
+terminal_size = "0.3.0"
+tmc-langs = { git = "https://github.com/rage/tmc-langs-rust", tag = "0.36.2" }
+toml = "0.8.19"
+tracing = "0.1.40"
+tracing-appender = "0.2.3"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 url = "2.2.2"
 uuid = { version = "1.4.0", features = ["v4"] }
 
@@ -52,3 +57,6 @@ clap_complete = "4.0.2"
 
 # [patch."https://github.com/rage/tmc-langs-rust"]
 # tmc-langs = { path = "../tmc-langs-rust/crates/tmc-langs" }
+
+# [patch.'https://github.com/rage/secret-project-331.git']
+# mooc-langs-api = { path = "../secret-project-331/services/headless-lms/langs-api" }

Cargo.toml

@@ -46,7 +46,7 @@ pub fn login(
     }
 
     if interactive_mode {
-        download_after_login(client, io, config, &org)?;
+        download_after_login(client, io, config, &org.slug)?;
     }
 
     io.println("Logged in", PrintColor::Success)?;

src/commands/login.rs

@@ -4,13 +4,14 @@ use crate::{
     interactive::{self, interactive_list},
     io::{Io, PrintColor},
 };
+use tmc_langs::tmc::response::Organization;
 
 // Asks for organization from user and saves it into file
 pub fn set_organization_old(
     io: &mut Io,
     client: &mut Client,
     config: &mut TmcCliConfig,
-) -> anyhow::Result<String> {
+) -> anyhow::Result<Organization> {
     // List all organizations
     let mut orgs = client.get_organizations()?;
     orgs.sort_by(|a, b| b.pinned.cmp(&a.pinned).then(b.name.cmp(&a.name)));
@@ -36,9 +37,9 @@ pub fn set_organization_old(
     let slug = io.read_line()?.trim().to_string();
 
     if let Some(org) = orgs.into_iter().find(|org| org.slug == slug) {
-        config.set_organization(org.slug);
+        config.set_organization(org.slug.clone());
         config.save()?;
-        return Ok(org.name);
+        return Ok(org);
     }
 
     anyhow::bail!("No such organization for the given slug: {}", slug);
@@ -48,7 +49,7 @@ pub fn set_organization(
     io: &mut Io,
     client: &mut Client,
     config: &mut TmcCliConfig,
-) -> anyhow::Result<String> {
+) -> anyhow::Result<Organization> {
     io.println("Fetching organizations...", PrintColor::Normal)?;
     let mut orgs = client.get_organizations()?;
     orgs.sort_by(|a, b| b.pinned.cmp(&a.pinned).then(a.name.cmp(&b.name)));
@@ -73,9 +74,9 @@ pub fn set_organization(
     };
 
     if let Some(org) = orgs.into_iter().find(|org| org.name == org_name) {
-        config.set_organization(org.slug);
+        config.set_organization(org.slug.clone());
         config.save()?;
-        return Ok(org.name);
+        return Ok(org);
     }
 
     anyhow::bail!("Something strange happened");
@@ -95,7 +96,7 @@ pub fn organization(
     };
 
     io.println(
-        &format!("Selected {org} as organization."),
+        &format!("Selected {} as organization.", org.name),
         PrintColor::Success,
     )?;
     Ok(())