projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[svtplay] Fix id extraction (closes #26576)
[youtube-dl]
/
youtube_dl
/
extractor
/
vidme.py
diff --git
a/youtube_dl/extractor/vidme.py
b/youtube_dl/extractor/vidme.py
index 39b65ed2f7657d62251e103b22285255786bfc6e..174e69cd6b1e8ce1e5bf829781140ea756bdc6bf 100644
(file)
--- a/
youtube_dl/extractor/vidme.py
+++ b/
youtube_dl/extractor/vidme.py
@@
-3,15
+3,13
@@
from __future__ import unicode_literals
import itertools
from .common import InfoExtractor
import itertools
from .common import InfoExtractor
-from ..compat import (
- compat_HTTPError,
- compat_str,
-)
+from ..compat import compat_HTTPError
from ..utils import (
ExtractorError,
int_or_none,
float_or_none,
parse_iso8601,
from ..utils import (
ExtractorError,
int_or_none,
float_or_none,
parse_iso8601,
+ url_or_none,
)
)
@@
-166,8
+164,8
@@
class VidmeIE(InfoExtractor):
formats = []
for f in video.get('formats', []):
formats = []
for f in video.get('formats', []):
- format_url =
f.get('uri'
)
- if not format_url
or not isinstance(format_url, compat_str)
:
+ format_url =
url_or_none(f.get('uri')
)
+ if not format_url:
continue
format_type = f.get('type')
if format_type == 'dash':
continue
format_type = f.get('type')
if format_type == 'dash':
@@
-275,11
+273,7
@@
class VidmeUserIE(VidmeListBaseIE):
'playlist_mincount': 191,
}, {
'url': 'https://vid.me/unsQuare_netWork',
'playlist_mincount': 191,
}, {
'url': 'https://vid.me/unsQuare_netWork',
- 'info_dict': {
- 'id': '16148757',
- 'title': 'unsQuare_netWork - %s' % _TITLE,
- },
- 'playlist_mincount': 73,
+ 'only_matching': True,
}]
}]
@@
-297,9
+291,5
@@
class VidmeUserLikesIE(VidmeListBaseIE):
'playlist_mincount': 415,
}, {
'url': 'https://vid.me/Kaleidoscope-Ish/likes',
'playlist_mincount': 415,
}, {
'url': 'https://vid.me/Kaleidoscope-Ish/likes',
- 'info_dict': {
- 'id': '16908594',
- 'title': 'Kaleidoscope-Ish - %s' % _TITLE,
- },
- 'playlist_mincount': 43,
+ 'only_matching': True,
}]
}]