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

Enable strict_optional for aqt/preferences.py (#3519)

Browse source 
* Enable strict_optional for aqt/preferences.py

* Fix mypy errors
This commit is contained in:
Ben Nguyen 2024-10-26 02:33:53 -07:00 committed by GitHub
parent 939cc5a268
commit 507050c876
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.mypy.ini
View file

@ -40,6 +40,8 @@ strict_optional = True
strict_optional = True strict_optional = True
[mypy-aqt.editor] [mypy-aqt.editor]
strict_optional = True strict_optional = True
[mypy-aqt.preferences]
strict_optional = True
[mypy-anki.scheduler.base] [mypy-anki.scheduler.base]
strict_optional = True strict_optional = True
[mypy-anki._backend.rsbridge] [mypy-anki._backend.rsbridge]

25
qt/aqt/preferences.py
View file

@ -46,13 +46,16 @@ class Preferences(QDialog):
self.form.network_timeout, self.form.network_timeout,
): ):
spinbox.setSuffix(f" {spinbox.suffix()}") spinbox.setSuffix(f" {spinbox.suffix()}")
disable_help_button(self) disable_help_button(self)
self.form.buttonBox.button(QDialogButtonBox.StandardButton.Help).setAutoDefault( help_button = self.form.buttonBox.button(QDialogButtonBox.StandardButton.Help)
False assert help_button is not None
) help_button.setAutoDefault(False)
self.form.buttonBox.button(
QDialogButtonBox.StandardButton.Close close_button = self.form.buttonBox.button(QDialogButtonBox.StandardButton.Close)
).setAutoDefault(False) assert close_button is not None
close_button.setAutoDefault(False)
qconnect( qconnect(
self.form.buttonBox.helpRequested, lambda: openHelp(HelpPage.PREFERENCES) self.form.buttonBox.helpRequested, lambda: openHelp(HelpPage.PREFERENCES)
) )
@ -218,6 +221,7 @@ class Preferences(QDialog):
qconnect(self.form.syncAnkiHubLogin.clicked, self.ankihub_sync_login) qconnect(self.form.syncAnkiHubLogin.clicked, self.ankihub_sync_login)
def update_login_status(self) -> None: def update_login_status(self) -> None:
assert self.prof is not None
if not self.prof.get("syncKey"): if not self.prof.get("syncKey"):
self.form.syncUser.setText(tr.preferences_ankiweb_intro()) self.form.syncUser.setText(tr.preferences_ankiweb_intro())
self.form.syncLogin.setVisible(True) self.form.syncLogin.setVisible(True)
@ -241,6 +245,7 @@ class Preferences(QDialog):
def sync_login(self) -> None: def sync_login(self) -> None:
def on_success(): def on_success():
assert self.prof is not None
if self.prof.get("syncKey"): if self.prof.get("syncKey"):
self.update_login_status() self.update_login_status()
self.confirm_sync_after_login() self.confirm_sync_after_login()
@ -251,6 +256,7 @@ class Preferences(QDialog):
if self.mw.media_syncer.is_syncing(): if self.mw.media_syncer.is_syncing():
showWarning("Can't log out while sync in progress.") showWarning("Can't log out while sync in progress.")
return return
assert self.prof is not None
self.prof["syncKey"] = None self.prof["syncKey"] = None
self.mw.col.media.force_resync() self.mw.col.media.force_resync()
self.update_login_status() self.update_login_status()
@ -263,7 +269,10 @@ class Preferences(QDialog):
ankihub_login(self.mw, on_success) ankihub_login(self.mw, on_success)
def ankihub_sync_logout(self) -> None: def ankihub_sync_logout(self) -> None:
ankihub_logout(self.mw, self.update_login_status, self.mw.pm.ankihub_token()) ankihub_token = self.mw.pm.ankihub_token()
if ankihub_token is None:
return
ankihub_logout(self.mw, self.update_login_status, ankihub_token)
def confirm_sync_after_login(self) -> None: def confirm_sync_after_login(self) -> None:
from aqt import mw from aqt import mw
@ -272,6 +281,7 @@ class Preferences(QDialog):
self.accept_with_callback(self.mw.on_sync_button_clicked) self.accept_with_callback(self.mw.on_sync_button_clicked)
def update_network(self) -> None: def update_network(self) -> None:
assert self.prof is not None
self.prof["autoSync"] = self.form.syncOnProgramOpen.isChecked() self.prof["autoSync"] = self.form.syncOnProgramOpen.isChecked()
self.prof["syncMedia"] = self.form.syncMedia.isChecked() self.prof["syncMedia"] = self.form.syncMedia.isChecked()
self.mw.pm.set_periodic_sync_media_minutes( self.mw.pm.set_periodic_sync_media_minutes(
@ -378,6 +388,7 @@ class Preferences(QDialog):
self.mw.set_theme(Theme(index)) self.mw.set_theme(Theme(index))
def on_reset_window_sizes(self) -> None: def on_reset_window_sizes(self) -> None:
assert self.prof is not None
regexp = re.compile(r"(Geom(etry)?|State|Splitter|Header)(\d+.\d+)?$") regexp = re.compile(r"(Geom(etry)?|State|Splitter|Header)(\d+.\d+)?$")
for key in list(self.prof.keys()): for key in list(self.prof.keys()):
if regexp.search(key): if regexp.search(key):