mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-12-23 08:26:50 +00:00
Merge remote-tracking branch 'codesparkle/fix-photobucket-url' (closes #2934)
Fix photobucket url extraction
This commit is contained in:
commit
08af0205f9
@ -1,10 +1,10 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
import datetime
|
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from ..utils import compat_urllib_parse
|
||||||
|
|
||||||
|
|
||||||
class PhotobucketIE(InfoExtractor):
|
class PhotobucketIE(InfoExtractor):
|
||||||
@ -14,6 +14,7 @@ class PhotobucketIE(InfoExtractor):
|
|||||||
'file': 'zpsc0c3b9fa.mp4',
|
'file': 'zpsc0c3b9fa.mp4',
|
||||||
'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
|
'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
|
'timestamp': 1367669341,
|
||||||
'upload_date': '20130504',
|
'upload_date': '20130504',
|
||||||
'uploader': 'rachaneronas',
|
'uploader': 'rachaneronas',
|
||||||
'title': 'Tired of Link Building? Try BacklinkMyDomain.com!',
|
'title': 'Tired of Link Building? Try BacklinkMyDomain.com!',
|
||||||
@ -32,11 +33,12 @@ class PhotobucketIE(InfoExtractor):
|
|||||||
info_json = self._search_regex(r'Pb\.Data\.Shared\.put\(Pb\.Data\.Shared\.MEDIA, (.*?)\);',
|
info_json = self._search_regex(r'Pb\.Data\.Shared\.put\(Pb\.Data\.Shared\.MEDIA, (.*?)\);',
|
||||||
webpage, 'info json')
|
webpage, 'info json')
|
||||||
info = json.loads(info_json)
|
info = json.loads(info_json)
|
||||||
|
url = compat_urllib_parse.unquote(self._html_search_regex(r'file=(.+\.mp4)', info['linkcodes']['html'], 'url'))
|
||||||
return {
|
return {
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': info['downloadUrl'],
|
'url': url,
|
||||||
'uploader': info['username'],
|
'uploader': info['username'],
|
||||||
'upload_date': datetime.date.fromtimestamp(info['creationDate']).strftime('%Y%m%d'),
|
'timestamp': info['creationDate'],
|
||||||
'title': info['title'],
|
'title': info['title'],
|
||||||
'ext': video_extension,
|
'ext': video_extension,
|
||||||
'thumbnail': info['thumbUrl'],
|
'thumbnail': info['thumbUrl'],
|
||||||
|
Loading…
Reference in New Issue
Block a user