plugin.video.optus.sport > v0.6.4

Ahmed20204 · Dec 9, 2021 · a624cd9 · a624cd9
1 parent 6d268f3
commit a624cd9
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 36 deletions.
diff --git a/plugin.video.optus.sport/.iptv_merge b/plugin.video.optus.sport/.iptv_merge
@@ -1,5 +1,3 @@
 {
- "version": 3,
- "playlist": "plugin://$ID/?_=playlist&output=$FILE",
- "epg": "https://i.mjh.nz/Optus/epg.xml.gz"
-}
+ "playlist": "plugin://$ID/?_=playlist&output=$FILE"
+}
diff --git a/plugin.video.optus.sport/addon.xml b/plugin.video.optus.sport/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.optus.sport" name="Optus Sport" provider-name="SlyGuy" version="0.6.3">
+<addon id="plugin.video.optus.sport" name="Optus Sport" provider-name="SlyGuy" version="0.6.4">
  <requires>
  <import addon="script.module.slyguy"/>
  </requires>
@@ -14,7 +14,7 @@ Subscription required.</description>
  <license></license>
  <language></language>
  <website></website>
- <news>Remove reminders and service</news>
+ <news>Move EPG into Playlist</news>
  <assets>
  <icon>icon.png</icon>
  <fanart>fanart.jpg</fanart>

diff --git a/plugin.video.optus.sport/resources/lib/constants.py b/plugin.video.optus.sport/resources/lib/constants.py
@@ -6,22 +6,10 @@
  'Referer': 'https://sport.optus.com.au',
 }
 
-API_URL  = 'https://sport.optus.com.au/api{}'
-AWS_URL  = 'https://cognito-idp.ap-southeast-2.amazonaws.com/'
+API_URL = 'https://sport.optus.com.au/api{}'
+AWS_URL = 'https://cognito-idp.ap-southeast-2.amazonaws.com/'
 AWS_CLIENT_ID = '4f9j45k3024143l8hck1k1o2tp'
-SERVICE_TIME = 270
-DEFAULT_IMG = 'https://sport.optus.com.au/images/OS_LOGO_YES_NAVY_4K_640_360.jpg'
-LINEAR_ID = 'home_linear_channels'
-
-# CHANNELS = [
-# ['v42463', _.OPTUS_1, 'OPTSP01', 'https://i.imgur.com/7YIRcp7.png'],
-# #['v42611', _.OPTUS_2, 'OPTSP02', 'https://i.imgur.com/TLZsoTn.png'],
-# # ['42823', _.OPTUS_3, 'OPTSP03', 'https://i.imgur.com/1aK5qdV.png'],
-# # ['v30004', _.OPTUS_4, 'OPTSP04', 'https://i.imgur.com/4zurIBa.png'],
-# # ['v30005', _.OPTUS_5, 'OPTSP05', 'https://i.imgur.com/wyXPXan.png'],
-# # ['v30006', _.OPTUS_6, 'OPTSP06', 'https://i.imgur.com/fGkjhJn.png'],
-# # ['v30007', _.OPTUS_7, 'OPTSP07', 'https://i.imgur.com/qGl9emd.png'],
-# # ['v30008', _.OPTUS_8, 'OPTSP08', 'https://i.imgur.com/KuYUL4v.png'],
-# # ['v42699', _.OPTUS_9, 'OPTSP09', 'https://i.imgur.com/KuYUL4v.png'],
-# # ['v42735', _.OPTUS_10, 'OPTSP10', 'https://i.imgur.com/KuYUL4v.png'],
-# ]
+SERVICE_TIME = 270
+DEFAULT_IMG = 'https://sport.optus.com.au/images/OS_LOGO_YES_NAVY_4K_640_360.jpg'
+LINEAR_ID = 'home_linear_channels'
+EPG_URL = 'https://i.mjh.nz/Optus/epg.xml.gz'
diff --git a/plugin.video.optus.sport/resources/lib/plugin.py b/plugin.video.optus.sport/resources/lib/plugin.py
@@ -7,7 +7,7 @@
 
 from .api import API
 from .language import _
