-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
82 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
src/main/java/fr/rakambda/mediaconverter/progress/CreateProgressBarSupplier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
package fr.rakambda.mediaconverter.progress; | ||
|
||
import lombok.extern.slf4j.Slf4j; | ||
import me.tongfei.progressbar.ProgressBar; | ||
import org.jetbrains.annotations.NotNull; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
|
||
@Slf4j | ||
public class CreateProgressBarSupplier implements ProgressBarSupplier{ | ||
private final ConverterProgressBarGenerator generator; | ||
private final AtomicInteger counter; | ||
|
||
public CreateProgressBarSupplier(@NotNull ConverterProgressBarGenerator generator){ | ||
this.generator = generator; | ||
counter = new AtomicInteger(0); | ||
} | ||
|
||
public void addBack(@NotNull ProgressBar progressBar){ | ||
progressBar.close(); | ||
} | ||
|
||
@Override | ||
public void close(){ | ||
} | ||
|
||
@NotNull | ||
public ProgressBarHandle get(){ | ||
return new ProgressBarHandle(generator.generate(counter.incrementAndGet()), this); | ||
} | ||
} |
27 changes: 5 additions & 22 deletions
27
src/main/java/fr/rakambda/mediaconverter/progress/ProgressBarSupplier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,28 +1,11 @@ | ||
package fr.rakambda.mediaconverter.progress; | ||
|
||
import lombok.extern.slf4j.Slf4j; | ||
import me.tongfei.progressbar.ProgressBar; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
import org.jetbrains.annotations.NotNull; | ||
|
||
@Slf4j | ||
public class ProgressBarSupplier implements AutoCloseable{ | ||
private final ConverterProgressBarGenerator generator; | ||
private final AtomicInteger counter; | ||
public interface ProgressBarSupplier extends AutoCloseable{ | ||
void addBack(@NotNull ProgressBar progressBar); | ||
|
||
public ProgressBarSupplier(ConverterProgressBarGenerator generator) { | ||
this.generator = generator; | ||
counter = new AtomicInteger(0); | ||
} | ||
|
||
public void addBack(ProgressBar progressBar){ | ||
progressBar.close(); | ||
} | ||
|
||
@Override | ||
public void close(){ | ||
} | ||
|
||
public ProgressBarHandle get(){ | ||
return new ProgressBarHandle(generator.generate(counter.incrementAndGet()), this); | ||
} | ||
@NotNull | ||
ProgressBarHandle get(); | ||
} |
45 changes: 45 additions & 0 deletions
45
src/main/java/fr/rakambda/mediaconverter/progress/ReuseProgressBarSupplier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
|
||
package fr.rakambda.mediaconverter.progress; | ||
|
||
import lombok.extern.slf4j.Slf4j; | ||
import me.tongfei.progressbar.ProgressBar; | ||
import org.jetbrains.annotations.NotNull; | ||
import java.util.Optional; | ||
import java.util.Queue; | ||
import java.util.concurrent.ConcurrentLinkedQueue; | ||
import java.util.concurrent.atomic.AtomicInteger; | ||
|
||
@Slf4j | ||
public class ReuseProgressBarSupplier implements ProgressBarSupplier{ | ||
private final ConverterProgressBarGenerator generator; | ||
private final AtomicInteger counter; | ||
private final Queue<ProgressBar> queue; | ||
|
||
public ReuseProgressBarSupplier(@NotNull ConverterProgressBarGenerator generator){ | ||
this.generator = generator; | ||
this.counter = new AtomicInteger(0); | ||
this.queue = new ConcurrentLinkedQueue<>(); | ||
} | ||
|
||
public void addBack(@NotNull ProgressBar progressBar){ | ||
queue.offer(progressBar | ||
.setExtraMessage("") | ||
.maxHint(-1) | ||
.reset() | ||
.pause()); | ||
} | ||
|
||
@Override | ||
public void close(){ | ||
queue.forEach(ProgressBar::close); | ||
queue.clear(); | ||
} | ||
|
||
@NotNull | ||
public ProgressBarHandle get(){ | ||
var progressBar = Optional.ofNullable(queue.poll()) | ||
.orElseGet(() -> generator.generate(counter.incrementAndGet())) | ||
.resume(); | ||
return new ProgressBarHandle(progressBar, this); | ||
} | ||
} |