More beatiful recfile field names

[gocheese.git] / upload.go

diff --git a/upload.go b/upload.go
index a3daa9357e97cc336cf1c02f633b0be5aea3bdff..f789fbe3ded1a831a3b707c1c8c5df53aa14b70f 100644 (file)
--- a/upload.go
+++ b/upload.go
@@ -231,40 +231,16 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 
        var buf bytes.Buffer
        wr := recfile.NewWriter(&buf)
-       for _, m := range [][2]string{
-               {"name", MetadataFieldName},
-               {"version", MetadataFieldVersion},
-               {"platform", MetadataFieldPlatform},
-               {"supported_platform", MetadataFieldSupportedPlatform},
-               {"summary", MetadataFieldSummary},
-               {"description", MetadataFieldDescription},
-               {"description_content_type", MetadataFieldDescriptionContentType},
-               {"keywords", MetadataFieldKeywords},
-               {"home_page", MetadataFieldHomePage},
-               {"author", MetadataFieldAuthor},
-               {"author_email", MetadataFieldAuthorEmail},
-               {"maintainer", MetadataFieldMaintainer},
-               {"maintainer_email", MetadataFieldMaintainerEmail},
-               {"license", MetadataFieldLicense},
-               {"classifiers", MetadataFieldClassifier},
-               {"requires_dist", MetadataFieldRequiresDist},
-               {"requires_python", MetadataFieldRequiresPython},
-               {"requires_external", MetadataFieldRequiresExternal},
-               {"project_url", MetadataFieldProjectURL},
-               {"provides_extra", MetadataFieldProvidesExtra},
-       } {
+       for _, m := range MDFormToRecField {
                formField, recField := m[0], m[1]
                if vs, exists := r.MultipartForm.Value[formField]; exists {
                        for _, v := range vs {
                                lines := strings.Split(v, "\n")
                                if len(lines) > 1 {
-                                       _, err = wr.WriteFieldMultiline(
-                                               metadataFieldToRecField(recField),
-                                               lines,
-                                       )
+                                       _, err = wr.WriteFieldMultiline(recField, lines)
                                } else {
                                        _, err = wr.WriteFields(recfile.Field{
-                                               Name:  metadataFieldToRecField(recField),
+                                               Name:  recField,
                                                Value: lines[0],
                                        })
                                }
@@ -274,7 +250,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
                        }
                }
        }
-       path := filepath.Join(dirPath, MetadataFile)
+       path := filepath.Join(dirPath, MDFile)
        if err = WriteFileSync(dirPath, path, buf.Bytes(), now); err != nil {
                log.Println("error", r.RemoteAddr, path, err)
                http.Error(w, err.Error(), http.StatusInternalServerError)