-from .constants import HEADERS, DEFAULT_IMG, LINEAR_ID
+from .constants import *
 
 api = API()
 
@@ -161,11 +161,11 @@ def play(asset, play_type=PLAY_FROM_LIVE, **kwargs):
 @plugin.merge()
 def playlist(output, **kwargs):
  with codecs.open(output, 'w', encoding='utf8') as f:
- f.write(u'#EXTM3U\n')
+ f.write(u'#EXTM3U x-tvg-url="{}"'.format(EPG_URL))
 
  for row in api.editorial(LINEAR_ID):
  if row.get('type') != 'linear-channel':
  continue
 
- f.write(u'#EXTINF:-1 tvg-id="{id}" tvg-logo="{logo}",{name}\n{path}\n'.format(
- id=row['channel']['id'], logo=row.get('imageUrl') or DEFAULT_IMG, name=row['title'], path=plugin.url_for(play, asset=row['id'], _is_live=True)))
+ f.write(u'\n#EXTINF:-1 tvg-id="{id}" tvg-logo="{logo}",{name}\n{url}'.format(
+ id=row['channel']['id'], logo=row.get('imageUrl') or DEFAULT_IMG, name=row['title'], url=plugin.url_for(play, asset=row['id'], _is_live=True)))
diff --git a/plugin.video.optus.sport/resources/settings.xml b/plugin.video.optus.sport/resources/settings.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
+ <category label="$ADDON[script.module.slyguy 32139]">
+ <setting label="$ADDON[script.module.slyguy 32111]" id="bookmarks" type="bool" default="true"/>
+ </category>
+
  <category label="$ADDON[script.module.slyguy 32035]">
  <setting label="$ADDON[script.module.slyguy 32063]" id="live_play_type" type="enum" default="0" lvalues="32066|32065|32064"/>
  <setting label="$ADDON[script.module.slyguy 32061]" id="default_quality" type="enum" default="0" lvalues="32055|32043|32060|32048|32054|32073"/>
  <setting label="$ADDON[script.module.slyguy 32059]" id="max_bandwidth" type="slider" default="7" range="0.5,0.5,100" option="float" visible="eq(-1,4)"/>
 
  <setting label="$ADDON[script.module.slyguy 32076]" type="bool" id="use_ia_hls_live" default="false" visible="false"/>
  <setting label="$ADDON[script.module.slyguy 32023]" type="bool" id="use_ia_hls_vod" default="false" visible="false"/>
- <setting label="$ADDON[script.module.slyguy 32021]" type="action" action="RunPlugin(plugin://$ID/?_=_ia_install)" option="close" visible="!system.platform.android"/>
  </category>
 
  <category label="$ADDON[script.module.slyguy 32081]">
@@ -16,17 +19,12 @@
  </category>
 
  <category label="$ADDON[script.module.slyguy 32036]">
- <setting label="$ADDON[script.module.slyguy 32111]" id="bookmarks" type="bool" default="true"/>
- <setting label="$ADDON[script.module.slyguy 32078]" id="kiosk" type="bool" default="false"/>
- <setting label="$ADDON[script.module.slyguy 32037]" id="verify_ssl" type="bool" default="true"/>
- <setting label="$ADDON[script.module.slyguy 32044]" id="http_timeout" type="number" default="30"/>
- <setting label="$ADDON[script.module.slyguy 32045]" id="http_retries" type="number" default="2"/>
- <setting label="$ADDON[script.module.slyguy 32046]" id="chunksize" type="number" default="4096"/>
+ <setting label="$ADDON[script.module.slyguy 32021]" type="action" action="RunPlugin(plugin://$ID/?_=_ia_install)" option="close" visible="!system.platform.android"/>
  <setting label="$ADDON[script.module.slyguy 32039]" id="service_delay" type="number" default="0" visible="false"/>
 
  <setting label="$ADDON[script.module.slyguy 32019]" type="action" action="RunPlugin(plugin://$ID/?_=_reset)" option="close"/>
 
  <setting id="_fresh" type="bool" default="true" visible="false"/>
  <setting id="_userdata" type="text" default="{}" visible="false"/>
  </category>
-</settings>
+</settings>