(.*?)')
- patron = '(.*?)<.*?href="(.*?)".*?>(.*?)<'
- matches = scrapertoolsV2.find_multiple_matches(bloque, patron)
-
- for scrapedtitle, scrapedurl, scrapedepisodies in matches:
- if "(SUB ITA)" in scrapedepisodies.upper():
- lang = "SUB ITA"
- scrapedepisodies = scrapedepisodies.replace('(SUB ITA)','')
- else:
- lang = "ITA"
- scrapedepisodies = scrapedepisodies.replace(lang,'')
- #num = scrapertoolsV2.find_single_match(scrapedepisodies, '(-\d+/)')
- #if num:
- # scrapedurl = scrapedurl.replace(num, "-episodi/")
- scrapedtitle = scrapedtitle.replace("–", "").replace('\xe2\x80\x93 ','').strip()
- scrapedepisodies = scrapedepisodies.replace('\xe2\x80\x93 ','').strip()
- itemlist.append(
- Item(
- channel=item.channel,
- action="episodios",
- contentType="tvshow",
- title = "%s" % scrapedtitle, # %s" % (scrapedtitle, scrapedepisodies),
- fulltitle = "%s %s" % (scrapedtitle, scrapedepisodies),
- text_color = color5,
- url = scrapedurl,
- #show = "%s %s" % (scrapedtitle, scrapedepisodies),
- extra=item.extra,
- #lang = lang,
- #data = data,
- folder=True))
-
- # locandine e trama e altro da tmdb se presente l'anno migliora la ricerca
- tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True, idioma_busqueda='it')
-
- return itemlist
-
-# =========== def per trovare i video =============
-
def findvideos(item):
- logger.info("%s findvideos log: %s" % (__channel__, item))
- itemlist = []
-
- # Carica la pagina
- data = item.url
-
- matches = re.findall(r'a href="([^"]+)"[^>]*>[^<]+', data, re.DOTALL)
-
- data = []
- for url in matches:
- url, c = unshortenit.unshorten(url)
- data.append(url)
-
- try:
- itemlist = servertools.find_video_items(data=str(data))
-
- for videoitem in itemlist:
- logger.info("Videoitemlist2: %s" % videoitem)
- videoitem.title = "%s [%s]" % (item.contentTitle, videoitem.title)#"[%s] %s" % (videoitem.server, item.title) #"[%s]" % (videoitem.title)
- videoitem.show = item.show
- videoitem.contentTitle = item.contentTitle
- videoitem.contentType = item.contentType
- videoitem.channel = item.channel
- videoitem.text_color = color5
- #videoitem.language = item.language
- videoitem.year = item.infoLabels['year']
- videoitem.infoLabels['plot'] = item.infoLabels['plot']
- except AttributeError:
- logger.error("data doesn't contain expected URL")
-
- # Controlla se i link sono validi
- if __comprueba_enlaces__:
- itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
-
- # Requerido para FilterTools
- # itemlist = filtertools.get_links(itemlist, item, list_language)
-
- # Requerido para AutoPlay
- autoplay.start(itemlist, item)
-
+ support.log()
+ itemlist =[]
+
+ itemlist = support.server(item, item.url)
+
+ """
+ Questa parte funziona se non vanno bene le modifiche a support
+ """
+## support.log()
+## itemlist =[]
+## data= ''
+## logger.info("Url item.url: [%s] " % item.url)
+##
+## urls = scrapertoolsV2.find_multiple_matches(item.url, r'href="([^"]+)"')
+## itemlist = servertools.find_video_items(data=str(urls))
+##
+## for videoitem in itemlist:
+## videoitem.title = item.title + ' - [COLOR limegreen][[/COLOR]'+ videoitem.title+ ' [COLOR limegreen]][/COLOR]'
+## videoitem.fulltitle = item.fulltitle
+## videoitem.thumbnail = item.thumbnail
+## videoitem.show = item.show
+## videoitem.plot = item.plot
+## videoitem.channel = item.channel
+## videoitem.contentType = item.contentType
+##
+## # Controlla se i link sono validi
+## if __comprueba_enlaces__:
+## itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
+##
+## # richiesto per AutoPlay
+## autoplay.start(itemlist, item)
+
return itemlist
diff --git a/channels/support.py b/channels/support.py
index 1bdec0f9..139cc0b8 100644
--- a/channels/support.py
+++ b/channels/support.py
@@ -136,7 +136,7 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data=""
matches = scrapertoolsV2.find_multiple_matches(block, patron)
log('MATCHES =', matches)
- known_keys = ['url', 'title', 'thumb', 'quality', 'year', 'plot', 'duration', 'genere', 'rating']
+ known_keys = ['url', 'title', 'episode', 'thumb', 'quality', 'year', 'plot', 'duration', 'genere', 'rating'] #by greko aggiunto episode
for match in matches:
if len(listGroups) > len(match): # to fix a bug
match = list(match)
@@ -152,8 +152,10 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data=""
title = scrapertoolsV2.decodeHtmlentities(scraped["title"]).strip()
plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"]))
- if scraped["quality"]:
- longtitle = '[B]' + title + '[/B] [COLOR blue][' + scraped["quality"] + '][/COLOR]'
+ if (scraped["quality"] and scraped["episode"]): # by greko aggiunto episode
+ longtitle = '[B]' + title + '[/B] - [B]' + scraped["episode"] + '[/B][COLOR blue][' + scraped["quality"] + '][/COLOR]' # by greko aggiunto episode
+ elif scraped["episode"]: # by greko aggiunto episode
+ longtitle = '[B]' + title + '[/B] - [B]' + scraped["episode"] + '[/B]' # by greko aggiunto episode
else:
longtitle = '[B]' + title + '[/B]'
@@ -438,7 +440,7 @@ def match(item, patron='', patron_block='', headers='', url=''):
def videolibrary(itemlist, item, typography=''):
- if item.contentType == 'movie':
+ if item.contentType != 'episode':
action = 'add_pelicula_to_library'
extra = 'findvideos'
contentType = 'movie'
@@ -448,28 +450,25 @@ def videolibrary(itemlist, item, typography=''):
contentType = 'tvshow'
title = typo(config.get_localized_string(30161) + ' ' + typography)
- if inspect.stack()[1][3] == 'findvideos' and contentType == 'movie' or inspect.stack()[1][3] != 'findvideos' and contentType != 'movie':
- if config.get_videolibrary_support() and len(itemlist) > 0:
- itemlist.append(
- Item(channel=item.channel,
- title=title,
- contentType=contentType,
- contentSerieName=item.fulltitle if contentType == 'tvshow' else '',
- url=item.url,
- action=action,
- extra=extra,
- contentTitle=item.fulltitle))
- return itemlist
+ if config.get_videolibrary_support() and len(itemlist) > 0:
+ itemlist.append(
+ Item(channel=item.channel,
+ title=title,
+ contentType=contentType,
+ contentSerieName=item.fulltitle if contentType == 'tvshow' else '',
+ url=item.url,
+ action=action,
+ extra=extra,
+ contentTitle=item.fulltitle))
+
def nextPage(itemlist, item, data, patron, function_level=1):
# Function_level is useful if the function is called by another function.
# If the call is direct, leave it blank
next_page = scrapertoolsV2.find_single_match(data, patron)
-
- if next_page != "":
- if 'http' not in next_page:
- next_page = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + next_page
+ if 'http' not in next_page:
+ next_page = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + next_page
log('NEXT= ', next_page)
if next_page != "":
@@ -484,17 +483,24 @@ def nextPage(itemlist, item, data, patron, function_level=1):
return itemlist
-
def server(item, data='', headers='', AutoPlay=True, CheckLinks=True):
-
+
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', item.channel)
log(__comprueba_enlaces__ )
__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', item.channel)
log(__comprueba_enlaces_num__ )
-
+
if not data:
data = httptools.downloadpage(item.url, headers=headers).data
-
+ ## fix by greko
+ # se inviamo un blocco di url dove cercare i video
+ if type(data) == list:
+ data = str(item.url)
+ else:
+ # se inviamo un singolo url dove cercare il video
+ data = item.url
+ ## FINE fix by greko
+
itemlist = servertools.find_video_items(data=data)
for videoitem in itemlist:
@@ -529,4 +535,4 @@ def log(stringa1="", stringa2="", stringa3="", stringa4="", stringa5=""):
frame = inspect.stack()[1]
filename = frame[0].f_code.co_filename
filename = os.path.basename(filename)
- logger.info("[" + filename + "] - [" + inspect.stack()[1][3] + "] " + str(stringa1) + str(stringa2) + str(stringa3) + str(stringa4) + str(stringa5))
\ No newline at end of file
+ logger.info("[" + filename + "] - [" + inspect.stack()[1][3] + "] " + str(stringa1) + str(stringa2) + str(stringa3) + str(stringa4) + str(stringa5))
diff --git a/channelselector.py b/channelselector.py
index 4286eb8c..87323a90 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -96,6 +96,7 @@ def getchanneltypes(view="thumb_"):
# viewmode="thumbnails"))
+
itemlist.append(Item(title=config.get_localized_string(70685), channel="community", action="mainlist", view=view,
category=title, channel_type="all", thumbnail=get_thumb("channels_community.png", view),
viewmode="thumbnails"))
diff --git a/servers/decrypters/zcrypt.py b/servers/decrypters/zcrypt.py
index 4956587b..0b69451e 100644
--- a/servers/decrypters/zcrypt.py
+++ b/servers/decrypters/zcrypt.py
@@ -44,10 +44,18 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
elif 'vcrypt.net' in url:
from lib import unshortenit
data, status = unshortenit.unshorten(url)
-
+ logger.info("Data - Status zcrypt vcrypt.net: [%s] [%s] " %(data, status))
elif 'linkup' in url:
idata = httptools.downloadpage(url).data
data = scrapertoolsV2.find_single_match(idata, "]*src=\\'([^'>]*)\\'[^<>]*>")
+ #fix by greko inizio
+ if not data:
+ data = scrapertoolsV2.find_single_match(idata, 'action="(?:[^/]+.*?/[^/]+/([a-zA-Z0-9_]+))">')
+ if '/olink/' in url or '/delta/' in url or '/mango/' in url or '/now/' in url:
+ from lib import unshortenit
+ data, status = unshortenit.unshorten(url)
+ logger.info("Data - Status zcrypt linkup : [%s] [%s] " %(data, status))
+ # fix by greko fine
else:
data = ""
while host in url:
@@ -63,7 +71,7 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
else:
logger.info(" url duplicada=" + url)
- patron = r"""(https?://(?:www\.)?(?:threadsphere\.bid|adf\.ly|q\.gs|j\.gs|u\.bb|ay\.gy|linkbucks\.com|any\.gs|cash4links\.co|cash4files\.co|dyo\.gs|filesonthe\.net|goneviral\.com|megaline\.co|miniurls\.co|qqc\.co|seriousdeals\.net|theseblogs\.com|theseforums\.com|tinylinks\.co|tubeviral\.com|ultrafiles\.net|urlbeat\.net|whackyvidz\.com|yyv\.co|adfoc\.us|lnx\.lu|sh\.st|href\.li|anonymz\.com|shrink-service\.it|rapidcrypt\.net)/[^"']+)"""
+ patron = r"""(https?://(?:www\.)?(?:threadsphere\.bid|adf\.ly|q\.gs|j\.gs|u\.bb|ay\.gy|linkbucks\.com|any\.gs|cash4links\.co|cash4files\.co|dyo\.gs|filesonthe\.net|goneviral\.com|megaline\.co|miniurls\.co|qqc\.co|seriousdeals\.net|theseblogs\.com|theseforums\.com|tinylinks\.co|tubeviral\.com|ultrafiles\.net|urlbeat\.net|whackyvidz\.com|yyv\.co|adfoc\.us|lnx\.lu|sh\.st|href\.li|anonymz\.com|shrink-service\.it|rapidcrypt\.netz|ecleneue\.com)/[^"']+)"""
logger.info(" find_videos #" + patron + "#")
matches = re.compile(patron).findall(page_url)
diff --git a/servers/deltabit.json b/servers/deltabit.json
new file mode 100644
index 00000000..f1f5a56d
--- /dev/null
+++ b/servers/deltabit.json
@@ -0,0 +1,42 @@
+{
+ "active": true,
+ "find_videos": {
+ "ignore_urls": [],
+ "patterns": [
+ {
+ "pattern": "https://deltabit.co/([A-z0-9]+)",
+ "url": "https://deltabit.co/\\1"
+ }
+ ]
+ },
+ "free": true,
+ "id": "deltabit",
+ "name": "deltabit",
+ "settings": [
+ {
+ "default": false,
+ "enabled": true,
+ "id": "black_list",
+ "label": "@60654",
+ "type": "bool",
+ "visible": true
+ },
+ {
+ "default": 0,
+ "enabled": true,
+ "id": "favorites_servers_list",
+ "label": "@60655",
+ "lvalues": [
+ "No",
+ "1",
+ "2",
+ "3",
+ "4",
+ "5"
+ ],
+ "type": "list",
+ "visible": false
+ }
+ ],
+ "thumbnail": "https://deltabit.co/img/logo.png"
+}
diff --git a/servers/deltabit.py b/servers/deltabit.py
new file mode 100644
index 00000000..d3229782
--- /dev/null
+++ b/servers/deltabit.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+
+import urllib
+from core import httptools
+from core import scrapertools
+from platformcode import logger
+
+import time
+
+def test_video_exists(page_url):
+ logger.info("(page_url='%s')" % page_url)
+ data = httptools.downloadpage(page_url).data
+ if "Not Found" in data or "File Does not Exist" in data:
+ return False, "[deltabit] El fichero no existe o ha sido borrado"
+ return True, ""
+
+
+def get_video_url(page_url, premium=False, user="", password="", video_password=""):
+ logger.info("(deltabit page_url='%s')" % page_url)
+ video_urls = []
+ data = httptools.downloadpage(page_url).data
+ data = data.replace('"', "'")
+ page_url_post = scrapertools.find_single_match(data, "
.*?\s
(.*?(?:\((\d{4})\)|(\d{4}))?)<\/a><\/h2>'
+ listGroups = ['thumb', 'url', 'title', 'year', 'year']
+ patronNext='a class="next page-numbers" href="?([^>"]+)">Avanti »'
+ itemlist = support.scrape(item, patron_block='', patron=patron, listGroups=listGroups,
+ patronNext=patronNext,
+ action='episodios')
return itemlist
def episodios(item):
- #logger.info("%s episodios log: %s" % (__channel__, item))
+ support.log()
itemlist = []
-
- if not(item.lang):
- lang_season = {'ITA':0, 'SUB ITA' :0}
- # Download pagina
+
+ # Carica la pagina
+ data = httptools.downloadpage(item.url).data
+ #========
+ if 'clicca qui per aprire' in data.lower():
+ item.url = scrapertoolsV2.find_single_match(data, '"go_to":"(.*?)"')
+ item.url = item.url.replace("\\","")
+ # Carica la pagina
data = httptools.downloadpage(item.url).data
- #========
- if 'clicca qui per aprire' in data.lower():
- logger.info("%s CLICCA QUI PER APRIRE GLI EPISODI log: %s" % (__channel__, item))
- item.url = scrapertoolsV2.find_single_match(data, '"go_to":"(.*?)"')
- item.url = item.url.replace("\\","")
- # Carica la pagina
- data = httptools.downloadpage(item.url).data
- #logger.info("%s FINE CLICCA QUI PER APRIRE GLI EPISODI log: %s" % (__channel__, item))
- elif 'clicca qui' in data.lower():
- logger.info("%s inizio CLICCA QUI log: %s" % (__channel__, item))
- item.url = scrapertoolsV2.find_single_match(data, '')
- data = httptools.downloadpage(item.url).data
- #logger.info("%s fine CLICCA QUI log: %s" % (__channel__, item))
- #=========
- data = scrapertoolsV2.decodeHtmlentities(data)
- bloque = scrapertoolsV2.find_single_match(data, '