From 3bf89e1106016e2d58e95350b4340ddc40ea356d Mon Sep 17 00:00:00 2001 From: 0x20F <0x20fa@gmail.com> Date: Thu, 30 Mar 2023 07:25:37 +0200 Subject: [PATCH 1/4] Fix timestamp now showing up properly when using the loading method --- src/logger/mod.rs | 20 ++++++++++++++++---- src/output/mod.rs | 20 ++++++++++++++++---- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/logger/mod.rs b/src/logger/mod.rs index f758e8a..3355df9 100644 --- a/src/logger/mod.rs +++ b/src/logger/mod.rs @@ -198,8 +198,8 @@ impl<'a> Logger<'a> { i = 0; } - let message = format!("\r{} {}", frames[i], &message); - output::stdout(colorize_string(message), ""); + let message = format!("{} {}", frames[i], &message); + output::stdout(colorize_string(message), "", true); io::stdout().flush().unwrap(); thread::sleep(Duration::from_millis(100)); @@ -278,7 +278,7 @@ impl<'a> Logger<'a> { self.done(); let message = message.to_string(); - output::stdout(self.formatter.colorize(&message), &self.get_line_ending()); + output::stdout(self.formatter.colorize(&message), &self.get_line_ending(), false); self } @@ -290,7 +290,7 @@ impl<'a> Logger<'a> { self.done(); let message = message.to_string(); - output::stderr(self.formatter.colorize(&message), &self.get_line_ending()); + output::stderr(self.formatter.colorize(&message), &self.get_line_ending(), false); self } @@ -345,6 +345,18 @@ mod tests { logger.success("Loading done!"); } + #[cfg(feature="timestamps")] + #[test] + fn loading_with_timestamps() { + let mut logger = Logger::new(); + logger.loading("Loading in the middle of a test is not good!"); + thread::sleep(Duration::from_secs(4)); + logger.loading("Still loading..."); + thread::sleep(Duration::from_secs(4)); + + logger.success("Loading done!"); + } + #[test] fn same() { let mut logger = Logger::new(); diff --git a/src/output/mod.rs b/src/output/mod.rs index eb7ab10..3d2adb3 100644 --- a/src/output/mod.rs +++ b/src/output/mod.rs @@ -24,23 +24,35 @@ fn current_time() -> String { /// Writes to stdout without replacing keys #[cfg(not(feature = "no_logger"))] -pub fn stdout(message: T, line_ending: &str) +pub fn stdout(message: T, line_ending: &str, with_carriage: bool) where T: Display, { + let mut carriage = ""; + + if with_carriage { + carriage = "\r"; + } + let timestamp = current_time(); - let message = format!("{}{}{}", timestamp, message, line_ending); + let message = format!("{}{}{}{}", carriage, timestamp, message, line_ending); print!("{}", message); } /// Writes to stderr without replacing keys #[cfg(not(feature = "no_logger"))] -pub fn stderr(message: T, line_ending: &str) +pub fn stderr(message: T, line_ending: &str, with_carriage: bool) where T: Display, { + let mut carriage = ""; + + if with_carriage { + carriage = "\r"; + } + let timestamp = current_time(); - let message = format!("{}{}{}", timestamp, message, line_ending); + let message = format!("{}{}{}{}", carriage, timestamp, message, line_ending); eprint!("{}", message); } From c088cb627d203d68be380eef9afcd953c36cc20c Mon Sep 17 00:00:00 2001 From: 0x20F <0x20fa@gmail.com> Date: Thu, 30 Mar 2023 07:26:02 +0200 Subject: [PATCH 2/4] Update cargo version --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 7b10ad2..d868330 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "paris" -version = "1.5.14" +version = "1.5.15" authors = ["Poly <0x20fa@gmail.com>"] edition = "2018" From fb61ca191fad18fa596d3cc0f6a724e6bb3e86fe Mon Sep 17 00:00:00 2001 From: 0x20F <0x20fa@gmail.com> Date: Thu, 30 Mar 2023 07:26:50 +0200 Subject: [PATCH 3/4] Delete unused workflow file --- .github/workflows/rust_test.yml | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .github/workflows/rust_test.yml diff --git a/.github/workflows/rust_test.yml b/.github/workflows/rust_test.yml deleted file mode 100644 index d54fa2f..0000000 --- a/.github/workflows/rust_test.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Rust - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -env: - CARGO_TERM_COLOR: always - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build - run: cargo build --verbose - - name: Run tests - run: cargo test --verbose From 04f18529d236d150d862b070e6e124d67fa46754 Mon Sep 17 00:00:00 2001 From: 0x20F <0x20fa@gmail.com> Date: Thu, 30 Mar 2023 07:28:45 +0200 Subject: [PATCH 4/4] Formatting --- src/logger/mod.rs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/logger/mod.rs b/src/logger/mod.rs index 3355df9..48be768 100644 --- a/src/logger/mod.rs +++ b/src/logger/mod.rs @@ -278,7 +278,11 @@ impl<'a> Logger<'a> { self.done(); let message = message.to_string(); - output::stdout(self.formatter.colorize(&message), &self.get_line_ending(), false); + output::stdout( + self.formatter.colorize(&message), + &self.get_line_ending(), + false, + ); self } @@ -290,7 +294,11 @@ impl<'a> Logger<'a> { self.done(); let message = message.to_string(); - output::stderr(self.formatter.colorize(&message), &self.get_line_ending(), false); + output::stderr( + self.formatter.colorize(&message), + &self.get_line_ending(), + false, + ); self } @@ -345,7 +353,7 @@ mod tests { logger.success("Loading done!"); } - #[cfg(feature="timestamps")] + #[cfg(feature = "timestamps")] #[test] fn loading_with_timestamps() { let mut logger = Logger::new();