projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c0345b8
)
[cliphinter] Fix extraction (closes #18083)
author
Sergey M․
<dstftw@gmail.com>
Tue, 6 Nov 2018 16:29:42 +0000
(23:29 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 6 Nov 2018 16:29:42 +0000
(23:29 +0700)
youtube_dl/extractor/cliphunter.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/cliphunter.py
b/youtube_dl/extractor/cliphunter.py
index ab651d1c8632fe08c29d44334cb4ba4a6ea2fddf..f2ca7a337df88aab5ba7f7b070537b7b9fec3172 100644
(file)
--- a/
youtube_dl/extractor/cliphunter.py
+++ b/
youtube_dl/extractor/cliphunter.py
@@
-1,19
+1,10
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
-from ..utils import int_or_none
-
-
-_translation_table = {
- 'a': 'h', 'd': 'e', 'e': 'v', 'f': 'o', 'g': 'f', 'i': 'd', 'l': 'n',
- 'm': 'a', 'n': 'm', 'p': 'u', 'q': 't', 'r': 's', 'v': 'p', 'x': 'r',
- 'y': 'l', 'z': 'i',
- '$': ':', '&': '.', '(': '=', '^': '&', '=': '/',
-}
-
-
-def _decode(s):
- return ''.join(_translation_table.get(c, c) for c in s)
+from ..utils import (
+ int_or_none,
+ url_or_none,
+)
class CliphunterIE(InfoExtractor):
class CliphunterIE(InfoExtractor):
@@
-60,14
+51,14
@@
class CliphunterIE(InfoExtractor):
formats = []
for format_id, f in gexo_files.items():
formats = []
for format_id, f in gexo_files.items():
- video_url =
f.get('url'
)
+ video_url =
url_or_none(f.get('url')
)
if not video_url:
continue
fmt = f.get('fmt')
height = f.get('h')
format_id = '%s_%sp' % (fmt, height) if fmt and height else format_id
formats.append({
if not video_url:
continue
fmt = f.get('fmt')
height = f.get('h')
format_id = '%s_%sp' % (fmt, height) if fmt and height else format_id
formats.append({
- 'url':
_decode(video_url)
,
+ 'url':
video_url
,
'format_id': format_id,
'width': int_or_none(f.get('w')),
'height': int_or_none(height),
'format_id': format_id,
'width': int_or_none(f.get('w')),
'height': int_or_none(height),