From ebe420b440dc12d16310055020cba52a28e6e740 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Fri, 2 Feb 2018 12:44:56 +1000
Subject: [PATCH] v2 sched cleanups

---
 anki/schedv2.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/anki/schedv2.py b/anki/schedv2.py
index 0620f6fc7..dbb6ba428 100644
--- a/anki/schedv2.py
+++ b/anki/schedv2.py
@@ -77,7 +77,6 @@ class Scheduler:
             return
 
         card.reps += 1
-        card.wasNew = card.type == 0
 
         if card.queue == 0:
             # came from the new queue, move to learning
@@ -93,6 +92,8 @@ class Scheduler:
             self._answerRevCard(card, ease)
             # update daily limit
             self._updateStats(card, 'rev')
+        else:
+            assert 0
 
     def _answerCardPreview(self, card, ease):
         assert 1 <= ease <= 2
@@ -527,26 +528,28 @@ did = ? and queue = 3 and due <= ? limit ?""",
             type = 0
         # lrnCount was decremented once when card was fetched
         lastLeft = card.left
+
+        leaving = False
+
         # immediate graduate?
         if ease == 4:
             self._rescheduleAsRev(card, conf, True)
-            self._logLrn(card, ease, conf, True, type, lastLeft)
+            leaving = True
         # next step?
         elif ease == 3:
             # graduation time?
             if (card.left%1000)-1 <= 0:
                 self._rescheduleAsRev(card, conf, False)
-                self._logLrn(card, ease, conf, True, type, lastLeft)
+                leaving = True
             else:
                 self._moveToNextStep(card, conf)
-                self._logLrn(card, ease, conf, False, type, lastLeft)
         elif ease == 2:
             self._repeatStep(card, conf)
-            self._logLrn(card, ease, conf, False, type, lastLeft)
         else:
             # back to first step
             self._moveToFirstStep(card, conf)
-            self._logLrn(card, ease, conf, False, type, lastLeft)
+
+        self._logLrn(card, ease, conf, leaving, type, lastLeft)
 
     def _moveToFirstStep(self, card, conf):
         card.left = self._startingLeft(card)
@@ -577,8 +580,10 @@ did = ? and queue = 3 and due <= ? limit ?""",
         self._rescheduleLrnCard(card, conf, delay=delay)
 
     def _rescheduleLrnCard(self, card, conf, delay=None):
+        # normal delay for the current step?
         if delay is None:
             delay = self._delayForGrade(conf, card.left)
+
         if card.due < time.time():
             # not collapsed; add some randomness
             delay *= random.uniform(1, 1.25)