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

Merge pull request #566 from danielr460/master

Browse Source 
Ajuste canales
This commit is contained in:
Alfa
2019-02-27 15:32:22 -05:00
committed by GitHub
parent 87c7832b66 ec6b89bf55
commit 459465abde
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugin.video.alfa/channels/cinehindi.json
+1 -1
View File
@@ -3,7 +3,7 @@
"name": "CineHindi", "name": "CineHindi",
"active": true, "active": true,
"adult": false, "adult": false,
"language": ["cast", "lat"], "language": ["vos"],
"thumbnail": "cinehindi.png", "thumbnail": "cinehindi.png",
"banner": "http://i.imgur.com/cau9TVe.png", "banner": "http://i.imgur.com/cau9TVe.png",
"categories": [ "categories": [
plugin.video.alfa/channels/cinehindi.py
+18 -17
View File
@@ -27,8 +27,8 @@ def mainlist(item):
itemlist = list() itemlist = list()
itemlist.append(Item(channel=item.channel, action="genero", title="Generos", url=host, thumbnail = get_thumb("genres", auto = True))) itemlist.append(Item(channel=item.channel, action="genero", title="Generos", url=host, thumbnail = get_thumb("genres", auto = True)))
itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", url=host, thumbnail = get_thumb("newest", auto = True))) itemlist.append(Item(channel=item.channel, action="lista", title="Novedades", url=host, thumbnail = get_thumb("newest", auto = True)))
itemlist.append(Item(channel=item.channel, action="proximas", title="Próximas Películas", #itemlist.append(Item(channel=item.channel, action="proximas", title="Próximas Películas",
url=urlparse.urljoin(host, "proximamente"))) # url=urlparse.urljoin(host, "proximamente")))
itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=urlparse.urljoin(host, "?s="), thumbnail = get_thumb("search", auto = True))) itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=urlparse.urljoin(host, "?s="), thumbnail = get_thumb("search", auto = True)))
autoplay.show_option(item.channel, itemlist) autoplay.show_option(item.channel, itemlist)
return itemlist return itemlist
@@ -38,8 +38,8 @@ def genero(item):
logger.info() logger.info()
itemlist = list() itemlist = list()
data = httptools.downloadpage(host).data data = httptools.downloadpage(host).data
patron = 'level-0.*?value="([^"]+)"' patron = '<option class=.*? value=([^<]+)>'
patron += '>([^<]+)' patron += '([^<]+)<\/option>'
matches = scrapertools.find_multiple_matches(data, patron) matches = scrapertools.find_multiple_matches(data, patron)
for scrapedurl, scrapedtitle in matches: for scrapedurl, scrapedtitle in matches:
if 'Próximas Películas' in scrapedtitle: if 'Próximas Películas' in scrapedtitle:
@@ -94,28 +94,29 @@ def lista(item):
else: else:
url = httptools.downloadpage("%s?cat=%s" %(host, item.cat), follow_redirects=False, only_headers=True).headers.get("location", "") url = httptools.downloadpage("%s?cat=%s" %(host, item.cat), follow_redirects=False, only_headers=True).headers.get("location", "")
data = httptools.downloadpage(url).data data = httptools.downloadpage(url).data
bloque = scrapertools.find_single_match(data, """class="item_1 items.*?id="paginador">""") bloque = data#scrapertools.find_single_match(data, """class="item_1 items.*?id="paginador">""")
patron = 'class="item">.*?' # Todos los items de peliculas (en esta web) empiezan con esto patron = '<div id=mt.+?>' # Todos los items de peliculas (en esta web) empiezan con esto
patron += '<a href="([^"]+).*?' # scrapedurl patron += '<a href=([^"]+)\/><div class=image>' # scrapedurl
patron += '<img src="([^"]+).*?' # scrapedthumbnail patron += '<img src=([^"]+) alt=.*?' # scrapedthumbnail
patron += 'alt="([^"]+).*?' # scrapedtitle patron += '<span class=tt>([^"]+)<\/span>' # scrapedtitle
patron += '<div class="fixyear">(.*?)</span></div><' # scrapedfixyear patron += '<span class=ttx>([^"]+)<div class=degradado>.*?' # scrapedplot
patron += '<span class=year>([^"]+)<\/span><\/div><\/div>' # scrapedfixyear
matches = scrapertools.find_multiple_matches(bloque, patron) matches = scrapertools.find_multiple_matches(bloque, patron)
for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedfixyear in matches: for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedplot, scrapedyear in matches:
patron = '<span class="year">([^<]+)' # scrapedyear #patron = '<span class="year">([^<]+)' # scrapedyear
scrapedyear = scrapertools.find_single_match(scrapedfixyear, patron) #scrapedyear = scrapertools.find_single_match(scrapedfixyear, patron)
scrapedtitle = scrapedtitle.replace(scrapertools.find_single_match(scrapedtitle,'\(\d{4}\)'),'').strip() scrapedtitle = scrapedtitle.replace(scrapertools.find_single_match(scrapedtitle,'\(\d{4}\)'),'').strip()
title = scrapedtitle title = scrapedtitle
if scrapedyear: if scrapedyear:
title += ' (%s)' % (scrapedyear) title += ' (%s)' % (scrapedyear)
item.infoLabels['year'] = int(scrapedyear) item.infoLabels['year'] = int(scrapedyear)
patron = '<span class="calidad2">([^<]+).*?' # scrapedquality patron = '<span class="calidad2">([^<]+).*?' # scrapedquality
scrapedquality = scrapertools.find_single_match(scrapedfixyear, patron) #scrapedquality = scrapertools.find_single_match(scrapedfixyear, patron)
if scrapedquality: #if scrapedquality:
title += ' [%s]' % (scrapedquality) # title += ' [%s]' % (scrapedquality)
itemlist.append( itemlist.append(
item.clone(title=title, url=scrapedurl, action="findvideos", extra=scrapedtitle, item.clone(title=title, url=scrapedurl, action="findvideos", extra=scrapedtitle,
contentTitle=scrapedtitle, thumbnail=scrapedthumbnail, contentType="movie", context=["buscar_trailer"])) contentTitle=scrapedtitle, thumbnail=scrapedthumbnail, plot=scrapedplot, contentType="movie", context=["buscar_trailer"]))
tmdb.set_infoLabels(itemlist) tmdb.set_infoLabels(itemlist)
# Paginacion # Paginacion
patron = 'rel="next" href="([^"]+)' patron = 'rel="next" href="([^"]+)'