.*?href="(.*?)" title="(.*?)".*?under-title">(.*?)<.*?src="(.*?)"'
- matches = re.compile(patron,re.DOTALL).findall(data)
-
+ patron = '
.*?href="(.*?)" title="(.*?)".*?under-title">(.*?)<.*?src="(.*?)"'
+ matches = scrapertools.find_multiple_matches(data, patron)
for scrapedurl, scrapedyear, scrapedtitle, scrapedthumbnail in matches:
-
- url = scrapedurl
- title = scrapedtitle
year = scrapertools.find_single_match(scrapedyear, r'.*?\((\d{4})\)')
- thumbnail = scrapedthumbnail
- new_item =Item (channel = item.channel, action="findvideos", title=title, contentTitle=title, url=url,
- thumbnail=thumbnail, infoLabels = {'year':year})
- if year:
- tmdb.set_infoLabels_item(new_item)
+ itemlist.append(Item(channel=item.channel, action="findvideos", title=scrapedtitle, fulltitle = scrapedtitle, url=scrapedurl,
+ thumbnail=scrapedthumbnail, infoLabels={'year': year}))
- itemlist.append(new_item)
-
- next_page_url = scrapertools.find_single_match(data,'')
- if next_page_url!="":
- next_page_url = urlparse.urljoin(item.url,next_page_url)
+ tmdb.set_infoLabels(itemlist, True)
+ next_page_url = scrapertools.find_single_match(data, '
Date: Mon, 9 Oct 2017 09:28:29 -0500
Subject: [PATCH 16/18] Update bitp.json
---
plugin.video.alfa/servers/bitp.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plugin.video.alfa/servers/bitp.json b/plugin.video.alfa/servers/bitp.json
index aeb7c8be..dd570cf3 100644
--- a/plugin.video.alfa/servers/bitp.json
+++ b/plugin.video.alfa/servers/bitp.json
@@ -10,7 +10,7 @@
"ignore_urls": [],
"patterns": [
{
- "pattern": "https://www.bitporno.com/e/([A-z0-9]+)",
+ "pattern": "https://www.bitporno.com/(?:e|embed)/([A-z0-9]+)",
"url": "https://www.bitporno.com/e/\\1"
},
{
From 028eec79b2eed8eeaac86bc889e40833a6abe2df Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 9 Oct 2017 10:23:27 -0500
Subject: [PATCH 17/18] nuevo conector cloudsany
---
plugin.video.alfa/servers/cloudsany.json | 49 ++++++++++++++++++++++++
plugin.video.alfa/servers/cloudsany.py | 33 ++++++++++++++++
2 files changed, 82 insertions(+)
create mode 100644 plugin.video.alfa/servers/cloudsany.json
create mode 100644 plugin.video.alfa/servers/cloudsany.py
diff --git a/plugin.video.alfa/servers/cloudsany.json b/plugin.video.alfa/servers/cloudsany.json
new file mode 100644
index 00000000..bd1f4f68
--- /dev/null
+++ b/plugin.video.alfa/servers/cloudsany.json
@@ -0,0 +1,49 @@
+{
+ "active": true,
+ "changes": [
+ {
+ "date": "09/10/2017",
+ "description": "Versión inicial"
+ }
+ ],
+ "find_videos": {
+ "ignore_urls": [],
+ "patterns": [
+ {
+ "pattern": "cloudsany.com/i/([A-z0-9]+)",
+ "url": "https://cloudsany.com/i/\\1"
+ }
+ ]
+ },
+ "free": true,
+ "id": "cloudsany",
+ "name": "cloudsany",
+ "settings": [
+ {
+ "default": false,
+ "enabled": true,
+ "id": "black_list",
+ "label": "Incluir en lista negra",
+ "type": "bool",
+ "visible": true
+ },
+ {
+ "default": 0,
+ "enabled": true,
+ "id": "favorites_servers_list",
+ "label": "Incluir en lista de favoritos",
+ "lvalues": [
+ "No",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ "type": "list",
+ "visible": false
+ }
+ ],
+ "thumbnail": "https://s1.postimg.org/6wixo35myn/cloudsany1.png",
+ "version": 1
+}
diff --git a/plugin.video.alfa/servers/cloudsany.py b/plugin.video.alfa/servers/cloudsany.py
new file mode 100644
index 00000000..67112c5f
--- /dev/null
+++ b/plugin.video.alfa/servers/cloudsany.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Alfa addon - KODI Plugin
+# Conector para cloudsany
+# https://github.com/alfa-addon
+# ------------------------------------------------------------
+
+from core import httptools
+from core import scrapertools
+from lib import jsunpack
+from platformcode import logger
+
+
+def test_video_exists(page_url):
+ logger.info("(page_url='%s')" % page_url)
+ data = httptools.downloadpage(page_url).data
+ if "no longer exists" in data:
+ return False, "[Cloudsany] El fichero ha sido borrado"
+
+ return True, ""
+
+
+def get_video_url(page_url, user="", password="", video_password=""):
+ logger.info("(page_url='%s')" % page_url)
+ data = httptools.downloadpage(page_url).data
+ data = scrapertools.find_single_match(data, 'p,a,c,k,e.*?')
+ unpack = jsunpack.unpack(data)
+ logger.info("Intel11 %s" %unpack)
+ video_urls = []
+ videourl = scrapertools.find_single_match(unpack, 'config={file:"([^"]+)')
+ video_urls.append([".MP4 [Cloudsany]", videourl])
+
+ return video_urls
From 7561a362163fe08bbb7f5323e6958f5732f39b0d Mon Sep 17 00:00:00 2001
From: Intel1 <25161862+Intel11@users.noreply.github.com>
Date: Mon, 9 Oct 2017 10:47:14 -0500
Subject: [PATCH 18/18] Update gamovideo.py
---
plugin.video.alfa/servers/gamovideo.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/plugin.video.alfa/servers/gamovideo.py b/plugin.video.alfa/servers/gamovideo.py
index 715836ca..2f746fbe 100755
--- a/plugin.video.alfa/servers/gamovideo.py
+++ b/plugin.video.alfa/servers/gamovideo.py
@@ -12,7 +12,7 @@ headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:40.0) Gecko/20
def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url)
- data = httptools.downloadpage(page_url, headers=headers).data
+ data = httptools.downloadpage(page_url, add_referer = True).data
if "File was deleted" in data or "Not Found" in data or "File was locked by administrator" in data:
return False, "[Gamovideo] El archivo no existe o ha sido borrado"
@@ -24,7 +24,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, headers=headers).data
+ data = httptools.downloadpage(page_url, add_referer = True).data
packer = scrapertools.find_single_match(data,
"")