Merge remote-tracking branch 'origin/master'

DownloaderForReddit/extractors/redgifs_extractor.py

@@ -1,4 +1,4 @@
-from yt_dlp import YoutubeDL
+import redgifs
 
 from .base_extractor import BaseExtractor
 from ..core.errors import Error
@@ -48,10 +48,36 @@ def __init__(self, post, **kwargs):
 
     def extract_content(self):
         try:
-            with YoutubeDL({'format': 'mp4'}) as ydl:
-                result = ydl.extract_info(self.url, download=False)
-                content = self.make_content(result['url'], 'mp4')
-                HEADERS[content.id] = result['http_headers']
+            api = redgifs.API()
+            api.login()
+            response = api.get_gif(self.get_gif_id())
+            url = self.get_download_url(response)
+            content = self.make_content(url, 'mp4')
+            HEADERS[content.id] = api.http.headers
         except:
-            message = 'Failed to locate content'
-            self.handle_failed_extract(error=Error.FAILED_TO_LOCATE, message=message, extractor_error_message=message)
+            message = 'Failed to extract content from redgifs'
+            self.handle_failed_extract(error=Error.FAILED_TO_LOCATE, message=message, exetractor_error_message=message)
+
+    def get_gif_id(self):
+        return self.url.rsplit('/', 1)[-1]
+
+    @staticmethod
+    def get_download_url(data):
+        try:
+            return data.urls.hd
+        except KeyError:
+            return data.urls.sd
+
+    # def extract_with_yt_dlp(self):
+    #     """
+    #     This method is out of date at the moment.  But with the way redgifs is changing their api, it could very well
+    #     be relevant again soon.  So this is staying here, just in case.
+    #     """
+    #     try:
+    #         with YoutubeDL({'format': 'mp4'}) as ydl:
+    #             result = ydl.extract_info(self.url, download=False)
+    #             content = self.make_content(result['url'], 'mp4')
+    #             HEADERS[content.id] = result['http_headers']
+    #     except:
+    #         message = 'Failed to locate content'
+    #         self.handle_failed_extract(error=Error.FAILED_TO_LOCATE, message=message, extractor_error_message=message)

requirements.txt

@@ -3,11 +3,12 @@ praw==7.5.0
 pyqt5==5.15.4
 PyQtNetworkAuth==5.15.4
 python-json-logger==0.1.9
-requests==2.20.0
-yt-dlp==2022.10.4
+requests==2.25.0
 SQLAlchemy==1.3.13
 toml==0.10.0
 alembic==1.4.2
 schedule==1.1.0
 pyqtspinner==0.1.1
-cryptography==3.4.7
+cryptography==3.4.7
+redgifs==1.4.0
+yt-dlp==2022.10.4