Merge pull request #142 from danielr460/master

Nuevos canales

plugin.video.alfa/channels/anitoonstv.py

@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 
 import re
 
@@ -149,34 +149,14 @@ def findvideos(item):
     for server, quality, url in itemla:
         if "Calidad Alta" in quality:
             quality = quality.replace("Calidad Alta", "HQ")
-            server = server.lower().strip()
-            if "ok" == server:
-                server = 'okru'
-            if "netu" == server:
-                continue
+        if " Calidad media - Carga mas rapido" in quality:
+            quality = quality.replace(" Calidad media - Carga mas rapido", "360p")
+        server = server.lower().strip()
+        if "ok" == server:
+            server = 'okru'
         itemlist.append(item.clone(url=url, action="play", server=server, contentQuality=quality,
                                    thumbnail=scrapedthumbnail, plot=scrapedplot,
                                    title="Enlace encontrado en %s: [%s]" % (server.capitalize(), quality)))
-
+    
     autoplay.start(itemlist, item)
     return itemlist
-
-
-def play(item):
-    logger.info()
-
-    itemlist = []
-
-    # Buscamos video por servidor ...
-    devuelve = servertools.findvideosbyserver(item.url, item.server)
-
-    if not devuelve:
-        # ...sino lo encontramos buscamos en todos los servidores disponibles
-        devuelve = servertools.findvideos(item.url, skip=True)
-
-    if devuelve:
-        # logger.debug(devuelve)
-        itemlist.append(Item(channel=item.channel, title=item.contentTitle, action="play", server=devuelve[0][2],
-                             url=devuelve[0][1], thumbnail=item.thumbnail))
-
-    return itemlist

plugin.video.alfa/channels/autoplay.py

@@ -7,6 +7,7 @@ from core import jsontools
 from core.item import Item
 from platformcode import config, logger
 from platformcode import platformtools
+from platformcode import launcher
 
 __channel__ = "autoplay"
 
