Merge pull request mxrch#89 from hmikihth/master

mxrch · web-flow · commit efb980dbea79 · 2020-10-24T18:46:28.000+02:00
Some bugfix
diff --git a/check_and_gen.py b/check_and_gen.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import json
 from os.path import isfile
 from pathlib import Path
diff --git a/hunt.py b/hunt.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 import json
 import sys
 import os
diff --git a/lib/metadata.py b/lib/metadata.py
@@ -58,7 +58,14 @@ def get_GPS(self, img):
                 return ""
 
     def feed(self, img):
-        if img.getexif():
+        try:
+            img._getexif()
+        except:
+            try:
+                img._getexif = img.getexif
+            except:
+                img._getexif = lambda d={}:d
+        if img._getexif():
             location = self.get_GPS(img)
             exif = {ExifTags.TAGS[k]: v for k, v in img._getexif().items() if k in ExifTags.TAGS}
             interesting_fields = ["Make", "Model", "DateTime", "Software"]
diff --git a/lib/photos.py b/lib/photos.py
@@ -124,19 +124,25 @@ def gpics(gaiaID, client, cookies, headers, regex_albums, regex_photos, headless
             album_length = int(album[2])
 
             if album_length >= 1:
-                req = client.get(album_link)
-                source = req.text.replace('\n', '')
-                results_pics = re.compile(regex_photos).findall(source)
-                for pic in results_pics:
-                    pic_name = pic[1]
-                    pic_link = pic[0]
-                    pics.append(pic_link)
+                try:
+                    req = client.get(album_link)
+                    source = req.text.replace('\n', '')
+                    results_pics = re.compile(regex_photos).findall(source)
+                    for pic in results_pics:
+                        pic_name = pic[1]
+                        pic_link = pic[0]
+                        pics.append(pic_link)
+                except:
+                    pass
 
         print(f"=> {list_albums_length} albums{', ' + str(len(pics)) + ' photos' if list_albums_length else ''}")
         for pic in pics:
-            req = client.get(pic)
-            img = Image.open(BytesIO(req.content))
-            exifeater.feed(img)
+            try:
+                req = client.get(pic)
+                img = Image.open(BytesIO(req.content))
+                exifeater.feed(img)
+            except:
+                pass
 
         print("\nSearching metadata...")
         exifeater.output()

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#!/usr/bin/env python3`
	`2`	`+`
`1`	`3`	`import json`
`2`	`4`	`from os.path import isfile`
`3`	`5`	`from pathlib import Path`