From a725fb1f4329a436e32019645299c11fa080ed74 Mon Sep 17 00:00:00 2001
From: codesparkle <adam.thalhammer@outlook.com>
Date: Sat, 17 May 2014 01:43:03 +1000
Subject: [PATCH] test_download works for photobucket after this change
---
youtube_dl/extractor/photobucket.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/youtube_dl/extractor/photobucket.py b/youtube_dl/extractor/photobucket.py
index a599534977..5337dea563 100644
--- a/youtube_dl/extractor/photobucket.py
+++ b/youtube_dl/extractor/photobucket.py
@@ -1,10 +1,10 @@
from __future__ import unicode_literals
-import datetime
import json
import re
from .common import InfoExtractor
+from utils import compat_urllib_parse
class PhotobucketIE(InfoExtractor):
@@ -14,6 +14,7 @@ class PhotobucketIE(InfoExtractor):
'file': 'zpsc0c3b9fa.mp4',
'md5': '7dabfb92b0a31f6c16cebc0f8e60ff99',
'info_dict': {
+ 'timestamp': 1367669341,
'upload_date': '20130504',
'uploader': 'rachaneronas',
'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, (.*?)\);',
webpage, 'info json')
info = json.loads(info_json)
+ url = compat_urllib_parse.unquote(self._html_search_regex('file=(.+\.mp4)', info['linkcodes']['html'], 'url'))
return {
'id': video_id,
- 'url': info['downloadUrl'],
+ 'url': url,
'uploader': info['username'],
- 'upload_date': datetime.date.fromtimestamp(info['creationDate']).strftime('%Y%m%d'),
+ 'timestamp': info['creationDate'],
'title': info['title'],
'ext': video_extension,
'thumbnail': info['thumbUrl'],