use WAL mode if available; don't delete media in check

This commit is contained in:
Damien Elmes 2011-12-02 22:44:00 +09:00
parent c961b5843a
commit 1db4b41e23
3 changed files with 3 additions and 6 deletions

View file

@ -124,6 +124,7 @@ crt=?, mod=?, scm=?, dty=?, usn=?, ls=?, conf=?""",
self.save() self.save()
else: else:
self.rollback() self.rollback()
self.db.execute("pragma journal_mode = delete")
self.db.close() self.db.close()
self.db = None self.db = None
self.media.close() self.media.close()

View file

@ -122,7 +122,7 @@ If the same name exists, compare checksums."""
# Rebuilding DB # Rebuilding DB
########################################################################## ##########################################################################
def check(self, delete=False, local=None): def check(self, local=None):
"Return (missingFiles, unusedFiles)." "Return (missingFiles, unusedFiles)."
mdir = self.dir() mdir = self.dir()
# generate card q/a and look through all references # generate card q/a and look through all references
@ -150,11 +150,6 @@ If the same name exists, compare checksums."""
unused.append(file) unused.append(file)
else: else:
del normrefs[nfile] del normrefs[nfile]
# optionally delete
if delete:
for f in unused:
path = os.path.join(mdir, f)
os.unlink(path)
nohave = normrefs.keys() nohave = normrefs.keys()
return (nohave, unused) return (nohave, unused)

View file

@ -27,6 +27,7 @@ def Collection(path, queue=True, lock=True, server=False):
ver = _upgradeSchema(db) ver = _upgradeSchema(db)
db.execute("pragma temp_store = memory") db.execute("pragma temp_store = memory")
db.execute("pragma cache_size = 10000") db.execute("pragma cache_size = 10000")
db.execute("pragma journal_mode = wal")
# add db to col and do any remaining upgrades # add db to col and do any remaining upgrades
col = _Collection(db, server) col = _Collection(db, server)
if ver < SCHEMA_VERSION: if ver < SCHEMA_VERSION: