Gedcom fixes for mime and finding media (#795)

* Fix Gedcom import/export for more comprehensive mime types

Fixes #11041

* Fix Gedcom import to better find media files

Issue #11041

* Fix Gedcom test files for media mime and error location message
This commit is contained in:
Paul Culley
2019-03-16 22:44:42 -05:00
committed by Sam Manzi
parent d96b6d19b8
commit 100d6d0672
6 changed files with 124 additions and 98 deletions

View File

@@ -104,15 +104,6 @@ LANGUAGES = {
#
#-------------------------------------------------------------------------
MIME2GED = {
"image/bmp" : "bmp",
"image/gif" : "gif",
"image/jpeg" : "jpeg",
"image/x-pcx" : "pcx",
"image/tiff" : "tiff",
"audio/x-wav" : "wav"
}
QUALITY_MAP = {
Citation.CONF_VERY_HIGH : "3",
Citation.CONF_HIGH : "2",
@@ -1467,8 +1458,7 @@ class GedcomWriter(UpdateCallback):
gramps_id = media.get_gramps_id()
self._writeln(0, '@%s@' % gramps_id, 'OBJE')
mime = media.get_mime_type()
form = MIME2GED.get(mime, mime)
form = os.path.splitext(media.get_path())[1][1:]
path = media_path_full(self.dbase, media.get_path())
self._writeln(1, 'FILE', path, limit=255)
if form: