Skip to content

Commit

Permalink
fix bundesland streams service api changes
Browse files Browse the repository at this point in the history 
version bump 0.12.9
  • Loading branch information
@s0faking
s0faking committed Aug 7, 2023
1 parent 7fd4337 commit e13e006
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 62 deletions.
6 changes: 3 additions & 3 deletions 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.orftvthek" name="ORF TVthek" version="0.12.8+matrix.1" provider-name="sofaking">
<addon id="plugin.video.orftvthek" name="ORF TVthek" version="0.12.9+matrix.1" provider-name="sofaking">
<requires>
<import addon="xbmc.python" version="3.0.0"/>
<import addon="script.module.future" version="0.16.0"/>
Expand All @@ -26,8 +26,8 @@
<icon>resources/icon.png</icon>
<fanart>resources/fanart.jpg</fanart>
</assets>
<news>v0.12.8 (06/12/2022)
[feature] added direct uri for simple iptv (livestreams)
<news>v0.12.9 (07/08/2023)
[fix] fixed livestream endpoint changes serviceapi
</news>
</extension>
</addon>
3 changes: 3 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* 0.12.9
- fixed livestream endpoint changes serviceapi

* 0.12.8
- added direct uri for simple iptv (livestreams) #108

Expand Down
115 changes: 56 additions & 59 deletions resources/lib/ServiceApi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,11 @@ def getHighlights(self):
response = self.__makeRequest(self.serviceAPIHighlights)
responseCode = response.getcode()
except HTTPError as error:
print(error)
responseCode = error.getcode()

if responseCode == 200:
print(response)
for result in json.loads(response.read().decode('UTF-8')).get('highlight_teasers'):
if result.get('target').get('model') == 'Segment':
self.JSONSegment2ListItem(result.get('target'))
Expand Down Expand Up @@ -366,98 +368,93 @@ def getSchedule(self):
u = build_kodi_url(parameters)
createListItem(title, None, None, None, date.strftime('%Y-%m-%d'), '', u, False, True, self.defaultbackdrop, self.pluginhandle)

# Fetch stream details.
def getStreamInfos(self, item, inputstreamAdaptive):
infos = {}
live_link = item.get('_links').get('self').get('href')
response = url_get_request(live_link, self.httpauth)
response_raw = response.read().decode('UTF-8')
infos['live'] = json.loads(response_raw)
infos['drmurl'] = self.JSONLicenseDrmURL(infos['live'])
if inputstreamAdaptive and infos['live'].get('is_drm_protected'):
infos['stream'] = self.JSONStreamingDrmURL(infos['live'])
else:
infos['stream'] = self.JSONStreamingURL(infos['live'].get('sources'))

infos['uhd25_stream'] = self.JSONStreamingDrmURL(infos['live'], 'uhdbrowser')
infos['uhd50_stream'] = self.JSONStreamingDrmURL(infos['live'], 'uhdsmarttv')
infos['items'] = {}
return infos

# Builds a livestream item.
def buildStreamItem(self, item, channel, stream_imfo, inputstreamAdaptive, use_restart=True):
description = item.get('description')
title = item.get('title')
programName = channel
if channel in self.__channelMap:
programName = self.__channelMap[channel]
livestreamStart = time.strptime(item.get('start')[0:19], '%Y-%m-%dT%H:%M:%S')
livestreamEnd = time.strptime(item.get('end')[0:19], '%Y-%m-%dT%H:%M:%S')
duration = max(time.mktime(livestreamEnd) - max(time.mktime(livestreamStart), time.mktime(time.localtime())), 1)
contextMenuItems = []
restart_url = False
if inputstreamAdaptive and item.get('restart'):
restart_parameters = {"mode": "liveStreamRestart", "link": item.get('id'), "lic_url": stream_imfo['drmurl']}
restart_url = build_kodi_url(restart_parameters)
contextMenuItems.append((self.translation(30063), 'RunPlugin(%s)' % restart_url))

