Mirroring/rmapy
1
0
Fork 0
mirror of https://github.com/subutux/rmapy.git synced 2025-12-08 22:53:25 +00:00
Code Issues Projects Releases Wiki Activity

Ignore missing files when used with Remarkable 2 (#14)

Browse Source 
* Ignore missing thumbnails during dump

* Ignore missing metadata file during load
This commit is contained in:
Reece Mathews
2021-03-21 05:05:31 -05:00
committed by GitHub
parent b5f0367dbb
commit 544bd11dd1
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rmapy/document.py
View File

@@ -261,8 +261,12 @@ class ZipDocument(object):
zf.writestr(f"{self.ID}/{page.order}-metadata.json", zf.writestr(f"{self.ID}/{page.order}-metadata.json",
json.dumps(page.metadata)) json.dumps(page.metadata))
page.page.seek(0) page.page.seek(0)
zf.writestr(f"{self.ID}.thumbnails/{page.order}.jpg", try:
page.thumbnail.read()) zf.writestr(f"{self.ID}.thumbnails/{page.order}.jpg",
page.thumbnail.read())
except AttributeError:
log.debug(f"missing thumbnail during dump: {self.ID}: {page.order}")
pass
if isinstance(file, BytesIO): if isinstance(file, BytesIO):
file.seek(0) file.seek(0)
@@ -321,9 +325,14 @@ class ZipDocument(object):
with zf.open(p, 'r') as rm: with zf.open(p, 'r') as rm:
page = BytesIO(rm.read()) page = BytesIO(rm.read())
page.seek(0) page.seek(0)
with zf.open(p.replace(".rm", "-metadata.json"), 'r') as md:
metadata = json.load(md)
p_meta = p.replace(".rm", "-metadata.json")
try:
with zf.open(p_meta, 'r') as md:
metadata = json.load(md)
except KeyError:
log.debug(f"missing metadata: {p_meta}")
metadata = None
thumbnail_name = p.replace(".rm", ".jpg") thumbnail_name = p.replace(".rm", ".jpg")
thumbnail_name = thumbnail_name.replace("/", ".thumbnails/") thumbnail_name = thumbnail_name.replace("/", ".thumbnails/")
try: try: