Merge pull request #508 from mrgaturus/cuevana2-channel
C2 y C2ES: try except
This commit is contained in:
@@ -33,7 +33,7 @@ def mainlist(item):
|
|||||||
itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "movies",
|
itemlist.append(Item(channel = item.channel, title = "Favoritas", action = "movies",
|
||||||
url = host + "peliculas-destacadas", thumbnail = get_thumb("favorites", auto = True) ))
|
url = host + "peliculas-destacadas", thumbnail = get_thumb("favorites", auto = True) ))
|
||||||
itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search",
|
itemlist.append(Item(channel = item.channel, title = "Buscar...", action = "search",
|
||||||
url = host + "search/", thumbnail = get_thumb("search", auto = True)))
|
url = host + "pelicula/?s=", thumbnail = get_thumb("search", auto = True)))
|
||||||
|
|
||||||
# SERIES
|
# SERIES
|
||||||
itemlist.append(Item(channel = item.channel, title = "--- Series ---", folder=False, text_bold=True))
|
itemlist.append(Item(channel = item.channel, title = "--- Series ---", folder=False, text_bold=True))
|
||||||
@@ -152,7 +152,6 @@ def searchShows(itemlist, item, texto):
|
|||||||
itemlist.append(Item(channel = item.channel, title=title, url=host + link, action="episodes"))
|
itemlist.append(Item(channel = item.channel, title=title, url=host + link, action="episodes"))
|
||||||
|
|
||||||
def searchMovies(itemlist, item, texto):
|
def searchMovies(itemlist, item, texto):
|
||||||
texto = texto.replace(' ', '+').lower()
|
|
||||||
data = load_data(item.url + texto)
|
data = load_data(item.url + texto)
|
||||||
#patron para buscar las peliculas
|
#patron para buscar las peliculas
|
||||||
pattern = '<a href="([^"]+)"><div class="img">' #link
|
pattern = '<a href="([^"]+)"><div class="img">' #link
|
||||||
@@ -160,14 +159,12 @@ def searchMovies(itemlist, item, texto):
|
|||||||
pattern += '<span style="width:([0-9]+)%">.*?'
|
pattern += '<span style="width:([0-9]+)%">.*?'
|
||||||
pattern += '"txt">(.*?)</div>' # text
|
pattern += '"txt">(.*?)</div>' # text
|
||||||
|
|
||||||
#coloca las peliculas encontradas en la lista, improvisando do while
|
#ahora ya no se necesita el do while
|
||||||
next_page = True
|
put_movies(itemlist, item, data, pattern)
|
||||||
while next_page:
|
next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)">')
|
||||||
put_movies(itemlist, item, data, pattern)
|
|
||||||
next_page = scrapertools.find_single_match(data, '<a class="nextpostslink" rel="next" href="([^"]+)">')
|
|
||||||
|
|
||||||
if next_page:
|
if next_page:
|
||||||
data = load_data(next_page)
|
itemlist.append(Item(channel = item.channel, title='Siguiente Pagina', url=next_page, action="movies"))
|
||||||
|
|
||||||
def search(item, texto):
|
def search(item, texto):
|
||||||
itemlist = []
|
itemlist = []
|
||||||
@@ -203,7 +200,10 @@ def age(item):
|
|||||||
|
|
||||||
def GKPluginLink(hash):
|
def GKPluginLink(hash):
|
||||||
hashdata = urllib.urlencode({r'link':hash})
|
hashdata = urllib.urlencode({r'link':hash})
|
||||||
json = httptools.downloadpage('https://player4.cuevana2.com/plugins/gkpluginsphp.php', post=hashdata).data
|
try:
|
||||||
|
json = httptools.downloadpage('https://player4.cuevana2.com/plugins/gkpluginsphp.php', post=hashdata).data
|
||||||
|
except:
|
||||||
|
return None
|
||||||
logger.info(jsontools.load(json))
|
logger.info(jsontools.load(json))
|
||||||
|
|
||||||
data = jsontools.load(json) if json else False
|
data = jsontools.load(json) if json else False
|
||||||
|
|||||||
@@ -152,7 +152,10 @@ def search(item, text):
|
|||||||
|
|
||||||
def GKPluginLink(hash):
|
def GKPluginLink(hash):
|
||||||
hashdata = urllib.urlencode({r'link':hash})
|
hashdata = urllib.urlencode({r'link':hash})
|
||||||
json = httptools.downloadpage('https://player4.cuevana2.com/plugins/gkpluginsphp.php', post=hashdata).data
|
try:
|
||||||
|
json = httptools.downloadpage('https://player4.cuevana2.com/plugins/gkpluginsphp.php', post=hashdata).data
|
||||||
|
except:
|
||||||
|
return None
|
||||||
logger.info(jsontools.load(json))
|
logger.info(jsontools.load(json))
|
||||||
|
|
||||||
data = jsontools.load(json) if json else False
|
data = jsontools.load(json) if json else False
|
||||||
|
|||||||
Reference in New Issue
Block a user