diff --git a/.gitignore b/.gitignore index 374e432a..7575bffb 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ githubtasks .test -githubtasks_cli/githubtasks_cli \ No newline at end of file +githubtasks_cli/githubtasks_cli +*.txt \ No newline at end of file diff --git a/githubtasks_cli/cli.go b/githubtasks_cli/cli.go index 22ba1868..9a629497 100644 --- a/githubtasks_cli/cli.go +++ b/githubtasks_cli/cli.go @@ -5,6 +5,7 @@ import ( "flag" "log" "os" + "strings" "github.com/brotherlogic/goserver/utils" "google.golang.org/grpc" @@ -48,8 +49,8 @@ func main() { pname := scanner.Text() project := &pb.Project{Name: pname} for scanner.Scan() { - milestone := scanner.Text() - project.Milestones = append(project.Milestones, &pb.Milestone{Name: milestone}) + elems := strings.Split(scanner.Text(), "~") + project.Milestones = append(project.Milestones, &pb.Milestone{Name: elems[0], GithubProject: elems[1]}) } _, err = client.AddProject(ctx, &pb.AddProjectRequest{Add: project}) diff --git a/proto/githubtasks.pb.go b/proto/githubtasks.pb.go index b8ec1f81..836ad8ac 100644 --- a/proto/githubtasks.pb.go +++ b/proto/githubtasks.pb.go @@ -56,21 +56,24 @@ func (Milestone_MilestoneState) EnumDescriptor() ([]byte, []int) { type Task_TaskState int32 const ( - Task_IDLE Task_TaskState = 0 - Task_ACTIVE Task_TaskState = 1 - Task_COMPLETE Task_TaskState = 2 + Task_CREATED Task_TaskState = 0 + Task_IDLE Task_TaskState = 1 + Task_ACTIVE Task_TaskState = 2 + Task_COMPLETE Task_TaskState = 3 ) var Task_TaskState_name = map[int32]string{ - 0: "IDLE", - 1: "ACTIVE", - 2: "COMPLETE", + 0: "CREATED", + 1: "IDLE", + 2: "ACTIVE", + 3: "COMPLETE", } var Task_TaskState_value = map[string]int32{ - "IDLE": 0, - "ACTIVE": 1, - "COMPLETE": 2, + "CREATED": 0, + "IDLE": 1, + "ACTIVE": 2, + "COMPLETE": 3, } func (x Task_TaskState) String() string { @@ -131,7 +134,6 @@ func (m *Config) GetLastUpdate() int64 { type Project struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Milestones []*Milestone `protobuf:"bytes,2,rep,name=milestones,proto3" json:"milestones,omitempty"` - GithubProject string `protobuf:"bytes,3,opt,name=github_project,json=githubProject,proto3" json:"github_project,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -176,18 +178,12 @@ func (m *Project) GetMilestones() []*Milestone { return nil } -func (m *Project) GetGithubProject() string { - if m != nil { - return m.GithubProject - } - return "" -} - type Milestone struct { Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` Number int32 `protobuf:"varint,2,opt,name=number,proto3" json:"number,omitempty"` State Milestone_MilestoneState `protobuf:"varint,3,opt,name=state,proto3,enum=githubtasks.Milestone_MilestoneState" json:"state,omitempty"` Tasks []*Task `protobuf:"bytes,4,rep,name=tasks,proto3" json:"tasks,omitempty"` + GithubProject string `protobuf:"bytes,5,opt,name=github_project,json=githubProject,proto3" json:"github_project,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -246,6 +242,13 @@ func (m *Milestone) GetTasks() []*Task { return nil } +func (m *Milestone) GetGithubProject() string { + if m != nil { + return m.GithubProject + } + return "" +} + type Task struct { Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` Body string `protobuf:"bytes,2,opt,name=body,proto3" json:"body,omitempty"` @@ -299,7 +302,7 @@ func (m *Task) GetState() Task_TaskState { if m != nil { return m.State } - return Task_IDLE + return Task_CREATED } func (m *Task) GetNumber() int32 { @@ -585,41 +588,41 @@ func init() { func init() { proto.RegisterFile("githubtasks.proto", fileDescriptor_0d888ecb083325cf) } var fileDescriptor_0d888ecb083325cf = []byte{ - // 534 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x54, 0xdb, 0x6e, 0xd3, 0x40, - 0x10, 0xad, 0x63, 0xe7, 0x36, 0x69, 0x5d, 0x67, 0x14, 0x2a, 0x0b, 0x24, 0x1a, 0xad, 0x14, 0x08, - 0x2f, 0x01, 0x02, 0x42, 0x48, 0x7d, 0xb2, 0x52, 0x0b, 0x55, 0x6a, 0x69, 0xe5, 0x06, 0x5e, 0x78, - 0x08, 0x4e, 0xbc, 0x14, 0xd3, 0xc4, 0x0e, 0xd9, 0x0d, 0x12, 0x12, 0x9f, 0xc0, 0xa7, 0xf0, 0x51, - 0x7c, 0x0a, 0xda, 0x5d, 0x5f, 0x5b, 0x87, 0x17, 0x6b, 0x77, 0xe6, 0xcc, 0xcc, 0x39, 0x3b, 0x47, - 0x86, 0xee, 0x4d, 0xc8, 0xbf, 0x6e, 0xe7, 0xdc, 0x67, 0xb7, 0x6c, 0xb4, 0xde, 0xc4, 0x3c, 0xc6, - 0x4e, 0x21, 0x44, 0x3e, 0x41, 0x63, 0x11, 0x47, 0x5f, 0xc2, 0x1b, 0x7c, 0x01, 0xad, 0xf5, 0x26, - 0xfe, 0x46, 0x17, 0x9c, 0xd9, 0x5a, 0x5f, 0x1f, 0x76, 0xc6, 0xbd, 0x51, 0xb1, 0xf8, 0x4a, 0x25, - 0xbd, 0x0c, 0x85, 0xc7, 0xd0, 0x59, 0xfa, 0x8c, 0xcf, 0xb6, 0xeb, 0xc0, 0xe7, 0xd4, 0xae, 0xf5, - 0xb5, 0xa1, 0xee, 0x81, 0x08, 0x7d, 0x90, 0x11, 0xf2, 0x0b, 0x9a, 0x49, 0x15, 0x22, 0x18, 0x91, - 0xbf, 0xa2, 0xb6, 0xd6, 0xd7, 0x86, 0x6d, 0x4f, 0x9e, 0xf1, 0x0d, 0xc0, 0x2a, 0x5c, 0x52, 0xc6, - 0xe3, 0x88, 0x32, 0xbb, 0x26, 0x67, 0x1e, 0x95, 0x66, 0x5e, 0xa4, 0x69, 0xaf, 0x80, 0xc4, 0x01, - 0x98, 0x0a, 0x34, 0x4b, 0xa8, 0xd8, 0xba, 0xec, 0x7a, 0xa0, 0xa2, 0xc9, 0x48, 0xf2, 0x57, 0x83, - 0x76, 0xd6, 0xa0, 0x92, 0xc0, 0x11, 0x34, 0xa2, 0xed, 0x6a, 0x4e, 0x37, 0x92, 0x7b, 0xdd, 0x4b, - 0x6e, 0x78, 0x02, 0x75, 0xc6, 0x85, 0x24, 0xd1, 0xd7, 0x1c, 0x0f, 0xaa, 0x39, 0xe5, 0xa7, 0x6b, - 0x01, 0xf6, 0x54, 0x0d, 0x3e, 0x85, 0xba, 0x04, 0xda, 0x86, 0x14, 0xd4, 0x2d, 0x15, 0x4f, 0x7d, - 0x76, 0xeb, 0xa9, 0x3c, 0x71, 0xc0, 0x2c, 0x77, 0xc0, 0x0e, 0x34, 0x27, 0x9e, 0xeb, 0x4c, 0xdd, - 0x53, 0x6b, 0x0f, 0x5b, 0x60, 0x9c, 0x9d, 0x9e, 0xbb, 0x96, 0x86, 0x00, 0x0d, 0x67, 0x32, 0x3d, - 0xfb, 0xe8, 0x5a, 0x35, 0xdc, 0x87, 0xd6, 0xe4, 0xf2, 0xe2, 0xea, 0xdc, 0x9d, 0xba, 0x96, 0x4e, - 0xfe, 0x68, 0x60, 0x88, 0x96, 0xd8, 0x83, 0x3a, 0x0f, 0xf9, 0x32, 0x95, 0xa7, 0x2e, 0x42, 0xf3, - 0x3c, 0x0e, 0x7e, 0x4a, 0x75, 0x6d, 0x4f, 0x9e, 0xf1, 0x65, 0xaa, 0xcd, 0x90, 0xda, 0x1e, 0xdd, - 0xa3, 0x27, 0x3f, 0x25, 0x45, 0xf9, 0x33, 0xd5, 0x8b, 0xcf, 0x44, 0x9e, 0x43, 0x3b, 0xc3, 0x66, - 0x74, 0xf7, 0x0a, 0x74, 0xb5, 0x12, 0xdd, 0x1a, 0x39, 0x81, 0xae, 0x13, 0x04, 0xa9, 0x91, 0xe8, - 0xf7, 0x2d, 0x65, 0x1c, 0x9f, 0x80, 0xee, 0x07, 0x81, 0x24, 0xbe, 0xcb, 0x72, 0x02, 0x40, 0x7a, - 0x80, 0xc5, 0x62, 0xb6, 0x8e, 0x23, 0x46, 0xc9, 0x67, 0xe8, 0x29, 0xb3, 0xdd, 0xe9, 0x5a, 0xb5, - 0xee, 0xd7, 0xd0, 0xce, 0x5c, 0x24, 0xdf, 0x64, 0xb7, 0xdd, 0x72, 0x20, 0x79, 0x07, 0x0f, 0xee, - 0x4c, 0x50, 0xa3, 0x71, 0x04, 0x4d, 0xe5, 0xfc, 0xff, 0x93, 0x4f, 0x41, 0xe4, 0xb7, 0x06, 0xa6, - 0x13, 0x04, 0xd2, 0x02, 0x09, 0xcb, 0x01, 0x98, 0xd9, 0xa0, 0x59, 0x81, 0xef, 0x41, 0x16, 0x7d, - 0x2f, 0x88, 0x3f, 0x03, 0xab, 0x00, 0x2b, 0x3a, 0xf6, 0x30, 0x07, 0x2a, 0xeb, 0x66, 0x46, 0xd0, - 0xab, 0x8c, 0x60, 0xe4, 0x46, 0x20, 0x6f, 0xe1, 0x30, 0x63, 0x93, 0x28, 0x1a, 0x80, 0x21, 0xb8, - 0x27, 0x72, 0x2a, 0x9c, 0x2b, 0xd3, 0xe3, 0x19, 0xec, 0x8b, 0x1b, 0xbb, 0xa6, 0x9b, 0x1f, 0xe1, - 0x82, 0xe2, 0x25, 0x40, 0xbe, 0x19, 0x7c, 0x5c, 0x2a, 0xbb, 0xb7, 0xef, 0x87, 0xc7, 0x3b, 0xf3, - 0xc9, 0x4a, 0xf7, 0xe6, 0x0d, 0xf9, 0xa3, 0x7a, 0xf5, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x87, 0xff, - 0xd3, 0x20, 0xbd, 0x04, 0x00, 0x00, + // 532 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x4f, 0x6f, 0xd3, 0x4e, + 0x10, 0xad, 0x63, 0x3b, 0x89, 0x27, 0xad, 0xeb, 0x8c, 0xf2, 0xab, 0xac, 0x1f, 0x12, 0x8d, 0x56, + 0x0a, 0x84, 0x4b, 0x04, 0x01, 0x21, 0xa4, 0x72, 0xb1, 0x52, 0x0b, 0x55, 0x6a, 0x69, 0xe5, 0xa6, + 0x5c, 0x38, 0x04, 0x27, 0x5e, 0x8a, 0x69, 0x62, 0x87, 0xec, 0x06, 0x89, 0x4f, 0xc0, 0x85, 0x2f, + 0xc4, 0xb7, 0x43, 0xde, 0xf5, 0xdf, 0xd6, 0x41, 0xe2, 0x52, 0xed, 0xce, 0xbc, 0xf1, 0x7b, 0xf3, + 0xf6, 0x35, 0xd0, 0xbd, 0x0d, 0xf9, 0x97, 0xed, 0x9c, 0xfb, 0xec, 0x8e, 0x8d, 0xd6, 0x9b, 0x98, + 0xc7, 0xd8, 0x29, 0x95, 0xc8, 0x47, 0x68, 0x2e, 0xe2, 0xe8, 0x73, 0x78, 0x8b, 0xcf, 0xa1, 0xbd, + 0xde, 0xc4, 0x5f, 0xe9, 0x82, 0x33, 0x5b, 0xe9, 0xab, 0xc3, 0xce, 0xb8, 0x37, 0x2a, 0x0f, 0x5f, + 0xc9, 0xa6, 0x97, 0xa3, 0xf0, 0x18, 0x3a, 0x4b, 0x9f, 0xf1, 0xd9, 0x76, 0x1d, 0xf8, 0x9c, 0xda, + 0x8d, 0xbe, 0x32, 0x54, 0x3d, 0x48, 0x4a, 0x37, 0xa2, 0x42, 0x6e, 0xa0, 0x95, 0x4e, 0x21, 0x82, + 0x16, 0xf9, 0x2b, 0x6a, 0x2b, 0x7d, 0x65, 0x68, 0x78, 0xe2, 0x8c, 0xaf, 0x01, 0x56, 0xe1, 0x92, + 0x32, 0x1e, 0x47, 0x94, 0xd9, 0x0d, 0xc1, 0x79, 0x54, 0xe1, 0xbc, 0xc8, 0xda, 0x5e, 0x09, 0x49, + 0x7e, 0x36, 0xc0, 0xc8, 0x3b, 0xb5, 0x5f, 0x3e, 0x82, 0x66, 0xb4, 0x5d, 0xcd, 0xe9, 0x46, 0x88, + 0xd2, 0xbd, 0xf4, 0x86, 0x27, 0xa0, 0x33, 0x9e, 0x68, 0x55, 0xfb, 0xca, 0xd0, 0x1c, 0x0f, 0xea, + 0xc9, 0x8a, 0xd3, 0x75, 0x02, 0xf6, 0xe4, 0x0c, 0x3e, 0x05, 0x5d, 0x00, 0x6d, 0x4d, 0x28, 0xed, + 0x56, 0x86, 0xa7, 0x3e, 0xbb, 0xf3, 0x64, 0x1f, 0x07, 0x60, 0xca, 0xd6, 0x2c, 0xb5, 0xca, 0xd6, + 0x85, 0xb6, 0x03, 0x59, 0x4d, 0x2d, 0x21, 0x0e, 0x98, 0x55, 0x22, 0xec, 0x40, 0x6b, 0xe2, 0xb9, + 0xce, 0xd4, 0x3d, 0xb5, 0xf6, 0xb0, 0x0d, 0xda, 0xd9, 0xe9, 0xb9, 0x6b, 0x29, 0x08, 0xd0, 0x74, + 0x26, 0xd3, 0xb3, 0x0f, 0xae, 0xd5, 0xc0, 0x7d, 0x68, 0x4f, 0x2e, 0x2f, 0xae, 0xce, 0xdd, 0xa9, + 0x6b, 0xa9, 0xe4, 0xb7, 0x02, 0x5a, 0xc2, 0x8c, 0x3d, 0xd0, 0x79, 0xc8, 0x97, 0x99, 0x0b, 0xf2, + 0x92, 0x58, 0x33, 0x8f, 0x83, 0x1f, 0xc2, 0x04, 0xc3, 0x13, 0x67, 0x7c, 0x91, 0x59, 0xa0, 0x09, + 0x0b, 0x1e, 0x3d, 0xd8, 0x42, 0xfc, 0xa9, 0x2c, 0x5e, 0xb8, 0xa9, 0x97, 0xdd, 0x24, 0x6f, 0xc1, + 0xc8, 0xb1, 0xff, 0xae, 0xfd, 0x04, 0xba, 0x4e, 0x10, 0x64, 0xa9, 0xa2, 0xdf, 0xb6, 0x94, 0x71, + 0x7c, 0x02, 0xaa, 0x1f, 0x04, 0x62, 0x8b, 0x5d, 0xf9, 0x4b, 0x00, 0xa4, 0x07, 0x58, 0x1e, 0x66, + 0xeb, 0x38, 0x62, 0x94, 0x7c, 0x82, 0x9e, 0x4c, 0xde, 0xbd, 0xaf, 0xd6, 0x45, 0xe4, 0x15, 0x18, + 0x79, 0xa4, 0x84, 0x41, 0xbb, 0xb3, 0x57, 0x00, 0xc9, 0x3b, 0xf8, 0xef, 0x1e, 0x83, 0xa4, 0xc6, + 0x11, 0xb4, 0xe4, 0xbf, 0xc1, 0xdf, 0xc5, 0x67, 0x20, 0xf2, 0x4b, 0x01, 0xd3, 0x09, 0x02, 0x11, + 0x9b, 0x54, 0xe5, 0x00, 0xcc, 0x9c, 0x68, 0x56, 0xd2, 0x7b, 0x90, 0x57, 0xdf, 0x27, 0xc2, 0x9f, + 0x81, 0x55, 0x82, 0x95, 0x53, 0x7e, 0x58, 0x00, 0x65, 0xdc, 0xf3, 0x54, 0xa8, 0x75, 0xa9, 0xd0, + 0x8a, 0x54, 0x90, 0x37, 0x70, 0x98, 0xab, 0x49, 0x37, 0x1a, 0x80, 0x96, 0x68, 0x4f, 0xd7, 0xa9, + 0x49, 0xbb, 0x68, 0x8f, 0x67, 0xb0, 0x9f, 0xdc, 0xd8, 0x35, 0xdd, 0x7c, 0x0f, 0x17, 0x14, 0x2f, + 0x01, 0x8a, 0x97, 0xc1, 0xc7, 0x95, 0xb1, 0x07, 0xef, 0xfd, 0xff, 0xf1, 0xce, 0x7e, 0xfa, 0xa4, + 0x7b, 0xf3, 0xa6, 0xf8, 0xd5, 0x7a, 0xf9, 0x27, 0x00, 0x00, 0xff, 0xff, 0xf3, 0xf1, 0xb5, 0x22, + 0xca, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/githubtasks.proto b/proto/githubtasks.proto index f6908b0c..ff03d637 100644 --- a/proto/githubtasks.proto +++ b/proto/githubtasks.proto @@ -10,7 +10,6 @@ message config { message Project { string name = 1; repeated Milestone milestones = 2; - string github_project = 3; } message Milestone { @@ -25,6 +24,7 @@ message Milestone { } MilestoneState state = 3; repeated Task tasks = 4; + string github_project = 5; } message Task { @@ -32,7 +32,7 @@ message Task { string body = 2; enum TaskState { - CREATED = 0 + CREATED = 0; IDLE = 1; ACTIVE = 2; COMPLETE = 3;