format and comments

metadata.go

@@ -5,6 +5,20 @@ import (
 	"time"
 )
 
+// Element with optional ID.
+type Element struct {
+	Value string `xml:",chardata"`
+	ID    string `xml:"id,attr,omitempty"` // The ID of this element, which must be unique within the document scope.
+}
+
+// ElementLang with optional ID, xml:lang & dir.
+type ElementLang struct {
+	Value string `xml:",chardata"`
+	ID    string `xml:"id,attr,omitempty"`       // The ID of this element, which must be unique within the document scope.
+	Dir   string `xml:"dir,attr,omitempty"`      // Specifies the base text direction of the content and attribute values of the carrying element and its descendants.
+	Lang  string `xml:"xml:lang,attr,omitempty"` // Specifies the language used in the contents and attribute values of the carrying element and its descendants
+}
+
 // Metadata element encapsulates Publication meta information.
 type Metadata struct {
 	DC string `xml:"xmlns:dc,attr"` // “http://purl.org/dc/elements/1.1/”
@@ -30,20 +44,6 @@ type Metadata struct {
 	Link []Link `xml:"link,omitempty"` // The link element is used to associate resources with a Publication, such as metadata records.
 }
 
-// Element with optional ID.
-type Element struct {
-	ID    string `xml:"id,attr,omitempty"` // The ID of this element, which must be unique within the document scope.
-	Value string `xml:",chardata"`
-}
-
-// ElementLang with optional ID, xml:lang & dir.
-type ElementLang struct {
-	ID    string `xml:"id,attr,omitempty"`       // The ID of this element, which must be unique within the document scope.
-	Dir   string `xml:"dir,attr,omitempty"`      // Specifies the base text direction of the content and attribute values of the carrying element and its descendants.
-	Lang  string `xml:"xml:lang,attr,omitempty"` // Specifies the language used in the contents and attribute values of the carrying element and its descendants
-	Value string `xml:",chardata"`
-}
-
 // AddTitle new publication title.
 func (m *Metadata) AddTitle(name string) {
 	m.Title = append(m.Title, ElementLang{Value: name})

mimetype.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 )
 
-// MimeTypes list supported MIME types.
+// MimeTypes list supported MIME types by file extension.
 var MimeTypes = map[string]string{
 	".gif":   "image/gif",
 	".jpg":   "image/jpeg",
@@ -36,13 +36,16 @@ var MimeTypes = map[string]string{
 }
 
 // typeByName returns the MIME type associated with the file name.
-func typeByName(filename string) (mimetype string) {
+func typeByName(filename string) string {
 	ext := strings.ToLower(filepath.Ext(filename))
-	if mimetype = MimeTypes[ext]; mimetype != "" {
+
+	if mimetype, ok := MimeTypes[ext]; ok {
 		return mimetype
 	}
-	if mimetype = mime.TypeByExtension(ext); mimetype != "" {
+
+	if mimetype := mime.TypeByExtension(ext); mimetype != "" {
 		return mimetype
 	}
+
 	return "application/octet-stream"
 }