3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-06 10:18:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

[core] Graph: Support loading files with previous UID system

Browse source 
The file version is updated and support for files with an older version
is added: upon detecting that the file version is old, the old UID
keys will be detected and reformatted with new ones so the file can
be properly loaded.
This commit is contained in:
Candice Bentéjac 2024-09-05 16:55:10 +02:00
parent 9973298746
commit b726387534
1 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
meshroom/core/graph.py
View file

@ -166,7 +166,7 @@ class Graph(BaseObject):
class IO(object): class IO(object):
""" Centralize Graph file keys and IO version. """ """ Centralize Graph file keys and IO version. """
__version__ = "1.1" __version__ = "2.0"
class Keys(object): class Keys(object):
""" File Keys. """ """ File Keys. """
@ -204,8 +204,10 @@ class Graph(BaseObject):
Graph.IO.Features.NodesVersions, Graph.IO.Features.NodesVersions,
Graph.IO.Features.PrecomputedOutputs, Graph.IO.Features.PrecomputedOutputs,
] ]
if fileVersion >= Version("1.1"): if fileVersion >= Version("1.1"):
features += [Graph.IO.Features.NodesPositions] features += [Graph.IO.Features.NodesPositions]
return tuple(features) return tuple(features)
def __init__(self, name, parent=None): def __init__(self, name, parent=None):
@ -260,7 +262,27 @@ class Graph(BaseObject):
with open(filepath) as jsonFile: with open(filepath) as jsonFile:
fileData = json.load(jsonFile) fileData = json.load(jsonFile)
# older versions of Meshroom files only contained the serialized nodes self.header = fileData.get(Graph.IO.Keys.Header, {})
fileVersion = self.header.get(Graph.IO.Keys.FileVersion, "0.0")
# Retro-compatibility for all project files with the previous UID format
if Version(fileVersion) < Version("2.0"):
# For internal folders, all "{uid0}" keys should be replaced with "{uid}"
updatedFileData = json.dumps(fileData).replace("{uid0}", "{uid}")
# For fileVersion < 2.0, the nodes' UID is stored as:
# "uids": {"0": "hashvalue"}
# These should be identified and replaced with:
# "uid": "hashvalue"
uidPattern = re.compile(r'"uids": \{"0":.*?\}')
uidOccurrences = uidPattern.findall(updatedFileData)
for occ in uidOccurrences:
uid = occ.split("\"")[-2] # UID is second to last element
newUidStr = r'"uid": "{}"'.format(uid)
updatedFileData = updatedFileData.replace(occ, newUidStr)
fileData = json.loads(updatedFileData)
# Older versions of Meshroom files only contained the serialized nodes
graphData = fileData.get(Graph.IO.Keys.Graph, fileData) graphData = fileData.get(Graph.IO.Keys.Graph, fileData)
if importProject: if importProject:
@ -270,12 +292,11 @@ class Graph(BaseObject):
if not isinstance(graphData, dict): if not isinstance(graphData, dict):
raise RuntimeError('loadGraph error: Graph is not a dict. File: {}'.format(filepath)) raise RuntimeError('loadGraph error: Graph is not a dict. File: {}'.format(filepath))
self._fileDateVersion = os.path.getmtime(filepath)
self.header = fileData.get(Graph.IO.Keys.Header, {})
nodesVersions = self.header.get(Graph.IO.Keys.NodesVersions, {}) nodesVersions = self.header.get(Graph.IO.Keys.NodesVersions, {})
# check whether the file was saved as a template in minimal mode self._fileDateVersion = os.path.getmtime(filepath)
# Check whether the file was saved as a template in minimal mode
isTemplate = self.header.get("template", False) isTemplate = self.header.get("template", False)
with GraphModification(self): with GraphModification(self):