diff options
| author | Josh Ferrell <josh@vector35.com> | 2020-02-07 20:06:11 -0500 |
|---|---|---|
| committer | Josh Ferrell <josh@vector35.com> | 2020-03-31 13:29:35 -0400 |
| commit | 95b145165e424d69554d03d4ebcf4cc13d43ec88 (patch) | |
| tree | 18e40ebfbb940986d8bbc990281f317fc88f0091 /python | |
| parent | fa1de9cc465473fb00f0f47f91aba0a1792a60ee (diff) | |
Undobuffer merging and mergetool
Diffstat (limited to 'python')
| -rw-r--r-- | python/filemetadata.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/python/filemetadata.py b/python/filemetadata.py index 9e6e6fd1..ce88fdce 100644 --- a/python/filemetadata.py +++ b/python/filemetadata.py @@ -358,6 +358,11 @@ class FileMetadata(object): ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_ulonglong, ctypes.c_ulonglong)( lambda ctxt, cur, total: progress_func(cur, total)), clean) + def merge_database(self, path, progress_func = None): + return core.BNMergeUndo(self.handle, str(path), None, + ctypes.CFUNCTYPE(None, ctypes.c_void_p, ctypes.c_ulonglong, ctypes.c_ulonglong)( + lambda ctxt, cur, total: progress_func(cur, total))) + def get_view_of_type(self, name): view = core.BNGetFileViewOfType(self.handle, str(name)) if view is None: |