diff options
author | CaptainT <CaptainTK@users.noreply.github.com> | 2017-10-20 21:59:24 +0200 |
---|---|---|
committer | CaptainT <CaptainTK@users.noreply.github.com> | 2017-10-20 21:59:24 +0200 |
commit | 9938b46bab5e79d6206553653bb9fc2dd19921dc (patch) | |
tree | 81fb7d98e4510b2d285866c3087224c94b15992f | |
parent | f9a09137e968901c8bc5995f10212c1c2bac26e2 (diff) |
[plugin.video.iplayerwww] 3.0.17
-rw-r--r-- | plugin.video.iplayerwww/addon.xml | 8 | ||||
-rw-r--r-- | plugin.video.iplayerwww/resources/lib/ipwww_common.py | 10 | ||||
-rw-r--r-- | plugin.video.iplayerwww/resources/lib/ipwww_video.py | 12 |
3 files changed, 20 insertions, 10 deletions
diff --git a/plugin.video.iplayerwww/addon.xml b/plugin.video.iplayerwww/addon.xml index 02bda65..49fdfe9 100644 --- a/plugin.video.iplayerwww/addon.xml +++ b/plugin.video.iplayerwww/addon.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<addon id="plugin.video.iplayerwww" name="iPlayer WWW" version="3.0.15" provider-name="CaptainT, Cas, ihurst, primaeval"> +<addon id="plugin.video.iplayerwww" name="iPlayer WWW" version="3.0.17" provider-name="CaptainT, Cas, ihurst, primaeval"> <requires> <import addon="xbmc.python" version="2.25.0"/> <import addon="script.module.requests" version="2.7.0"/> @@ -22,6 +22,12 @@ <fanart>resources/fanart.jpg</fanart> </assets> <news> +v3.0.17 +Fixed Highlights. + +v3.0.16 +Categories now needs https. + v3.0.15 Fixed Highlights. diff --git a/plugin.video.iplayerwww/resources/lib/ipwww_common.py b/plugin.video.iplayerwww/resources/lib/ipwww_common.py index 797896f..962a169 100644 --- a/plugin.video.iplayerwww/resources/lib/ipwww_common.py +++ b/plugin.video.iplayerwww/resources/lib/ipwww_common.py @@ -419,27 +419,27 @@ def CreateBaseDirectory(content_type): live_mode = 123 AddMenuEntry(translation(30329), 'cbeebies_hd', live_mode, xbmc.translatePath( - 'special://home/addons/plugin.video.iplayerwww/media/cbeebies.png' + 'special://home/addons/plugin.video.iplayerwww/media/cbeebies_hd.png' ), '', '') AddMenuEntry(translation(30330), 'cbbc_hd', live_mode, xbmc.translatePath( - 'special://home/addons/plugin.video.iplayerwww/media/cbbc.png' + 'special://home/addons/plugin.video.iplayerwww/media/cbbc_hd.png' ), '', '') AddMenuEntry(translation(30331), 'cbeebies', 125, xbmc.translatePath( - 'special://home/addons/plugin.video.iplayerwww/media/cbeebies.png' + 'special://home/addons/plugin.video.iplayerwww/media/cbeebies_hd.png' ), '', '') AddMenuEntry(translation(30332), 'cbbc', 125, xbmc.translatePath( - 'special://home/addons/plugin.video.iplayerwww/media/cbbc.png' + 'special://home/addons/plugin.video.iplayerwww/media/cbbc_hd.png' ), '', '') AddMenuEntry(translation(30333), 'p02pnn9d', 131, xbmc.translatePath( - 'special://home/addons/plugin.video.iplayerwww/media/cbeebies.png' + 'special://home/addons/plugin.video.iplayerwww/media/cbeebies_hd.png' ), '', '') return diff --git a/plugin.video.iplayerwww/resources/lib/ipwww_video.py b/plugin.video.iplayerwww/resources/lib/ipwww_video.py index e7d17da..08b6a0c 100644 --- a/plugin.video.iplayerwww/resources/lib/ipwww_video.py +++ b/plugin.video.iplayerwww/resources/lib/ipwww_video.py @@ -306,7 +306,7 @@ def ScrapeEpisodes(page_url): for page in page_range: if page > current_page: - page_url = 'http://www.bbc.co.uk' + page_base_url + str(page) + page_url = 'https://www.bbc.co.uk' + page_base_url + str(page) html = OpenURL(page_url) # NOTE remove inner li to match outer li @@ -1161,11 +1161,15 @@ def ListMainHighlights(highlights_url): if button_match: is_group = True - href = '' + url = '' href_match = re.match( r'<a href="(.*?)"', programme, flags=(re.DOTALL | re.MULTILINE)) if href_match: href = href_match.group(1) + if href.startswith('http'): + url = href + else: + url = 'https://www.bbc.co.uk' + href name = '' if group_type == "popular": @@ -1212,10 +1216,10 @@ def ListMainHighlights(highlights_url): category_match.group(1), 125, '', '', '') else: AddMenuEntry('[B]%s: %s[/B]' % (translation(30314), name), - href, 128, '', '', '') + url, 128, '', '', '') else: - CheckAutoplay(name, href, iconimage, description, '') + CheckAutoplay(name, url, iconimage, description, '') xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_VIDEO_TITLE) xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_DATE) |