]> Cypherpunks.ru repositories - gocheese.git/blobdiff - refresh.go
More beatiful recfile field names
[gocheese.git] / refresh.go
index 0138e7ddfbf6f93e29e13f318ee025064ac6b640..fcee245b93d15fce58322dcf1c16c72d8770cd1c 100644 (file)
@@ -124,42 +124,42 @@ func refreshDir(
                err = json.Unmarshal(body, &meta)
                if err == nil {
                        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},
+                               {MDFieldName, meta.Info.Name},
+                               {MDFieldVersion, meta.Info.Version},
+                               {MDFieldSummary, meta.Info.Summary},
+                               {MDFieldDescriptionContentType, meta.Info.DescriptionContentType},
+                               {MDFieldKeywords, meta.Info.Keywords},
+                               {MDFieldHomePage, meta.Info.HomePage},
+                               {MDFieldAuthor, meta.Info.Author},
+                               {MDFieldAuthorEmail, meta.Info.AuthorEmail},
+                               {MDFieldMaintainer, meta.Info.Maintainer},
+                               {MDFieldMaintainerEmail, meta.Info.MaintainerEmail},
+                               {MDFieldLicense, meta.Info.License},
+                               {MDFieldRequiresPython, meta.Info.RequiresPython},
                        } {
                                recField, jsonField := m[0], m[1]
                                if jsonField == "" {
                                        continue
                                }
                                if _, err = wr.WriteFields(recfile.Field{
-                                       Name:  metadataFieldToRecField(recField),
+                                       Name:  MDFieldToRecField[recField],
                                        Value: jsonField,
                                }); err != nil {
                                        log.Fatalln(err)
                                }
                        }
                        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},
+                               {MDFieldClassifier, meta.Info.Classifier},
+                               {MDFieldPlatform, meta.Info.Platform},
+                               {MDFieldSupportedPlatform, meta.Info.SupportedPlatform},
+                               {MDFieldRequiresDist, meta.Info.RequiresDist},
+                               {MDFieldRequiresExternal, meta.Info.RequiresExternal},
+                               {MDFieldProjectURL, meta.Info.ProjectURL},
+                               {MDFieldProvidesExtra, meta.Info.ProvidesExtra},
                        } {
                                for _, v := range m.jsonFields {
                                        if _, err = wr.WriteFields(recfile.Field{
-                                               Name:  metadataFieldToRecField(m.recField),
+                                               Name:  MDFieldToRecField[m.recField],
                                                Value: v,
                                        }); err != nil {
                                                log.Fatalln(err)
@@ -180,25 +180,25 @@ func refreshDir(
                                return false
                        }
                        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},
+                               {MDFieldName, metaStripped.Info.Name},
+                               {MDFieldVersion, metaStripped.Info.Version},
+                               {MDFieldSummary, metaStripped.Info.Summary},
+                               {MDFieldDescriptionContentType, metaStripped.Info.DescriptionContentType},
+                               {MDFieldKeywords, metaStripped.Info.Keywords},
+                               {MDFieldHomePage, metaStripped.Info.HomePage},
+                               {MDFieldAuthor, metaStripped.Info.Author},
+                               {MDFieldAuthorEmail, metaStripped.Info.AuthorEmail},
+                               {MDFieldMaintainer, metaStripped.Info.Maintainer},
+                               {MDFieldMaintainerEmail, metaStripped.Info.MaintainerEmail},
+                               {MDFieldLicense, metaStripped.Info.License},
+                               {MDFieldRequiresPython, metaStripped.Info.RequiresPython},
                        } {
                                recField, jsonField := m[0], m[1]
                                if jsonField == "" {
                                        continue
                                }
                                if _, err = wr.WriteFields(recfile.Field{
-                                       Name:  metadataFieldToRecField(recField),
+                                       Name:  MDFieldToRecField[recField],
                                        Value: jsonField,
                                }); err != nil {
                                        log.Fatalln(err)
@@ -206,12 +206,12 @@ func refreshDir(
                        }
 
                        for _, m := range []RecFieldToValuesMap{
-                               {MetadataFieldClassifier, metaStripped.Info.Classifier},
-                               {MetadataFieldRequiresDist, metaStripped.Info.RequiresDist},
+                               {MDFieldClassifier, metaStripped.Info.Classifier},
+                               {MDFieldRequiresDist, metaStripped.Info.RequiresDist},
                        } {
                                for _, v := range m.jsonFields {
                                        if _, err = wr.WriteFields(recfile.Field{
-                                               Name:  metadataFieldToRecField(m.recField),
+                                               Name:  MDFieldToRecField[m.recField],
                                                Value: v,
                                        }); err != nil {
                                                log.Fatalln(err)
@@ -224,7 +224,7 @@ func refreshDir(
                lines := strings.Split(description, "\n")
                if len(lines) > 0 {
                        if _, err = wr.WriteFieldMultiline(
-                               MetadataFieldDescription, lines,
+                               MDFieldDescription, lines,
                        ); err != nil {
                                log.Fatalln(err)
                        }
@@ -233,7 +233,7 @@ func refreshDir(
                if !mkdirForPkg(w, r, pkgName) {
                        return false
                }
-               path := filepath.Join(dirPath, MetadataFile)
+               path := filepath.Join(dirPath, MDFile)
                existing, err := ioutil.ReadFile(path)
                if err != nil || bytes.Compare(existing, buf.Bytes()) != 0 {
                        if err = WriteFileSync(dirPath, path, buf.Bytes(), now); err != nil {
@@ -241,7 +241,7 @@ func refreshDir(
                                http.Error(w, err.Error(), http.StatusInternalServerError)
                                return false
                        }
-                       log.Println(r.RemoteAddr, "pypi", pkgName+"/"+MetadataFile, "touch")
+                       log.Println(r.RemoteAddr, "pypi", pkgName+"/"+MDFile, "touch")
                }
        }
        mtimes := make(map[string]time.Time)