diff --git a/plugin.video.alfa/channels/divxatope.json b/plugin.video.alfa/channels/mispelisyseries.json similarity index 69% rename from plugin.video.alfa/channels/divxatope.json rename to plugin.video.alfa/channels/mispelisyseries.json index 8f70eb4a..9d5ae057 100755 --- a/plugin.video.alfa/channels/divxatope.json +++ b/plugin.video.alfa/channels/mispelisyseries.json @@ -1,11 +1,11 @@ { - "id": "divxatope", - "name": "Divxatope", + "id": "mispelisyseries", + "name": "Mispelisyseries", "active": true, "adult": false, "language": ["cast", "lat"], - "thumbnail": "divxatope.png", - "banner": "divxatope.png", + "thumbnail": "http://mispelisyseries.com/mps/library/content/template_mps/images/logomps.png", + "banner": "", "categories": [ "torrent", "movie", @@ -43,6 +43,14 @@ "default": true, "enabled": true, "visible": true + }, + { + "id": "include_in_newest_4k", + "type": "bool", + "label": "Incluir en Novedades - 4K", + "default": true, + "enabled": true, + "visible": true } ] } \ No newline at end of file diff --git a/plugin.video.alfa/channels/divxatope.py b/plugin.video.alfa/channels/mispelisyseries.py similarity index 76% rename from plugin.video.alfa/channels/divxatope.py rename to plugin.video.alfa/channels/mispelisyseries.py index d1aae940..b3eabc2d 100644 --- a/plugin.video.alfa/channels/divxatope.py +++ b/plugin.video.alfa/channels/mispelisyseries.py @@ -10,17 +10,17 @@ from core import servertools from core.item import Item from platformcode import logger - +host = 'http://mispelisyseries.com/' def mainlist(item): logger.info() itemlist = [] - itemlist.append(Item(channel=item.channel, action="menu", title="Películas", url="http://www.divxatope1.com/", + itemlist.append(Item(channel=item.channel, action="menu", title="Películas", url=host, extra="Peliculas", folder=True)) itemlist.append( - Item(channel=item.channel, action="menu", title="Series", url="http://www.divxatope1.com", extra="Series", + Item(channel=item.channel, action="menu", title="Series", url=host, extra="Series", folder=True)) - itemlist.append(Item(channel=item.channel, action="search", title="Buscar...")) + itemlist.append(Item(channel=item.channel, action="search", title="Buscar", url=host + 'buscar')) return itemlist @@ -44,61 +44,64 @@ def menu(item): plot = "" itemlist.append(Item(channel=item.channel, action="lista", title=title, url=url, thumbnail=thumbnail, plot=plot, folder=True)) + + if title != "Todas las Peliculas": itemlist.append( Item(channel=item.channel, action="alfabetico", title=title + " [A-Z]", url=url, thumbnail=thumbnail, plot=plot, folder=True)) - if item.extra == "Peliculas": - title = "4k UltraHD" - url = "http://divxatope1.com/peliculas-hd/4kultrahd/" - thumbnail = "" - plot = "" - itemlist.append(Item(channel=item.channel, action="lista", title=title, url=url, thumbnail=thumbnail, plot=plot, - folder=True)) + itemlist.append( Item(channel=item.channel, action="alfabetico", title=title + " [A-Z]", url=url, thumbnail=thumbnail, plot=plot, folder=True)) + if 'películas' in item.title.lower(): + new_item = item.clone(title='Peliculas 4K', url=host+'buscar', post='q=4k', action='listado2', + pattern='buscar-list') + itemlist.append(new_item) + return itemlist def search(item, texto): - logger.info() - texto = texto.replace(" ", "+") - item.url = "http://www.divxatope1.com/buscar/descargas" - item.extra = urllib.urlencode({'q': texto}) + logger.info("search:" + texto) + # texto = texto.replace(" ", "+") - try: - itemlist = lista(item) + #try: + item.post = "q=%s" % texto + item.pattern = "buscar-list" + itemlist = listado2(item) - # Esta pagina coloca a veces contenido duplicado, intentamos descartarlo - dict_aux = {} - for i in itemlist: - if not i.url in dict_aux: - dict_aux[i.url] = i - else: - itemlist.remove(i) - - return itemlist - # Se captura la excepci?n, para no interrumpir al buscador global si un canal falla - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] + return itemlist + # Se captura la excepción, para no interrumpir al buscador global si un canal falla + # except: + # import sys + # for line in sys.exc_info(): + # logger.error("%s" % line) + # return [] def newest(categoria): itemlist = [] item = Item() try: if categoria in ['peliculas', 'torrent']: - item.url = "http://www.divxatope1.com/peliculas" + item.url = host+"peliculas" elif categoria == 'series': - item.url = "http://www.divxatope1.com/series" + item.url = host+"series" + + if categoria == '4k': + + item.url = Host + '/buscar' + + item.post = 'q=4k' + + item.pattern = 'buscar-list' + + action = listado2(item) else: return [] @@ -180,7 +183,7 @@ def lista(item): matches = re.compile(patron, re.DOTALL).findall(calidad + '
') idioma = '' - if "divxatope1.com/serie" in url: + if host+"/serie" in url: contentTitle = re.sub('\s+-|\.{3}$', '', contentTitle) capitulo = '' temporada = 0 @@ -220,6 +223,62 @@ def lista(item): return itemlist +def listado2(item): + logger.info() + itemlist = [] + + data = re.sub(r"\n|\r|\t|\s{2,}", "", httptools.downloadpage(item.url, post=item.post).data) + data = unicode(data, "iso-8859-1", errors="replace").encode("utf-8") + + list_chars = [["ñ", "ñ"]] + for el in list_chars: + data = re.sub(r"%s" % el[0], el[1], data) + try: + get, post = scrapertools.find_single_match(data, '