all repos — gopkgs @ 659dd4b4cf5bebcb3dfb6f86f20f7959ea8ddb29

Go module vanity import paths

simplify config schema

Alan Pearce
commit

659dd4b4cf5bebcb3dfb6f86f20f7959ea8ddb29

parent

ff2824b2558358e9ff4c3f8cf1a02c3cf641ea82

1 file changed, 14 insertions(+), 19 deletions(-)

changed files
M main.go → main.go
@@ -17,15 +17,10 @@ Title    string
 	Domain   string
 	Forge    string
 	Menu     []*Link
-	Packages []*Package
+	Packages []string
 }
 
 type Link struct {
-	Name string
-	URL  string
-}
-
-type Package struct {
 	Name string
 	URL  string
 }

@@ -43,31 +38,31 @@ log.Fatal(err)
 	}
 }
 
-func importString(config *Config, pkg Package) string {
+func importString(config *Config, pkg string) string {
 	return fmt.Sprintf("%s git %s",
-		must(url.JoinPath(config.Domain, pkg.Name)),
-		must(url.JoinPath(config.Forge, pkg.Name)),
+		must(url.JoinPath(config.Domain, pkg)),
+		must(url.JoinPath(config.Forge, pkg)),
 	)
 }
 
-func sourceString(config *Config, pkg Package) string {
+func sourceString(config *Config, pkg string) string {
 	return fmt.Sprintf("%s _ %s %s",
-		must(url.JoinPath(config.Domain, pkg.Name)),
-		must(url.JoinPath(config.Forge, pkg.Name, "tree/main{/dir}")),
-		must(url.JoinPath(config.Forge, pkg.Name, "tree/main{/dir}/{file}#n{line}")),
+		must(url.JoinPath(config.Domain, pkg)),
+		must(url.JoinPath(config.Forge, pkg, "tree/main{/dir}")),
+		must(url.JoinPath(config.Forge, pkg, "tree/main{/dir}/{file}#n{line}")),
 	)
 }
 
-func godocURL(config *Config, pkg *Package) string {
+func godocURL(config *Config, pkg string) string {
 	return must(url.JoinPath("https://pkg.go.dev", packageImportPath(config, pkg)))
 }
 
-func packageImportPath(config *Config, pkg *Package) string {
-	return must(url.JoinPath(config.Domain, pkg.Name))
+func packageImportPath(config *Config, pkg string) string {
+	return must(url.JoinPath(config.Domain, pkg))
 }
 
-func packageForgeURL(config *Config, pkg *Package) string {
-	return must(url.JoinPath(config.Forge, pkg.Name))
+func packageForgeURL(config *Config, pkg string) string {
+	return must(url.JoinPath(config.Forge, pkg))
 }
 
 func getConfig(filename string) (cfg *Config, err error) {

@@ -116,7 +111,7 @@
 	for _, pkg := range cfg.Packages {
 		err = renderToFile(
 			PackagePage(cfg, pkg),
-			filepath.Join(pkg.Name, "index.html"),
+			filepath.Join(pkg, "index.html"),
 		)
 		fatal(err)
 	}