Merge pull request #61 from alecrem/feature/issue-60/add-search-fields

Middle_School_Card_Search.py

@@ -39,28 +39,65 @@ st.write(f'**{mslist_df.shape[0]}**{_["search"]["cards_are_legal"][l]}')
 results_df = mslist_df
 
 # Filter by card name
-input_name = st.text_input(_["search"]["search_by_card_name"][l]).strip()
+input_name = st.text_input(
+    f'**{_["search"]["search_by_card_name"][l]}**',
+    placeholder=_["search"]["search_by_card_name_placeholder"][l],
+).strip()
 exact_match = lib.get_legal_cardnames(input_name, mslist_df)
 results_en_df = results_df[results_df["name"].str.contains(input_name, case=False)]
 results_ja_df = results_df[results_df["name_ja"].str.contains(input_name, case=False)]
 results_df = results_en_df.merge(results_ja_df, how="outer")
 
-col1, col2 = st.columns(2)
+# Filter by color
+(
+    colorcol0,
+    colorcol1,
+    colorcol2,
+    colorcol3,
+    colorcol4,
+    colorcol5,
+    colorcol6,
+) = st.columns(7)
+colorcol0.write(f'**{_["search"]["search_by_color"][l]}**')
+if colorcol1.checkbox(_["basic"]["color_w"][l]):
+    results_df = results_df[results_df["w"] == True]
+if colorcol2.checkbox(_["basic"]["color_u"][l]):
+    results_df = results_df[results_df["u"] == True]
+if colorcol3.checkbox(_["basic"]["color_b"][l]):
+    results_df = results_df[results_df["b"] == True]
+if colorcol4.checkbox(_["basic"]["color_r"][l]):
+    results_df = results_df[results_df["r"] == True]
+if colorcol5.checkbox(_["basic"]["color_g"][l]):
+    results_df = results_df[results_df["g"] == True]
+if colorcol6.checkbox(_["basic"]["color_c"][l]):
+    results_df = results_df[results_df["c"] == True]
 
+col1, col2 = st.columns(2)
 # Filter by type (select)
+type_list = streamlit_common.locale.get_type_options()
 select_types = col1.multiselect(
-    _["search"]["select_type"][l],
-    ["Artifact", "Creature", "Enchantment", "Instant", "Land", "Sorcery"],
+    f'**{_["search"]["select_type"][l]}**',
+    type_list[l],
+    placeholder=_["search"]["select_type_placeholder"][l],
 )
 for cardtype in select_types:
-    results_df = results_df[results_df["type"].str.contains(cardtype, case=False)]
+    type_to_search = cardtype
+    if l == "ja":
+        type_to_search = type_list["en"][type_list["ja"].index(cardtype)]
+    results_df = results_df[results_df["type"].str.contains(type_to_search, case=False)]
 
 # Filter by type (text input)
-input_type = col2.text_input(_["search"]["search_by_type"][l]).strip()
+input_type = col2.text_input(
+    f'**{_["search"]["search_by_type"][l]}**',
+    placeholder=_["search"]["search_by_type_placeholder"][l],
+).strip()
 results_df = results_df[results_df["type"].str.contains(input_type, case=False)]
 
 # Filter by text
-input_text = st.text_input(_["search"]["search_by_text"][l]).strip()
+input_text = st.text_input(
+    f'**{_["search"]["search_by_text"][l]}**',
+    placeholder=_["search"]["search_by_text_placeholder"][l],
+).strip()
 results_df = results_df[results_df["text"].str.contains(input_text, case=False)]
 
 if results_df.shape[0] < mslist_df.shape[0]:

streamlit_common/locale.py

@@ -11,25 +11,45 @@ def get_locale():
                 "ja": "枚 のカードが使用可能です。",
             },
             "search_by_card_name": {
-                "en": "Search by card name (or part of it):",
-                "ja": "カード名（もしくは一部）で検索してください：",
+                "en": "Search by card name:",
+                "ja": "カード名で検索：",
             },
