stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

piccoli Fix

Browse Source
This commit is contained in:
Alhaziel01
2021-02-09 19:13:55 +01:00
parent 35def5e512
commit 4bcbec4253
9 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/discoveryplus.py
View File

@@ -142,9 +142,9 @@ def episodios(item):
return itemlist
def play(item):
if item.filter:
item.id = liveDict()[item.filter]['id']
item.fulltitle = item.filter
if item.livefilter:
item.id = liveDict()[item.livefilter]['id']
item.fulltitle = item.livefilter
item.forcethumb = True
item.no_return = True
support.thumb(item, live=True)

4
channels/la7.py
View File

@@ -118,9 +118,9 @@ def episodios(item):
def play(item):
support.info()
if item.filter:
if item.livefilter:
for it in live(item):
if it.fulltitle == item.filter:
if it.fulltitle == item.livefilter:
item = it
break
data = support.match(item).data

6
channels/mediasetplay.py
View File

@@ -284,10 +284,10 @@ def findvideos(item):
def play(item):
support.info()
if item.filter:
d = liveDict()[item.filter]
if item.livefilter:
d = liveDict()[item.livefilter]
# support.dbg()
item = item.clone(title=support.typo(item.filter, 'bold'), fulltitle=item.filter, urls=d['urls'], plot=d['plot'], action='play', forcethumb=True, no_return=True)
item = item.clone(title=support.typo(item.livefilter, 'bold'), fulltitle=item.livefilter, urls=d['urls'], plot=d['plot'], action='play', forcethumb=True, no_return=True)
support.thumb(item, live=True)
if not item.urls: urls = item.url
else: urls = item.urls

9
channels/paramount.py
View File

@@ -162,8 +162,9 @@ def findvideos(item):
def play(item):
logger.debug()
if item.filter:
d = liveDict()[item.filter]
item = item.clone(title=support.typo(item.filter, 'bold'), fulltitle=item.filter, url=d['url'], plot=d['plot'], action='play', forcethumb=True, no_return=True)
item.server = 'paramount_server'
if item.livefilter:
d = liveDict()[item.livefilter]
item = item.clone(title=support.typo(item.livefilter, 'bold'), fulltitle=item.livefilter, url=d['url'], plot=d['plot'], action='play', forcethumb=True, no_return=True)
support.thumb(item, live=True)
return support.servertools.find_video_items(item, data=item.url)
return [item]

12
channels/raiplay.py
View File

@@ -342,7 +342,7 @@ def findvideos(item):
else:
url = item.url
itemlist.append(item.clone(server = 'directo', title = 'Rai Play', url = getUrl(url), action = 'play'))
itemlist.append(item.clone(server = 'directo', title = 'Rai Play', url = getUrl(url) + '&output=56', action = 'play'))
return support.server(item, itemlist=itemlist, Download=False)
@@ -419,9 +419,15 @@ def load_episodes(key, item):
def play(item):
if item.filter:
if item.livefilter:
d = liveDict()
item = item.clone(server='directo', fulltitle=item.filter, url=d[item.filter]['url'], plot=d[item.filter]['plot'], forcethumb=True, no_return=True)
item = item.clone(server='directo', fulltitle=item.livefilter, url=d[item.livefilter]['url'], plot=d[item.livefilter]['plot'], forcethumb=True, no_return=True)
support.thumb(item, live=True)
if '&output=56' in item.url:
match = support.match(item, patron=r'content"><!\[CDATA\[([^\]]+)(?:.*?"WIDEVINE","licenceUrl":"([^"]+))?').match
item.url = match[0]
if len(match) == 2:
item.drm = 'com.widevine.alpha'
item.license = match[1] + '|' + host + '|R{SSM}|'
logger.debug('PLAY URL', item.url)
return [item]

6
lib/fuzzy_match/algorithims.py
View File

@@ -8,7 +8,7 @@ from collections import Counter
def find_ngrams(string: str, split_num: int=3) -> set:
def find_ngrams(string, split_num=3):
"""
Slice string into ngrams.
Returns array of ngrams for the given string.
@@ -21,7 +21,7 @@ def find_ngrams(string: str, split_num: int=3) -> set:
if not string:
return set()
words = [f' {x} ' for x in re.split(r'\W+', str(string).lower()) if x.strip()]
words = [' {} '.format(x) for x in re.split(r'\W+', str(string).lower()) if x.strip()]
ngrams = set()
@@ -35,7 +35,7 @@ def find_ngrams(string: str, split_num: int=3) -> set:
return None
def trigram(text1: str, text2: str, split_num: int=3):
def trigram(text1, text2, split_num=3):
"""
Find the similarity between two strings using ngrams.
Returns float score value, 0.0 being completely different strings and 1.0 being equal strings.

2
platformcode/launcher.py
View File

@@ -44,7 +44,7 @@ def run(item=None):
if sys.argv[2] and 'play' in sys.argv[2]:
sp = sys.argv[2].split('/')
if len(sp) == 3:
item = Item(channel=sp[1], filter=sp[2], action='play')
item = Item(channel=sp[1], livefilter=sp[2], action='play')
# If no item, this is mainlist
elif sys.argv[2]:
sp = sys.argv[2].split('&')

2
platformcode/platformtools.py
View File

@@ -1057,7 +1057,7 @@ def set_player(item, xlistitem, mediaurl, view, strm):
play_torrent(item, xlistitem, mediaurl)
return
# If it is a strm file, play is not necessary
elif strm:
elif strm or item.livefilter:
xbmcplugin.setResolvedUrl(int(sys.argv[1]), True, xlistitem)
if item.subtitle:
xbmc.sleep(2000)

3
servers/paramount_server.py
View File

@@ -26,8 +26,9 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
url = jsontools.load(support.match(rootUrl.replace('&device={device}','').format(uri = ID)).data)['package']['video']['item'][0]['rendition'][0]['src']
urls = support.match(url, patron=r'RESOLUTION=(\d+x\d+).*?(http[^ ]+)').matches
for quality, url in urls:
quality = quality.split('x')[0]
if quality not in qualities:
qualities.append(quality)
video_urls.append(["m3u8 {}p [Paramount]".format(quality.split('x')[-1]), url])
video_urls.append(["m3u8 {}p [Paramount]".format(quality), url.split('?')[0]])
video_urls.sort(key=lambda url: int(support.match(url[0], patron=r'(\d+)p').match))
return video_urls