Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-06-25 18:29:29 +00:00
Code Issues Projects Releases Wiki Activity

Moved the reconstruct_missing checks into __setstate__

Browse Source
This commit is contained in:
Rob McMullen 2017-03-28 16:11:26 -07:00
parent c28a3426f9
commit b6a81a10b2
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
atrcopy/segments.py
View File

@ -401,6 +401,16 @@ class DefaultSegment(object):
self.rawdata.replace_arrays(container.rawdata) self.rawdata.replace_arrays(container.rawdata)
def __getstate__(self): def __getstate__(self):
"""Custom jsonpickle state save routine
This routine culls down the list of attributes that should be
serialized, and in some cases changes their format slightly so they
have a better mapping to json objects. For instance, json can't handle
dicts with integer keys, so dicts are turned into lists of lists.
Tuples are also turned into lists because tuples don't have a direct
representation in json, while lists have a compact representation in
json.
"""
state = dict() state = dict()
for key in ['start_addr', 'error', 'name', 'verbose_name', 'page_size', 'map_width', 'uuid', 'can_resize']: for key in ['start_addr', 'error', 'name', 'verbose_name', 'page_size', 'map_width', 'uuid', 'can_resize']:
state[key] = getattr(self, key) state[key] = getattr(self, key)
@ -414,23 +424,24 @@ class DefaultSegment(object):
return state return state
def __setstate__(self, state): def __setstate__(self, state):
self.memory_map = dict(state.pop('memory_map', [])) """Custom jsonpickle state restore routine
self.__dict__.update(state)
def reconstruct_missing(self):
"""Any instance attributes set in __init__, but added after some save
files exist in the wild should be checked for and given default values
if not present.
The use of jsonpickle to recreate objects doesn't go through __init__, The use of jsonpickle to recreate objects doesn't go through __init__,
so newer attributes won't exist. so there will be missing attributes when restoring old versions of the
json. Once a version gets out in the wild and additional attributes are
added to a segment, a default value should be applied here.
""" """
if not hasattr(self, 'uuid'): self.memory_map = dict(state.pop('memory_map', []))
self.uuid = str(uuid.uuid4()) self.uuid = state.pop('uuid', uuid.uuid4())
if not hasattr(self, 'can_resize'): self.can_resize = state.pop('can_resize', self.__class__.can_resize_default)
self.can_resize = self.__class__.can_resize_default self.__dict__.update(state)
def reconstruct_raw(self, rawdata): def reconstruct_raw(self, rawdata):
"""Reconstruct the pointers to the parent data arrays
Each segment is a view into the primary segment's data, so those
pointers and the order must be restored in the child segments.
"""
start, end = self._rawdata_bounds start, end = self._rawdata_bounds
r = rawdata[start:end] r = rawdata[start:end]
delattr(self, '_rawdata_bounds') delattr(self, '_rawdata_bounds')
@ -442,7 +453,6 @@ class DefaultSegment(object):
except AttributeError: except AttributeError:
pass pass
self.set_raw(r) self.set_raw(r)
self.reconstruct_missing()
def get_parallel_raw_data(self, other): def get_parallel_raw_data(self, other):
""" Get the raw data that is similar to the specified other segment """ Get the raw data that is similar to the specified other segment