mirror of
https://github.com/ankitects/anki.git
synced 2025-09-19 14:32:22 -04:00
make sure to close temp file fds, add full sync to sync()
This commit is contained in:
parent
dd9ba0e833
commit
f5facee398
1 changed files with 8 additions and 3 deletions
|
@ -68,6 +68,9 @@ class SyncTools(object):
|
||||||
if not self.prepareSync():
|
if not self.prepareSync():
|
||||||
return
|
return
|
||||||
sums = self.summaries()
|
sums = self.summaries()
|
||||||
|
if self.needFullSync(sums):
|
||||||
|
self.fullSync()
|
||||||
|
else:
|
||||||
payload = self.genPayload(sums)
|
payload = self.genPayload(sums)
|
||||||
res = self.server.applyPayload(payload)
|
res = self.server.applyPayload(payload)
|
||||||
self.applyPayloadReply(res)
|
self.applyPayloadReply(res)
|
||||||
|
@ -989,6 +992,7 @@ and cards.id in %s""" % ids2str([c[0] for c in cards])))
|
||||||
# wait for reply
|
# wait for reply
|
||||||
dst.close()
|
dst.close()
|
||||||
tmp.close()
|
tmp.close()
|
||||||
|
os.close(fd)
|
||||||
errcode, errmsg, headers = h.getreply()
|
errcode, errmsg, headers = h.getreply()
|
||||||
assert errcode == 200
|
assert errcode == 200
|
||||||
finally:
|
finally:
|
||||||
|
@ -1014,6 +1018,7 @@ and cards.id in %s""" % ids2str([c[0] for c in cards])))
|
||||||
runHook("fullSyncProgress", "fromServer", cnt)
|
runHook("fullSyncProgress", "fromServer", cnt)
|
||||||
src.close()
|
src.close()
|
||||||
tmp.close()
|
tmp.close()
|
||||||
|
os.close(fd)
|
||||||
# if we were successful, overwrite old deck
|
# if we were successful, overwrite old deck
|
||||||
os.unlink(path)
|
os.unlink(path)
|
||||||
os.rename(tmpname, path)
|
os.rename(tmpname, path)
|
||||||
|
|
Loading…
Reference in a new issue