code review 27110043: go.net/html/charset: new package

html/charset/gen.go

 // +build ignore
 
+package main
+
 // Download http://encoding.spec.whatwg.org/encodings.json and use it to

[nigeltao, 2013/11/18 04:16:18]

I'd put this comment below the package clause, instead of being a doc comment,
similarly to go.net/publicsuffix's gen.go.

-// generate encodinglist.go.

[nigeltao, 2013/11/18 04:16:18]

I'd shorten encodinglist.go to table.go, similarly to go.net/publicsuffix. It's
not like there's going to be any other sorts of lists in this package.

-package main
+// generate table.go.
 
 import (
         "encoding/json"
         "fmt"
         "log"
         "net/http"
         "strings"
 )
 
 type enc struct {
         Name   string
         Labels []string
 }
 
-type encGroup struct {
+type group struct {
         Encodings []enc
         Heading   string
 }
 
 const specURL = "http://encoding.spec.whatwg.org/encodings.json"
 
 func main() {
         resp, err := http.Get(specURL)
         if err != nil {
                 log.Fatalf("error fetching %s: %s", specURL, err)
         }
         if resp.StatusCode != 200 {
                 log.Fatalf("error fetching %s: HTTP status %s", specURL, resp.Status)
         }
         defer resp.Body.Close()
 
-        var encodings []encGroup

[nigeltao, 2013/11/18 04:16:18]

It might read better if this was
var groups []group

[andybalholm, 2013/11/18 17:01:28]

Done.

+        var groups []group
         d := json.NewDecoder(resp.Body)
-        err = d.Decode(&encodings)
+        err = d.Decode(&groups)
         if err != nil {
                 log.Fatalf("error reading encodings.json: %s", err)
         }
 
-        fmt.Println("// This file is automatically generated from", specURL)

[nigeltao, 2013/11/18 04:16:18]

I'd just say
"// generated by go run gen.go; DO NOT EDIT"
a la go.net/publicsuffix.

[andybalholm, 2013/11/18 17:01:28]

Done.

-        fmt.Println("// with the command go run gen.go | gofmt > encodinglist.go")
+        fmt.Println("// generated by go run gen.go; DO NOT EDIT")
         fmt.Println()
         fmt.Println("package charset")
         fmt.Println()
 
         fmt.Println("import (")
         fmt.Println(`"code.google.com/p/go.text/encoding"`)
         for _, pkg := range []string{"charmap", "japanese", "korean", "simplifiedchinese", "traditionalchinese", "unicode"} {
                 fmt.Printf("\"code.google.com/p/go.text/encoding/%s\"\n", pkg)
         }
         fmt.Println(")")
         fmt.Println()
 
         fmt.Println("var encodings = map[string]encoding.Encoding{")
-        for _, grp := range encodings {

[nigeltao, 2013/11/18 04:16:18]

I'd write
for _, g := range groups {

[andybalholm, 2013/11/18 17:01:28]

Done.

-                for _, e := range grp.Encodings {
+        for _, g := range groups {
+                for _, e := range g.Encodings {
                         goName, ok := miscNames[e.Name]
                         if !ok {
                                 for k, v := range prefixes {
                                         if strings.HasPrefix(e.Name, k) {
                                                 goName = v + e.Name[len(k):]
                                                 break
                                         }
                                 }
                                 if goName == "" {
                                         log.Fatalf("unrecognized encoding name: %s", e.Name)
@@ skipping 27 matching lines @@
         "big5":           "traditionalchinese.Big5",
         "euc-jp":         "japanese.EUCJP",
         "iso-2022-jp":    "japanese.ISO2022JP",
         "shift_jis":      "japanese.ShiftJIS",
         "euc-kr":         "korean.EUCKR",
         "replacement":    "replacementEncoding{}",
         "utf-16be":       "unicode.UTF16(unicode.BigEndian, unicode.IgnoreBOM)",
         "utf-16le":       "unicode.UTF16(unicode.LittleEndian, unicode.IgnoreBOM)",
         "x-user-defined": "charmap.XUserDefined",
 }