debian/patches: Drop patch included in version 2017.02.07.

[youtubedl] / youtube_dl / extractor / hitbox.py

diff --git a/youtube_dl/extractor/hitbox.py b/youtube_dl/extractor/hitbox.py
index 421f55bbeaed2c1249833e5136ff479557c1bccc..e21ebb8fb4057ac6b6d226b3c0f99501b3340cdf 100644 (file)
--- a/youtube_dl/extractor/hitbox.py
+++ b/youtube_dl/extractor/hitbox.py
@@ -25,7 +25,7 @@ class HitboxIE(InfoExtractor):
             'alt_title': 'hitboxlive - Aug 9th #6',
             'description': '',
             'ext': 'mp4',
             'alt_title': 'hitboxlive - Aug 9th #6',
             'description': '',
             'ext': 'mp4',

-            'thumbnail': 're:^https?://.*\.jpg$',
+            'thumbnail': r're:^https?://.*\.jpg$',

             'duration': 215.1666,
             'resolution': 'HD 720p',
             'uploader': 'hitboxlive',
             'duration': 215.1666,
             'resolution': 'HD 720p',
             'uploader': 'hitboxlive',


@@ -159,8 +159,11 @@ class HitboxLiveIE(HitboxIE):
         cdns = player_config.get('cdns')
         servers = []
         for cdn in cdns:
         cdns = player_config.get('cdns')
         servers = []
         for cdn in cdns:

+            # Subscribe URLs are not playable
+            if cdn.get('rtmpSubscribe') is True:
+                continue

             base_url = cdn.get('netConnectionUrl')
             base_url = cdn.get('netConnectionUrl')

-            host = re.search('.+\.([^\.]+\.[^\./]+)/.+', base_url).group(1)
+            host = re.search(r'.+\.([^\.]+\.[^\./]+)/.+', base_url).group(1)

             if base_url not in servers:
                 servers.append(base_url)
                 for stream in cdn.get('bitrates'):
             if base_url not in servers:
                 servers.append(base_url)
                 for stream in cdn.get('bitrates'):