Fix Delverlens import flow

sevenkeys/cli/mainui.go

@@ -64,6 +64,7 @@ func MainCliLoop(db *sql.DB) {
 			logic.Check(err)
 
 			//selectedStorageAreaName = name
+			// TODO: Make db call to cache StorageArea once we have the ID
 			cardLocation.StorageAreaId = id
 			break
 		case "c", "criteria":
@@ -102,7 +103,7 @@ func MainCliLoop(db *sql.DB) {
 			cards, err := delverlens.ParseExportFile(filename)
 			logic.Check(err)
 
-			err = logic.ImportDelverLensCards(cards)
+			err = logic.ImportDelverLensCards(db, cards, cardLocation.StorageAreaId)
 			logic.Check(err)
 			break
 		case "l", "locate":

sevenkeys/database/storagearea.go

@@ -1,6 +1,12 @@
 package database
 
-import "database/sql"
+import (
+	"database/sql"
+	"errors"
+)
+
+var ErrStorageAreaDoesNotExist error = errors.New("Storage area does not exist.")
+var ErrNoEmptySlotsInBinder error = errors.New("No empty slots in binder.")
 
 var StorageAreaTypeBinder string = "Binder"
 var StorageAreaTypeBox string = "Box"
@@ -34,6 +40,22 @@ func GetAllStorageAreas(db *sql.DB) ([]StorageArea, error) {
 	return storageAreas, nil
 }
 
+func GetStorageAreaIdByName(db *sql.DB, storageAreaName string) (int, error) {
+	var storageAreaId int
+
+	query := `SELECT Id FROM StorageArea WHERE Name = ?;`
+	row := db.QueryRow(query, storageAreaName)
+
+	err := row.Scan(&storageAreaId)
+	if err == sql.ErrNoRows {
+		return storageAreaId, ErrStorageAreaDoesNotExist
+	} else if err != nil {
+		return storageAreaId, err
+	}
+
+	return storageAreaId, nil
+}
+
 func GetStorageAreaTypeById(db *sql.DB, storageAreaId int) (string, error) {
 	var storageType string
 
@@ -54,7 +76,7 @@ func GetNextEmptySlotInBinder(db *sql.DB, storageAreaId int) (int, error) {
 	var emptySlotId int
 	err := db.QueryRow(query, storageAreaId).Scan(&emptySlotId)
 	if err == sql.ErrNoRows {
-		return -1, nil
+		return -1, ErrNoEmptySlotsInBinder
 	} else if err != nil {
 		return 0, err
 	}

sevenkeys/delverlens/delverlens.go

@@ -4,7 +4,6 @@ import (
 	"encoding/csv"
 	"io"
 	"os"
-	"strings"
 )
 
 type DelverLensCard struct {
@@ -16,6 +15,7 @@ func ParseExportFile(filename string) ([]DelverLensCard, error) {
 	var cards []DelverLensCard
 
 	file, err := os.Open("/home/viciouscirce/dox/sevenkeys_imports/" + filename)
+	defer file.Close()
 	if err != nil {
 		return cards, err
 	}
@@ -38,10 +38,8 @@ func ParseExportFile(filename string) ([]DelverLensCard, error) {
 		}
 
 		card := DelverLensCard{
-			Name:            record[0],
+			ScryfallID: record[0],
-			IsFoil:          record[1] == "Foil",
+			IsFoil:     record[1] == "Foil",
-			CollectorNumber: record[2],
-			SetCode:         strings.ToLower(record[3]),
 		}
 		cards = append(cards, card)
 	}

sevenkeys/logic/import.go

@@ -10,9 +10,9 @@ func ImportDelverLensCards(db *sql.DB, cards []delverlens.DelverLensCard, storag
 	for _, card := range cards {
 		var cardPrintingId string
 		if card.IsFoil {
-			cardPrintingId = card.ScryfallID + "n"
-		} else {
 			cardPrintingId = card.ScryfallID + "f"
+		} else {
+			cardPrintingId = card.ScryfallID + "n"
 		}
 
 		cardLocation := database.CardLocation{
@@ -20,6 +20,8 @@ func ImportDelverLensCards(db *sql.DB, cards []delverlens.DelverLensCard, storag
 			StorageAreaId:  storageAreaId,
 		}
 
-		StoreCard(cardLocation)
+		StoreCard(db, cardLocation)
 	}
+
+	return nil
 }

sevenkeys/logic/storage.go

@@ -2,10 +2,34 @@ package logic
 
 import (
 	"database/sql"
+	"errors"
 	"sevenkeys/database"
 )
 
-type StorageAreaSearchOptions map[string]int
+var ErrCouldNotGetStorageAreaId error = errors.New("Could not get storage area ID.")
+
+func GetStorageAreaId(db *sql.DB, storageAreaName string) (int, error) {
+	id, err := database.GetStorageAreaIdByName(db, storageAreaName)
+	if err == nil {
+		return id, nil
+	}
+
+	if err == database.ErrStorageAreaDoesNotExist {
+		storageOptions, err := GetStorageAreaSearchOptions(db)
+		if err != nil {
+			return id, err
+		}
+
+		id, _, err := GenericSearch(storageOptions)
+		if err == nil {
+			return id, nil
+		}
+
+		return id, ErrCouldNotGetStorageAreaId
+	}
+
+	return id, ErrCouldNotGetStorageAreaId
+}
 
 func CreateStorageArea(db *sql.DB, storageArea database.StorageArea) error {
 	// TODO: Check if there's already a storage are with the same name
@@ -18,8 +42,10 @@ func CreateStorageArea(db *sql.DB, storageArea database.StorageArea) error {
 	return nil
 }
 
+type StorageAreaSearchOptions map[string]int
+
 func GetStorageAreaSearchOptions(db *sql.DB) (StorageAreaSearchOptions, error) {
-	var options StorageAreaSearchOptions
+	var options StorageAreaSearchOptions = make(map[string]int)
 
 	storageAreas, err := database.GetAllStorageAreas(db)
 	if err != nil {
@@ -33,7 +59,7 @@ func GetStorageAreaSearchOptions(db *sql.DB) (StorageAreaSearchOptions, error) {
 	return options, nil
 }
 
-func StoreAfterLastCard(db *sql.DB, cardLocation database.CardLocation) error {
+func storeAfterLastCard(db *sql.DB, cardLocation database.CardLocation) error {
 	lastPosition, err := database.GetLastPositionInStorageArea(db, cardLocation.StorageAreaId)
 	if err != nil {
 		return err
@@ -49,7 +75,7 @@ func StoreAfterLastCard(db *sql.DB, cardLocation database.CardLocation) error {
 	return nil
 }
 
-func StoreInEmptySlot(db *sql.DB, cardLocation database.CardLocation, cardLocationId int) error {
+func storeInEmptySlot(db *sql.DB, cardLocation database.CardLocation, cardLocationId int) error {
 	cardLocation.Id = cardLocationId
 	err := database.InsertCardInExistingLocation(db, cardLocation)
 	if err != nil {
@@ -68,15 +94,15 @@ func StoreCard(db *sql.DB, cardLocation database.CardLocation) error {
 	if storageAreaType == database.StorageAreaTypeBinder {
 		nextEmptySlotId, err := database.GetNextEmptySlotInBinder(db, cardLocation.StorageAreaId)
 
-		if err == sql.ErrNoRows {
+		if err == database.ErrNoEmptySlotsInBinder {
-			err = StoreAfterLastCard(db, cardLocation)
+			err = storeAfterLastCard(db, cardLocation)
 			if err != nil {
 				return err
 			}
 		} else if err != nil {
 			return err
 		} else {
-			err = StoreInEmptySlot(db, cardLocation, nextEmptySlotId)
+			err = storeInEmptySlot(db, cardLocation, nextEmptySlotId)
 			if err != nil {
 				return err
 			}
@@ -85,9 +111,10 @@ func StoreCard(db *sql.DB, cardLocation database.CardLocation) error {
 		return nil
 	}
 
-	err = StoreAfterLastCard(db, cardLocation)
+	err = storeAfterLastCard(db, cardLocation)
 	if err != nil {
 		return err
 	}
+
 	return nil
 }

sevenkeys/main.go

@@ -1,25 +1,61 @@
 package main
 
 import (
+	"flag"
+	"fmt"
 	"os"
 	"sevenkeys/cli"
 	"sevenkeys/database"
+	"sevenkeys/delverlens"
 	"sevenkeys/figlet"
+	"sevenkeys/logic"
+)
+
+const (
+	ImportSubcommand string = "import"
 )
 
 func main() {
 	var profile string
-	if len(os.Args) < 2 {
+	flag.StringVar(&profile, "profile", "development", "The database profile to use.")
-		profile = "production"
-	} else {
-		profile = os.Args[1]
-	}
-	db := database.GetDatabaseFromConfig("config." + profile + ".json")
 
+	flag.Parse()
+
+	db := database.GetDatabaseFromConfig("config." + profile + ".json")
 	figlet.ReadFigletFonts()
 	cli.ShowSplashScreen()
-
 	cli.RunUpdateCheck(db)
 
-	cli.MainCliLoop(db)
+	// TODO: Decide in what form we need to retain this functionality if any
+	//cli.MainCliLoop(db)
+
+	importCmd := flag.NewFlagSet("import", flag.ExitOnError)
+	storageArea := importCmd.String("storagearea", "", "The name of the StorageArea where cards should be imported.")
+
+	if len(flag.Args()) == 0 {
+		fmt.Fprintln(os.Stderr, "Please specify a subcommand.")
+		os.Exit(1)
+	}
+
+	switch flag.Args()[0] {
+	case ImportSubcommand:
+		importCmd.Parse(flag.Args()[1:])
+
+		storageAreaId, err := logic.GetStorageAreaId(db, *storageArea)
+		if err == logic.ErrCouldNotGetStorageAreaId {
+			fmt.Fprintf(os.Stderr, "[sevenkeys] No storage area was selected, exiting.\n")
+			os.Exit(1)
+		}
+		logic.Check(err)
+
+		delverLensCards, err := delverlens.ParseExportFile(importCmd.Args()[0])
+		logic.Check(err)
+
+		err = logic.ImportDelverLensCards(db, delverLensCards, storageAreaId)
+		logic.Check(err)
+		break
+	default:
+		fmt.Fprintf(os.Stderr, "Unrecognized subcommand: %s\n", os.Args[1])
+		break
+	}
 }