Ensure not submitted is only displayed during fetch

Author: Tonkpils

api/api.go

@@ -68,7 +68,7 @@ func (c *Client) Fetch(args []string) ([]*Problem, error) {
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf(`unable to fetch problems (HTTP: %d) - %s`, res.StatusCode, payload.Error)
+		return nil, fmt.Errorf("unable to fetch problems (HTTP: %d) - %s", res.StatusCode, payload.Error)
 	}
 
 	return payload.Problems, nil
@@ -89,27 +89,22 @@ func (c *Client) Restore() ([]*Problem, error) {
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf(`unable to fetch problems (HTTP: %d) - %s`, res.StatusCode, payload.Error)
+		return nil, fmt.Errorf("unable to fetch problems (HTTP: %d) - %s", res.StatusCode, payload.Error)
 	}
 
 	return payload.Problems, nil
 }
 
 // Submissions gets a list of submitted exercises and their current acceptance state.
-func Submissions(url string) (map[string][]SubmissionInfo, error) {
-	req, err := http.NewRequest("GET", url, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	res, err := http.DefaultClient.Do(req)
+func (c *Client) Submissions() (map[string][]SubmissionInfo, error) {
+	url := fmt.Sprintf("%s/api/v1/exercises?key=%s", c.APIHost, c.APIKey)
+	req, err := c.NewRequest("GET", url, nil)
 	if err != nil {
 		return nil, err
 	}
-	defer res.Body.Close()
 
-	payload := map[string][]SubmissionInfo{}
-	if err := json.NewDecoder(res.Body).Decode(&payload); err != nil {
+	var payload map[string][]SubmissionInfo
+	if _, err := c.Do(req, &payload); err != nil {
 		return nil, err
 	}
 
@@ -153,7 +148,7 @@ func (c *Client) Demo() ([]*Problem, error) {
 	}
 
 	if res.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf(`unable to fetch problems (HTTP: %d) - %s`, res.StatusCode, payload.Error)
+		return nil, fmt.Errorf("unable to fetch problems (HTTP: %d) - %s", res.StatusCode, payload.Error)
 	}
 
 	return payload.Problems, nil
@@ -179,7 +174,7 @@ func (c *Client) Submit(iter *Iteration) (*Submission, error) {
 	}
 
 	if res.StatusCode != http.StatusCreated {
-		return nil, fmt.Errorf(`unable to submit (HTTP: %d) - %s`, res.StatusCode, ps.Error)
+		return nil, fmt.Errorf("unable to submit (HTTP: %d) - %s", res.StatusCode, ps.Error)
 	}
 
 	return ps.Submission, nil

cmd/fetch.go

@@ -22,7 +22,12 @@ func Fetch(ctx *cli.Context) {
 		log.Fatal(err)
 	}
 
-	if err := setSubmissionState(c, problems); err != nil {
+	submissionInfo, err := client.Submissions()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	if err := setSubmissionState(problems, submissionInfo); err != nil {
 		log.Fatal(err)
 	}
 
@@ -31,17 +36,12 @@ func Fetch(ctx *cli.Context) {
 		log.Fatal(err)
 	}
 
-	hw.Summarize()
+	hw.Summarize(true)
 }
 
-func setSubmissionState(c *config.Config, problems []*api.Problem) error {
-	submissions, err := api.Submissions(fmt.Sprintf("%s/api/v1/exercises?key=%s", c.API, c.APIKey))
-	if err != nil {
-		return err
-	}
-
+func setSubmissionState(problems []*api.Problem, submissionInfo map[string][]api.SubmissionInfo) error {
 	for _, problem := range problems {
-		langSubmissions := submissions[problem.Language]
+		langSubmissions := submissionInfo[problem.Language]
 		for _, submission := range langSubmissions {
 			if submission.Slug == problem.Slug {
 				problem.Submitted = true

cmd/restore.go

@@ -27,5 +27,5 @@ func Restore(ctx *cli.Context) {
 	if err := hw.Save(); err != nil {
 		log.Fatal(err)
 	}
-	hw.Summarize()
+	hw.Summarize(false)
 }

user/homework.go

@@ -117,11 +117,12 @@ func (hw *Homework) maxTitleWidth() int {
 }
 
 // Summarize prints a full report of new and updated items in the set.
-func (hw *Homework) Summarize() {
+func (hw *Homework) Summarize(displayNotSubmitted bool) {
 	hw.Report(HWUpdated)
 	hw.Report(HWNew)
-	hw.Report(HWNotSubmitted)
-
+	if displayNotSubmitted {
+		hw.Report(HWNotSubmitted)
+	}
 	fresh := len(hw.ItemsMatching(HWNew))
 	updated := len(hw.ItemsMatching(HWUpdated))
 	unchanged := len(hw.Items) - updated - fresh