projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Remove info el for get_video_info request
[youtube-dl]
/
youtube_dl
/
extractor
/
chirbit.py
diff --git
a/youtube_dl/extractor/chirbit.py
b/youtube_dl/extractor/chirbit.py
index b435186523454e0873a8adedda2f80c1a8a6ecbe..8d75cdf199b7f7b8ac5321c1e58b7ef57d4f2622 100644
(file)
--- a/
youtube_dl/extractor/chirbit.py
+++ b/
youtube_dl/extractor/chirbit.py
@@
-1,9
+1,10
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import
base64
+import
re
from .common import InfoExtractor
from .common import InfoExtractor
+from ..compat import compat_b64decode
from ..utils import parse_duration
from ..utils import parse_duration
@@
-18,6
+19,7
@@
class ChirbitIE(InfoExtractor):
'title': 'md5:f542ea253f5255240be4da375c6a5d7e',
'description': 'md5:f24a4e22a71763e32da5fed59e47c770',
'duration': 306,
'title': 'md5:f542ea253f5255240be4da375c6a5d7e',
'description': 'md5:f24a4e22a71763e32da5fed59e47c770',
'duration': 306,
+ 'uploader': 'Gerryaudio',
},
'params': {
'skip_download': True,
},
'params': {
'skip_download': True,
@@
-42,8
+44,7
@@
class ChirbitIE(InfoExtractor):
# Reverse engineered from https://chirb.it/js/chirbit.player.js (look
# for soundURL)
# Reverse engineered from https://chirb.it/js/chirbit.player.js (look
# for soundURL)
- audio_url = base64.b64decode(
- data_fd[::-1].encode('ascii')).decode('utf-8')
+ audio_url = compat_b64decode(data_fd[::-1]).decode('utf-8')
title = self._search_regex(
r'class=["\']chirbit-title["\'][^>]*>([^<]+)', webpage, 'title')
title = self._search_regex(
r'class=["\']chirbit-title["\'][^>]*>([^<]+)', webpage, 'title')
@@
-53,6
+54,9
@@
class ChirbitIE(InfoExtractor):
duration = parse_duration(self._search_regex(
r'class=["\']c-length["\'][^>]*>([^<]+)',
webpage, 'duration', fatal=False))
duration = parse_duration(self._search_regex(
r'class=["\']c-length["\'][^>]*>([^<]+)',
webpage, 'duration', fatal=False))
+ uploader = self._search_regex(
+ r'id=["\']chirbit-username["\'][^>]*>([^<]+)',
+ webpage, 'uploader', fatal=False)
return {
'id': audio_id,
return {
'id': audio_id,
@@
-60,17
+64,17
@@
class ChirbitIE(InfoExtractor):
'title': title,
'description': description,
'duration': duration,
'title': title,
'description': description,
'duration': duration,
+ 'uploader': uploader,
}
class ChirbitProfileIE(InfoExtractor):
IE_NAME = 'chirbit:profile'
}
class ChirbitProfileIE(InfoExtractor):
IE_NAME = 'chirbit:profile'
- _VALID_URL = r'https?://(?:www\.)?chirbit.com/(?:rss/)?(?P<id>[^/]+)'
+ _VALID_URL = r'https?://(?:www\.)?chirbit
\
.com/(?:rss/)?(?P<id>[^/]+)'
_TEST = {
'url': 'http://chirbit.com/ScarletBeauty',
'info_dict': {
'id': 'ScarletBeauty',
_TEST = {
'url': 'http://chirbit.com/ScarletBeauty',
'info_dict': {
'id': 'ScarletBeauty',
- 'title': 'Chirbits by ScarletBeauty',
},
'playlist_mincount': 3,
}
},
'playlist_mincount': 3,
}
@@
-78,13
+82,10
@@
class ChirbitProfileIE(InfoExtractor):
def _real_extract(self, url):
profile_id = self._match_id(url)
def _real_extract(self, url):
profile_id = self._match_id(url)
- rss = self._download_xml(
- 'http://chirbit.com/rss/%s' % profile_id, profile_id)
+ webpage = self._download_webpage(url, profile_id)
entries = [
entries = [
- self.url_result(
audio_url.text, 'Chirbit'
)
- for
audio_url in rss.findall('./channel/item/link'
)]
+ self.url_result(
self._proto_relative_url('//chirb.it/' + video_id)
)
+ for
_, video_id in re.findall(r'<input[^>]+id=([\'"])copy-btn-(?P<id>[0-9a-zA-Z]+)\1', webpage
)]
- title = rss.find('./channel/title').text
-
- return self.playlist_result(entries, profile_id, title)
+ return self.playlist_result(entries, profile_id)