Spring/spring-shell
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ProgressView spinner calculation in item function

Browse Source 
- Move spinner frame calculation to item itself so that
- Remove spinnerFrame from state and add
  start/update times
- view don't have hard dependency to it, as we'd
  need its interval
- Change spinner to run only when view is running
- Relates #995
This commit is contained in:
Janne Valkealahti
2024-02-04 09:43:56 +00:00
parent 9446afecb7
commit 95aaa865c5
2 changed files with 78 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
spring-shell-samples/spring-shell-sample-commands/src/main/java/org/springframework/shell/samples/standard/ComponentUiCommands.java
View File

@@ -31,6 +31,7 @@ import org.springframework.shell.component.view.control.BoxView;
import org.springframework.shell.component.view.control.InputView;
import org.springframework.shell.component.view.control.ProgressView;
import org.springframework.shell.component.view.control.ProgressView.ProgressViewItem;
import org.springframework.shell.component.view.control.Spinner;
import org.springframework.shell.component.view.event.EventLoop;
import org.springframework.shell.geom.HorizontalAlign;
import org.springframework.shell.geom.VerticalAlign;
@@ -95,13 +96,7 @@ public class ComponentUiCommands extends AbstractShellComponent {
return String.format("Input was '%s'", input);
}
@Command(command = "componentui progress1")
public void progress1() {
ProgressView view = new ProgressView();
view.setDescription("name");
view.setRect(0, 0, 20, 1);
private void runProgress(ProgressView view) {
ViewComponent component = new ViewComponent(getTerminal(), view);
EventLoop eventLoop = component.getEventLoop();
@@ -123,10 +118,19 @@ public class ComponentUiCommands extends AbstractShellComponent {
}
}));
component.run();
}
@Command(command = "componentui progress1")
public void progress1() {
ProgressView view = new ProgressView();
view.setDescription("name");
view.setRect(0, 0, 20, 1);
view.start();
runProgress(view);
}
@Command(command = "componentui progress2")
public void progress2() {
ProgressView view = new ProgressView(0, 100, ProgressViewItem.ofText(10, HorizontalAlign.LEFT),
@@ -134,31 +138,20 @@ public class ComponentUiCommands extends AbstractShellComponent {
ProgressViewItem.ofPercent(0, HorizontalAlign.RIGHT));
view.setDescription("name");
view.setRect(0, 0, 20, 1);
view.start();
runProgress(view);
}
ViewComponent component = new ViewComponent(getTerminal(), view);
EventLoop eventLoop = component.getEventLoop();
@Command(command = "componentui progress3")
public void progress3() {
ProgressView view = new ProgressView();
view.setDescription("name");
view.setRect(0, 0, 20, 1);
view.setSpinner(Spinner.of(Spinner.DOTS1, 80));
view.start();
Flux<Message<?>> ticks = Flux.interval(Duration.ofMillis(100)).map(l -> {
Message<Long> message = MessageBuilder
.withPayload(l)
.setHeader(ShellMessageHeaderAccessor.EVENT_TYPE, EventLoop.Type.USER)
.build();
return message;
});
eventLoop.dispatch(ticks);
eventLoop.onDestroy(eventLoop.events()
.filter(m -> EventLoop.Type.USER.equals(StaticShellMessageHeaderAccessor.getEventType(m)))
.subscribe(m -> {
if (m.getPayload() instanceof Long) {
view.tickAdvance(5);
eventLoop.dispatch(ShellMessageBuilder.ofRedraw());
}
}));
component.run();
runProgress(view);
}
}