Basic parsing

Fix broken configs for "remote" and "bare" repos.

BUILD

@@ -18,8 +18,3 @@ gazelle(
     ],
     command = "update-repos",
 )
-
-alias(
-    name = "beornextract",
-    actual = "//cmd/beornextract:beornextract",
-)

WORKSPACE

@@ -27,6 +27,14 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 # The first declaration of an external repository "wins".
 ############################################################
 
+go_repository(
+    name = "com_github_davecgh_go_spew",
+    build_file_proto_mode = "disable_global",
+    importpath = "github.com/davecgh/go-spew",
+    sum = "h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=",
+    version = "v1.1.1",
+)
+
 load("//:deps.bzl", "go_dependencies")
 
 # gazelle:repository_macro deps.bzl%go_dependencies

bazel-lotr

@@ -0,0 +1 @@
+/private/var/tmp/_bazel_christian/3262850bcac806b0124f7f44b81dceb1/execroot/__main__

cmd/beornextract/BUILD

@@ -1,26 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-
-package(
-    default_visibility = ["//visibility:public"],
-)
-
-go_library(
-    name = "beornextract_lib",
-    srcs = ["main.go"],
-    data = [
-        "//cmd/beornextract/data:Bot.Cards.json",
-        "//cmd/beornextract/data:Export.Cards.json",
-    ],
-    importpath = "github.com/squk/lotr/cmd/beornextract",
-    deps = [
-        "//cmd/beornextract/types",
-        "@com_github_grokify_html_strip_tags_go//:html-strip-tags-go",
-        "@com_github_jessevdk_go_flags//:go_default_library",
-        "@io_bazel_rules_go//go/tools/bazel:go_default_library",
-    ],
-)
-
-go_binary(
-    name = "beornextract",
-    embed = [":beornextract_lib"],
-)

cmd/beornextract/main.go

@@ -1,136 +0,0 @@
-package main
-
-import (
-	"encoding/csv"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/bazelbuild/rules_go/go/tools/bazel"
-	strip "github.com/grokify/html-strip-tags-go"
-	"github.com/jessevdk/go-flags"
-	"github.com/squk/lotr/cmd/beornextract/types"
-)
-
-type Options struct {
-	RawConversion bool `short:"r" long:"raw" description:"Enable to keep the original text from HallOfBeorn dump. Enable to prep for ALEP pipeline."`
-}
-
-var opts = Options{
-	RawConversion: false,
-}
-
-func main() {
-	_, err := flags.ParseArgs(&opts, os.Args)
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Println("LOTR CARD PARSE")
-	f, err := bazel.Runfile(".")
-	if err != nil {
-		panic(err)
-	}
-	err = filepath.Walk(f,
-		func(path string, info os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-			fmt.Println(path, info.Size())
-			return nil
-		})
-	if err != nil {
-		log.Println(err)
-	}
-
-	// Open our jsonFile
-	// jsonFile, err := os.Open("cmd/beornextract/data/Bot.Cards.json")
-	jsonFile, err := os.Open("cmd/beornextract/data/Export.Cards.json")
-	// if we os.Open returns an error then handle it
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	// defer the closing of our jsonFile so that we can parse it later on
-	defer jsonFile.Close()
-
-	byteValue, _ := ioutil.ReadAll(jsonFile)
-	cards := []types.HallOfBeornCard{}
-	json.Unmarshal(byteValue, &cards)
-
-	// Open a file for writing
-	csvFile, err := os.Create("/Users/christian/Downloads/lotr-lcg-set-generator.csv")
-	defer csvFile.Close()
-	if err != nil {
-		// Handle error
-	}
-
-	// Create a writer
-	w := csv.NewWriter(csvFile)
-
-	// Write some rows
-	for _, card := range cards {
-		if card.EncounterSet != "" {
-			continue // skip non=player cards
-		}
-
-		w.Write(
-			[]string{
-				card.Octgnid,
-				"", // hidden
-				"", // hidden
-				card.EncounterSet,
-				strconv.Itoa(card.Position),
-				strconv.Itoa(card.Quantity),
-				card.Name,
-				fmt.Sprintf(
-					"%t",
-					card.IsUnique,
-				),
-				card.TypeName,
-				card.SphereName,
-				card.Traits,
-				findKeywords(card.Text),
-				card.Cost,
-				card.EngagementCost,
-				strconv.Itoa(card.Threat),
-				strconv.Itoa(card.Willpower),
-				strconv.Itoa(card.Attack),
-				strconv.Itoa(card.Defense),
-				strconv.Itoa(card.Health),
-				card.QuestPoints,
-				strconv.Itoa(card.VictoryPoints),
-				"", // Special Icon
-				transformText(card.Name, card.Text),
-				card.Flavor,
-			},
-		)
-	}
-
-	// Close the writer
-	w.Flush()
-	// spew.Dump(c)
-}
-
-func transformText(name, text string) string {
-	if opts.RawConversion {
-		return text
-	}
-
-	out := strings.ReplaceAll(text, name, "[name]") // insert name tag
-	out = strip.StripTags(out)
-	out = keywordPattern.ReplaceAllLiteralString(out, "")
-	return strings.TrimSpace(out)
-}
-
-var keywordPattern = regexp.MustCompile(`((?:(?:[A-Z][a-z]+(\.|\s[0-9]+\.)\s*)+))`)
-
-func findKeywords(text string) string {
-	return strings.TrimSpace(keywordPattern.FindString(text))
-}

