Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matrix.script.module.libmediathek4 fix timestamp #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Matrix.script.module.libmediathek4 fix timestamp #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e008cd0
Add files via upload
obrain17 Feb 24, 2024
79bb1e6
Add files via upload
obrain17 Feb 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions addon.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.module.libmediathek4"
name="libmediathek4"
version="0.0.1"
provider-name="sarbes">
<addon id="script.module.libmediathek4" name="libmediathek4" version="1.0.1" provider-name="sarbes">
<requires>
<import addon="xbmc.python" version="3.0.0" />
</requires>
<extension point="xbmc.python.module" library="lib" />
<extension point="xbmc.addon.metadata">
<platform>all</platform>
<license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
<source>https://github.com/prof-membrane/plugin.video.libmediathek4</source>
<summary lang="en">Supplementary lib for Mediathek add-ons.</summary>
<description lang="en">This lib is a mini framework. It is used in my (sarbes) "Mediathek" scrapers.</description>
<license>GPL-2.0-only</license>
<source>https://github.com/sarbes/plugin.video.libmediathek4</source>
<summary lang="en_GB">Supplementary lib for Mediathek add-ons.</summary>
<description lang="en_GB">This lib is a mini framework. It is used in my (sarbes) "Mediathek" scrapers.</description>
<assets>
<icon>resources/icon.png</icon>
</assets>
</extension>
</addon>
183 changes: 54 additions & 129 deletions lib/libmediathek4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand All @@ -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',''),
Expand All @@ -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:
Expand All @@ -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

Expand All @@ -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])
Expand All @@ -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)
Expand All @@ -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'])
Expand Down Expand Up @@ -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

Expand All @@ -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()

Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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')
Expand Down
68 changes: 68 additions & 0 deletions lib/libmediathek4ttml2srt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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('<tt:','<').replace('</tt:','</')
if content:
d = _stylesSetup(re.compile('<styling>(.+?)</styling>', re.DOTALL).findall(content)[0])
div = re.compile('<div.+?>(.+?)</div>', re.DOTALL).findall(content)[0]
p = re.compile('<(.+?)</p>', re.DOTALL).findall(div)
i = 1
buffer = ''
for part in p:
if '<span' in part:
part = part.replace('begin="1','begin="0').replace('end="1','end="0').replace('\n','').replace('<br/>','\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('<br />','\n')
if 'style=' in s:
style = re.compile('style="(.+?)"').findall(s)[0]
if d[style]:
part = '<font color="'+d[style]+'">'+part+'</font>'
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+'>','<font color="'+d[style]+'">')
else:
part = part.replace('<'+entry+'>','')
elif entry.startswith('/span'):
part = part.replace('</span>','</font>')
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('<style(.+?)>', 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

Loading