From e5917f5b382d3be4e1056e6c87a2777007178294 Mon Sep 17 00:00:00 2001 From: Intel1 <25161862+Intel11@users.noreply.github.com> Date: Thu, 22 Feb 2018 11:38:40 -0500 Subject: [PATCH] divxtotal: fix series, codigo actualizado --- plugin.video.alfa/channels/divxtotal.py | 594 +----------------------- 1 file changed, 25 insertions(+), 569 deletions(-) diff --git a/plugin.video.alfa/channels/divxtotal.py b/plugin.video.alfa/channels/divxtotal.py index 0163a61b..0525ac09 100644 --- a/plugin.video.alfa/channels/divxtotal.py +++ b/plugin.video.alfa/channels/divxtotal.py @@ -3,83 +3,30 @@ import os import re import urllib -from threading import Thread -import xbmc -import xbmcgui from core import httptools from core import scrapertools from core import tmdb from core.item import Item -from core.scrapertools import decodeHtmlentities as dhe from platformcode import config, logger header = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0'} - -ACTION_SHOW_FULLSCREEN = 36 -ACTION_GESTURE_SWIPE_LEFT = 511 -ACTION_SELECT_ITEM = 7 -ACTION_PREVIOUS_MENU = 10 -ACTION_MOVE_LEFT = 1 -ACTION_MOVE_RIGHT = 2 -ACTION_MOVE_DOWN = 4 -ACTION_MOVE_UP = 3 -OPTION_PANEL = 6 -OPTIONS_OK = 5 +host = "http://www.divxtotal.co" __modo_grafico__ = config.get_setting('modo_grafico', "divxtotal") -# Para la busqueda en bing evitando baneos - -def browser(url): - import mechanize - - # Utilizamos Browser mechanize para saltar problemas con la busqueda en bing - br = mechanize.Browser() - # Browser options - br.set_handle_equiv(False) - br.set_handle_gzip(True) - br.set_handle_redirect(True) - br.set_handle_referer(False) - br.set_handle_robots(False) - # Follows refresh 0 but not hangs on refresh > 0 - br.set_handle_refresh(mechanize._http.HTTPRefreshProcessor(), max_time=1) - # Want debugging messages? - # br.set_debug_http(True) - # br.set_debug_redirects(True) - # br.set_debug_responses(True) - - # User-Agent (this is cheating, ok?) - # br.addheaders = [('User-agent', 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/600.7.12 (KHTML, like Gecko) Version/7.1.7 Safari/537.85.16')] - # br.addheaders =[('Cookie','SRCHD=AF=QBRE; domain=.bing.com; expires=25 de febrero de 2018 13:00:28 GMT+1; MUIDB=3B942052D204686335322894D3086911; domain=www.bing.com;expires=24 de febrero de 2018 13:00:28 GMT+1')] - # Open some site, let's pick a random one, the first that pops in mind - r = br.open(url) - response = r.read() - print response - if "img,divreturn" in response: - r = br.open("http://ssl-proxy.my-addr.org/myaddrproxy.php/" + url) - print "prooooxy" - response = r.read() - - return response - - -api_key = "2e2160006592024ba87ccdf78c28f49f" -api_fankey = "dffe90fba4d02c199ae7a9e71330c987" - - def mainlist(item): logger.info() itemlist = [] itemlist.append(item.clone(title="[COLOR orange][B]Películas[/B][/COLOR]", action="scraper", - url="http://www.divxtotal.com/peliculas/", thumbnail="http://imgur.com/A4zN3OP.png", + url = host + "/peliculas/", thumbnail="http://imgur.com/A4zN3OP.png", fanart="http://imgur.com/fdntKsy.jpg", contentType="movie")) itemlist.append(item.clone(title="[COLOR orange][B] Películas HD[/B][/COLOR]", action="scraper", - url="http://www.divxtotal.com/peliculas-hd/", thumbnail="http://imgur.com/A4zN3OP.png", + url = host + "/peliculas-hd/", thumbnail="http://imgur.com/A4zN3OP.png", fanart="http://imgur.com/fdntKsy.jpg", contentType="movie")) itemlist.append(itemlist[-1].clone(title="[COLOR orange][B]Series[/B][/COLOR]", action="scraper", - url="http://www.divxtotal.com/series/", thumbnail="http://imgur.com/GPX2wLt.png", + url = host + "/series/", thumbnail="http://imgur.com/GPX2wLt.png", contentType="tvshow")) itemlist.append(itemlist[-1].clone(title="[COLOR orangered][B]Buscar[/B][/COLOR]", action="search", @@ -90,7 +37,7 @@ def mainlist(item): def search(item, texto): logger.info() texto = texto.replace(" ", "+") - item.url = "http://www.divxtotal.com/?s=" + texto + item.url = host + "/?s=" + texto item.extra = "search" try: return buscador(item) @@ -106,22 +53,16 @@ def buscador(item): itemlist = [] data = httptools.downloadpage(item.url, headers=header, cookies=False).data data = re.sub(r"\n|\r|\t|\s{2}| ", "", data) - - patron = scrapertools.find_multiple_matches(data, - '.*?-left">(.*?)') - - for url, title, check in patron: - + patron = '.*?-left">(.*?)' + matches = scrapertools.find_multiple_matches(data, patron) + for url, title, check in matches: if "N/A" in check: checkmt = "tvshow" - else: checkmt = "movie" - titulo = title title = re.sub(r"!|¡|HD|\d+\d+\d+\d+|\(.*?\).*\[.*?]\]", "", title) title = re.sub(r"’|PRE-Estreno", "'", title) - if checkmt == "movie": new_item = item.clone(action="findvideos", title=titulo, url=url, fulltitle=title, contentTitle=title, contentType="movie", library=True) @@ -138,9 +79,7 @@ def buscador(item): next = scrapertools.find_single_match(data, "