Refactoring

report/slack.go

@@ -170,7 +170,7 @@ func toSlackAttachments(scanResult models.ScanResult) (attaches []*attachment) {
 
 		curentPackages := []string{}
 		for _, p := range cveInfo.Packages {
-			curentPackages = append(curentPackages, p.ToStringCurrentVersion())
+			curentPackages = append(curentPackages, p.FormatCurrentVer())
 		}
 		for _, n := range cveInfo.CpeNames {
 			curentPackages = append(curentPackages, n)
@@ -178,7 +178,7 @@ func toSlackAttachments(scanResult models.ScanResult) (attaches []*attachment) {
 
 		newPackages := []string{}
 		for _, p := range cveInfo.Packages {
-			newPackages = append(newPackages, p.ToStringNewVersion())
+			newPackages = append(newPackages, p.FormatNewVer())
 		}
 
 		a := attachment{

report/tui.go

@@ -799,8 +799,8 @@ func detailLines() (string, error) {
 		packages = append(packages,
 			fmt.Sprintf(
 				"%s -> %s",
-				pack.ToStringCurrentVersion(),
-				pack.ToStringNewVersion()))
+				pack.FormatCurrentVer(),
+				pack.FormatNewVer()))
 	}
 
 	data := dataForTmpl{

report/util.go

@@ -118,7 +118,7 @@ No CVE-IDs are found in updatable packages.
 		var packsVer string
 		for _, p := range d.Packages {
 			packsVer += fmt.Sprintf(
-				"%s -> %s\n", p.ToStringCurrentVersion(), p.ToStringNewVersion())
+				"%s -> %s\n", p.FormatCurrentVer(), p.FormatNewVer())
 		}
 		for _, n := range d.CpeNames {
 			packsVer += n
@@ -460,7 +460,7 @@ func addPackageInfos(table *uitable.Table, packs []models.PackageInfo) *uitable.
 			title = "Package"
 		}
 		ver := fmt.Sprintf(
-			"%s -> %s", p.ToStringCurrentVersion(), p.ToStringNewVersion())
+			"%s -> %s", p.FormatCurrentVer(), p.FormatNewVer())
 		table.AddRow(title, ver)
 	}
 	return table
@@ -501,7 +501,7 @@ func formatOneChangelog(p models.PackageInfo) string {
 	}
 
 	packVer := fmt.Sprintf("%s -> %s",
-		p.ToStringCurrentVersion(), p.ToStringNewVersion())
+		p.FormatCurrentVer(), p.FormatNewVer())
 	var delim bytes.Buffer
 	for i := 0; i < len(packVer); i++ {
 		delim.WriteString("-")