Refactor previous is_legal functions

Middle_School_Card_Search.py

@@ -15,7 +15,7 @@ def row_to_link(x: pd.DataFrame) -> None:
     st.markdown(f"- [{cardname}]({x.link})")
 
 
-def is_legal(cardname: str) -> list:
+def get_legal_cardnames(cardname: str, mslist_df: pd.DataFrame) -> list:
     english_match = mslist_df[mslist_df["name"].str.lower() == cardname.lower()]
     cardname_en_list = None
     if english_match.shape[0] > 0:
@@ -30,7 +30,6 @@ def is_legal(cardname: str) -> list:
             cardname_en_list[0] or None,
             cardname_ja_list[0] or None,
         ]
-
     return None
 
 
@@ -55,7 +54,7 @@ mslist_df.fillna("", inplace=True)
 st.write(mslist_df.shape[0], "cards are legal")
 
 name_input = st.text_input(f"Search by card name").strip()
-exact_match = is_legal(name_input)
+exact_match = get_legal_cardnames(name_input, mslist_df)
 results_en_df = mslist_df[
     mslist_df["name"].str.contains(name_input.lower(), case=False)
 ]

pages/1_Check_Card_List.py

@@ -11,7 +11,7 @@ def remove_number_of_copies(line: str) -> str:
     return pattern.sub("", line)
 
 
-def is_legal(cardname: str) -> bool:
+def is_cardname_legal(cardname: str, mslist_df: pd.DataFrame) -> bool:
     if mslist_df[mslist_df["name"].str.lower() == cardname.lower()].shape[0] > 0:
         return True
     if mslist_df[mslist_df["name_ja"] == cardname].shape[0] > 0:
@@ -51,7 +51,9 @@ for line in input_list.split("\n"):
         cardnames.append(remove_number_of_copies(cardname))
 
 input_cards = pd.DataFrame(cardnames, columns=["cardname"])
-input_cards["legal"] = input_cards["cardname"].apply(is_legal)
+input_cards["legal"] = input_cards["cardname"].apply(
+    is_cardname_legal, args=[mslist_df]
+)
 
 col2.write("##### Middle School legality")
 col2.dataframe(input_cards[["legal", "cardname"]], use_container_width=True)