Macintosh-Tools
/
python-rsrcfork
mirror of https://github.com/dgelessus/python-rsrcfork.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rewrite Resource methods using stream API where appropriate

This commit is contained in:
dgelessus 2020-07-21 14:20:50 +02:00
parent 61247ec783
commit 664e992fa3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rsrcfork/api.py
View File

@ -130,10 +130,12 @@ class Resource(object):
def __repr__(self) -> str:
try:
data = self.data
with self.open() as f:
data = f.read(33)
except compress.DecompressError:
decompress_ok = False
data = self.data_raw
with self.open_raw() as f:
data = f.read(33)
else:
decompress_ok = True
@ -207,7 +209,8 @@ class Resource(object):
try:
return self._compressed_info
except AttributeError:
self._compressed_info = compress.common.CompressedHeaderInfo.parse(self.data_raw)
with self.open_raw() as f:
self._compressed_info = compress.common.CompressedHeaderInfo.parse_stream(f)
return self._compressed_info
else:
return None
@ -244,7 +247,9 @@ class Resource(object):
try:
return self._data_decompressed
except AttributeError:
self._data_decompressed = compress.decompress_parsed(self.compressed_info, self.data_raw[self.compressed_info.header_length:])
with self.open_raw() as f:
f.seek(self.compressed_info.header_length)
self._data_decompressed = b"".join(compress.decompress_stream_parsed(self.compressed_info, f))
return self._data_decompressed
else:
return self.data_raw