cmd/beornextract/types/card.go

@@ -1,27 +0,0 @@
-package types
-
-type HallOfBeornCard struct {
-	PackCode      string `json:"pack_code,omitempty"`
-	PackName      string `json:"pack_name,omitempty"`
-	IsOfficial    bool   `json:"is_official,omitempty"`
-	TypeCode      string `json:"type_code,omitempty"`
-	TypeName      string `json:"type_name,omitempty"`
-	SphereCode    string `json:"sphere_code,omitempty"`
-	SphereName    string `json:"sphere_name,omitempty"`
-	Position      int    `json:"position,omitempty"`
-	Threat        int    `json:"threat,omitempty"`
-	Willpower     int    `json:"willpower,omitempty"`
-	Attack        int    `json:"attack,omitempty"`
-	Defense       int    `json:"defense,omitempty"`
-	Health        int    `json:"health,omitempty"`
-	Octgnid       string `json:"octgnid,omitempty"`
-	HasErrata     bool   `json:"has_errata,omitempty"`
-	URL           string `json:"url,omitempty"`
-	QuestPoints   string `json:"quest,omitempty"`
-	VictoryPoints int    `json:"victory,omitempty"`
-	Imagesrc      string `json:"imagesrc,omitempty"`
-
-	EncounterSet   string `json:"encounter_set,omitempty"`
-	EngagementCost string `json:"engagement_cost,omitempty"`
-	ThreatStrength int    `json:"threat_strength,omitempty"`
-}

cmd/test/main.go