banner = self.JSONImage(item.get('_embedded').get('image'))
item_title = "[%s] %s %s (%s)" % (programName, "[%s]" % self.translation(30063) if inputstreamAdaptive and restart_url else '', title, time.strftime('%H:%M', livestreamStart))
if item.get('uhd') and stream_imfo['uhd25_stream']:
createListItem("[UHD] %s" % item_title, banner, description, duration,time.strftime('%Y-%m-%d', livestreamStart), programName, stream_imfo['uhd25_stream'], True, False, self.defaultbackdrop, self.pluginhandle)
if item.get('uhd') and stream_imfo['uhd50_stream']:
createListItem("[UHD 50fps] %s" % item_title, banner, description, duration,time.strftime('%Y-%m-%d', livestreamStart), programName, stream_imfo['uhd50_stream'], True, False, self.defaultbackdrop, self.pluginhandle)

createListItem(item_title, banner, description, duration, time.strftime('%Y-%m-%d', livestreamStart), programName, stream_imfo['stream'], True, False, self.defaultbackdrop, self.pluginhandle, contextMenuItems=contextMenuItems)

# Returns Live Stream Listing
def getLiveStreams(self):
showFullSchedule = xbmcaddon.Addon().getSetting('showLiveStreamSchedule') == 'true'
try:
xbmcaddon.Addon('inputstream.adaptive')
inputstreamAdaptive = True
except RuntimeError:
inputstreamAdaptive = False

showFullSchedule = xbmcaddon.Addon().getSetting('showLiveStreamSchedule') == 'true'

response = self.__makeRequestV4(self.__urlLiveChannels)
response_raw = response.read().decode('UTF-8')
channels = json.loads(response_raw)

live_link = False
channelresults = {}

# Prefetch the stream infos to limit request for each stream.
for channel in channels:
channelresults[channel] = {}
channel_items = channels[channel].get('items')
for channel_item in channel_items:
live_link = channel_item.get('_links').get('self').get('href')
response = url_get_request(live_link, self.httpauth)
response_raw = response.read().decode('UTF-8')
channelresults[channel]['live'] = json.loads(response_raw)
channelresults[channel] = self.getStreamInfos(channel_item, inputstreamAdaptive)
channelresults[channel]['items'] = channel_items
channelresults[channel]['drmurl'] = self.JSONLicenseDrmURL(channelresults[channel]['live'])
if inputstreamAdaptive and channelresults[channel]['live'].get('is_drm_protected'):
channelresults[channel]['stream'] = self.JSONStreamingDrmURL(channelresults[channel]['live'])
else:
channelresults[channel]['stream'] = self.JSONStreamingURL(channelresults[channel]['live'].get('sources'))

channelresults[channel]['uhd25_stream'] = self.JSONStreamingDrmURL(channelresults[channel]['live'], 'uhdbrowser')
channelresults[channel]['uhd50_stream'] = self.JSONStreamingDrmURL(channelresults[channel]['live'], 'uhdsmarttv')
break

# Render current streams first.
for channel in channels:
for upcoming in channelresults[channel]['items']:
if not 'upcoming' in channels[channel] or ('upcoming' in channels[channel] and upcoming.get('start')[0:17] == channels[channel]['upcoming'].get('start')[0:17]):
if not 'upcoming' in channels[channel] or ('upcoming' in channels[channel] and upcoming.get('start')[0:17] == channels[channel]['upcoming'].get('start')[0:17]):
if not 'upcoming' in channels[channel]:
channels[channel]['upcoming'] = upcoming
description = upcoming.get('description')
title = upcoming.get('title')
programName = channel
if channel in self.__channelMap:
programName = self.__channelMap[channel]
livestreamStart = time.strptime(upcoming.get('start')[0:19], '%Y-%m-%dT%H:%M:%S')
livestreamEnd = time.strptime(upcoming.get('end')[0:19], '%Y-%m-%dT%H:%M:%S')
duration = max(time.mktime(livestreamEnd) - max(time.mktime(livestreamStart), time.mktime(time.localtime())), 1)
contextMenuItems = []
restart_url = False
if inputstreamAdaptive and upcoming.get('restart'):
restart_parameters = {"mode": "liveStreamRestart", "link": upcoming.get('id'), "lic_url": channelresults[channel]['drmurl']}
restart_url = build_kodi_url(restart_parameters)
contextMenuItems.append((self.translation(30063), 'RunPlugin(%s)' % restart_url))

