diff --git a/plugin.video.alfa/channels/pelisplusco.json b/plugin.video.alfa/channels/pelisplusco.json
new file mode 100644
index 00000000..339aeb18
--- /dev/null
+++ b/plugin.video.alfa/channels/pelisplusco.json
@@ -0,0 +1,39 @@
+{
+ "id": "pelisplusco",
+ "name": "PelisPlus.co",
+ "active": true,
+ "adult": false,
+ "thumbnail": "https://s13.postimg.org/z5dbzfasn/pelisplus.png",
+ "banner": "https://s16.postimg.org/p9xz2vlo5/pelisplus_banner.png",
+ "version": 1,
+ "categories": [
+ "latino",
+ "movie",
+ "tvshow",
+ "documentary",
+ "direct"
+
+ ],
+ "settings": [
+ {
+ "id": "include_in_global_search",
+ "type": "bool",
+ "label": "Incluir en busqueda global",
+ "default": true,
+ "enabled": false,
+ "visible": false
+ },
+ {
+ "id": "filter_languages",
+ "type": "list",
+ "label": "Mostrar enlaces en idioma...",
+ "default": 0,
+ "enabled": true,
+ "visible": true,
+ "lvalues": [
+ "No filtrar",
+ "Latino"
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/plugin.video.alfa/channels/pelisplusco.py b/plugin.video.alfa/channels/pelisplusco.py
new file mode 100644
index 00000000..903f0c58
--- /dev/null
+++ b/plugin.video.alfa/channels/pelisplusco.py
@@ -0,0 +1,256 @@
+# -*- coding: utf-8 -*-
+# -*- Channel PelisPlus.co -*-
+# -*- Created for Alfa-addon -*-
+# -*- By the Alfa Develop Group -*-
+
+import re
+import urllib
+from platformcode import logger
+from platformcode import config
+from core import scrapertools
+from core.item import Item
+from core import servertools
+from core import httptools
+from core import tmdb
+
+
+audio = {'Latino':'[COLOR limegreen]LATINO[/COLOR]', 'Subtitulado':'[COLOR red]Subtitulado[/COLOR]'}
+
+host = 'http://pelisplus.co'
+
+def mainlist(item):
+ logger.info()
+
+ itemlist = []
+
+ itemlist.append(item.clone(title="Estrenos",
+ action="lista",
+ thumbnail='https://s12.postimg.org/iygbg8ip9/todas.png',
+ fanart='https://s12.postimg.org/iygbg8ip9/todas.png',
+ url = host+'/estrenos/',
+ type = 'normal'
+ ))
+
+ itemlist.append(item.clone(title="Generos",
+ action="seccion",
+ url=host,
+ thumbnail='https://s3.postimg.org/5s9jg2wtf/generos.png',
+ fanart='https://s3.postimg.org/5s9jg2wtf/generos.png',
+ seccion='generos'
+ ))
+
+ itemlist.append(item.clone(title="Por Año",
+ action="seccion",
+ url=host,
+ thumbnail='https://s8.postimg.org/7eoedwfg5/pora_o.png',
+ fanart='https://s8.postimg.org/7eoedwfg5/pora_o.png',
+ seccion='anios'
+ ))
+
+
+
+ return itemlist
+
+def get_source(url):
+ logger.info()
+ data = httptools.downloadpage(url).data
+ data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data)
+ return data
+
+def lista (item):
+ logger.info ()
+
+ itemlist = []
+
+ if item.type not in ['normal', 'seccion']:
+ post = {'page':item.page, 'type':item.type,'id':item.id}
+ post = urllib.urlencode(post)
+ logger.debug('post: %s'%post)
+ data =httptools.downloadpage(item.url, post=post).data
+ data = re.sub(r'"|\n|\r|\t| |
|\s{2,}', "", data)
+ else:
+ data = get_source(item.url)
+ logger.debug (data)
+ #return
+ patron = '
(.*?)<\/p>(.*?)<\/span>'
+ matches = re.compile(patron,re.DOTALL).findall(data)
+
+ for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear in matches:
+ url = host+scrapedurl
+ thumbnail = scrapedthumbnail
+ plot= ''
+ contentTitle=scrapedtitle
+ title = contentTitle
+ year = scrapedyear
+ fanart =''
+
+ itemlist.append(item.clone(action='findvideos' ,
+ title=title,
+ url=url,
+ thumbnail=thumbnail,
+ plot=plot,
+ fanart=fanart,
+ contentTitle = contentTitle,
+ infoLabels ={'year':year}
+ ))
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb =True)
+ #Paginacion
+
+ next_page_valid = scrapertools.find_single_match(data, '
|\s{2,}', "", data)
+ logger.debug('data findvideos: %s'%data)
+ patron = 'data-iframe=0>(.*?) - (.*?)<.*?data-source=(.*?) data.*?-srt=(.*?) '
+ matches = matches = re.compile(patron, re.DOTALL).findall(data)
+
+ for language, quality, url, sub in matches:
+ logger.debug('url: %s'%url)
+
+ if 'http' not in url :
+
+ new_url = 'https://onevideo.tv/api/player?key=90503e3de26d45e455b55e9dc54f015b3d1d4150&link' \
+ '=%s&srt=%s' % (url, sub)
+ headers = {'Referer':new_url}
+ data = httptools.downloadpage(new_url, headers = headers).data
+ data = re.sub(r'\\', "", data)
+ logger.debug('one video: %s'%data)
+ video_list.extend(servertools.find_video_items(data=data))
+
+ for video_url in video_list:
+ video_url.channel = item.channel
+ video_url.action = 'play'
+ #video_url.title = item.title + '(%s) (%s)' % (language, video_url.server)
+ video_url.title = video_url.url
+ video_url.quality = quality
+ video_url.language = language
+ video_url.subtitle = sub
+ video_url.contentTitle=item.title
+ else:
+ server = servertools.get_server_from_url(url)
+ video_list.append(item.clone(title=item.title,
+ url=url,
+ action='play',
+ quality = quality,
+ language = language,
+ server=server,
+ subtitle = sub
+ ))
+
+
+ if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
+ itemlist.append(
+ Item(channel=item.channel,
+ title='[COLOR yellow]Añadir esta pelicula a la videoteca[/COLOR]',
+ url=item.url,
+ action="add_pelicula_to_library",
+ extra="findvideos",
+ contentTitle=item.contentTitle
+ ))
+ return video_list
+# def findvideos(item):
+# logger.info()
+# itemlist=[]
+# data = get_source(item.url)
+# logger.debug (data)
+# patron = 'data-srt=(.*?) data-iframe=0 data-source=(.*?)>(.*?) - 1080p<\/a>'
+# #sub = scrapertools.find_single_match('')
+# matches = re.compile(patron, re.DOTALL).findall(data)
+#
+# for sub, id, lang in matches:
+# new_url = 'http://iplay.one/api/embed?id=%s&token=8908d9f846&%s' % (id, sub)
+# data= get_source(new_url)
+# logger.debug(data)
+# patron = 'file:(.*?),label:(.*?),'
+# matches = re.compile(patron, re.DOTALL).findall(data)
+# for scrapedurl, quality in matches:
+# url = scrapedurl
+#
+# title = item.contentTitle+' (%s) (%s)'%(quality, audio[lang])
+# itemlist.append(item.clone(action='play',
+# url=scrapedurl,
+# title=title,
+# quality=quality,
+# language=lang,
+# subtitle=sub
+# ))
+#
+#
+# return itemlist
+
diff --git a/plugin.video.alfa/servers/gvideo.json b/plugin.video.alfa/servers/gvideo.json
index a2f59aa5..b7c3d0d4 100644
--- a/plugin.video.alfa/servers/gvideo.json
+++ b/plugin.video.alfa/servers/gvideo.json
@@ -18,7 +18,7 @@
"url": "http://docs.google.com/get_video_info?docid=\\1"
},
{
- "pattern": "(?s)\"https:\/\/(.*?).googleusercontent.com\/([^\"]+)\"",
+ "pattern": "(?s)\"https://(?!docs)(.*?).googleusercontent.com/([^\"]+\")",
"url": "https://\\1.googleusercontent.com/\\2"
}
]
diff --git a/plugin.video.alfa/servers/gvideo.py b/plugin.video.alfa/servers/gvideo.py
index 8f992b0d..e1470665 100644
--- a/plugin.video.alfa/servers/gvideo.py
+++ b/plugin.video.alfa/servers/gvideo.py
@@ -8,8 +8,9 @@ from platformcode import logger
def test_video_exists(page_url):
+
if 'googleusercontent' in page_url:
- return True, ""
+ return True, ""
response = httptools.downloadpage(page_url, cookies=False, headers={"Referer": page_url})
if "no+existe" in response.data:
return False, "[gvideo] El video no existe o ha sido borrado"
@@ -27,17 +28,12 @@ def get_video_url(page_url, user="", password="", video_password=""):
streams =[]
logger.debug('page_url: %s'%page_url)
if 'googleusercontent' in page_url:
- logger.info("Intel77")
data = httptools.downloadpage(page_url, follow_redirects = False, headers={"Referer": page_url})
- logger.info("Intel88")
+ logger.debug('data gvideo lh3 headers: %s'%data.headers)
url=data.headers['location']
- logger.debug('url: %s' % url)
- logger.debug("data.headers: %s" % data.headers)
quality = scrapertools.find_single_match (url, '.itag=(\d+).')
- logger.debug('quality: %s' % quality)
streams.append((quality, url))
- logger.debug('streams: %s' % streams)
headers_string=""
else: