Support "any"-style req for card gen

genanki/__init__.py

@@ -202,8 +202,9 @@ def sort_field(self, val):
  @cached_property
  def cards(self):
  rv = []
- for card_ord, _, required_field_ords in self.model._req:
- if all(self.fields[ord_] for ord_ in required_field_ords):
+ for card_ord, any_or_all, required_field_ords in self.model._req:
+ op = {'any': any, 'all': all}[any_or_all]
+ if op(self.fields[ord_] for ord_ in required_field_ords):
  rv.append(Card(card_ord))
  return rv
 

tests/test_genanki.py

@@ -120,7 +120,7 @@ def test_Model_req__cn(self):
  def test_Model_req__with_hint(self):
  assert TEST_MODEL_WITH_HINT._req == [[0, 'any', [0, 1]]]
 
- def test_notes_generate_cards_based_on_req(self):
+ def test_notes_generate_cards_based_on_req__cn(self):
  # has 'Simplified' field, will generate a 'Simplified' card
  n1 = genanki.Note(model=TEST_CN_MODEL, fields=['中國', '中国', 'China'])
  # no 'Simplified' field, so it won't generate a 'Simplified' card
@@ -133,6 +133,16 @@ def test_notes_generate_cards_based_on_req(self):
  assert len(n2.cards) == 1
  assert n2.cards[0].ord == 0
 
+ def test_notes_generate_cards_based_on_req__with_hint(self):
+ # both of these notes will generate one card
+ n1 = genanki.Note(model=TEST_MODEL_WITH_HINT, fields=['capital of California', '', 'Sacramento'])
+ n2 = genanki.Note(model=TEST_MODEL_WITH_HINT, fields=['capital of Iowa', 'French for "The Moines"', 'Des Moines'])
+
+ assert len(n1.cards) == 1
+ assert n1.cards[0].ord == 0
+ assert len(n2.cards) == 1
+ assert n2.cards[0].ord == 0
+
  def test_Note_with_guid_property(self):
  class MyNote(genanki.Note):
  @property