update from upstream

1 files changed, 86 insertions, 0 deletions

diff --git a/hypervideo_dl/extractor/patreon.py b/hypervideo_dl/extractor/patreon.py
index 761a4b1..a189c02 100644
--- a/hypervideo_dl/extractor/patreon.py
+++ b/hypervideo_dl/extractor/patreon.py
@@ -1,7 +1,12 @@
 # coding: utf-8
 from __future__ import unicode_literals
 
+import itertools
+
 from .common import InfoExtractor
+from .vimeo import VimeoIE
+
+from ..compat import compat_urllib_parse_unquote
 from ..utils import (
     clean_html,
     determine_ext,
@@ -11,6 +16,7 @@ from ..utils import (
     parse_iso8601,
     str_or_none,
     try_get,
+    url_or_none,
 )
 
 
@@ -63,6 +69,20 @@ class PatreonIE(InfoExtractor):
     }, {
         'url': 'https://www.patreon.com/posts/743933',
         'only_matching': True,
+    }, {
+        'url': 'https://www.patreon.com/posts/kitchen-as-seen-51706779',
+        'md5': '96656690071f6d64895866008484251b',
+        'info_dict': {
+            'id': '555089736',
+            'ext': 'mp4',
+            'title': 'KITCHEN AS SEEN ON DEEZ NUTS EXTENDED!',
+            'uploader': 'Cold Ones',
+            'thumbnail': 're:^https?://.*$',
+            'upload_date': '20210526',
+            'description': 'md5:557a409bd79d3898689419094934ba79',
+            'uploader_id': '14936315',
+        },
+        'skip': 'Patron-only content'
     }]
 
     # Currently Patreon exposes download URL via hidden CSS, so login is not
@@ -137,6 +157,19 @@ class PatreonIE(InfoExtractor):
                     })
 
         if not info.get('url'):
+            # handle Vimeo embeds
+            if try_get(attributes, lambda x: x['embed']['provider']) == 'Vimeo':
+                embed_html = try_get(attributes, lambda x: x['embed']['html'])
+                v_url = url_or_none(compat_urllib_parse_unquote(
+                    self._search_regex(r'src=(https%3A%2F%2Fplayer\.vimeo\.com.+)%3F', embed_html, 'vimeo url', fatal=False)))
+                if v_url:
+                    info.update({
+                        '_type': 'url_transparent',
+                        'url': VimeoIE._smuggle_referrer(v_url, 'https://patreon.com'),
+                        'ie_key': 'Vimeo',
+                    })
+
+        if not info.get('url'):
             embed_url = try_get(attributes, lambda x: x['embed']['url'])
             if embed_url:
                 info.update({
@@ -154,3 +187,56 @@ class PatreonIE(InfoExtractor):
                 })
 
         return info
+
+
+class PatreonUserIE(InfoExtractor):
+
+    _VALID_URL = r'https?://(?:www\.)?patreon\.com/(?P<id>[-_\w\d]+)/?(?:posts/?)?'
+
+    _TESTS = [{
+        'url': 'https://www.patreon.com/dissonancepod/',
+        'info_dict': {
+            'title': 'dissonancepod',
+        },
+        'playlist_mincount': 68,
+        'expected_warnings': 'Post not viewable by current user! Skipping!',
+    }, {
+        'url': 'https://www.patreon.com/dissonancepod/posts',
+        'only_matching': True
+    }, ]
+
+    @classmethod
+    def suitable(cls, url):
+        return False if PatreonIE.suitable(url) else super(PatreonUserIE, cls).suitable(url)
+
+    def _entries(self, campaign_id, user_id):
+        cursor = None
+        params = {
+            'fields[campaign]': 'show_audio_post_download_links,name,url',
+            'fields[post]': 'current_user_can_view,embed,image,is_paid,post_file,published_at,patreon_url,url,post_type,thumbnail_url,title',
+            'filter[campaign_id]': campaign_id,
+            'filter[is_draft]': 'false',
+            'sort': '-published_at',
+            'json-api-version': 1.0,
+            'json-api-use-default-includes': 'false',
+        }
+
+        for page in itertools.count(1):
+
+            params.update({'page[cursor]': cursor} if cursor else {})
+            posts_json = self._download_json('https://www.patreon.com/api/posts', user_id, note='Downloading posts page %d' % page, query=params, headers={'Cookie': '.'})
+
+            cursor = try_get(posts_json, lambda x: x['meta']['pagination']['cursors']['next'])
+
+            for post in posts_json.get('data') or []:
+                yield self.url_result(url_or_none(try_get(post, lambda x: x['attributes']['patreon_url'])), 'Patreon')
+
+            if cursor is None:
+                break
+
+    def _real_extract(self, url):
+
+        user_id = self._match_id(url)
+        webpage = self._download_webpage(url, user_id, headers={'Cookie': '.'})
+        campaign_id = self._search_regex(r'https://www.patreon.com/api/campaigns/(\d+)/?', webpage, 'Campaign ID')
+        return self.playlist_result(self._entries(campaign_id, user_id), playlist_title=user_id)