From 72b41481279286aad197a5e7406d80529dba6b32 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Tue, 24 Jun 2014 14:50:39 -0500
Subject: [PATCH 01/11] make sure temp folder hasn't been deleted since
 creation

---
 anki/utils.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/anki/utils.py b/anki/utils.py
index 6fab82fa1..5452d051b 100644
--- a/anki/utils.py
+++ b/anki/utils.py
@@ -292,9 +292,10 @@ def tmpdir():
             shutil.rmtree(_tmpdir)
         import atexit
         atexit.register(cleanup)
-        _tmpdir = unicode(os.path.join(tempfile.gettempdir(), "anki_temp"), sys.getfilesystemencoding())
-        if not os.path.exists(_tmpdir):
-            os.mkdir(_tmpdir)
+        _tmpdir = unicode(os.path.join(tempfile.gettempdir(), "anki_temp"), \
+                sys.getfilesystemencoding())
+    if not os.path.exists(_tmpdir):
+        os.mkdir(_tmpdir)
     return _tmpdir
 
 def tmpfile(prefix="", suffix=""):

From 88c36af987e936c6f456341c8a96a36e468f94f4 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Tue, 24 Jun 2014 15:04:23 -0500
Subject: [PATCH 02/11] don't try to log in if user cancels login dialog

---
 aqt/sync.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aqt/sync.py b/aqt/sync.py
index c54000654..af8ff0d50 100644
--- a/aqt/sync.py
+++ b/aqt/sync.py
@@ -217,10 +217,10 @@ enter your details below.""") %
         vbox.addWidget(bb)
         d.setLayout(vbox)
         d.show()
-        d.exec_()
+        accepted = d.exec_()
         u = user.text()
         p = passwd.text()
-        if not u or not p:
+        if not accepted or not u or not p:
             return
         return (u, p)
 

From a2eb5a09c3a3256f81a103cf1d39f6dec88ce3a6 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Tue, 17 Jun 2014 17:51:02 -0500
Subject: [PATCH 03/11] allow changing case of profile name on Windows

---
 aqt/profiles.py | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/aqt/profiles.py b/aqt/profiles.py
index 4503240d6..25aec728d 100644
--- a/aqt/profiles.py
+++ b/aqt/profiles.py
@@ -140,9 +140,24 @@ documentation for information on using a flash drive.""")
         self.name = name
         newFolder = self.profileFolder(create=False)
         if os.path.exists(newFolder):
-            showWarning(_("Folder already exists."))
-            self.name = oldName
-            return
+            if (oldFolder != newFolder) and (
+                    oldFolder.lower() == newFolder.lower()):
+                # OS is telling us the folder exists because it does not take
+                # case into account; use a temporary folder location
+                midFolder = ''.join([oldFolder, '-temp'])
+                if not os.path.exists(midFolder):
+                    os.rename(oldFolder, midFolder)
+                    oldFolder = midFolder
+                else:
+                    showWarning(_("Please remove the folder %s and try again.")
+                            % midFolder)
+                    self.name = oldName
+                    return
+            else:
+                showWarning(_("Folder already exists."))
+                self.name = oldName
+                return
+
         # update name
         self.db.execute("update profiles set name = ? where name = ?",
                         name.encode("utf8"), oldName.encode("utf-8"))

From a570779a2623769fb15f06b054c986fffc5af68d Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Tue, 24 Jun 2014 15:55:19 -0500
Subject: [PATCH 04/11] update all duplicates when importing

If duplicate notes are already in the collection and, based on the first
field of all of them, they should be updated, update all of them instead
of just the first one we come across.
---
 anki/importing/noteimp.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/anki/importing/noteimp.py b/anki/importing/noteimp.py
index e9e435d67..d53f8a9ac 100644
--- a/anki/importing/noteimp.py
+++ b/anki/importing/noteimp.py
@@ -156,7 +156,6 @@ class NoteImporter(Importer):
                                 updateLog.append(updateLogTxt % fld0)
                                 dupeCount += 1
                                 found = True
-                            break
                         elif self.importMode == 1:
                             dupeCount += 1
                         elif self.importMode == 2:

From 083d9e8aa5d041475ea59ccd54c0014afda33f54 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Wed, 25 Jun 2014 13:46:21 -0500
Subject: [PATCH 05/11] remove search text when ctrl-clicking a left panel item

---
 aqt/browser.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aqt/browser.py b/aqt/browser.py
