projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8faf9b9
)
[letv] Simplify
author
Philipp Hagemeister
<phihag@phihag.de>
Thu, 26 Feb 2015 00:30:18 +0000
(
01:30
+0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Thu, 26 Feb 2015 00:30:18 +0000
(
01:30
+0100)
youtube_dl/extractor/letv.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/letv.py
b/youtube_dl/extractor/letv.py
index d5839263c8da99c38336b632d3728e39b96db66f..583ce35b903dd5ee3214db7c7d3f0b604e0f4cf3 100644
(file)
--- a/
youtube_dl/extractor/letv.py
+++ b/
youtube_dl/extractor/letv.py
@@
-1,14
+1,20
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import
os.path
+import
datetime
import re
import time
import re
import time
-import datetime
from .common import InfoExtractor
from .common import InfoExtractor
-from ..compat import (compat_urlparse, compat_urllib_parse)
-from ..utils import (ExtractorError, parse_iso8601)
+from ..compat import (
+ compat_urlparse,
+ compat_urllib_parse,
+)
+from ..utils import (
+ determine_ext,
+ ExtractorError,
+ parse_iso8601,
+)
class LetvIE(InfoExtractor):
class LetvIE(InfoExtractor):
@@
-44,7
+50,7
@@
class LetvIE(InfoExtractor):
def urshift(val, n):
return val >> n if val >= 0 else (val + 0x100000000) >> n
def urshift(val, n):
return val >> n if val >= 0 else (val + 0x100000000) >> n
- # ror() and calc
TimeK
ey() are reversed from a embedded swf file in KLetvPlayer.swf
+ # ror() and calc
_time_k
ey() are reversed from a embedded swf file in KLetvPlayer.swf
def ror(self, param1, param2):
_loc3_ = 0
while _loc3_ < param2:
def ror(self, param1, param2):
_loc3_ = 0
while _loc3_ < param2:
@@
-52,7
+58,7
@@
class LetvIE(InfoExtractor):
_loc3_ += 1
return param1
_loc3_ += 1
return param1
- def calc
TimeK
ey(self, param1):
+ def calc
_time_k
ey(self, param1):
_loc2_ = 773625421
_loc3_ = self.ror(param1, _loc2_ % 13)
_loc3_ = _loc3_ ^ _loc2_
_loc2_ = 773625421
_loc3_ = self.ror(param1, _loc2_ % 13)
_loc3_ = _loc3_ ^ _loc2_
@@
-67,7
+73,7
@@
class LetvIE(InfoExtractor):
'platid': 1,
'splatid': 101,
'format': 1,
'platid': 1,
'splatid': 101,
'format': 1,
- 'tkey': self.calc
TimeK
ey(int(time.time())),
+ 'tkey': self.calc
_time_k
ey(int(time.time())),
'domain': 'www.letv.com'
}
play_json = self._download_json(
'domain': 'www.letv.com'
}
play_json = self._download_json(
@@
-108,7
+114,7
@@
class LetvIE(InfoExtractor):
url_info_dict = {
'url': media_url,
url_info_dict = {
'url': media_url,
- 'ext':
os.path.splitext(dispatch[format_id][1])[1][1:]
+ 'ext':
determine_ext(dispatch[format_id][1])
}
if format_id[-1:] == 'p':
}
if format_id[-1:] == 'p':