daylin/oizys
1
0
Fork 0
mirror of https://github.com/daylinmorgan/oizys.git synced 2024-11-09 20:33:15 -06:00
Code Issues Projects Releases Packages Wiki Activity

oizys-go QOL

Browse source
This commit is contained in:
Daylin Morgan 2024-06-20 13:41:18 -05:00
parent 564a38dc85
commit 00e3781049
Signed by: daylin
GPG key ID: 950D13E9719334AD
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/oizys/oizys-go/cmd/root.go
View file

@ -55,7 +55,7 @@ func setupLogger() {
log.SetReportTimestamp(false) log.SetReportTimestamp(false)
styles := log.DefaultStyles() styles := log.DefaultStyles()
for k, v := range styles.Levels { for k, v := range styles.Levels {
styles.Levels[k] = v.MaxWidth(10) styles.Levels[k] = v.Width(5).MaxWidth(5)
} }
log.SetStyles(styles) log.SetStyles(styles)
} }

9
pkgs/oizys/oizys-go/internal/oizys/main.go
View file

@ -190,6 +190,7 @@ func (p *packages) summary() {
Render(fmt.Sprint(len(p.names))), Render(fmt.Sprint(len(p.names))),
) )
} }
func logCmd(cmd *exec.Cmd) { func logCmd(cmd *exec.Cmd) {
log.Debugf("CMD: %s", strings.Join(cmd.Args, " ")) log.Debugf("CMD: %s", strings.Join(cmd.Args, " "))
} }
@ -237,9 +238,13 @@ func parseDryRun(buf string) (*packages, *packages) {
var parts [2][]string var parts [2][]string
i := 0 i := 0
for _, line := range lines { for _, line := range lines {
if strings.Contains(line, "fetch") { if strings.Contains(line, "fetch") && strings.HasSuffix(line, ":") {
i++ i++
} }
if i == 2 {
log.Fatal("failed to parse output", "output", buf)
}
if strings.HasPrefix(line, " ") { if strings.HasPrefix(line, " ") {
parts[i] = append(parts[i], line) parts[i] = append(parts[i], line)
} }
@ -247,7 +252,7 @@ func parseDryRun(buf string) (*packages, *packages) {
if len(parts[0])+len(parts[1]) == 0 { if len(parts[0])+len(parts[1]) == 0 {
log.Info("no changes...") log.Info("no changes...")
log.Fatal("or failed to parse nix build --dry-run output") os.Exit(0)
} }
return parsePackages(parts[0], "packages to build"), return parsePackages(parts[0], "packages to build"),