fix import of media

This commit is contained in:
Damien Elmes 2016-07-11 14:56:58 +10:00
parent cc742df71a
commit 44457e78d2

View file

@ -391,7 +391,8 @@ def replaceWithApkg(mw, file, backup):
# unwanted media. in the future we might also want to deduplicate this # unwanted media. in the future we might also want to deduplicate this
# step # step
d = os.path.join(mw.pm.profileFolder(), "collection.media") d = os.path.join(mw.pm.profileFolder(), "collection.media")
for n, (cStr, file) in enumerate(json.loads(z.read("media")).items()): for n, (cStr, file) in enumerate(
json.loads(z.read("media").decode("utf8")).items()):
mw.progress.update(ngettext("Processed %d media file", mw.progress.update(ngettext("Processed %d media file",
"Processed %d media files", n) % n) "Processed %d media files", n) % n)
size = z.getinfo(cStr).file_size size = z.getinfo(cStr).file_size