GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-18 22:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

import .colpkg in a background thread

Browse source
This commit is contained in:
Damien Elmes 2020-03-06 14:55:15 +10:00
parent ad9dad8748
commit 8d429cd192
1 changed files with 47 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
qt/aqt/importing.py
View file

@ -473,10 +473,11 @@ def replaceWithApkg(mw, file, backup):
mw.unloadCollection(lambda: _replaceWithApkg(mw, file, backup))
def _replaceWithApkg(mw, file, backup):
def _replaceWithApkg(mw, filename, backup):
mw.progress.start(immediate=True)
z = zipfile.ZipFile(file)
def do_import():
z = zipfile.ZipFile(filename)
# v2 scheduler?
colname = "collection.anki21"
@ -485,23 +486,18 @@ def _replaceWithApkg(mw, file, backup):
except KeyError:
colname = "collection.anki2"
try:
with z.open(colname) as source, open(mw.pm.collectionPath(), "wb") as target:
shutil.copyfileobj(source, target)
except:
mw.progress.finish()
showWarning(_("The provided file is not a valid .apkg file."))
return
# because users don't have a backup of media, it's safer to import new
# data and rely on them running a media db check to get rid of any
# unwanted media. in the future we might also want to deduplicate this
# step
d = os.path.join(mw.pm.profileFolder(), "collection.media")
for n, (cStr, file) in enumerate(
json.loads(z.read("media").decode("utf8")).items()
):
mw.progress.update(
ngettext("Processed %d media file", "Processed %d media files", n) % n
mw.taskman.run_on_main(
lambda n=n: mw.progress.update(
ngettext("Processed %d media file", "Processed %d media files", n)
% n
)
)
size = z.getinfo(cStr).file_size
dest = os.path.join(d, unicodedata.normalize("NFC", file))
@ -510,11 +506,24 @@ def _replaceWithApkg(mw, file, backup):
continue
data = z.read(cStr)
open(dest, "wb").write(data)
z.close()
# reload
if not mw.loadCollection():
def on_done(future: Future):
mw.progress.finish()
try:
future.result()
except Exception as e:
print(e)
showWarning(_("The provided file is not a valid .apkg file."))
return
if not mw.loadCollection():
return
if backup:
mw.col.modSchema(check=False)
mw.progress.finish()
tooltip(_("Importing complete."))
mw.taskman.run_in_background(do_import, on_done)