diff options
| -rw-r--r-- | populatePackagePB.go | 4 | ||||
| -rw-r--r-- | wit.go | 28 |
2 files changed, 24 insertions, 8 deletions
diff --git a/populatePackagePB.go b/populatePackagePB.go index 6bd3c48..1d9b900 100644 --- a/populatePackagePB.go +++ b/populatePackagePB.go @@ -7,7 +7,7 @@ import ( "go.wit.com/lib/config" ) -func setString(pb proto.Message, varname string, val string) (bool, error) { +func setString(pb proto.Message, varname string, varvalue string) (bool, error) { msg := pb.ProtoReflect() // This is the entry point to the reflection API. descriptor := msg.Descriptor() // Get the message's descriptor, which contains metadata about its fields. @@ -24,7 +24,7 @@ func setString(pb proto.Message, varname string, val string) (bool, error) { return false, config.ErrProtoVarNotString } - valueToSet := protoreflect.ValueOfString(varname) + valueToSet := protoreflect.ValueOfString(varvalue) // 6. If the field exists and is a string, get its value. // The value is returned as a protoreflect.Value. @@ -46,13 +46,29 @@ func fillPB(p *zoopb.Package, namemap map[string]string) error { s = strings.TrimSpace(s) varname = strings.TrimSpace(varname) varname := strings.TrimSuffix(varname, ":") + // some junk that was in some that we made + if varname == "size" || varname == "servers" || varname == "GoPath" { + continue + } + if varname == "MD5sum" { + varname = "MD5SUM" + } + if varname == "Build-Depends" { + varname = "BuildDepends" + } + if varname == "Package-Build-Date" { + varname = "PackageBuildDate" + } + if varname == "Git-Tag-Date" { + varname = "GitTagDate" + } if ok, err := setString(p, varname, s); ok { continue } else { - log.Printf("var=%s val=%s err=%v\n", varname, s, err) + log.Printf("%s: var=%s val=%s err=%v\n", p.Package, varname, s, err) } } - log.Info("") + // log.Info("") return nil } @@ -151,10 +167,10 @@ func parsePackageInfo(lines string) (*zoopb.Package, map[string]string) { } p := zoopb.Package{ - Name: name, - Version: version, - PkgName: filename, - SrcPath: gopath, + Name: name, + Version: version, + PkgName: filename, + Namespace: gopath, } return &p, namemap |