[skip-changelog] Fix pluggable conversion (#1512)

* Fixed network upload for avr packages

* Added test for serial pluggable-monitor compatibility conversion

* Added data for unit testing

* Fixed other collateral tests

* Perform regexp compile at package level

* fix i18n

Author: cmaglie

arduino/cores/packagemanager/loader.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -419,6 +420,8 @@ func convertLegacyPlatformToPluggableDiscovery(platform *cores.PlatformRelease)
 	}
 }
 
+var netPropRegexp = regexp.MustCompile(`\{upload\.network\.([^}]+)\}`)
+
 func convertLegacyNetworkPatternToPluggableDiscovery(props *properties.Map, newToolName string) *properties.Map {
 	pattern, ok := props.GetOk("upload.network_pattern")
 	if !ok {
@@ -432,6 +435,11 @@ func convertLegacyNetworkPatternToPluggableDiscovery(props *properties.Map, newT
 		props.Set("upload.field.password.secret", "true")
 		pattern = strings.ReplaceAll(pattern, "{network.password}", "{upload.field.password}")
 	}
+	// Search for "{upload.network.PROPERTY}"" and convert it to "{upload.port.property.PROPERTY}"
+	for netPropRegexp.MatchString(pattern) {
+		netProp := netPropRegexp.FindStringSubmatch(pattern)[1]
+		pattern = strings.ReplaceAll(pattern, "{upload.network."+netProp+"}", "{upload.port.properties."+netProp+"}")
+	}
 	props.Set("upload.pattern", pattern)
 
 	prefix := "tools." + newToolName + "."

arduino/cores/packagemanager/package_manager_test.go

@@ -71,7 +71,7 @@ func TestResolveFQBN(t *testing.T) {
 	require.NotNil(t, platformRelease.Platform)
 	require.Equal(t, platformRelease.Platform.String(), "arduino:avr")
 	require.NotNil(t, board)
-	require.Equal(t, board.Name(), "Arduino/Genuino Uno")
+	require.Equal(t, board.Name(), "Arduino Uno")
 	require.NotNil(t, props)
 	require.Equal(t, platformRelease, buildPlatformRelease)
 
@@ -85,7 +85,7 @@ func TestResolveFQBN(t *testing.T) {
 	require.NotNil(t, platformRelease.Platform)
 	require.Equal(t, platformRelease.Platform.String(), "arduino:avr")
 	require.NotNil(t, board)
-	require.Equal(t, board.Name(), "Arduino/Genuino Mega or Mega 2560")
+	require.Equal(t, board.Name(), "Arduino Mega or Mega 2560")
 	require.NotNil(t, props)
 	require.Equal(t, platformRelease, buildPlatformRelease)
 
@@ -460,6 +460,7 @@ func TestLegacyPackageConversionToPluggableDiscovery(t *testing.T) {
 		platformProps := platformRelease.Properties
 		require.Equal(t, "builtin:serial-discovery", platformProps.Get("pluggable_discovery.required.0"))
 		require.Equal(t, "builtin:mdns-discovery", platformProps.Get("pluggable_discovery.required.1"))
+		require.Equal(t, "builtin:serial-monitor", platformProps.Get("pluggable_monitor.required.serial"))
 		require.Equal(t, "{runtime.tools.esptool.path}", platformProps.Get("tools.esptool__pluggable_network.path"))
 		require.Contains(t, platformProps.Get("tools.esptool__pluggable_network.cmd"), "esptool")
 		require.Contains(t, platformProps.Get("tools.esptool__pluggable_network.network_cmd"), "{runtime.platform.path}/tools/espota")
@@ -481,6 +482,7 @@ func TestLegacyPackageConversionToPluggableDiscovery(t *testing.T) {
 		platformProps := platformRelease.Properties
 		require.Equal(t, "builtin:serial-discovery", platformProps.Get("pluggable_discovery.required.0"))
 		require.Equal(t, "builtin:mdns-discovery", platformProps.Get("pluggable_discovery.required.1"))
+		require.Equal(t, "builtin:serial-monitor", platformProps.Get("pluggable_monitor.required.serial"))
 		require.Equal(t, "", platformProps.Get("tools.esptool__pluggable_network.path"))
 		require.Equal(t, "{runtime.tools.python3.path}/python3", platformProps.Get("tools.esptool__pluggable_network.cmd"))
 		require.Equal(t, "{runtime.tools.python3.path}/python3", platformProps.Get("tools.esptool__pluggable_network.network_cmd"))
@@ -491,4 +493,18 @@ func TestLegacyPackageConversionToPluggableDiscovery(t *testing.T) {
 		require.Equal(t, "true", platformProps.Get("tools.esptool__pluggable_network.upload.field.password.secret"))
 		require.Equal(t, "\"{network_cmd}\" -I \"{runtime.platform.path}/tools/espota.py\" -i \"{upload.port.address}\" -p \"{upload.port.properties.port}\" \"--auth={upload.field.password}\" -f \"{build.path}/{build.project_name}.bin\"", platformProps.Get("tools.esptool__pluggable_network.upload.pattern"))
 	}
+	{
+		fqbn, err := cores.ParseFQBN("arduino:avr:uno")
+		require.NoError(t, err)
+		require.NotNil(t, fqbn)
+		_, platformRelease, board, _, _, err := pm.ResolveFQBN(fqbn)
+		require.NoError(t, err)
+		require.Equal(t, "avrdude__pluggable_network", board.Properties.Get("upload.tool.network"))
+		require.Equal(t, "uno", board.Properties.Get("upload_port.4.board"))
+		platformProps := platformRelease.Properties
+		require.Equal(t, "builtin:serial-discovery", platformProps.Get("pluggable_discovery.required.0"))
+		require.Equal(t, "builtin:mdns-discovery", platformProps.Get("pluggable_discovery.required.1"))
+		require.Equal(t, "builtin:serial-monitor", platformProps.Get("pluggable_monitor.required.serial"))
+		require.Equal(t, `"{network_cmd}" -address {upload.port.address} -port {upload.port.properties.port} -sketch "{build.path}/{build.project_name}.hex" -upload {upload.port.properties.endpoint_upload} -sync {upload.port.properties.endpoint_sync} -reset {upload.port.properties.endpoint_reset} -sync_exp {upload.port.properties.sync_return}`, platformProps.Get("tools.avrdude__pluggable_network.upload.pattern"))
+	}
 }