sevenkeys/config.example.json

@@ -1,11 +1,8 @@
 {
-  "DatabaseConfig": {
+  "User": "<your username>",
-    "User": "<your username>",
+  "Passwd": "<your password>",
-    "Passwd": "<your password>",
+  "Net": "tcp",
-    "Net": "tcp",
+  "Addr": "127.0.0.1:3306",
-    "Addr": "127.0.0.1:3306",
+  "DBName": "<your database name>",
-    "DBName": "<your database name>",
+  "AllowNativePasswords": true
-    "AllowNativePasswords": true
-  },
-  "CardtraderToken": "<your cardtrader token>"
 }

sevenkeys/config/config.go

@@ -1,29 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"log"
-	"os"
-
-	"github.com/go-sql-driver/mysql"
-)
-
-type SevenkeysConfig struct {
-	DatabaseConfig  mysql.Config `json:"DatabaseConfig"`
-	CardtraderToken string       `json:"CardtraderToken"`
-}
-
-func ReadConfigFromFile(filename string) SevenkeysConfig {
-	bytes, err := os.ReadFile(filename)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	var config SevenkeysConfig
-	err = json.Unmarshal(bytes, &config)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return config
-}

sevenkeys/database/get_database.go

@@ -2,12 +2,31 @@ package database
 
 import (
 	"database/sql"
+	"encoding/json"
 	"log"
+	"os"
 
 	"github.com/go-sql-driver/mysql"
 )
 
