Skip to content

Commit 8a258d5

Browse files
asutulaasutula
authored
enum best practices, no assumptions (textileio#425)
Signed-off-by: Aaron Sutula <hi@asutula.com>
1 parent 6e22a66 commit 8a258d5

5 files changed

Lines changed: 158 additions & 120 deletions

File tree

‎api/client/ffs.go‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,11 +343,26 @@ func (f *FFS) WatchJobs(ctx context.Context, ch chan<- JobEvent, jids ...ffs.Job
343343
close(ch)
344344
break
345345
}
346+
var status ffs.JobStatus
347+
switch reply.Job.Status {
348+
case rpc.JobStatus_QUEUED:
349+
status = ffs.Queued
350+
case rpc.JobStatus_EXECUTING:
351+
status = ffs.Executing
352+
case rpc.JobStatus_FAILED:
353+
status = ffs.Failed
354+
case rpc.JobStatus_CANCELED:
355+
status = ffs.Canceled
356+
case rpc.JobStatus_SUCCESS:
357+
status = ffs.Success
358+
default:
359+
status = ffs.Unspecified
360+
}
346361
job := ffs.Job{
347362
ID: ffs.JobID(reply.Job.ID),
348363
APIID: ffs.APIID(reply.Job.ApiID),
349364
Cid: c,
350-
Status: ffs.JobStatus(reply.Job.Status),
365+
Status: status,
351366
ErrCause: reply.Job.ErrCause,
352367
DealErrors: dealErrors,
353368
}

‎ffs/rpc/rpc.go‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,27 @@ func (s *RPC) WatchJobs(req *WatchJobsRequest, srv RPC_WatchJobsServer) error {
277277
close(ch)
278278
}()
279279
for job := range ch {
280+
var status JobStatus
281+
switch job.Status {
282+
case ffs.Queued:
283+
status = JobStatus_QUEUED
284+
case ffs.Executing:
285+
status = JobStatus_EXECUTING
286+
case ffs.Failed:
287+
status = JobStatus_FAILED
288+
case ffs.Canceled:
289+
status = JobStatus_FAILED
290+
case ffs.Success:
291+
status = JobStatus_SUCCESS
292+
default:
293+
status = JobStatus_UNSPECIFIED
294+
}
280295
reply := &WatchJobsReply{
281296
Job: &Job{
282297
ID: job.ID.String(),
283298
ApiID: job.APIID.String(),
284299
Cid: job.Cid.String(),
285-
Status: JobStatus(job.Status),
300+
Status: status,
286301
ErrCause: job.ErrCause,
287302
DealErrors: toRPCDealErrors(job.DealErrors),
288303
},

0 commit comments

Comments
 (0)