nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[arte] use M3U8 format instead of HBBTV

Browse source
This commit is contained in:
Bezleputh 2014-07-29 17:37:54 +02:00
commit 648fc82b39
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/arte/browser.py
View file

@ -61,18 +61,24 @@ class ArteBrowser(BaseBrowser):
if video is None: if video is None:
video = self.create_video(result['video']) video = self.create_video(result['video'])
try: try:
video.url = u'%s' % result['video']['VSR'][0]['VUR'] video.url = self.get_first_link_m3u8(result['video']['VSR'][0]['VUR'])
video.ext = u'%s' % result['video']['VSR'][0]['VMT'] video.ext = u'm3u8'
except: except:
video.url, video.ext = self.get_default_url(url) video.url, video.ext = self.get_default_url(url)
return video return video
def get_first_link_m3u8(self, url):
r = self.openurl(url)
baseurl = url.rpartition('/')[0]
for line in r.readlines():
if not line.startswith('#'):
return u'%s/%s' % (baseurl, line.replace('\n', ''))
def get_default_url(self, url): def get_default_url(self, url):
result = self.get_video_by_quality(url, 'ALL') result = self.get_video_by_quality(url, 'ALL')
try: try:
return u'%s' % result['video']['VSR'][0]['VUR'], \ return self.get_first_link_m3u8(result['video']['VSR'][0]['VUR']), u'm3u8'
u'%s' % result['video']['VSR'][0]['VMT']
except: except:
return NotAvailable, NotAvailable return NotAvailable, NotAvailable

2
modules/arte/video.py
View file

@ -28,7 +28,7 @@ class ArteVideo(BaseVideo):
@classmethod @classmethod
def id2url(cls, _id): def id2url(cls, _id):
lang = _id[-1:] lang = _id[-1:]
return 'http://arte.tv/papi/tvguide/videos/stream/%s/%s/HBBTV' % (lang, _id) return 'http://arte.tv/papi/tvguide/videos/stream/%s/%s/M3U8' % (lang, _id)
class ArteLiveVideo(BaseVideo): class ArteLiveVideo(BaseVideo):