diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2011-02-04 04:02:29 -0200 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2011-02-04 04:02:29 -0200 |
| commit | f24c674b048003d878a1d6436c1b2af47693f2ac (patch) | |
| tree | ab5cfd38d00d4c4989dfd99bcc8e46008a68fbca | |
| parent | 58b53721af446dcc2766f89a80f90c2f9f95d6ea (diff) | |
| download | youtube-dl-f24c674b048003d878a1d6436c1b2af47693f2ac.tar.gz youtube-dl-f24c674b048003d878a1d6436c1b2af47693f2ac.tar.bz2 youtube-dl-f24c674b048003d878a1d6436c1b2af47693f2ac.zip | |
Make some of the comments more descriptive.
| -rwxr-xr-x | youtube-dl | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/youtube-dl b/youtube-dl index b96156be7..a925c9783 100755 --- a/youtube-dl +++ b/youtube-dl @@ -1764,8 +1764,12 @@ class VimeoIE(InfoExtractor): self._downloader.trouble(u'ERROR: Unable to retrieve video webpage: %s' % str(err)) return - # Extract uploader and title from webpage + # Now we begin extracting as much information as we can from what we + # retrieved. First we extract the information common to all extractors, + # and latter we extract those that are Vimeo specific. self.report_extraction(video_id) + + # Extract title mobj = re.search(r'<caption>(.*?)</caption>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract video title') @@ -1773,6 +1777,7 @@ class VimeoIE(InfoExtractor): video_title = mobj.group(1).decode('utf-8') simple_title = re.sub(ur'(?u)([^%s]+)' % simple_title_chars, ur'_', video_title) + # Extract uploader mobj = re.search(r'<uploader_url>http://vimeo.com/(.*?)</uploader_url>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract video uploader') @@ -1795,14 +1800,14 @@ class VimeoIE(InfoExtractor): # if not video_description: video_description = 'No description available.' video_description = 'Foo.' - # Extract request signature + # Vimeo specific: extract request signature mobj = re.search(r'<request_signature>(.*?)</request_signature>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract request signature') return sig = mobj.group(1).decode('utf-8') - # Extract request signature expiration + # Vimeo specific: Extract request signature expiration mobj = re.search(r'<request_signature_expires>(.*?)</request_signature_expires>', webpage) if mobj is None: self._downloader.trouble(u'ERROR: unable to extract request signature expiration') |