diff --git a/src/serra/add.go b/src/serra/add.go index 2b3cd0c..d091830 100644 --- a/src/serra/add.go +++ b/src/serra/add.go @@ -79,7 +79,7 @@ func addCards(cards []string, unique bool, count int64) error { c := co[0] if unique { - LogMessage(fmt.Sprintf("Not adding \"%s\" (%s, %.2f %s) to Collection because it already exists.", c.Name, c.Rarity, c.getValue(foil), getCurrency()), "red") + LogMessage(fmt.Sprintf("Not adding \"%s\" (%s, %.2f%s) to Collection because it already exists.", c.Name, c.Rarity, c.getValue(foil), getCurrency()), "red") continue } @@ -92,7 +92,7 @@ func addCards(cards []string, unique bool, count int64) error { total = c.SerraCount + count } // Give feedback of successfully added card - LogMessage(fmt.Sprintf("%dx \"%s\" (%s, %.2f %s) added to Collection.", total, c.Name, c.Rarity, c.getValue(foil), getCurrency()), "green") + LogMessage(fmt.Sprintf("%dx \"%s\" (%s, %.2f%s) added to Collection.", total, c.Name, c.Rarity, c.getValue(foil), getCurrency()), "green") // If card is not already in collection, fetching from scyfall } else { @@ -120,7 +120,7 @@ func addCards(cards []string, unique bool, count int64) error { } // Give feedback of successfully added card - LogMessage(fmt.Sprintf("%dx \"%s\" (%s, %.2f %s) added to Collection.", total, c.Name, c.Rarity, c.getValue(foil), getCurrency()), "green") + LogMessage(fmt.Sprintf("%dx \"%s\" (%s, %.2f%s) added to Collection.", total, c.Name, c.Rarity, c.getValue(foil), getCurrency()), "green") } } storage_disconnect(client) diff --git a/src/serra/card.go b/src/serra/card.go index f3b041d..c48b9e8 100644 --- a/src/serra/card.go +++ b/src/serra/card.go @@ -127,10 +127,10 @@ func show_card_list(cards []Card) { var total float64 for _, card := range cards { - LogMessage(fmt.Sprintf("* %dx %s%s%s (%s/%s) %s%.2f %s%s", card.SerraCount+card.SerraCountFoil+card.SerraCountEtched, Purple, card.Name, Reset, card.Set, card.CollectorNumber, Yellow, card.getValue(false), getCurrency(), Reset), "normal") + LogMessage(fmt.Sprintf("* %dx %s%s%s (%s/%s) %s%.2f%s%s", card.SerraCount+card.SerraCountFoil+card.SerraCountEtched, Purple, card.Name, Reset, card.Set, card.CollectorNumber, Yellow, card.getValue(false), getCurrency(), Reset), "normal") total = total + card.getValue(false)*float64(card.SerraCount) + card.getValue(true)*float64(card.SerraCountFoil) } - fmt.Printf("\nTotal Value: %s%.2f %s%s\n", Yellow, total, getCurrency(), Reset) + fmt.Printf("\nTotal Value: %s%.2f%s%s\n", Yellow, total, getCurrency(), Reset) } @@ -141,9 +141,9 @@ func show_card_details(card *Card) error { fmt.Printf("Scryfall: %s\n", strings.Replace(card.ScryfallURI, "?utm_source=api", "", 1)) fmt.Printf("\n%sCurrent Value%s\n", Green, Reset) - fmt.Printf("* Normal: %dx %s%.2f %s%s\n", card.SerraCount, Yellow, card.getValue(false), getCurrency(), Reset) + fmt.Printf("* Normal: %dx %s%.2f%s%s\n", card.SerraCount, Yellow, card.getValue(false), getCurrency(), Reset) if card.SerraCountFoil > 0 { - fmt.Printf("* Foil: %dx %s%.2f %s%s\n", card.SerraCountFoil, Yellow, card.getValue(true), getCurrency(), Reset) + fmt.Printf("* Foil: %dx %s%.2f%s%s\n", card.SerraCountFoil, Yellow, card.getValue(true), getCurrency(), Reset) } fmt.Printf("\n%sValue History%s\n", Green, Reset) diff --git a/src/serra/env.go b/src/serra/env.go index d4c48f4..f44f58e 100644 --- a/src/serra/env.go +++ b/src/serra/env.go @@ -18,9 +18,9 @@ func getMongoDBURI() string { func getCurrency() string { switch os.Getenv("SERRA_CURRENCY") { case "EUR": - return "EUR" + return "€" case "USD": - return "USD" + return "$" } // default LogMessage("Warning: You did not configure SERRA_CURRENCY. Assuming \"USD\"", "yellow") diff --git a/src/serra/helpers.go b/src/serra/helpers.go index 9c7b477..282c741 100644 --- a/src/serra/helpers.go +++ b/src/serra/helpers.go @@ -182,11 +182,11 @@ func print_price_history(prices []PriceEntry, prefix string, total bool) { } if value > before && before != 0 { - fmt.Printf("%s%s%s %.2f %s%s (%+.2f%%, %+.2f %s)\n", prefix, stringToTime(e.Date), Green, value, getCurrency(), Reset, (value/before*100)-100, value-before, getCurrency()) + fmt.Printf("%s%s%s %.2f%s%s (%+.2f%%, %+.2f%s)\n", prefix, stringToTime(e.Date), Green, value, getCurrency(), Reset, (value/before*100)-100, value-before, getCurrency()) } else if value < before { - fmt.Printf("%s%s%s %.2f %s%s (%+.2f%%, %+.2f %s)\n", prefix, stringToTime(e.Date), Red, value, getCurrency(), Reset, (value/before*100)-100, value-before, getCurrency()) + fmt.Printf("%s%s%s %.2f%s%s (%+.2f%%, %+.2f%s)\n", prefix, stringToTime(e.Date), Red, value, getCurrency(), Reset, (value/before*100)-100, value-before, getCurrency()) } else { - fmt.Printf("%s%s %.2f %s%s\n", prefix, stringToTime(e.Date), value, getCurrency(), Reset) + fmt.Printf("%s%s %.2f%s%s\n", prefix, stringToTime(e.Date), value, getCurrency(), Reset) } before = value } diff --git a/src/serra/remove.go b/src/serra/remove.go index 128a17c..5e458cf 100644 --- a/src/serra/remove.go +++ b/src/serra/remove.go @@ -90,7 +90,7 @@ func removeCards(cards []string, count int64) error { if foil && c.SerraCountFoil == 1 && c.SerraCount == 0 || !foil && c.SerraCount == 1 && c.SerraCountFoil == 0 { coll.storage_remove(bson.M{"_id": c.ID}) - LogMessage(fmt.Sprintf("\"%s\" (%.2f %s) removed from the Collection.", c.Name, c.getValue(foil), getCurrency()), "green") + LogMessage(fmt.Sprintf("\"%s\" (%.2f%s) removed from the Collection.", c.Name, c.getValue(foil), getCurrency()), "green") } else { modify_count_of_card(coll, c, -1, foil) } diff --git a/src/serra/set.go b/src/serra/set.go index d3784ea..cf468e0 100644 --- a/src/serra/set.go +++ b/src/serra/set.go @@ -79,7 +79,7 @@ func show_set_list(sets []primitive.M) { 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/%d%s Total: %.0f \n", Yellow, set["unique"], setobj.CardCount, Reset, set["count"]) - fmt.Printf(" Value: %s%.2f %s%s\n", Pink, set["value"], getCurrency(), Reset) + fmt.Printf(" Value: %s%.2f%s%s\n", Pink, set["value"], getCurrency(), Reset) fmt.Println() } } @@ -155,7 +155,7 @@ func ShowSet(setname string) error { foil_value = 0 } total_value := nf_value + foil_value - LogMessage(fmt.Sprintf("Total Value: %.2f %s", total_value, getCurrency()), "normal") + LogMessage(fmt.Sprintf("Total Value: %.2f%s", total_value, getCurrency()), "normal") LogMessage(fmt.Sprintf("Released: %s", sets[0].ReleasedAt), "normal") LogMessage(fmt.Sprintf("Mythics: %.0f", ri.Mythics), "normal") LogMessage(fmt.Sprintf("Rares: %.0f", ri.Rares), "normal") @@ -176,7 +176,7 @@ func ShowSet(setname string) error { for i := 0; i < ccards; i++ { card := cards[i] - fmt.Printf("* %s%s%s (%s/%s) %s%.2f %s%s\n", Purple, card.Name, Reset, sets[0].Code, card.CollectorNumber, Yellow, card.getValue(false), getCurrency(), Reset) + fmt.Printf("* %s%s%s (%s/%s) %s%.2f%s%s\n", Purple, card.Name, Reset, sets[0].Code, card.CollectorNumber, Yellow, card.getValue(false), getCurrency(), Reset) } return nil diff --git a/src/serra/stats.go b/src/serra/stats.go index e755ac5..f970c93 100644 --- a/src/serra/stats.go +++ b/src/serra/stats.go @@ -120,9 +120,9 @@ var statsCmd = &cobra.Command{ foil_value = 0 } total_value := nf_value + foil_value - fmt.Printf("Total: %s%.2f %s%s\n", Pink, total_value, getCurrency(), Reset) - fmt.Printf("Normal: %s%.2f %s%s\n", Pink, nf_value, getCurrency(), Reset) - fmt.Printf("Foils: %s%.2f %s%s\n", Pink, foil_value, getCurrency(), Reset) + fmt.Printf("Total: %s%.2f%s%s\n", Pink, total_value, getCurrency(), Reset) + fmt.Printf("Normal: %s%.2f%s%s\n", Pink, nf_value, getCurrency(), Reset) + fmt.Printf("Foils: %s%.2f%s%s\n", Pink, foil_value, getCurrency(), Reset) total, _ := totalcoll.storage_find_total() fmt.Printf("History: \n")