From 174b13f7dfc3eac7bbe17aa43a1ddeee464b2355 Mon Sep 17 00:00:00 2001
From: Damien Elmes <git@ichi2.net>
Date: Mon, 14 Mar 2011 17:30:55 +0900
Subject: [PATCH] speed up new card fetching, add a text factory arg to the db,
 fix stopMplayer()

---
 anki/db.py    | 4 +++-
 anki/sched.py | 2 +-
 anki/sound.py | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/anki/db.py b/anki/db.py
index 0c14d82a8..4cf7aed71 100644
--- a/anki/db.py
+++ b/anki/db.py
@@ -15,9 +15,11 @@ from anki.hooks import runHook
 #FIXME: do we need the dbFinished hook?
 
 class DB(object):
-    def __init__(self, path, level="EXCLUSIVE"):
+    def __init__(self, path, level="EXCLUSIVE", text=None):
         self._db = sqlite.connect(
             path, timeout=0, isolation_level=level)
+        if text:
+            self._db.text_factory = text
         self._path = path
         self.echo = os.environ.get("DBECHO")
 
diff --git a/anki/sched.py b/anki/sched.py
index 81c49819e..e7e787e99 100644
--- a/anki/sched.py
+++ b/anki/sched.py
@@ -101,7 +101,7 @@ class Scheduler(object):
         else:
             self.newQueue = self.db.all("""
 select id, due from cards where
-queue = 2 %s order by due, id limit %d""" % (self.groupLimit('new'),
+queue = 2 %s order by due limit %d""" % (self.groupLimit('new'),
                                          lim))
             self.newQueue.reverse()
             self.newCount = len(self.newQueue)
diff --git a/anki/sound.py b/anki/sound.py
index 3c275e4d1..e440e0a44 100644
--- a/anki/sound.py
+++ b/anki/sound.py
@@ -233,7 +233,7 @@ def ensureMplayerThreads():
         mplayerReader.daemon = True
         mplayerReader.start()
 
-def stopMplayer():
+def stopMplayer(*args):
     if not mplayerManager:
         return
     mplayerManager.kill()