Merge pull request #87 from alecrem/feature/issue-86/show-banned-cards

Middle_School_Card_Search.py

@@ -4,9 +4,22 @@ import streamlit_common.footer
 import streamlit_common.lib as lib
 import streamlit_common.locale
 
-mslist_path = "static/middleschool_extra_fields.csv"
+mslist_path = "static/middleschool_extra_fields_with_banned.csv"
 _ = streamlit_common.locale.get_locale()
 
+
+def row_to_link(row: pd.DataFrame) -> None:
+    """Prints a list item with a Scryfall link for the card in the row passed"""
+    cardname = row["name"]
+    if row.name_ja is not "":
+        cardname = f"{cardname} / {row.name_ja}"
+    link = f"[{cardname}]({row.link})"
+    if row.banned:
+        link = f"🈲 {link} ({_['legality']['banned'][l]})"
+    link = f"- {link}"
+    st.write(link)
+
+
 if "number_shown_results" not in st.session_state:
     st.session_state["number_shown_results"] = 20
 if "lang" not in st.session_state:
@@ -41,7 +54,9 @@ st.write(_["search"]["instructions"][l])
 
 mslist_df = pd.read_csv(mslist_path)
 mslist_df.fillna("", inplace=True)
-st.write(f'**{mslist_df.shape[0]}**{_["search"]["cards_are_legal"][l]}')
+st.write(
+    f'**{mslist_df[mslist_df["banned"]==False].shape[0]}**{_["search"]["cards_are_legal"][l]}'
+)
 
 results_df = mslist_df
 
@@ -155,16 +170,21 @@ if results_df.shape[0] < mslist_df.shape[0]:
         cardname = exact_match[1]
         if exact_match[2] is not None:
             cardname = f"{cardname} / {exact_match[2]}"
-        st.write(
-            f'✅ [{cardname}]({lib.compose_scryfall_url(exact_match[1])}) {_["search"]["exact_match"][l]}'
-        )
+        if exact_match[3]:
+            st.write(
+                f'🈲 [{cardname}]({lib.compose_scryfall_url(exact_match[1])}) {_["search"]["banned_match"][l]}'
+            )
+        else:
+            st.write(
+                f'✅ [{cardname}]({lib.compose_scryfall_url(exact_match[1])}) {_["search"]["exact_match"][l]}'
+            )
     st.write(f'**{results_df.shape[0]}**{_["search"]["cards_found"][l]}')
     if results_df.shape[0] > st.session_state["number_shown_results"]:
         st.write(_["search"]["top_results"][l])
 
     results_df["link"] = results_df["name"].apply(lib.compose_scryfall_url)
     results_df[: st.session_state["number_shown_results"]].transpose().apply(
-        lib.row_to_link
+        row_to_link
     )
 
     if results_df.shape[0] > st.session_state["number_shown_results"]:

pages/1_Check_Card_List.py

@@ -4,9 +4,21 @@ import streamlit_common.footer
 import streamlit_common.lib as lib
 import streamlit_common.locale
 
-mslist_path = "static/middleschool.csv"
+mslist_path = "static/middleschool_with_banned.csv"
 _ = streamlit_common.locale.get_locale()
 
+
+def legal_to_checkmark(row: pd.DataFrame) -> pd.DataFrame:
+    if row["isbanned"]:
+        row["Legal"] = f"🈲 {_['legality']['banned'][l]}"
+        return row
+    if row["islegal"]:
+        row["Legal"] = f"✅ {_['legality']['legal'][l]}"
+        return row
+    row["Legal"] = f"🚫 {_['legality']['not_legal'][l]}"
+    return row
+
+
 if "lang" not in st.session_state:
     st.session_state["lang"] = "en"
 
@@ -51,13 +63,15 @@ input_cards["legalnames"] = input_cards["cardname"].apply(
     lib.get_legal_cardnames, args=[mslist_df]
 )
 input_cards = input_cards.apply(lib.split_names_list, axis=1)
-input_cards = input_cards.apply(lib.legal_to_checkmark, axis=1)
+input_cards = input_cards.apply(legal_to_checkmark, axis=1)
 if input_cards.shape[0] > 0:
     input_cards = input_cards.sort_values(by="Legal", ascending=False)
 
 illegal_cards = 0
 if input_cards.shape[0] > 0:
-    illegal_cards = input_cards[input_cards["Legal"] != "✅"].shape[0]
+    illegal_cards = input_cards[
+        input_cards["Legal"] != f"✅ {_['legality']['legal'][l]}"
+    ].shape[0]
 
 col2.write(
     f'##### {_["check"]["illegal_cards_1"][l]}{illegal_cards}{_["check"]["illegal_cards_2"][l]}'
@@ -70,6 +84,8 @@ if "English" in input_cards and "日本語" in input_cards:
     )
 
 if input_cards.shape[0] > 0:
