From 434374906a464a894c6247f0c0f2296adf2d2f48 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Tue, 26 Aug 2025 03:35:43 +0200 Subject: [PATCH 1/6] Add a simple progressBar --- .../commons/progressbar/ProgressBar.java | 146 ++++++++++++++++++ .../commons/progressbar/ProgressBarTest.java | 114 ++++++++++++++ 2 files changed, 260 insertions(+) create mode 100644 eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java create mode 100644 eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java new file mode 100644 index 0000000..aa631a4 --- /dev/null +++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java @@ -0,0 +1,146 @@ +package com.eternalcode.commons.progressbar; + +public class ProgressBar { + + private final String filledToken; + + private final String emptyToken; + + private final boolean showBrackets; + private final String leftBracket; + private final String rightBracket; + private final String bracketColor; + + private final int length; + + private ProgressBar(Builder builder) { + String filledChar = builder.filledChar; + String emptyChar = builder.emptyChar; + String filledColor = builder.filledColor; + String emptyColor = builder.emptyColor; + + this.leftBracket = builder.leftBracket; + this.rightBracket = builder.rightBracket; + this.bracketColor = builder.bracketColor; + this.length = builder.length; + this.showBrackets = builder.showBrackets; + + this.filledToken = filledColor + filledChar; + this.emptyToken = emptyColor + emptyChar; + } + + public String render(double progress) { + double clampedProgress = Math.max(0, Math.min(1, progress)); + int filled = (int) (this.length * clampedProgress); + + StringBuilder bar = new StringBuilder(); + + if (this.showBrackets) { + bar.append(this.bracketColor).append(this.leftBracket); + } + + bar.append(this.filledToken.repeat(filled)); + bar.append(this.emptyToken.repeat(this.length - filled)); + + if (this.showBrackets) { + bar.append(this.bracketColor).append(this.rightBracket); + } + + return bar.toString(); + } + + public String render(int current, int max) { + if (max <= 0) { + return this.render(1.0); + } + double progress = (double) current / max; + return this.render(progress); + } + + public String render(long current, long max) { + if (max <= 0) { + return this.render(1.0); + } + double progress = (double) current / max; + return this.render(progress); + } + + public static Builder builder() { + return new Builder(); + } + + public static class Builder { + private String filledChar = "█"; + private String emptyChar = "░"; + private String filledColor = ""; + private String emptyColor = ""; + private String leftBracket = "["; + private String rightBracket = "]"; + private String bracketColor = ""; + private int length = 10; + private boolean showBrackets = true; + + public Builder filledChar(String filledChar) { + this.filledChar = filledChar; + return this; + } + + public Builder emptyChar(String emptyChar) { + this.emptyChar = emptyChar; + return this; + } + + public Builder filledColor(String filledColor) { + this.filledColor = filledColor; + return this; + } + + public Builder emptyColor(String emptyColor) { + this.emptyColor = emptyColor; + return this; + } + + public Builder leftBracket(String leftBracket) { + this.leftBracket = leftBracket; + return this; + } + + public Builder rightBracket(String rightBracket) { + this.rightBracket = rightBracket; + return this; + } + + public Builder brackets(String left, String right) { + this.leftBracket = left; + this.rightBracket = right; + return this; + } + + public Builder bracketColor(String bracketColor) { + this.bracketColor = bracketColor; + return this; + } + + public Builder length(int length) { + if (length <= 0) { + throw new IllegalArgumentException("Length must be positive"); + } + this.length = length; + return this; + } + + public Builder showBrackets(boolean showBrackets) { + this.showBrackets = showBrackets; + return this; + } + + public Builder hideBrackets() { + this.showBrackets = false; + return this; + } + + public ProgressBar build() { + return new ProgressBar(this); + } + } +} diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java new file mode 100644 index 0000000..3f509ed --- /dev/null +++ b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java @@ -0,0 +1,114 @@ +package com.eternalcode.commons.progressbar; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class ProgressBarTest { + + @Test + void testRenderFullProgress() { + ProgressBar bar = ProgressBar.builder() + .length(5) + .build(); + String rendered = bar.render(1.0); + + assertTrue(rendered.contains("█")); + assertFalse(rendered.contains("░")); + assertEquals(7, rendered.length()); + } + + @Test + void testRenderEmptyProgress() { + ProgressBar bar = ProgressBar.builder() + .length(5) + .build(); + String rendered = bar.render(0.0); + + assertTrue(rendered.contains("░")); + assertFalse(rendered.contains("█")); + assertEquals(7, rendered.length()); + } + + @Test + void testRenderHalfProgress() { + ProgressBar bar = ProgressBar.builder() + .length(4) + .build(); + String rendered = bar.render(0.5); + + assertTrue(rendered.contains("█")); + assertTrue(rendered.contains("░")); + assertEquals(6, rendered.length()); + } + + @Test + void testRenderIntOverMax() { + ProgressBar bar = ProgressBar.builder() + .length(3) + .build(); + String rendered = bar.render(5, 3); + + assertEquals("[███]", rendered); + } + + @Test + void testRenderIntWithZeroMax() { + ProgressBar bar = ProgressBar.builder() + .length(3) + .build(); + String rendered = bar.render(0, 0); + + assertEquals("[███]", rendered); + } + + @Test + void testHideBrackets() { + ProgressBar bar = ProgressBar.builder() + .length(3) + .hideBrackets() + .build(); + String rendered = bar.render(1.0); + + assertEquals("███", rendered); + } + + @Test + void testCustomCharacters() { + ProgressBar bar = ProgressBar.builder() + .length(4) + .filledChar("#") + .emptyChar("-") + .brackets("{", "}") + .build(); + + String rendered = bar.render(0.5); + assertEquals("{##--}", rendered); + } + + @Test + void testNegativeProgressClampedToZero() { + ProgressBar bar = ProgressBar.builder() + .length(3) + .build(); + String rendered = bar.render(-1.0); + + assertEquals("[░░░]", rendered); + } + + @Test + void testProgressGreaterThanOneClampedToOne() { + ProgressBar bar = ProgressBar.builder() + .length(3) + .build(); + String rendered = bar.render(2.0); + + assertEquals("[███]", rendered); + } + + @Test + void testInvalidLengthThrowsException() { + assertThrows(IllegalArgumentException.class, () -> ProgressBar.builder().length(0)); + assertThrows(IllegalArgumentException.class, () -> ProgressBar.builder().length(-5)); + } +} From 22f6cb1b29c72f412c6878616f669ad75de03128 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Tue, 26 Aug 2025 03:40:23 +0200 Subject: [PATCH 2/6] Update eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../com/eternalcode/commons/progressbar/ProgressBar.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java index aa631a4..c0919d0 100644 --- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java +++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java @@ -14,19 +14,14 @@ public class ProgressBar { private final int length; private ProgressBar(Builder builder) { - String filledChar = builder.filledChar; - String emptyChar = builder.emptyChar; - String filledColor = builder.filledColor; - String emptyColor = builder.emptyColor; - this.leftBracket = builder.leftBracket; this.rightBracket = builder.rightBracket; this.bracketColor = builder.bracketColor; this.length = builder.length; this.showBrackets = builder.showBrackets; - this.filledToken = filledColor + filledChar; - this.emptyToken = emptyColor + emptyChar; + this.filledToken = builder.filledColor + builder.filledChar; + this.emptyToken = builder.emptyColor + builder.emptyChar; } public String render(double progress) { From ab993dc4f2b1a7d7ddad9f0e8fb3b4a92172c907 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Tue, 26 Aug 2025 03:40:58 +0200 Subject: [PATCH 3/6] Update eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../com/eternalcode/commons/progressbar/ProgressBarTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java index 3f509ed..21e0597 100644 --- a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java +++ b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java @@ -13,9 +13,7 @@ void testRenderFullProgress() { .build(); String rendered = bar.render(1.0); - assertTrue(rendered.contains("█")); - assertFalse(rendered.contains("░")); - assertEquals(7, rendered.length()); + assertEquals("[█████]", rendered); } @Test From a6c92d9ec3bfdcf2ff448b1b99f6b1bbf377154c Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Tue, 26 Aug 2025 03:41:05 +0200 Subject: [PATCH 4/6] Update eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../com/eternalcode/commons/progressbar/ProgressBarTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java index 21e0597..b0ce954 100644 --- a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java +++ b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java @@ -23,9 +23,7 @@ void testRenderEmptyProgress() { .build(); String rendered = bar.render(0.0); - assertTrue(rendered.contains("░")); - assertFalse(rendered.contains("█")); - assertEquals(7, rendered.length()); + assertEquals("[░░░░░]", rendered); } @Test From a6729ac2c4cabde018a2757f0f4031bef42e1716 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Tue, 26 Aug 2025 03:41:12 +0200 Subject: [PATCH 5/6] Update eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../com/eternalcode/commons/progressbar/ProgressBarTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java index b0ce954..09657fc 100644 --- a/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java +++ b/eternalcode-commons-shared/test/com/eternalcode/commons/progressbar/ProgressBarTest.java @@ -33,9 +33,7 @@ void testRenderHalfProgress() { .build(); String rendered = bar.render(0.5); - assertTrue(rendered.contains("█")); - assertTrue(rendered.contains("░")); - assertEquals(6, rendered.length()); + assertEquals("[██░░]", rendered); } @Test From 3a9c58a76fecf0c7ebf6442a77a7f2a45ce96a48 Mon Sep 17 00:00:00 2001 From: Piotr Zych <77621271+P1otrulla@users.noreply.github.com> Date: Tue, 26 Aug 2025 03:42:54 +0200 Subject: [PATCH 6/6] follow gemini's suggestion --- .../com/eternalcode/commons/progressbar/ProgressBar.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java index c0919d0..9537967 100644 --- a/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java +++ b/eternalcode-commons-shared/src/main/java/com/eternalcode/commons/progressbar/ProgressBar.java @@ -45,11 +45,7 @@ public String render(double progress) { } public String render(int current, int max) { - if (max <= 0) { - return this.render(1.0); - } - double progress = (double) current / max; - return this.render(progress); + return this.render(current, (long) max); } public String render(long current, long max) {