projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0e6f914
)
[vivo] Improve extraction (closes #19217)
author
Sergey M․
<dstftw@gmail.com>
Wed, 22 May 2019 20:04:58 +0000
(
03:04
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 22 May 2019 20:06:07 +0000
(
03:06
+0700)
youtube_dl/extractor/shared.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/shared.py
b/youtube_dl/extractor/shared.py
index eade8fd9e0148b5906c5ad8d89c1a8ab5fe17cda..ff575f592003beb91314b0101fb97b3a27a67432 100644
(file)
--- a/
youtube_dl/extractor/shared.py
+++ b/
youtube_dl/extractor/shared.py
@@
-1,15
+1,15
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from ..compat import compat_b64decode
from ..utils import (
from .common import InfoExtractor
from ..compat import compat_b64decode
from ..utils import (
+ determine_ext,
ExtractorError,
int_or_none,
ExtractorError,
int_or_none,
+ KNOWN_EXTENSIONS,
+ parse_filesize,
url_or_none,
urlencode_postdata,
url_or_none,
urlencode_postdata,
- unescapeHTML,
)
)
@@
-26,8
+26,7
@@
class SharedBaseIE(InfoExtractor):
video_url = self._extract_video_url(webpage, video_id, url)
title = self._extract_title(webpage)
video_url = self._extract_video_url(webpage, video_id, url)
title = self._extract_title(webpage)
- filesize = int_or_none(self._html_search_meta(
- 'full:size', webpage, 'file size', fatal=False))
+ filesize = int_or_none(self._extract_filesize(webpage))
return {
'id': video_id,
return {
'id': video_id,
@@
-41,6
+40,10
@@
class SharedBaseIE(InfoExtractor):
return compat_b64decode(self._html_search_meta(
'full:title', webpage, 'title')).decode('utf-8')
return compat_b64decode(self._html_search_meta(
'full:title', webpage, 'title')).decode('utf-8')
+ def _extract_filesize(self, webpage):
+ return self._html_search_meta(
+ 'full:size', webpage, 'file size', fatal=False)
+
class SharedIE(SharedBaseIE):
IE_DESC = 'shared.sx'
class SharedIE(SharedBaseIE):
IE_DESC = 'shared.sx'
@@
-88,19
+91,27
@@
class VivoIE(SharedBaseIE):
'id': 'd7ddda0e78',
'ext': 'mp4',
'title': 'Chicken',
'id': 'd7ddda0e78',
'ext': 'mp4',
'title': 'Chicken',
- 'filesize': 5
28031
,
+ 'filesize': 5
15659
,
},
}
def _extract_title(self, webpage):
},
}
def _extract_title(self, webpage):
-
data_title = self.
_search_regex(
+
title = self._html
_search_regex(
r'data-name\s*=\s*(["\'])(?P<title>(?:(?!\1).)+)\1', webpage,
'title', default=None, group='title')
r'data-name\s*=\s*(["\'])(?P<title>(?:(?!\1).)+)\1', webpage,
'title', default=None, group='title')
- if data_title:
- return unescapeHTML(re.sub(r"\.[a-z0-9]{3,4}$", "", data_title))
+ if title:
+ ext = determine_ext(title)
+ if ext.lower() in KNOWN_EXTENSIONS:
+ title = title.rpartition('.' + ext)[0]
+ return title
return self._og_search_title(webpage)
return self._og_search_title(webpage)
- def _extract_video_url(self, webpage, video_id, *args):
+ def _extract_filesize(self, webpage):
+ return parse_filesize(self._search_regex(
+ r'data-type=["\']video["\'][^>]*>Watch.*?<strong>\s*\((.+?)\)',
+ webpage, 'filesize', fatal=False))
+
+ def _extract_video_url(self, webpage, video_id, url):
def decode_url(encoded_url):
return compat_b64decode(encoded_url).decode('utf-8')
def decode_url(encoded_url):
return compat_b64decode(encoded_url).decode('utf-8')