projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[foxgay] Ensure height is int
[youtube-dl]
/
youtube_dl
/
extractor
/
chirbit.py
diff --git
a/youtube_dl/extractor/chirbit.py
b/youtube_dl/extractor/chirbit.py
index 61aed016753b28ceac34974c76aca0f9e1639f35..4815b34be7832144075793217de77ba44b7c9471 100644
(file)
--- a/
youtube_dl/extractor/chirbit.py
+++ b/
youtube_dl/extractor/chirbit.py
@@
-2,6
+2,7
@@
from __future__ import unicode_literals
import base64
from __future__ import unicode_literals
import base64
+import re
from .common import InfoExtractor
from ..utils import parse_duration
from .common import InfoExtractor
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,
@@
-53,6
+55,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,6
+65,7
@@
class ChirbitIE(InfoExtractor):
'title': title,
'description': description,
'duration': duration,
'title': title,
'description': description,
'duration': duration,
+ 'uploader': uploader,
}
}
@@
-70,7
+76,6
@@
class ChirbitProfileIE(InfoExtractor):
'url': 'http://chirbit.com/ScarletBeauty',
'info_dict': {
'id': 'ScarletBeauty',
'url': 'http://chirbit.com/ScarletBeauty',
'info_dict': {
'id': 'ScarletBeauty',
- 'title': 'Chirbits by ScarletBeauty',
},
'playlist_mincount': 3,
}
},
'playlist_mincount': 3,
}
@@
-78,13
+83,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)