index e43a58a60..4a65ea9b1 100644
--- a/aqt/browser.py
+++ b/aqt/browser.py
@@ -790,8 +790,9 @@ by clicking on one on the left."""))
             txt = "-"+txt
         if self.mw.app.keyboardModifiers() & Qt.ControlModifier:
             cur = unicode(self.form.searchEdit.lineEdit().text())
-            if cur:
-                txt = cur + " " + txt
+            if cur and cur != \
+                    _("<type here to search; hit enter to show current deck>"):
+                        txt = cur + " " + txt
         elif self.mw.app.keyboardModifiers() & Qt.ShiftModifier:
             cur = unicode(self.form.searchEdit.lineEdit().text())
             if cur:

From 46a38f843efd5ac37f1779ce9a24d30acd1b7035 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Thu, 26 Jun 2014 10:07:58 -0500
Subject: [PATCH 06/11] fix rounding of cards/minute; use 1 decimal place

---
 anki/stats.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/anki/stats.py b/anki/stats.py
index 681157785..391fa67a2 100644
--- a/anki/stats.py
+++ b/anki/stats.py
@@ -353,7 +353,11 @@ group by day order by day""" % (self._limit(), lim),
                 tot, period, unit))
         if total and tot:
             perMin = total / float(tot)
-            perMin = ngettext("%d card/minute", "%d cards/minute", perMin) % round(perMin)
+            perMin = round(perMin, 1)
+            perMin = ngettext("%d card/minute", "%.01f cards/minute", perMin) % perMin
+            # don't round down to zero
+            if float(perMin.split(' ')[0]) < 0.1:
+                perMin = ''.join(["<", _("%.01f cards/minute")]) % 0.1
             self._line(
                 i, _("Average answer time"),
                 _("%(a)0.1fs (%(b)s)") % dict(a=(tot*60)/total, b=perMin))

From 4619933e7e47515fcd5d603c414b428c43a64d0c Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Thu, 26 Jun 2014 10:55:45 -0500
Subject: [PATCH 07/11] change default Anki folder location on Linux to
 Documents/Anki

(leave in ~/Anki for existing installs)
---
 aqt/profiles.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/aqt/profiles.py b/aqt/profiles.py
index b0a8af646..0b456350b 100644
--- a/aqt/profiles.py
+++ b/aqt/profiles.py
@@ -204,7 +204,12 @@ a flash drive.""" % self.base)
         elif isMac:
             return os.path.expanduser("~/Documents/Anki")
         else:
-            return os.path.expanduser("~/Anki")
+            # use Documents/Anki on new installs, ~/Anki on existing ones
+            p = os.path.expanduser("~/Anki")
+            if os.path.exists(p):
+                return p
+            else:
+                return os.path.expanduser("~/Documents/Anki")
 
     def _loadMeta(self):
         path = os.path.join(self.base, "prefs.db")

From 186641ad8cc8f73eeee64fe2471d1be5e5345b4d Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Sat, 28 Jun 2014 09:17:36 -0500
Subject: [PATCH 08/11] add css id to the star used for marking

Can't automatically prevent the star from being affected by image resize
and other CSS properties, as even weirder things happen to it when we
try. However, this will give users the ability to fix it themselves.
---
 aqt/reviewer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aqt/reviewer.py b/aqt/reviewer.py
index 40a5dcdc9..9bdfc749b 100644
--- a/aqt/reviewer.py
+++ b/aqt/reviewer.py
@@ -127,7 +127,7 @@ class Reviewer(object):
     ##########################################################################
 
     _revHtml = """
-<img src="qrc:/icons/rating.png" class=marked>
+<img src="qrc:/icons/rating.png" id=star class=marked>
 <div id=qa></div>
 <script>
 var ankiPlatform = "desktop";

From a261f1526975dd4d23261632aeed3c53007b6a99 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Sat, 28 Jun 2014 10:31:12 -0500
Subject: [PATCH 09/11] change out of temp media folder before deleting it

In some cases, not doing so could cause a "this file is being used by
another process" error.
---
 anki/exporting.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anki/exporting.py b/anki/exporting.py
index f61871d6c..83beb5e4e 100644
--- a/anki/exporting.py
+++ b/anki/exporting.py
@@ -259,6 +259,7 @@ class AnkiPackageExporter(AnkiExporter):
         # tidy up intermediate files
         os.unlink(colfile)
         os.unlink(path.replace(".apkg", ".media.db"))
+        os.chdir(self.mediaDir)
         shutil.rmtree(path.replace(".apkg", ".media"))
         return media
 

From 0c937074ebdcdc6cd5984e542b8bfbd351cc8315 Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Sat, 28 Jun 2014 11:22:07 -0500
Subject: [PATCH 10/11] prevent profiles from getting out of sync when rename
 fails

