X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=upload.go;h=aec2008849f534241ad7ce3850627663cb265973;hb=63422ceeb9e24f452c8f497995b3319ab50996f8;hp=a3daa9357e97cc336cf1c02f633b0be5aea3bdff;hpb=cadc8ac4eec12951dab588615f63969be488ae4a;p=gocheese.git

diff --git a/upload.go b/upload.go
index a3daa93..aec2008 100644
--- a/upload.go
+++ b/upload.go
@@ -1,7 +1,7 @@
 /*
 GoCheese -- Python private package repository and caching proxy
-Copyright (C) 2019-2021 Sergey Matveev <stargrave@stargrave.org>
-              2019-2021 Elena Balakhonova <balakhonova_e@riseup.net>
+Copyright (C) 2019-2022 Sergey Matveev <stargrave@stargrave.org>
+              2019-2022 Elena Balakhonova <balakhonova_e@riseup.net>
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -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)