X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=upload.go;h=f789fbe3ded1a831a3b707c1c8c5df53aa14b70f;hb=5124053610e1cca8c4f51a53552815585a69d524;hp=669e414e81e07be2cd37fe12a1c427bcd20fd3c7;hpb=94df7244ce24df7e9cdca181f64d0cd2a4e1fd2c;p=gocheese.git

diff --git a/upload.go b/upload.go
index 669e414..f789fbe 100644
--- a/upload.go
+++ b/upload.go
@@ -67,7 +67,7 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	pkgName := strings.ToLower(NormalizationRe.ReplaceAllString(pkgNames[0], "-"))
-	dirPath := filepath.Join(*Root, pkgName)
+	dirPath := filepath.Join(Root, pkgName)
 	gpgSigsExpected := make(map[string]struct{})
 	now := time.Now().UTC()
 
@@ -231,39 +231,16 @@ func serveUpload(w http.ResponseWriter, r *http.Request) {
 
 	var buf bytes.Buffer
 	wr := recfile.NewWriter(&buf)
-	for formField, recField := range map[string]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],
 					})
 				}
@@ -273,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)