Merge pull request #229 from per1234/print-resolved-url

Show resolved URL in duplicate submission error message when relevant

Author: per1234

main.go

@@ -390,7 +390,12 @@ func populateSubmission(submissionURL string, listPath *paths.Path, accessList [
 
 		normalizedListURLObject := normalizeURL(listURLObject)
 		if normalizedListURLObject.String() == normalizedURLObject.String() {
-			submission.Error = "Submission URL is already in the Library Manager index."
+			normalizedSubmissionURLObject := normalizeURL(submissionURLObject)
+			if normalizedURLObject.String() == normalizedSubmissionURLObject.String() {
+				submission.Error = "Submission URL is already in the Library Manager index."
+			} else {
+				submission.Error = fmt.Sprintf("Resolved URL %s is already in the Library Manager index.", normalizedURLObject.String())
+			}
 			return submission, "", true
 		}
 	}

tests/test_all.py

@@ -253,6 +253,27 @@
             "",
             "http://downloads.arduino.cc/libraries/logs/github.com/arduino-libraries/Servo/",
         ),
+        (
+            "resolved-already-in-library-manager",
+            "FooUser",
+            "",
+            "submission",
+            "",
+            [
+                {
+                    "submissionURL": "https://github.com/arduino-org/WiFi_for_UNOWiFi_rev1",
+                    "normalizedURL": "https://github.com/arduino-libraries/WiFi_for_UNOWiFi_rev1.git",
+                    "repositoryName": "WiFi_for_UNOWiFi_rev1",
+                    "name": "",
+                    "official": False,
+                    "tag": "",
+                    "error": "Resolved URL https://github.com/arduino-libraries/WiFi_for_UNOWiFi_rev1.git is already in"
+                    " the Library Manager index.",
+                }
+            ],
+            "",
+            "http://downloads.arduino.cc/libraries/logs/github.com/arduino-libraries/WiFi_for_UNOWiFi_rev1/",
+        ),
         (
             "type-arduino",
             "FooUser",

tests/testdata/resolved-already-in-library-manager/.github/workflows/assets/accesslist.yml

@@ -0,0 +1 @@
+[]

tests/testdata/resolved-already-in-library-manager/diff.txt

@@ -0,0 +1,8 @@
+diff --git a/repositories.txt b/repositories.txt
+index c080a7a..1194257 100644
+--- a/repositories.txt
++++ b/repositories.txt
+@@ -1,2 +1,3 @@
++https://github.com/arduino-org/WiFi_for_UNOWiFi_rev1
+ https://github.com/arduino-libraries/WiFi_for_UNOWiFi_rev1
+ https://github.com/arduino-libraries/Stepper

tests/testdata/resolved-already-in-library-manager/repositories.txt

@@ -0,0 +1,2 @@
+https://github.com/arduino-libraries/WiFi_for_UNOWiFi_rev1
+https://github.com/arduino-libraries/Stepper