From e64d82573066cc647a0dc685439625d53419898f Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 1 Mar 2013 01:36:14 +0900
Subject: [PATCH] fix some sync issues

- better error message when upload fails
- don't show success message on error
- fix 'unable to find server' accidentally being catchall
---
 anki/sync.py |  3 ++-
 aqt/sync.py  | 14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/anki/sync.py b/anki/sync.py
index 930377fac..2df4c662e 100644
--- a/anki/sync.py
+++ b/anki/sync.py
@@ -636,7 +636,8 @@ class FullSyncer(HttpSyncer):
         assert self.col.db.scalar("pragma integrity_check") == "ok"
         # apply some adjustments, then upload
         self.col.beforeUpload()
-        assert self.req("upload", open(self.col.path, "rb")) == "OK"
+        if self.req("upload", open(self.col.path, "rb")) != "OK":
+            raise Exception("server refused upload")
 
 # Media syncing
 ##########################################################################
diff --git a/aqt/sync.py b/aqt/sync.py
index cf6d982a3..10990a389 100644
--- a/aqt/sync.py
+++ b/aqt/sync.py
@@ -8,7 +8,7 @@ from anki import Collection
 from anki.sync import Syncer, RemoteServer, FullSyncer, MediaSyncer, \
     RemoteMediaServer
 from anki.hooks import addHook, remHook
-from aqt.utils import tooltip, askUserDialog, showWarning, showText
+from aqt.utils import tooltip, askUserDialog, showWarning, showText, showInfo
 
 # Sync manager
 ######################################################################
@@ -33,6 +33,7 @@ class SyncManager(QObject):
         # to avoid gui widgets being garbage collected in the worker thread,
         # run gc in advance
         self._didFullUp = False
+        self._didError = False
         gc.collect()
         # create the thread, setup signals and start running
         t = self.thread = SyncThread(
@@ -48,14 +49,16 @@ class SyncManager(QObject):
             self.mw.app.processEvents()
             self.thread.wait(100)
         self.mw.progress.finish()
-        if self._didFullUp:
-            showWarning(_("""\
+        def delayedInfo():
+            if self._didFullUp and not self._didError:
+                showInfo(_("""\
 Your collection was successfully uploaded to AnkiWeb.
 
 If you use any other devices, please sync them now, and choose \
 to download the collection you have just uploaded from this computer. \
 After doing so, future reviews and added cards will be merged \
 automatically."""))
+        self.mw.progress.timer(1000, delayedInfo, False)
 
     def _updateLabel(self):
         self.mw.progress.update(label="%s\n%s" % (
@@ -100,6 +103,7 @@ Please visit AnkiWeb, upgrade your deck, then try again."""))
                 self.label = m
                 self._updateLabel()
         elif evt == "error":
+            self._didError = True
             showText(_("Syncing failed:\n%s")%
                      self._rewriteError(args[0]))
         elif evt == "clockOff":
@@ -142,7 +146,7 @@ AnkiWeb is too busy at the moment. Please try again in a few minutes.""")
         elif "10061" in err or "10013" in err:
             return _(
                 "Antivirus or firewall software is preventing Anki from connecting to the internet.")
-        elif "Unable to find the server":
+        elif "Unable to find the server" in err:
             return _(
                 "Server not found. Either your connection is down, or antivirus/firewall "
                 "software is blocking Anki from connecting to the internet.")
@@ -152,6 +156,8 @@ AnkiWeb is too busy at the moment. Please try again in a few minutes.""")
             return _("After syncing, the collection was in an inconsistent \
 state. To fix this problem, Anki will force a full sync. Please sync again, and \
 choose which side you would like to keep.")
+        elif "server refused upload" in err:
+            return _("The server said our uploaded file was corrupt. Please try again.")
         return err
 
     def _getUserPass(self):