Support python libraries with + in the file name (#244)

utils/pythonutils/utils.go

@@ -3,6 +3,7 @@ package pythonutils
 import (
 	"errors"
 	"fmt"
+	"net/url"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -307,5 +308,12 @@ func extractFileNameFromRegexCaptureGroup(pattern *gofrogcmd.CmdOutputPattern) (
 	if lastSlashIndex == -1 {
 		return filePath
 	}
-	return filePath[lastSlashIndex+1:]
+	lastComponent := filePath[lastSlashIndex+1:]
+	// Unescape the last component, for example 'PyYAML-5.1.2%2Bsp1.tar.gz' -> 'PyYAML-5.1.2+sp1.tar.gz'.
+	unescapedComponent, _ := url.QueryUnescape(lastComponent)
+	if unescapedComponent == "" {
+		// Couldn't escape, will use the raw string
+		return lastComponent
+	}
+	return unescapedComponent
 }

utils/pythonutils/utils_test.go

@@ -77,6 +77,20 @@ Collecting PyYAML==5.1.2 (from jfrog-python-example==1.0)
 			  Installing build dependencies: started`,
 			expectedCapture: `PyYAML-5.1.2.tar.gz`,
 		},
+		{
+			name:                "Downloading - multi line captures",
+			startCapturePattern: startDownloadingPattern,
+			captureGroupPattern: downloadingCaptureGroup,
+			endCapturePattern:   endPattern,
+			text: `  Preparing metadata (pyproject.toml): finished with status 'done'
+Collecting PyYAML==5.1.2 (from jfrog-python-example==1.0)
+  Downloading http://localhost:8081/artifactory/api/pypi/cli-pypi-virtual-1698
+829558/packages/packages/e3/e8/b3212641ee2718d556df0f23f78de8303f068fe29cdaa7a91018849
+582fe/PyYAML-5.1.2%2Bsp1.tar.gz (265 kB)
+	 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ 265.0/265.0 kB 364.4 MB/s eta 0:00:00
+			  Installing build dependencies: started`,
+			expectedCapture: `PyYAML-5.1.2+sp1.tar.gz`,
+		},
 	}
 
 	for _, testCase := range tests {