]> Nutra Git (v2) - gamesguru/getmyancestors.git/commitdiff
Temporary fix because familysearch made change on Memorie's features
authorBenoît Fontaine <benoitfontaine.ba@gmail.com>
Wed, 12 Sep 2018 18:15:18 +0000 (20:15 +0200)
committerBenoît Fontaine <benoitfontaine.ba@gmail.com>
Wed, 12 Sep 2018 18:15:18 +0000 (20:15 +0200)
getmyancestors.py

index 1b458288b65c910ca007d494b153776387226337..1ab43bc820b622fa3beb973e8ca8315d944cfa88 100755 (executable)
@@ -214,8 +214,8 @@ class Session:
                 continue
             try:
                 return r.json()
-            except:
-                self.write_log('WARNING: corrupted file from ' + url)
+            except Exception as e:
+                self.write_log('WARNING: corrupted file from %s, error: %s' % (url, e))
                 return None
 
     # retrieve FamilySearch current user ID
@@ -361,7 +361,7 @@ class Memorie:
     def __init__(self, data=None):
         self.description = self.url = None
         if data and 'links' in data:
-            self.url = data['links']['alternate'][0]['href']
+            self.url = data['links']['image']['href']
             if 'titles' in data:
                 self.description = data['titles'][0]['value']
             if 'descriptions' in data:
@@ -508,7 +508,8 @@ class Indi:
                 memorie = self.tree.fs.get_url(url)
                 if memorie and 'sourceDescriptions' in memorie:
                     for x in memorie['sourceDescriptions']:
-                        self.memories.add(Memorie(x))
+                        if x['mediaType'] in ('image/jpeg', 'image/png'):
+                            self.memories.add(Memorie(x))
 
     # add a fams to the individual
     def add_fams(self, fams):