projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[thisav] Improve title extraction (closes #10682)
[youtube-dl]
/
youtube_dl
/
extractor
/
thisav.py
diff --git
a/youtube_dl/extractor/thisav.py
b/youtube_dl/extractor/thisav.py
index 027a8e90712a7b8f84f8bd5096ea41a125ef9384..4473a3c773c3d9c4c26361e907769e8bb1ac9fad 100644
(file)
--- a/
youtube_dl/extractor/thisav.py
+++ b/
youtube_dl/extractor/thisav.py
@@
-4,6
+4,7
@@
from __future__ import unicode_literals
import re
from .jwplatform import JWPlatformBaseIE
import re
from .jwplatform import JWPlatformBaseIE
+from ..utils import remove_end
class ThisAVIE(JWPlatformBaseIE):
class ThisAVIE(JWPlatformBaseIE):
@@
-35,7
+36,9
@@
class ThisAVIE(JWPlatformBaseIE):
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
video_id = mobj.group('id')
webpage = self._download_webpage(url, video_id)
- title = self._html_search_regex(r'<h1>([^<]*)</h1>', webpage, 'title')
+ title = remove_end(self._html_search_regex(
+ r'<title>([^<]+)</title>', webpage, 'title'),
+ ' - 視頻 - ThisAV.com-世界第一中文成人娛樂網站')
video_url = self._html_search_regex(
r"addVariable\('file','([^']+)'\);", webpage, 'video url', default=None)
if video_url:
video_url = self._html_search_regex(
r"addVariable\('file','([^']+)'\);", webpage, 'video url', default=None)
if video_url: