Merge pull request #4 from debian-janitor/lintian-fixes

[youtubedl] / youtube_dl / extractor / bitchute.py

diff --git a/youtube_dl/extractor/bitchute.py b/youtube_dl/extractor/bitchute.py
index 4f39424f59ee12bb5adb916e707b3a33e9d35e58..0c773e66e1c7349802b4bb8425e844163d18da75 100644 (file)
--- a/youtube_dl/extractor/bitchute.py
+++ b/youtube_dl/extractor/bitchute.py
@@ -7,6 +7,7 @@ import re
 from .common import InfoExtractor
 from ..utils import (
     orderedSet,
 from .common import InfoExtractor
 from ..utils import (
     orderedSet,

+    unified_strdate,

     urlencode_postdata,
 )
 
     urlencode_postdata,
 )
 


@@ -23,6 +24,7 @@ class BitChuteIE(InfoExtractor):
             'description': 'md5:3f21f6fb5b1d17c3dee9cf6b5fe60b3a',
             'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'Victoria X Rave',
             'description': 'md5:3f21f6fb5b1d17c3dee9cf6b5fe60b3a',
             'thumbnail': r're:^https?://.*\.jpg$',
             'uploader': 'Victoria X Rave',

+            'upload_date': '20170813',

         },
     }, {
         'url': 'https://www.bitchute.com/embed/lbb5G1hjPhw/',
         },
     }, {
         'url': 'https://www.bitchute.com/embed/lbb5G1hjPhw/',


@@ -55,6 +57,11 @@ class BitChuteIE(InfoExtractor):
         formats = [
             {'url': format_url}
             for format_url in orderedSet(format_urls)]
         formats = [
             {'url': format_url}
             for format_url in orderedSet(format_urls)]

+
+        if not formats:
+            formats = self._parse_html5_media_entries(
+                url, webpage, video_id)[0]['formats']
+

         self._check_formats(formats, video_id)
         self._sort_formats(formats)
 
         self._check_formats(formats, video_id)
         self._sort_formats(formats)
 


@@ -65,8 +72,13 @@ class BitChuteIE(InfoExtractor):
             webpage, default=None) or self._html_search_meta(
             'twitter:image:src', webpage, 'thumbnail')
         uploader = self._html_search_regex(
             webpage, default=None) or self._html_search_meta(
             'twitter:image:src', webpage, 'thumbnail')
         uploader = self._html_search_regex(

-            r'(?s)<p\b[^>]+\bclass=["\']video-author[^>]+>(.+?)</p>', webpage,
-            'uploader', fatal=False)
+            (r'(?s)<div class=["\']channel-banner.*?<p\b[^>]+\bclass=["\']name[^>]+>(.+?)</p>',
+             r'(?s)<p\b[^>]+\bclass=["\']video-author[^>]+>(.+?)</p>'),
+            webpage, 'uploader', fatal=False)
+
+        upload_date = unified_strdate(self._search_regex(
+            r'class=["\']video-publish-date[^>]+>[^<]+ at \d+:\d+ UTC on (.+?)\.',
+            webpage, 'upload date', fatal=False))

 
         return {
             'id': video_id,
 
         return {
             'id': video_id,


@@ -74,6 +86,7 @@ class BitChuteIE(InfoExtractor):
             'description': description,
             'thumbnail': thumbnail,
             'uploader': uploader,
             'description': description,
             'thumbnail': thumbnail,
             'uploader': uploader,

+            'upload_date': upload_date,

             'formats': formats,
         }
 
             'formats': formats,
         }