If there is an error in renaming the folder, don't write the new profile
name to the database.
---
 aqt/profiles.py | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/aqt/profiles.py b/aqt/profiles.py
index 0b456350b..cc99fd26e 100644
--- a/aqt/profiles.py
+++ b/aqt/profiles.py
@@ -164,8 +164,22 @@ a flash drive.""" % self.base)
         self.db.execute("update profiles set name = ? where name = ?",
                         name.encode("utf8"), oldName.encode("utf-8"))
         # rename folder
-        os.rename(oldFolder, newFolder)
-        self.db.commit()
+        try:
+            os.rename(oldFolder, newFolder)
+        except WindowsError as e:
+            self.db.rollback()
+            if "Access is denied" in e:
+                showWarning(_("""\
+Anki could not rename your profile because it could not rename the profile \
+folder on disk. Please ensure you have permission to write to Documents/Anki \
+and no other programs are accessing your profile folders, then try again."""))
+            else:
+                raise
+        except:
+            self.db.rollback()
+            raise
+        else:
+            self.db.commit()
 
     # Folder handling
     ######################################################################

From c3434ff751488897df617f61a8c2d201662cbfce Mon Sep 17 00:00:00 2001
From: "Soren I. Bjornstad" <soren.bjornstad@gmail.com>
Date: Sat, 28 Jun 2014 13:51:30 -0500
Subject: [PATCH 11/11] update note type on apkg import when only templates
 have changed

Previously, it only updated if card/note count was different, even if
the templates / styling information had been updated.
---
 anki/importing/anki2.py                 |   5 +++++
 tests/support/diffmodeltemplates-1.apkg | Bin 0 -> 5140 bytes
 tests/support/diffmodeltemplates-2.apkg | Bin 0 -> 5147 bytes
 tests/test_importing.py                 |  21 +++++++++++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 tests/support/diffmodeltemplates-1.apkg
 create mode 100644 tests/support/diffmodeltemplates-2.apkg

diff --git a/anki/importing/anki2.py b/anki/importing/anki2.py
index ffb97c815..01e3bb751 100644
--- a/anki/importing/anki2.py
+++ b/anki/importing/anki2.py
@@ -190,6 +190,11 @@ class Anki2Importer(Importer):
             dstScm = self.dst.models.scmhash(dstModel)
             if srcScm == dstScm:
                 # they do; we can reuse this mid
+                model = srcModel.copy()
+                model['id'] = mid
+                model['mod'] = intTime()
+                model['usn'] = self.col.usn()
+                self.dst.models.update(model)
                 break
             # as they don't match, try next id
             mid += 1
diff --git a/tests/support/diffmodeltemplates-1.apkg b/tests/support/diffmodeltemplates-1.apkg
new file mode 100644
index 0000000000000000000000000000000000000000..e75abac3a9c64961011b339f0b83e5c3732d96f7
GIT binary patch
literal 5140
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
GSpNV;MX8AZ

literal 0
HcmV?d00001

diff --git a/tests/support/diffmodeltemplates-2.apkg b/tests/support/diffmodeltemplates-2.apkg
new file mode 100644
index 0000000000000000000000000000000000000000..acb8e11fb012285051129b9757410f685ab63095
GIT binary patch
literal 5147
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

literal 0
HcmV?d00001

diff --git a/tests/test_importing.py b/tests/test_importing.py
index 841827b51..4f7bf77f1 100644
--- a/tests/test_importing.py
+++ b/tests/test_importing.py
@@ -204,6 +204,27 @@ def test_anki2_diffmodels():
     assert after == before + 1
     assert dst.cardCount() == 3
 
+def test_anki2_diffmodel_templates():
+    # different from the above as this one tests only the template text being
+    # changed, not the number of cards/fields
+    dst = getEmptyCol()
+    # import the first version of the model
+    tmp = getUpgradeDeckPath("diffmodeltemplates-1.apkg")
+    imp = AnkiPackageImporter(dst, tmp)
+    imp.dupeOnSchemaChange = True
+    imp.run()
+    # then the version with updated template
+    tmp = getUpgradeDeckPath("diffmodeltemplates-2.apkg")
+    imp = AnkiPackageImporter(dst, tmp)
+    imp.dupeOnSchemaChange = True
+    imp.run()
+    # collection should contain the note we imported
+    assert(dst.noteCount() == 1)
+    # the front template should contain the text added in the 2nd package
+    tcid = dst.findCards("")[0] # only 1 note in collection
+    tnote = dst.getCard(tcid).note()
+    assert("Changed Front Template" in dst.findTemplates(tnote)[0]['qfmt'])
+
 def test_anki2_updates():
     # create a new empty deck
     dst = getEmptyCol()