projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove unnecessary assignment parenthesis
[youtube-dl]
/
youtube_dl
/
extractor
/
hrti.py
diff --git
a/youtube_dl/extractor/hrti.py
b/youtube_dl/extractor/hrti.py
index 656ce6d0504180daa1f27495459599d47cebdae0..9ba1aa7032eb932e325f9e1e40da1e4b583ce322 100644
(file)
--- a/
youtube_dl/extractor/hrti.py
+++ b/
youtube_dl/extractor/hrti.py
@@
-66,7
+66,7
@@
class HRTiBaseIE(InfoExtractor):
self._logout_url = modules['user']['resources']['logout']['uri']
def _login(self):
self._logout_url = modules['user']['resources']['logout']['uri']
def _login(self):
-
(username, password)
= self._get_login_info()
+
username, password
= self._get_login_info()
# TODO: figure out authentication with cookies
if username is None or password is None:
self.raise_login_required()
# TODO: figure out authentication with cookies
if username is None or password is None:
self.raise_login_required()
@@
-104,7
+104,7
@@
class HRTiIE(HRTiBaseIE):
(?:
hrti:(?P<short_id>[0-9]+)|
https?://
(?:
hrti:(?P<short_id>[0-9]+)|
https?://
- hrti\.hrt\.hr/
\#/
video/show/(?P<id>[0-9]+)/(?P<display_id>[^/]+)?
+ hrti\.hrt\.hr/
(?:\#/)?
video/show/(?P<id>[0-9]+)/(?P<display_id>[^/]+)?
)
'''
_TESTS = [{
)
'''
_TESTS = [{
@@
-129,6
+129,9
@@
class HRTiIE(HRTiBaseIE):
}, {
'url': 'hrti:2181385',
'only_matching': True,
}, {
'url': 'hrti:2181385',
'only_matching': True,
+ }, {
+ 'url': 'https://hrti.hrt.hr/video/show/3873068/cuvar-dvorca-dramska-serija-14',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-170,7
+173,7
@@
class HRTiIE(HRTiBaseIE):
class HRTiPlaylistIE(HRTiBaseIE):
class HRTiPlaylistIE(HRTiBaseIE):
- _VALID_URL = r'https?://hrti
.hrt.hr/#/
video/list/category/(?P<id>[0-9]+)/(?P<display_id>[^/]+)?'
+ _VALID_URL = r'https?://hrti
\.hrt\.hr/(?:#/)?
video/list/category/(?P<id>[0-9]+)/(?P<display_id>[^/]+)?'
_TESTS = [{
'url': 'https://hrti.hrt.hr/#/video/list/category/212/ekumena',
'info_dict': {
_TESTS = [{
'url': 'https://hrti.hrt.hr/#/video/list/category/212/ekumena',
'info_dict': {
@@
-182,6
+185,9
@@
class HRTiPlaylistIE(HRTiBaseIE):
}, {
'url': 'https://hrti.hrt.hr/#/video/list/category/212/',
'only_matching': True,
}, {
'url': 'https://hrti.hrt.hr/#/video/list/category/212/',
'only_matching': True,
+ }, {
+ 'url': 'https://hrti.hrt.hr/video/list/category/212/ekumena',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):