Skip to content

Commit 5f2b90a

Browse files
committed
Rewire CLI args and flags once more
1 parent b32d7b1 commit 5f2b90a

File tree

11 files changed

+36
-36
lines changed

11 files changed

+36
-36
lines changed

cmd/namigo/flag.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import (
77
"github.com/urfave/cli/v2"
88
)
99

10-
// checkCountFlag checks for valid count flag.
11-
func checkCountFlag(ctx *cli.Context, i int) error {
10+
// checkSizeFlag checks for valid size flag.
11+
func checkSizeFlag(ctx *cli.Context, i int) error {
1212
if i <= 0 {
13-
return fmt.Errorf("count %d is invalid", i)
13+
return fmt.Errorf("size %d is invalid", i)
1414
}
1515
return nil
1616
}

cmd/namigo/main.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ func main() {
3939
Usage: "Target interests",
4040
},
4141
&cli.IntFlag{
42-
Name: "count",
43-
Usage: "Maximum count of names",
42+
Name: "size",
43+
Usage: "Max size for generated names",
4444
Value: 10,
45-
Action: checkCountFlag,
45+
Action: checkSizeFlag,
4646
},
4747
&cli.IntFlag{
4848
Name: "length",
49-
Usage: "Maximum length for each name",
49+
Usage: "Max length for each generated name",
5050
Value: 20,
5151
Action: checkLengthFlag,
5252
},
@@ -60,10 +60,10 @@ func main() {
6060
Usage: "Search for terms across entities",
6161
Flags: []cli.Flag{
6262
&cli.IntFlag{
63-
Name: "count",
64-
Usage: "Maximum count of results",
63+
Name: "size",
64+
Usage: "Max size for search results",
6565
Value: 10,
66-
Action: checkCountFlag,
66+
Action: checkSizeFlag,
6767
},
6868
&cli.StringFlag{
6969
Name: "format",

cmd/namigo/sub/generate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ func GeneratePromptAction(c *cli.Context) error {
2626
if err != nil {
2727
return err
2828
}
29-
maxResults := c.Int("count")
29+
maxSize := c.Int("size")
3030
maxLength := c.Int("length")
3131

32-
prompt, err := generate.GeneratePrompt(purpose, theme, demographics, interests, maxResults, maxLength)
32+
prompt, err := generate.GeneratePrompt(purpose, theme, demographics, interests, maxSize, maxLength)
3333
if err != nil {
3434
return err
3535
}

cmd/namigo/sub/search.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ func SearchPackageAction(c *cli.Context) error {
2020
if len(searchTerm) == 0 {
2121
return ErrMissingSearchTerm
2222
}
23-
maxResults := c.Int("count")
23+
maxSize := c.Int("size")
2424
outputFormat := model.GetOutputFormat(c.String("format"))
2525

2626
ptf := search.NewPortfolio()
2727

2828
ptf.Run(func(ptf *search.Portfolio) {
2929
defer ptf.Done()
3030
fmt.Printf("🔍 Search for %s results\n", ptf.Fmt.Golang.Label())
31-
if searchResults, err := golang.SearchByScrape(searchTerm, maxResults); err == nil {
31+
if searchResults, err := golang.SearchByScrape(searchTerm, maxSize); err == nil {
3232
ptf.Res.Golang = searchResults
3333
} else {
3434
ptf.Err.Golang = err
@@ -38,7 +38,7 @@ func SearchPackageAction(c *cli.Context) error {
3838
ptf.Run(func(ptf *search.Portfolio) {
3939
defer ptf.Done()
4040
fmt.Printf("🔍 Search for %s results\n", ptf.Fmt.NPM.Label())
41-
if searchResults, err := npm.SearchByAPI(searchTerm, maxResults); err == nil {
41+
if searchResults, err := npm.SearchByAPI(searchTerm, maxSize); err == nil {
4242
ptf.Res.NPM = searchResults
4343
} else {
4444
ptf.Err.NPM = err
@@ -48,7 +48,7 @@ func SearchPackageAction(c *cli.Context) error {
4848
ptf.Run(func(ptf *search.Portfolio) {
4949
defer ptf.Done()
5050
fmt.Printf("🔍 Search for %s results\n", ptf.Fmt.PyPI.Label())
51-
if searchResults, err := pypi.SearchByAPI(searchTerm, maxResults); err == nil {
51+
if searchResults, err := pypi.SearchByAPI(searchTerm, maxSize); err == nil {
5252
ptf.Res.PyPI = searchResults
5353
} else {
5454
ptf.Err.PyPI = err
@@ -75,13 +75,13 @@ func SearchDNSAction(c *cli.Context) error {
7575
if len(searchTerm) == 0 {
7676
return ErrMissingSearchTerm
7777
}
78-
maxResults := c.Int("count")
78+
maxSize := c.Int("size")
7979
outputFormat := model.GetOutputFormat(c.String("format"))
8080

8181
ptf := search.NewPortfolio()
8282

8383
fmt.Printf("🔍 Search for %s results\n", ptf.Fmt.DNS.Label())
84-
if searchResults, err := dns.SearchByProbe(searchTerm, maxResults); err == nil {
84+
if searchResults, err := dns.SearchByProbe(searchTerm, maxSize); err == nil {
8585
ptf.Res.DNS = searchResults
8686
} else {
8787
ptf.Err.DNS = err
@@ -104,13 +104,13 @@ func SearchEmailAction(c *cli.Context) error {
104104
if len(searchTerm) == 0 {
105105
return ErrMissingSearchTerm
106106
}
107-
maxResults := c.Int("count")
107+
maxSize := c.Int("size")
108108
outputFormat := model.GetOutputFormat(c.String("format"))
109109

110110
ptf := search.NewPortfolio()
111111

112112
fmt.Printf("🔍 Search for %s results\n", ptf.Fmt.Email.Label())
113-
if searchResults, err := email.SearchByProbe(searchTerm, maxResults); err == nil {
113+
if searchResults, err := email.SearchByProbe(searchTerm, maxSize); err == nil {
114114
ptf.Res.Email = searchResults
115115
} else {
116116
ptf.Err.Email = err

pkg/generate/generate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import (
77
)
88

99
// GeneratePrompt generates the prompt for AI chatbots.
10-
func GeneratePrompt(purpose, theme, demographics, interests string, count, length int) (string, error) {
10+
func GeneratePrompt(purpose, theme, demographics, interests string, size, length int) (string, error) {
1111
data := promptData{
1212
Purpose: purpose,
1313
Demographics: demographics,
1414
Interests: interests,
1515
Theme: theme,
16-
MaxCount: count,
16+
MaxSize: size,
1717
MaxLength: length,
1818
}
1919
tmpl, err := template.New(promptName).Parse(promptTemplate)

pkg/generate/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ type promptData struct {
99
Demographics string
1010
Interests string
1111
Theme string
12-
MaxCount int
12+
MaxSize int
1313
MaxLength int
1414
}
1515

@@ -21,7 +21,7 @@ const promptTemplate = `Given the following parameters:
2121
- Target Demographics: {{.Demographics}}
2222
- Target Interests: {{.Interests}}
2323
24-
Generate up to {{.MaxCount}} names for a side business / project. All names
24+
Generate up to {{.MaxSize}} names for a side business / project. All names
2525
should have at most {{.MaxLength}} characters.
2626
2727
For each of the names generated, please provide the following:

pkg/search/dns/search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
// SearchByProbe searches for DNS records via nameserver lookups.
11-
func SearchByProbe(name string, count int) ([]model.DNSRecord, error) {
11+
func SearchByProbe(name string, size int) ([]model.DNSRecord, error) {
1212
domains := []string{"com", "org", "net", "io", "tech", "ai", "me", "shop"}
1313
domainChan := make(chan string)
1414

@@ -26,7 +26,7 @@ func SearchByProbe(name string, count int) ([]model.DNSRecord, error) {
2626

2727
for i := 0; i < 4; i++ {
2828
wg.Add(1)
29-
go netWorker(domainChan, &wg, &mu, &result, &errors, count)
29+
go netWorker(domainChan, &wg, &mu, &result, &errors, size)
3030
}
3131

3232
wg.Wait()

pkg/search/email/search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ var (
2323
// To learn more:
2424
//
2525
// https://docs.abstractapi.com/email-validation
26-
func SearchByProbe(name string, count int) ([]model.EmailRecord, error) {
26+
func SearchByProbe(name string, size int) ([]model.EmailRecord, error) {
2727
result := []model.EmailRecord{}
2828
for _, domain := range domains {
29-
if len(result) >= count {
29+
if len(result) >= size {
3030
break
3131
}
3232
email := fmt.Sprintf("%s@%s", name, domain)

pkg/search/golang/search.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
)
1010

1111
// SearchByScrape searches for Go packages by scraping pkg.go.dev.
12-
func SearchByScrape(name string, count int) ([]model.GoPackage, error) {
12+
func SearchByScrape(name string, size int) ([]model.GoPackage, error) {
1313
client := &http.Client{Timeout: 5 * time.Second}
1414
pipeline := util.NewDocumentPipeline(client, ScrapeList(name))
1515
doc, err := pipeline.Execute()
1616
if err != nil {
1717
return []model.GoPackage{}, err
1818
}
1919

20-
return docWorker(doc, count, name), nil
20+
return docWorker(doc, size, name), nil
2121
}

pkg/search/npm/search.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ import (
1111
)
1212

1313
// SearchByScrape searches for NPM packages by scraping www.npmjs.com.
14-
func SearchByScrape(name string, count int) ([]model.NPMPackage, error) {
14+
func SearchByScrape(name string, size int) ([]model.NPMPackage, error) {
1515
client := &http.Client{Timeout: 5 * time.Second}
1616
pipeline := util.NewDocumentPipeline(client, ScrapeList(name))
1717
doc, err := pipeline.Execute()
1818
if err != nil {
1919
return []model.NPMPackage{}, err
2020
}
2121

22-
return docWorker(doc, count), nil
22+
return docWorker(doc, size), nil
2323
}
2424

2525
// SearchByAPI searches for NPM packages by querying registry.npmjs.com.
26-
func SearchByAPI(name string, count int) ([]model.NPMPackage, error) {
26+
func SearchByAPI(name string, size int) ([]model.NPMPackage, error) {
2727
client := &http.Client{Timeout: 5 * time.Second}
28-
bl, err := util.RESTAPIQuery(client, APIList(name, count))
28+
bl, err := util.RESTAPIQuery(client, APIList(name, size))
2929
if err != nil {
3030
return []model.NPMPackage{}, err
3131
}

0 commit comments

Comments
 (0)