internal/rosa: helpers for common url formats

This cleans up call site of NewPackage.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 55 insertions, 55 deletions

diff --git a/internal/rosa/perl.go b/internal/rosa/perl.go
index 19a224a8..622171fa 100644
--- a/internal/rosa/perl.go
+++ b/internal/rosa/perl.go
@@ -11,9 +11,9 @@ func (t Toolchain) newPerl() (pkg.Artifact, string) {
 		version  = "5.42.2"
 		checksum = "Me_xFfgkRnVyG0sE6a74TktK2OUq9Z1LVJNEu_9RdZG3S2fbjfzNiuk2SJqHAgbm"
 	)
-	return t.NewPackage("perl", version, pkg.NewHTTPGetTar(
-		nil, "https://www.cpan.org/src/5.0/perl-"+version+".tar.gz",
-		mustDecode(checksum),
+	return t.NewPackage("perl", version, newTar(
+		"https://www.cpan.org/src/5.0/perl-"+version+".tar.gz",
+		checksum,
 		pkg.TarGzip,
 	), &PackageAttr{
 		// uses source tree as scratch space
@@ -91,10 +91,10 @@ func (t Toolchain) newPerlModuleBuild() (pkg.Artifact, string) {
 		version  = "0.4234"
 		checksum = "ZKxEFG4hE1rqZt52zBL2LRZBMkYzhjb5-cTBXcsyA52EbPeeYyVxU176yAea8-Di"
 	)
-	return t.newViaPerlModuleBuild("Module-Build", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/L/LE/LEONT/"+
+	return t.newViaPerlModuleBuild("Module-Build", version, newTar(
+		"https://cpan.metacpan.org/authors/id/L/LE/LEONT/"+
 			"Module-Build-"+version+".tar.gz",
-		mustDecode(checksum),
+		checksum,
 		pkg.TarGzip,
 	), nil), version
 }
@@ -145,11 +145,11 @@ func (t Toolchain) newPerlLocaleGettext() (pkg.Artifact, string) {
 		version  = "1.07"
 		checksum = "cFq4BKFD1MWSoa7lsrPjpdo9kzPqd0jlRcBFUyL1L1isw8m3D_Sge_ff0MAu_9J3"
 	)
-	return t.newViaPerlMakeMaker("Locale::gettext", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/P/PV/PVANDRY/"+
-			"Locale-gettext-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("Locale::gettext", version, newFromCPAN(
+		"PVANDRY",
+		"Locale-gettext",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {
@@ -167,11 +167,11 @@ func (t Toolchain) newPerlPodParser() (pkg.Artifact, string) {
 		version  = "1.67"
 		checksum = "RdURu9mOfExk_loCp6abxlcQV3FycSNbTqhRS9i6JUqnYfGGEgercK30g0gjYyqe"
 	)
-	return t.newViaPerlMakeMaker("Pod::Parser", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/M/MA/MAREKR/"+
-			"Pod-Parser-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("Pod::Parser", version, newFromCPAN(
+		"MAREKR",
+		"Pod-Parser",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {
@@ -189,11 +189,11 @@ func (t Toolchain) newPerlSGMLS() (pkg.Artifact, string) {
 		version  = "1.1"
 		checksum = "aZijn4MUqD-wfyZgdcCruCwl4SgDdu25cNmJ4_UvdAk9a7uz4gzMQdoeB6DQ6QOy"
 	)
-	return t.newViaPerlMakeMaker("SGMLS", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/R/RA/RAAB/"+
-			"SGMLSpm-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("SGMLS", version, newFromCPAN(
+		"RAAB",
+		"SGMLSpm",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {
@@ -211,11 +211,11 @@ func (t Toolchain) newPerlTermReadKey() (pkg.Artifact, string) {
 		version  = "2.38"
 		checksum = "qerL8Xo7kD0f42PZoiEbmE8Roc_S9pOa27LXelY4DN_0UNy_u5wLrGHI8utNlaiI"
 	)
-	return t.newViaPerlMakeMaker("Term::ReadKey", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/J/JS/JSTOWE/"+
-			"TermReadKey-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("Term::ReadKey", version, newFromCPAN(
+		"JSTOWE",
+		"TermReadKey",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {
@@ -233,11 +233,11 @@ func (t Toolchain) newPerlTextCharWidth() (pkg.Artifact, string) {
 		version  = "0.04"
 		checksum = "G2p5RHU4_HiZ23ZusBA_enTlVMxz0J4esUx4CGcOPhY6xYTbp-aXWRN6lYZpzBw2"
 	)
-	return t.newViaPerlMakeMaker("Text::CharWidth", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/K/KU/KUBOTA/"+
-			"Text-CharWidth-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("Text::CharWidth", version, newFromCPAN(
+		"KUBOTA",
+		"Text-CharWidth",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {
@@ -255,11 +255,11 @@ func (t Toolchain) newPerlTextWrapI18N() (pkg.Artifact, string) {
 		version  = "0.06"
 		checksum = "Vmo89qLgxUqyQ6QmWJVqu60aQAUjrNKRjFQSXGnvClxofzRjiCa6idzPgJ4VkixM"
 	)
-	return t.newViaPerlMakeMaker("Text::WrapI18N", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/K/KU/KUBOTA/"+
-			"Text-WrapI18N-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("Text::WrapI18N", version, newFromCPAN(
+		"KUBOTA",
+		"Text-WrapI18N",
+		version,
+		checksum,
 	), nil,
 		PerlTextCharWidth,
 	), version
@@ -283,11 +283,11 @@ func (t Toolchain) newPerlMIMECharset() (pkg.Artifact, string) {
 		version  = "1.013.1"
 		checksum = "Ou_ukcrOa1cgtE3mptinb-os3bdL1SXzbRDFZQF3prrJj-drc3rp_huay7iDLJol"
 	)
-	return t.newViaPerlMakeMaker("MIME::Charset", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/"+
-			"MIME-Charset-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("MIME::Charset", version, newFromCPAN(
+		"NEZUMI",
+		"MIME-Charset",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {
@@ -300,25 +300,25 @@ func init() {
 	}
 }
 
-func (t Toolchain) newPerlUnicodeGCString() (pkg.Artifact, string) {
+func (t Toolchain) newPerlUnicodeLineBreak() (pkg.Artifact, string) {
 	const (
 		version  = "2019.001"
 		checksum = "ZHVkh7EDgAUHnTpvXsnPAuWpgNoBImtY_9_8TIbo2co_WgUwEb0MtXPhI8pAZ5OH"
 	)
-	return t.newViaPerlMakeMaker("Unicode::GCString", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/N/NE/NEZUMI/"+
-			"Unicode-LineBreak-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("Unicode::LineBreak", version, newFromCPAN(
+		"NEZUMI",
+		"Unicode-LineBreak",
+		version,
+		checksum,
 	), nil,
 		PerlMIMECharset,
 	), version
 }
 func init() {
-	artifactsM[PerlUnicodeGCString] = Metadata{
-		f: Toolchain.newPerlUnicodeGCString,
+	artifactsM[PerlUnicodeLineBreak] = Metadata{
+		f: Toolchain.newPerlUnicodeLineBreak,
 
-		Name:        "perl-Unicode::GCString",
+		Name:        "perl-Unicode::LineBreak",
 		Description: "String as Sequence of UAX #29 Grapheme Clusters",
 		Website:     "https://metacpan.org/release/Unicode-LineBreak",
 
@@ -333,11 +333,11 @@ func (t Toolchain) newPerlYAMLTiny() (pkg.Artifact, string) {
 		version  = "1.76"
 		checksum = "V1MV4KPym1LxSw8CRXqPR3K-l1hGHbT5Ob4t-9xju6R9X_CWyw6hI8wsMaNdHdBY"
 	)
-	return t.newViaPerlMakeMaker("YAML::Tiny", version, pkg.NewHTTPGetTar(
-		nil, "https://cpan.metacpan.org/authors/id/E/ET/ETHER/"+
-			"YAML-Tiny-"+version+".tar.gz",
-		mustDecode(checksum),
-		pkg.TarGzip,
+	return t.newViaPerlMakeMaker("YAML::Tiny", version, newFromCPAN(
+		"ETHER",
+		"YAML-Tiny",
+		version,
+		checksum,
 	), nil), version
 }
 func init() {