From ec966b83ab37944e7aa1b6daca8c33c81196e465 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 26 May 2019 01:36:22 -0700 Subject: [PATCH] more protobuf cleanups Signed-off-by: Jeff Carr --- account.pb.go | 113 ++++++++++++++++++++++++++++++-------------------- account.proto | 29 +++++++------ 2 files changed, 86 insertions(+), 56 deletions(-) diff --git a/account.pb.go b/account.pb.go index 0e88de4..b1900aa 100644 --- a/account.pb.go +++ b/account.pb.go @@ -21,18 +21,21 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type Account struct { - Nick string `protobuf:"bytes,1,opt,name=nick,proto3" json:"nick,omitempty"` - Username string `protobuf:"bytes,2,opt,name=username,proto3" json:"username,omitempty"` - Token string `protobuf:"bytes,3,opt,name=token,proto3" json:"token,omitempty"` - Password string `protobuf:"bytes,4,opt,name=password,proto3" json:"password,omitempty"` - Hostname string `protobuf:"bytes,5,opt,name=hostname,proto3" json:"hostname,omitempty"` - Domainname string `protobuf:"bytes,6,opt,name=domainname,proto3" json:"domainname,omitempty"` - Port int32 `protobuf:"varint,7,opt,name=port,proto3" json:"port,omitempty"` - Email string `protobuf:"bytes,8,opt,name=email,proto3" json:"email,omitempty"` - SignupTime string `protobuf:"bytes,9,opt,name=signupTime,proto3" json:"signupTime,omitempty"` - SignupBrowser string `protobuf:"bytes,10,opt,name=signupBrowser,proto3" json:"signupBrowser,omitempty"` - HttpHeaders []*Account_HttpHeader `protobuf:"bytes,11,rep,name=httpHeaders,proto3" json:"httpHeaders,omitempty"` - URL string `protobuf:"bytes,12,opt,name=URL,proto3" json:"URL,omitempty"` + Id int32 `protobuf:"varint,1,opt,name=id,proto3" json:"id,omitempty"` + Nick string `protobuf:"bytes,2,opt,name=nick,proto3" json:"nick,omitempty"` + Username string `protobuf:"bytes,3,opt,name=username,proto3" json:"username,omitempty"` + Token string `protobuf:"bytes,4,opt,name=token,proto3" json:"token,omitempty"` + Password string `protobuf:"bytes,5,opt,name=password,proto3" json:"password,omitempty"` + Hostname string `protobuf:"bytes,6,opt,name=hostname,proto3" json:"hostname,omitempty"` + Domain string `protobuf:"bytes,7,opt,name=domain,proto3" json:"domain,omitempty"` + Port int32 `protobuf:"varint,8,opt,name=port,proto3" json:"port,omitempty"` + Email string `protobuf:"bytes,9,opt,name=email,proto3" json:"email,omitempty"` + URL string `protobuf:"bytes,10,opt,name=URL,proto3" json:"URL,omitempty"` + Ctime string `protobuf:"bytes,11,opt,name=ctime,proto3" json:"ctime,omitempty"` + Mtime string `protobuf:"bytes,12,opt,name=mtime,proto3" json:"mtime,omitempty"` + Atime string `protobuf:"bytes,13,opt,name=atime,proto3" json:"atime,omitempty"` + Browser string `protobuf:"bytes,14,opt,name=browser,proto3" json:"browser,omitempty"` + HttpHeaders []*Account_HttpHeader `protobuf:"bytes,15,rep,name=httpHeaders,proto3" json:"httpHeaders,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -63,6 +66,13 @@ func (m *Account) XXX_DiscardUnknown() { var xxx_messageInfo_Account proto.InternalMessageInfo +func (m *Account) GetId() int32 { + if m != nil { + return m.Id + } + return 0 +} + func (m *Account) GetNick() string { if m != nil { return m.Nick @@ -98,9 +108,9 @@ func (m *Account) GetHostname() string { return "" } -func (m *Account) GetDomainname() string { +func (m *Account) GetDomain() string { if m != nil { - return m.Domainname + return m.Domain } return "" } @@ -119,16 +129,37 @@ func (m *Account) GetEmail() string { return "" } -func (m *Account) GetSignupTime() string { +func (m *Account) GetURL() string { if m != nil { - return m.SignupTime + return m.URL } return "" } -func (m *Account) GetSignupBrowser() string { +func (m *Account) GetCtime() string { if m != nil { - return m.SignupBrowser + return m.Ctime + } + return "" +} + +func (m *Account) GetMtime() string { + if m != nil { + return m.Mtime + } + return "" +} + +func (m *Account) GetAtime() string { + if m != nil { + return m.Atime + } + return "" +} + +func (m *Account) GetBrowser() string { + if m != nil { + return m.Browser } return "" } @@ -140,13 +171,6 @@ func (m *Account) GetHttpHeaders() []*Account_HttpHeader { return nil } -func (m *Account) GetURL() string { - if m != nil { - return m.URL - } - return "" -} - type Account_HttpHeader struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` @@ -202,23 +226,24 @@ func init() { func init() { proto.RegisterFile("account.proto", fileDescriptor_8e28828dcb8d24f0) } var fileDescriptor_8e28828dcb8d24f0 = []byte{ - // 278 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x51, 0xbd, 0x4e, 0xc3, 0x30, - 0x10, 0x56, 0x49, 0xd3, 0x9f, 0x0b, 0x95, 0x90, 0xc5, 0x70, 0xea, 0x00, 0x11, 0x62, 0xc8, 0x94, - 0x01, 0x24, 0xf6, 0x32, 0x75, 0x60, 0x40, 0x11, 0x3c, 0x80, 0x9b, 0x18, 0x6a, 0xb5, 0xb1, 0x23, - 0xff, 0x90, 0x17, 0xe2, 0x41, 0x91, 0xcf, 0x4d, 0x1b, 0xb6, 0xef, 0xe7, 0xee, 0xd3, 0xf9, 0x33, - 0xac, 0x78, 0x5d, 0x6b, 0xaf, 0x5c, 0xd9, 0x19, 0xed, 0x34, 0xcb, 0x7a, 0xe9, 0xde, 0x03, 0xda, - 0xf9, 0xaf, 0x87, 0xdf, 0x04, 0xe6, 0x9b, 0x68, 0x33, 0x06, 0x53, 0x25, 0xeb, 0x03, 0x4e, 0xf2, - 0x49, 0xb1, 0xac, 0x08, 0xb3, 0x35, 0x2c, 0xbc, 0x15, 0x46, 0xf1, 0x56, 0xe0, 0x15, 0xe9, 0x67, - 0xce, 0x6e, 0x21, 0x75, 0xfa, 0x20, 0x14, 0x26, 0x64, 0x44, 0x12, 0x36, 0x3a, 0x6e, 0x6d, 0xaf, - 0x4d, 0x83, 0xd3, 0xb8, 0x31, 0xf0, 0xe0, 0xed, 0xb5, 0x75, 0x94, 0x96, 0x46, 0x6f, 0xe0, 0xec, - 0x0e, 0xa0, 0xd1, 0x2d, 0x97, 0x8a, 0xdc, 0x19, 0xb9, 0x23, 0x25, 0x5c, 0xd7, 0x69, 0xe3, 0x70, - 0x9e, 0x4f, 0x8a, 0xb4, 0x22, 0x1c, 0x2e, 0x10, 0x2d, 0x97, 0x47, 0x5c, 0xc4, 0x0b, 0x88, 0x84, - 0x24, 0x2b, 0xbf, 0x95, 0xef, 0x3e, 0x64, 0x2b, 0x70, 0x19, 0x93, 0x2e, 0x0a, 0x7b, 0x84, 0x55, - 0x64, 0xaf, 0x46, 0xf7, 0x56, 0x18, 0x04, 0x1a, 0xf9, 0x2f, 0xb2, 0x0d, 0x64, 0x7b, 0xe7, 0xba, - 0xad, 0xe0, 0x8d, 0x30, 0x16, 0xb3, 0x3c, 0x29, 0xb2, 0xa7, 0xfb, 0x72, 0x54, 0x5e, 0x79, 0x2a, - 0xae, 0xdc, 0x9e, 0xe7, 0xaa, 0xf1, 0x0e, 0xbb, 0x81, 0xe4, 0xb3, 0x7a, 0xc3, 0x6b, 0x8a, 0x0f, - 0x70, 0xfd, 0x02, 0x70, 0x19, 0xa6, 0xc2, 0xc3, 0x63, 0x87, 0xc2, 0x4f, 0xa5, 0xfe, 0xf0, 0xa3, - 0x1f, 0xda, 0x8e, 0x64, 0x37, 0xa3, 0xaf, 0x7b, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x6d, - 0x17, 0xe7, 0xcb, 0x01, 0x00, 0x00, + // 294 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x31, 0x4f, 0xc3, 0x30, + 0x10, 0x85, 0x95, 0xa6, 0x4d, 0xda, 0x0b, 0x2d, 0xc8, 0x42, 0xe8, 0xd4, 0x85, 0x88, 0x29, 0x53, + 0x06, 0x90, 0xd8, 0xbb, 0x75, 0x60, 0x40, 0x91, 0xf8, 0x01, 0x4e, 0x62, 0x54, 0xab, 0x75, 0x1c, + 0xd9, 0x0e, 0xf9, 0x7f, 0xfc, 0x32, 0xe4, 0x73, 0x52, 0xba, 0xbd, 0xef, 0xbd, 0x3b, 0xdb, 0x7a, + 0x86, 0x2d, 0x6f, 0x1a, 0x3d, 0x74, 0xae, 0xec, 0x8d, 0x76, 0x9a, 0x65, 0xa3, 0x74, 0x9f, 0x5e, + 0xd5, 0xc3, 0xf7, 0xcb, 0x6f, 0x0c, 0xe9, 0x21, 0xc4, 0x6c, 0x07, 0x0b, 0xd9, 0x62, 0x94, 0x47, + 0xc5, 0xaa, 0x5a, 0xc8, 0x96, 0x31, 0x58, 0x76, 0xb2, 0x39, 0xe3, 0x22, 0x8f, 0x8a, 0x4d, 0x45, + 0x9a, 0xed, 0x61, 0x3d, 0x58, 0x61, 0x3a, 0xae, 0x04, 0xc6, 0xe4, 0x5f, 0x99, 0x3d, 0xc2, 0xca, + 0xe9, 0xb3, 0xe8, 0x70, 0x49, 0x41, 0x00, 0xbf, 0xd1, 0x73, 0x6b, 0x47, 0x6d, 0x5a, 0x5c, 0x85, + 0x8d, 0x99, 0x7d, 0x76, 0xd2, 0xd6, 0xd1, 0x69, 0x49, 0xc8, 0x66, 0x66, 0x4f, 0x90, 0xb4, 0x5a, + 0x71, 0xd9, 0x61, 0x4a, 0xc9, 0x44, 0xfe, 0x55, 0xbd, 0x36, 0x0e, 0xd7, 0xf4, 0x4e, 0xd2, 0xfe, + 0x66, 0xa1, 0xb8, 0xbc, 0xe0, 0x26, 0xdc, 0x4c, 0xc0, 0x1e, 0x20, 0xfe, 0xaa, 0x3e, 0x10, 0xc8, + 0xf3, 0xd2, 0xcf, 0x35, 0x4e, 0x2a, 0x81, 0x59, 0x98, 0x23, 0xf0, 0xae, 0x22, 0xf7, 0x2e, 0xb8, + 0x6a, 0x76, 0x39, 0xb9, 0xdb, 0xe0, 0x12, 0x30, 0x84, 0xb4, 0x36, 0x7a, 0xb4, 0xc2, 0xe0, 0x8e, + 0xfc, 0x19, 0xd9, 0x01, 0xb2, 0x93, 0x73, 0xfd, 0x51, 0xf0, 0x56, 0x18, 0x8b, 0xf7, 0x79, 0x5c, + 0x64, 0xaf, 0xcf, 0xe5, 0x4d, 0xd9, 0xe5, 0x54, 0x74, 0x79, 0xbc, 0xce, 0x55, 0xb7, 0x3b, 0xfb, + 0x77, 0x80, 0xff, 0x88, 0xea, 0xf7, 0xc5, 0x44, 0x53, 0xfd, 0x53, 0xc5, 0x3f, 0xfc, 0x32, 0x88, + 0xe9, 0x4f, 0x02, 0xd4, 0x09, 0x7d, 0xec, 0xdb, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x35, 0xc6, + 0x83, 0x27, 0xe9, 0x01, 0x00, 0x00, } diff --git a/account.proto b/account.proto index 954fe2c..7e2cebc 100644 --- a/account.proto +++ b/account.proto @@ -2,18 +2,23 @@ syntax = "proto3"; package witProtobuf; message Account { - string nick = 1; - string username = 2; - string token = 3; - string password = 4; - string hostname = 5; - string domainname = 6; - int32 port = 7; - string email = 8; - string signupTime = 9; - string signupBrowser = 10; - repeated HttpHeader httpHeaders = 11; - string URL = 12; + int32 id = 1; + string nick = 2; + string username = 3; + string token = 4; + string password = 5; + string hostname = 6; + string domain = 7; + int32 port = 8; + string email = 9; + string URL = 10; + + string ctime = 11; + string mtime = 12; + string atime = 13; + + string browser = 14; + repeated HttpHeader httpHeaders = 15; message HttpHeader { string name = 1;