diff options
| author | Sergey M․ <dstftw@gmail.com> | 2017-04-08 21:11:08 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2017-04-08 21:11:08 +0700 |
| commit | 29c6726646326fdbf17fca2f0e5600b6ee3b9f63 (patch) | |
| tree | cdde5776072bcce0dc8497eec21288eb8e002668 | |
| parent | a66e25859a0f163446c009f9a71abab4083745f8 (diff) | |
| download | youtube-dl-29c6726646326fdbf17fca2f0e5600b6ee3b9f63.tar.xz | |
[mixcloud] Fix view count extraction and modernize
| -rw-r--r-- | youtube_dl/extractor/mixcloud.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/mixcloud.py b/youtube_dl/extractor/mixcloud.py index bc38a8663..0efbe660a 100644 --- a/youtube_dl/extractor/mixcloud.py +++ b/youtube_dl/extractor/mixcloud.py @@ -97,7 +97,7 @@ class MixcloudIE(InfoExtractor): view_count = str_to_int(self._search_regex( [r'<meta itemprop="interactionCount" content="UserPlays:([0-9]+)"', r'/listeners/?">([0-9,.]+)</a>', - r'm-tooltip=["\']([\d,.]+) plays'], + r'(?:m|data)-tooltip=["\']([\d,.]+) plays'], webpage, 'play count', default=None)) return { @@ -143,7 +143,7 @@ class MixcloudPlaylistBaseIE(InfoExtractor): class MixcloudUserIE(MixcloudPlaylistBaseIE): - _VALID_URL = r'^(?:https?://)?(?:www\.)?mixcloud\.com/(?P<user>[^/]+)/(?P<type>uploads|favorites|listens)?/?$' + _VALID_URL = r'https?://(?:www\.)?mixcloud\.com/(?P<user>[^/]+)/(?P<type>uploads|favorites|listens)?/?$' IE_NAME = 'mixcloud:user' _TESTS = [{ @@ -216,7 +216,7 @@ class MixcloudUserIE(MixcloudPlaylistBaseIE): class MixcloudPlaylistIE(MixcloudPlaylistBaseIE): - _VALID_URL = r'^(?:https?://)?(?:www\.)?mixcloud\.com/(?P<user>[^/]+)/playlists/(?P<playlist>[^/]+)/?$' + _VALID_URL = r'https?://(?:www\.)?mixcloud\.com/(?P<user>[^/]+)/playlists/(?P<playlist>[^/]+)/?$' IE_NAME = 'mixcloud:playlist' _TESTS = [{ @@ -259,7 +259,7 @@ class MixcloudPlaylistIE(MixcloudPlaylistBaseIE): class MixcloudStreamIE(MixcloudPlaylistBaseIE): - _VALID_URL = r'^(?:https?://)?(?:www\.)?mixcloud\.com/(?P<id>[^/]+)/stream/?$' + _VALID_URL = r'https?://(?:www\.)?mixcloud\.com/(?P<id>[^/]+)/stream/?$' IE_NAME = 'mixcloud:stream' _TEST = { |