Skip to content

progress bar POC #1888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
maxandersen wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

progress bar POC #1888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b651c44
[minor] relase
maxandersen Dec 16, 2024
d32dfed
feat: download progressbar
maxandersen Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ dependencies {
implementation 'org.jsoup:jsoup:1.17.1'
implementation 'org.codejive:java-properties:0.0.7'

implementation 'me.tongfei:progressbar:0.10.1'

implementation "org.slf4j:slf4j-nop:1.7.30"
implementation "org.slf4j:jcl-over-slf4j:1.7.30"
implementation "org.jboss:jandex:2.2.3.Final"
Expand Down
11 changes: 8 additions & 3 deletions src/main/java/dev/jbang/dependencies/ArtifactResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ private ArtifactResolver(Builder builder) {
}

this.downloadSources = builder.downloadSources;
final RepositoryListener listener = builder.loggingEnabled ? setupSessionLogging() : null;

ProgressBarTransferListener pblistener = new ProgressBarTransferListener();

final RepositoryListener listener = builder.loggingEnabled ? setupSessionLogging(pblistener) : null;

ContextOverrides.Builder overridesBuilder = ContextOverrides.create()
.userProperties(userProperties)
Expand All @@ -153,7 +156,8 @@ private ArtifactResolver(Builder builder) {
.snapshotUpdatePolicy(builder.updateCache
? ContextOverrides.SnapshotUpdatePolicy.ALWAYS
: null)
.repositoryListener(listener);
.repositoryListener(listener)
.transferListener(pblistener);

overridesBuilder.extraArtifactTypes(
Collections.singletonList(new DefaultArtifactType("fatjar", "jar", null, "java", true, true)));
Expand Down Expand Up @@ -234,7 +238,7 @@ public List<ArtifactInfo> resolve(List<String> depIds) {
}
}

private AbstractRepositoryListener setupSessionLogging() {
private AbstractRepositoryListener setupSessionLogging(final ProgressBarTransferListener pblistener) {
return new AbstractRepositoryListener() {

@Override
Expand Down Expand Up @@ -293,6 +297,7 @@ private void printEvent(String groupId, String artId, String version, String typ
infoMsg(" " + coord);
}
printed.add(id);
pblistener.next(id);
}
}
}
Expand Down
75 changes: 75 additions & 0 deletions src/main/java/dev/jbang/dependencies/ProgressBarTransferListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package dev.jbang.dependencies;

import org.eclipse.aether.transfer.AbstractTransferListener;
import org.eclipse.aether.transfer.TransferCancelledException;
import org.eclipse.aether.transfer.TransferEvent;

import me.tongfei.progressbar.ProgressBar;
import me.tongfei.progressbar.ProgressBarBuilder;

public class ProgressBarTransferListener extends AbstractTransferListener {

private ProgressBar progressBar;

public ProgressBarTransferListener() {
ProgressBarBuilder pbb = ProgressBar.builder()
.showSpeed()// .hideEta()
.setInitialMax(-1)
// .setStyle(ProgressBarStyle.ASCII)
// .setTaskName("Downloading")
.setUnit("MB", 1024 * 1024);
// .setUpdateIntervalMillis(100)
// .setMaxRenderedLength(100)
// .showSpeed();
// or .showSpeed(new DecimalFormat("#.##")) to customize speed display
// .setEtaFunction(state -> ...)

progressBar = pbb.build();
}

public void next(String id) {
// progressBar.setExtraMessage(id);
}

@Override
public void transferInitiated(TransferEvent event) throws TransferCancelledException {
// System.err.println("transferInitiated " + event);

}

@Override
public void transferStarted(TransferEvent event) throws TransferCancelledException {
// System.err.println("transferStarted " + event);
long contentLength = event.getResource().getContentLength();

if (contentLength < 0) {
contentLength = -1;
}

long max = progressBar.getMax() + Math.max(0, contentLength);

progressBar.maxHint(max);

progressBar.setExtraMessage(event.getResource().getFile().getName());
}

@Override
public void transferProgressed(TransferEvent event) throws TransferCancelledException {
// System.err.println("transferProgressed " + event);
// progressBar.maxHint(event.getResource().getContentLength() < 0 ? -1 :
// event.getResource().getContentLength());
progressBar.stepBy(event.getDataLength());
}

@Override
public void transferSucceeded(TransferEvent event) {
// System.out.println("transferSucceeded " + event);
// progressBar.close();
}

@Override
public void transferFailed(TransferEvent event) {
// System.out.println("transferFailed " + event);
// progressBar.close();
}
}
Loading