diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..0a722d7 --- /dev/null +++ b/.envrc @@ -0,0 +1 @@ +use nix; diff --git a/.gitignore b/.gitignore index 0d4fa73..db60114 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ main index.html +.direnv diff --git a/main.go b/main.go index b913ee7..c543252 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() @@ -147,7 +147,7 @@ func main() { const ( geckoDriverPath = "deps/geckodriver" - geckoDriverPort = 8080 + geckoDriverPort = 8081 ) opts := []selenium.ServiceOption{ @@ -162,7 +162,9 @@ func main() { } defer service.Stop() - wd, err := selenium.NewRemote(nil, fmt.Sprintf("http://localhost:%d", geckoDriverPort)) + wd, err := selenium.NewRemote(selenium.Capabilities{ + "acceptInsecureCerts": true, + }, fmt.Sprintf("http://localhost:%d", geckoDriverPort)) if err != nil { panic(err) } @@ -170,12 +172,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) @@ -184,7 +186,7 @@ func main() { } err = generateHTML(getSites(*largest, wd), file) if err != nil { - fmt.Println(err) + log.Fatal(err) } } } diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..7d09546 --- /dev/null +++ b/shell.nix @@ -0,0 +1,12 @@ +let + nixpkgs = fetchTarball "https://github.com/NixOS/nixpkgs/tarball/nixos-24.05"; + pkgs = import nixpkgs { config = {}; overlays = []; }; +in + +pkgs.mkShellNoCC { + packages = with pkgs; [ + go + xorg.xorgserver # xorg.xvfb once https://github.com/NixOS/nixpkgs/commit/43ebb05c575221362b44d7cc9a0f0cd1b5d3a53d hits stable + xorg.xauth + ]; +} diff --git a/template.html b/template.html index 6790977..09a07b6 100644 --- a/template.html +++ b/template.html @@ -6,36 +6,63 @@ {n}hats.com domains

{n}hats.com domains

+

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

+ {{ $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
-
{{.FetchTime.Format "Mon Jan 2 15:04:05 -0700 MST 2006" }}
+
{{.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 "Mon Jan 2 2006" }}
+
{{(parseTime .DomainInfo.CreatedDate).Format "Jan 2, 2006" }}
{{end}} {{with .Title}}
Title
@@ -48,9 +75,10 @@
{{if .ScreenshotURL}} - screenshot of {{.DomainName}} as of {{.FetchTime.Format + screenshot of {{.DomainName}} as of {{.FetchTime.Format {{end}} {{end}} + {{end}}