git://git.jankratochvil.net
/
youtube-dl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
going home and need to upload what little i did
[youtube-dl.git]
/
youtube-dl
diff --git
a/youtube-dl
b/youtube-dl
index
3a37fae
..
cb31d13
100755
(executable)
--- a/
youtube-dl
+++ b/
youtube-dl
@@
-2709,11
+2709,12
@@
class DepositFilesIE(InfoExtractor):
class FacebookIE(InfoExtractor):
"""Information Extractor for Facebook"""
class FacebookIE(InfoExtractor):
"""Information Extractor for Facebook"""
- _VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/
video/video
\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)'
+ _VALID_URL = r'^(?:https?://)?(?:\w+\.)?facebook\.com/
(?:video/video|photo)
\.php\?(?:.*?)v=(?P<ID>\d+)(?:.*)'
_LOGIN_URL = 'https://login.facebook.com/login.php?m&next=http%3A%2F%2Fm.facebook.com%2Fhome.php&'
_NETRC_MACHINE = 'facebook'
_LOGIN_URL = 'https://login.facebook.com/login.php?m&next=http%3A%2F%2Fm.facebook.com%2Fhome.php&'
_NETRC_MACHINE = 'facebook'
- _available_formats = ['highqual', 'lowqual']
+ _available_formats = ['
video', '
highqual', 'lowqual']
_video_extensions = {
_video_extensions = {
+ 'video': 'mp4',
'highqual': 'mp4',
'lowqual': 'mp4',
}
'highqual': 'mp4',
'lowqual': 'mp4',
}
@@
-2741,10
+2742,9
@@
class FacebookIE(InfoExtractor):
def _parse_page(self, video_webpage):
"""Extract video information from page"""
# General data
def _parse_page(self, video_webpage):
"""Extract video information from page"""
# General data
- data = {'title': r'
class="video_title datawrap">(.*?)</
',
+ data = {'title': r'
\("video_title", "(.*?)"\)
',
'description': r'<div class="datawrap">(.*?)</div>',
'owner': r'\("video_owner_name", "(.*?)"\)',
'description': r'<div class="datawrap">(.*?)</div>',
'owner': r'\("video_owner_name", "(.*?)"\)',
- 'upload_date': r'data-date="(.*?)"',
'thumbnail': r'\("thumb_url", "(?P<THUMB>.*?)"\)',
}
video_info = {}
'thumbnail': r'\("thumb_url", "(?P<THUMB>.*?)"\)',
}
video_info = {}
@@
-3481,6
+3481,13
@@
class XVideosIE(InfoExtractor):
self._downloader.trouble(u'\nERROR: unable to download ' + video_id)
self._downloader.trouble(u'\nERROR: unable to download ' + video_id)
+class SoundcloudIE(InformationExtractor):
+ """Information extractor for soundcloud.com"""
+
+ _VALID_URL = r'^(?:https?://)?(?:www\.)?soundcloud\.com/([\w\d-]+)/(\w\d-]+)'
+ IE_NAME = u'soundcloud'
+
+
class PostProcessor(object):
"""Post Processor class.
class PostProcessor(object):
"""Post Processor class.