GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-23 16:26:40 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

check backup integrity using existing db connection to avoid locking issues

Browse source
This commit is contained in:
Damien Elmes 2010-01-04 22:37:14 +09:00
parent 33ec7ce133
commit 20da165b6e
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
anki/deck.py
View file

@ -2759,7 +2759,7 @@ class DeckStorage(object):
deck.setVar("leechFails", 16) deck.setVar("leechFails", 16)
else: else:
if backup: if backup:
DeckStorage.backup(deck.modified, path) DeckStorage.backup(deck, path)
deck._initVars() deck._initVars()
try: try:
deck = DeckStorage._upgradeDeck(deck, path) deck = DeckStorage._upgradeDeck(deck, path)
@ -3333,16 +3333,13 @@ nextFactor, reps, thinkingTime, yesCount, noCount from reviewHistory""")
deck.utcOffset = time.timezone + 60*60*4 deck.utcOffset = time.timezone + 60*60*4
_setUTCOffset = staticmethod(_setUTCOffset) _setUTCOffset = staticmethod(_setUTCOffset)
def backup(modified, path): def backup(deck, path):
"""Path must not be unicode.""" """Path must not be unicode."""
from anki.db import sqlite
if not numBackups: if not numBackups:
return return
# check integrity # check integrity
con = sqlite.connect(path) if not deck.s.scalar("pragma integrity_check") == "ok":
if not con.execute("pragma integrity_check").fetchone() == ("ok",):
raise DeckAccessError(_("Deck is corrupt."), type="corrupt") raise DeckAccessError(_("Deck is corrupt."), type="corrupt")
con.close()
def escape(path): def escape(path):
path = os.path.abspath(path) path = os.path.abspath(path)
path = path.replace("\\", "!") path = path.replace("\\", "!")
@ -3361,7 +3358,7 @@ nextFactor, reps, thinkingTime, yesCount, noCount from reviewHistory""")
# check if last backup is the same # check if last backup is the same
if backups: if backups:
latest = os.path.join(backupDir, backups[-1][1]) latest = os.path.join(backupDir, backups[-1][1])
if int(modified) == int( if int(deck.modified) == int(
os.stat(latest)[stat.ST_MTIME]): os.stat(latest)[stat.ST_MTIME]):
return return
# get next num # get next num
@ -3374,7 +3371,7 @@ nextFactor, reps, thinkingTime, yesCount, noCount from reviewHistory""")
re.sub("\.anki$", ".backup-%s.anki" % n, escp))) re.sub("\.anki$", ".backup-%s.anki" % n, escp)))
shutil.copy2(path, newpath) shutil.copy2(path, newpath)
# set mtimes to be identical # set mtimes to be identical
os.utime(newpath, (modified, modified)) os.utime(newpath, (deck.modified, deck.modified))
# remove if over # remove if over
if len(backups) + 1 > numBackups: if len(backups) + 1 > numBackups:
delete = len(backups) + 1 - numBackups delete = len(backups) + 1 - numBackups