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

better sync failure message, don't prompt for save if open online fails

Browse source
This commit is contained in:
Damien Elmes 2009-02-26 00:49:41 +09:00
parent c00850e011
commit 1e9c3ff253
2 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ankiqt/ui/main.py
View file

@ -222,6 +222,7 @@ Please do not file a bug report with Anki.<br><br>""")
if 'state' != 'noDeck' and state != 'editCurrentFact': if 'state' != 'noDeck' and state != 'editCurrentFact':
self.switchToReviewScreen() self.switchToReviewScreen()
if state == "noDeck": if state == "noDeck":
self.deck = None
self.switchToWelcomeScreen() self.switchToWelcomeScreen()
self.help.hide() self.help.hide()
self.currentCard = None self.currentCard = None
@ -1606,13 +1607,11 @@ day = :d""", d=yesterday)
name = ui.sync.DeckChooser(self, decks, create).getName() name = ui.sync.DeckChooser(self, decks, create).getName()
self.syncName = name self.syncName = name
if name: if name:
if name == self.syncName: # name chosen
self.syncDeck(create=True, interactive=False) onlyMerge = self.loadAfterSync == 2
else: self.syncDeck(create=True, interactive=False, onlyMerge=onlyMerge)
self.syncDeck(interactive=False)
else: else:
if not create: if not create:
# called via 'new' - close
self.cleanNewDeck() self.cleanNewDeck()
else: else:
self.syncFinished() self.syncFinished()

12
ankiqt/ui/sync.py
View file

@ -49,10 +49,10 @@ class Sync(QThread):
msg=_("Please double-check your username/password.") msg=_("Please double-check your username/password.")
elif error.data.get('status') == "oldVersion": elif error.data.get('status') == "oldVersion":
msg=_("The sync protocol has changed. Please upgrade.") msg=_("The sync protocol has changed. Please upgrade.")
elif error.data.get('type') == "noResponse":
msg=_("Server is down or operation failed.")
else: else:
msg=_("Unknown error: %s") % `error.data` msg=_("""\
Syncing failed. Please try again in a few minutes.
If the problem persists, please report it on the forum.""")
return msg return msg
def connect(self, *args): def connect(self, *args):
@ -153,14 +153,14 @@ class Sync(QThread):
time.sleep(0.25) time.sleep(0.25)
self.emit(SIGNAL("syncFinished")) self.emit(SIGNAL("syncFinished"))
except Exception, e: except Exception, e:
traceback.print_exc() self.ok = False
#traceback.print_exc()
self.deck.close() self.deck.close()
# cheap hack to ensure message is displayed # cheap hack to ensure message is displayed
err = `getattr(e, 'data', None) or e` err = `getattr(e, 'data', None) or e`
self.setStatus(_("Syncing failed: %(a)s") % { self.setStatus(_("Syncing failed: %(a)s") % {
'a': err}) 'a': err})
time.sleep(3) self.error(e)
self.emit(SIGNAL("syncFinished"))
def doBulkDownload(self, deckname): def doBulkDownload(self, deckname):
self.emit(SIGNAL("openSyncProgress")) self.emit(SIGNAL("openSyncProgress"))