projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FFmpegMergerPP: use the new system for specifying which files can be delete
[youtube-dl]
/
youtube_dl
/
extractor
/
tnaflix.py
diff --git
a/youtube_dl/extractor/tnaflix.py
b/youtube_dl/extractor/tnaflix.py
index 0ecd695f85e6a40929501fb6adc40bace8784d42..d48cbbf140054e639f7191acfa0909972ef3ab76 100644
(file)
--- a/
youtube_dl/extractor/tnaflix.py
+++ b/
youtube_dl/extractor/tnaflix.py
@@
-12,7
+12,7
@@
from ..utils import (
class TNAFlixIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?tnaflix\.com/(?P<cat_id>[\w-]+)/(?P<display_id>[\w-]+)/video(?P<id>\d+)'
class TNAFlixIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?tnaflix\.com/(?P<cat_id>[\w-]+)/(?P<display_id>[\w-]+)/video(?P<id>\d+)'
- _TITLE_REGEX =
None
+ _TITLE_REGEX =
r'<title>(.+?) - TNAFlix Porn Videos</title>'
_DESCRIPTION_REGEX = r'<h3 itemprop="description">([^<]+)</h3>'
_CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"'
_DESCRIPTION_REGEX = r'<h3 itemprop="description">([^<]+)</h3>'
_CONFIG_REGEX = r'flashvars\.config\s*=\s*escape\("([^"]+)"'
@@
-49,8
+49,8
@@
class TNAFlixIE(InfoExtractor):
if duration:
duration = parse_duration(duration[1:])
if duration:
duration = parse_duration(duration[1:])
- cfg_url = self._html_search_regex(
- self._CONFIG_REGEX, webpage, 'flashvars.config')
+ cfg_url = self._
proto_relative_url(self._
html_search_regex(
+ self._CONFIG_REGEX, webpage, 'flashvars.config')
, 'http:')
cfg_xml = self._download_xml(
cfg_url, display_id, note='Downloading metadata',
cfg_xml = self._download_xml(
cfg_url, display_id, note='Downloading metadata',