From fd4c2048e15b3b18b138c3f70d27a42b466a77d5 Mon Sep 17 00:00:00 2001
From: The Magician <themagician@engineer.com>
Date: Tue, 21 May 2024 12:35:01 +0100
Subject: [PATCH] Modify Makefile to use unified importer

---
 sevenkeys/Makefile               |  6 ++---
 sevenkeys/cmd/importsets/main.go | 46 --------------------------------
 2 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 sevenkeys/cmd/importsets/main.go

diff --git a/sevenkeys/Makefile b/sevenkeys/Makefile
index fed786c..ad8179a 100644
--- a/sevenkeys/Makefile
+++ b/sevenkeys/Makefile
@@ -1,9 +1,7 @@
 createdb:
 	mysql --user=root --password=$(shell pass show sevenkeys/mysql) <sql/createdb.sql
-importsets: createdb
-	go run cmd/importsets/main.go
-importcards: importsets
-	go run cmd/importcards/main.go
+import: createdb
+	go run main.go
 
 clean:
 	mysql --user=root --password=$(shell pass show sevenkeys/mysql) <sql/removedb.sql
diff --git a/sevenkeys/cmd/importsets/main.go b/sevenkeys/cmd/importsets/main.go
deleted file mode 100644
index 9a90c52..0000000
--- a/sevenkeys/cmd/importsets/main.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package main
-
-import (
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"sevenkeys/database"
-	"sevenkeys/database/operations"
-	"sevenkeys/scryfall/methods"
-)
-
-func main() {
-	log.Println("Downloading set data from Scryfall...")
-	sets, err := methods.GetSets()
-	check(err)
-	log.Println("Downloaded set data.")
-
-	log.Println("Connecting to database...")
-	db := database.GetDatabaseFromConfig("config.json")
-	log.Println("Connected.")
-
-	for _, set := range sets {
-		// We're only interested in paper cards, so skip importing
-		// any sets that were only released in a video game
-		if set.Digital {
-			continue
-		}
-
-		log.Println("Importing set: " + set.Name)
-		err = operations.InsertOrUpdateSet(db, set)
-		check(err)
-
-		response, err := http.Get(set.IconSvgUri)
-		log.Println("Downloading logo for set: " + set.Name)
-		defer response.Body.Close()
-		check(err)
-
-		iconFilename := ICON_CACHE_DIR + set.Code + FILE_EXTENSION_SVG
-		iconFile, err := os.Create(iconFilename)
-		check(err)
-
-		io.Copy(iconFile, response.Body)
-		log.Println("Finished importing set: " + set.Name)
-	}
-}