banner = self.JSONImage(upcoming.get('_embedded').get('image'))
item_title = "[%s] %s %s (%s)" % (programName, "[%s]" % self.translation(30063) if inputstreamAdaptive and restart_url else '', title, time.strftime('%H:%M', livestreamStart))
if upcoming.get('uhd') and channelresults[channel]['uhd25_stream']:
createListItem("[UHD] %s" % item_title, banner, description, duration,time.strftime('%Y-%m-%d', livestreamStart), programName, channelresults[channel]['uhd25_stream'], True, False, self.defaultbackdrop, self.pluginhandle)
if upcoming.get('uhd') and channelresults[channel]['uhd50_stream']:
createListItem("[UHD 50fps] %s" % item_title, banner, description, duration,time.strftime('%Y-%m-%d', livestreamStart), programName, channelresults[channel]['uhd50_stream'], True, False, self.defaultbackdrop, self.pluginhandle)

createListItem(item_title, banner, description, duration, time.strftime('%Y-%m-%d', livestreamStart), programName, channelresults[channel]['stream'], True, False, self.defaultbackdrop, self.pluginhandle, contextMenuItems=contextMenuItems)
elif upcoming.get('start')[0:17] == channels[channel]['upcoming'].get('start')[0:17] and upcoming.get('id') != channels[channel]['upcoming'].get('id'):
channelresults[channel] = self.getStreamInfos(upcoming, inputstreamAdaptive)
self.buildStreamItem(upcoming, channel, channelresults[channel], inputstreamAdaptive)

# Render upcoming streams last for better list item order.
if showFullSchedule:
addDirectory('[COLOR red]-------- Upcoming --------[/COLOR]', None, self.defaultbackdrop, "", "", 'getLive', self.pluginhandle)
addDirectory('[COLOR red]----------------[/COLOR]', None, self.defaultbackdrop, "", "", 'getLive', self.pluginhandle)
for channel in channels:
for upcoming in channelresults[channel]['items']:
if not 'upcoming' in channels[channel] or channels[channel]['upcoming'].get('id') != upcoming.get('id'):
description = upcoming.get('description')
title = upcoming.get('title')
programName = channel
if channel in self.__channelMap:
programName = self.__channelMap[channel]
livestreamStart = time.strptime(upcoming.get('start')[0:19], '%Y-%m-%dT%H:%M:%S')
livestreamEnd = time.strptime(upcoming.get('end')[0:19], '%Y-%m-%dT%H:%M:%S')
duration = max(time.mktime(livestreamEnd) - max(time.mktime(livestreamStart), time.mktime(time.localtime())), 1)
contextMenuItems = []
restart_url = False

banner = self.JSONImage(upcoming.get('_embedded').get('image'))
item_title = "[%s] %s %s (%s)" % (programName, "[%s]" % self.translation(30063) if inputstreamAdaptive and restart_url else '', title, time.strftime('%H:%M', livestreamStart))
if upcoming.get('uhd') and channelresults[channel]['uhd25_stream']:
createListItem("[UHD] %s" % item_title, banner, description, duration,time.strftime('%Y-%m-%d', livestreamStart), programName, channelresults[channel]['uhd25_stream'], True, False, self.defaultbackdrop, self.pluginhandle)
if upcoming.get('uhd') and channelresults[channel]['uhd50_stream']:
createListItem("[UHD 50fps] %s" % item_title, banner, description, duration,time.strftime('%Y-%m-%d', livestreamStart), programName, channelresults[channel]['uhd50_stream'], True, False, self.defaultbackdrop, self.pluginhandle)

createListItem(item_title, banner, description, duration, time.strftime('%Y-%m-%d', livestreamStart), programName, channelresults[channel]['stream'], True, False, self.defaultbackdrop, self.pluginhandle, contextMenuItems=contextMenuItems)
self.buildStreamItem(upcoming, channel, channelresults[channel], inputstreamAdaptive, False)

# Restart callback.
def liveStreamRestart(self, link, protocol):
try:
xbmcaddon.Addon('inputstream.adaptive')
Expand Down

0 comments on commit e13e006

Please sign in to comment.