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

0003553: Import media files from GEDCOM (part fix). 0005456: Default log level after installation results in disk being filled on import (part fix). Don't give error messages if the imported media file is an http URL (instead of a local file). Note that the double slash in 'http://" is still stored as a single slash.

Browse Source 
svn: r18862
This commit is contained in:
Tim G L Lyons 2012-02-11 18:34:52 +00:00
parent 7e3415accb
commit 5800f46518
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/lib/libgedcom.py
View File

@ -6638,10 +6638,15 @@ class GedcomParser(UpdateCallback):
url.set_type(gen.lib.UrlType.WEB_HOME) url.set_type(gen.lib.UrlType.WEB_HOME)
obj.add_url(url) obj.add_url(url)
else: else:
(valid, path) = self.__find_file(filename, self.dir_path) # to allow import of references to URLs (especially for import from
if not valid: # geni.com), do not try to find the files if they are blatently URLs
self.__add_msg(_("Could not import %s") % filename) if filename[0:7] == "http://" or filename[0:8] == "https://":
path = filename.replace('\\', os.path.sep) path = filename
else:
(valid, path) = self.__find_file(filename, self.dir_path)
if not valid:
self.__add_msg(_("Could not import %s") % filename)
path = filename.replace('\\', os.path.sep)
photo_handle = self.media_map.get(path) photo_handle = self.media_map.get(path)
if photo_handle is None: if photo_handle is None:
photo = gen.lib.MediaObject() photo = gen.lib.MediaObject()