code review 10028043: mime: add support for Plan 9

mime: add support for Plan 9

[ality, 2013-06-05 00:04:04]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://code.google.com/p/go/

[bradfitz, 2013-06-05 00:12:31]

LGTM



On Tue, Jun 4, 2013 at 5:04 PM, <ality@pbrane.org> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://code.google.com/p/go/
>
>
> Description:
> mime: add support for Plan 9
>
> Please review this at
https://codereview.appspot.**com/10028043/<https://codereview.appspot.com/100...
>
> Affected files:
>   A src/pkg/mime/testdata/test.**types.plan9
>   M src/pkg/mime/type_plan9.go
>   M src/pkg/mime/type_unix.go
>
>
> Index: src/pkg/mime/testdata/test.**types.plan9
> ==============================**==============================**=======
> new file mode 100644
> --- /dev/null
> +++ b/src/pkg/mime/testdata/test.**types.plan9
> @@ -0,0 +1,8 @@
> +# Copyright 2013 The Go Authors. All rights reserved.
> +# Use of this source code is governed by a BSD-style
> +# license that can be found in the LICENSE file.
> +
> +
> + # mime package test
> +.t1            application     test            -               y # Simple
> test
> +.t2            text            test            -               y # Text
> test
> Index: src/pkg/mime/type_plan9.go
> ==============================**==============================**=======
> copy from src/pkg/mime/type_unix.go
> copy to src/pkg/mime/type_plan9.go
> --- a/src/pkg/mime/type_unix.go
> +++ b/src/pkg/mime/type_plan9.go
> @@ -1,9 +1,7 @@
> -// Copyright 2010 The Go Authors. All rights reserved.
> +// Copyright 2013 The Go Authors. All rights reserved.
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd plan9
> -
>  package mime
>
>  import (
> @@ -13,9 +11,7 @@
>  )
>
>  var typeFiles = []string{
> -       "/etc/mime.types",
> -       "/etc/apache2/mime.types",
> -       "/etc/apache/mime.types",
> +       "/sys/lib/mimetypes",
>  }
>
>  func loadMimeFile(filename string) {
> @@ -28,16 +24,13 @@
>         scanner := bufio.NewScanner(f)
>         for scanner.Scan() {
>                 fields := strings.Fields(scanner.Text())
> -               if len(fields) <= 1 || fields[0][0] == '#' {
> +               if len(fields) <= 2 || fields[0][0] != '.' {
>                         continue
>                 }
> -               mimeType := fields[0]
> -               for _, ext := range fields[1:] {
> -                       if ext[0] == '#' {
> -                               break
> -                       }
> -                       setExtensionType("."+ext, mimeType)
> +               if fields[1] == "-" || fields[2] == "-" {
> +                       continue
>                 }
> +               setExtensionType(fields[0], fields[1]+"/"+fields[2])
>         }
>         if err := scanner.Err(); err != nil {
>                 panic(err)
> @@ -51,7 +44,7 @@
>  }
>
>  func initMimeForTests() map[string]string {
> -       typeFiles = []string{"testdata/test.types"**}
> +       typeFiles = []string{"testdata/test.types.**plan9"}
>         return map[string]string{
>                 ".t1":  "application/test",
>                 ".t2":  "text/test; charset=utf-8",
> Index: src/pkg/mime/type_unix.go
> ==============================**==============================**=======
> --- a/src/pkg/mime/type_unix.go
> +++ b/src/pkg/mime/type_unix.go
> @@ -2,7 +2,7 @@
>  // Use of this source code is governed by a BSD-style
>  // license that can be found in the LICENSE file.
>
> -// +build darwin freebsd linux netbsd openbsd plan9
> +// +build darwin freebsd linux netbsd openbsd
>
>  package mime
>
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

[ality, 2013-06-05 00:30:50]

*** Submitted as https://code.google.com/p/go/source/detail?r=cda3832e9a12 ***

mime: add support for Plan 9

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/10028043