projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a66e258
)
[mixcloud] Fix view count extraction and modernize
author
Sergey M․
<dstftw@gmail.com>
Sat, 8 Apr 2017 14:11:08 +0000
(21:11 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 8 Apr 2017 14:11:08 +0000
(21:11 +0700)
youtube_dl/extractor/mixcloud.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/mixcloud.py
b/youtube_dl/extractor/mixcloud.py
index bc38a86638f025dad1a24b5a0cdbd284fc4c3848..0efbe660a5d2a88b41e198078da84baf8bfc7a9e 100644
(file)
--- 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>',
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 {
webpage, 'play count', default=None))
return {
@@
-143,7
+143,7
@@
class MixcloudPlaylistBaseIE(InfoExtractor):
class MixcloudUserIE(MixcloudPlaylistBaseIE):
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 = [{
IE_NAME = 'mixcloud:user'
_TESTS = [{
@@
-216,7
+216,7
@@
class MixcloudUserIE(MixcloudPlaylistBaseIE):
class MixcloudPlaylistIE(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 = [{
IE_NAME = 'mixcloud:playlist'
_TESTS = [{
@@
-259,7
+259,7
@@
class MixcloudPlaylistIE(MixcloudPlaylistBaseIE):
class MixcloudStreamIE(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 = {
IE_NAME = 'mixcloud:stream'
_TEST = {