diff --git a/addon.xml b/addon.xml index f0d3ad9..1cd9803 100644 --- a/addon.xml +++ b/addon.xml @@ -1,17 +1,17 @@ - + all - GNU GENERAL PUBLIC LICENSE. Version 2, June 1991 - https://github.com/prof-membrane/plugin.video.libmediathek4 - Supplementary lib for Mediathek add-ons. - This lib is a mini framework. It is used in my (sarbes) "Mediathek" scrapers. + GPL-2.0-only + https://github.com/sarbes/plugin.video.libmediathek4 + Supplementary lib for Mediathek add-ons. + This lib is a mini framework. It is used in my (sarbes) "Mediathek" scrapers. + + resources/icon.png + diff --git a/lib/libmediathek4.py b/lib/libmediathek4.py index 99242d2..ea54492 100644 --- a/lib/libmediathek4.py +++ b/lib/libmediathek4.py @@ -5,13 +5,7 @@ import urllib.parse import json from datetime import date, timedelta -#from libmediathek3utils import * -#from libmediathek3listing import * -#from libmediathek3ttml2srt import * -#from libmediathek3premadedirs import * -#from libmediathek3dialogs import * - -#translation = xbmcaddon.Addon(id='script.module.libmediathek3').getLocalizedString +import time import xbmcaddon import xbmcgui @@ -45,11 +39,6 @@ def translation(self,id,addonid=False): def sortAZ(self): xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_TITLE_IGNORE_THE) - def getSearchString(self): - return 'sport' - - - def setSetting(self,k,v): return xbmcplugin.setSetting(int(sys.argv[1]), k, v) @@ -64,34 +53,51 @@ def _buildUri(self,d): def addEntries(self,d): lists = [] - #print(json.dumps(d)) for item in d['items']: u = self._buildUri(item['params']) - #print('Pluginpath') - #print(self._buildUri(item['params'])) - #print('Item') - #print(json.dumps(item, indent=4, sort_keys=True)) - - - """if 'type' in items anitems d['type'] == 'date' and 'airedtime' in items: - items["name"] = '(' + str(items["airedtime"]) + ') ' + items["name"] - elif 'type' in items and items['type'] == 'date' and 'time' in items: - items["name"] = '(' + str(items["date"]) + ') ' + items["name"] - """ metadata = item['metadata'] + name = metadata.get('name','') + ilabels = {} + + - liz=xbmcgui.ListItem(metadata.get('name','')) + if 'type' in item: + if item['type'] in ['video', 'live', 'clip']: + ilabels['mediatype'] = 'video' + elif item['type'] in ['date']: + ilabels['mediatype'] = 'video' + if 'aired' in metadata: + if 'ISO8601' in metadata['aired']: + if metadata['aired']['ISO8601'].endswith('Z'): + t = time.strptime(metadata['aired']['ISO8601'][:19],'%Y-%m-%dT%H:%M:%S') + else: + t = time.strptime(metadata['aired']['ISO8601'],'%Y-%m-%dT%H:%M:%S%z') + ilabels['aired'] = time.strftime('%Y-%m-%d',t) + name = f'({time.strftime("%H:%M",t)}) {name}' + + elif item['type'] in ['tvshow']: + ilabels['mediatype'] = 'tvshow' + elif item['type'] in ['shows', 'season']: + ilabels['mediatype'] = 'season' + elif item['type'] in ['episode']: + ilabels['mediatype'] = 'episode' + elif item['type'] in ['movie']: + ilabels['mediatype'] = 'movie' + elif item['type'] in ['sport']: + ilabels['mediatype'] = 'sport' + else: + ilabels['mediatype'] = 'video' + - ilabels = { - "Title": metadata.get('name',''), + ilabels.update({ + "Title": name, "Plot": metadata.get('plot',metadata.get('plotoutline','')), "Plotoutline": metadata.get('plotoutline',''), "Duration": str(metadata.get('duration','')), "Mpaa": metadata.get('mpaa',''), - "Aired": metadata.get('aired',''), "Studio": metadata.get('channel',''), - #"episode": metadata.get('episode',None), - #"season": metadata.get('season',''), + "episode": metadata.get('episode',''), + "season": metadata.get('season',''), "tvshowtitle": metadata.get('tvshowtitle',''), "rating": metadata.get('rating',''), "director": metadata.get('directors',''), @@ -102,7 +108,10 @@ def addEntries(self,d): "year": metadata.get('year',''), "premiered": metadata.get('premiered',''), "premiered": metadata.get('originaltitle',''), - } + }) + + liz=xbmcgui.ListItem(name) + if 'art' in metadata: liz.setArt(metadata['art']) if 'episode' in metadata: @@ -116,22 +125,6 @@ def addEntries(self,d): if 'actors' in metadata: liz.setCast(metadata['actors']) - - if 'type' in item: - if item['type'] in ['video', 'live', 'date', 'clip']: - ilabels['mediatype'] = 'video' - elif item['type'] in ['tvshow']: - ilabels['mediatype'] = 'tvshow' - elif item['type'] in ['shows', 'season']: - ilabels['mediatype'] = 'season' - elif item['type'] in ['episode']: - ilabels['mediatype'] = 'episode' - elif item['type'] in ['movie']: - ilabels['mediatype'] = 'movie' - elif item['type'] in ['sport']: - ilabels['mediatype'] = 'sport' - else: - ilabels['mediatype'] = 'video' ok=True @@ -140,19 +133,6 @@ def addEntries(self,d): else: liz.setInfo( type="Video", infoLabels=ilabels) - """ art = {} - art['thumb'] = d.get('thumb') - art['landscape'] = d.get('thumb') - art['poster'] = d.get('thumb') - art['fanart'] = d.get('fanart',d.get('thumb',fanart)) - art['icon'] = d.get('channelLogo','') - liz.setArt(art)""" - - """ - if 'customprops' in d: - for prop in d['customprops']: - liz.setProperty(prop, d['customprops'][prop]) - """ if item.get('type',None) in ['video', 'live', 'date', 'clip', 'episode', 'audio', 'sport', 'sports', 'movie', 'song']: liz.setProperty('IsPlayable', 'true') lists.append([u,liz,False]) @@ -163,26 +143,11 @@ def addEntries(self,d): xbmcplugin.setContent(handle=int(sys.argv[1]), content=d['content'] ) else: xbmcplugin.setContent(handle=int(sys.argv[1]), content="files" ) - """ - if d['type'] in ['video', 'live', 'date', 'clip', 'episode']: - xbmcplugin.setContent(handle=int(sys.argv[1]), content="episodes" ) - elif d['type'] in ['shows', 'season']: - xbmcplugin.setContent(handle=int(sys.argv[1]), content="tvshows" ) - elif d['type'] in ['sport']: - xbmcplugin.setContent(handle=int(sys.argv[1]), content="sport" ) - elif d['type'] in ['movie']: - xbmcplugin.setContent(handle=int(sys.argv[1]), content="movies" ) - elif d['type'] in ['songs']: - xbmcplugin.setContent(handle=int(sys.argv[1]), content="songs" ) - else: - xbmcplugin.setContent(handle=int(sys.argv[1]), content="files" ) - """ - xbmcplugin.addDirectoryItems(int(sys.argv[1]), lists) def play(self,d,external=False): - if len(d['media']) == 0:#TODO: add error msg + if not 'media' in d or len(d['media']) == 0:#TODO: add error msg listitem = xbmcgui.ListItem(path='') pluginhandle = int(sys.argv[1]) xbmcplugin.setResolvedUrl(pluginhandle, False, listitem) @@ -196,12 +161,12 @@ def play(self,d,external=False): if subtitle['type'] == 'srt': subs.append(subtitle['url']) elif subtitle['type'] == 'ttml': - import libmediathek3ttml2srt - subFile = libmediathek3ttml2srt.ttml2Srt(subtitle['url']) + import libmediathek4ttml2srt + subFile = libmediathek4ttml2srt.ttml2Srt(subtitle['url']) subs.append(subFile) elif subtitle['type'] == 'webvtt': - import libmediathek3webvtt2srt - subFile = libmediathek3webvtt2srt.webvtt2Srt(subtitle['url']) + import libmediathek4webvtt2srt + subFile = libmediathek4webvtt2srt.webvtt2Srt(subtitle['url']) subs.append(subFile) else: log('Subtitle format not supported: ' + subtitle['type']) @@ -255,17 +220,13 @@ def _chooseBitrate(self,l): if 'licenseserverurl' in item: listitem.setProperty('inputstream.adaptive.license_type', 'com.widevine.alpha') listitem.setProperty('inputstream.adaptive.license_key', item['licenseserverurl']) - #listitem.setProperty('inputstream.adaptive.stream_headers','User-Agent=Mozilla%2F5.0%20%28Windows%20NT%206.1%3B%20Win64%3B%20x64%29%20AppleWebKit%2F537.36%20%28KHTML%2C%20like%20Gecko%29%20Chrome%2F63.0.3239.84%20Safari%2F537.36') listitem.setMimeType('application/dash+xml') listitem.setContentLookup(False) elif streamType == 'HLS': listitem.setMimeType('application/vnd.apple.mpegurl') - listitem.setProperty('inputstreamaddon', 'inputstream.adaptive') + listitem.setProperty('inputstream', 'inputstream.adaptive') listitem.setProperty('inputstream.adaptive.manifest_type', 'hls') listitem.setContentLookup(False) - #elif streamType == 'MP4': - # listitem.setMimeType('application/dash+xml') - # listitem.setContentLookup(False) return listitem,url @@ -276,7 +237,6 @@ def action(self): self.play(self.playbackModes[mode]()) else: l = self.modes[mode]() - #print(json.dumps(l)) self.addEntries(l) self.endOfDirectory() @@ -305,13 +265,13 @@ def libMediathekListLetters(self): def libMediathekListDate(self): result = {'items':[]} weekdayDict = { - '0': self.translation(32013),#Sonntag - '1': self.translation(32014),#Montag - '2': self.translation(32015),#Dienstag - '3': self.translation(32016),#Mittwoch - '4': self.translation(32017),#Donnerstag - '5': self.translation(32018),#Freitag - '6': self.translation(32019),#Samstag + '0': self.translation(32013), + '1': self.translation(32014), + '2': self.translation(32015), + '3': self.translation(32016), + '4': self.translation(32017), + '5': self.translation(32018), + '6': self.translation(32019), } i = 0 @@ -333,7 +293,7 @@ def libMediathekListDate(self): result['items'].append(d) i += 1 - #if self.params.get('dateChooser',False) == True: + #if self.params.get('datePicker',False) == True: # d = {'params':{'mode': mode}, 'metadata':{'name': self.translation(32022)}, 'type':'dir'} # if channel: d['params']['channel'] = channel # result['items'].append(d) @@ -342,41 +302,6 @@ def libMediathekListDate(self): def libMediathekPlayDirect(self): return {'media':[{'url':self.params['url'], 'stream':self.params['stream']}]} - def populateDirDate(self,mode,channel=False,dateChooser=False): - weekdayDict = { - '0': self.translation(32013),#Sonntag - '1': self.translation(32014),#Montag - '2': self.translation(32015),#Dienstag - '3': self.translation(32016),#Mittwoch - '4': self.translation(32017),#Donnerstag - '5': self.translation(32018),#Freitag - '6': self.translation(32019),#Samstag - } - result = {'items':[]} - - i = 0 - while i <= 6: - day = date.today() - timedelta(i) - - d = {'params':{'mode': mode, 'datum': str(i), 'yyyymmdd': self._calcyyyymmdd(i)}, 'metadata':{}, 'type':'dir'} - if i == 0: - d['metadata']['name'] = self.translation(32020) - elif i == 1: - d['metadata']['name'] = self.translation(32021) - else: - d['metadata']['name'] = weekdayDict[day.strftime("%w")] - if channel: - d['params']['channel'] = channel - - result['items'].append(d) - i += 1 - - #if self.params.get('dateChooser',False) == True: - # d = {'params':{'mode': mode}, 'metadata':{'name': self.translation(32022)}, 'type':'dir'} - # if channel: d['params']['channel'] = channel - # result['items'].append(d) - return result - def _calcyyyymmdd(self,d): day = date.today() - timedelta(d) return day.strftime('%Y-%m-%d') diff --git a/lib/libmediathek4ttml2srt.py b/lib/libmediathek4ttml2srt.py new file mode 100644 index 0000000..699a6ea --- /dev/null +++ b/lib/libmediathek4ttml2srt.py @@ -0,0 +1,68 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +import re +import requests +import html +import libmediathek4utils as lm4utils + +def ttml2Srt(url): + content = requests.get(url).text + content = content.replace('\0','').replace('(.+?)', re.DOTALL).findall(content)[0]) + div = re.compile('(.+?)', re.DOTALL).findall(content)[0] + p = re.compile('<(.+?)

