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

diff --git a/upload.go b/upload.go
index 669e414..a3daa93 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,28 +231,29 @@ 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 [][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},
 	} {
+		formField, recField := m[0], m[1]
 		if vs, exists := r.MultipartForm.Value[formField]; exists {
 			for _, v := range vs {
 				lines := strings.Split(v, "\n")