Skip to content

Suppress compile summary stats if --quiet flag is set on compile. #2820

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

Merged
merged 10 commits into from
Jan 24, 2025
Merged

Suppress compile summary stats if --quiet flag is set on compile. #2820

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1214f57
Made builder logger verbosity an explicit type
cmaglie Jan 21, 2025
95080cf
Compile with --quiet flag set will not output final stats
cmaglie Jan 21, 2025
d9cfdf7
Suppress size output if --quiet is specified
cmaglie Jan 21, 2025
2e4d48f
Added -q shortcut to --quiet flag in compile command
cmaglie Jan 21, 2025
48a6ad3
Compile recap is hidden also on a successful compile with default ver…
cmaglie Jan 22, 2025
f967107
Made --quiet and --verbose mutually exclusive
cmaglie Jan 23, 2025
a596028
Output 'ctags' command line to stdout instead of stderr
cmaglie Jan 23, 2025
6268f39
Do not output empty lines if the message is empty
cmaglie Jan 23, 2025
c9122eb
Added integration tests
cmaglie Jan 23, 2025
17ced8f
Use internal function to check for arguments exclusivity
cmaglie Jan 23, 2025
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
Prev Previous commit
Next Next commit
Suppress size output if --quiet is specified
  • Loading branch information
@cmaglie
cmaglie committed Jan 23, 2025
commit d9cfdf7942b9ba3ad17838511ba0c4eedbdb9b1b
3 changes: 3 additions & 0 deletions commands/service_compile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ func (s *arduinoCoreServerImpl) Compile(req *rpc.CompileRequest, stream rpc.Ardu
})
}
var verbosity logger.Verbosity = logger.VerbosityNormal
if req.GetQuiet() {
verbosity = logger.VerbosityQuiet
}
if req.GetVerbose() {
verbosity = logger.VerbosityVerbose
}
Expand Down
28 changes: 15 additions & 13 deletions internal/arduino/builder/sizer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,21 @@ func (b *Builder) checkSize() (ExecutablesFileSections, error) {
return nil, nil
}

b.logger.Info(i18n.Tr("Sketch uses %[1]s bytes (%[3]s%%) of program storage space. Maximum is %[2]s bytes.",
strconv.Itoa(textSize),
strconv.Itoa(maxTextSize),
strconv.Itoa(textSize*100/maxTextSize)))
if dataSize >= 0 {
if maxDataSize > 0 {
b.logger.Info(i18n.Tr("Global variables use %[1]s bytes (%[3]s%%) of dynamic memory, leaving %[4]s bytes for local variables. Maximum is %[2]s bytes.",
strconv.Itoa(dataSize),
strconv.Itoa(maxDataSize),
strconv.Itoa(dataSize*100/maxDataSize),
strconv.Itoa(maxDataSize-dataSize)))
} else {
b.logger.Info(i18n.Tr("Global variables use %[1]s bytes of dynamic memory.", strconv.Itoa(dataSize)))
if b.logger.VerbosityLevel() > logger.VerbosityQuiet {
b.logger.Info(i18n.Tr("Sketch uses %[1]s bytes (%[3]s%%) of program storage space. Maximum is %[2]s bytes.",
strconv.Itoa(textSize),
strconv.Itoa(maxTextSize),
strconv.Itoa(textSize*100/maxTextSize)))
if dataSize >= 0 {
if maxDataSize > 0 {
b.logger.Info(i18n.Tr("Global variables use %[1]s bytes (%[3]s%%) of dynamic memory, leaving %[4]s bytes for local variables. Maximum is %[2]s bytes.",
strconv.Itoa(dataSize),
strconv.Itoa(maxDataSize),
strconv.Itoa(dataSize*100/maxDataSize),
strconv.Itoa(maxDataSize-dataSize)))
} else {
b.logger.Info(i18n.Tr("Global variables use %[1]s bytes of dynamic memory.", strconv.Itoa(dataSize)))
}
}
}

Expand Down