fix index access errors (#80)

sarumaj · Jan 24, 2024 · f209ea3 · f209ea3
1 parent 5012f5d
commit f209ea3
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/pkg/commands/command_pull.go b/pkg/commands/command_pull.go
@@ -248,15 +248,9 @@ func updateRepoConfig(conf *configfile.Configuration, host string, repository *g
 	}
 
 	// set commiter and author
-	userSection := repoConf.Raw.Section("user")
-	userSection.SetOption("name", profile.Fullname)
-	userSection.SetOption("email", profile.Email)
-
-	// override remote origin url and remove authentication context
-	remoteOriginSection := repoConf.Raw.Section("remote").Subsection("origin")
-	url := remoteOriginSection.Options.Get("url")
-	conf.Generalize(&url)
-	remoteOriginSection.SetOption("url", url)
+	_ = repoConf.Raw.Section("user").
+		SetOption("name", profile.Fullname).
+		SetOption("email", profile.Email)
 
 	if err := repoConf.Validate(); err != nil {
 		return err

diff --git a/pkg/commands/operation_loop.go b/pkg/commands/operation_loop.go
@@ -95,5 +95,5 @@ func operationLoop(fn func(pool.WorkUnit, operationContext), verbInfinitive stri
 	}
 
 	logger.Debug("Collected workers")
-	status.Sort().Print()
+	status.Sort().Align().Print()
 }
diff --git a/pkg/commands/operation_status.go b/pkg/commands/operation_status.go
@@ -30,7 +30,6 @@ func (p *operationStatus) appendRow(name string, args ...any) {
 
 		case string:
 			p.AddRowField(v, color.FgGreen)
-
 		case error:
 			p.AddRowField(v.Error(), color.FgRed)
 

diff --git a/pkg/configfile/configuration.go b/pkg/configfile/configuration.go
@@ -130,6 +130,7 @@ func (conf *Configuration) AppendRepositories(user *resources.User, repos ...res
 func (conf Configuration) Authenticate(targetURL *string) {
 	loggerEntry.Debugf("Authenticating URL: %v", targetURL)
 	if targetURL == nil || *targetURL == "" || !urlRegex.MatchString(*targetURL) {
+		loggerEntry.Debugf("Got empty or invalid URL: %#v", targetURL)
 		return
 	}
 
@@ -340,11 +341,13 @@ func (conf *Configuration) FilterRepositories(repositories *[]resources.Reposito
 
 // Remove username and token from URL.
 func (conf Configuration) Generalize(targetURL *string) {
-	loggerEntry.Debugf("Generalizing URL: %v", targetURL)
 	if targetURL == nil || *targetURL == "" || !urlRegex.MatchString(*targetURL) {
+		loggerEntry.Debugf("Got empty or invalid URL: %#v", targetURL)
 		return
 	}
 
+	loggerEntry.Debugf("Generalizing URL: %s", *targetURL)
+
 	*targetURL = urlRegex.ReplaceAllString(*targetURL, "${Schema}${Hostpath}")
 	loggerEntry.Debugf("Generelized: %s", *targetURL)
 }

diff --git a/pkg/util/table_printer.go b/pkg/util/table_printer.go
@@ -17,6 +17,24 @@ type TablePrinter struct {
 	records  [][]string
 }
 
+// Align records to match the maximum column width and prevent index errors.
+func (t *TablePrinter) Align() *TablePrinter {
+	var max_row_width int
+	for _, row := range t.records {
+		if len(row) > max_row_width {
+			max_row_width = len(row)
+		}
+	}
+
+	for i := range t.records {
+		for len(t.records[i]) < max_row_width {
+			t.records[i] = append(t.records[i], "")
+		}
+	}
+
+	return t
+}
+
 // Get current printer.
 func (t *TablePrinter) current() tableprinter.TablePrinter {
 	if t.isStdErr {