@@ -78,7 +79,20 @@ def start(itemlist, item):
     :return: intenta autoreproducir, en caso de fallar devuelve el itemlist que recibio en un principio
     '''
     logger.info()
-
+    for videoitem in itemlist:
+        #Nos dice de donde viene si del addon o videolibrary
+        if item.contentChannel=='videolibrary':
+            videoitem.contentEpisodeNumber=item.contentEpisodeNumber
+            videoitem.contentPlot=item.contentPlot
+            videoitem.contentSeason=item.contentSeason
+            videoitem.contentSerieName=item.contentSerieName
+            videoitem.contentTitle=item.contentTitle
+            videoitem.contentType=item.contentType
+            videoitem.episode_id=item.episode_id
+            videoitem.hasContentDetails=item.hasContentDetails
+            videoitem.infoLabels=item.infoLabels
+            videoitem.thumbnail=item.thumbnail
+            #videoitem.title=item.title
     if not config.is_xbmc():
         #platformtools.dialog_notification('AutoPlay ERROR', 'Sólo disponible para XBMC/Kodi')
         return itemlist
@@ -261,8 +275,12 @@ def start(itemlist, item):
                             else:
                                 videoitem = resolved_item[0]
 
-                    # si no directamente reproduce
-                    platformtools.play_video(videoitem)
+                    # si no directamente reproduce y marca como visto
+                    from platformcode import xbmc_videolibrary
+                    xbmc_videolibrary.mark_auto_as_watched(item)
+                    #platformtools.play_video(videoitem)
+                    videoitem.contentChannel='videolibrary'
+                    launcher.run(videoitem)
 
                     try:
                         if platformtools.is_playing():

plugin.video.alfa/channels/cartoonlatino.py

@@ -9,6 +9,7 @@ from core import servertools
 from core import tmdb
 from core.item import Item
 from platformcode import config, logger
+from channels import autoplay
 
 host = "http://www.cartoon-latino.com/"
 from channels import autoplay
@@ -150,7 +151,6 @@ def episodios(item):
 
     if config.get_videolibrary_support() and len(itemlist) > 0:
         itemlist.append(Item(channel=item.channel, title="Añadir " + show + " a la videoteca", url=item.url,
-
                              action="add_serie_to_library", extra="episodios", show=show))
 
     return itemlist
@@ -185,29 +185,5 @@ def findvideos(item):
                 server1 = server
         itemlist.append(item.clone(url=url, action="play", server=server1,
                                    title="Enlace encontrado en %s " % (server1.capitalize())))
-
     autoplay.start(itemlist, item)
     return itemlist
-
-
-def play(item):
-    logger.info()
-
-    itemlist = []
-
-    # Buscamos video por servidor ...
-
-    devuelve = servertools.findvideosbyserver(item.url, item.server)
-
-    if not devuelve:
-        # ...sino lo encontramos buscamos en todos los servidores disponibles
-
-        devuelve = servertools.findvideos(item.url, skip=True)
-
-    if devuelve:
-        # logger.debug(devuelve)
-        itemlist.append(Item(channel=item.channel, title=item.contentTitle, action="play", server=devuelve[0][2],
-
-                             url=devuelve[0][1], thumbnail=item.thumbnail, folder=False))
-
-    return itemlist

plugin.video.alfa/channels/danimados.json

@@ -0,0 +1,19 @@
+{
+  "id": "danimados",
+  "name": "Danimados",
+  "active": true,
+  "adult": false,
+  "language": ["lat"],
+  "thumbnail": "https://imgur.com/kU5Lx1S.png",
+  "banner": "https://imgur.com/xG5xqBq.png",
+  "version": 1,
+  "changes": [
+    {
+      "date": "24/10/2017",
+      "description": "Primera version del canal"
+    }
+  ],
+  "categories": [
+    "tvshow"
+  ]
+}

plugin.video.alfa/channels/danimados.py

@@ -0,0 +1,186 @@
+# -*- coding: utf-8 -*-
+
+import re
+
+from channelselector import get_thumb
+from core import httptools
+from core import scrapertools
+from core import servertools
+from core import tmdb
+from core.item import Item
+from platformcode import config, logger
+from channels import autoplay
+
+host = "http://www.danimados.com/"
+
+list_servers = ['openload',
+                'okru',
+                'rapidvideo'
+                ]
+list_quality = ['default']
+
+
+def mainlist(item):
+    logger.info()
+
+    thumb_series = get_thumb("channels_tvshow.png")
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist = list()
+
+    itemlist.append(Item(channel=item.channel, action="mainpage", title="Categorías", url=host,
+                         thumbnail=thumb_series))
+    itemlist.append(Item(channel=item.channel, action="mainpage", title="Más Populares", url=host,
+                         thumbnail=thumb_series))
+    #itemlist.append(Item(channel=item.channel, action="movies", title="Peliculas Animadas", url=host,
+    #                     thumbnail=thumb_series))
+    autoplay.show_option(item.channel, itemlist)
+    return itemlist
+
+
+"""
+def search(item, texto):
+    logger.info()
+    texto = texto.replace(" ","+")
+    item.url = item.url+texto
+    if texto!='':
+       return lista(item)
+"""
+
+
+def mainpage(item):
+    logger.info()
+
+    itemlist = []
+
+    data1 = httptools.downloadpage(item.url).data
+    data1 = re.sub(r"\n|\r|\t|\s{2}| ", "", data1)
+    if item.title=="Más Populares":
+        patron_sec='<a class="lglossary" data-type.+?>(.+?)<\/ul>'
+        patron='<img .+? src="([^"]+)".+?<a href="([^"]+)".+?>([^"]+)<\/a>' #scrapedthumbnail, #scrapedurl, #scrapedtitle
+    if item.title=="Categorías":
+        patron_sec='<ul id="main_header".+?>(.+?)<\/ul><\/div>'
+        patron='<a href="([^"]+)">([^"]+)<\/a>'#scrapedurl, #scrapedtitle
+        
+    data = scrapertools.find_single_match(data1, patron_sec)
+    
+    matches = scrapertools.find_multiple_matches(data, patron)
+    if item.title=="Géneros" or item.title=="Categorías":
+        for scrapedurl, scrapedtitle in matches:
+            if "Películas Animadas"!=scrapedtitle:
+                itemlist.append(
+                    Item(channel=item.channel, title=scrapedtitle, url=scrapedurl, action="lista"))
+        return itemlist
+    else:
+        for scraped1, scraped2, scrapedtitle in matches:
+            scrapedthumbnail=scraped1
+            scrapedurl=scraped2
+            itemlist.append(
+                    Item(channel=item.channel, title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, action="episodios",
+                         show=scrapedtitle))
+            tmdb.set_infoLabels(itemlist)
+        return itemlist
+    return itemlist
+
+
+def lista(item):
+    logger.info()
+
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    data_lista = scrapertools.find_single_match(data, '<div class="items">(.+?)<\/div><\/div><div class=.+?>')
+    patron = '<img src="([^"]+)" alt="([^"]+)">.+?<a href="([^"]+)">.+?<div class="texto">(.+?)<\/div>'
+    #scrapedthumbnail,#scrapedtitle, #scrapedurl, #scrapedplot
+    matches = scrapertools.find_multiple_matches(data_lista, patron)
+    for scrapedthumbnail,scrapedtitle, scrapedurl, scrapedplot in matches:
+        itemlist.append(
+            item.clone(title=scrapedtitle, url=scrapedurl, thumbnail=scrapedthumbnail, 
+                       context=autoplay.context,plot=scrapedplot, action="episodios", show=scrapedtitle))
+    tmdb.set_infoLabels(itemlist)
+    return itemlist
+
+
+def episodios(item):
+    logger.info()
+
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+   
+    data_lista = scrapertools.find_single_match(data,
+                      '<ul class="episodios">(.+?)<\/ul><\/div><\/div><\/div>')
+    show = item.title
+    patron_caps = '<img src="([^"]+)"><\/a><\/div><div class=".+?">([^"]+)<\/div>.+?<a .+? href="([^"]+)">([^"]+)<\/a>'
+    #scrapedthumbnail,#scrapedtempepi, #scrapedurl, #scrapedtitle
+    matches = scrapertools.find_multiple_matches(data_lista, patron_caps)
+    for scrapedthumbnail, scrapedtempepi, scrapedurl, scrapedtitle in matches:
+        tempepi=scrapedtempepi.split(" - ")
+        if tempepi[0]=='Pel':
+            tempepi[0]=0
+        title="{0}x{1} - ({2})".format(tempepi[0], tempepi[1].zfill(2), scrapedtitle)
+        itemlist.append(Item(channel=item.channel, thumbnail=scrapedthumbnail,
+                        action="findvideos", title=title, url=scrapedurl, show=show))
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=item.channel, title="[COLOR blue]Añadir " + show + " a la videoteca[/COLOR]", url=item.url,
+                             action="add_serie_to_library", extra="episodios", show=show))
+
+
+    return itemlist
+
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    data = scrapertools.find_single_match(data, 
+                      '<div id="playex" .+?>(.+?)<\/nav><\/div><\/div>')
+    patron='src="(.+?)"'
+    itemla = scrapertools.find_multiple_matches(data,patron)
+    for i in range(len(itemla)):
+        #for url in itemla:
+        url=itemla[i]
+        #verificar existencia del video (testing)
+        codigo=verificar_video(itemla[i])
+        if codigo==200:
+            if "ok.ru" in url:
+                server='okru'
+            else:
+                server=''
+            if "openload" in url:
+                server='openload'
+            if "google" in url:
+                server='gvideo'
+            if "rapidvideo" in url:
+                server='rapidvideo'
+            if "streamango" in url:
+                server='streamango'
+            if server!='':
+                title="Enlace encontrado en %s " % (server.capitalize())
+            else:
+                title="NO DISPONIBLE"
+            if title!="NO DISPONIBLE":
+                itemlist.append(item.clone(title=title,url=url, action="play", server=server))
+            
+    autoplay.start(itemlist, item)
+    return itemlist
+
+
+def verificar_video(url):
+    codigo=httptools.downloadpage(url).code
+    if codigo==200:
+        # Revise de otra forma
+        data=httptools.downloadpage(url).data
+        removed = scrapertools.find_single_match(data,'removed(.+)')
+        if len(removed) != 0:
+            codigo1=404
+        else:
+            codigo1=200
+    else:
+		codigo1=200
+    return codigo1

plugin.video.alfa/channels/mundiseries.json

@@ -0,0 +1,19 @@
+{
+  "id": "mundiseries",
+  "name": "Mundiseries",
+  "active": true,
+  "adult": false,
+  "language": ["cast", "lat"],
+  "thumbnail": "https://imgur.com/GdGMFi1.png",
+  "banner": "https://imgur.com/1bDbYY1.png",
+  "version": 1,
+  "changes": [
+    {
+      "date": "23/10/2017",
+      "description": "Primera versión del canal"
+    }
+  ],
+  "categories": [
+    "tvshow"
+  ]
+}

plugin.video.alfa/channels/mundiseries.py

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+
+import re
+import urlparse
+
+from channels import filtertools
+from platformcode import config, logger
+from platformcode import platformtools
+from core import scrapertools
+from core import servertools
+from core.item import Item
+from core import httptools
+from channels import autoplay
+
+host = "http://mundiseries.com"
+list_servers = ['okru']
+list_quality = ['default']
+                
+def mainlist(item):
+    logger.info()
+    itemlist = list()
+    autoplay.init(item.channel, list_servers, list_quality)
+
+    itemlist.append(Item(channel=item.channel, action="lista", title="Series", url=urlparse.urljoin(host, "/lista-de-series")))
+    autoplay.show_option(item.channel, itemlist)
+
+    return itemlist
+
+def lista(item):
+    logger.info()
+
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}| ", "", data)
+    patron = '<a href="([^"]+)"><img src="([^"]+)" alt="ver ([^"]+) online'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for link, thumbnail, name in matches:
+        itemlist.append(item.clone(title=name, url=host+link, thumbnail=host+thumbnail, action="temporada"))
+    return itemlist
+
+def temporada(item):
+    logger.info()
+
+    itemlist = []
+
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    logger.info("preon,:"+data)
+    patron = '<a href="([^"]+)"><div class="item-temporada"><img alt=".+?" src="([^"]+)"><div .+?>Ver ([^"]+)<\/div><\/a>'
+    matches = scrapertools.find_multiple_matches(data, patron)
+    for link,thumbnail,name in matches:
+        itemlist.append(item.clone(title=name, url=host+link, thumbnail=host+thumbnail,action="episodios",context=autoplay.context))
+    return itemlist
+
+def episodios(item):
+    logger.info()
+
+    itemlist = []
+    data = httptools.downloadpage(item.url).data
+    data = re.sub(r"\n|\r|\t|\s{2}|&nbsp;", "", data)
+    patron_caps = 'href="http:.+?\/mundiseries.+?com([^"]+)" alt="([^"]+) Capitulo ([^"]+) Temporada ([^"]+)"'
+    matches = scrapertools.find_multiple_matches(data, patron_caps)
+    patron_show='<h1 class="h-responsive center">.+?'
+    patron_show+='<font color=".+?>([^"]+)<\/a><\/font>'
+    show = scrapertools.find_single_match(data,patron_show)
+    for link, name,cap,temp in matches:
+        if '|' in cap:
+            cap = cap.replace('|','')
+        if '|' in temp:
+            temp = temp.replace('|','')
+        if '|' in name:
+            name = name.replace('|','')
+        title = "%sx%s %s"%(temp, str(cap).zfill(2),name)
+        url=host+link
+        itemlist.append(Item(channel=item.channel, action="findvideos", 
+                             title=title, url=url, show=show))
+
+    if config.get_videolibrary_support() and len(itemlist) > 0:
+        itemlist.append(Item(channel=item.channel, title="Añadir Temporada/Serie a la biblioteca de Kodi", url=item.url,
+                             action="add_serie_to_library", extra="episodios", show=show))
+    return itemlist
+
+def findvideos(item):
+    logger.info()
+
+    itemlist = []
+    id = ""
+    type = ""
+    data = httptools.downloadpage(item.url).data
+    it2 = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
+    itemlist.extend(servertools.find_video_items(data=data))
+    
+    for item in it2:
+        if "###" not in item.url:
+            item.url += "###" + id + ";" + type
+    for videoitem in itemlist:
+        videoitem.channel= item.channel
+    autoplay.start(itemlist, item)
+    return itemlist

plugin.video.alfa/channels/seriesblanco.py

@@ -311,7 +311,6 @@ def findvideos(item):
         d=c[0].rstrip( )
         d=d.lstrip( )
         list_links[i].server=d
-
     autoplay.start(list_links, item)
 
     return list_links
@@ -319,7 +318,6 @@ def findvideos(item):
 
 def play(item):
     logger.info("%s - %s = %s" % (item.show, item.title, item.url))
-
     if item.url.startswith(HOST):
         data = httptools.downloadpage(item.url).data
 

plugin.video.alfa/channels/videolibrary.py

@@ -381,6 +381,7 @@ def findvideos(item):
                     item_json.show = item.library_filter_show.get(nom_canal, "")
 
             # Ejecutamos find_videos, del canal o común
+            item_json.contentChannel='videolibrary'
             if hasattr(channel, 'findvideos'):
                 from core import servertools
                 list_servers = getattr(channel, 'findvideos')(item_json)