Skip to content

Commit

Permalink
update bbc and itv
Browse files Browse the repository at this point in the history
  • Loading branch information
@catchup4kodi
catchup4kodi committed Feb 20, 2018
1 parent 0ae2647 commit 86b2a8d
Show file tree
Hide file tree
Showing 11 changed files with 136 additions and 202 deletions.
2 changes: 1 addition & 1 deletion plugin.video.bbciplayer/addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.bbciplayer" name="BBC iPlayer" version="0.5.2" provider-name="catchup4kodi">
<addon id="plugin.video.bbciplayer" name="BBC iPlayer" version="0.5.3" provider-name="LittleWiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down
294 changes: 119 additions & 175 deletions plugin.video.bbciplayer/default.py
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions plugin.video.bbciplayer/resources/settings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<category label="Stream Options">
<setting id="livehd" type="bool" label="HD Live Streams" default="true"/>
<setting label="AutoPlay" type="bool" default="true" id="autoplay"/>
<setting label="Catchup Source" type="enum" default="0" id="catchup" enable="eq(-1,true)" values="HLS|RTMP"/>
<setting label="Supplier" type="enum" default="0" id="supplier" enable="eq(-2,true)" values="AKAMAI|LIMELIGHT"/>
<setting label="Catchup Source" type="enum" default="0" id="catchup" enable="eq(-1,true)" values="HLS"/>
<setting label="Supplier" type="enum" default="0" id="supplier" enable="eq(-2,true)" values="AKAMAI|LIMELIGHT|BIDI"/>
</category>
<category label="Auto-View">
<setting id="sort" type="bool" label="Sort Alphabetically" default="false"/>
Expand Down
2 changes: 1 addition & 1 deletion plugin.video.itv/addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.itv" name="ITV" version="2.4.1" provider-name="catchup4kodi">
<addon id="plugin.video.itv" name="ITV" version="2.4.2" provider-name="LittleWiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down
26 changes: 8 additions & 18 deletions plugin.video.itv/default.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ def CATS():
setView('tvshows', 'default')

def LIVE():
addDir('ITV1','https://itv1liveios-i.akamaihd.net/hls/live/203437/itvlive/ITV1MN/master.m3u8',7,foricon+'art/1.png',isFolder=False)#sim1
addDir('ITV2','https://itv2liveios-i.akamaihd.net/hls/live/203495/itvlive/ITV2MN/master.m3u8',7,foricon+'art/2.png',isFolder=False)#sim2
addDir('ITV3','https://itv3liveios-i.akamaihd.net/hls/live/207262/itvlive/ITV3MN/master.m3u8',7,foricon+'art/3.png',isFolder=False)#sim3
addDir('ITV4','https://itv4liveios-i.akamaihd.net/hls/live/207266/itvlive/ITV4MN/master.m3u8',7,foricon+'art/4.png',isFolder=False)#sim4
addDir('ITVBe','https://itvbeliveios-i.akamaihd.net/hls/live/219078/itvlive/ITVBE/master.m3u8',7,foricon+'art/8.jpg',isFolder=False)
addDir('CITV','https://citvliveios-i.akamaihd.net/hls/live/207267/itvlive/CITVMN/master.m3u8',7,foricon+'art/7.png',isFolder=False)#sim7
addDir('ITV1','sim1',7,foricon+'art/1.png',isFolder=False)#sim1 https://itv1liveios-i.akamaihd.net/hls/live/203437/itvlive/ITV1MN/master.m3u8
addDir('ITV2','sim2',7,foricon+'art/2.png',isFolder=False)#sim2 https://itv2liveios-i.akamaihd.net/hls/live/203495/itvlive/ITV2MN/master.m3u8
addDir('ITV3','sim3',7,foricon+'art/3.png',isFolder=False)#sim3 https://itv3liveios-i.akamaihd.net/hls/live/207262/itvlive/ITV3MN/master.m3u8
addDir('ITV4','sim4',7,foricon+'art/4.png',isFolder=False)#sim4 https://itv4liveios-i.akamaihd.net/hls/live/207266/itvlive/ITV4MN/master.m3u8
#addDir('ITVBe','https://itvbeliveios-i.akamaihd.net/hls/live/219078/itvlive/ITVBE/master.m3u8',7,foricon+'art/8.jpg',isFolder=False)# https://itvbeliveios-i.akamaihd.net/hls/live/219078/itvlive/ITVBE/master.m3u8
addDir('CITV','sim7',7,foricon+'art/7.png',isFolder=False)#sim7 https://citvliveios-i.akamaihd.net/hls/live/207267/itvlive/CITVMN/master.m3u8
addDir('Events/Sport','https://itvliveevents-i.akamaihd.net/hls/live/203496/itvliveevents/ITVEVTMN/master.m3u8',7,foricon+'art/9.jpg',isFolder=False)#sim9

def CATEGORIES():
Expand Down Expand Up @@ -205,20 +205,10 @@ def PLAY_STREAM(name,url,iconimage):
r='CDATA\[(citv.+?)\]'
else:
r='CDATA\[(itv.+?)\]'
playpath=re.compile(r,re.DOTALL).findall(response)
playpath=re.compile(r,re.DOTALL).findall(response) [0]



if (quality == 0):
playpath = playpath[0]
elif (quality == 1):
playpath = playpath[1]
elif (quality == 2):
playpath = playpath[2]
elif (quality == 3):
playpath = playpath[3]
elif (quality == 4):
playpath = playpath[4]

STREAM=rtmp+' playpath='+playpath+' swfUrl=http://www.itv.com/mediaplayer/ITVMediaPlayer.swf live=true timeout=10 swfvfy=true'


Expand Down
4 changes: 2 additions & 2 deletions zips/addons.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<addons>
<addon id="plugin.video.bbciplayer" name="BBC iPlayer" version="0.5.2" provider-name="catchup4kodi">
<addon id="plugin.video.bbciplayer" name="BBC iPlayer" version="0.5.3" provider-name="LittleWiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down Expand Up @@ -76,7 +76,7 @@
</extension>
</addon>

<addon id="plugin.video.itv" name="ITV" version="2.4.1" provider-name="catchup4kodi">
<addon id="plugin.video.itv" name="ITV" version="2.4.2" provider-name="LittleWiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down
2 changes: 1 addition & 1 deletion zips/addons.xml.md5
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b9c4548c1434255e9dda19b4f2c3b38a
e79e9df8c30486ebb09849cafe343f2d
2 changes: 1 addition & 1 deletion zips/plugin.video.bbciplayer/addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.bbciplayer" name="BBC iPlayer" version="0.5.2" provider-name="catchup4kodi">
<addon id="plugin.video.bbciplayer" name="BBC iPlayer" version="0.5.3" provider-name="LittleWiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down
Binary file added zips/plugin.video.bbciplayer/plugin.video.bbciplayer-0.5.3.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion zips/plugin.video.itv/addon.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="plugin.video.itv" name="ITV" version="2.4.1" provider-name="catchup4kodi">
<addon id="plugin.video.itv" name="ITV" version="2.4.2" provider-name="LittleWiz">
<requires>
<import addon="xbmc.python" version="2.1.0"/>
</requires>
Expand Down
Binary file added zips/plugin.video.itv/plugin.video.itv-2.4.2.zip
View file
Binary file not shown.

0 comments on commit 86b2a8d

Please sign in to comment.