Merge pull request #231 from SuperChen-CC/cc-dev

cyberchen1995 · web-flow · commit 9f4faaa62d1e · 2023-12-25T18:56:33.000+08:00
fix: handle the failure to get AppName when using relative paths
diff --git a/cmd/format/save.go b/cmd/format/save.go
@@ -48,7 +48,7 @@ func Save(report Report, output string) {
 			} else if strings.HasSuffix(out, ".swid.json") {
 				SwidJson(report, out)
 			} else {
-				report.TaskInfo.AppName = filepath.Base(filepath.Clean(report.TaskInfo.AppName))
+				setAppName(&report)
 				Json(report, out)
 			}
 		case ".dsdx":
@@ -98,3 +98,8 @@ func outWrite(out string, do func(io.Writer)) {
 		do(w)
 	}
 }
+
+func setAppName(report *Report) {
+	absPath, _ := filepath.Abs(report.TaskInfo.AppName)
+	report.TaskInfo.AppName = filepath.Base(absPath)
+}

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func Save(report Report, output string) {`
`48`	`48`	`} else if strings.HasSuffix(out, ".swid.json") {`
`49`	`49`	`SwidJson(report, out)`
`50`	`50`	`} else {`
`51`		`- report.TaskInfo.AppName = filepath.Base(filepath.Clean(report.TaskInfo.AppName))`
	`51`	`+ setAppName(&report)`
`52`	`52`	`Json(report, out)`
`53`	`53`	`}`
`54`	`54`	`case ".dsdx":`
`@@ -98,3 +98,8 @@ func outWrite(out string, do func(io.Writer)) {`
`98`	`98`	`do(w)`
`99`	`99`	`}`
`100`	`100`	`}`
	`101`	`+`
	`102`	`+func setAppName(report *Report) {`
	`103`	`+ absPath, _ := filepath.Abs(report.TaskInfo.AppName)`
	`104`	`+ report.TaskInfo.AppName = filepath.Base(absPath)`
	`105`	`+}`