@@ -1,113 +0,0 @@
-package main
-
-import (
-	"database/sql"
-	"fmt"
-	"log"
-	"os"
-
-	"github.com/davecgh/go-spew/spew"
-	_ "github.com/mattn/go-sqlite3"
-)
-
-func main() {
-	spew.Dump(os.Getwd())
-
-	os.Remove("./foo.db")
-
-	db, err := sql.Open("sqlite3", "./foo.db")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	sqlStmt := `
-	create table foo (id integer not null primary key, name text);
-	delete from foo;
-	`
-	_, err = db.Exec(sqlStmt)
-	if err != nil {
-		log.Printf("%q: %s\n", err, sqlStmt)
-		return
-	}
-
-	tx, err := db.Begin()
-	if err != nil {
-		log.Fatal(err)
-	}
-	stmt, err := tx.Prepare("insert into foo(id, name) values(?, ?)")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer stmt.Close()
-	for i := 0; i < 100; i++ {
-		_, err = stmt.Exec(i, fmt.Sprintf("こんにちは世界%03d", i))
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-	err = tx.Commit()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	rows, err := db.Query("select id, name from foo")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var id int
-		var name string
-		err = rows.Scan(&id, &name)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Println(id, name)
-	}
-	err = rows.Err()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	stmt, err = db.Prepare("select name from foo where id = ?")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer stmt.Close()
-	var name string
-	err = stmt.QueryRow("3").Scan(&name)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println(name)
-
-	_, err = db.Exec("delete from foo")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = db.Exec("insert into foo(id, name) values(1, 'foo'), (2, 'bar'), (3, 'baz')")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	rows, err = db.Query("select id, name from foo")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer rows.Close()
-	for rows.Next() {
-		var id int
-		var name string
-		err = rows.Scan(&id, &name)
-		if err != nil {
-			log.Fatal(err)
-		}
-		fmt.Println(id, name)
-	}
-	err = rows.Err()
-	if err != nil {
-		log.Fatal(err)
-	}
-}

deps.bzl

@@ -1,96 +1,2 @@
-load("@bazel_gazelle//:deps.bzl", "go_repository")
-
 def go_dependencies():
-    go_repository(
+    pass
-        name = "com_github_bazelbuild_rules_go",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/bazelbuild/rules_go",
-        sum = "h1:JzlRxsFNhlX+g4drDRPhIaU5H5LnI978wdMJ0vK4I+k=",
-        version = "v0.41.0",
-    )
-
-    go_repository(
-        name = "com_github_davecgh_go_spew",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/davecgh/go-spew",
-        sum = "h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=",
-        version = "v1.1.1",
-    )
-    go_repository(
-        name = "com_github_golang_mock",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/golang/mock",
-        sum = "h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=",
-        version = "v1.6.0",
-    )
-    go_repository(
-        name = "com_github_golang_protobuf",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/golang/protobuf",
-        sum = "h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=",
-        version = "v1.5.2",
-    )
-    go_repository(
-        name = "com_github_grokify_html_strip_tags_go",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/grokify/html-strip-tags-go",
-        sum = "h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0=",
-        version = "v0.0.1",
-    )
-    go_repository(
-        name = "com_github_jessevdk_go_flags",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/jessevdk/go-flags",
-        sum = "h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=",
-        version = "v1.5.0",
-    )
-
-    go_repository(
-        name = "com_github_mattn_go_sqlite3",
-        build_file_proto_mode = "disable_global",
-        importpath = "github.com/mattn/go-sqlite3",
-        sum = "h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=",
-        version = "v1.14.17",
-    )
-    go_repository(
-        name = "org_golang_google_genproto",
-        build_file_proto_mode = "disable_global",
-        importpath = "google.golang.org/genproto",
-        sum = "h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=",
-        version = "v0.0.0-20200526211855-cb27e3aa2013",
-    )
-    go_repository(
-        name = "org_golang_google_grpc",
-        build_file_proto_mode = "disable_global",
-        importpath = "google.golang.org/grpc",
-        sum = "h1:fPVVDxY9w++VjTZsYvXWqEf9Rqar/e+9zYfxKK+W+YU=",
-        version = "v1.50.0",
-    )
-    go_repository(
-        name = "org_golang_google_protobuf",
-        build_file_proto_mode = "disable_global",
-        importpath = "google.golang.org/protobuf",
-        sum = "h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=",
-        version = "v1.28.0",
-    )
-    go_repository(
-        name = "org_golang_x_net",
-        build_file_proto_mode = "disable_global",
-        importpath = "golang.org/x/net",
-        sum = "h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0=",
-        version = "v0.0.0-20210405180319-a5a99cb37ef4",
-    )
-    go_repository(
-        name = "org_golang_x_sys",
-        build_file_proto_mode = "disable_global",
-        importpath = "golang.org/x/sys",
-        sum = "h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=",
-        version = "v0.0.0-20210510120138-977fb7262007",
-    )
-    go_repository(
-        name = "org_golang_x_text",
-        build_file_proto_mode = "disable_global",
-        importpath = "golang.org/x/text",
-        sum = "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=",
-        version = "v0.3.3",
-    )

