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() item = Item()
try: try:
if categoria in ['peliculas','latino']: if categoria in ['peliculas','latino']:
item.url = host + 'peliculas/ultimas-agregadas/' item.url = host + 'peliculas/ultimas-peliculas/'
elif categoria == 'infantiles': elif categoria == 'infantiles':
item.url = host + 'peliculas/animacion/' item.url = host + 'peliculas/animacion/'
@@ -297,7 +297,7 @@ def newest(categoria):
elif categoria == 'documentales': elif categoria == 'documentales':
item.url = host + 'documentales/' item.url = host + 'documentales/'
itemlist = lista(item) itemlist = list_all(item)
if itemlist[-1].title == 'Siguiente >>>': if itemlist[-1].title == 'Siguiente >>>':
itemlist.pop() itemlist.pop()
except: except:
+20 -3
View File
@@ -12,6 +12,7 @@ from core import jsontools
from core import scrapertools from core import scrapertools
from core import servertools from core import servertools
from core import tmdb from core import tmdb
from channels import autoplay
from core.item import Item from core.item import Item
from platformcode import config, logger 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', 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'} 'Español Castellano':'es', 'Sub Español':'VOSE'}
list_idiomas = IDIOMAS.values() 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): def mainlist(item):
logger.info() logger.info()
autoplay.init(item.channel, list_servers, CALIDADES)
thumb_series = get_thumb("channels_tvshow.png") thumb_series = get_thumb("channels_tvshow.png")
thumb_series_az = get_thumb("channels_tvshow_az.png") thumb_series_az = get_thumb("channels_tvshow_az.png")
thumb_buscar = get_thumb("search.png") thumb_buscar = get_thumb("search.png")
@@ -39,6 +44,8 @@ def mainlist(item):
itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES) itemlist = filtertools.show_option(itemlist, item.channel, list_idiomas, CALIDADES)
autoplay.show_option(item.channel, itemlist)
return itemlist return itemlist
@@ -205,13 +212,23 @@ def findvideos(item):
server=server.rstrip(), server=server.rstrip(),
quality=quality, quality=quality,
uploader=uploader), uploader=uploader),
server=server.rstrip(),
url=urlparse.urljoin(HOST, url), url=urlparse.urljoin(HOST, url),
language=IDIOMAS.get(lang, lang), language=IDIOMAS.get(lang,lang),
quality=quality, quality=quality
) for lang, date, server, url, linkType, quality, uploader in links] ) for lang, date, server, url, linkType, quality, uploader in links]
# Requerido para FilterTools
itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES) itemlist = filtertools.get_links(itemlist, item, list_idiomas, CALIDADES)
# Requerido para AutoPlay
autoplay.start(itemlist, item)
return itemlist return itemlist
+16 -13
View File
@@ -170,25 +170,26 @@ def servers_blacklist(item):
server_list = servertools.get_servers_list() server_list = servertools.get_servers_list()
dict_values = {} dict_values = {}
list_controls = [{'id': 'filter_servers', list_controls = [{"id": "filter_servers",
'type': "bool", "type": "bool",
'label': "@30068", "label": "@30068",
'default': False, "default": False,
'enabled': True, "enabled": True,
'visible': True}] "visible": True}]
dict_values['filter_servers'] = config.get_setting('filter_servers') 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())): for i, server in enumerate(sorted(server_list.keys())):
server_parameters = server_list[server] server_parameters = server_list[server]
controls, defaults = servertools.get_server_controls_settings(server) controls, defaults = servertools.get_server_controls_settings(server)
dict_values[server] = config.get_setting("black_list", server=server) dict_values[server] = config.get_setting("black_list", server=server)
control = {'id': server, control = {"id": server,
'type': "bool", "type": "bool",
'label': ' %s' % server_parameters["name"], "label": ' %s' % server_parameters["name"],
'default': defaults.get("black_list", False), "default": defaults.get("black_list", False),
'enabled': "eq(-%s,True)" % (i + 1), "enabled": "eq(-%s,True)" % (i + 1),
'visible': True} "visible": True}
list_controls.append(control) list_controls.append(control)
return platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values, return platformtools.show_channel_settings(list_controls=list_controls, dict_values=dict_values,
@@ -228,6 +229,8 @@ def servers_favorites(item):
'enabled': True, 'enabled': True,
'visible': True}] 'visible': True}]
dict_values['favorites_servers'] = config.get_setting('favorites_servers') dict_values['favorites_servers'] = config.get_setting('favorites_servers')
if dict_values['favorites_servers'] == None:
dict_values['favorites_servers'] = False
server_names = ['Ninguno'] server_names = ['Ninguno']
+11
View File
@@ -129,6 +129,17 @@ def token_trakt(item):
return itemlist return itemlist
def set_trakt_info(item):
logger.info()
import xbmcgui
# Envia los datos a trakt
try:
info = item.infoLabels
ids = jsontools.dump({'tmdb': info['tmdb_id'] , 'imdb': info['imdb_id'], 'slug': info['title']})
xbmcgui.Window(10000).setProperty('script.trakt.ids', ids)
except:
pass
def get_trakt_watched(id_type, mediatype, update=False): def get_trakt_watched(id_type, mediatype, update=False):
logger.info() logger.info()
@@ -136,6 +136,11 @@ def run(item=None):
# Special play action # Special play action
if item.action == "play": if item.action == "play":
#define la info para trakt
try:
trakt_tools.set_trakt_info(item)
except:
pass
logger.info("item.action=%s" % item.action.upper()) logger.info("item.action=%s" % item.action.upper())
# logger.debug("item_toPlay: " + "\n" + item.tostring('\n')) # logger.debug("item_toPlay: " + "\n" + item.tostring('\n'))
+1 -2
View File
@@ -31,11 +31,10 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
data = httptools.downloadpage(page_url, cookies=False, headers=header).data data = httptools.downloadpage(page_url, cookies=False, headers=header).data
subtitle = scrapertools.find_single_match(data, '<track kind="captions" src="([^"]+)" srclang="es"') subtitle = scrapertools.find_single_match(data, '<track kind="captions" src="([^"]+)" srclang="es"')
try: try:
code = scrapertools.find_single_match(data, '<span[^>]+id="[^"]+">([^<]{40,})</span>' ) code = scrapertools.find_single_match(data, '<p style="" id="[^"]+">(.*?)</p>' )
_0x59ce16 = eval(scrapertools.find_single_match(data, '_0x59ce16=([^;]+)').replace('parseInt', 'int')) _0x59ce16 = eval(scrapertools.find_single_match(data, '_0x59ce16=([^;]+)').replace('parseInt', 'int'))
_1x4bfb36 = eval(scrapertools.find_single_match(data, '_1x4bfb36=([^;]+)').replace('parseInt', 'int')) _1x4bfb36 = eval(scrapertools.find_single_match(data, '_1x4bfb36=([^;]+)').replace('parseInt', 'int'))
parseInt = eval(scrapertools.find_single_match(data, '_0x30725e,(\(parseInt.*?)\),').replace('parseInt', 'int')) parseInt = eval(scrapertools.find_single_match(data, '_0x30725e,(\(parseInt.*?)\),').replace('parseInt', 'int'))