CHANGELOG.md

@@ -3,10 +3,6 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [0.3.7]
-### Fixed
-- session expiration is now recognized more accurately ([#44])
-
 ## [0.3.6]
 ### Fixed
 - `--all` once again downloads all courses you're a member of
@@ -170,7 +166,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [0.1.0] - 2020-04-21
 (undocumented)
 
-[#44]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/issues/44
 [#33]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/pull/33
 [#31]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/issues/31
 [#30]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/issues/30
@@ -194,8 +189,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 [@Craeckie]: https://github.com/Craeckie
 [@funnym0nk3y]: https://github.com/funnym0nk3y
 [@Ma27]: https://github.com/Ma27
-[Unreleased]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/compare/v0.3.7...HEAD
-[0.3.7]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/compare/v0.3.7...v0.3.6
+[Unreleased]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/compare/v0.3.6...HEAD
 [0.3.6]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/compare/v0.3.6...v0.3.5
 [0.3.5]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/compare/v0.3.5...v0.3.4
 [0.3.4]: https://github.com/FliegendeWurst/KIT-ILIAS-downloader/compare/v0.3.3...v0.3.4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "KIT-ILIAS-downloader"
-version = "0.3.7"
+version = "0.3.6"
 authors = ["FliegendeWurst <2012gdwu@posteo.de>"]
 license = "GPL-3.0-or-later"
 edition = "2018"
@@ -12,28 +12,28 @@ reqwest = { version = "0.11.0", default-features = false, features = ["cookies",
 tokio = { version = "1.24.2", features = ["fs", "macros", "net", "rt-multi-thread", "process"] }
 tokio-util = { version = "0.7.0", features = ["io"] }
 serde_json = "1.0.51"
-scraper = "0.17"
+scraper = "0.13.0"
 url = "2.1.1"
 futures = "0.3.8"
 futures-util = "0.3.8"
 futures-channel = "0.3.8"
 regex = "1.3.7"
 structopt = "0.3.13"
-rpassword = "7"
-rprompt = "2"
+rpassword = "6.0.1"
+rprompt = "1.0.5"
 ignore = "0.4.14"
 anyhow = "1.0.28"
 colored = "2.0.0"
 keyring = { git = "https://github.com/FliegendeWurst/keyring-rs" }
 cfg-if = "1.0.0"
-indicatif = "0.17"
+indicatif = "0.16.0"
 once_cell = "1.7.2"
 atty = "0.2.14"
 h2 = "0.3.3"
-cookie_store = "0.20"
-reqwest_cookie_store = "0.6"
+cookie_store = "0.16.1"
+reqwest_cookie_store = "0.3.0"
 bytes = "1.0.1"
-toml = "0.7"
+toml = "0.5.8"
 tempfile = "3.2.0"
 ego-tree = "0.6.2"
 async-recursion = "1.0.0"

src/cli.rs

@@ -157,7 +157,7 @@ pub fn ask_user_pass(opt: &Opt) -> Result<(String, String)> {
 	let user = if let Some(username) = opt.username.as_ref() {
 		username.clone()
 	} else {
-		rprompt::prompt_reply("Username: ").context("username prompt")?
+		rprompt::prompt_reply_stdout("Username: ").context("username prompt")?
 	};
 	let (pass, should_store);
 	let keyring = Lazy::new(|| keyring::Entry::new(env!("CARGO_PKG_NAME"), &user));

src/main.rs

@@ -151,8 +151,8 @@ async fn real_main(mut opt: Opt) -> Result<()> {
 	let mut rx = queue::set_parallel_jobs(ilias.opt.jobs);
 	PROGRESS_BAR_ENABLED.store(atty::is(atty::Stream::Stdout), Ordering::SeqCst);
 	if PROGRESS_BAR_ENABLED.load(Ordering::SeqCst) {
-		PROGRESS_BAR.set_draw_target(ProgressDrawTarget::stderr());
-		PROGRESS_BAR.set_style(ProgressStyle::default_bar().template("[{pos}/{len}+] {wide_msg}")?);
+		PROGRESS_BAR.set_draw_target(ProgressDrawTarget::stderr_nohz());
+		PROGRESS_BAR.set_style(ProgressStyle::default_bar().template("[{pos}/{len}+] {wide_msg}"));
 		PROGRESS_BAR.set_message("initializing..");
 	}
 
@@ -195,7 +195,7 @@ async fn real_main(mut opt: Opt) -> Result<()> {
 		}
 	}
 	if PROGRESS_BAR_ENABLED.load(Ordering::SeqCst) {
-		PROGRESS_BAR.set_style(ProgressStyle::default_bar().template("[{pos}/{len}] {wide_msg}")?);
+		PROGRESS_BAR.set_style(ProgressStyle::default_bar().template("[{pos}/{len}] {wide_msg}"));
 		PROGRESS_BAR.finish_with_message("done");
 	}
 	Ok(())