extract/BUILD

@@ -0,0 +1,3 @@
+package(
+    default_visibility = ["//visibility:public"],
+)

extract/cmd/BUILD

@@ -1,18 +1,22 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "test_lib",
+    name = "cmd_lib",
     srcs = ["main.go"],
-    importpath = "github.com/squk/lotr/cmd/test",
+    data = [
+        "//data:Bot.Cards.json",
+        "//data:Export.Cards.json"
+    ],
+    importpath = "github.com/squk/lotr/extract/cmd",
     visibility = ["//visibility:private"],
     deps = [
+        "//extract/types",
         "@com_github_davecgh_go_spew//spew",
-        "@com_github_mattn_go_sqlite3//:go-sqlite3",
     ],
 )
 
 go_binary(
-    name = "test",
+    name = "cmd",
-    embed = [":test_lib"],
+    embed = [":cmd_lib"],
     visibility = ["//visibility:public"],
 )

extract/cmd/main.go

@@ -0,0 +1,31 @@
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+	"github.com/squk/lotr/extract/types"
+	"github.com/davecgh/go-spew/spew"
+)
+
+func main() {
+	fmt.Println("LOTR CARD PARSE")
+
+
+	// Open our jsonFile
+    jsonFile, err := os.Open("./data/Bot.Cards.json")
+    // if we os.Open returns an error then handle it
+    if err != nil {
+        fmt.Println(err)
+        return
+    }
+    fmt.Println("Successfully Opened users.json")
+    // defer the closing of our jsonFile so that we can parse it later on
+    defer jsonFile.Close()
+
+    byteValue, _ := ioutil.ReadAll(jsonFile)
+	c := []types.Card{}
+	json.Unmarshal(byteValue, &c)
+	spew.Dump(c)
+}

extract/types/BUILD

@@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "types",
     srcs = ["card.go"],
-    importpath = "github.com/squk/lotr/cmd/beornextract/types",
+    importpath = "github.com/squk/lotr/extract/types",
     visibility = ["//visibility:public"],
 )

extract/types/card.go

@@ -0,0 +1,35 @@
+package types
+
+type Card struct {
+	PackCode    string `json:"pack_code"`
+	PackName    string `json:"pack_name"`
+	IsOfficial  bool   `json:"is_official"`
+	TypeCode    string `json:"type_code"`
+	TypeName    string `json:"type_name"`
+	SphereCode  string `json:"sphere_code"`
+	SphereName  string `json:"sphere_name"`
+	Position    int    `json:"position"`
+	Code        string `json:"code"`
+	Name        string `json:"name"`
+	Traits      string `json:"traits"`
+	Text        string `json:"text"`
+	Flavor      string `json:"flavor"`
+	IsUnique    bool   `json:"is_unique"`
+	Threat      int    `json:"threat"`
+	Willpower   int    `json:"willpower"`
+	Attack      int    `json:"attack"`
+	Defense     int    `json:"defense"`
+	Health      int    `json:"health"`
+	Quantity    int    `json:"quantity"`
+	DeckLimit   int    `json:"deck_limit"`
+	Illustrator string `json:"illustrator"`
+	Octgnid     string `json:"octgnid"`
+	HasErrata   bool   `json:"has_errata"`
+	URL         string `json:"url"`
+	Imagesrc    string `json:"imagesrc"`
+	Versions    []struct {
+		SetName string `json:"set_name"`
+		Year    string `json:"year"`
+		URL     string `json:"url"`
+	} `json:"versions"`
+}

go.mod

