Use GrampsCursor as a context manager using "with" statement
svn: r12672
This commit is contained in:
Gerald Britton
@ -28,6 +28,7 @@
|
||||
# python modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
from __future__ import with_statement
|
||||
import os
|
||||
import sys
|
||||
import cStringIO
|
||||
@ -266,7 +267,7 @@ class CheckIntegrity(object):
|
||||
in self.db.name_formats if not act]
|
||||
|
||||
# remove the invalid references from all Name objects
|
||||
for person_handle in self.db.iter_person_handles():
|
||||
for person_handle in self.db.get_person_handles():
|
||||
person = self.db.get_person_from_handle(person_handle)
|
||||
|
||||
p_changed = False
|
||||
@ -310,7 +311,7 @@ class CheckIntegrity(object):
|
||||
self.progress.set_pass(_('Looking for duplicate spouses'),
|
||||
self.db.get_number_of_people())
|
||||
|
||||
for handle in self.db.iter_person_handles():
|
||||
for handle in self.db.person_map.keys():
|
||||
value = self.db.person_map[handle]
|
||||
p = gen.lib.Person(value)
|
||||
splist = p.get_family_handle_list()
|
||||
@ -327,8 +328,7 @@ class CheckIntegrity(object):
|
||||
def fix_encoding(self):
|
||||
self.progress.set_pass(_('Looking for character encoding errors'),
|
||||
self.db.get_number_of_media_objects())
|
||||
|
||||
for handle in self.db.iter_media_handles():
|
||||
for handle in self.db.media_map.keys():
|
||||
data = self.db.media_map[handle]
|
||||
if not isinstance(data[2], unicode) or not isinstance(data[4], unicode):
|
||||
obj = self.db.get_object_from_handle(handle)
|
||||
@ -351,10 +351,9 @@ class CheckIntegrity(object):
|
||||
def check_for_broken_family_links(self):
|
||||
# Check persons referenced by the family objects
|
||||
|
||||
fhandle_list = self.db.iter_family_handles()
|
||||
fhandle_list = self.db.get_family_handles()
|
||||
self.progress.set_pass(_('Looking for broken family links'),
|
||||
self.db.get_number_of_families()+
|
||||
self.db.get_number_of_people())
|
||||
len(fhandle_list) + self.db.get_number_of_people())
|
||||
|
||||
for family_handle in fhandle_list:
|
||||
family = self.db.get_family_from_handle(family_handle)
|
||||
@ -434,7 +433,7 @@ class CheckIntegrity(object):
|
||||
self.progress.step()
|
||||
|
||||
# Check persons membership in referenced families
|
||||
for person_handle in self.db.iter_person_handles():
|
||||
for person_handle in self.db.get_person_handles():
|
||||
person = self.db.get_person_from_handle(person_handle)
|
||||
|
||||
phandle_list = person.get_parent_family_handle_list()
|
||||
@ -479,38 +478,38 @@ class CheckIntegrity(object):
|
||||
def cleanup_missing_photos(self,cl=0):
|
||||
|
||||
self.progress.set_pass(_('Looking for unused objects'),
|
||||
self.db.get_number_of_media_objects())
|
||||
len(self.db.get_media_object_handles()))
|
||||
|
||||
missmedia_action = 0
|
||||
#-------------------------------------------------------------------------
|
||||
def remove_clicked():
|
||||
# File is lost => remove all references and the object itself
|
||||
|
||||
for handle in self.db.iter_person_handles():
|
||||
for handle in self.db.get_person_handles(sort_handles=False):
|
||||
person = self.db.get_person_from_handle(handle)
|
||||
if person.has_media_reference(ObjectId):
|
||||
person.remove_media_references([ObjectId])
|
||||
self.db.commit_person(person,self.trans)
|
||||
|
||||
for handle in self.db.iter_family_handles():
|
||||
for handle in self.db.get_family_handles():
|
||||
family = self.db.get_family_from_handle(handle)
|
||||
if family.has_media_reference(ObjectId):
|
||||
family.remove_media_references([ObjectId])
|
||||
self.db.commit_family(family,self.trans)
|
||||
|
||||
for handle in self.db.iter_event_handles():
|
||||
for handle in self.db.get_event_handles():
|
||||
event = self.db.get_event_from_handle(handle)
|
||||
if event.has_media_reference(ObjectId):
|
||||
event.remove_media_references([ObjectId])
|
||||
self.db.commit_event(event,self.trans)
|
||||
|
||||
for handle in self.db.iter_source_handles():
|
||||
for handle in self.db.get_source_handles():
|
||||
source = self.db.get_source_from_handle(handle)
|
||||
if source.has_media_reference(ObjectId):
|
||||
source.remove_media_references([ObjectId])
|
||||
self.db.commit_source(source,self.trans)
|
||||
|
||||
for handle in self.db.iter_place_handles():
|
||||
for handle in self.db.get_place_handles():
|
||||
place = self.db.get_place_from_handle(handle)
|
||||
if place.has_media_reference(ObjectId):
|
||||
place.remove_media_references([ObjectId])
|
||||
@ -550,7 +549,7 @@ class CheckIntegrity(object):
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
for ObjectId in self.db.iter_media_handles():
|
||||
for ObjectId in self.db.get_media_object_handles():
|
||||
obj = self.db.get_object_from_handle(ObjectId)
|
||||
photo_name = Utils.media_path_full(self.db, obj.get_path())
|
||||
if photo_name is not None and photo_name != "" and not Utils.find_file(photo_name):
|
||||
@ -663,23 +662,18 @@ class CheckIntegrity(object):
|
||||
'remove' : self.db.remove_note},
|
||||
}
|
||||
for the_type, the_func in tables.iteritems():
|
||||
cursor = the_func['cursor_func']()
|
||||
total = the_func['total_func']()
|
||||
check = the_func['check_func']
|
||||
remove_func = the_func['remove']
|
||||
|
||||
self.progress.set_pass(the_func['progress'],total)
|
||||
|
||||
item = cursor.first()
|
||||
while item:
|
||||
self.progress.step()
|
||||
(handle,data) = item
|
||||
if check(data):
|
||||
self.empty_objects[the_type].append(handle)
|
||||
#we cannot remove here as that would destroy cursor
|
||||
item = cursor.next()
|
||||
|
||||
cursor.close()
|
||||
with the_func['cursor_func']() as cursor:
|
||||
total = the_func['total_func']()
|
||||
check = the_func['check_func']
|
||||
remove_func = the_func['remove']
|
||||
|
||||
self.progress.set_pass(the_func['progress'],total)
|
||||
for handle, data in cursor:
|
||||
self.progress.step()
|
||||
if check(data):
|
||||
self.empty_objects[the_type].append(handle)
|
||||
#we cannot remove here as that would destroy cursor
|
||||
|
||||
#now remove
|
||||
for handle in self.empty_objects[the_type]:
|
||||
remove_func(handle, self.trans)
|
||||
@ -696,10 +690,10 @@ class CheckIntegrity(object):
|
||||
|
||||
def cleanup_empty_families(self,automatic):
|
||||
|
||||
fhandle_list = self.db.iter_family_handles()
|
||||
fhandle_list = self.db.get_family_handles()
|
||||
|
||||
self.progress.set_pass(_('Looking for empty families'),
|
||||
self.db.get_number_of_families())
|
||||
len(fhandle_list))
|
||||
for family_handle in fhandle_list:
|
||||
self.progress.step()
|
||||
|
||||
@ -714,7 +708,7 @@ class CheckIntegrity(object):
|
||||
self.delete_empty_family(family_handle)
|
||||
|
||||
def delete_empty_family(self,family_handle):
|
||||
for key in self.iter.get_person_handles():
|
||||
for key in self.db.get_person_handles(sort_handles=False):
|
||||
child = self.db.get_person_from_handle(key)
|
||||
child.remove_parent_family_handle(family_handle)
|
||||
child.remove_family_handle(family_handle)
|
||||
@ -724,9 +718,9 @@ class CheckIntegrity(object):
|
||||
"""Repair father=female or mother=male in hetero families
|
||||
"""
|
||||
|
||||
fhandle_list = self.db.iter_family_handles()
|
||||
fhandle_list = self.db.get_family_handles()
|
||||
self.progress.set_pass(_('Looking for broken parent relationships'),
|
||||
self.db.get_number_of_families())
|
||||
len(fhandle_list))
|
||||
|
||||
for family_handle in fhandle_list:
|
||||
self.progress.step()
|
||||
@ -760,7 +754,7 @@ class CheckIntegrity(object):
|
||||
self.db.get_number_of_people()
|
||||
+self.db.get_number_of_families())
|
||||
|
||||
for key in self.db.iter_person_handles():
|
||||
for key in self.db.get_person_handles(sort_handles=False):
|
||||
self.progress.step()
|
||||
|
||||
person = self.db.get_person_from_handle(key)
|
||||
@ -814,7 +808,7 @@ class CheckIntegrity(object):
|
||||
self.db.commit_person(person,self.trans)
|
||||
self.invalid_events.append(key)
|
||||
|
||||
for key in self.db.iter_family_handles():
|
||||
for key in self.db.get_family_handles():
|
||||
self.progress.step()
|
||||
family = self.db.get_family_from_handle(key)
|
||||
if family.get_event_ref_list():
|
||||
@ -837,10 +831,10 @@ class CheckIntegrity(object):
|
||||
self.invalid_events.append(key)
|
||||
|
||||
def check_person_references(self):
|
||||
plist = self.db.iter_person_handles()
|
||||
plist = self.db.get_person_handles()
|
||||
|
||||
self.progress.set_pass(_('Looking for person reference problems'),
|
||||
self.db.get_number_of_people())
|
||||
len(plist))
|
||||
|
||||
for key in plist:
|
||||
person = self.db.get_person_from_handle(key)
|
||||
@ -857,9 +851,9 @@ class CheckIntegrity(object):
|
||||
Fix issues in 3.1.0 upgrade: missed some dates on associated people
|
||||
source dates.
|
||||
"""
|
||||
plist = self.db.iter_person_handles()
|
||||
plist = self.db.get_person_handles()
|
||||
self.progress.set_pass(_('Checking people for proper date formats'),
|
||||
self.db.get_number_of_people())
|
||||
len(plist))
|
||||
# First, decode all of a person:
|
||||
for handle in plist:
|
||||
need_to_fix = False
|
||||
@ -948,9 +942,9 @@ class CheckIntegrity(object):
|
||||
self.invalid_dates.append(handle)
|
||||
self.progress.step()
|
||||
|
||||
flist = self.db.iter_family_handles()
|
||||
flist = self.db.get_family_handles()
|
||||
self.progress.set_pass(_('Checking families for proper date formats'),
|
||||
self.db.get_number_of_families())
|
||||
len(flist))
|
||||
# First, decode all of a person:
|
||||
for handle in flist:
|
||||
need_to_fix = False
|
||||
@ -1004,10 +998,10 @@ class CheckIntegrity(object):
|
||||
self.progress.step()
|
||||
|
||||
def check_repo_references(self):
|
||||
slist = self.db.iter_source_handles()
|
||||
slist = self.db.get_source_handles()
|
||||
|
||||
self.progress.set_pass(_('Looking for repository reference problems'),
|
||||
self.db.get_number_of_sources)
|
||||
len(slist))
|
||||
|
||||
for key in slist:
|
||||
source = self.db.get_source_from_handle(key)
|
||||
@ -1020,13 +1014,11 @@ class CheckIntegrity(object):
|
||||
self.invalid_repo_references.append(key)
|
||||
|
||||
def check_place_references(self):
|
||||
plist = self.db.iter_person_handles()
|
||||
flist = self.db.iter_family_handles()
|
||||
elist = self.db.iter_event_handles()
|
||||
plist = self.db.get_person_handles()
|
||||
flist = self.db.get_family_handles()
|
||||
elist = self.db.get_event_handles()
|
||||
self.progress.set_pass(_('Looking for place reference problems'),
|
||||
self.db.get_number_of_people()+
|
||||
self.db.get_number_of_events()+
|
||||
self.db.get_number_of_families())
|
||||
len(elist)+len(plist)+len(flist))
|
||||
# check persons -> the LdsOrd references a place
|
||||
for key in plist:
|
||||
person = self.db.get_person_from_handle(key)
|
||||
@ -1079,7 +1071,7 @@ class CheckIntegrity(object):
|
||||
self.progress.set_pass(_('Looking for source reference problems'),
|
||||
total)
|
||||
|
||||
for handle in self.db.iter_person_handles():
|
||||
for handle in self.db.person_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.person_map[handle]
|
||||
person = gen.lib.Person()
|
||||
@ -1095,7 +1087,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_source_references]
|
||||
self.invalid_source_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_family_handles():
|
||||
for handle in self.db.family_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.family_map[handle]
|
||||
family = gen.lib.Family()
|
||||
@ -1111,7 +1103,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_source_references]
|
||||
self.invalid_source_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_place_handles():
|
||||
for handle in self.db.place_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.place_map[handle]
|
||||
place = gen.lib.Place()
|
||||
@ -1127,7 +1119,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_source_references]
|
||||
self.invalid_source_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_repository_handles():
|
||||
for handle in self.db.repository_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.repository_map[handle]
|
||||
repo = gen.lib.Repository()
|
||||
@ -1160,7 +1152,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_source_references]
|
||||
self.invalid_source_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_media_handles():
|
||||
for handle in self.db.media_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.media_map[handle]
|
||||
obj = gen.lib.MediaObject()
|
||||
@ -1176,7 +1168,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_source_references]
|
||||
self.invalid_source_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_event_handles():
|
||||
for handle in self.db.event_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.event_map[handle]
|
||||
event = gen.lib.Event()
|
||||
@ -1206,7 +1198,7 @@ class CheckIntegrity(object):
|
||||
self.progress.set_pass(_('Looking for media object reference problems'),
|
||||
total)
|
||||
|
||||
for handle in self.db.iter_person_handles():
|
||||
for handle in self.db.person_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.person_map[handle]
|
||||
person = gen.lib.Person()
|
||||
@ -1222,7 +1214,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_media_references]
|
||||
self.invalid_media_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_family_handles():
|
||||
for handle in self.db.family_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.family_map[handle]
|
||||
family = gen.lib.Family()
|
||||
@ -1238,7 +1230,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_media_references]
|
||||
self.invalid_media_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_place_handles():
|
||||
for handle in self.db.place_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.place_map[handle]
|
||||
place = gen.lib.Place()
|
||||
@ -1254,7 +1246,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_media_references]
|
||||
self.invalid_media_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_event_handles():
|
||||
for handle in self.db.event_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.event_map[handle]
|
||||
event = gen.lib.Event()
|
||||
@ -1270,7 +1262,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_media_references]
|
||||
self.invalid_media_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_source_handles():
|
||||
for handle in self.db.source_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.source_map[handle]
|
||||
source = gen.lib.Source()
|
||||
@ -1302,7 +1294,7 @@ class CheckIntegrity(object):
|
||||
self.progress.set_pass(_('Looking for note reference problems'),
|
||||
total)
|
||||
|
||||
for handle in self.db.iter_person_handles():
|
||||
for handle in self.db.person_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.person_map[handle]
|
||||
person = gen.lib.Person()
|
||||
@ -1319,7 +1311,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_note_references]
|
||||
self.invalid_note_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_family_handles():
|
||||
for handle in self.db.family_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.family_map[handle]
|
||||
family = gen.lib.Family()
|
||||
@ -1336,7 +1328,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_note_references]
|
||||
self.invalid_note_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_place_handles():
|
||||
for handle in self.db.place_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.place_map[handle]
|
||||
place = gen.lib.Place()
|
||||
@ -1353,7 +1345,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_note_references]
|
||||
self.invalid_note_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_source_handles():
|
||||
for handle in self.db.source_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.source_map[handle]
|
||||
source = gen.lib.Source()
|
||||
@ -1370,7 +1362,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_note_references]
|
||||
self.invalid_note_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_media_handles():
|
||||
for handle in self.db.media_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.media_map[handle]
|
||||
obj = gen.lib.MediaObject()
|
||||
@ -1387,7 +1379,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_note_references]
|
||||
self.invalid_note_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_event_handles():
|
||||
for handle in self.db.event_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.event_map[handle]
|
||||
event = gen.lib.Event()
|
||||
@ -1404,7 +1396,7 @@ class CheckIntegrity(object):
|
||||
not in self.invalid_note_references]
|
||||
self.invalid_note_references += new_bad_handles
|
||||
|
||||
for handle in self.db.iter_repository_handles():
|
||||
for handle in self.db.repository_map.keys():
|
||||
self.progress.step()
|
||||
info = self.db.repository_map[handle]
|
||||
repo = gen.lib.Repository()
|
||||
|
||||
Reference in New Issue
Block a user