Merge branch 'master' into scraper

py34/post.py

@@ -3,6 +3,7 @@ from .url import ImageURL, ThumbnailURL, IMAGE_FORMATS
 from io import BytesIO
 from PIL import Image
 from PIL.ImageFile import ImageFile
+import time
 
 
 class Post:
@@ -34,7 +35,13 @@ class Post:
     def get_thumbnail_data(self) -> bytes:
         if self._thumbnail_data is not None:
             return self._thumbnail_data
-        self._thumbnail_data = scraper.get(ThumbnailURL(self.image_dir, self.image_id))
+        for i in range(5):
+            res = scraper.get(ThumbnailURL(self.image_dir, self.image_id), retry=False)
+            if res.status_code == 200:
+                self._thumbnail_data = res.content
+            if res.status_code == 404:
+                self._thumbnail_data = b""
+            time.sleep(5)
         return self._thumbnail_data
 
 

py34/scraper.py

@@ -40,7 +40,7 @@ class Scraper:
             if not body:
                 return res
             if res.status_code != 200:
-                raise ScraperException(res, "Request did not succeed")
+                raise ScraperException(res, f"Request did not succeed: {method} {url}")
             return res.content
 
     @retry(Exception, tries=5, delay=5)