-    input_cards[input_cards["Legal"] == "✅"].apply(lib.row_to_button_link, axis=1)
+    input_cards[input_cards["Legal"] == f"✅ {_['legality']['legal'][l]}"].apply(
+        lib.row_to_button_link, axis=1
+    )
 
 streamlit_common.footer.write_footer()

streamlit_common/lib.py

@@ -9,14 +9,6 @@ def compose_scryfall_url(cardname: str) -> str:
     return f"https://scryfall.com/search?q=prefer%3Aoldest%20!%22{urllib.parse.quote_plus(cardname)}%22"
 
 
-def row_to_link(row: pd.DataFrame) -> None:
-    """Prints a list item with a Scryfall link for the card in the row passed"""
-    cardname = row["name"]
-    if row.name_ja is not "":
-        cardname = f"{cardname} / {row.name_ja}"
-    st.write(f"- [{cardname}]({row.link})")
-
-
 def row_to_button_link(row: pd.DataFrame) -> None:
     """Prints a list item with a Scryfall link for the card in the row passed"""
     cardname = row.English
@@ -33,17 +25,21 @@ def get_legal_cardnames(cardname: str, mslist_df: pd.DataFrame) -> list:
         return [False, [], []]
     cardname_en_list = []
     cardname_ja_list = []
+    banned_list = []
     legal = False
+    banned = False
     english_match = mslist_df[mslist_df["name"].str.lower() == cardname.lower()]
     if english_match.shape[0] > 0:
         legal = True
         cardname_en_list = english_match["name"].to_list()
         cardname_ja_list = english_match["name_ja"].to_list()
+        banned_list = english_match["banned"].to_list()
     japanese_match = mslist_df[mslist_df["name_ja"] == cardname]
     if japanese_match.shape[0] > 0:
         legal = True
         cardname_en_list = japanese_match["name"].to_list()
         cardname_ja_list = japanese_match["name_ja"].to_list()
+        banned_list = japanese_match["banned"].to_list()
     if len(cardname_en_list) > 0:
         legalname_en = cardname_en_list[0]
     else:
@@ -52,11 +48,11 @@ def get_legal_cardnames(cardname: str, mslist_df: pd.DataFrame) -> list:
         legalname_ja = cardname_ja_list[0]
     else:
         legalname_ja = cardname
-    return [
-        legal,
-        legalname_en,
-        legalname_ja,
-    ]
+    if len(banned_list) > 0:
+        banned = banned_list[0]
+    else:
+        banned = False
+    return [legal, legalname_en, legalname_ja, banned]
 
 
 def remove_number_of_copies(line: str) -> str:
@@ -78,14 +74,6 @@ def is_cardname_legal(cardname: str, mslist_df: pd.DataFrame) -> bool:
     return False
 
 
-def legal_to_checkmark(row: pd.DataFrame) -> pd.DataFrame:
-    if row["islegal"]:
-        row["Legal"] = "✅"
-        return row
-    row["Legal"] = "🚫"
-    return row
-
-
 def split_names_list(row: pd.DataFrame):
     """Splits the English and Japanese card names in a list into two different columns"""
     if not isinstance(row["legalnames"], list):
@@ -94,4 +82,5 @@ def split_names_list(row: pd.DataFrame):
     row["English"] = row["legalnames"][1]
     if row["legalnames"][1] is not None:
         row["日本語"] = row["legalnames"][2]
+    row["isbanned"] = row["legalnames"][3]
     return row

streamlit_common/locale.py

@@ -46,6 +46,10 @@ def get_locale():
                 "en": "is an exact match.",
                 "ja": "が完全一致します。",
             },
+            "banned_match": {
+                "en": "is an exact match, but it is banned.",
+                "ja": "が完全一致しますが、使用禁止になっています。",
+            },
             "search_by_color": {
                 "en": "Color:",
                 "ja": "色：",
@@ -63,8 +67,8 @@ def get_locale():
                 "ja": "タフネス：",
             },
             "cards_found": {
-                "en": " cards were found.",
-                "ja": "枚 のカードが見つかりました。",
+                "en": " cards were found in the card pool.",
+                "ja": "枚 のカードがカードプール見つかりました。",
             },
             "top_results": {
                 "en": "Top results:",
@@ -79,6 +83,20 @@ def get_locale():
                 "ja": "上位20枚表示に戻す",
             },
         },
+        "legality": {
+            "legal": {
+                "en": "Legal",
+                "ja": "使用可能",
+            },
+            "banned": {
+                "en": "Banned",
+                "ja": "禁止カード",
+            },
+            "not_legal": {
+                "en": "Not legal",
+                "ja": "使用不可",
+            },
+        },
         "check": {
             "title": {
                 "en": "List Check",