Added type hints, renamed kwarg

This commit is contained in:
k12ish 2020-12-19 18:12:58 +00:00
parent ef1f58c8b6
commit cc0572a385
2 changed files with 6 additions and 6 deletions

View file

@ -379,9 +379,9 @@ class Collection:
def cardCount(self) -> Any: def cardCount(self) -> Any:
return self.db.scalar("select count() from cards") return self.db.scalar("select count() from cards")
def card_count_from_did(self, did, recursive=False): def card_count_from_did(self, did: int, count_subdecks: bool = False) -> Any:
dids = [did] dids: List[int] = [did]
if recursive: if count_subdecks:
dids += [r[1] for r in self.decks.children(did)] dids += [r[1] for r in self.decks.children(did)]
count = self.db.scalar( count = self.db.scalar(
"select count() from cards where did in {0} or " "select count() from cards where did in {0} or "

View file

@ -265,7 +265,7 @@ class DeckBrowser:
node.collapsed = not node.collapsed node.collapsed = not node.collapsed
self._renderPage(reuse=True) self._renderPage(reuse=True)
def _dragDeckOnto(self, draggedDeckDid, ontoDeckDid): def _dragDeckOnto(self, draggedDeckDid: int, ontoDeckDid: int):
try: try:
self.mw.col.decks.renameForDragAndDrop(draggedDeckDid, ontoDeckDid) self.mw.col.decks.renameForDragAndDrop(draggedDeckDid, ontoDeckDid)
gui_hooks.sidebar_should_refresh_decks() gui_hooks.sidebar_should_refresh_decks()
@ -274,11 +274,11 @@ class DeckBrowser:
self.show() self.show()
def _delete(self, did): def _delete(self, did: int):
self.mw.checkpoint(tr(TR.DECKS_DELETE_DECK)) self.mw.checkpoint(tr(TR.DECKS_DELETE_DECK))
deck = self.mw.col.decks.get(did) deck = self.mw.col.decks.get(did)
if not deck["dyn"]: if not deck["dyn"]:
count = self.mw.col.card_count_from_did(did, recursive=True) count = self.mw.col.card_count_from_did(did, count_subdecks=True)
if count: if count:
extra = tr(TR.DECKS_IT_HAS_CARD, count=count) extra = tr(TR.DECKS_IT_HAS_CARD, count=count)
else: else: