fixed color

src/serra/helpers.go

@@ -3,7 +3,6 @@ package serra
 import (
 	"errors"
 	"fmt"
-	"strconv"
 	"time"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -35,8 +34,7 @@ func modify_count_of_card(coll *Collection, c *Card, amount int64) error {
 func find_card_by_setcollectornumber(coll *Collection, setcode string, collectornumber string) (*Card, error) {
 
 	sort := bson.D{{"_id", 1}}
-	c, _ := strconv.ParseInt(collectornumber, 10, 64)
+	search_filter := bson.D{{"set", setcode}, {"collectornumber", collectornumber}}
-	search_filter := bson.D{{"set", setcode}, {"collectornumber", c}}
 	stored_cards, err := coll.storage_find(search_filter, sort)
 	if err != nil {
 		return &Card{}, err
@@ -53,6 +51,20 @@ func stringToTime(s primitive.DateTime) string {
 	return time.UnixMilli(int64(s)).Format("2006-01-02")
 }
 
+func find_set_by_code(coll *Collection, setcode string) (*Set, error) {
+
+	stored_sets, err := coll.storage_find_set(bson.D{{"code", setcode}}, bson.D{{"_id", 1}})
+	if err != nil {
+		return &Set{}, err
+	}
+
+	if len(stored_sets) < 1 {
+		return &Set{}, errors.New("Set not found")
+	}
+
+	return &stored_sets[0], nil
+}
+
 func show_card_details(card *Card) error {
 	fmt.Printf("* %dx %s%s%s (%s/%s)\n", card.SerraCount, Purple, card.Name, Reset, card.Set, card.CollectorNumber)
 	fmt.Printf("  Added: %s\n", stringToTime(card.SerraCreated))

src/serra/root.go

@@ -85,9 +85,7 @@ func Cards() {
 	coll := &Collection{client.Database("serra").Collection("cards")}
 	defer storage_disconnect(client)
 
-	sort := bson.D{{"name", 1}}
+	cards, _ := coll.storage_find(bson.D{{}}, bson.D{{"name", 1}})
-	filter := bson.D{{}}
-	cards, _ := coll.storage_find(filter, sort)
 
 	for _, card := range cards {
 		LogMessage(fmt.Sprintf("* %dx %s%s%s (%s/%s) %s%.2f EUR%s", card.SerraCount, Purple, card.Name, Reset, card.Set, card.CollectorNumber, Yellow, card.Prices.Eur, Reset), "normal")
@@ -114,6 +112,7 @@ func Sets() {
 
 	client := storage_connect()
 	coll := &Collection{client.Database("serra").Collection("cards")}
+	setscoll := &Collection{client.Database("serra").Collection("sets")}
 	defer storage_disconnect(client)
 
 	groupStage := bson.D{
@@ -133,8 +132,9 @@ func Sets() {
 
 	sets, _ := coll.storage_aggregate(mongo.Pipeline{groupStage, sortStage})
 	for _, set := range sets {
+		setobj, _ := find_set_by_code(setscoll, set["code"].(string))
 		fmt.Printf("* %s %s%s%s (%s%s%s)\n", set["release"].(string)[0:4], Purple, set["_id"], Reset, Cyan, set["code"], Reset)
-		fmt.Printf("  Cards: %s%d/350%s Total: %.0f \n", Yellow, set["unique"], Reset, set["count"])
+		fmt.Printf("  Cards: %s%d/%d%s Total: %.0f \n", Yellow, set["unique"], setobj.CardCount, Reset, set["count"])
 		fmt.Printf("  Value: %s%.2f EUR%s\n", Pink, set["value"], Reset)
 		fmt.Println()
 	}

src/serra/scryfall.go

@@ -131,7 +131,7 @@ type SetList struct {
 }
 
 type Set struct {
-	CardCount   int64  `json:"card_count"`
+	CardCount   int64  `json:"card_count" bson:"cardcount"`
 	Code        string `json:"code"`
 	Digital     bool   `json:"digital"`
 	FoilOnly    bool   `json:"foil_only"`