Merge a327d17cea448293aaa8128b610d851e19506f22 into 3eb8d22ddb8982ca4fb56bb7a8d6517538bf14c6

[JSInterp] Temporary fix for #33102
[pornhub] Download archive improvement
2025-05-10 15:54:49 +09:00 · 2025-04-01 08:26:14 +02:00 · 2025-03-31 04:21:09 +01:00 · 2022-12-19 17:00:57 +01:00
2 changed files with 5 additions and 3 deletions
--- a/youtube_dl/extractor/pornhub.py
+++ b/youtube_dl/extractor/pornhub.py
@ -518,9 +518,9 @@ class PornHubPlaylistBaseIE(PornHubBaseIE):
        return [
            self.url_result(
                'http://www.%s/%s' % (host, video_url),
-                PornHubIE.ie_key(), video_title=title)
-            for video_url, title in orderedSet(re.findall(
-                r'href="/?(view_video\.php\?.*\bviewkey=[\da-z]+[^"]*)"[^>]*\s+title="([^"]+)"',
+                PornHubIE.ie_key(), video_title=title, video_id=id)
+            for video_url, id, title in orderedSet(re.findall(
+                r'href="/?(view_video\.php\?.*\bviewkey=([\da-z]+)[^"]*)"[^>]*\s+title="([^"]+)"',
                container))
        ]

--- a/youtube_dl/jsinterp.py
+++ b/youtube_dl/jsinterp.py
@ -686,6 +686,8 @@ class JSInterpreter(object):
            raise self.Exception('Cannot get index {idx!r:.100}'.format(**locals()), expr=repr(obj), cause=e)

    def _dump(self, obj, namespace):
+        if obj is JS_Undefined:
+            return 'undefined'
        try:
            return json.dumps(obj)
        except TypeError:
Author	SHA1	Message	Date
MrBigDig	35e17a9fa4	Merge a327d17cea448293aaa8128b610d851e19506f22 into 3eb8d22ddb8982ca4fb56bb7a8d6517538bf14c6	2025-04-01 08:26:14 +02:00
dirkf	3eb8d22ddb	[JSInterp] Temporary fix for #33102	2025-03-31 04:21:09 +01:00
MrBigDig	a327d17cea	[pornhub] Download archive improvement	2022-12-19 17:00:57 +01:00