swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix fullstack cli progress (#2787)

Browse Source 
* Fix progress for fullstack builds
* Fix internal logs
This commit is contained in:
Evan Almloff authored and GitHub committed 2024-08-06 13:51:15 -07:00
1 parent 469ab66341
commit e4abe79276
1 file changed
+84 -60
Download Patch File Download Diff File Expand all files Collapse all files
packages/cli/src/serve/output.rs
+84 -60
View File
@@ -61,7 +61,8 @@ impl From<TargetPlatform> for LogSource {
#[derive(Default)]
pub struct BuildProgress {
build_logs: HashMap<LogSource, ActiveBuild>,
internal_logs: Vec<BuildMessage>,
build_logs: HashMap<TargetPlatform, ActiveBuild>,
}
impl BuildProgress {
@@ -189,7 +190,6 @@ impl Output {
/// Add a message from stderr to the logs
fn push_stderr(&mut self, platform: TargetPlatform, stderr: String) {
self.set_tab(Tab::BuildLog);
let source = platform.into();
self.running_apps
.get_mut(&platform)
@@ -201,7 +201,7 @@ impl Output {
.push_str(&stderr);
self.build_progress
.build_logs
.get_mut(&source)
.get_mut(&platform)
.unwrap()
.messages
.push(BuildMessage {
@@ -213,8 +213,6 @@ impl Output {
/// Add a message from stdout to the logs
fn push_stdout(&mut self, platform: TargetPlatform, stdout: String) {
let source = platform.into();
self.running_apps
.get_mut(&platform)
.unwrap()
@@ -225,7 +223,7 @@ impl Output {
.push_str(&stdout);
self.build_progress
.build_logs
.get_mut(&source)
.get_mut(&platform)
.unwrap()
.messages
.push(BuildMessage {
@@ -330,6 +328,19 @@ impl Output {
/// versions of the cli would just eat build logs making debugging issues harder than they needed
/// to be.
fn drain_print_logs(&mut self) {
fn log_build_message(platform: &LogSource, message: &BuildMessage) {
match &message.message {
MessageType::Text(text) => {
for line in text.lines() {
println!("{platform}: {line}");
}
}
MessageType::Cargo(diagnostic) => {
println!("{platform}: {diagnostic}");
}
}
}
// todo: print the build info here for the most recent build, and then the logs of the most recent build
for (platform, build) in self.build_progress.build_logs.iter_mut() {
if build.messages.is_empty() {
@@ -339,17 +350,15 @@ impl Output {
let messages = build.messages.drain(0..);
for message in messages {
match &message.message {
MessageType::Cargo(diagnostic) => {
println!(
"{platform}: {}",
diagnostic.rendered.as_deref().unwrap_or_default()
)
}
MessageType::Text(t) => println!("{platform}: {t}"),
}
log_build_message(&LogSource::Target(*platform), &message);
}
}
// Log the internal logs
let messaegs = self.build_progress.internal_logs.drain(..);
for message in messaegs {
log_build_message(&LogSource::Internal, &message);
}
}
/// Handle an input event, returning `true` if the event should cause the program to restart.
@@ -481,21 +490,24 @@ impl Output {
let source = platform.into();
let snapped = self.is_snapped(source);
self.build_progress
.build_logs
.entry(source)
.or_default()
.stdout_logs
.push(message);
match source {
LogSource::Internal => self.build_progress.internal_logs.push(message),
LogSource::Target(platform) => self
.build_progress
.build_logs
.entry(platform)
.or_default()
.stdout_logs
.push(message),
}
if snapped {
self.scroll_to_bottom();
}
}
pub fn new_build_logs(&mut self, platform: impl Into<LogSource>, update: UpdateBuildProgress) {
let source = platform.into();
let snapped = self.is_snapped(source);
pub fn new_build_logs(&mut self, platform: TargetPlatform, update: UpdateBuildProgress) {
let snapped = self.is_snapped(LogSource::Target(platform));
// when the build is finished, switch to the console
if update.stage == Stage::Finished {
@@ -504,7 +516,7 @@ impl Output {
self.build_progress
.build_logs
.entry(source)
.entry(platform)
.or_default()
.update(update);
@@ -545,8 +557,7 @@ impl Output {
self.running_apps.insert(platform, app);
// Finish the build progress for the platform that just finished building
let source = platform.into();
if let Some(build) = self.build_progress.build_logs.get_mut(&source) {
if let Some(build) = self.build_progress.build_logs.get_mut(&platform) {
build.stage = Stage::Finished;
}
}
@@ -646,7 +657,7 @@ impl Output {
.build_progress
.build_logs
.values()
.min_by(|a, b| a.partial_cmp(b).unwrap())
.min_by(|a, b| a.partial_cmp(b).unwrap_or(std::cmp::Ordering::Equal))
.unwrap();
spans.extend_from_slice(&build.spans(Rect::new(
0,
@@ -712,6 +723,42 @@ impl Output {
// handle the wrapping and scrolling
let mut paragraph_text: Text<'_> = Text::default();
let mut add_build_message = |message: &BuildMessage| {
use ansi_to_tui::IntoText;
match &message.message {
MessageType::Text(line) => {
for line in line.lines() {
let text = line.into_text().unwrap_or_default();
for line in text.lines {
let source = format!("[{}] ", message.source);
let msg_span = Span::from(source);
let msg_span = match message.source {
MessageSource::App => msg_span.light_blue(),
MessageSource::Dev => msg_span.dark_gray(),
MessageSource::Build => msg_span.light_yellow(),
};
let mut out_line = vec![msg_span];
for span in line.spans {
out_line.push(span);
}
let newline = Line::from(out_line);
paragraph_text.push_line(newline);
}
}
}
MessageType::Cargo(diagnostic) => {
let diagnostic = diagnostic.rendered.as_deref().unwrap_or_default();
for line in diagnostic.lines() {
paragraph_text.extend(line.into_text().unwrap_or_default());
}
}
};
};
// First log each platform's build logs
for platform in self.build_progress.build_logs.keys() {
let build = self.build_progress.build_logs.get(platform).unwrap();
@@ -721,40 +768,13 @@ impl Output {
};
for span in msgs.iter() {
use ansi_to_tui::IntoText;
match &span.message {
MessageType::Text(line) => {
for line in line.lines() {
let text = line.into_text().unwrap_or_default();
for line in text.lines {
let source = format!("[{}] ", span.source);
let msg_span = Span::from(source);
let msg_span = match span.source {
MessageSource::App => msg_span.light_blue(),
MessageSource::Dev => msg_span.dark_gray(),
MessageSource::Build => msg_span.light_yellow(),
};
let mut out_line = vec![msg_span];
for span in line.spans {
out_line.push(span);
}
let newline = Line::from(out_line);
paragraph_text.push_line(newline);
}
}
}
MessageType::Cargo(diagnostic) => {
let diagnostic = diagnostic.rendered.as_deref().unwrap_or_default();
for line in diagnostic.lines() {
paragraph_text.extend(line.into_text().unwrap_or_default());
}
}
};
add_build_message(span);
}
}
// Then log the internal logs
for message in self.build_progress.internal_logs.iter() {
add_build_message(message);
}
let paragraph = Paragraph::new(paragraph_text)
.left_aligned()
@@ -868,6 +888,10 @@ impl ActiveBuild {
fn update(&mut self, update: UpdateBuildProgress) {
match update.update {
UpdateStage::Start => {
// If we are already past the stage, don't roll back
if self.stage > update.stage {
return;
}
self.stage = update.stage;
self.progress = 0.0;
self.failed = None;