select: add new "select" command for choosing the default database

Author: justinclift

cmd/branchActiveGet.go

@@ -22,16 +22,27 @@ func init() {
 
 func branchActiveGet(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be worked with at a time (for now)")
 	}
 
 	// Load the local metadata cache, without retrieving updated metadata from the cloud
-	db := args[0]
-	meta, err := localFetchMetadata(db, false)
+	meta, err = localFetchMetadata(db, false)
 	if err != nil {
 		return err
 	}

cmd/branchActiveSet.go

@@ -35,8 +35,20 @@ func init() {
 
 func branchActiveSet(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be changed at a time (for now)")
@@ -48,8 +60,7 @@ func branchActiveSet(args []string) error {
 	}
 
 	// If there's no local metadata cache, then create one
-	db := args[0]
-	meta, err := loadMetadata(db)
+	meta, err = loadMetadata(db)
 	if err != nil {
 		return err
 	}

cmd/branchCreate.go

@@ -27,8 +27,20 @@ func init() {
 
 func branchCreate(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be changed at a time (for now)")
@@ -43,8 +55,7 @@ func branchCreate(args []string) error {
 	}
 
 	// Load the metadata
-	db := args[0]
-	meta, err := loadMetadata(db)
+	meta, err = loadMetadata(db)
 	if err != nil {
 		return err
 	}

cmd/branchList.go

@@ -26,17 +26,28 @@ func init() {
 
 func branchList(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be worked with at a time (for now)")
 	}
 
 	// If there is a local metadata cache for the requested database, use that.  Otherwise, retrieve it from the
 	// server first (without storing it)
-	db := args[0]
-	meta := metaData{}
+	meta = metaData{}
 	md, err := ioutil.ReadFile(filepath.Join(".dio", db, "metadata.json"))
 	if err == nil {
 		err = json.Unmarshal([]byte(md), &meta)

cmd/branchRemove.go

@@ -25,8 +25,20 @@ func init() {
 
 func branchRemove(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be changed at a time (for now)")
@@ -38,8 +50,7 @@ func branchRemove(args []string) error {
 	}
 
 	// Load the metadata
-	db := args[0]
-	meta, err := loadMetadata(db)
+	meta, err = loadMetadata(db)
 	if err != nil {
 		return err
 	}

cmd/branchRevert.go

@@ -38,8 +38,20 @@ func init() {
 
 func branchRevert(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be changed at a time (for now)")
@@ -56,8 +68,7 @@ func branchRevert(args []string) error {
 	}
 
 	// Load the metadata
-	db := args[0]
-	meta, err := loadMetadata(db)
+	meta, err = loadMetadata(db)
 	if err != nil {
 		return err
 	}

cmd/branchUpdate.go

@@ -31,8 +31,20 @@ func init() {
 
 func branchUpdate(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("Only one database can be changed at a time (for now)")
@@ -47,8 +59,7 @@ func branchUpdate(args []string) error {
 	}
 
 	// Load the metadata
-	db := args[0]
-	meta, err := loadMetadata(db)
+	meta, err = loadMetadata(db)
 	if err != nil {
 		return err
 	}

cmd/commit.go

@@ -49,8 +49,20 @@ func init() {
 
 func commit(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
+	var meta metaData
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	// TODO: Allow giving multiple database files on the command line.  Hopefully just needs turning this
 	// TODO  into a for loop
@@ -59,7 +71,6 @@ func commit(args []string) error {
 	}
 
 	// Ensure the database file exists
-	db := args[0]
 	fi, err := os.Stat(db)
 	if err != nil {
 		return err
@@ -98,7 +109,6 @@ func commit(args []string) error {
 
 	// If the database metadata doesn't exist locally, check if it does exist on the server.
 	var newDB, localPresent bool
-	var meta metaData
 	if _, err = os.Stat(filepath.Join(".dio", db, "db")); os.IsNotExist(err) {
 		// At the moment, since there's no better way to check for the existence of a remote database, we just
 		// grab the list of the users databases and check against that

cmd/log.go

@@ -27,17 +27,28 @@ func init() {
 
 func branchLog(args []string) error {
 	// Ensure a database file was given
+	var db string
+	var err error
 	if len(args) == 0 {
-		return errors.New("no database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
 	if len(args) > 1 {
 		return errors.New("only one database can be worked with at a time (for now)")
 	}
 
 	// If there is a local metadata cache for the requested database, use that.  Otherwise, retrieve it from the
 	// server first (without storing it)
-	db := args[0]
-	meta, err := localFetchMetadata(db, true)
+	var meta metaData
+	meta, err = localFetchMetadata(db, true)
 	if err != nil {
 		return err
 	}

cmd/pull.go

@@ -40,9 +40,21 @@ func init() {
 
 func pull(args []string) error {
 	// Ensure a database file was given
+	var db, defDB string
+	var err error
 	if len(args) == 0 {
-		return errors.New("No database file specified")
+		db, err = getDefaultDatabase()
+		if err != nil {
+			return err
+		}
+		if db == "" {
+			// No database name was given on the command line, and we don't have a default database selected
+			return errors.New("No database file specified")
+		}
+	} else {
+		db = args[0]
 	}
+
 	// TODO: Allow giving multiple database files on the command line.  Hopefully just needs turning this
 	// TODO  into a for loop
 	if len(args) > 1 {
@@ -59,23 +71,24 @@ func pull(args []string) error {
 
 	// Retrieve metadata for the database
 	var meta metaData
-	var err error
-	db := args[0]
 	meta, err = updateMetadata(db, false) // Don't store the metadata to disk yet, in case the download fails
 	if err != nil {
 		return err
 	}
 
-	// Unless --force is specified, check whether the file has changed since the last commit, and let the user know
-	if *pullForce == false {
-		changed, err := dbChanged(db, meta)
-		if err != nil {
-			return err
-		}
-		if changed {
-			_, err = fmt.Fprintf(fOut, "%s has been changed since the last commit.  Use --force if you "+
-				"really want to overwrite it\n", db)
-			return err
+	// If the database file already exists locally, check whether the file has changed since the last commit, and let
+	// the user know.  The --force option on the command line overrides this
+	if _, err = os.Stat(db); err == nil {
+		if *pullForce == false {
+			changed, err := dbChanged(db, meta)
+			if err != nil {
+				return err
+			}
+			if changed {
+				_, err = fmt.Fprintf(fOut, "%s has been changed since the last commit.  Use --force if you "+
+					"really want to overwrite it\n", db)
+				return err
+			}
 		}
 	}
 
@@ -182,6 +195,18 @@ func pull(args []string) error {
 			if err != nil {
 				return err
 			}
+
+			// If a default database isn't already selected, we use this one as the default
+			defDB, err = getDefaultDatabase()
+			if err != nil {
+				return err
+			}
+			if defDB == "" {
+				err = saveDefaultDatabase(db)
+				if err != nil {
+					return err
+				}
+			}
 			return nil
 		}
 	}
@@ -254,6 +279,18 @@ func pull(args []string) error {
 		return err
 	}
 
+	// If a default database isn't already selected, we use this one as the default
+	defDB, err = getDefaultDatabase()
+	if err != nil {
+		return err
+	}
+	if defDB == "" {
+		err = saveDefaultDatabase(db)
+		if err != nil {
+			return err
+		}
+	}
+
 	// Display success message to the user
 	comID := resp.Header.Get("Commit-Id")
 	_, err = fmt.Fprintln(fOut, "Downloaded complete")