stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'master' of github.com:alfa-addon/addon

Browse Source
This commit is contained in:
alfa-addon
2017-08-25 19:23:13 -04:00
parent 3082a40de2 96faf81ff4
commit 44153b1016
13 changed files with 414 additions and 1258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mediaserver/platformcode/template/js/protocol.js
View File

@@ -285,6 +285,7 @@ function get_response(data) {
else {
keypress = "";
};
if (!data.items[x].value) data.items[x].value = "";
itemlist[data.items[x].category].push(replace_list(html.config.text, {
"item_color": data.items[x].color,
"item_label": data.items[x].label,

23
plugin.video.alfa/channels/cinetux.py
View File

@@ -314,15 +314,11 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
url = scrapertools.find_single_match(bloque1, patron)
if "goo.gl" in url:
url = httptools.downloadpage(url, follow_redirects=False, only_headers=True).headers.get("location", "")
if "www.cinetux.me" in url:
server = scrapertools.find_single_match(url, "player/(.*?)\.")
else:
server = servertools.get_server_from_url(url)
matches.append([url, server, "", language.strip(), t_tipo])
matches.append([url, "", "", language.strip(), t_tipo])
bloque2 = scrapertools.find_single_match(data, '(?s)box_links.*?dt_social_single')
bloque2 = bloque2.replace("\t", "").replace("\r", "")
patron = '(?s)optn" href="([^"]+)'
patron += '.*?title="([^"]+)'
patron += '.*?title="([^\.]+)'
patron += '.*?src.*?src="[^>]+"?/>([^<]+)'
patron += '.*?src="[^>]+"?/>([^<]+)'
patron += '.*?/span>([^<]+)'
@@ -336,7 +332,7 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
scrapedtipo = match[4]
if t_tipo.upper() not in scrapedtipo.upper():
continue
title = " Mirror en " + scrapedserver.split(".")[0] + " (" + scrapedlanguage + ")"
title = " Mirror en %s (" + scrapedlanguage + ")"
if len(scrapedcalidad.strip()) > 0:
title += " (Calidad " + scrapedcalidad.strip() + ")"
@@ -357,6 +353,7 @@ def bloque_enlaces(data, filtro_idioma, dict_idiomas, type, item):
title = "Mostrar enlaces filtrados en %s" % ", ".join(filtrados)
lista_enlaces.append(item.clone(title=title, action="findvideos", url=item.url, text_color=color3,
filtro=True))
lista_enlaces = servertools.get_servers_itemlist(lista_enlaces, lambda i: i.title % i.server.capitalize())
return lista_enlaces
@@ -368,7 +365,6 @@ def play(item):
data = httptools.downloadpage(item.url, headers={'Referer': item.extra}).data.replace("\\", "")
id = scrapertools.find_single_match(data, 'img src="[^#]+#(.*?)"')
item.url = "https://youtube.googleapis.com/embed/?status=ok&hl=es&allow_embed=1&ps=docs&partnerid=30&hd=1&autoplay=0&cc_load_policy=1&showinfo=0&docid=" + id
itemlist = servertools.find_video_items(data=item.url)
elif "links" in item.url or "www.cinetux.me" in item.url:
data = httptools.downloadpage(item.url).data
scrapedurl = scrapertools.find_single_match(data, '<a href="(http[^"]+)')
@@ -380,7 +376,16 @@ def play(item):
scrapedurl = httptools.downloadpage(scrapedurl, follow_redirects=False, only_headers=True).headers.get(
"location", "")
item.url = scrapedurl
itemlist = servertools.find_video_items(data=item.url)
else:
return [item]
itemlist.append(
Item(channel = item.channel,
action = "play",
title = "%s",
fulltitle = item.fulltitle,
thumbnail = item.thumbnail,
server = "",
url = item.url
))
itemlist = servertools.get_servers_itemlist(itemlist, lambda i: i.title % i.server.capitalize())
return itemlist

13
plugin.video.alfa/channels/newpct1.py
View File

@@ -11,12 +11,17 @@ from platformcode import config, logger
def mainlist(item):
logger.info()
itemlist = []
thumb_pelis=get_thumb("channels_movie.png")
thumb_series=get_thumb("channels_tvshow.png")
itemlist.append(Item(channel=item.channel, action="submenu", title="Películas", url="http://www.newpct1.com/",
extra="peliculas"))
itemlist.append(
Item(channel=item.channel, action="submenu", title="Series", url="http://www.newpct1.com/", extra="series"))
extra="peliculas", thumbnail=thumb_pelis ))
itemlist.append(Item(channel=item.channel, action="submenu", title="Series", url="http://www.newpct1.com/", extra="series",
thumbnail=thumb_series))
# itemlist.append(Item(channel=item.channel, action="search", title="Buscar"))
return itemlist

17
plugin.video.alfa/channels/torrentlocura.json
View File

@@ -6,23 +6,12 @@
"language": "es",
"banner": "torrentlocura.png",
"thumbnail": "http://imgur.com/EWmLS3d.png",
"fanart": "http://imgur.com/V7QZLAL.jpg",
"version": 1,
"changes": [
{
"date": "31/12/2016",
"description": "Release"
},
{
"date": "13/01/2017",
"description": "Añadida info a cápitulos en bloque"
},
{
"date": "04/04/2017",
"description": "Reparación cambios web"
},
{
"date": "28/06/2017",
"description": "Corrección código y algunas mejoras"
"date": "25/08/2017",
"description": "revamp"
}
],
"categories": [

1461
plugin.video.alfa/channels/torrentlocura.py
View File

File diff suppressed because it is too large Load Diff

6
plugin.video.alfa/servers/fourshared.json
View File

@@ -7,9 +7,9 @@
}
],
"find_videos": {
"ignore_urls": {
"value": "http://www.4shared.com/flash/player.swf"
},
"ignore_urls": [
"http://www.4shared.com/flash/player.swf"
],
"patterns": [
{
"pattern": "(http://www.4shared.com/embed/[A-Z0-9a-z]+/[A-Z0-9a-z]+)",

6
plugin.video.alfa/servers/mp4upload.json
View File

@@ -7,9 +7,9 @@
}
],
"find_videos": {
"ignore_urls": {
"value": "http://www.mp4upload.com/embed/embed"
},
"ignore_urls": [
"http://www.mp4upload.com/embed/embed"
],
"patterns": [
{
"pattern": "mp4upload.com/embed-([A-Za-z0-9]+)",

32
plugin.video.alfa/servers/streamcloud.json
View File

@@ -11,23 +11,21 @@
}
],
"find_videos": {
"ignore_urls": {
"value": [
"http://streamcloud.eu/stylesheets",
"http://streamcloud.eu/control",
"http://streamcloud.eu/xupload",
"http://streamcloud.eu/js",
"http://streamcloud.eu/favicon",
"http://streamcloud.eu/reward",
"http://streamcloud.eu/login",
"http://streamcloud.eu/deliver",
"http://streamcloud.eu/faq",
"http://streamcloud.eu/tos",
"http://streamcloud.eu/checkfiles",
"http://streamcloud.eu/contact",
"http://streamcloud.eu/serve"
]
},
"ignore_urls": [
"http://streamcloud.eu/stylesheets",
"http://streamcloud.eu/control",
"http://streamcloud.eu/xupload",
"http://streamcloud.eu/js",
"http://streamcloud.eu/favicon",
"http://streamcloud.eu/reward",
"http://streamcloud.eu/login",
"http://streamcloud.eu/deliver",
"http://streamcloud.eu/faq",
"http://streamcloud.eu/tos",
"http://streamcloud.eu/checkfiles",
"http://streamcloud.eu/contact",
"http://streamcloud.eu/serve"
],
"patterns": [
{
"pattern": "(streamcloud.eu/[a-z0-9]+)",

30
plugin.video.alfa/servers/streaminto.json
View File

@@ -11,22 +11,20 @@
}
],
"find_videos": {
"ignore_urls": {
"value": [
"http://streamin.to/embed-theme.html",
"http://streamin.to/embed-jquery.html",
"http://streamin.to/embed-s.html",
"http://streamin.to/embed-images.html",
"http://streamin.to/embed-faq.html",
"http://streamin.to/embed-embed.html",
"http://streamin.to/embed-ri.html",
"http://streamin.to/embed-d.html",
"http://streamin.to/embed-css.html",
"http://streamin.to/embed-js.html",
"http://streamin.to/embed-player.html",
"http://streamin.to/embed-cgi.html"
]
},
"ignore_urls": [
"http://streamin.to/embed-theme.html",
"http://streamin.to/embed-jquery.html",
"http://streamin.to/embed-s.html",
"http://streamin.to/embed-images.html",
"http://streamin.to/embed-faq.html",
"http://streamin.to/embed-embed.html",
"http://streamin.to/embed-ri.html",
"http://streamin.to/embed-d.html",
"http://streamin.to/embed-css.html",
"http://streamin.to/embed-js.html",
"http://streamin.to/embed-player.html",
"http://streamin.to/embed-cgi.html"
],
"patterns": [
{
"pattern": "streamin.to/(?:embed-)?([a-z0-9A-Z]+)",

4
plugin.video.alfa/servers/uploadedto.json
View File

@@ -7,7 +7,9 @@
}
],
"find_videos": {
"ignore_urls": [],
"ignore_urls": [
"http://uploaded.net/file/ref"
],
"patterns": [
{
"pattern": "(?:ul|uploaded).(?:net|to)/(?:file/|f/)?([a-zA-Z0-9]+)",

7
plugin.video.alfa/servers/vidoza.py
View File

@@ -7,11 +7,10 @@ from platformcode import logger
def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url)
data = httptools.downloadpage(page_url).data
if "Page not found" in data:
return False, "[vidoza] El archivo no existe o ha sido borrado"
elif "Video is processing now" in data:
return False, "[vidoza] El archivo no existe o ha sido borrado"
elif "processing" in data:
return False, "[vidoza] El vídeo se está procesando"
return True, ""
@@ -19,9 +18,7 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
logger.info("(page_url='%s')" % page_url)
data = httptools.downloadpage(page_url).data
video_urls = []
matches = scrapertools.find_multiple_matches(data, 'file\s*:\s*"([^"]+)"\s*,\s*label:"([^"]+)"')
for media_url, calidad in matches:

66
plugin.video.alfa/servers/vidspot.json
View File

@@ -7,40 +7,38 @@
}
],
"find_videos": {
"ignore_urls": {
"value": [
"http://vidspot.net/embed-theme.html",
"http://vidspot.net/embed-jquery.html",
"http://vidspot.net/embed-s.html",
"http://vidspot.net/embed-images.html",
"http://vidspot.net/embed-faq.html",
"http://vidspot.net/embed-embed.html",
"http://vidspot.net/embed-ri.html",
"http://vidspot.net/embed-d.html",
"http://vidspot.net/embed-css.html",
"http://vidspot.net/embed-js.html",
"http://vidspot.net/embed-player.html",
"http://vidspot.net/embed-cgi.html",
"http://vidspot.net/embed-i.html",
"http://vidspot.net/images",
"http://vidspot.net/theme",
"http://vidspot.net/xupload",
"http://vidspot.net/s",
"http://vidspot.net/js",
"http://vidspot.net/jquery",
"http://vidspot.net/login",
"http://vidspot.net/make",
"http://vidspot.net/i",
"http://vidspot.net/faq",
"http://vidspot.net/tos",
"http://vidspot.net/premium",
"http://vidspot.net/checkfiles",
"http://vidspot.net/privacy",
"http://vidspot.net/refund",
"http://vidspot.net/links",
"http://vidspot.net/contact"
]
},
"ignore_urls": [
"http://vidspot.net/embed-theme.html",
"http://vidspot.net/embed-jquery.html",
"http://vidspot.net/embed-s.html",
"http://vidspot.net/embed-images.html",
"http://vidspot.net/embed-faq.html",
"http://vidspot.net/embed-embed.html",
"http://vidspot.net/embed-ri.html",
"http://vidspot.net/embed-d.html",
"http://vidspot.net/embed-css.html",
"http://vidspot.net/embed-js.html",
"http://vidspot.net/embed-player.html",
"http://vidspot.net/embed-cgi.html",
"http://vidspot.net/embed-i.html",
"http://vidspot.net/images",
"http://vidspot.net/theme",
"http://vidspot.net/xupload",
"http://vidspot.net/s",
"http://vidspot.net/js",
"http://vidspot.net/jquery",
"http://vidspot.net/login",
"http://vidspot.net/make",
"http://vidspot.net/i",
"http://vidspot.net/faq",
"http://vidspot.net/tos",
"http://vidspot.net/premium",
"http://vidspot.net/checkfiles",
"http://vidspot.net/privacy",
"http://vidspot.net/refund",
"http://vidspot.net/links",
"http://vidspot.net/contact"
],
"patterns": [
{
"pattern": "vidspot.(?:net/|php\\?id=)(?:embed-)?([a-z0-9]+)",

6
plugin.video.alfa/servers/yourupload.json
View File

@@ -15,9 +15,9 @@
}
],
"find_videos": {
"ignore_urls": {
"value": "http://www.yourupload.com/embed/embed"
},
"ignore_urls": [
"http://www.yourupload.com/embed/embed"
],
"patterns": [
{
"pattern": "yourupload.com/embed/([A-z0-9]+)",