From 27b1385a92fefb3e89c3f8e22e4b6d75c7709cd7 Mon Sep 17 00:00:00 2001 From: Artyom Belousov Date: Sat, 11 May 2019 20:59:11 +0300 Subject: [PATCH] Refactoring --- cardsinfo/names.go | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/cardsinfo/names.go b/cardsinfo/names.go index 10237ea..de0c65f 100644 --- a/cardsinfo/names.go +++ b/cardsinfo/names.go @@ -5,27 +5,6 @@ import ( "strings" ) -func getCardName(card *mtg.Card) string { - switch card.Layout { - case "split": - return strings.Join(card.Names, " // ") - case "transform": - return strings.Join(card.Names, " | ") - default: - return card.Name - } -} - -func getOriginalNameFromLang(name, lang string, channel chan string) { - cards, _, _ := mtg.NewQuery().Where(mtg.CardLanguage, lang).Where(mtg.CardName, name).PageS(1, 1) - if len(cards) > 0 { - name := getCardName(cards[0]) - channel <- name - } else { - channel <- "" - } -} - func GetOriginalName(name string) string { langs := []string{"Russian", ""} channel := make(chan string) @@ -40,3 +19,24 @@ func GetOriginalName(name string) string { } return "" } + +func getOriginalNameFromLang(name, lang string, channel chan string) { + cards, _, _ := mtg.NewQuery().Where(mtg.CardLanguage, lang).Where(mtg.CardName, name).PageS(1, 1) + if len(cards) > 0 { + name := getCardName(cards[0]) + channel <- name + } else { + channel <- "" + } +} + +func getCardName(card *mtg.Card) string { + switch card.Layout { + case "split": + return strings.Join(card.Names, " // ") + case "transform": + return strings.Join(card.Names, " | ") + default: + return card.Name + } +}