Add support for disabling auto align

rocky-linux · Mar 28, 2022 · 2fafeba · 2fafeba
1 parent e0081b4
commit 2fafeba
Show file tree

Hide file tree

Showing 3 changed files with 91 additions and 76 deletions.
diff --git a/pb/cfg.pb.go b/pb/cfg.pb.go
diff --git a/pkg/directives/spec_change.go b/pkg/directives/spec_change.go
@@ -105,7 +105,7 @@ func sourcePatchOperationAfterLoop(req *sourcePatchOperationAfterLoopRequest) (b
 			case *srpmprocpb.SpecChange_FileOperation_Add:
 				fieldNum := *req.lastNum + 1
 				field := fmt.Sprintf("%s%d", req.expectedField, fieldNum)
-				spaces := calculateSpaces(req.longestField, len(field))
+				spaces := calculateSpaces(req.longestField, len(field), req.cfg.SpecChange.DisableAutoAlign)
 				*req.newLines = append(*req.newLines, fmt.Sprintf("%s:%s%s", field, spaces, file.Name))
 
 				if req.expectedField == "Patch" && file.AddToPrep {
@@ -132,7 +132,10 @@ func sourcePatchOperationAfterLoop(req *sourcePatchOperationAfterLoopRequest) (b
 	return false, nil
 }
 
-func calculateSpaces(longestField int, fieldLength int) string {
+func calculateSpaces(longestField int, fieldLength int, disableAutoAlign bool) string {
+	if disableAutoAlign {
+		return ""
+	}
 	return strings.Repeat(" ", longestField+8-fieldLength)
 }
 
@@ -284,7 +287,7 @@ func specChange(cfg *srpmprocpb.Cfg, pd *data.ProcessData, md *data.ModeData, _
 	for field, nfm := range newFieldMemory {
 		for value, lineNum := range nfm {
 			if lineNum != 0 {
-				newLine := fmt.Sprintf("%s:%s%s", field, calculateSpaces(longestField, len(field)), value)
+				newLine := fmt.Sprintf("%s:%s%s", field, calculateSpaces(longestField, len(field), cfg.SpecChange.DisableAutoAlign), value)
 				setFASlice(futureAdditions, lineNum+1, newLine)
 			}
 		}
@@ -339,7 +342,7 @@ func specChange(cfg *srpmprocpb.Cfg, pd *data.ProcessData, md *data.ModeData, _
 				}
 			}
 
-			spaces := calculateSpaces(longestField, len(field))
+			spaces := calculateSpaces(longestField, len(field), cfg.SpecChange.DisableAutoAlign)
 
 			err := sourcePatchOperationInLoop(&sourcePatchOperationInLoopRequest{
 				cfg:           cfg,
@@ -410,7 +413,7 @@ func specChange(cfg *srpmprocpb.Cfg, pd *data.ProcessData, md *data.ModeData, _
 				var innerNewLines []string
 				for field, nfm := range newFieldMemory {
 					for value, ln := range nfm {
-						newLine := fmt.Sprintf("%s:%s%s", field, calculateSpaces(longestField, len(field)), value)
+						newLine := fmt.Sprintf("%s:%s%s", field, calculateSpaces(longestField, len(field), cfg.SpecChange.DisableAutoAlign), value)
 						if ln == 0 {
 							if isNextLineSection(lineNum, lines) {
 								innerNewLines = append(innerNewLines, newLine)

diff --git a/proto/cfg.proto b/proto/cfg.proto
@@ -134,6 +134,7 @@ message SpecChange {
   repeated SearchAndReplaceOperation search_and_replace = 3;
   repeated AppendOperation append = 4;
   repeated NewFieldOperation new_field = 5;
+  bool disable_auto_align = 6;
 }
 
 message Patch {