various: initial minor tweaks for usability

Author: justinclift

cmd/list.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/spf13/cobra"
 )
@@ -65,11 +66,21 @@ func list(args []string) error {
 				return err
 			}
 		}
-		_, err = fmt.Fprintf(fOut, "      File last modified: %s\n", j.LastModified)
+		// The server gives us the last modified and repo modified dates in pre-formatted UTC timezone.  For now, lets
+		// convert these back to the users local time
+		z, err := time.Parse(time.RFC822, j.LastModified)
 		if err != nil {
 			return err
 		}
-		_, err = fmt.Fprintf(fOut, "      Repository last updated: %s\n\n", j.RepoModified)
+		_, err = fmt.Fprintf(fOut, "      File last modified: %s\n", z.Local().Format(time.RFC1123))
+		if err != nil {
+			return err
+		}
+		z, err = time.Parse(time.RFC822, j.RepoModified)
+		if err != nil {
+			return err
+		}
+		_, err = fmt.Fprintf(fOut, "      Repository last updated: %s\n\n", z.Local().Format(time.RFC1123))
 		if err != nil {
 			return err
 		}

cmd/log.go

@@ -88,7 +88,7 @@ func branchLog(args []string) error {
 func createCommitText(c commitEntry, licList map[string]string) string {
 	s := fmt.Sprintf("  * Commit: %s\n", c.ID)
 	s += fmt.Sprintf("    Author: %s <%s>\n", c.AuthorName, c.AuthorEmail)
-	s += fmt.Sprintf("    Date: %v\n", c.Timestamp.Format(time.UnixDate))
+	s += fmt.Sprintf("    Date: %v\n", c.Timestamp.Local().Format(time.RFC1123))
 	if c.Tree.Entries[0].LicenceSHA != "" {
 		s += fmt.Sprintf("    Licence: %s\n\n", licList[c.Tree.Entries[0].LicenceSHA])
 	} else {

cmd/pull.go

@@ -187,6 +187,12 @@ func pull(args []string) error {
 	}
 
 	// Download the database file
+	// TODO: Use a streaming download approach, so download progress can be shown.  Something like this should help:
+	//         https://stackoverflow.com/questions/22108519/how-do-i-read-a-streaming-response-body-using-golangs-net-http-package
+	_, err = fmt.Fprintf(fOut, "Downloading '%s' from %s...\n", db, cloud)
+	if err != nil {
+		return err
+	}
 	resp, body, err := retrieveDatabase(db, pullCmdBranch, pullCmdCommit)
 	if err != nil {
 		return err
@@ -201,17 +207,17 @@ func pull(args []string) error {
 	}
 
 	// Calculate the sha256 of the database file
-	s := sha256.Sum256([]byte(body))
+	s := sha256.Sum256(body)
 	shaSum := hex.EncodeToString(s[:])
 
 	// Write the database file to disk in the cache directory
-	err = ioutil.WriteFile(filepath.Join(".dio", db, "db", shaSum), []byte(body), 0644)
+	err = ioutil.WriteFile(filepath.Join(".dio", db, "db", shaSum), body, 0644)
 	if err != nil {
 		return err
 	}
 
 	// Write the database file to disk again, this time in the working directory
-	err = ioutil.WriteFile(db, []byte(body), 0644)
+	err = ioutil.WriteFile(db, body, 0644)
 	if err != nil {
 		return err
 	}
@@ -250,7 +256,7 @@ func pull(args []string) error {
 
 	// Display success message to the user
 	comID := resp.Header.Get("Commit-Id")
-	_, err = fmt.Fprintf(fOut, "Database '%s' downloaded from %s\n", db, cloud)
+	_, err = fmt.Fprintln(fOut, "Downloaded complete")
 	if err != nil {
 		return err
 	}
@@ -267,8 +273,5 @@ func pull(args []string) error {
 		}
 	}
 	_, err = numFormat.Fprintf(fOut, "  * Size: %d bytes\n", len(body))
-	if err != nil {
-		return err
-	}
-	return nil
+	return err
 }

cmd/shared.go

@@ -23,14 +23,14 @@ import (
 // Check if the database with the given SHA256 checksum is in local cache.  If it's not then download and cache it
 func checkDBCache(db, shaSum string) (err error) {
 	if _, err = os.Stat(filepath.Join(".dio", db, "db", shaSum)); os.IsNotExist(err) {
-		var body string
+		var body []byte
 		_, body, err = retrieveDatabase(db, pullCmdBranch, pullCmdCommit)
 		if err != nil {
 			return
 		}
 
 		// Verify the SHA256 checksum of the new download
-		s := sha256.Sum256([]byte(body))
+		s := sha256.Sum256(body)
 		thisSum := hex.EncodeToString(s[:])
 		if thisSum != shaSum {
 			// The newly downloaded database file doesn't have the expected checksum.  Abort.
@@ -39,7 +39,7 @@ func checkDBCache(db, shaSum string) (err error) {
 		}
 
 		// Write the database file to disk in the cache directory
-		err = ioutil.WriteFile(filepath.Join(".dio", db, "db", shaSum), []byte(body), 0644)
+		err = ioutil.WriteFile(filepath.Join(".dio", db, "db", shaSum), body, 0644)
 	}
 	return
 }
@@ -525,7 +525,7 @@ func mergeMetadata(origMeta metaData, newMeta metaData) (mergedMeta metaData, er
 }
 
 // Retrieves a database from DBHub.io
-func retrieveDatabase(db string, branch string, commit string) (resp rq.Response, body string, err error) {
+func retrieveDatabase(db string, branch string, commit string) (resp rq.Response, body []byte, err error) {
 	dbURL := fmt.Sprintf("%s/%s/%s", cloud, certUser, db)
 	req := rq.New().TLSClientConfig(&TLSConfig).Get(dbURL)
 	if branch != "" {
@@ -534,7 +534,7 @@ func retrieveDatabase(db string, branch string, commit string) (resp rq.Response
 		req.Query(fmt.Sprintf("commit=%s", url.QueryEscape(commit)))
 	}
 	var errs []error
-	resp, body, errs = req.End()
+	resp, body, errs = req.EndBytes()
 	if errs != nil {
 		log.Print("Errors when downloading database:")
 		for _, err := range errs {