GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Resolve config sort in table model

Browse source
This commit is contained in:
RumovZ 2021-04-10 11:33:59 +02:00
parent 801f52df40
commit eafa2afc0d
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
qt/aqt/table.py
View file

@ -49,7 +49,8 @@ ItemList = Union[Sequence[CardId], Sequence[NoteId]]
class SearchContext: class SearchContext:
search: str search: str
browser: aqt.browser.Browser browser: aqt.browser.Browser
order: Union[bool, str] = True order: Union[bool, str, Column] = True
reverse: bool = False
# if set, provided ids will be used instead of the regular search # if set, provided ids will be used instead of the regular search
ids: Optional[Sequence[ItemId]] = None ids: Optional[Sequence[ItemId]] = None
@ -592,7 +593,9 @@ class ItemState(ABC):
# Get ids # Get ids
@abstractmethod @abstractmethod
def find_items(self, search: str, order: Union[bool, str]) -> Sequence[ItemId]: def find_items(
self, search: str, order: Union[bool, str, Column], reverse: bool
) -> Sequence[ItemId]:
"""Return the item ids fitting the given search and order.""" """Return the item ids fitting the given search and order."""
@abstractmethod @abstractmethod
@ -662,8 +665,10 @@ class CardState(ItemState):
def get_note(self, item: ItemId) -> Note: def get_note(self, item: ItemId) -> Note:
return self.get_card(item).note() return self.get_card(item).note()
def find_items(self, search: str, order: Union[bool, str]) -> Sequence[ItemId]: def find_items(
return self.col.find_cards(search, order) self, search: str, order: Union[bool, str, Column], reverse: bool
) -> Sequence[ItemId]:
return self.col.find_cards(search, order, reverse)
def get_item_from_card_id(self, card: CardId) -> ItemId: def get_item_from_card_id(self, card: CardId) -> ItemId:
return card return card
@ -725,8 +730,10 @@ class NoteState(ItemState):
def get_note(self, item: ItemId) -> Note: def get_note(self, item: ItemId) -> Note:
return self.col.get_note(NoteId(item)) return self.col.get_note(NoteId(item))
def find_items(self, search: str, order: Union[bool, str]) -> Sequence[ItemId]: def find_items(
return self.col.find_notes(search, order) self, search: str, order: Union[bool, str, Column], reverse: bool
) -> Sequence[ItemId]:
return self.col.find_notes(search, order, reverse)
def get_item_from_card_id(self, card: CardId) -> ItemId: def get_item_from_card_id(self, card: CardId) -> ItemId:
return self.col.get_card(card).note().id return self.col.get_card(card).note().id
@ -969,9 +976,14 @@ class DataModel(QAbstractTableModel):
def search(self, context: SearchContext) -> None: def search(self, context: SearchContext) -> None:
self.begin_reset() self.begin_reset()
try: try:
if context.order is True:
context.order = self.columns[self._state.sort_column]
context.reverse = self._state.sort_backwards
gui_hooks.browser_will_search(context) gui_hooks.browser_will_search(context)
if context.ids is None: if context.ids is None:
context.ids = self._state.find_items(context.search, context.order) context.ids = self._state.find_items(
context.search, context.order, context.reverse
)
gui_hooks.browser_did_search(context) gui_hooks.browser_did_search(context)
self._items = context.ids self._items = context.ids
self._rows = {} self._rows = {}