From cadc8ac4eec12951dab588615f63969be488ae4a Mon Sep 17 00:00:00 2001 From: Sergey Matveev Date: Sun, 26 Sep 2021 19:09:49 +0300 Subject: [PATCH] Fixed .metadata.rec fields order --- refresh.go | 89 +++++++++++++++++++++++++++++------------------------- upload.go | 43 +++++++++++++------------- 2 files changed, 70 insertions(+), 62 deletions(-) diff --git a/refresh.go b/refresh.go index b97d2be..d941117 100644 --- a/refresh.go +++ b/refresh.go @@ -79,6 +79,11 @@ func agentedReq(url string) *http.Request { return req } +type RecFieldToValuesMap struct { + recField string + jsonFields []string +} + func refreshDir( w http.ResponseWriter, r *http.Request, @@ -117,20 +122,21 @@ func refreshDir( var meta PkgMeta err = json.Unmarshal(body, &meta) if err == nil { - for recField, jsonField := range map[string]string{ - MetadataFieldName: meta.Info.Name, - MetadataFieldVersion: meta.Info.Version, - MetadataFieldSummary: meta.Info.Summary, - MetadataFieldDescriptionContentType: meta.Info.DescriptionContentType, - MetadataFieldKeywords: meta.Info.Keywords, - MetadataFieldHomePage: meta.Info.HomePage, - MetadataFieldAuthor: meta.Info.Author, - MetadataFieldAuthorEmail: meta.Info.AuthorEmail, - MetadataFieldMaintainer: meta.Info.Maintainer, - MetadataFieldMaintainerEmail: meta.Info.MaintainerEmail, - MetadataFieldLicense: meta.Info.License, - MetadataFieldRequiresPython: meta.Info.RequiresPython, + for _, m := range [][2]string{ + {MetadataFieldName, meta.Info.Name}, + {MetadataFieldVersion, meta.Info.Version}, + {MetadataFieldSummary, meta.Info.Summary}, + {MetadataFieldDescriptionContentType, meta.Info.DescriptionContentType}, + {MetadataFieldKeywords, meta.Info.Keywords}, + {MetadataFieldHomePage, meta.Info.HomePage}, + {MetadataFieldAuthor, meta.Info.Author}, + {MetadataFieldAuthorEmail, meta.Info.AuthorEmail}, + {MetadataFieldMaintainer, meta.Info.Maintainer}, + {MetadataFieldMaintainerEmail, meta.Info.MaintainerEmail}, + {MetadataFieldLicense, meta.Info.License}, + {MetadataFieldRequiresPython, meta.Info.RequiresPython}, } { + recField, jsonField := m[0], m[1] if jsonField == "" { continue } @@ -141,18 +147,18 @@ func refreshDir( log.Fatalln(err) } } - for recField, jsonFields := range map[string][]string{ - MetadataFieldClassifier: meta.Info.Classifier, - MetadataFieldPlatform: meta.Info.Platform, - MetadataFieldSupportedPlatform: meta.Info.SupportedPlatform, - MetadataFieldRequiresDist: meta.Info.RequiresDist, - MetadataFieldRequiresExternal: meta.Info.RequiresExternal, - MetadataFieldProjectURL: meta.Info.ProjectURL, - MetadataFieldProvidesExtra: meta.Info.ProvidesExtra, + for _, m := range []RecFieldToValuesMap{ + {MetadataFieldClassifier, meta.Info.Classifier}, + {MetadataFieldPlatform, meta.Info.Platform}, + {MetadataFieldSupportedPlatform, meta.Info.SupportedPlatform}, + {MetadataFieldRequiresDist, meta.Info.RequiresDist}, + {MetadataFieldRequiresExternal, meta.Info.RequiresExternal}, + {MetadataFieldProjectURL, meta.Info.ProjectURL}, + {MetadataFieldProvidesExtra, meta.Info.ProvidesExtra}, } { - for _, v := range jsonFields { + for _, v := range m.jsonFields { if _, err = wr.WriteFields(recfile.Field{ - Name: metadataFieldToRecField(recField), + Name: metadataFieldToRecField(m.recField), Value: v, }); err != nil { log.Fatalln(err) @@ -172,20 +178,21 @@ func refreshDir( http.Error(w, "can not parse metadata JSON", http.StatusBadGateway) return false } - for recField, jsonField := range map[string]string{ - MetadataFieldName: metaStripped.Info.Name, - MetadataFieldVersion: metaStripped.Info.Version, - MetadataFieldSummary: metaStripped.Info.Summary, - MetadataFieldDescriptionContentType: metaStripped.Info.DescriptionContentType, - MetadataFieldKeywords: metaStripped.Info.Keywords, - MetadataFieldHomePage: metaStripped.Info.HomePage, - MetadataFieldAuthor: metaStripped.Info.Author, - MetadataFieldAuthorEmail: metaStripped.Info.AuthorEmail, - MetadataFieldMaintainer: metaStripped.Info.Maintainer, - MetadataFieldMaintainerEmail: metaStripped.Info.MaintainerEmail, - MetadataFieldLicense: metaStripped.Info.License, - MetadataFieldRequiresPython: metaStripped.Info.RequiresPython, + for _, m := range [][2]string{ + {MetadataFieldName, metaStripped.Info.Name}, + {MetadataFieldVersion, metaStripped.Info.Version}, + {MetadataFieldSummary, metaStripped.Info.Summary}, + {MetadataFieldDescriptionContentType, metaStripped.Info.DescriptionContentType}, + {MetadataFieldKeywords, metaStripped.Info.Keywords}, + {MetadataFieldHomePage, metaStripped.Info.HomePage}, + {MetadataFieldAuthor, metaStripped.Info.Author}, + {MetadataFieldAuthorEmail, metaStripped.Info.AuthorEmail}, + {MetadataFieldMaintainer, metaStripped.Info.Maintainer}, + {MetadataFieldMaintainerEmail, metaStripped.Info.MaintainerEmail}, + {MetadataFieldLicense, metaStripped.Info.License}, + {MetadataFieldRequiresPython, metaStripped.Info.RequiresPython}, } { + recField, jsonField := m[0], m[1] if jsonField == "" { continue } @@ -197,13 +204,13 @@ func refreshDir( } } - for recField, jsonFields := range map[string][]string{ - MetadataFieldClassifier: metaStripped.Info.Classifier, - MetadataFieldRequiresDist: metaStripped.Info.RequiresDist, + for _, m := range []RecFieldToValuesMap{ + {MetadataFieldClassifier, metaStripped.Info.Classifier}, + {MetadataFieldRequiresDist, metaStripped.Info.RequiresDist}, } { - for _, v := range jsonFields { + for _, v := range m.jsonFields { if _, err = wr.WriteFields(recfile.Field{ - Name: metadataFieldToRecField(recField), + Name: metadataFieldToRecField(m.recField), Value: v, }); err != nil { log.Fatalln(err) diff --git a/upload.go b/upload.go index 9ce5540..a3daa93 100644 --- a/upload.go +++ b/upload.go @@ -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") -- 2.44.0