From 5dca91c1a530877d34f39e5afd6a50150db5562f Mon Sep 17 00:00:00 2001 From: Kingbox <37674310+lopezvg@users.noreply.github.com> Date: Wed, 23 May 2018 21:15:17 +0200 Subject: [PATCH] =?UTF-8?q?EliteTorrent:=20redise=C3=B1o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reparación y rediseño --- plugin.video.alfa/channels/elitetorrent.json | 8 +- plugin.video.alfa/channels/elitetorrent.py | 613 ++++++++++++++++-- .../media/channels/thumb/elitetorrent.png | Bin 0 -> 20518 bytes 3 files changed, 548 insertions(+), 73 deletions(-) create mode 100644 plugin.video.alfa/resources/media/channels/thumb/elitetorrent.png diff --git a/plugin.video.alfa/channels/elitetorrent.json b/plugin.video.alfa/channels/elitetorrent.json index a0044960..72705725 100644 --- a/plugin.video.alfa/channels/elitetorrent.json +++ b/plugin.video.alfa/channels/elitetorrent.json @@ -3,7 +3,7 @@ "name": "Elite Torrent", "active": true, "adult": false, - "language": ["cast"], + "language": ["*"], "thumbnail": "elitetorrent.png", "banner": "elitetorrent.png", "categories": [ @@ -15,10 +15,10 @@ ], "settings":[ { - "id": "include_in_newest_torrent", + "id": "include_in_global_search", "type": "bool", - "label": "Incluir en Novedades - Torrent", - "default": true, + "label": "Incluir en busqueda global", + "default": false, "enabled": true, "visible": true } diff --git a/plugin.video.alfa/channels/elitetorrent.py b/plugin.video.alfa/channels/elitetorrent.py index 66181660..42e69560 100644 --- a/plugin.video.alfa/channels/elitetorrent.py +++ b/plugin.video.alfa/channels/elitetorrent.py @@ -1,111 +1,586 @@ # -*- coding: utf-8 -*- import re +import sys +import urllib import urlparse +from channelselector import get_thumb +from core import httptools from core import scrapertools +from core import servertools from core.item import Item -from platformcode import logger +from platformcode import config, logger +from core import tmdb -BASE_URL = 'http://www.elitetorrent.wesconference.net' +host = 'http://www.elitetorrent.biz' def mainlist(item): logger.info() - itemlist = [] - itemlist.append(Item(channel=item.channel, title="Docus y TV", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/6/docus-y-tv/modo:mini", - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Estrenos", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/1/estrenos/modo:mini", viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Películas", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/2/peliculas/modo:mini", viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Peliculas HDRip", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/13/peliculas-hdrip/modo:mini", - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Peliculas MicroHD", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/17/peliculas-microhd/modo:mini", - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Peliculas VOSE", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/14/peliculas-vose/modo:mini", - viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Series", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/4/series/modo:mini", viewmode="movie_with_plot")) - itemlist.append(Item(channel=item.channel, title="Series VOSE", action="peliculas", - url="http://www.elitetorrent.wesconference.net/categoria/16/series-vose/modo:mini", - viewmode="movie_with_plot")) + + thumb_pelis = get_thumb("channels_movie.png") + thumb_pelis_hd = get_thumb("channels_movie_hd.png") + thumb_series = get_thumb("channels_tvshow.png") + thumb_series_hd = get_thumb("channels_tvshow_hd.png") + thumb_buscar = get_thumb("search.png") + + itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url=host, extra="peliculas", thumbnail=thumb_pelis)) + + itemlist.append(Item(channel=item.channel, action="submenu", title="Series", url=host, extra="series", thumbnail=thumb_series)) + + itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url=host, thumbnail=thumb_buscar)) return itemlist + + +def submenu(item): + logger.info() + itemlist = [] + + data = re.sub(r"\n|\r|\t|\s{2}|()", "", httptools.downloadpage(item.url).data) + + patron = '
.*?<\/div>' #Menú principal + data1 = scrapertools.get_match(data, patron) + patron = '