From df95421d91a1c937ce2bd481f67d61e3af16c8ec Mon Sep 17 00:00:00 2001
From: Joe R <joeraz5@verizon.net>
Date: Tue, 5 Sep 2023 17:26:40 -0400
Subject: [PATCH] Set up cardsets advanced search to only show options that are
 registered.

---
 pysollib/tile/selectcardset.py | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pysollib/tile/selectcardset.py b/pysollib/tile/selectcardset.py
index 5e4ef711d..218ee061e 100644
--- a/pysollib/tile/selectcardset.py
+++ b/pysollib/tile/selectcardset.py
@@ -220,7 +220,7 @@ def __init__(self, parent, title, app, manager, key=None, **kw):
         self.manager = manager
         self.key = key
         self.app = app
-        self.criteria = SearchCriteria()
+        self.criteria = SearchCriteria(manager)
         self.cardset_values = None
         # padx, pady = kw.padx, kw.pady
         padx, pady = 4, 4
@@ -527,7 +527,7 @@ def performSearch(self):
 
     def advancedSearch(self):
         d = SelectCardsetAdvancedSearch(self.top, _("Advanced search"),
-                                        self.criteria)
+                                        self.criteria, self.manager)
         if d.status == 0 and d.button == 0:
             self.criteria.name = d.name.get()
 
@@ -712,7 +712,7 @@ def __init__(self, parent, title, cardset, images, **kw):
 
 
 class SearchCriteria:
-    def __init__(self):
+    def __init__(self, manager):
         self.name = ""
         self.size = ""
         self.type = ""
@@ -729,25 +729,32 @@ def __init__(self):
                             "Hi-Res cardsets": CSI.SIZE_HIRES}
 
         typeOptions = {-1: ""}
-        typeOptions.update(CSI.TYPE_NAME)
-        del typeOptions[7]  # Navagraha Ganjifa is unused.
+        for key, name in CSI.TYPE_NAME.items():
+            if manager.registered_types.get(key):
+                typeOptions[key] = name
         self.typeOptions = dict((v, k) for k, v in typeOptions.items())
 
         styleOptions = {-1: ""}
-        styleOptions.update(CSI.STYLE)
+        for key, name in CSI.STYLE.items():
+            if manager.registered_styles.get(key):
+                styleOptions[key] = name
         self.styleOptions = dict((v, k) for k, v in styleOptions.items())
 
         dateOptions = {-1: ""}
-        dateOptions.update(CSI.DATE)
+        for key, name in CSI.DATE.items():
+            if manager.registered_dates.get(key):
+                dateOptions[key] = name
         self.dateOptions = dict((v, k) for k, v in dateOptions.items())
 
         natOptions = {-1: ""}
-        natOptions.update(CSI.NATIONALITY)
+        for key, name in CSI.NATIONALITY.items():
+            if manager.registered_nationalities.get(key):
+                natOptions[key] = name
         self.natOptions = dict((v, k) for k, v in natOptions.items())
 
 
 class SelectCardsetAdvancedSearch(MfxDialog):
-    def __init__(self, parent, title, criteria, **kw):
+    def __init__(self, parent, title, criteria, manager, **kw):
         kw = self.initKw(kw)
         MfxDialog.__init__(self, parent, title, kw.resizable, kw.default)
         top_frame, bottom_frame = self.createFrames(kw)