use WarnDeprecatedFiles to remove some code duplication

umbynos · umbynos · commit df7596e0f436 · 2021-11-22T12:10:23.000+01:00
diff --git a/cli/upload/upload.go b/cli/upload/upload.go
@@ -79,12 +79,8 @@ func runUploadCommand(command *cobra.Command, args []string) {
 	}
 	sketchPath := arguments.InitSketchPath(path)
 
-	// .pde files are still supported but deprecated, this warning urges the user to rename them
-	if files := sketch.CheckForPdeFiles(sketchPath); len(files) > 0 && importDir == "" && importFile == "" {
-		feedback.Error(tr("Sketches with .pde extension are deprecated, please rename the following files to .ino:"))
-		for _, f := range files {
-			feedback.Error(f)
-		}
+	if importDir == "" && importFile == "" {
+		arguments.WarnDeprecatedFiles(sketchPath)
 	}
 
 	sk, err := sketch.New(sketchPath)

Original file line number	Diff line number	Diff line change
`@@ -79,12 +79,8 @@ func runUploadCommand(command *cobra.Command, args []string) {`
`79`	`79`	`}`
`80`	`80`	`sketchPath := arguments.InitSketchPath(path)`
`81`	`81`
`82`		`- // .pde files are still supported but deprecated, this warning urges the user to rename them`
`83`		`- if files := sketch.CheckForPdeFiles(sketchPath); len(files) > 0 && importDir == "" && importFile == "" {`
`84`		`- feedback.Error(tr("Sketches with .pde extension are deprecated, please rename the following files to .ino:"))`
`85`		`- for _, f := range files {`
`86`		`- feedback.Error(f)`
`87`		`- }`
	`82`	`+ if importDir == "" && importFile == "" {`
	`83`	`+ arguments.WarnDeprecatedFiles(sketchPath)`
`88`	`84`	`}`
`89`	`85`
`90`	`86`	`sk, err := sketch.New(sketchPath)`