From: Philipp Hagemeister <phihag@phihag.de>
Date: Thu, 27 Sep 2012 16:55:56 +0000 (+0200)
Subject: Merge xnxx.com Support (NSFW). Test URL (SFW): http://video.xnxx.com/video1443330... 
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=ebe3f89ea45dc74bbadab10acc27ebf91ddbb736;p=youtube-dl

Merge xnxx.com Support (NSFW). Test URL (SFW): http://video.xnxx.com/video1443330/youtube-dl_testvid_a_and_9829_._and_amp_and_38_
---

ebe3f89ea45dc74bbadab10acc27ebf91ddbb736
diff --cc youtube_dl/InfoExtractors.py
index 8dd1c0b07,32c52cc08..56003df26
--- a/youtube_dl/InfoExtractors.py
+++ b/youtube_dl/InfoExtractors.py
@@@ -2955,3 -2955,73 +2955,73 @@@ class MTVIE(InfoExtractor)
  		}
  
  		return [info]
+ 
+ class XNXXIE(InfoExtractor):
+ 	"""Information extractor for xnxx.com"""
+ 
+ 	_VALID_URL = r'^http://video\.xnxx\.com/video([0-9]+)/(.*)'
+ 	IE_NAME = u'xnxx'
+ 	VIDEO_URL_RE = r'flv_url=(.*?)&amp;'
+ 	VIDEO_TITLE_RE = r'<title>(.*?)\s+-\s+XNXX.COM'
+ 	VIDEO_THUMB_RE = r'url_bigthumb=(.*?)&amp;'
+ 
+ 	def report_webpage(self, video_id):
+ 		"""Report information extraction"""
+ 		self._downloader.to_screen(u'[%s] %s: Downloading webpage' % (self.IE_NAME, video_id))
+ 
+ 	def report_extraction(self, video_id):
+ 		"""Report information extraction"""
+ 		self._downloader.to_screen(u'[%s] %s: Extracting information' % (self.IE_NAME, video_id))
+ 
+ 	def extract_video_url(self, webpage):
+ 		"Extract the url for the video from the webpage"
+ 		
+ 		result = re.search(self.VIDEO_URL_RE, webpage)
+ 		if result is None:
+ 			self._downloader.trouble(u'ERROR: unable to extract video url')
+ 		return urllib.unquote(result.group(1).decode('utf-8'))
+ 
+ 	def extract_video_title(self, webpage):
+ 		"Extract the title for the video from the webpage"
+ 
+ 		result = re.search(self.VIDEO_TITLE_RE, webpage)
+ 		if result is None:
+ 			self._downloader.trouble(u'ERROR: unable to extract video title')
+ 		return result.group(1).decode('utf-8')
+ 
+ 	def extract_video_thumbnail(self, webpage):
+ 		"Extract the thumbnail for the video from the webpage"
+ 
+ 		result = re.search(self.VIDEO_THUMB_RE, webpage)
+ 		if result is None:
+ 			self._downloader.trouble(u'ERROR: unable to extract video thumbnail')
+ 		return result.group(1).decode('utf-8')
+ 
+ 	def _real_extract(self, url):
+ 		mobj = re.match(self._VALID_URL, url)
+ 		if mobj is None:
+ 			self._downloader.trouble(u'ERROR: invalid URL: %s' % url)
+ 			return
+ 		video_id = mobj.group(1).decode('utf-8')
+ 
+ 		self.report_webpage(video_id)
+ 
+ 		# Get webpage content
+ 		try:
+ 			webpage = urllib2.urlopen(url).read()
+ 		except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+ 			self._downloader.trouble(u'ERROR: unable to download video webpage: %s' % err)
+ 			return
+ 
+ 		info = {'id': video_id,
+ 				'url': self.extract_video_url(webpage),
+ 				'uploader': None,
+ 				'upload_date': None,
+ 				'title': self.extract_video_title(webpage),
+ 				'ext': 'flv',
+ 				'format': 'flv',
+ 				'thumbnail': self.extract_video_thumbnail(webpage),
+ 				'description': None,
+ 				'player_url': None}
+ 
 -		return [info]
++		return [info]