From 1db4b41e23f217e56c344f4d658aa813f915f307 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Fri, 2 Dec 2011 22:44:00 +0900 Subject: [PATCH] use WAL mode if available; don't delete media in check --- anki/collection.py | 1 + anki/media.py | 7 +------ anki/storage.py | 1 + 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/anki/collection.py b/anki/collection.py index 406f85a3d..e14c5e6f6 100644 --- a/anki/collection.py +++ b/anki/collection.py @@ -124,6 +124,7 @@ crt=?, mod=?, scm=?, dty=?, usn=?, ls=?, conf=?""", self.save() else: self.rollback() + self.db.execute("pragma journal_mode = delete") self.db.close() self.db = None self.media.close() diff --git a/anki/media.py b/anki/media.py index 242b396fa..d323b56f9 100644 --- a/anki/media.py +++ b/anki/media.py @@ -122,7 +122,7 @@ If the same name exists, compare checksums.""" # Rebuilding DB ########################################################################## - def check(self, delete=False, local=None): + def check(self, local=None): "Return (missingFiles, unusedFiles)." mdir = self.dir() # generate card q/a and look through all references @@ -150,11 +150,6 @@ If the same name exists, compare checksums.""" unused.append(file) else: del normrefs[nfile] - # optionally delete - if delete: - for f in unused: - path = os.path.join(mdir, f) - os.unlink(path) nohave = normrefs.keys() return (nohave, unused) diff --git a/anki/storage.py b/anki/storage.py index 0e0e99b73..e00720892 100644 --- a/anki/storage.py +++ b/anki/storage.py @@ -27,6 +27,7 @@ def Collection(path, queue=True, lock=True, server=False): ver = _upgradeSchema(db) db.execute("pragma temp_store = memory") db.execute("pragma cache_size = 10000") + db.execute("pragma journal_mode = wal") # add db to col and do any remaining upgrades col = _Collection(db, server) if ver < SCHEMA_VERSION: