Fix Server Bloccati

This commit is contained in:
Alhaziel01
2021-01-13 17:03:12 +01:00
parent d6cd5ccf76
commit 7932613f76
2 changed files with 16 additions and 10 deletions
+4 -1
View File
@@ -1155,8 +1155,11 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru
verifiedItemlist = [] verifiedItemlist = []
def getItem(videoitem): def getItem(videoitem):
if not videoitem.server:
s = servertools.get_server_from_url(videoitem.url)
videoitem.server = s[2] if s else 'directo'
srv_param = servertools.get_server_parameters(videoitem.server.lower()) srv_param = servertools.get_server_parameters(videoitem.server.lower())
if srv_param['active']: if srv_param.get('active', False):
if not srv_param: # do not exists or it's empty if not srv_param: # do not exists or it's empty
findS = servertools.get_server_from_url(videoitem.url) findS = servertools.get_server_from_url(videoitem.url)
info(findS) info(findS)
+12 -9
View File
@@ -402,8 +402,8 @@ def findvideos(item):
json = item.url json = item.url
for option in json: for option in json:
extra = set_extra_values(item, option, item.path) extra = set_extra_values(item, option, item.path)
title = item.fulltitle + (' - '+option['title'] if 'title' in option else '') title = item.fulltitle + (' - '+ option['title'] if 'title' in option else '')
title = set_title(title, extra.language, extra.quality) title = set_title(title, extra.language, extra.quality, False)
itemlist.append(Item(channel=item.channel, title=title, url=option['url'], action='play', quality=extra.quality, itemlist.append(Item(channel=item.channel, title=title, url=option['url'], action='play', quality=extra.quality,
language=extra.language, infoLabels = item.infoLabels)) language=extra.language, infoLabels = item.infoLabels))
@@ -711,22 +711,25 @@ def set_extra_values(item, json, path):
# format titles # format titles
def set_title(title, language='', quality=''): def set_title(title, language='', quality='', Bold = True):
logger.debug() logger.debug()
t = support.match(title, patron=r'\{([^\}]+)\}').match t = support.match(title, patron=r'\{([^\}]+)\}').match
if 'bold' not in t: t += ' bold' bold = ''
title = re.sub(r'(\{[^\}]+\})','',title) if Bold:
title = support.typo(title,t) bold = ' bold'
if 'bold' not in t: t += ' bold'
title = re.sub(r'(\{[^\}]+\})','',title)
title = support.typo(title,t)
if quality: if quality:
title += support.typo(quality, '_ [] color kod bold') title += support.typo(quality, '_ [] color kod' + bold)
if language: if language:
if not isinstance(language, list): if not isinstance(language, list):
title += support.typo(language.upper(), '_ [] color kod bold') title += support.typo(language.upper(), '_ [] color kod' + bold)
else: else:
for lang in language: for lang in language:
title += support.typo(lang.upper(), '_ [] color kod bold') title += support.typo(lang.upper(), '_ [] color kod' + bold)
return title return title