-            "search_by_text": {
-                "en": "Type a part of the rules text:",
-                "ja": "テキストの一部を入力してください：",
-            },
-            "search_by_type": {
-                "en": "Search by types, cardtypes and supertypes:",
-                "ja": "タイプ、サブタイプ、スーパータイプで検索：",
+            "search_by_card_name_placeholder": {
+                "en": "Type a card name or part of it",
+                "ja": "カード名もしくはその一部を入力してください",
             },
             "select_type": {
                 "en": "Select card types:",
                 "ja": "タイプを選択してください：",
             },
+            "search_by_type": {
+                "en": "Search by card types:",
+                "ja": "カードタイプで検索：",
+            },
+            "search_by_type_placeholder": {
+                "en": "Type a types, subtypes or supertypes",
+                "ja": "タイプ、サブタイプ、スーパータイプを入力",
+            },
+            "select_type_placeholder": {
+                "en": "Select card types",
+                "ja": "カードタイプ選択",
+            },
+            "search_by_text": {
+                "en": "Search by rules text:",
+                "ja": "テキストで検索：",
+            },
+            "search_by_text_placeholder": {
+                "en": "Type a part of the rules text",
+                "ja": "テキストの一部を入力してください",
+            },
             "exact_match": {
                 "en": "is an exact match.",
                 "ja": "が完全一致します。",
             },
+            "search_by_color": {
+                "en": "Color:",
+                "ja": "色：",
+            },
             "cards_found": {
                 "en": " cards were found.",
                 "ja": "枚 のカードが見つかりました。",
@@ -39,12 +59,12 @@ def get_locale():
                 "ja": "上位の検索結果：",
             },
             "see_more": {
-                "en": "See more",
-                "ja": "さらに見る",
+                "en": "See more results",
+                "ja": "さらに表示する",
             },
             "see_20": {
-                "en": "Only show 20",
-                "ja": "20枚に戻す",
+                "en": "Reset to 20 results",
+                "ja": "上位20枚表示に戻す",
             },
         },
         "check": {
@@ -69,4 +89,76 @@ def get_locale():
                 "ja": "**枚",
             },
         },
+        "basic": {
+            "color_w": {
+                "en": "W",
+                "ja": "白",
+            },
+            "color_u": {
+                "en": "U",
+                "ja": "青",
+            },
+            "color_b": {
+                "en": "B",
+                "ja": "黒",
+            },
+            "color_r": {
+                "en": "R",
+                "ja": "赤",
+            },
+            "color_g": {
+                "en": "G",
+                "ja": "緑",
+            },
+            "color_c": {
+                "en": "C",
+                "ja": "無/茶",
+            },
+            "type_artifact": {
+                "en": "Artifact",
+                "ja": "アーティファクト",
+            },
+            "type_creature": {
+                "en": "Creature",
+                "ja": "クリーチャー",
+            },
+            "type_enchantment": {
+                "en": "Enchantment",
+                "ja": "エンチャント",
+            },
+            "type_instant": {
+                "en": "Instant",
+                "ja": "インスタント",
+            },
+            "type_land": {
+                "en": "Land",
+                "ja": "土地",
+            },
+            "type_sorcery": {
+                "en": "Sorcery",
+                "ja": "ソーサリー",
+            },
+        },
+    }
+
+
+def get_type_options():
+    _ = get_locale()
+    return {
+        "en": [
+            _["basic"]["type_artifact"]["en"],
+            _["basic"]["type_creature"]["en"],
+            _["basic"]["type_enchantment"]["en"],
+            _["basic"]["type_instant"]["en"],
+            _["basic"]["type_land"]["en"],
+            _["basic"]["type_sorcery"]["en"],
+        ],
+        "ja": [
+            _["basic"]["type_artifact"]["ja"],
+            _["basic"]["type_creature"]["ja"],
+            _["basic"]["type_enchantment"]["ja"],
+            _["basic"]["type_instant"]["ja"],
+            _["basic"]["type_land"]["ja"],
+            _["basic"]["type_sorcery"]["ja"],
+        ],
     }