Redgifs improvements

Add check to verify token was received.
Update headers sent to content API.

Add availability check for videos to resolve last part of #472 where only SD version is available.

bdfr/site_downloaders/redgifs.py

@@ -2,7 +2,7 @@
 
 import json
 import re
-import urllib.parse
+import requests
 from typing import Optional
 
 from praw.models import Submission
@@ -29,7 +29,13 @@ class Redgifs(BaseDownloader):
             raise SiteDownloaderError(f'Could not extract Redgifs ID from {url}')
 
         auth_token = json.loads(Redgifs.retrieve_url('https://api.redgifs.com/v2/auth/temporary').text)['token']
+        if not auth_token:
+            raise SiteDownloaderError('Unable to retrieve Redgifs API token')
+
         headers = {
+            'referer': 'https://www.redgifs.com/',
+            'origin': 'https://www.redgifs.com',
+            'content-type': 'application/json',
             'Authorization': f'Bearer {auth_token}',
         }
 
@@ -46,7 +52,10 @@ class Redgifs(BaseDownloader):
         out = set()
         try:
             if response_json['gif']['type'] == 1:  # type 1 is a video
-                out.add(response_json['gif']['urls']['hd'])
+                if requests.get(response_json['gif']['urls']['hd'], headers=headers).ok:
+                    out.add(response_json['gif']['urls']['hd'])
+                else:
+                    out.add(response_json['gif']['urls']['sd'])
             elif response_json['gif']['type'] == 2:  # type 2 is an image
                 if response_json['gif']['gallery']:
                     content = Redgifs.retrieve_url(

tests/site_downloaders/test_redgifs.py

@@ -41,8 +41,7 @@ def test_get_link(test_url: str, expected: set[str]):
     ('https://redgifs.com/watch/springgreendecisivetaruca', {'8dac487ac49a1f18cc1b4dabe23f0869'}),
     ('https://redgifs.com/watch/leafysaltydungbeetle', {'076792c660b9c024c0471ef4759af8bd'}),
     ('https://www.redgifs.com/watch/palegoldenrodrawhalibut', {'46d5aa77fe80c6407de1ecc92801c10e'}),
-    ('https://redgifs.com/watch/hollowintentsnowyowl',
+    ('https://redgifs.com/watch/hollowintentsnowyowl', {'5ee51fa15e0a58e98f11dea6a6cca771'}),
-     {'5ee51fa15e0a58e98f11dea6a6cca771'}),
     ('https://www.redgifs.com/watch/lustrousstickywaxwing',
      {'b461e55664f07bed8d2f41d8586728fa',
       '30ba079a8ed7d7adf17929dc3064c10f',
@@ -60,3 +59,27 @@ def test_download_resource(test_url: str, expected_hashes: set[str]):
     [res.download() for res in results]
     hashes = set([res.hash.hexdigest() for res in results])
     assert hashes == set(expected_hashes)
+
+
+@pytest.mark.online
+@pytest.mark.parametrize(('test_url', 'expected_link', 'expected_hash'), (
+    ('https://redgifs.com/watch/flippantmemorablebaiji', {'FlippantMemorableBaiji-mobile.mp4'},
+     {'41a5fb4865367ede9f65fc78736f497a'}),
+    ('https://redgifs.com/watch/thirstyunfortunatewaterdragons', {'thirstyunfortunatewaterdragons-mobile.mp4'},
+     {'1a51dad8fedb594bdd84f027b3cbe8af'}),
+    ('https://redgifs.com/watch/conventionalplainxenopterygii', {'conventionalplainxenopterygii-mobile.mp4'},
+     {'2e1786b3337da85b80b050e2c289daa4'})
+))
+def test_hd_soft_fail(test_url: str, expected_link: set[str], expected_hash: set[str]):
+    link = Redgifs._get_link(test_url)
+    link = list(link)
+    patterns = [r'https://thumbs\d\.redgifs\.com/' + e + r'.*' for e in expected_link]
+    assert all([re.match(p, r) for p in patterns] for r in link)
+    mock_submission = Mock()
+    mock_submission.url = test_url
+    test_site = Redgifs(mock_submission)
+    results = test_site.find_resources()
+    assert all([isinstance(res, Resource) for res in results])
+    [res.download() for res in results]
+    hashes = set([res.hash.hexdigest() for res in results])
+    assert hashes == set(expected_hash)