Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Initial code for finding differences

Browse Source 
svn: r19987
This commit is contained in:
Doug Blank 2012-07-11 14:49:24 +00:00
parent c59fe9fd71
commit fdeac38c04
1 changed files with 174 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

174
src/gen/merge/diff.py Normal file
View File

@ -0,0 +1,174 @@
#
# Gramps - a GTK+/GNOME based genealogy program
#
# Copyright (C) 2012 Doug Blank <doug.blank@gmail.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# $Id: $
"""
This package implements an object difference engine.
"""
import os
import cli.user
from gen.dbstate import DbState
from cli.grampscli import CLIManager
from gen.plug import BasePluginManager
from gen.db.dictionary import DictionaryDb
def import_as_dict(filename):
"""
Import the filename into a DictionaryDb and return it.
"""
user = cli.user.User()
db = DictionaryDb()
dbstate = DbState()
climanager = CLIManager(dbstate, False) # do not load db_loader
climanager.do_reg_plugins(dbstate, None)
pmgr = BasePluginManager.get_instance()
(name, ext) = os.path.splitext(os.path.basename(filename))
format = ext[1:].lower()
import_list = pmgr.get_reg_importers()
for pdata in import_list:
if format == pdata.extension:
mod = pmgr.load_plugin(pdata)
if not mod:
for item in pmgr.get_fail_list():
name, error_tuple, pdata = item
# (filename, (exception-type, exception, traceback), pdata)
etype, exception, traceback = error_tuple
print "ERROR:", name, exception
return False
retval = import_function = getattr(mod, pdata.import_function)
import_function(db, filename, user)
return db
return None
def diff_dates(json1, json2):
"""
Compare two json date objects. Returns True if different.
"""
if json1 == json2:
return False
elif isinstance(json1, dict) and isinstance(json2, dict):
if json1["dateval"] == json2["dateval"] and json2["dateval"] != 0:
return False
elif json1["text"] == json2["text"]:
return False
else:
return True
else:
return True
def diff_items(path, json1, json2):
"""
Compare two json objects. Returns True if different.
"""
if json1 == json2:
return False
elif isinstance(json1, dict) and isinstance(json2, dict):
retval = False
for key in json1.keys():
if key == "change":
continue # don't care about time differences, only data changes
elif key == "date":
result = diff_dates(json1["date"], json2["date"])
if result:
retval = result
else:
value1 = json1[key]
value2 = json2[key]
if isinstance(value1, dict) and isinstance(value2, dict):
retval = diff_items(path + "/" + key, value1, value2)
elif isinstance(value1, list) and isinstance(value2, list):
pos = 0
for v1, v2 in zip(value1, value2):
result = diff_items(path + "/" + key + "/" + str(pos),
v1, v2)
if result:
retval = True
pos += 1
elif value1 != value2:
print "different parts", path + "/" + key
print " old:", value1
print " new:", value2
retval = True
return retval
else:
print "different values", path
print " old:", json1
print " new:", json2
return True
def diff_dbs(db1, db2):
"""
1. new objects => mark for insert
2. deleted objects, no change locally after delete date => mark
for deletion
3. deleted objects, change locally => mark for user confirm for
deletion
4. updated objects => do a diff on differences, mark origin
values as new data
"""
missing_from_old = []
missing_from_new = []
diffs = []
for item in ['Person', 'Family', 'Source', 'Citation', 'Event', 'Media',
'Place', 'Repository', 'Note', 'Tag']:
handles1 = sorted(db1._tables[item]["handles_func"]())
handles2 = sorted(db2._tables[item]["handles_func"]())
p1 = 0
p2 = 0
while p1 < len(handles1) and p2 < len(handles2):
if handles1[p1] == handles2[p2]: # in both
item1 = db1._tables[item]["handle_func"](handles1[p1])
item2 = db2._tables[item]["handle_func"](handles2[p2])
diff = diff_items(item, item1.to_json(), item2.to_json())
if diff:
diffs += [(item1, item2)]
# else same!
p1 += 1
p2 += 1
elif handles1[p1] < handles2[p2]: # p1 is mssing in p2
item1 = db1._tables[item]["handle_func"](handles1[p1])
missing_from_new += [(item, item1)]
p1 += 1
elif handles1[p1] > handles2[p2]: # p2 is mssing in p1
item2 = db2._tables[item]["handle_func"](handles2[p2])
missing_from_old += [(item, item2)]
p2 += 1
while p1 < len(handles1):
item1 = db1._tables[item]["handle_func"](handles1[p1])
missing_from_new += [(item, item1)]
p1 += 1
while p2 < len(handles2):
item2 = db2._tables[item]["handle_func"](handles2[p2])
missing_from_old += [(item, item2)]
p2 += 1
return diffs, missing_from_old, missing_from_new
def diff_db_to_file(old_db, filename):
# First, get data as a DictionaryDb
new_db = import_as_dict(filename)
# Next get differences:
diffs, m_old, m_new = diff_dbs(old_db, new_db)
return diffs, m_old, m_new
def diff(db):
diffs, m_old, m_new = diff_db_to_file(db, '/home/dblank/Ubuntu One/blank-no-chenoweths.gramps')
return diffs, m_old, m_new