Correcciones

This commit is contained in:
Unknown
2018-04-05 16:59:31 -03:00
parent b81a2202f3
commit 0654a1eabd
6 changed files with 55 additions and 20 deletions
+2 -2
View File
@@ -286,7 +286,7 @@ def newest(categoria):
item = Item()
try:
if categoria in ['peliculas','latino']:
item.url = host + 'peliculas/ultimas-agregadas/'
item.url = host + 'peliculas/ultimas-peliculas/'
elif categoria == 'infantiles':
item.url = host + 'peliculas/animacion/'
@@ -297,7 +297,7 @@ def newest(categoria):
elif categoria == 'documentales':
item.url = host + 'documentales/'
itemlist = lista(item)
itemlist = list_all(item)
if itemlist[-1].title == 'Siguiente >>>':
itemlist.pop()
except:
+20 -3
View File
@@ -12,6 +12,7 @@ from core import jsontools
from core import scrapertools
from core import servertools
from core import tmdb
from channels import autoplay
from core.item import Item
from platformcode import config, logger
@@ -20,12 +21,16 @@ HOST = "http://www.seriespapaya.com"
IDIOMAS = {'es': 'Español', 'lat': 'Latino', 'in': 'Inglés', 'ca': 'Catalán', 'sub': 'VOSE', 'Español Latino':'lat',
'Español Castellano':'es', 'Sub Español':'VOSE'}
list_idiomas = IDIOMAS.values()
CALIDADES = ['360p', '480p', '720p HD', '1080p HD']
CALIDADES = ['360p', '480p', '720p HD', '1080p HD', 'default']
list_servers = ['powvideo', 'streamplay', 'filebebo', 'flashx', 'gamovideo', 'nowvideo', 'openload', 'streamango',
'streamcloud', 'vidzi', 'clipwatching', ]
def mainlist(item):
logger.info()
autoplay.init(item.channel, list_servers, CALIDADES)
thumb_series = get_thumb("channels_tvshow.png")
thumb_series_az = get_thumb("channels_tvshow_az.png")
thumb_buscar = get_thumb("search.png")
@@ -39,6 +44,8 @@ def mainlist(item):
itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES)
autoplay.show_option(item.channel, itemlist)
return itemlist
@@ -205,13 +212,23 @@ def findvideos(item):
server=server.rstrip(),
quality=quality,
uploader=uploader),
server=server.rstrip(),
url=urlparse.urljoin(HOST, url),
language=IDIOMAS.get(lang, lang),
quality=quality,
language=IDIOMAS.get(lang,lang),
quality=quality
) for lang, date, server, url, linkType, quality, uploader in links]
# Requerido para FilterTools
itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES)
# Requerido para AutoPlay
autoplay.start(itemlist, item)
return itemlist
+16 -13
View File
@@ -170,25 +170,26 @@ def servers_blacklist(item):
server_list = servertools.get_servers_list()
dict_values = {}
list_controls = [{'id': 'filter_servers',
'type': "bool",
'label': "@30068",
'default': False,
'enabled': True,
'visible': True}]
list_controls = [{"id": "filter_servers",
"type": "bool",
"label": "@30068",
"default": False,
"enabled": True,
"visible": True}]
dict_values['filter_servers'] = config.get_setting('filter_servers')
if dict_values['filter_servers'] == None:
dict_values['filter_servers'] = False
for i, server in enumerate(sorted(server_list.keys())):
server_parameters = server_list[server]
controls, defaults = servertools.get_server_controls_settings(server)
dict_values[server] = config.get_setting("black_list", server=server)
control = {'id': server,
'type': "bool",
'label': ' %s' % server_parameters["name"],
'default': defaults.get("black_list", False),
'enabled': "eq(-%s,True)" % (i + 1),
'visible': True}
control = {"id": server,
"type": "bool",
"label": ' %s' % server_parameters["name"],
"default": defaults.get("black_list", False),
"enabled": "eq(-%s,True)" % (i + 1),
"visible": True}
list_controls.append(control)
return platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values,
@@ -228,6 +229,8 @@ def servers_favorites(item):
'enabled': True,
'visible': True}]
dict_values['favorites_servers'] = config.get_setting('favorites_servers')
if dict_values['favorites_servers'] == None:
dict_values['favorites_servers'] = False
server_names = ['Ninguno']