', re.DOTALL).findall(div) + i = 1 + buffer = '' + for part in p: + if '','\n') + begin = re.compile('begin="(.+?)"').findall(part)[0] + begin = begin.replace(".",",")[:-1] + end = re.compile('end="(.+?)"').findall(part)[0] + end = end.replace(".",",")[:-1] + s = part.split('>')[0] + part = part.replace(s+'>','') + part = part.replace('
','\n') + if 'style=' in s: + style = re.compile('style="(.+?)"').findall(s)[0] + if d[style]: + part = ''+part+'' + match = re.compile('<(.+?)>').findall(part) + for entry in match: + if entry.startswith('span'): + if 'style' in entry: + style = re.compile('style="(.+?)"').findall(entry)[0] + part = part.replace('<'+entry+'>','') + else: + part = part.replace('<'+entry+'>','') + elif entry.startswith('/span'): + part = part.replace('','') + else: + part = part.replace('<'+entry+'>','') + part = ''.join([l.strip() + '\n' for l in part.splitlines()]) + part = re.sub('(\n){2,}','\n',part) + part = html.unescape(part) + buffer += str(i) + '\n' + buffer += begin+" --> "+end+"\n" + buffer += part.strip() + '\n\n' + i+=1 + + subFile = lm4utils.pathUserdata('/ttml.srt') + lm4utils.f_write(subFile,buffer) + return subFile + + +def _stylesSetup(styles): + d = {} + styles = styles.replace('tt:','').replace('xml:','') + match_styles = re.compile('', re.DOTALL).findall(styles) + for style in match_styles: + id = re.compile('id="(.+?)"', re.DOTALL).findall(style)[0] + if 'color=' in style: + color = re.compile('color="(.+?)"', re.DOTALL).findall(style)[0] + else: + color = False + d[id] = color + return d + diff --git a/lib/libmediathek4utils.py b/lib/libmediathek4utils.py index 561c54b..99c6b20 100644 --- a/lib/libmediathek4utils.py +++ b/lib/libmediathek4utils.py @@ -4,11 +4,6 @@ import xbmcgui import xbmcaddon import xbmcvfs -import sys - -temp = xbmc.translatePath(xbmcaddon.Addon().getAddonInfo('profile')+'temp') -dict = xbmc.translatePath(xbmcaddon.Addon().getAddonInfo('profile')+'dict.py') - def log(msg): @@ -18,59 +13,41 @@ def getTranslation(id): return xbmcaddon.Addon().getLocalizedString(id) def pathUserdata(path): - special = xbmcaddon.Addon().getAddonInfo('profile')+path - special = special.replace('//','/').replace('special:/','special://') - return special - -def pathAddon(path): - special = xbmc.validatePath(xbmcaddon.Addon().getAddonInfo('path').replace('\\','/')+path.replace('\\','/')) - special = special.replace('//','/').replace('special:/','special://') - return special + if not f_exists(xbmcaddon.Addon().getAddonInfo('profile')): + f_mkdir(xbmcaddon.Addon().getAddonInfo('profile')) + return xbmcvfs.validatePath(xbmcaddon.Addon().getAddonInfo('profile')+path) def f_open(path): - try: - f = xbmcvfs.File(path) + with xbmcvfs.File(path) as f: result = f.read() - except: pass - finally: - f.close() return result def f_write(path,data): - try: - #f_mkdir(path) - f = xbmcvfs.File(path, 'w') - result = f.write(data) - except: pass - finally: - f.close() + with xbmcvfs.File(path, 'w') as f: + f.write(data) return True def f_remove(path): return xbmcvfs.delete(path) def f_exists(path): - exists = xbmcvfs.exists(path) - if exists == 0: - return False - elif exists == False: - return False - else: - return True + return xbmcvfs.exists(path) def f_mkdir(path): return xbmcvfs.mkdir(path) def setSetting(k,v): - return xbmcplugin.setSetting(int(sys.argv[1]), k, v) + return xbmcaddon.Addon().setSetting(k,v) def getSetting(k): - return xbmcplugin.getSetting(int(sys.argv[1]), id=k) + return xbmcaddon.Addon().getSetting(k) + def executeJSONRPC(cmd): xbmc.executeJSONRPC(cmd) + def getISO6391(): return xbmc.getLanguage(xbmc.ISO_639_1) def displayMsg(a,b): - xbmcgui.Dialog().notification(a,b) + xbmcgui.Dialog().notification(a,b,time=10000) \ No newline at end of file diff --git a/lib/libmediathek4webvtt2srt.py b/lib/libmediathek4webvtt2srt.py new file mode 100644 index 0000000..8bb1d61 --- /dev/null +++ b/lib/libmediathek4webvtt2srt.py @@ -0,0 +1,48 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +import re +import requests +import libmediathek4utils as lm4utils + +bracketLookup = { + '': '', + '': '', + '': '', + '': '', + '': '', + '': '', + '': '', + '': '', + '': '', +} +def webvtt2Srt(url): + webvtt = requests.get(url).text + webvtt = webvtt.replace('\r','') + s = webvtt.split('\n\n') + i = 1 + if s[1].strip() == '': + i = 2 + srt = '' + n = 1 + while i < len(s): + j = 0 + for line in s[i].split('\n'): + if j == 0: + srt += f'{str(n)}\n' + n += 1 + + if j == 1: + t = line.split('-->') + srt += t[0].strip().replace('.',',') + ' --> ' + t[1].strip().replace('.',',') + '\n' + + if j > 1: + for bracket in bracketLookup: + line = line.replace(bracket,bracketLookup[bracket]) + srt += line + '\n' + j += 1 + srt += '\n' + i += 1 + + subFile = lm4utils.pathUserdata('/webvtt.srt') + lm4utils.f_write(subFile,srt) + return subFile \ No newline at end of file