Fixed network upload for avr packages

Author: cmaglie

arduino/cores/packagemanager/loader.go

@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 
@@ -432,6 +433,12 @@ 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}"
+	netPropRegexp := regexp.MustCompile(`\{upload\.network\.([^}]+)\}`)
+	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

@@ -491,4 +491,17 @@ 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, `"{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"))
+	}
 }