@@ -3,11 +3,3 @@ module github.com/squk/lotr
 go 1.19
 
 require github.com/davecgh/go-spew v1.1.1
-
-require (
-	github.com/bazelbuild/rules_go v0.41.0 // indirect
-	github.com/grokify/html-strip-tags-go v0.0.1 // indirect
-	github.com/jessevdk/go-flags v1.5.0 // indirect
-	github.com/mattn/go-sqlite3 v1.14.17 // indirect
-	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
-)

go.sum

@@ -1,13 +1,2 @@
-github.com/bazelbuild/rules_go v0.41.0 h1:JzlRxsFNhlX+g4drDRPhIaU5H5LnI978wdMJ0vK4I+k=
-github.com/bazelbuild/rules_go v0.41.0/go.mod h1:TMHmtfpvyfsxaqfL9WnahCsXMWDMICTw7XeK9yVb+YU=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/grokify/html-strip-tags-go v0.0.1 h1:0fThFwLbW7P/kOiTBs03FsJSV9RM2M/Q/MOnCQxKMo0=
-github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78=
-github.com/jessevdk/go-flags v1.5.0 h1:1jKYvbxEjfUl0fmqTCOfonvskHHXMjBySTLW4y9LFvc=
-github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

server/docker-compose.yaml

@@ -1,50 +0,0 @@
-version: "3.6"
-services:
-  postgres:
-    image: postgres:15
-    restart: always
-    volumes:
-      - db_data:/var/lib/postgresql/data
-    environment:
-      POSTGRES_PASSWORD: lotrlcgpassword
-  graphql-engine:
-    image: hasura/graphql-engine:v2.28.0
-    ports:
-      - "8080:8080"
-    restart: always
-    environment:
-      ## postgres database to store Hasura metadata
-      HASURA_GRAPHQL_METADATA_DATABASE_URL: postgres://postgres:lotrlcgpassword@postgres:5432/postgres
-      ## this env var can be used to add the above postgres database to Hasura as a data source. this can be removed/updated based on your needs
-      PG_DATABASE_URL: postgres://postgres:lotrlcgpassword@postgres:5432/postgres
-      ## enable the console served by server
-      HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # set to "false" to disable console
-      ## enable debugging mode. It is recommended to disable this in production
-      HASURA_GRAPHQL_DEV_MODE: "true"
-      HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
-      ## uncomment next line to run console offline (i.e load console assets from server instead of CDN)
-      # HASURA_GRAPHQL_CONSOLE_ASSETS_DIR: /srv/console-assets
-      ## uncomment next line to set an admin secret
-      # HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
-      HASURA_GRAPHQL_METADATA_DEFAULTS: '{"backend_configs":{"dataconnector":{"athena":{"uri":"http://data-connector-agent:8081/api/v1/athena"},"mariadb":{"uri":"http://data-connector-agent:8081/api/v1/mariadb"},"mysql8":{"uri":"http://data-connector-agent:8081/api/v1/mysql"},"oracle":{"uri":"http://data-connector-agent:8081/api/v1/oracle"},"snowflake":{"uri":"http://data-connector-agent:8081/api/v1/snowflake"}}}}'
-    depends_on:
-      data-connector-agent:
-        condition: service_healthy
-  data-connector-agent:
-    image: hasura/graphql-data-connector:v2.28.0
-    restart: always
-    ports:
-      - 8081:8081
-    environment:
-      QUARKUS_LOG_LEVEL: ERROR # FATAL, ERROR, WARN, INFO, DEBUG, TRACE
-      ## https://quarkus.io/guides/opentelemetry#configuration-reference
-      QUARKUS_OPENTELEMETRY_ENABLED: "false"
-      ## QUARKUS_OPENTELEMETRY_TRACER_EXPORTER_OTLP_ENDPOINT: http://jaeger:4317
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost:8081/api/v1/athena/health"]
-      interval: 5s
-      timeout: 10s
-      retries: 5
-      start_period: 5s
-volumes:
-  db_data: