beckermj/gramps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed get_object_from to get_media_from

Browse Source
This commit is contained in:
Doug Blank 2016-01-23 19:00:13 -05:00
parent 885bab26ef
commit 2eeda93617
68 changed files with 148 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gramps/cli/plug/__init__.py
View File

@ -393,7 +393,7 @@ class CommandLineReport(object):
elif isinstance(option, MediaOption):
id_list = []
for mhandle in self.database.get_media_object_handles():
mobject = self.database.get_object_from_handle(mhandle)
mobject = self.database.get_media_from_handle(mhandle)
id_list.append(mobject.get_gramps_id())
self.options_help[name].append(id_list)
elif isinstance(option, PersonListOption):

4
gramps/gen/db/base.py
View File

@ -503,7 +503,7 @@ class DbReadBase(object):
"""
raise NotImplementedError
def get_object_from_gramps_id(self, val):
def get_media_from_gramps_id(self, val):
"""
Find a Media in the database from the passed Gramps ID.
@ -512,7 +512,7 @@ class DbReadBase(object):
"""
raise NotImplementedError
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
"""
Find an Object in the database from the passed Gramps ID.

8
gramps/gen/db/generic.py
View File

@ -525,8 +525,8 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
})
self._tables['Media'].update(
{
"handle_func": self.get_object_from_handle,
"gramps_id_func": self.get_object_from_gramps_id,
"handle_func": self.get_media_from_handle,
"gramps_id_func": self.get_media_from_gramps_id,
"class_func": Media,
"cursor_func": self.get_media_cursor,
"handles_func": self.get_media_object_handles,
@ -1123,12 +1123,12 @@ class DbGeneric(DbWriteBase, DbReadBase, UpdateCallback, Callback):
handle = str(handle, "utf-8")
return Note.create(self._get_raw_note_data(handle))
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
if isinstance(handle, bytes):
handle = str(handle, "utf-8")
return Media.create(self._get_raw_media_data(handle))
def get_object_from_gramps_id(self, gramps_id):
def get_media_from_gramps_id(self, gramps_id):
return Media.create(self.media_id_map[gramps_id])
def get_tag_from_handle(self, handle):

2
gramps/gen/filters/_genericfilter.py
View File

@ -331,7 +331,7 @@ class GenericMediaFilter(GenericFilter):
return Media()
def find_from_handle(self, db, handle):
return db.get_object_from_handle(handle)
return db.get_media_from_handle(handle)
class GenericRepoFilter(GenericFilter):

2
gramps/gen/filters/rules/person/_hastextmatchingsubstringof.py
View File

@ -156,7 +156,7 @@ class HasTextMatchingSubstringOf(Rule):
return False
# search inside the media object and cache the result
if media_handle not in self.media_map:
media = self.db.get_object_from_handle(media_handle)
media = self.db.get_media_from_handle(media_handle)
if self.match_object(media):
self.media_map.add(media_handle)
return media_handle in self.media_map

6
gramps/gen/lib/struct.py
View File

@ -211,7 +211,7 @@ class Struct(object):
current = getattr(current, item)
return current
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
return self.db.get_from_name_and_handle(handle.classname, str(handle))
def handle_join(self, item):
@ -219,7 +219,7 @@ class Struct(object):
If the item is a handle, look up reference object.
"""
if isinstance(item, HandleClass) and self.db:
obj = self.get_object_from_handle(item)
obj = self.get_media_from_handle(item)
if obj:
return Struct(obj.to_struct(), self.db)
else:
@ -263,7 +263,7 @@ class Struct(object):
if struct is None: # invalid part to set, skip
return
if isinstance(struct, HandleClass):
struct = self.get_object_from_handle(struct).to_struct()
struct = self.get_media_from_handle(struct).to_struct()
# keep track of primary object for update, below
if isinstance(struct, dict) and "_class" in struct and self.primary_object_q(struct["_class"]):
primary_obj = struct

2
gramps/gen/merge/mergecitationquery.py
View File

@ -83,7 +83,7 @@ class MergeCitationQuery(object):
place.replace_citation_references(old_handle, new_handle)
self.database.commit_place(place, trans)
elif class_name == Media.__name__:
obj = self.database.get_object_from_handle(handle)
obj = self.database.get_media_from_handle(handle)
assert(obj.has_citation_reference(old_handle))
obj.replace_citation_references(old_handle, new_handle)
self.database.commit_media_object(obj, trans)

2
gramps/gen/merge/mergenotequery.py
View File

@ -90,7 +90,7 @@ class MergeNoteQuery(object):
place.replace_note_references(old_handle, new_handle)
self.database.commit_place(place, trans)
elif class_name == Media.__name__:
obj = self.database.get_object_from_handle(handle)
obj = self.database.get_media_from_handle(handle)
assert(obj.has_note_reference(old_handle))
obj.replace_note_references(old_handle, new_handle)
self.database.commit_media_object(obj, trans)

2
gramps/gen/plug/report/utils.py
View File

@ -143,7 +143,7 @@ def insert_image(database, doc, photo, user,
"""
object_handle = photo.get_reference_handle()
media_object = database.get_object_from_handle(object_handle)
media_object = database.get_media_from_handle(object_handle)
mime_type = media_object.get_mime_type()
if mime_type and mime_type.startswith("image"):
filename = media_path_full(database, media_object.get_path())

10
gramps/gen/proxy/filter.py
View File

@ -158,12 +158,12 @@ class FilterProxyDb(ProxyDbBase):
self.sanitize_notebase(citation)
return citation
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
"""
Finds a Media in the database from the passed Gramps handle.
If no such Object exists, None is returned.
"""
media = self.db.get_object_from_handle(handle)
media = self.db.get_media_from_handle(handle)
if media:
# Filter notes out
@ -350,14 +350,14 @@ class FilterProxyDb(ProxyDbBase):
else:
return None
def get_object_from_gramps_id(self, val):
def get_media_from_gramps_id(self, val):
"""
Finds a Media in the database from the passed Gramps ID.
If no such Media exists, None is returned.
"""
media = self.db.get_object_from_gramps_id(val)
media = self.db.get_media_from_gramps_id(val)
if media:
return self.get_object_from_handle(media.get_handle())
return self.get_media_from_handle(media.get_handle())
else:
return None

14
gramps/gen/proxy/private.py
View File

@ -87,12 +87,12 @@ class PrivateProxyDb(ProxyDbBase):
return sanitize_citation(self.db, citation)
return None
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
"""
Finds an Object in the database from the passed Gramps ID.
If no such Object exists, None is returned.
"""
media = self.db.get_object_from_handle(handle)
media = self.db.get_media_from_handle(handle)
if media and not media.get_privacy():
return sanitize_media(self.db, media)
return None
@ -207,12 +207,12 @@ class PrivateProxyDb(ProxyDbBase):
return sanitize_citation(self.db, citation)
return None
def get_object_from_gramps_id(self, val):
def get_media_from_gramps_id(self, val):
"""
Finds a Media in the database from the passed Gramps ID.
If no such Media exists, None is returned.
"""
obj = self.db.get_object_from_gramps_id(val)
obj = self.db.get_media_from_gramps_id(val)
if obj and not obj.get_privacy():
return sanitize_media(self.db, obj)
return None
@ -376,7 +376,7 @@ class PrivateProxyDb(ProxyDbBase):
"""
Return True if the handle exists in the current Mediadatabase.
"""
object = self.db.get_object_from_handle(handle)
object = self.db.get_media_from_handle(handle)
if object and not object.get_privacy():
return True
return False
@ -432,7 +432,7 @@ class PrivateProxyDb(ProxyDbBase):
'Source' : self.db.get_source_from_handle,
'Citation' : self.db.get_citation_from_handle,
'Place' : self.db.get_place_from_handle,
'Media' : self.db.get_object_from_handle,
'Media' : self.db.get_media_from_handle,
'Note' : self.db.get_note_from_handle,
'Repository' : self.db.get_repository_from_handle,
}
@ -463,7 +463,7 @@ def copy_media_ref_list(db, original_obj, clean_obj):
for media_ref in original_obj.get_media_list():
if media_ref and not media_ref.get_privacy():
handle = media_ref.get_reference_handle()
media_object = db.get_object_from_handle(handle)
media_object = db.get_media_from_handle(handle)
if media_object and not media_object.get_privacy():
clean_obj.add_media_reference(sanitize_media_ref(db, media_ref))

12
gramps/gen/proxy/proxybase.py
View File

@ -523,13 +523,13 @@ class ProxyDbBase(DbReadBase):
return self.gfilter(self.include_place,
self.db.get_place_from_handle(handle))
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
"""
Finds an Object in the database from the passed gramps handle.
If no such Object exists, None is returned.
"""
return self.gfilter(self.include_media_object,
self.db.get_object_from_handle(handle))
self.db.get_media_from_handle(handle))
def get_repository_from_handle(self, handle):
"""
@ -603,13 +603,13 @@ class ProxyDbBase(DbReadBase):
return self.gfilter(self.include_citation,
self.db.get_citation_from_gramps_id(val))
def get_object_from_gramps_id(self, val):
def get_media_from_gramps_id(self, val):
"""
Finds a Media in the database from the passed gramps' ID.
If no such Media exists, None is returned.
"""
return self.gfilter(self.include_media_object,
self.db.get_object_from_gramps_id(val))
self.db.get_media_from_gramps_id(val))
def get_repository_from_gramps_id(self, val):
"""
@ -806,7 +806,7 @@ class ProxyDbBase(DbReadBase):
return self.get_family_from_handle(handle).serialize()
def get_raw_object_data(self, handle):
return self.get_object_from_handle(handle).serialize()
return self.get_media_from_handle(handle).serialize()
def get_raw_place_data(self, handle):
return self.get_place_from_handle(handle).serialize()
@ -876,7 +876,7 @@ class ProxyDbBase(DbReadBase):
returns True if the handle exists in the current Mediadatabase.
"""
return self.gfilter(self.include_media_object,
self.db.get_object_from_handle(handle)) is not None
self.db.get_media_from_handle(handle)) is not None
def has_repository_handle(self, handle):
"""

4
gramps/gen/proxy/referencedbyselection.py
View File

@ -130,7 +130,7 @@ class ReferencedBySelectionProxyDb(ProxyDbBase):
if obj:
self.process_repository(obj)
elif class_name == "Media":
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
if obj:
self.process_media(obj)
elif class_name == "Note":
@ -410,7 +410,7 @@ class ReferencedBySelectionProxyDb(ProxyDbBase):
self.process_attributes(media_ref)
self.process_citation_ref_list(media_ref)
handle = media_ref.get_reference_handle()
media_object = self.db.get_object_from_handle(handle)
media_object = self.db.get_media_from_handle(handle)
if media_object:
self.process_media(media_object)

2
gramps/gen/simple/_simpleaccess.py
View File

@ -862,7 +862,7 @@ class SimpleAccess(object):
:rtype: list
"""
return self.__all_objects(self.dbase.get_media_cursor,
self.dbase.get_object_from_handle)
self.dbase.get_media_from_handle)
def all_places(self):
"""

6
gramps/gen/sort.py
View File

@ -262,13 +262,13 @@ class Sort(object):
## """Sort routine for comparing two media objects by their title. """
## if not (a_id and b_id):
## return False
## a = self.database.get_object_from_handle(a_id)
## b = self.database.get_object_from_handle(b_id)
## a = self.database.get_media_from_handle(a_id)
## b = self.database.get_media_from_handle(b_id)
## return glocale.strcoll(a.desc, b.desc)
def by_media_title_key(self, a_id):
"""Sort routine for comparing two media objects by their title. """
if not a_id:
return False
obj_a = self.database.get_object_from_handle(a_id)
obj_a = self.database.get_media_from_handle(a_id)
return glocale.sort_key(obj_a.desc)

2
gramps/gen/utils/db.py
View File

@ -362,7 +362,7 @@ def navigation_label(db, nav_type, handle):
if obj:
label = obj.get_name()
elif nav_type == 'Media' or nav_type == 'Media':
obj = db.get_object_from_handle(handle)
obj = db.get_media_from_handle(handle)
if obj:
label = obj.get_description()
elif nav_type == 'Note':

10
gramps/gui/clipboard.py
View File

@ -281,7 +281,7 @@ class ClipObjWrapper(ClipWrapper):
'Family': self._db.get_family_from_handle,
'Event': self._db.get_event_from_handle,
'Place': self._db.get_place_from_handle,
'Media': self._db.get_object_from_handle,
'Media': self._db.get_media_from_handle,
'Source': self._db.get_source_from_handle}
for (classname, handle) in self._obj.get_referenced_handles_recursively():
@ -662,7 +662,7 @@ class ClipMediaObj(ClipHandleWrapper):
def refresh(self):
if self._handle:
obj = self._db.get_object_from_handle(self._handle)
obj = self._db.get_media_from_handle(self._handle)
if obj:
self._title = obj.get_description()
self._value = obj.get_path()
@ -670,7 +670,7 @@ class ClipMediaObj(ClipHandleWrapper):
def is_valid(self):
data = pickle.loads(self._obj)
handle = data[2]
obj = self._db.get_object_from_handle(handle)
obj = self._db.get_media_from_handle(handle)
if obj:
return True
return False
@ -688,7 +688,7 @@ class ClipMediaRef(ClipObjWrapper):
def refresh(self):
if self._obj:
base = self._db.get_object_from_handle(self._obj.get_reference_handle())
base = self._db.get_media_from_handle(self._obj.get_reference_handle())
if base:
self._title = base.get_description()
self._value = base.get_path()
@ -1645,7 +1645,7 @@ class MultiTreeView(Gtk.TreeView):
except WindowActiveError:
pass
elif objclass == 'Media':
ref = self.dbstate.db.get_object_from_handle(handle)
ref = self.dbstate.db.get_media_from_handle(handle)
if ref:
try:
EditMedia(self.dbstate,

2
gramps/gui/editors/displaytabs/backrefmodel.py
View File

@ -134,7 +134,7 @@ class BackRefModel(Gtk.ListStore):
gid = p.gramps_id
handle = p.handle
else:
p = self.db.get_object_from_handle(ref[1])
p = self.db.get_media_from_handle(ref[1])
if not p:
continue
name = p.get_description()

6
gramps/gui/editors/displaytabs/gallerytab.py
View File

@ -132,7 +132,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
self.menu = Gtk.Menu()
ref_obj = self.dbstate.db.get_object_from_handle(obj.ref)
ref_obj = self.dbstate.db.get_media_from_handle(obj.ref)
media_path = media_path_full(self.dbstate.db, ref_obj.get_path())
if media_path:
item = Gtk.ImageMenuItem(_('View'))
@ -255,7 +255,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
self._build_icon_model()
for ref in self.media_list:
handle = ref.get_reference_handle()
obj = self.dbstate.db.get_object_from_handle(handle)
obj = self.dbstate.db.get_media_from_handle(handle)
if obj is None :
#notify user of error
from ...dialog import RunDatabaseRepair
@ -346,7 +346,7 @@ class GalleryTab(ButtonTab, DbGUIElement):
def edit_button_clicked(self, obj):
ref = self.get_selected()
if ref:
obj = self.dbstate.db.get_object_from_handle(
obj = self.dbstate.db.get_media_from_handle(
ref.get_reference_handle())
try:
from .. import EditMediaRef

2
gramps/gui/editors/editcitation.py
View File

@ -388,7 +388,7 @@ class DeleteCitationQuery(object):
self.db.commit_source(source, trans)
for handle in media_list:
media = self.db.get_object_from_handle(handle)
media = self.db.get_media_from_handle(handle)
media.remove_citation_references(ctn_handle_list)
self.db.commit_media_object(media, trans)

6
gramps/gui/editors/editmedia.py
View File

@ -77,8 +77,8 @@ class EditMedia(EditPrimary):
def __init__(self, dbstate, uistate, track, obj, callback=None):
EditPrimary.__init__(self, dbstate, uistate, track, obj,
dbstate.db.get_object_from_handle,
dbstate.db.get_object_from_gramps_id, callback)
dbstate.db.get_media_from_handle,
dbstate.db.get_media_from_gramps_id, callback)
if not self.obj.get_handle():
#show the addmedia dialog immediately, with track of parent.
AddMedia(dbstate, self.uistate, self.track, self.obj,
@ -247,7 +247,7 @@ class EditMedia(EditPrimary):
self.view_media(obj)
def view_media(self, obj):
ref_obj = self.dbstate.db.get_object_from_handle(self.obj.handle)
ref_obj = self.dbstate.db.get_media_from_handle(self.obj.handle)
if ref_obj:
media_path = media_path_full(self.dbstate.db,

2
gramps/gui/editors/editnote.py
View File

@ -391,7 +391,7 @@ class DeleteNoteQuery(object):
self.db.commit_citation(citation, trans)
for handle in media_list:
media = self.db.get_object_from_handle(handle)
media = self.db.get_media_from_handle(handle)
media.remove_note(note_handle)
self.db.commit_media_object(media, trans)

10
gramps/gui/editors/editperson.py
View File

@ -621,7 +621,7 @@ class EditPerson(EditPrimary):
if media_list:
media_ref = media_list[0]
object_handle = media_ref.get_reference_handle()
media_obj = self.db.get_object_from_handle(object_handle)
media_obj = self.db.get_media_from_handle(object_handle)
try:
EditMediaRef(self.dbstate, self.uistate, self.track,
@ -645,7 +645,7 @@ class EditPerson(EditPrimary):
self.imgmenu = Gtk.Menu()
menu = self.imgmenu
menu.set_title(_("Media Object"))
obj = self.db.get_object_from_handle(photo.get_reference_handle())
obj = self.db.get_media_from_handle(photo.get_reference_handle())
if obj:
add_menuitem(menu, _("View"), photo,
self._popup_view_photo)
@ -661,7 +661,7 @@ class EditPerson(EditPrimary):
if media_list:
photo = media_list[0]
object_handle = photo.get_reference_handle()
ref_obj = self.db.get_object_from_handle(object_handle)
ref_obj = self.db.get_media_from_handle(object_handle)
photo_path = media_path_full(self.db, ref_obj.get_path())
open_file_with_default_application(photo_path)
@ -673,7 +673,7 @@ class EditPerson(EditPrimary):
if media_list:
media_ref = media_list[0]
object_handle = media_ref.get_reference_handle()
media_obj = self.db.get_object_from_handle(object_handle)
media_obj = self.db.get_media_from_handle(object_handle)
EditMediaRef(self.dbstate, self.uistate, self.track,
media_obj, media_ref, self.load_photo)
@ -952,7 +952,7 @@ class EditPerson(EditPrimary):
if media_list:
ref = media_list[0]
handle = ref.get_reference_handle()
obj = self.dbstate.db.get_object_from_handle(handle)
obj = self.dbstate.db.get_media_from_handle(handle)
if obj is None :
#notify user of error
from ..dialog import RunDatabaseRepair

2
gramps/gui/editors/editsource.py
View File

@ -290,7 +290,7 @@ class DeleteSrcQuery(object):
self.db.commit_source(source, trans)
for handle in media_list:
media = self.db.get_object_from_handle(handle)
media = self.db.get_media_from_handle(handle)
media.remove_citation_references(ctn_handle_list)
self.db.commit_media_object(media, trans)

6
gramps/gui/editors/filtereditor.py
View File

@ -358,7 +358,7 @@ class MyID(Gtk.Box):
citation = self.db.get_citation_from_gramps_id(gramps_id)
name = citation.get_page()
elif self.namespace == 'Media':
obj = self.db.get_object_from_gramps_id(gramps_id)
obj = self.db.get_media_from_gramps_id(gramps_id)
name = obj.get_path()
elif self.namespace == 'Repository':
repo = self.db.get_repository_from_gramps_id(gramps_id)
@ -994,7 +994,7 @@ class ShowResults(ManagedWindow):
name = _pd.display(self.db, place)
gid = place.get_gramps_id()
elif self.namespace == 'Media':
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
name = obj.get_description()
gid = obj.get_gramps_id()
elif self.namespace == 'Repository':
@ -1026,7 +1026,7 @@ class ShowResults(ManagedWindow):
place = self.db.get_place_from_handle(handle)
sortname = _pd.display(self.db, place)
elif self.namespace == 'Media':
sortname = self.db.get_object_from_handle(handle).get_description()
sortname = self.db.get_media_from_handle(handle).get_description()
elif self.namespace == 'Repository':
sortname = self.db.get_repository_from_handle(handle).get_name()
elif self.namespace == 'Note':

2
gramps/gui/editors/objectentries.py
View File

@ -402,7 +402,7 @@ class MediaEntry(ObjEntry):
def get_from_handle(self, handle):
""" return the object given the hande
"""
return self.db.get_object_from_handle(handle)
return self.db.get_media_from_handle(handle)
def get_label(self, object):
return "%s [%s]" % (object.get_description(), object.gramps_id)

4
gramps/gui/merge/mergemedia.py
View File

@ -57,8 +57,8 @@ class MergeMedia(ManagedWindow):
ManagedWindow.__init__(self, uistate, [], self.__class__)
self.dbstate = dbstate
database = dbstate.db
self.mo1 = database.get_object_from_handle(handle1)
self.mo2 = database.get_object_from_handle(handle2)
self.mo1 = database.get_media_from_handle(handle1)
self.mo2 = database.get_media_from_handle(handle2)
self.define_glade('mergeobject', _GLADE_FILE)
self.set_window(self._gladeobj.toplevel,

4
gramps/gui/plug/_guioptions.py
View File

@ -1049,7 +1049,7 @@ class GuiMediaOption(Gtk.Box):
# Initialize to the current value
mid = self.__option.get_value()
media = self.__db.get_object_from_gramps_id(mid)
media = self.__db.get_media_from_gramps_id(mid)
self.__update_media(media)
self.valuekey = self.__option.connect('value-changed', self.__value_changed)
@ -1097,7 +1097,7 @@ class GuiMediaOption(Gtk.Box):
Handle the change made programmatically
"""
mid = self.__option.get_value()
media = self.__db.get_object_from_gramps_id(mid)
media = self.__db.get_media_from_gramps_id(mid)
# Need to disable signals as __update_media() calls set_value()
# which would launch the 'value-changed' signal which is what

2
gramps/gui/plug/quick/_quickreports.py
View File

@ -267,7 +267,7 @@ def run_report(dbstate, uistate, category, handle, pdata, container=None,
elif category == CATEGORY_QR_PLACE :
obj = dbstate.db.get_place_from_handle(handle)
elif category == CATEGORY_QR_MEDIA :
obj = dbstate.db.get_object_from_handle(handle)
obj = dbstate.db.get_media_from_handle(handle)
elif category == CATEGORY_QR_REPOSITORY :
obj = dbstate.db.get_repository_from_handle(handle)
elif category == CATEGORY_QR_NOTE :

2
gramps/gui/plug/quick/_quicktable.py
View File

@ -257,7 +257,7 @@ class QuickTable(SimpleTable):
except WindowActiveError:
pass
elif objclass == 'Media':
ref = self.access.dbase.get_object_from_handle(handle)
ref = self.access.dbase.get_media_from_handle(handle)
if ref:
try:
EditMedia(self.simpledoc.doc.dbstate,

2
gramps/gui/selectors/selectobject.py
View File

@ -73,7 +73,7 @@ class SelectObject(BaseSelector):
return MediaModel
def get_from_handle_func(self):
return self.db.get_object_from_handle
return self.db.get_media_from_handle
def get_column_titles(self):
return [

2
gramps/gui/utils.py
View File

@ -594,7 +594,7 @@ def edit_object(dbstate, uistate, reftype, ref):
pass
elif reftype == 'Media':
try:
obj = dbstate.db.get_object_from_handle(ref)
obj = dbstate.db.get_media_from_handle(ref)
EditMedia(dbstate, uistate, [], obj)
except WindowActiveError:
pass

2
gramps/gui/views/tags.py
View File

@ -504,7 +504,7 @@ class OrganizeTagsDialog(object):
self.db.commit_citation),
'Repository': (self.db.get_repository_from_handle,
self.db.commit_repository),
'Media': (self.db.get_object_from_handle,
'Media': (self.db.get_media_from_handle,
self.db.commit_media_object),
'Note': (self.db.get_note_from_handle,
self.db.commit_note)}

8
gramps/plugins/database/bsddb_support/read.py
View File

@ -331,8 +331,8 @@ class DbBsddbRead(DbReadBase, Callback):
})
self._tables['Media'].update(
{
"handle_func": self.get_object_from_handle,
"gramps_id_func": self.get_object_from_gramps_id,
"handle_func": self.get_media_from_handle,
"gramps_id_func": self.get_media_from_gramps_id,
"class_func": Media,
"cursor_func": self.get_media_cursor,
"handles_func": self.get_media_object_handles,
@ -738,7 +738,7 @@ class DbBsddbRead(DbReadBase, Callback):
"""
return self.get_from_handle(handle, Citation, self.citation_map)
def get_object_from_handle(self, handle):
def get_media_from_handle(self, handle):
"""
Find an Object in the database from the passed handle.
@ -873,7 +873,7 @@ class DbBsddbRead(DbReadBase, Callback):
return self.__get_obj_from_gramps_id(val, self.cid_trans, Citation,
self.citation_map)
def get_object_from_gramps_id(self, val):
def get_media_from_gramps_id(self, val):
"""
Find a Media in the database from the passed Gramps ID.

4
gramps/plugins/database/bsddb_support/test/db_test.py
View File

@ -83,8 +83,8 @@ class DbTest(unittest.TestCase):
"get_number_of_repositories",
"get_number_of_sources",
"get_number_of_tags",
"get_object_from_gramps_id",
"get_object_from_handle",
"get_media_from_gramps_id",
"get_media_from_handle",
"get_person_attribute_types",
"get_person_cursor",
"get_person_from_gramps_id",

4
gramps/plugins/database/bsddb_support/write.py
View File

@ -302,8 +302,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
})
self._tables['Media'].update(
{
"handle_func": self.get_object_from_handle,
"gramps_id_func": self.get_object_from_gramps_id,
"handle_func": self.get_media_from_handle,
"gramps_id_func": self.get_media_from_gramps_id,
"class_func": Media,
"cursor_func": self.get_media_cursor,
"handles_func": self.get_media_object_handles,

2
gramps/plugins/database/dictionarydb.py
View File

@ -537,7 +537,7 @@ class DictionaryDb(DbGeneric):
old_media = None
if media.handle in self.media_map:
emit = "media-update"
old_media = self.get_object_from_handle(media.handle).serialize()
old_media = self.get_media_from_handle(media.handle).serialize()
self._media_dict[media.handle] = media
self._media_id_dict[media.gramps_id] = media
else:

2
gramps/plugins/export/exportgedcom.py
View File

@ -1354,7 +1354,7 @@ class GedcomWriter(UpdateCallback):
+1 <<NOTE_STRUCTURE>> {0:M}
"""
photo_obj_id = photo.get_reference_handle()
photo_obj = self.dbase.get_object_from_handle(photo_obj_id)
photo_obj = self.dbase.get_media_from_handle(photo_obj_id)
if photo_obj:
mime = photo_obj.get_mime_type()
form = MIME2GED.get(mime, mime)

2
gramps/plugins/export/exportpkg.py
View File

@ -182,7 +182,7 @@ class PackageWriter(object):
# Write media files first, since the database may be modified
# during the process (i.e. when removing object)
for m_id in self.db.get_media_object_handles(sort_handles=True):
mobject = self.db.get_object_from_handle(m_id)
mobject = self.db.get_media_from_handle(m_id)
filename = media_path_full(self.db, mobject.get_path())
archname = str(mobject.get_path())
if os.path.isfile(filename) and os.access(filename, os.R_OK):

2
gramps/plugins/export/exportxml.py
View File

@ -317,7 +317,7 @@ class GrampsXmlWriter(UpdateCallback):
if obj_len > 0:
self.g.write(" <objects>\n")
for handle in sorted(self.db.get_media_object_handles()):
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
self.write_object(obj,2)
self.update()
self.g.write(" </objects>\n")

4
gramps/plugins/gramplet/attributes.py
View File

@ -174,7 +174,7 @@ class MediaAttributes(Attributes):
def update_has_data(self):
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
self.set_has_data(self.get_has_data(active))
else:
self.set_has_data(False)
@ -183,7 +183,7 @@ class MediaAttributes(Attributes):
self.model.clear()
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
if active:
self.display_attributes(active)
else:

8
gramps/plugins/gramplet/citations.py
View File

@ -87,7 +87,7 @@ class Citations(Gramplet, DbGUIElement):
for media_ref in obj.get_media_list():
self.add_citations(media_ref)
self.add_attribute_citations(media_ref)
media = self.dbstate.db.get_object_from_handle(media_ref.ref)
media = self.dbstate.db.get_media_from_handle(media_ref.ref)
self.add_media_citations(media)
def add_media_citations(self, media):
@ -174,7 +174,7 @@ class Citations(Gramplet, DbGUIElement):
return True
if self.check_attribute_citations(media_ref):
return True
media = self.dbstate.db.get_object_from_handle(media_ref.ref)
media = self.dbstate.db.get_media_from_handle(media_ref.ref)
if self.check_media_citations(media):
return True
return False
@ -516,7 +516,7 @@ class MediaCitations(Citations):
def update_has_data(self):
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
self.set_has_data(self.get_has_data(active))
else:
self.set_has_data(False)
@ -526,7 +526,7 @@ class MediaCitations(Citations):
self.callman.unregister_all()
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
if active:
self.callman.register_obj(active)
self.display_citations(active)

4
gramps/plugins/gramplet/gallery.py
View File

@ -56,7 +56,7 @@ class Gallery(Gramplet):
count = 0
for media_ref in media_list:
media_handle = media_ref.get_reference_handle()
media = self.dbstate.db.get_object_from_handle(media_handle)
media = self.dbstate.db.get_media_from_handle(media_handle)
full_path = media_path_full(self.dbstate.db, media.get_path())
mime_type = media.get_mime_type()
if mime_type and mime_type.startswith("image"):
@ -78,7 +78,7 @@ class Gallery(Gramplet):
media_list = obj.get_media_list()
for media_ref in media_list:
media_handle = media_ref.get_reference_handle()
media = self.dbstate.db.get_object_from_handle(media_handle)
media = self.dbstate.db.get_media_from_handle(media_handle)
mime_type = media.get_mime_type()
if mime_type and mime_type.startswith("image"):
return True

4
gramps/plugins/gramplet/mediapreview.py
View File

@ -48,7 +48,7 @@ class MediaPreview(Gramplet):
def update_has_data(self):
active_handle = self.get_active('Media')
if active_handle:
active_media = self.dbstate.db.get_object_from_handle(active_handle)
active_media = self.dbstate.db.get_media_from_handle(active_handle)
self.set_has_data(active_media is not None)
else:
self.set_has_data(False)
@ -56,7 +56,7 @@ class MediaPreview(Gramplet):
def main(self):
active_handle = self.get_active('Media')
if active_handle:
media = self.dbstate.db.get_object_from_handle(active_handle)
media = self.dbstate.db.get_media_from_handle(active_handle)
self.top.hide()
if media:
self.load_image(media)

4
gramps/plugins/gramplet/metadataviewer.py
View File

@ -53,7 +53,7 @@ class MetadataViewer(Gramplet):
def main(self):
active_handle = self.get_active('Media')
if active_handle:
media = self.dbstate.db.get_object_from_handle(active_handle)
media = self.dbstate.db.get_media_from_handle(active_handle)
if media:
full_path = media_path_full(self.dbstate.db, media.get_path())
has_data = self.view.display_exif_tags(full_path)
@ -66,7 +66,7 @@ class MetadataViewer(Gramplet):
def update_has_data(self):
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
self.set_has_data(self.get_has_data(active))
else:
self.set_has_data(False)

4
gramps/plugins/gramplet/notes.py
View File

@ -340,7 +340,7 @@ class MediaNotes(Notes):
def update_has_data(self):
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
self.set_has_data(self.get_has_data(active))
else:
self.set_has_data(False)
@ -349,7 +349,7 @@ class MediaNotes(Notes):
self.clear_text()
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
if active:
self.get_notes(active)
else:

2
gramps/plugins/gramplet/persondetails.py
View File

@ -260,7 +260,7 @@ class PersonDetails(Gramplet):
if media_list:
media_ref = media_list[0]
object_handle = media_ref.get_reference_handle()
obj = self.dbstate.db.get_object_from_handle(object_handle)
obj = self.dbstate.db.get_media_from_handle(object_handle)
full_path = media_path_full(self.dbstate.db, obj.get_path())
mime_type = obj.get_mime_type()
if mime_type and mime_type.startswith("image"):

2
gramps/plugins/gramplet/placedetails.py
View File

@ -155,7 +155,7 @@ class PlaceDetails(Gramplet):
if media_list:
media_ref = media_list[0]
object_handle = media_ref.get_reference_handle()
obj = self.dbstate.db.get_object_from_handle(object_handle)
obj = self.dbstate.db.get_media_from_handle(object_handle)
full_path = media_path_full(self.dbstate.db, obj.get_path())
mime_type = obj.get_mime_type()
if mime_type and mime_type.startswith("image"):

4
gramps/plugins/gramplet/todo.py
View File

@ -425,7 +425,7 @@ class MediaToDo(ToDo):
def update_has_data(self):
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
self.set_has_data(self.get_has_data(active))
else:
self.set_has_data(False)
@ -434,7 +434,7 @@ class MediaToDo(ToDo):
self.clear_text()
active_handle = self.get_active('Media')
if active_handle:
active = self.dbstate.db.get_object_from_handle(active_handle)
active = self.dbstate.db.get_media_from_handle(active_handle)
if active:
self.get_notes(active)
else:

2
gramps/plugins/graph/gvfamilylines.py
View File

@ -773,7 +773,7 @@ class FamilyLinesReport(Report):
mediaList = person.get_media_list()
if len(mediaList) > 0:
mediaHandle = mediaList[0].get_reference_handle()
media = self._db.get_object_from_handle(mediaHandle)
media = self._db.get_media_from_handle(mediaHandle)
mediaMimeType = media.get_mime_type()
if mediaMimeType[0:5] == "image":
imagePath = get_thumbnail_path(

2
gramps/plugins/graph/gvrelgraph.py
View File

@ -407,7 +407,7 @@ class RelGraphReport(Report):
mediaList = person.get_media_list()
if len(mediaList) > 0:
mediaHandle = mediaList[0].get_reference_handle()
media = self.database.get_object_from_handle(mediaHandle)
media = self.database.get_media_from_handle(mediaHandle)
mediaMimeType = media.get_mime_type()
if mediaMimeType[0:5] == "image":
imagePath = get_thumbnail_path(

4
gramps/plugins/importer/importxml.py
View File

@ -1398,7 +1398,7 @@ class GrampsParser(UpdateCallback):
and handle not in self.db.place_bookmarks.get() ):
self.db.place_bookmarks.append(handle)
elif target == 'media':
if (self.db.get_object_from_handle(handle) is not None
if (self.db.get_media_from_handle(handle) is not None
and handle not in self.db.media_bookmarks.get() ):
self.db.media_bookmarks.append(handle)
elif target == 'repository':
@ -2196,7 +2196,7 @@ class GrampsParser(UpdateCallback):
self.db.find_next_object_gramps_id)
self.object.set_gramps_id(gramps_id)
if is_merge_candidate:
orig_object = self.db.get_object_from_handle(orig_handle)
orig_object = self.db.get_media_from_handle(orig_handle)
self.info.add('merge-candidate', MEDIA_KEY, orig_object,
self.object)
else:

2
gramps/plugins/lib/libgedcom.py
View File

@ -7543,7 +7543,7 @@ class GedcomParser(UpdateCallback):
self.dbase.add_object(photo, self.trans)
self.media_map[path] = photo.handle
else:
photo = self.dbase.get_object_from_handle(photo_handle)
photo = self.dbase.get_media_from_handle(photo_handle)
oref = MediaRef()
oref.set_reference_handle(photo.handle)
if note:

2
gramps/plugins/lib/libsubstkeyword.py
View File

@ -919,7 +919,7 @@ class VariableParse(object):
media_list = person_or_marriage.get_media_list()
for media_ref in media_list:
media_handle = media_ref.get_reference_handle()
media = self.database.get_object_from_handle(media_handle)
media = self.database.get_media_from_handle(media_handle)
mime_type = media.get_mime_type()
if mime_type and mime_type.startswith("image"):
return media

2
gramps/plugins/lib/maps/geography.py
View File

@ -804,7 +804,7 @@ class GeoGraphyView(OsmGps, NavigationView):
if media_list:
for media_ref in media_list:
object_handle = media_ref.get_reference_handle()
media_obj = self.dbstate.db.get_object_from_handle(object_handle)
media_obj = self.dbstate.db.get_media_from_handle(object_handle)
path = media_obj.get_path()
name, extension = os.path.splitext(path)
if extension == ".kml":

2
gramps/plugins/quickview/references.py
View File

@ -49,7 +49,7 @@ def get_ref(db, objclass, handle):
elif objclass == 'Note':
ref = db.get_note_from_handle(handle)
elif objclass == 'Media':
ref = db.get_object_from_handle(handle)
ref = db.get_media_from_handle(handle)
else:
ref = objclass
return ref

6
gramps/plugins/textreport/indivcomplete.py
View File

@ -488,7 +488,7 @@ class IndivCompleteReport(Report):
for media_ref in media_list:
media_handle = media_ref.get_reference_handle()
if media_handle:
media = self._db.get_object_from_handle(media_handle)
media = self._db.get_media_from_handle(media_handle)
if media and media.get_mime_type():
if media.get_mime_type().startswith("image"):
i_total += 1
@ -513,7 +513,7 @@ class IndivCompleteReport(Report):
while ( media_count < len(media_list) ):
media_ref = media_list[media_count]
media_handle = media_ref.get_reference_handle()
media = self._db.get_object_from_handle(media_handle)
media = self._db.get_media_from_handle(media_handle)
if media is None:
from gramps.gui.dialog import RunDatabaseRepair
RunDatabaseRepair(_('Non existing media found in the Gallery'))
@ -790,7 +790,7 @@ class IndivCompleteReport(Report):
if self.use_images and len(media_list) > 0:
media0 = media_list[0]
media_handle = media0.get_reference_handle()
media = self._db.get_object_from_handle(media_handle)
media = self._db.get_media_from_handle(media_handle)
self.mime0 = media.get_mime_type()
if self.mime0 and self.mime0.startswith("image"):
image_filename = media_path_full(self._db, media.get_path())

2
gramps/plugins/textreport/simplebooktitle.py
View File

@ -89,7 +89,7 @@ class SimpleBookTitle(Report):
self.doc.end_paragraph()
if self.object_id:
the_object = self.database.get_object_from_gramps_id(self.object_id)
the_object = self.database.get_media_from_gramps_id(self.object_id)
filename = media_path_full(self.database, the_object.get_path())
if os.path.exists(filename):
if self.image_size:

2
gramps/plugins/textreport/summary.py
View File

@ -227,7 +227,7 @@ class SummaryReport(Report):
total_media = len(self.__db.get_media_object_handles())
mbytes = "0"
for media_id in self.__db.get_media_object_handles():
media = self.__db.get_object_from_handle(media_id)
media = self.__db.get_media_from_handle(media_id)
try:
size_in_bytes += posixpath.getsize(
media_path_full(self.__db, media.get_path()))

2
gramps/plugins/textreport/tagreport.py
View File

@ -563,7 +563,7 @@ class TagReport(Report):
self.doc.end_row()
for media_handle in media_list:
media = self.database.get_object_from_handle(media_handle)
media = self.database.get_media_from_handle(media_handle)
self.doc.start_row()

12
gramps/plugins/tool/check.py
View File

@ -354,7 +354,7 @@ class CheckIntegrity(object):
handle = bhandle.decode('utf-8')
data = self.db.media_map[bhandle]
if not isinstance(data[2], str) or not isinstance(data[4], str):
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
if not isinstance(data[2], str):
obj.path = obj.path.decode('utf-8')
logging.warning(' FAIL: encoding error on media object '
@ -369,7 +369,7 @@ class CheckIntegrity(object):
error_count += 1
# Once we are here, fix the mime string if not str
if not isinstance(data[3], str):
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
try:
if data[3] == str(data[3]):
obj.mime = str(data[3])
@ -678,7 +678,7 @@ class CheckIntegrity(object):
def fs_ok_clicked(obj):
name = fs_top.get_filename()
if os.path.isfile(name):
obj = self.db.get_object_from_handle(ObjectId)
obj = self.db.get_media_from_handle(ObjectId)
obj.set_path(name)
self.db.commit_media_object(obj, self.trans)
self.replaced_photo.append(ObjectId)
@ -705,7 +705,7 @@ class CheckIntegrity(object):
for bObjectId in self.db.get_media_object_handles():
ObjectId = bObjectId.decode('utf-8')
obj = self.db.get_object_from_handle(ObjectId)
obj = self.db.get_media_from_handle(ObjectId)
photo_name = media_path_full(self.db, obj.get_path())
photo_desc = obj.get_description()
if photo_name is not None and photo_name != "" and not find_file(photo_name):
@ -850,7 +850,7 @@ class CheckIntegrity(object):
_db.remove_place,
),
('media',
_db.get_object_from_handle,
_db.get_media_from_handle,
_db.get_media_cursor,
_db.get_number_of_media_objects,
_('Looking for empty media records'),
@ -1831,7 +1831,7 @@ class CheckIntegrity(object):
for bObjectId in self.db.get_media_object_handles():
self.progress.step()
ObjectId = bObjectId.decode('utf-8')
obj = self.db.get_object_from_handle(ObjectId)
obj = self.db.get_media_from_handle(ObjectId)
full_path = media_path_full(self.db, obj.get_path())
new_checksum = create_checksum(full_path)
if new_checksum != obj.checksum:

6
gramps/plugins/tool/mediamanager.py
View File

@ -546,7 +546,7 @@ class PathChange(BatchOp):
from_text = str(self.from_entry.get_text())
to_text = str(self.to_entry.get_text())
for handle in self.handle_list:
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
new_path = obj.get_path().replace(from_text, to_text)
obj.set_path(new_path)
self.db.commit_media_object(obj, self.trans)
@ -580,7 +580,7 @@ class Convert2Abs(BatchOp):
self.prepare()
self.set_total(len(self.handle_list))
for handle in self.handle_list:
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
new_path = media_path_full(self.db, obj.path)
obj.set_path(new_path)
self.db.commit_media_object(obj, self.trans)
@ -617,7 +617,7 @@ class Convert2Rel(BatchOp):
self.set_total(len(self.handle_list))
base_dir = media_path(self.db)
for handle in self.handle_list:
obj = self.db.get_object_from_handle(handle)
obj = self.db.get_media_from_handle(handle)
new_path = relative_path(obj.path, base_dir)
obj.set_path(new_path)
self.db.commit_media_object(obj, self.trans)

2
gramps/plugins/tool/removeunused.py
View File

@ -108,7 +108,7 @@ class RemoveUnused(tool.Tool, ManagedWindow, UpdateCallback):
'editor' : 'EditPlace',
'icon' : 'gramps-place',
'name_ix' : 2},
'media' : {'get_func': self.db.get_object_from_handle,
'media' : {'get_func': self.db.get_media_from_handle,
'remove' : self.db.remove_object,
'get_text': None,
'editor' : 'EditMedia',

4
gramps/plugins/tool/reorderids.py
View File

@ -107,8 +107,8 @@ class ReorderIds(tool.BatchTool):
self.progress.set_pass(_('Reordering Media Object IDs'),
db.get_number_of_media_objects())
self.reorder(Media,
db.get_object_from_gramps_id,
db.get_object_from_handle,
db.get_media_from_gramps_id,
db.get_media_from_handle,
db.find_next_object_gramps_id,
db.media_map,
db.commit_media_object,

12
gramps/plugins/view/mediaview.py
View File

@ -222,7 +222,7 @@ class MediaView(ListView):
Launch external viewers for the selected objects.
"""
for handle in self.selected_handles():
ref_obj = self.dbstate.db.get_object_from_handle(handle)
ref_obj = self.dbstate.db.get_media_from_handle(handle)
mpath = media_path_full(self.dbstate.db, ref_obj.get_path())
open_file_with_default_application(mpath)
@ -231,7 +231,7 @@ class MediaView(ListView):
Launch external viewers for the selected objects.
"""
for handle in self.selected_handles():
ref_obj = self.dbstate.db.get_object_from_handle(handle)
ref_obj = self.dbstate.db.get_media_from_handle(handle)
mpath = media_path_full(self.dbstate.db, ref_obj.get_path())
if mpath:
mfolder, mfile = os.path.split(mpath)
@ -323,7 +323,7 @@ class MediaView(ListView):
user verification.
"""
the_lists = get_media_referents(handle, self.dbstate.db)
object = self.dbstate.db.get_object_from_handle(handle)
object = self.dbstate.db.get_media_from_handle(handle)
query = DeleteMediaQuery(self.dbstate, self.uistate, handle, the_lists)
is_used = any(the_lists)
return (query, is_used, object)
@ -333,7 +333,7 @@ class MediaView(ListView):
Edit the selected objects in the EditMedia dialog
"""
for handle in self.selected_handles():
object = self.dbstate.db.get_object_from_handle(handle)
object = self.dbstate.db.get_media_from_handle(handle)
try:
EditMedia(self.dbstate, self.uistate, [], object)
except WindowActiveError:
@ -358,7 +358,7 @@ class MediaView(ListView):
"""
returns the handle of the specified object
"""
obj = self.dbstate.db.get_object_from_gramps_id(gid)
obj = self.dbstate.db.get_media_from_gramps_id(gid)
if obj:
return obj.get_handle()
else:
@ -380,7 +380,7 @@ class MediaView(ListView):
"""
Add the given tag to the given media object.
"""
media = self.dbstate.db.get_object_from_handle(media_handle)
media = self.dbstate.db.get_media_from_handle(media_handle)
media.add_tag(tag_handle)
self.dbstate.db.commit_media_object(media, transaction)

2
gramps/plugins/view/pedigreeview.py
View File

@ -159,7 +159,7 @@ class _PersonWidgetBase(Gtk.DrawingArea):
if media_list:
photo = media_list[0]
object_handle = photo.get_reference_handle()
obj = dbstate.db.get_object_from_handle(
obj = dbstate.db.get_media_from_handle(
object_handle)
if obj:
mtype = obj.get_mime_type()

2
gramps/plugins/view/relview.py
View File

@ -651,7 +651,7 @@ class RelationshipView(NavigationView):
# image
image_list = person.get_media_list()
if image_list:
mobj = self.dbstate.db.get_object_from_handle(image_list[0].ref)
mobj = self.dbstate.db.get_media_from_handle(image_list[0].ref)
if mobj and mobj.get_mime_type()[0:5] == "image":
pixbuf = get_thumbnail_image(
media_path_full(self.dbstate.db,

22
gramps/plugins/webreport/narrativeweb.py
View File

@ -1941,7 +1941,7 @@ class BasePage(object):
pic_id = self.report.options[option_name]
if pic_id:
obj = self.report.database.get_object_from_gramps_id(pic_id)
obj = self.report.database.get_media_from_gramps_id(pic_id)
if obj is None:
return None
mime_type = obj.get_mime_type()
@ -2100,7 +2100,7 @@ class BasePage(object):
return None
photo_handle = photolist[0].get_reference_handle()
photo = self.report.database.get_object_from_handle(photo_handle)
photo = self.report.database.get_media_from_handle(photo_handle)
mime_type = photo.get_mime_type()
descr = photo.get_description()
@ -2192,7 +2192,7 @@ class BasePage(object):
for mediaref in photolist_ordered:
photo_handle = mediaref.get_reference_handle()
photo = self.report.database.get_object_from_handle(photo_handle)
photo = self.report.database.get_media_from_handle(photo_handle)
if photo_handle in displayed:
continue
@ -2391,7 +2391,7 @@ class BasePage(object):
if self.create_media:
for media_ref in sref.get_media_list():
media_handle = media_ref.get_reference_handle()
media = self.dbase_.get_object_from_handle(media_handle)
media = self.dbase_.get_media_from_handle(media_handle)
if media:
mime_type = media.get_mime_type()
if mime_type:
@ -4445,7 +4445,7 @@ class MediaPages(BasePage):
len(self.report.obj_dict[Media]) + 1) as step:
sorted_media_handles = sorted(self.report.obj_dict[Media].keys(),
key=lambda x: SORT_KEY(self.report.database.get_object_from_handle(x).desc))
key=lambda x: SORT_KEY(self.report.database.get_media_from_handle(x).desc))
self.MediaListPage(self.report, title, sorted_media_handles)
prev = None
@ -4515,7 +4515,7 @@ class MediaPages(BasePage):
index = 1
for media_handle in sorted_media_handles:
media = self.dbase_.get_object_from_handle(media_handle)
media = self.dbase_.get_media_from_handle(media_handle)
if media:
if media.get_change_time() > ldatec: ldatec = media.get_change_time()
title = media.get_description() or "[untitled]"
@ -4573,7 +4573,7 @@ class MediaPages(BasePage):
(prev, next, page_number, total_pages) = info
self.dbase_ = report.database
media = self.dbase_.get_object_from_handle(media_handle)
media = self.dbase_.get_media_from_handle(media_handle)
BasePage.__init__(self, report, title, media.gramps_id)
ldatec = media.get_change_time()
@ -4851,11 +4851,11 @@ class ThumbnailPreviewPage(BasePage):
return (obj.desc, obj.gramps_id)
self.photo_keys = sorted(self.report.obj_dict[Media],
key=lambda x: sort_by_desc_and_gid(self.dbase_.get_object_from_handle(x)))
key=lambda x: sort_by_desc_and_gid(self.dbase_.get_media_from_handle(x)))
media_list = []
for person_handle in self.photo_keys:
photo = self.dbase_.get_object_from_handle(person_handle)
photo = self.dbase_.get_media_from_handle(person_handle)
if photo:
if photo.get_mime_type().startswith("image"):
media_list.append((photo.get_description(), person_handle, photo))
@ -5949,7 +5949,7 @@ class PersonPages(BasePage):
photolist = person.get_media_list()
if photolist:
photo_handle = photolist[0].get_reference_handle()
photo = self.dbase_.get_object_from_handle(photo_handle)
photo = self.dbase_.get_media_from_handle(photo_handle)
mime_type = photo.get_mime_type()
if mime_type:
region = self.media_ref_region_to_object(photo_handle, person)
@ -7596,7 +7596,7 @@ class NavWebReport(Report):
media_refs = self.bkref_dict[Media].get(media_handle)
if media_refs and (bkref_class, bkref_handle) in media_refs:
return
media = self.database.get_object_from_handle(media_handle)
media = self.database.get_media_from_handle(media_handle)
media_name = "Media"
if self.inc_gallery:
media_fname = self.build_url_fname(media_handle, "img",