From f23bbca2e77c3862e5a9f857a84faa29721e9deb Mon Sep 17 00:00:00 2001 From: Michael Smith Date: Wed, 16 Apr 2025 00:03:01 +0000 Subject: [PATCH] refactor: start making main() leaner --- cmd/readmevalidation/contributors.go | 23 +++++++++++++++++++++++ cmd/readmevalidation/main.go | 21 +-------------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/cmd/readmevalidation/contributors.go b/cmd/readmevalidation/contributors.go index 782cc0c9..f8447c5b 100644 --- a/cmd/readmevalidation/contributors.go +++ b/cmd/readmevalidation/contributors.go @@ -3,6 +3,7 @@ package main import ( "errors" "fmt" + "log" "net/url" "os" "path" @@ -371,3 +372,25 @@ func validateContributorRelativeUrls(contributors map[string]contributorProfile) errors: problems, } } + +func validateAllContributors(errChan chan<- error) { + allReadmeFiles, err := aggregateContributorReadmeFiles() + if err != nil { + errChan <- err + return + } + log.Printf("Processing %d README files\n", len(allReadmeFiles)) + contributors, err := parseContributorFiles(allReadmeFiles) + log.Printf("Processed %d README files as valid contributor profiles", len(contributors)) + if err != nil { + errChan <- err + return + } + err = validateContributorRelativeUrls(contributors) + if err != nil { + errChan <- err + return + } + log.Println("All relative URLs for READMEs are valid") + log.Printf("Processed all READMEs in the %q directory\n", rootRegistryPath) +} diff --git a/cmd/readmevalidation/main.go b/cmd/readmevalidation/main.go index c4fa13ec..1471a654 100644 --- a/cmd/readmevalidation/main.go +++ b/cmd/readmevalidation/main.go @@ -87,26 +87,7 @@ func main() { wg.Add(1) go func() { defer wg.Done() - - allReadmeFiles, err := aggregateContributorReadmeFiles() - if err != nil { - errChan <- err - return - } - log.Printf("Processing %d README files\n", len(allReadmeFiles)) - contributors, err := parseContributorFiles(allReadmeFiles) - log.Printf("Processed %d README files as valid contributor profiles", len(contributors)) - if err != nil { - errChan <- err - return - } - err = validateContributorRelativeUrls(contributors) - if err != nil { - errChan <- err - return - } - log.Println("All relative URLs for READMEs are valid") - log.Printf("Processed all READMEs in the %q directory\n", rootRegistryPath) + validateAllContributors(errChan) }() // Validate modules