From 07da911b05775988c9f80bcda3ed53c143f1c995 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 18 Oct 2021 23:01:29 -0500 Subject: [PATCH 01/10] Add error display --- template.html | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/template.html b/template.html index 6790977..a6fec00 100644 --- a/template.html +++ b/template.html @@ -11,22 +11,44 @@ img { max-width: 100%; box-shadow: 0 0 10px 10px lightgray; } img:hover { box-shadow: 0 0 10px 10px darkgray} h3 { margin-top: 100px; } + .errors { padding: 0.5rem; border: 1px solid #f5c6cb; color: #721c24; background: #f8d7da; } * { line-height: 1.5em; }

{n}hats.com domains

+ {{ $errors := false -}} + {{- range . -}} + {{- with .Error -}} + {{- $errors = true -}} + {{- end -}} + {{- end -}} + {{- if $errors -}} +
+

Errors occurred during processing

+
    + {{- range . -}} + {{- if .Error }} +
  1. {{.DomainName}}: {{.Error}}
    2. + {{ end -}} + {{- end -}} +
+
+ {{end}}

Summary

{{range .}} + {{if not .Error}}

{{.DomainName}}

Fetched
@@ -52,5 +74,6 @@ {{end}} {{end}} + {{end}} From 4fee11b5918eeb6fb3334eb6010144bddf2e7956 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 18 Oct 2021 23:02:02 -0500 Subject: [PATCH 02/10] Use correct variable in logs --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index b913ee7..353c6a8 100644 --- a/main.go +++ b/main.go @@ -57,7 +57,7 @@ type HatsSite struct { } func getSite(domainName string, wd selenium.WebDriver) (hatsSite HatsSite) { - log.Printf("Retrieving info for %v\n", hatsSite.DomainName) + log.Printf("Retrieving info for %v\n", domainName) hatsSite.DomainName = domainName hatsSite.FetchTime = time.Now() From 63895bed2d85cc1dcff06af109f4e033bc7ae445 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 18 Oct 2021 23:10:09 -0500 Subject: [PATCH 03/10] Simplify date formats --- template.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/template.html b/template.html index a6fec00..9e09c18 100644 --- a/template.html +++ b/template.html @@ -42,7 +42,7 @@ {{if .Available}}
  • {{.DomainName}} – Available!
    • {{else}} -
  • {{.DomainName}} – Registered since {{(parseTime .DomainInfo.CreatedDate).Format "Mon Jan 2 2006" }}
    • +
  • {{.DomainName}} – Registered since {{(parseTime .DomainInfo.CreatedDate).Format "Jan 2, 2006" }}
    • {{end}} {{end}} {{end}} @@ -52,12 +52,12 @@

    {{.DomainName}}

    Fetched
    -
    {{.FetchTime.Format "Mon Jan 2 15:04:05 -0700 MST 2006" }}
    +
    {{.FetchTime.Format "Jan 2, 2006 15:04:05 -0700" }}
    {{if not .Available}}
    Owner
    {{.Registrant.Name}} <{{.Registrant.Email}}>
    Since
    -
    {{(parseTime .DomainInfo.CreatedDate).Format "Mon Jan 2 2006" }}
    +
    {{(parseTime .DomainInfo.CreatedDate).Format "Jan 2, 2006" }}
    {{end}} {{with .Title}}
    Title
    @@ -70,7 +70,7 @@
    {{if .ScreenshotURL}} - screenshot of {{.DomainName}} as of {{.FetchTime.Format + screenshot of {{.DomainName}} as of {{.FetchTime.Format {{end}} {{end}} From 64d3923b1ed1b1043db5a14ca459f3e37e11808f Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 18 Oct 2021 23:10:21 -0500 Subject: [PATCH 04/10] Add last updated time --- template.html | 1 + 1 file changed, 1 insertion(+) diff --git a/template.html b/template.html index 9e09c18..ff352c9 100644 --- a/template.html +++ b/template.html @@ -17,6 +17,7 @@

    {n}hats.com domains

    +

    Last updated {{(index . 0).FetchTime.Format "Jan 2, 2006" }}

    {{ $errors := false -}} {{- range . -}} {{- with .Error -}} From c1cf6ee3a716234c6af0d24060c9fd89a582adf3 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Mon, 18 Oct 2021 23:31:17 -0500 Subject: [PATCH 05/10] Fail upon error --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 353c6a8..cae3ad8 100644 --- a/main.go +++ b/main.go @@ -184,7 +184,7 @@ func main() { } err = generateHTML(getSites(*largest, wd), file) if err != nil { - fmt.Println(err) + log.Fatal(err) } } } From c57cc6ad1233123e46202959eea9e18d917f8682 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Tue, 19 Oct 2021 00:02:08 -0500 Subject: [PATCH 06/10] Add workaround for 39hats.com For some reason, 39hats.com returns a nil registrant. Ideally, I'd like to figure out _why_ there's not something returned, but in the meantime we can just check if it's empty and skip it. --- template.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/template.html b/template.html index ff352c9..ca5911a 100644 --- a/template.html +++ b/template.html @@ -56,7 +56,11 @@
    {{.FetchTime.Format "Jan 2, 2006 15:04:05 -0700" }}
    {{if not .Available}}
    Owner
    + {{if .Registrant}}
    {{.Registrant.Name}} <{{.Registrant.Email}}>
    + {{else}} +
    Information unavailable
    + {{end}}
    Since
    {{(parseTime .DomainInfo.CreatedDate).Format "Jan 2, 2006" }}
    {{end}} From 9404a848ad8613c9a7ed576166f6c79c9b02f311 Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Tue, 19 Oct 2021 00:36:02 -0500 Subject: [PATCH 07/10] Re-enable dev server --- main.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index cae3ad8..51a3e2e 100644 --- a/main.go +++ b/main.go @@ -147,7 +147,7 @@ func main() { const ( geckoDriverPath = "deps/geckodriver" - geckoDriverPort = 8080 + geckoDriverPort = 8081 ) opts := []selenium.ServiceOption{ @@ -170,12 +170,12 @@ func main() { if *serve { http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { - // err := generateHTML(w, *largest, wd) - // if err != nil { - // w.Write([]byte(err.Error())) - // } + err = generateHTML(getSites(*largest, wd), w) + if err != nil { + w.Write([]byte(err.Error())) + } }) - fmt.Printf("Serving on %v\n", port) + fmt.Printf("Serving on %v\n", *port) log.Fatal(http.ListenAndServe(fmt.Sprintf(":%v", *port), nil)) } else { file, err := os.Create(*filename) From c9f0315db56fc4fcc2e2cc1109ebf7ad0551bb0e Mon Sep 17 00:00:00 2001 From: Chandler Swift Date: Wed, 20 Oct 2021 21:40:47 -0500 Subject: [PATCH 08/10] Add padding to body --- template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template.html b/template.html index ca5911a..09a07b6 100644 --- a/template.html +++ b/template.html @@ -6,7 +6,7 @@ {n}hats.com domains