diff --git a/plugin.video.alfa/channels/mejortorrent.py b/plugin.video.alfa/channels/mejortorrent.py index 014562fd..63eced5a 100755 --- a/plugin.video.alfa/channels/mejortorrent.py +++ b/plugin.video.alfa/channels/mejortorrent.py @@ -12,7 +12,7 @@ from core.item import Item from core.tmdb import Tmdb from platformcode import logger -host = "http://www.mejortorrent.com" +host = "https://mejortorrent.website" def mainlist(item): @@ -29,19 +29,19 @@ def mainlist(item): thumb_buscar = get_thumb("search.png") itemlist.append(Item(channel=item.channel, title="Peliculas", action="getlist", - url="http://www.mejortorrent.com/torrents-de-peliculas.html", thumbnail=thumb_pelis)) + url= host + "/torrents-de-peliculas.html", thumbnail=thumb_pelis)) itemlist.append(Item(channel=item.channel, title="Peliculas HD", action="getlist", - url="http://www.mejortorrent.com/torrents-de-peliculas-hd-alta-definicion.html", + url= host + "/torrents-de-peliculas-hd-alta-definicion.html", thumbnail=thumb_pelis_hd)) itemlist.append(Item(channel=item.channel, title="Series", action="getlist", - url="http://www.mejortorrent.com/torrents-de-series.html", thumbnail=thumb_series)) + url= host + "/torrents-de-series.html", thumbnail=thumb_series)) itemlist.append(Item(channel=item.channel, title="Series HD", action="getlist", - url="http://www.mejortorrent.com/torrents-de-series-hd-alta-definicion.html", + url= host + "/torrents-de-series-hd-alta-definicion.html", thumbnail=thumb_series_hd)) itemlist.append(Item(channel=item.channel, title="Series Listado Alfabetico", action="listalfabetico", - url="http://www.mejortorrent.com/torrents-de-series.html", thumbnail=thumb_series_az)) + url= host + "/torrents-de-series.html", thumbnail=thumb_series_az)) itemlist.append(Item(channel=item.channel, title="Documentales", action="getlist", - url="http://www.mejortorrent.com/torrents-de-documentales.html", thumbnail=thumb_docus)) + url= host + "/torrents-de-documentales.html", thumbnail=thumb_docus)) itemlist.append(Item(channel=item.channel, title="Buscar...", action="search", thumbnail=thumb_buscar)) return itemlist @@ -55,10 +55,10 @@ def listalfabetico(item): for letra in ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']: itemlist.append(Item(channel=item.channel, action="getlist", title=letra, - url="http://www.mejortorrent.com/series-letra-" + letra.lower() + ".html")) + url= host + "/series-letra-" + letra.lower() + ".html")) itemlist.append(Item(channel=item.channel, action="getlist", title="Todas", - url="http://www.mejortorrent.com/series-letra..html")) + url= host + "/series-letra..html")) return itemlist @@ -67,7 +67,7 @@ def search(item, texto): logger.info() texto = texto.replace(" ", "+") - item.url = "http://www.mejortorrent.com/secciones.php?sec=buscador&valor=%s" % (texto) + item.url = host + "/secciones.php?sec=buscador&valor=%s" % (texto) try: return buscador(item) @@ -81,30 +81,12 @@ def search(item, texto): def buscador(item): logger.info() itemlist = [] - data = httptools.downloadpage(item.url).data - - # pelis - # - # - # - # - # docs - # - # - # - - # busca series patron = "]+>(.*?)" patron += ".*?([^']+)" patron_enlace = "/serie-descargar-torrents-\d+-\d+-(.*?)\.html" matches = scrapertools.find_multiple_matches(data, patron) - scrapertools.printMatches(matches) for scrapedurl, scrapedtitle, scrapedinfo in matches: title = scrapertools.remove_htmltags(scrapedtitle).decode('iso-8859-1').encode( @@ -119,10 +101,7 @@ def buscador(item): # busca pelis patron = "]+>(.*?)" patron_enlace = "/peli-descargar-torrent-\d+(.*?)\.html" - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - for scrapedurl, scrapedtitle in matches: title = scrapertools.remove_htmltags(scrapedtitle).decode('iso-8859-1').encode('utf-8') url = urlparse.urljoin(item.url, scrapedurl) @@ -135,10 +114,7 @@ def buscador(item): patron += "(.*?).*?" patron += "(.*?)" patron_enlace = "/doc-descargar-torrent-\d+-\d+-(.*?)\.html" - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - for scrapedurl, scrapedtitle, scrapedinfo in matches: title = scrapedtitle.decode('iso-8859-1').encode('utf8') + " " + scrapedinfo.decode('iso-8859-1').encode('utf8') url = urlparse.urljoin(item.url, scrapedurl) @@ -154,23 +130,7 @@ def buscador(item): def getlist(item): logger.info() itemlist = [] - data = httptools.downloadpage(item.url).data - - # pelis - # - # - # - # - # docs - # - # - # - if item.url.find("peliculas") > -1: patron = '[^<]+' patron += '' @@ -202,27 +162,18 @@ def getlist(item): action = "episodios" folder = True extra = "docus" - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - for scrapedurl, scrapedthumbnail in matches: title = scrapertools.get_match(scrapedurl, patron_enlace) title = title.replace("-", " ") url = urlparse.urljoin(item.url, scrapedurl) - thumbnail = urlparse.urljoin(item.url, urllib.quote(scrapedthumbnail)) + thumbnail = host + urllib.quote(scrapedthumbnail) plot = "" - logger.debug("title=[" + title + "], url=[" + url + "], thumbnail=[" + thumbnail + "]") itemlist.append(Item(channel=item.channel, action=action, title=title, url=url, thumbnail=thumbnail, plot=plot, folder=folder, extra=extra)) matches = re.compile(patron_title, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - # Cambia el título sacado de la URL por un título con más información. - # esta implementación asume que va a encontrar las mismas coincidencias - # que en el bucle anterior, lo cual técnicamente es erróneo, pero que - # funciona mientras no cambien el formato de la página cnt = 0 for scrapedtitle, notused, scrapedinfo in matches: title = re.sub('\r\n', '', scrapedtitle).decode('iso-8859-1').encode('utf8').strip() @@ -244,7 +195,6 @@ def getlist(item): # Extrae el paginador patronvideos = " Siguiente >>" matches = re.compile(patronvideos, re.DOTALL).findall(data) - scrapertools.printMatches(matches) if len(matches) > 0: scrapedurl = urlparse.urljoin(item.url, matches[0]) @@ -267,18 +217,11 @@ def episodios(item): item.thumbnail = scrapertools.find_single_match(data, "src='http://www\.mejortorrent\.com(/uploads/imagenes/" + tabla + "/[a-zA-Z0-9_ ]+.jpg)'") - item.thumbnail = 'http://www.mejortorrent.com' + urllib.quote(item.thumbnail) + item.thumbnail = host + + urllib.quote(item.thumbnail) #
data = scrapertools.get_match(data, "(.*?)
") - ''' - 4x01 - Episodio en V.O. Sub Esp. -
Fecha: 2014-04-07
- - - ''' - if item.extra == "series": patron = "]+>]+>([^>]+)[^<]+" else: @@ -289,7 +232,6 @@ def episodios(item): patron += "") link = urlparse.urljoin(url, link) - logger.debug("link=" + link) - itemlist.append(Item(channel=item.channel, action="play", server="torrent", title=item.title, url=link, thumbnail=item.thumbnail, plot=item.plot, fanart=item.fanart, folder=False)) @@ -402,26 +339,12 @@ def play(item): data = httptools.downloadpage(item.url, post=item.extra).data logger.debug("data=" + data) - # series - # - # El sue–o de todos. - params = dict(urlparse.parse_qsl(item.extra)) - patron = '>": itemlist.pop() - item.url = 'http://www.mejortorrent.com/torrents-de-series.html' + item.url = host + "/torrents-de-series.html" itemlist.extend(getlist(item)) if itemlist[-1].title == "Pagina siguiente >>": itemlist.pop()