-func GetDatabaseFromConfig(config mysql.Config) *sql.DB {
+func readConfigFromFile(filename string) mysql.Config {
+	bytes, err := os.ReadFile(filename)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	var config mysql.Config
+	err = json.Unmarshal(bytes, &config)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return config
+}
+
+func GetDatabaseFromConfig(filename string) *sql.DB {
+	config := readConfigFromFile(filename)
+
 	db, err := sql.Open("mysql", config.FormatDSN())
 
 	if err != nil {

sevenkeys/database/migrations/00008_create_cardtrader_tables.sql

@@ -1,43 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-CREATE TABLE IF NOT EXISTS CardtraderGame (
-	Id INT PRIMARY KEY AUTO_INCREMENT,
-	Name VARCHAR(255) NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS CardtraderCategory (
-	Id INT PRIMARY KEY AUTO_INCREMENT,
-	CardtraderGameId INT NOT NULL,
-	FOREIGN KEY (CardtraderGameId) REFERENCES CardtraderGame(Id),
-	Name VARCHAR(255) NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS CardtraderExpansion (
-	Id INT PRIMARY KEY AUTO_INCREMENT,
-	CardtraderGameId INT NOT NULL,
-	FOREIGN KEY (CardtraderGameId) REFERENCES CardtraderGame(Id)
-);
-
-CREATE TABLE IF NOT EXISTS CardtraderBlueprint (
-	Id INT PRIMARY KEY AUTO_INCREMENT,
-	CardtraderGameId INT NOT NULL,
-	FOREIGN KEY (CardtraderGameId) REFERENCES CardtraderGame(Id),
-	CardtraderCategoryId INT NOT NULL,
-	FOREIGN KEY (CardtraderCategoryId) REFERENCES CardtraderCategory(Id),
-	CardtraderExpansionId INT NOT NULL,
-	FOREIGN KEY (CardtraderExpansionId) REFERENCES CardtraderExpansion(Id),
-	Name VARCHAR(255) NOT NULL,
-	CollectorNumber VARCHAR(10) NOT NULL
-);
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-DROP TABLE IF EXISTS CardtraderBlueprint;
-
-DROP TABLE IF EXISTS CardtraderExpansion;
-
-DROP TABLE IF EXISTS CardtraderCategory;
-
-DROP TABLE IF EXISTS CardtraderGame;
--- +goose StatementEnd

sevenkeys/main.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bufio"
 	"encoding/json"
 	"errors"
 	"flag"
@@ -8,15 +9,31 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
-	"sevenkeys/config"
 	"sevenkeys/database"
 	"sevenkeys/delverlens"
 	"sevenkeys/logic"
-	"sevenkeys/update"
+	"sevenkeys/logic/scryfall"
+	"strings"
 
 	"github.com/mtgban/go-mtgban/cardtrader"
 )
 
+func GetStringResponse(prompt string) string {
+	fmt.Print(prompt + " ")
+
+	var response string
+	scanner := bufio.NewScanner(os.Stdin)
+	scanner.Scan()
+	response = scanner.Text()
+
+	return response
+}
+
+func GetYesNoResponse(prompt string) bool {
+	response := GetStringResponse(prompt)
+	return strings.ToUpper(response) == "Y"
+}
+
 const (
 	UpdateSubcommand            string = "update"
 	CreateStorageAreaSubcommand string = "createstorage"
@@ -38,8 +55,17 @@ func main() {
 
 	flag.Parse()
 
-	config := config.ReadConfigFromFile("config." + profile + ".json")
+	db := database.GetDatabaseFromConfig("config." + profile + ".json")
-	db := database.GetDatabaseFromConfig(config.DatabaseConfig)
+	/* Sad.
+	figlet.ReadFigletFonts()
+	cli.ShowSplashScreen()
+	*/
+
+	// TODO: Decide in what form we need to retain this functionality if any
+	//cli.MainCliLoop(db)
+
+	//searchCmd := flag.NewFlagSet(SearchSubcommand, flag.ExitOnError)
+	//name := searchCmd.String("name", "", "The card name to search for.")
 
 	if len(flag.Args()) == 0 {
 		fmt.Fprintln(os.Stderr, "Please specify a subcommand.")
@@ -48,8 +74,33 @@ func main() {
 
 	switch flag.Args()[0] {
 	case UpdateSubcommand:
-		update.UpdateScryfallData(db)
+		fmt.Println("Checking for updates...")
-		//update.UpdateCardtraderData(config.CardtraderToken)
+		bulkData, err := scryfall.GetBulkDataByType(scryfall.BulkDataTypeAllCards)
+		logic.Check(err)
+
+		needsUpdate, err := logic.CheckForUpdates(db, bulkData)
+		logic.Check(err)
+
+		if !needsUpdate {
+			fmt.Println("No update required.")
+			return
+		}
+
+		fmt.Println("Update required.")
+
+		if GetYesNoResponse("Run update? (y/N)") {
+			fmt.Println("Running update...")
+
+			logic.CreateCacheDirectories()
+
+			err = logic.UpdateSets(db)
+			logic.Check(err)
+
+			err = logic.UpdateCards(db, bulkData)
+			logic.Check(err)
+
+			fmt.Println("Update finished.")
+		}
 		break
 	case CreateStorageAreaSubcommand:
 		createStorageCmd := flag.NewFlagSet(CreateStorageAreaSubcommand, flag.ExitOnError)

sevenkeys/update/scryfall.go

@@ -1,32 +0,0 @@
-package update
-
-import (
-	"database/sql"
-	"fmt"
-	"sevenkeys/logic"
-	"sevenkeys/logic/scryfall"
-)
-
-func UpdateScryfallData(db *sql.DB) {
-	fmt.Println("Checking for updates...")
-	bulkData, err := scryfall.GetBulkDataByType(scryfall.BulkDataTypeAllCards)
-	logic.Check(err)
-
-	needsUpdate, err := logic.CheckForUpdates(db, bulkData)
-	logic.Check(err)
-
-	if !needsUpdate {
-		fmt.Println("No update required.")
-		return
-	}
-
-	logic.CreateCacheDirectories()
-
-	err = logic.UpdateSets(db)
-	logic.Check(err)
-
-	err = logic.UpdateCards(db, bulkData)
-	logic.Check(err)
-
-	fmt.Println("Update finished.")
-}