'
url = scrapertools.find_single_match(data, patron)
data = httptools.downloadpage(url).data
- patron = r""""""
- matches = re.compile(patron, re.DOTALL).findall(data)
- for video in matches:
- itemlist.append(
- Item(
- channel=item.channel,
- action="play",
- fulltitle=item.fulltitle,
- title="".join([item.title, ' ', support.typo(video.title, 'color kod []')]),
- url=video,
- contentType=item.contentType,
- folder=False))
+ # patron = r""""""
+ # matches = re.compile(patron, re.DOTALL).findall(data)
+ # for video in matches:
+ # itemlist.append(
+ # Item(
+ # channel=item.channel,
+ # action="play",
+ # fulltitle=item.fulltitle,
+ # title="".join([item.title, ' ', support.typo(video.title, 'color kod []')]),
+ # url=video,
+ # contentType=item.contentType,
+ # folder=False))
itemlist = support.server(item, data=data)
# itemlist = filtertools.get_links(itemlist, item, list_language)
@@ -295,7 +320,7 @@ def ultimiep(item):
channel=item.channel,
action="ultimiep",
title=support.typo(config.get_localized_string(30992), 'color kod bold'),
- url=host + "/fetch_pages?request=episodes",
+ url=host + "/fetch_pages?request=episodios",
thumbnail= support.thumb(),
extra=next_page,
folder=True))
@@ -317,7 +342,7 @@ def newest(categoria):
item.extra = ''
try:
if categoria == "anime":
- item.url = "%s/fetch_pages?request=episodes" % host
+ item.url = "%s/fetch_pages?request=episodios" % host
item.action = "ultimiep"
itemlist = ultimiep(item)
diff --git a/channels/fastsubita.json b/channels/fastsubita.json
index 7f0be85e..a18c5eeb 100644
--- a/channels/fastsubita.json
+++ b/channels/fastsubita.json
@@ -4,10 +4,18 @@
"language": ["ita"],
"active": true,
"adult": false,
- "thumbnail": "http://fastsubita.ml/wp-content/uploads/2017/10/Untitled-222255xxx.jpg",
- "banner": "http://fastsubita.ml/wp-content/uploads/2017/10/Untitled-222255xxx.jpg",
+ "thumbnail": "http://fastsubita.com/wp-content/uploads/2017/10/Untitled-222255xxx.jpg",
+ "banner": "http://fastsubita.com/wp-content/uploads/2017/10/Untitled-222255xxx.jpg",
"categories": ["tvshow", "vosi"],
"settings": [
+ {
+ "id": "channel_host",
+ "type": "text",
+ "label": "Host del canale",
+ "default": "http://fastsubita.com",
+ "enabled": true,
+ "visible": true
+ },
{
"id": "include_in_global_search",
"type": "bool",
diff --git a/channels/fastsubita.py b/channels/fastsubita.py
index b3d10bef..be508828 100644
--- a/channels/fastsubita.py
+++ b/channels/fastsubita.py
@@ -1,25 +1,26 @@
# -*- coding: utf-8 -*-
# ------------------------------------------------------------
-# Ringraziamo Icarus crew
+# Thanks Icarus crew & Alfa addon
# Canale per fastsubita
# ------------------------------------------------------------
import re, urlparse
-from channels import autoplay, filtertools
+import channelselector
+from channels import autoplay, filtertools, support
from core import scrapertools, servertools, httptools, tmdb
from core.item import Item
from platformcode import config, logger
-host = "http://fastsubita.com"
-
+__channel__ = 'fastsubita'
+host = config.get_setting("channel_host", __channel__)
IDIOMAS = {'Italiano': 'IT'}
list_language = IDIOMAS.values()
list_servers = ['verystream', 'openload', 'speedvideo', 'wstream', 'flashx', 'vidoza', 'vidtome']
list_quality = ['default']
-__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'fastsubita')
-__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'fastsubita')
+# __comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'fastsubita')
+# __comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'fastsubita')
headers = [
['Host', 'fastsubita.com'],
@@ -34,45 +35,52 @@ headers = [
['Cache-Control', 'max-age=0']
]
-PERPAGE = 14
+PERPAGE = 15
def mainlist(item):
- logger.info("[fastsubita.py] mainlist")
+ logger.info(item.channel+" mainlist")
+ itemlist = []
+ support.menu(itemlist, 'Serie TV bold', 'lista_serie', host,'tvshow')
+ support.menu(itemlist, 'Novità submenu', 'pelicuals_tv', host,'tvshow')
+ support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host,'tvshow',args=['serie'])
+
+ support.menu(itemlist, 'Cerca', 'search', host,'tvshow')
autoplay.init(item.channel, list_servers, list_quality)
- itemlist = [Item(channel=item.channel,
- title="[COLOR azure]Aggiornamenti[/COLOR]",
- action="serietv",
- extra='serie',
- url=host,
- thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
- Item(channel=item.channel,
- title="[COLOR azure]Tutte le Serie TV[/COLOR]",
- action="all_quick",
- extra='serie',
- url="%s/elenco-serie-tv/" % host,
- thumbnail="http://orig03.deviantart.net/6889/f/2014/079/7/b/movies_and_popcorn_folder_icon_by_matheusgrilo-d7ay4tw.png"),
- Item(channel=item.channel,
- title="[COLOR yellow]Cerca...[/COLOR]",
- action="search",
- extra='serie',
- thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")]
-
autoplay.show_option(item.channel, itemlist)
+ itemlist.append(
+ Item(channel='setting',
+ action="channel_config",
+ title=support.typo("Configurazione Canale color lime"),
+ config=item.channel,
+ folder=False,
+ thumbnail=channelselector.get_thumb('setting_0.png'))
+ )
+
return itemlist
+# ----------------------------------------------------------------------------------------------------------------
+def cleantitle(scrapedtitle):
+ scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle.strip())
+ scrapedtitle = scrapedtitle.replace('’', '\'').replace('×','x').replace('×','x')
+
+ return scrapedtitle.strip()
+
+
+# ================================================================================================================
+
def newest(categoria):
- logger.info("[fastsubita.py]==> newest" + categoria)
+ logger.info(__channel__+" newest" + categoria)
itemlist = []
item = Item()
try:
if categoria == "series":
item.url = host
- item.action = "serietv"
- itemlist = serietv(item)
+ # item.action = "serietv"
+ itemlist = pelicuals_tv(item)
if itemlist[-1].action == "serietv":
itemlist.pop()
@@ -87,13 +95,12 @@ def newest(categoria):
return itemlist
-def serietv(item):
- logger.info("[fastsubita.py] peliculas")
+def pelicuals_tv(item):
+ logger.info(item.channel+" pelicuals_tv")
itemlist = []
# Carica la pagina
data = httptools.downloadpage(item.url, headers=headers).data
- logger.info("[fastsubita.py] peliculas")
# Estrae i contenuti
patron = r'(.*?)<'
@@ -103,9 +110,11 @@ def serietv(item):
scrapedplot = ""
scrapedthumbnail = ""
scraped_1 = scrapedtitle.split("×")[0][:-2]
- scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+ scrapedtitle = cleantitle(scrapedtitle)
+ episode = scrapertools.find_multiple_matches(scrapedtitle, r'((\d*)x(\d*))')[0]
scrapedtitle = scrapedtitle.replace(scraped_1, "")
+
if "http:" in scrapedurl:
scrapedurl = scrapedurl
else:
@@ -115,37 +124,64 @@ def serietv(item):
Item(channel=item.channel,
action="findvideos",
contentTpye="tvshow",
- title="[COLOR azure]" + scraped_1 + "[/COLOR]" + " " + scrapedtitle,
- fulltitle=scraped_1,
+ title=scraped_1 + " " + scrapedtitle,
+ fulltitle=scraped_1 + " " + scrapedtitle,
url=scrapedurl,
thumbnail=scrapedthumbnail,
plot=scrapedplot,
show=scraped_1,
extra=item.extra,
+ contentSerieName=scraped_1+" ("+episode[0]+" Sub-Ita)",
folder=True))
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- # Paginazione
- patronvideos = r'Successivi'
- matches = re.compile(patronvideos, re.DOTALL).findall(data)
-
- if len(matches) > 0:
- scrapedurl = urlparse.urljoin(item.url, matches[0])
- itemlist.append(
- Item(channel=item.channel,
- action="serietv",
- title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
- url=scrapedurl,
- thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
- extra=item.extra,
- folder=True))
+ # Paginazione
+ support.nextPage(itemlist,item,data,'Successivi')
return itemlist
+def serietv():
+ logger.info(__channel__+" serietv")
-def all_quick(item):
- logger.info("[fastsubita.py] peliculas")
+ itemlist = []
+ data = httptools.downloadpage("%s/" % host, headers=headers).data
+ # block = scrapertools.find_single_match(data, r'
(.*?)<'
@@ -103,9 +110,11 @@ def serietv(item):
scrapedplot = ""
scrapedthumbnail = ""
scraped_1 = scrapedtitle.split("×")[0][:-2]
- scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
+ scrapedtitle = cleantitle(scrapedtitle)
+ episode = scrapertools.find_multiple_matches(scrapedtitle, r'((\d*)x(\d*))')[0]
scrapedtitle = scrapedtitle.replace(scraped_1, "")
+
if "http:" in scrapedurl:
scrapedurl = scrapedurl
else:
@@ -115,37 +124,64 @@ def serietv(item):
Item(channel=item.channel,
action="findvideos",
contentTpye="tvshow",
- title="[COLOR azure]" + scraped_1 + "[/COLOR]" + " " + scrapedtitle,
- fulltitle=scraped_1,
+ title=scraped_1 + " " + scrapedtitle,
+ fulltitle=scraped_1 + " " + scrapedtitle,
url=scrapedurl,
thumbnail=scrapedthumbnail,
plot=scrapedplot,
show=scraped_1,
extra=item.extra,
+ contentSerieName=scraped_1+" ("+episode[0]+" Sub-Ita)",
folder=True))
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- # Paginazione
- patronvideos = r'Successivi'
- matches = re.compile(patronvideos, re.DOTALL).findall(data)
-
- if len(matches) > 0:
- scrapedurl = urlparse.urljoin(item.url, matches[0])
- itemlist.append(
- Item(channel=item.channel,
- action="serietv",
- title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
- url=scrapedurl,
- thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
- extra=item.extra,
- folder=True))
+ # Paginazione
+ support.nextPage(itemlist,item,data,'Successivi')
return itemlist
+def serietv():
+ logger.info(__channel__+" serietv")
-def all_quick(item):
- logger.info("[fastsubita.py] peliculas")
+ itemlist = []
+ data = httptools.downloadpage("%s/" % host, headers=headers).data
+ # block = scrapertools.find_single_match(data, r'(.*?)')
+ block = scrapertools.find_single_match(data, r"(.*?)")
+ # block = data
+ # Estrae i contenuti
+ # patron = r'([^<]+)<\/a>'
+ # patron = r'([^<]+)<\/a>'
+ # matches = re.compile(patron, re.DOTALL).findall(block)
+ matches = re.compile(r'', re.DOTALL).findall(block)
+ index = 0
+ # for scrapedurl, scrapedtitle in matches:
+ # scrapedtitle = cleantitle(scrapedtitle)
+ # if "http:" not in scrapedurl:
+ # scrapedurl = "http:" + scrapedurl
+ #
+ # if ('S' in scrapedtitle.strip().upper()[0] and len(scrapedtitle.strip()) == 3) or '02' == scrapedtitle:
+ # # itemlist[index -1][0]+='{|}'+scrapedurl
+ # continue
+ #
+ # itemlist.append([scrapedurl,scrapedtitle])
+ # index += 1
+ for level, cat, title in matches:
+ title = cleantitle(title)
+ url = '%s?cat=%s' % (host, cat)
+ if int(level) > 0:
+ itemlist[index - 1][0] += '{|}' + url
+ continue
+
+ itemlist.append([url, title])
+
+ index += 1
+
+ logger.debug(itemlist)
+ return itemlist
+
+def lista_serie(item):
+ logger.info(item.channel+" lista_serie")
itemlist = []
p = 1
@@ -153,57 +189,65 @@ def all_quick(item):
item.url, p = item.url.split('{}')
p = int(p)
+ # logger.debug(p)
# Carica la pagina
- data = httptools.downloadpage(item.url, headers=headers).data
+ # data = httptools.downloadpage(item.url, headers=headers).data
+ #
+ # block = scrapertools.find_single_match(data,r'(.*?)')
+ #
+ # # Estrae i contenuti
+ # # patron = r'([^<]+)<\/a>'
+ # patron = r'([^<]+)<\/a>'
+ # matches = re.compile(patron, re.DOTALL).findall(block)
+ if '||' in item.url:
+ series = item.url.split('\n\n')
+ matches = []
+ for i, serie in enumerate(series):
+ matches.append(serie.split('||'))
+ series = matches
+ else:
+ series = serietv()
- # Estrae i contenuti
- patron = r'([^<]+)<\/a>'
- matches = re.compile(patron, re.DOTALL).findall(data)
-
- for i, (scrapedurl, scrapedtitle) in enumerate(matches):
+ for i, (scrapedurl, scrapedtitle) in enumerate(series):
if (p - 1) * PERPAGE > i: continue
if i >= p * PERPAGE: break
+
scrapedplot = ""
scrapedthumbnail = ""
- scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
- if 'S' in scrapedtitle.lower(): continue
-
- if "http:" in scrapedurl:
- scrapedurl = scrapedurl
- else:
- scrapedurl = "http:" + scrapedurl
itemlist.append(
Item(channel=item.channel,
- action="serietv",
- contentType="tvshow",
+ action="episodios",
title=scrapedtitle,
fulltitle=scrapedtitle,
- text_color="azure",
url=scrapedurl,
thumbnail=scrapedthumbnail,
plot=scrapedplot,
show=scrapedtitle,
extra=item.extra,
+ contentType='episode',
+ originalUrl=scrapedurl,
folder=True))
+ # ii += 1
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- if len(matches) >= p * PERPAGE:
+ if len(series) >= p * PERPAGE:
scrapedurl = item.url + '{}' + str(p + 1)
itemlist.append(
Item(channel=item.channel,
- extra=item.extra,
- action="all_quick",
- title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]",
+ action='lista_serie',
+ contentType=item.contentType,
+ title=support.typo(config.get_localized_string(30992), 'color kod bold'),
url=scrapedurl,
- thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png",
- folder=True))
+ args=item.args,
+ extra=item.extra,
+ thumbnail=support.thumb()))
return itemlist
def findvideos(item):
- logger.info("[fastsubita.py] findvideos")
+ logger.info(item.channel+" findvideos")
itemlist = []
data = httptools.downloadpage(item.url, headers=headers).data
@@ -217,30 +261,33 @@ def findvideos(item):
scrapedurl, follow_redirects=False)
data += resp.headers.get("location", "") + '\n'
- itemlist = servertools.find_video_items(data=data)
- for videoitem in itemlist:
- videoitem.title = item.title + videoitem.title
- videoitem.fulltitle = item.fulltitle
- videoitem.thumbnail = item.thumbnail
- videoitem.show = item.show
- videoitem.plot = item.plot
- videoitem.channel = item.channel
- videoitem.contentType = item.contentType
- videoitem.language = IDIOMAS['Italiano']
+ itemlist = support.server(item,data)
- # Requerido para Filtrar enlaces
-
- 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)
+ # itemlist = servertools.find_video_items(data=data)
+ #
+ # for videoitem in itemlist:
+ # videoitem.title = item.title + videoitem.title
+ # videoitem.fulltitle = item.fulltitle
+ # videoitem.thumbnail = item.thumbnail
+ # videoitem.show = item.show
+ # videoitem.plot = item.plot
+ # videoitem.channel = item.channel
+ # videoitem.contentType = item.contentType
+ # videoitem.language = IDIOMAS['Italiano']
+ #
+ # # Requerido para Filtrar enlaces
+ #
+ # 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)
@@ -248,10 +295,30 @@ def findvideos(item):
def search(item, texto):
- logger.info("[fastsubita.py] " + item.url + " search " + texto)
- item.url = "%s/?s=%s" % (host, texto)
+ logger.info(item.channel + " " + item.url + " search " + texto)
+ # item.url = "%s/?s=%s" % (host, texto)
+ # item.url = "%s/elenco-serie-tv/" % host
+ itemlist = []
try:
- return serietv(item)
+ series = serietv()
+ for i, (scrapedurl, scrapedtitle) in enumerate(series):
+ if texto.upper() in scrapedtitle.upper():
+ scrapedthumbnail = ""
+ scrapedplot = ""
+ itemlist.append(
+ Item(channel=item.channel,
+ extra=item.extra,
+ action="episodios",
+ title=scrapedtitle,
+ url=scrapedurl,
+ thumbnail=scrapedthumbnail,
+ fulltitle=scrapedtitle,
+ show=scrapedtitle,
+ plot=scrapedplot,
+ contentType='episode',
+ originalUrl=scrapedurl,
+ folder=True))
+ return itemlist
# Continua la ricerca in caso di errore
except:
import sys
@@ -259,4 +326,103 @@ def search(item, texto):
logger.error("%s" % line)
return []
-
+# ----------------------------------------------------------------------------------------------------------------
+
+def list_az(item):
+ support.log(item.channel + " list_az")
+ itemlist = []
+
+ alphabet = dict()
+
+
+ for i, (scrapedurl, scrapedtitle) in enumerate(serietv()):
+ letter = scrapedtitle[0].upper()
+ if letter not in alphabet:
+ alphabet[letter] = []
+ alphabet[letter].append(scrapedurl + '||' + scrapedtitle)
+
+ for letter in sorted(alphabet):
+ itemlist.append(
+ Item(channel=item.channel,
+ action="lista_serie",
+ url='\n\n'.join(alphabet[letter]),
+ title=letter,
+ fulltitle=letter))
+
+ return itemlist
+
+# ================================================================================================================
+
+# ----------------------------------------------------------------------------------------------------------------
+def episodios(item,itemlist = []):
+ support.log(item.channel + " episodios")
+ urls = item.url.split('{|}')
+ # logger.debug(urls)
+ # Carica la pagina
+ data = httptools.downloadpage(urls[0], headers=headers).data
+ urls.pop(0)
+ # Estrae i contenuti
+ patron = r'(.*?)<'
+ matches = re.compile(patron, re.DOTALL).findall(data)
+
+ # logger.debug(matches)
+ for scrapedurl, scrapedtitle in matches:
+ scrapedplot = ""
+ scrapedthumbnail = ""
+ scrapedtitle = cleantitle(scrapedtitle)
+ episode = scrapertools.find_multiple_matches(scrapedtitle,r'((\d*)x(\d*))')[0]
+
+ season = episode[1].lstrip('0')
+ # if season in seasons and '/page/' not in item.url: break
+ # logger.debug(scrapedtitle)
+ # logger.debug(episode)
+ # return False
+
+ infoLabels = {}
+ infoLabels['season'] = season
+ infoLabels['episode'] = episode[2]
+ title = infoLabels['season']+'x'+infoLabels['episode']
+
+ if "http:" not in scrapedurl:
+ scrapedurl = "http:" + scrapedurl
+
+ itemlist.append(
+ Item(channel=item.channel,
+ action="findvideos",
+ contentTpye="tvshow",
+ title=title,
+ fulltitle=scrapedtitle,
+ url=scrapedurl,
+ thumbnail=scrapedthumbnail,
+ plot=scrapedplot,
+ show=item.show,
+ extra=item.extra,
+ infoLabels=infoLabels,
+ folder=True))
+
+
+ next_page = scrapertools.find_single_match(data,r'Successivi')
+ if next_page != "":
+ urls.insert(0,next_page)
+
+ # logger.debug(urls)
+
+ if(len(urls) > 0):
+ item.url = '{|}'.join(urls)
+ itemlist = episodios(item, itemlist)
+ else:
+ cleanItemlist = []
+ episodes = []
+ for episode in itemlist:
+ if episode.title in episodes: continue
+ cleanItemlist.append(episode)
+ episodes.append(episode.title)
+ itemlist = cleanItemlist
+
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+ item.url = item.originalUrl
+ support.videolibrary(itemlist, item, 'bold color kod')
+
+ return itemlist
+
+# ================================================================================================================
diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py
index 4cb682d0..4cb880b5 100644
--- a/channels/serietvsubita.py
+++ b/channels/serietvsubita.py
@@ -30,7 +30,7 @@ def mainlist(item):
itemlist = []
support.menu(itemlist, 'Serie TV bold', 'lista_serie', host,'tvshow')
support.menu(itemlist, 'Novità submenu', 'peliculas_tv', host,'tvshow')
- support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host,'tvshow')
+ support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host,'tvshow',args=['serie'])
support.menu(itemlist, 'Cerca', 'search', host,'tvshow')
@@ -293,9 +293,13 @@ def peliculas_tv(item):
scrapedthumbnail = ""
scrapedplot = ""
scrapedtitle = cleantitle(scrapedtitle)
+ episode = scrapertools.find_multiple_matches(scrapedtitle, r'((\d*)x(\d*))')[0]
title = scrapedtitle.split(" S0")[0].strip()
title = title.split(" S1")[0].strip()
title = title.split(" S2")[0].strip()
+
+
+
itemlist.append(
Item(channel=item.channel,
action="findvideos",
@@ -304,7 +308,7 @@ def peliculas_tv(item):
title=scrapedtitle,
url=scrapedurl,
thumbnail=scrapedthumbnail,
- contentSerieName=title,
+ contentSerieName=title+" ("+episode[0]+" Sub-Ita)",
plot=scrapedplot,
folder=True))
From 4c4f6182550ca0643f94c8610dbe451c61c063d9 Mon Sep 17 00:00:00 2001
From: Alhaziel
Date: Thu, 23 May 2019 18:30:04 +0200
Subject: [PATCH 8/8] Reorganized channels and support moved to core
---
channels/altadefinizione01.py | 4 +-
channels/altadefinizione01_club.json | 2 +-
channels/altadefinizione01_club.py | 8 +-
channels/altadefinizione01_link.json | 2 +-
channels/altadefinizione01_link.py | 8 +-
channels/altadefinizioneclick.py | 4 +-
channels/altadefinizionehd.py | 2 +-
channels/animeleggendari.py | 6 +-
channels/animesaturn.py | 6 +-
channels/animespace.py | 6 +-
channels/animesubita.py | 3 +-
channels/animeworld.py | 4 +-
channels/casacinema.py | 4 +-
channels/casacinemaInfo.py | 4 +-
channels/cineblog01.py | 4 +-
channels/cinemalibero.py | 5 +-
channels/cinemastreaming.py | 4 +-
channels/community.py | 4 +-
channels/eurostreaming.json | 2 +-
channels/eurostreaming.py | 4 +-
channels/fastsubita.py | 2 +-
channels/filmigratis.py | 4 +-
channels/filmpertutti.py | 4 +-
channels/filmsenzalimiti.py | 5 +-
channels/filmsenzalimiticc.py | 4 +-
channels/guardaserieclick.py | 3 +-
channels/ilgeniodellostreaming.py | 4 +-
channels/italiafilmhd.py | 7 +-
channels/itastreaming.py | 5 +-
channels/mondoserietv.py | 4 +-
channels/piratestreaming.py | 4 +-
channels/seriehd.py | 6 +-
channels/serietvonline.py | 4 +-
channels/serietvsubita.py | 4 +-
channels/serietvu.py | 4 +-
channels/streamingaltadefinizione.py | 10 +-
channels/support.py | 2 +-
channels/tantifilm.py | 6 +-
channels/thumbzilla.json | 2 +-
channels/toonitalia.py | 4 +-
channels/vedohd.py | 4 +-
channels/xms.json | 2 +-
channelselector.py | 4 +-
core/channeltools.py | 4 +-
core/support.py | 534 ++++++++++++++++++
default.py | 4 +
{channels => platformcode}/help.json | 0
{channels => platformcode}/help.py | 10 +-
{channels => platformcode}/infoplus.py | 4 +-
platformcode/launcher.py | 38 +-
platformcode/platformtools.py | 20 +-
platformcode/xbmc_config_menu.py | 6 +-
platformcode/xbmc_videolibrary.py | 4 +-
resources/settings.xml | 4 +-
.../skins/Default/720p/ChannelSettings.xml | 2 +-
specials/__init__.py | 12 +
{channels => specials}/autoplay.py | 0
{channels => specials}/autorenumber.py | 8 +-
{channels => specials}/downloads.json | 14 +-
{channels => specials}/downloads.py | 26 +-
{channels => specials}/favorites.py | 0
{channels => specials}/filmontv.json | 0
{channels => specials}/filmontv.py | 5 +-
{channels => specials}/filtertools.py | 0
.../kodfavorites.py | 2 +-
{channels => specials}/news.json | 0
{channels => specials}/news.py | 2 +-
{channels => specials}/search.json | 0
{channels => specials}/search.py | 3 +-
{channels => specials}/searchall.py | 2 +-
{channels => specials}/setting.py | 0
{channels => specials}/side_menu.py | 2 +-
{channels => specials}/tvmoviedb.json | 0
{channels => specials}/tvmoviedb.py | 6 +-
{channels => specials}/url.json | 0
{channels => specials}/url.py | 0
{channels => specials}/videolibrary.json | 0
{channels => specials}/videolibrary.py | 2 +-
videolibrary_service.py | 2 +-
79 files changed, 716 insertions(+), 184 deletions(-)
create mode 100644 core/support.py
rename {channels => platformcode}/help.json (100%)
rename {channels => platformcode}/help.py (96%)
rename {channels => platformcode}/infoplus.py (99%)
create mode 100644 specials/__init__.py
rename {channels => specials}/autoplay.py (100%)
rename {channels => specials}/autorenumber.py (95%)
rename {channels => specials}/downloads.json (92%)
rename {channels => specials}/downloads.py (98%)
rename {channels => specials}/favorites.py (100%)
rename {channels => specials}/filmontv.json (100%)
rename {channels => specials}/filmontv.py (96%)
rename {channels => specials}/filtertools.py (100%)
rename channels/alfavorites.py => specials/kodfavorites.py (99%)
rename {channels => specials}/news.json (100%)
rename {channels => specials}/news.py (99%)
rename {channels => specials}/search.json (100%)
rename {channels => specials}/search.py (99%)
rename {channels => specials}/searchall.py (99%)
rename {channels => specials}/setting.py (100%)
rename {channels => specials}/side_menu.py (99%)
rename {channels => specials}/tvmoviedb.json (100%)
rename {channels => specials}/tvmoviedb.py (99%)
rename {channels => specials}/url.json (100%)
rename {channels => specials}/url.py (100%)
rename {channels => specials}/videolibrary.json (100%)
rename {channels => specials}/videolibrary.py (99%)
diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py
index f117eae5..962297e1 100644
--- a/channels/altadefinizione01.py
+++ b/channels/altadefinizione01.py
@@ -5,8 +5,8 @@
import re
import urlparse
-from channels import filtertools, autoplay, support
-from core import servertools, httptools, tmdb, scrapertoolsV2
+from specials import filtertools, autoplay
+from core import servertools, httptools, tmdb, scrapertoolsV2, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/altadefinizione01_club.json b/channels/altadefinizione01_club.json
index 62672c18..19890b5b 100644
--- a/channels/altadefinizione01_club.json
+++ b/channels/altadefinizione01_club.json
@@ -14,7 +14,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py
index 8ab09f31..e54d3179 100644
--- a/channels/altadefinizione01_club.py
+++ b/channels/altadefinizione01_club.py
@@ -5,13 +5,9 @@
# -*- last change: 04/05/2019
-from channels import autoplay, support, filtertools
+from specials import autoplay, filtertools
from channelselector import get_thumb
-from core import httptools
-from core import channeltools
-from core import scrapertools
-from core import servertools
-from core import tmdb
+from core import httptools, channeltools, scrapertools, servertools, tmdb, support
from core.item import Item
from platformcode import config, logger
diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json
index c43a2939..e56d2b1a 100644
--- a/channels/altadefinizione01_link.json
+++ b/channels/altadefinizione01_link.json
@@ -16,7 +16,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py
index 7b26cf89..3626719b 100644
--- a/channels/altadefinizione01_link.py
+++ b/channels/altadefinizione01_link.py
@@ -6,13 +6,9 @@
# -*- last change: 04/05/2019
-from channels import autoplay, support, filtertools
+from specials import autoplay, filtertools
from channelselector import get_thumb
-from core import httptools
-from core import channeltools
-from core import scrapertools
-from core import servertools
-from core import tmdb
+from core import httptools, channeltools, scrapertools, servertools, tmdb, support
from core.item import Item
from platformcode import config, logger
diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py
index d6b570a6..8cdeaa69 100644
--- a/channels/altadefinizioneclick.py
+++ b/channels/altadefinizioneclick.py
@@ -5,8 +5,8 @@
import re
-from channels import autoplay, filtertools, support
-from core import servertools
+from specials import autoplay, filtertools
+from core import servertools, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/altadefinizionehd.py b/channels/altadefinizionehd.py
index 1d56c404..2187c1a4 100644
--- a/channels/altadefinizionehd.py
+++ b/channels/altadefinizionehd.py
@@ -7,7 +7,7 @@ import re
from core import httptools, scrapertools, servertools, tmdb
from platformcode import logger, config
from core.item import Item
-from channels import autoplay
+from specials import autoplay
from channelselector import thumb
diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py
index 0cd8d2ff..853aadf7 100644
--- a/channels/animeleggendari.py
+++ b/channels/animeleggendari.py
@@ -5,9 +5,9 @@
import re
-from channels import filtertools, autoplay, support, autorenumber
-from channels.support import log, menu
-from core import servertools, httptools, scrapertoolsV2, scrapertools, tmdb
+from specials import filtertools, autoplay, autorenumber
+from core.support import log, menu
+from core import servertools, httptools, scrapertoolsV2, scrapertools, tmdb, support
from platformcode import logger, config
from core.item import Item
from lib.js2py.host import jsfunctions
diff --git a/channels/animesaturn.py b/channels/animesaturn.py
index c0a3d675..7d164821 100644
--- a/channels/animesaturn.py
+++ b/channels/animesaturn.py
@@ -8,9 +8,9 @@ import re
import time
import urlparse
-import channelselector
-from channels import autoplay, support, filtertools
-from core import httptools, tmdb, scrapertools, servertools
+import channelselector, filtertools
+from core import httptools, tmdb, scrapertools, servertools, support
+from specials import autoplay
from core.item import Item
from platformcode import logger, config
__channel__ = "animesaturn"
diff --git a/channels/animespace.py b/channels/animespace.py
index a77405b7..e19fdfac 100644
--- a/channels/animespace.py
+++ b/channels/animespace.py
@@ -13,9 +13,9 @@ from channelselector import get_thumb
from core import tmdb
from core.item import Item
from platformcode import logger, config
-from channels import autoplay
-from channels import filtertools
-from channels import renumbertools
+from specials import autoplay
+from specials import filtertools
+from specials import renumbertools
host = "https://animespace.tv/"
diff --git a/channels/animesubita.py b/channels/animesubita.py
index 167e7084..cb77da59 100644
--- a/channels/animesubita.py
+++ b/channels/animesubita.py
@@ -7,10 +7,9 @@
import re, urllib, urlparse
-from core import servertools, httptools, scrapertools, tmdb
+from core import servertools, httptools, scrapertools, tmdb, support
from platformcode import logger, config
from core.item import Item
-from channels import support
diff --git a/channels/animeworld.py b/channels/animeworld.py
index f79980a1..7ee895d2 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -4,10 +4,10 @@
# ----------------------------------------------------------
import re, urlparse
-from core import httptools, scrapertoolsV2, servertools, tmdb, tvdb
+from core import httptools, scrapertoolsV2, servertools, tmdb, tvdb, support
from core.item import Item
from platformcode import logger, config
-from channels import autoplay, filtertools, support, autorenumber
+from specials import autoplay, filtertools, autorenumber
from channelselector import thumb
diff --git a/channels/casacinema.py b/channels/casacinema.py
index 46b06a34..fa0c794a 100644
--- a/channels/casacinema.py
+++ b/channels/casacinema.py
@@ -5,8 +5,8 @@
# ------------------------------------------------------------
import re, urlparse
-from core import scrapertools, scrapertoolsV2, httptools, servertools, tmdb
-from channels import autoplay, filtertools, support
+from core import scrapertools, scrapertoolsV2, httptools, servertools, tmdb, support
+from specials import autoplay, filtertools
from core.item import Item
from platformcode import logger, config
from channelselector import thumb, get_thumb
diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py
index 1c198b7d..38fa29d3 100644
--- a/channels/casacinemaInfo.py
+++ b/channels/casacinemaInfo.py
@@ -4,8 +4,8 @@
# ------------------------------------------------------------
import re, urlparse, base64
-from core import scrapertoolsV2, httptools, servertools, tmdb
-from channels import autoplay, support
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
+from specials import autoplay
from core.item import Item
from platformcode import logger, config
diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index ba16123f..3ded6e1f 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -6,8 +6,8 @@
import re
import urlparse
-from channels import autoplay, filtertools, support
-from core import scrapertoolsV2, httptools, servertools, tmdb
+from specials import autoplay, filtertools
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
from core.item import Item
from lib import unshortenit
from platformcode import logger, config
diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index 8b18fd60..c00f9709 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -6,9 +6,8 @@ import base64
import re
import urlparse
-from channels import autoplay, support
-from channels import filtertools
-from core import scrapertools, servertools, httptools
+from specials import autoplay, filtertools
+from core import scrapertools, servertools, httptools, support
from platformcode import logger, config
from core.item import Item
from lib import unshortenit
diff --git a/channels/cinemastreaming.py b/channels/cinemastreaming.py
index ce7834c4..0120d3e6 100644
--- a/channels/cinemastreaming.py
+++ b/channels/cinemastreaming.py
@@ -4,8 +4,8 @@
# ------------------------------------------------------------
import re
-from channels import filtertools, support, autoplay
-from core import scrapertools, servertools, httptools, scrapertoolsV2
+from specials import filtertools, autoplay
+from core import scrapertools, servertools, httptools, scrapertoolsV2, support
from core.item import Item
host = 'https://cinemastreaming.icu'
diff --git a/channels/community.py b/channels/community.py
index 53123d10..5ab15928 100644
--- a/channels/community.py
+++ b/channels/community.py
@@ -15,8 +15,8 @@ from channelselector import get_thumb
from core import tmdb
from core.item import Item
from platformcode import logger, config, platformtools
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
list_data = {}
diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json
index d63dde60..e4641e02 100644
--- a/channels/eurostreaming.json
+++ b/channels/eurostreaming.json
@@ -19,7 +19,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py
index 841f9c21..70ebc4ee 100644
--- a/channels/eurostreaming.py
+++ b/channels/eurostreaming.py
@@ -17,8 +17,8 @@
import re
-from channels import autoplay, filtertools, support
-from core import scrapertoolsV2, httptools, servertools, tmdb
+from specials import autoplay, filtertools
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/fastsubita.py b/channels/fastsubita.py
index b3d10bef..194cefc4 100644
--- a/channels/fastsubita.py
+++ b/channels/fastsubita.py
@@ -6,7 +6,7 @@
import re, urlparse
-from channels import autoplay, filtertools
+from specials import autoplay, filtertools
from core import scrapertools, servertools, httptools, tmdb
from core.item import Item
from platformcode import config, logger
diff --git a/channels/filmigratis.py b/channels/filmigratis.py
index 9252686f..82e9bca8 100644
--- a/channels/filmigratis.py
+++ b/channels/filmigratis.py
@@ -7,8 +7,8 @@ import re
import urlparse
from channelselector import get_thumb
-from channels import filtertools, support, autoplay
-from core import scrapertools, servertools, httptools, tmdb
+from specials import filtertools, autoplay
+from core import scrapertools, servertools, httptools, tmdb, support
from platformcode import logger, config
from core.item import Item
diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py
index 646fce27..bca50d7e 100644
--- a/channels/filmpertutti.py
+++ b/channels/filmpertutti.py
@@ -5,8 +5,8 @@
import re
import urlparse
-from channels import autoplay, support
-from core import scrapertoolsV2, servertools, httptools, tmdb
+from specials import autoplay
+from core import scrapertoolsV2, servertools, httptools, tmdb, support
from core.item import Item
from lib import unshortenit
from platformcode import config, logger
diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py
index 6b51f642..a0103af7 100644
--- a/channels/filmsenzalimiti.py
+++ b/channels/filmsenzalimiti.py
@@ -7,9 +7,8 @@ import re
import urlparse
from channelselector import get_thumb
-from channels import autoplay
-from channels import filtertools, support
-from core import scrapertools, servertools, httptools
+from specials import filtertools, autoplay
+from core import scrapertools, servertools, httptools, support
from platformcode import logger, config
from core.item import Item
from platformcode import config
diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py
index 0fd0b10f..d54afbdd 100644
--- a/channels/filmsenzalimiticc.py
+++ b/channels/filmsenzalimiticc.py
@@ -6,8 +6,8 @@ import base64
import re
import urlparse
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import scrapertools, servertools, httptools
from platformcode import logger, config
from core.item import Item
diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py
index b013f92e..71915f5d 100644
--- a/channels/guardaserieclick.py
+++ b/channels/guardaserieclick.py
@@ -6,11 +6,10 @@
import re
-from core import httptools, scrapertools, servertools
+from core import httptools, scrapertools, servertools, support
from core.item import Item
from core import tmdb
from platformcode import logger, config
-from channels import support
host = "http://www.guardaserie.watch"
diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py
index 3a24cc2e..77bcc496 100644
--- a/channels/ilgeniodellostreaming.py
+++ b/channels/ilgeniodellostreaming.py
@@ -8,8 +8,8 @@ import re, urlparse
from platformcode import config, logger
from core import scrapertools, servertools, httptools
from core.item import Item
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import tmdb
__channel__ = "ilgeniodellostreaming"
diff --git a/channels/italiafilmhd.py b/channels/italiafilmhd.py
index fd15b1c3..ba41d390 100644
--- a/channels/italiafilmhd.py
+++ b/channels/italiafilmhd.py
@@ -7,11 +7,10 @@ import base64
import re
import urlparse
-from channels import autoplay
-from channels import filtertools, support
-from core import scrapertools, servertools, httptools
+from specials import autoplay
+from specials import filtertools
+from core import scrapertools, servertools, httptools, tmdb, support
from core.item import Item
-from core import tmdb
from platformcode import logger, config
IDIOMAS = {'Italiano': 'IT'}
diff --git a/channels/itastreaming.py b/channels/itastreaming.py
index bf40844f..79a5318c 100644
--- a/channels/itastreaming.py
+++ b/channels/itastreaming.py
@@ -7,12 +7,9 @@ import base64
import re
import urlparse
-from core import scrapertools, httptools
-from core import servertools
+from core import scrapertools, httptools, servertools, tmdb, support
from core.item import Item
-from core import tmdb
from platformcode import logger, config
-from channels import support
diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py
index 272e25ac..a7649b10 100644
--- a/channels/mondoserietv.py
+++ b/channels/mondoserietv.py
@@ -7,8 +7,8 @@
import re
import urllib
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import scrapertools, servertools, httptools, scrapertoolsV2
from core.item import Item
from core import tmdb
diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py
index 0c80d520..d7b3c11f 100644
--- a/channels/piratestreaming.py
+++ b/channels/piratestreaming.py
@@ -6,8 +6,8 @@
import re
import urlparse
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import httptools, scrapertools, servertools
from core.item import Item
from core import tmdb
diff --git a/channels/seriehd.py b/channels/seriehd.py
index e98887a5..2f167ac6 100644
--- a/channels/seriehd.py
+++ b/channels/seriehd.py
@@ -4,9 +4,9 @@
# ------------------------------------------------------------
import urlparse
-from channels import autoplay, filtertools, support
-from channels.support import menu, log
-from core import scrapertoolsV2, servertools, httptools, tmdb
+from specials import autoplay, filtertools
+from core.support import menu, log
+from core import scrapertoolsV2, servertools, httptools, tmdb, support
from core.item import Item
from platformcode import logger, config
from channelselector import thumb
diff --git a/channels/serietvonline.py b/channels/serietvonline.py
index 40360979..adc05134 100644
--- a/channels/serietvonline.py
+++ b/channels/serietvonline.py
@@ -4,11 +4,11 @@
# ----------------------------------------------------------
import re
-from core import httptools, scrapertoolsV2, servertools, tmdb
+from core import httptools, scrapertoolsV2, servertools, tmdb, support
from core.item import Item
from lib import unshortenit
from platformcode import logger, config
-from channels import autoplay, support
+from specials import autoplay
from channelselector import thumb
host = "https://serietvonline.live"
diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py
index 4cb682d0..b8515ef6 100644
--- a/channels/serietvsubita.py
+++ b/channels/serietvsubita.py
@@ -8,8 +8,8 @@ import re
import time
import channelselector
-from channels import autoplay, support, filtertools
-from core import httptools, tmdb, scrapertools, servertools
+from specials import autoplay, filtertools
+from core import httptools, tmdb, scrapertools, servertools, support
from core.item import Item
from platformcode import logger, config
__channel__ = "serietvsubita"
diff --git a/channels/serietvu.py b/channels/serietvu.py
index fa0a7091..c4dedb4f 100644
--- a/channels/serietvu.py
+++ b/channels/serietvu.py
@@ -6,8 +6,8 @@
import re
import channelselector
-from channels import autoplay, support, filtertools
-from core import httptools, tmdb, scrapertools, servertools
+from specials import autoplay, filtertools
+from core import httptools, tmdb, scrapertools, servertools, support
from core.item import Item
from platformcode import logger, config
__channel__ = 'serietvu'
diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py
index 748c225d..5e190e68 100644
--- a/channels/streamingaltadefinizione.py
+++ b/channels/streamingaltadefinizione.py
@@ -1,7 +1,13 @@
-from channels import support, autoplay
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per Streaming Altadefinizione
+# ------------------------------------------------------------
+
+from core import support
+from specials import autoplay
from core.item import Item
-host = 'https://www.streamingaltadefinizione.world/'
+host = 'https://www.streamingaltadefinizione.space'
list_servers = ['verystream', 'openload', 'wstream']
list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM']
diff --git a/channels/support.py b/channels/support.py
index a6cbc968..4a00dee6 100644
--- a/channels/support.py
+++ b/channels/support.py
@@ -7,7 +7,7 @@ import urllib
from lib import unshortenit
from platformcode import logger, config
from channelselector import thumb
-from channels import autoplay
+from specials import autoplay
def hdpass_get_servers(item):
diff --git a/channels/tantifilm.py b/channels/tantifilm.py
index d706f154..c82d92e5 100644
--- a/channels/tantifilm.py
+++ b/channels/tantifilm.py
@@ -6,9 +6,9 @@
import re
import urlparse
-from channels import support, autorenumber
-from channels.support import menu, log, aplay
-from core import scrapertoolsV2, httptools, tmdb
+from specials import autorenumber
+from core.support import menu, log, aplay
+from core import scrapertoolsV2, httptools, tmdb, support
from core.item import Item
from platformcode import config, logger
diff --git a/channels/thumbzilla.json b/channels/thumbzilla.json
index fcce22f8..bf9e0378 100644
--- a/channels/thumbzilla.json
+++ b/channels/thumbzilla.json
@@ -14,7 +14,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/toonitalia.py b/channels/toonitalia.py
index 7af084db..6b881f03 100644
--- a/channels/toonitalia.py
+++ b/channels/toonitalia.py
@@ -7,8 +7,8 @@
import re
import urlparse
-from channels import autoplay, filtertools, support
-from core import scrapertools, scrapertoolsV2, httptools, tmdb, servertools
+from specials import autoplay, filtertool
+from core import scrapertools, scrapertoolsV2, httptools, tmdb, servertoolss, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/vedohd.py b/channels/vedohd.py
index c42dd0db..2e21ae8e 100644
--- a/channels/vedohd.py
+++ b/channels/vedohd.py
@@ -6,8 +6,8 @@
import re
import urlparse
-from channels import autoplay, support
-from core import scrapertoolsV2, httptools, servertools
+from specials import autoplay
+from core import scrapertoolsV2, httptools, servertools, support
from core.item import Item
from platformcode import logger
from channelselector import thumb
diff --git a/channels/xms.json b/channels/xms.json
index 64e505cd..4c3088f3 100644
--- a/channels/xms.json
+++ b/channels/xms.json
@@ -14,7 +14,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channelselector.py b/channelselector.py
index 87323a90..66c09c56 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -27,11 +27,11 @@ def getmainlist(view="thumb_"):
thumbnail=get_thumb("channels.png", view), view=view,
category=config.get_localized_string(30119), viewmode="thumbnails"))
- itemlist.append(Item(title=config.get_localized_string(70527), channel="alfavorites", action="mainlist",
+ itemlist.append(Item(title=config.get_localized_string(70527), channel="kodfavorites", action="mainlist",
thumbnail=get_thumb("mylink.png", view), view=view,
category=config.get_localized_string(70527), viewmode="thumbnails"))
- itemlist.append(Item(title=config.get_localized_string(30103), channel="search", action="mainlist",
+ itemlist.append(Item(title=config.get_localized_string(30103), channel="search", path='special', action="mainlist",
thumbnail=get_thumb("search.png", view),
category=config.get_localized_string(30119), viewmode="list",
context=[{"title": config.get_localized_string(70286), "channel": "search", "action": "opciones",
diff --git a/core/channeltools.py b/core/channeltools.py
index 5595ddaa..39d6b60b 100644
--- a/core/channeltools.py
+++ b/core/channeltools.py
@@ -133,6 +133,8 @@ def get_channel_json(channel_name):
channel_json = None
try:
channel_path = filetools.join(config.get_runtime_path(), "channels", channel_name + ".json")
+ if not os.path.isfile(channel_path):
+ channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json")
if filetools.isfile(channel_path):
# logger.info("channel_data=" + channel_path)
channel_json = jsontools.load(filetools.read(channel_path))
@@ -149,7 +151,7 @@ def get_channel_json(channel_name):
def get_channel_controls_settings(channel_name):
# logger.info("channel_name=" + channel_name)
dict_settings = {}
-
+ # import web_pdb; web_pdb.set_trace()
list_controls = get_channel_json(channel_name).get('settings', list())
for c in list_controls:
diff --git a/core/support.py b/core/support.py
new file mode 100644
index 00000000..bff31475
--- /dev/null
+++ b/core/support.py
@@ -0,0 +1,534 @@
+# support functions that are needed by many channels, to no repeat the same code
+import base64, urlparse, re, os, inspect
+from core import httptools, scrapertoolsV2, servertools, tmdb
+from core.item import Item
+import urllib
+
+from lib import unshortenit
+from platformcode import logger, config
+from channelselector import thumb
+from specials import autoplay
+
+
+def hdpass_get_servers(item):
+ # Carica la pagina
+ data = httptools.downloadpage(item.url).data.replace('\n', '')
+ patron = r']+><\/iframe>'
+ url = scrapertoolsV2.find_single_match(data, patron).replace("?alta", "")
+ url = url.replace("&download=1", "")
+ if 'https' not in url:
+ url = 'https:' + url
+
+ if 'hdpass' or 'hdplayer' in url:
+ data = httptools.downloadpage(url).data
+
+ start = data.find('')
+ end = data.find('', start)
+ data = data[start:end]
+
+ patron_res = '(.*?)'
+ patron_mir = '(.*?)'
+ patron_media = r''
+
+ res = scrapertoolsV2.find_single_match(data, patron_res)
+
+ itemlist = []
+
+ for res_url, res_video in scrapertoolsV2.find_multiple_matches(res, '([^<]+?)'):
+
+ data = httptools.downloadpage(urlparse.urljoin(url, res_url)).data.replace('\n', '')
+
+ mir = scrapertoolsV2.find_single_match(data, patron_mir)
+
+ for mir_url, server in scrapertoolsV2.find_multiple_matches(mir, '([^<]+?)'):
+
+ data = httptools.downloadpage(urlparse.urljoin(url, mir_url)).data.replace('\n', '')
+ for media_label, media_url in scrapertoolsV2.find_multiple_matches(data, patron_media):
+ itemlist.append(Item(channel=item.channel,
+ action="play",
+ title=item.title+" ["+color(server, 'orange')+"]"+" - "+color(res_video, 'limegreen'),
+ fulltitle=item.fulltitle,
+ quality=res_video,
+ show=item.show,
+ thumbnail=item.thumbnail,
+ contentType=item.contentType,
+ server=server,
+ url=url_decode(media_url)))
+ log("video -> ", res_video)
+
+ return itemlist
+
+
+def url_decode(url_enc):
+ lenght = len(url_enc)
+ if lenght % 2 == 0:
+ len2 = lenght / 2
+ first = url_enc[0:len2]
+ last = url_enc[len2:lenght]
+ url_enc = last + first
+ reverse = url_enc[::-1]
+ return base64.b64decode(reverse)
+
+ last_car = url_enc[lenght - 1]
+ url_enc[lenght - 1] = ' '
+ url_enc = url_enc.strip()
+ len1 = len(url_enc)
+ len2 = len1 / 2
+ first = url_enc[0:len2]
+ last = url_enc[len2:len1]
+ url_enc = last + first
+ reverse = url_enc[::-1]
+ reverse = reverse + last_car
+ return base64.b64decode(reverse)
+
+
+def color(text, color):
+ return "[COLOR " + color + "]" + text + "[/COLOR]"
+
+
+def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="", patron_block="",
+ patronNext="", action="findvideos", addVideolibrary = True):
+ # patron: the patron to use for scraping page, all capturing group must match with listGroups
+ # listGroups: a list containing the scraping info obtained by your patron, in order
+ # accepted values are: url, title, thumb, quality, year, plot, duration, genre, rating
+
+ # header: values to pass to request header
+ # blacklist: titles that you want to exclude(service articles for example)
+ # data: if you want to pass data manually, maybe because you need some custom replacement
+ # patron_block: patron to get parts of the page (to scrape with patron attribute),
+ # if you need a "block inside another block" you can create a list, please note that all matches
+ # will be packed as string
+ # patronNext: patron for scraping next page link
+ # action: if you want results perform an action different from "findvideos", useful when scraping film by genres
+ # url_host: string to prepend to scrapedurl, useful when url don't contain host
+ # example usage:
+ # import support
+ # itemlist = []
+ # patron = 'blablabla'
+ # headers = [['Referer', host]]
+ # blacklist = 'Request a TV serie!'
+ # return support.scrape(item, itemlist, patron, ['thumb', 'quality', 'url', 'title', 'year', 'plot'],
+ # headers=headers, blacklist=blacklist)
+
+ itemlist = []
+
+ if not data:
+ data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"')
+ data = re.sub('\n|\t', ' ', data)
+ # replace all ' with " and eliminate newline, so we don't need to worry about
+ log('DATA =', data)
+
+ block = data
+
+ if patron_block:
+ if type(patron_block) == str:
+ patron_block = [patron_block]
+
+ for n, regex in enumerate(patron_block):
+ blocks = scrapertoolsV2.find_multiple_matches(block, regex)
+ block = ""
+ for b in blocks:
+ block += "\n" + b
+ log('BLOCK ', n, '=', block)
+ else:
+ block = data
+ if patron and listGroups:
+ matches = scrapertoolsV2.find_multiple_matches(block, patron)
+ log('MATCHES =', matches)
+
+ 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)
+ match.extend([''] * (len(listGroups) - len(match)))
+
+ scraped = {}
+ for kk in known_keys:
+ val = match[listGroups.index(kk)] if kk in listGroups else ''
+ if val and (kk == "url" or kk == 'thumb') and 'http' not in val:
+ val = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + val
+ scraped[kk] = val
+
+ title = scrapertoolsV2.decodeHtmlentities(scraped["title"]).strip()
+ plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"]))
+
+ 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]'
+
+ if item.infoLabels["title"] or item.fulltitle: # if title is set, probably this is a list of episodes or video sources
+ infolabels = item.infoLabels
+ else:
+ infolabels = {}
+ if scraped["year"]:
+ infolabels['year'] = scraped["year"]
+ if scraped["plot"]:
+ infolabels['plot'] = plot
+ if scraped["duration"]:
+ matches = scrapertoolsV2.find_multiple_matches(scraped["duration"],r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)')
+ for h, m in matches:
+ scraped["duration"] = int(h) * 60 + int(m)
+ if not matches:
+ scraped["duration"] = scrapertoolsV2.find_single_match(scraped["duration"], r'(\d+)')
+ infolabels['duration'] = int(scraped["duration"]) * 60
+ if scraped["genere"]:
+ genres = scrapertoolsV2.find_multiple_matches(scraped["genere"], '[A-Za-z]+')
+ infolabels['genere'] = ", ".join(genres)
+ if scraped["rating"]:
+ infolabels['rating'] = scrapertoolsV2.decodeHtmlentities(scraped["rating"])
+
+ if scraped["title"] not in blacklist:
+ it = Item(
+ channel=item.channel,
+ action=action,
+ contentType=item.contentType,
+ title=longtitle,
+ fulltitle=title,
+ show=title,
+ quality=scraped["quality"],
+ url=scraped["url"],
+ infoLabels=infolabels,
+ thumbnail=scraped["thumb"],
+ args=item.args
+ )
+
+ for lg in list(set(listGroups).difference(known_keys)):
+ it.__setattr__(lg, match[listGroups.index(lg)])
+
+ itemlist.append(it)
+
+ if (item.contentType == "episode" and (action != "findvideos" and action != "play")) \
+ or (item.contentType == "movie" and action != "play"):
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+ else:
+ for it in itemlist:
+ it.infoLabels = item.infoLabels
+
+ if patronNext:
+ nextPage(itemlist, item, data, patronNext, 2)
+
+ if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
+ item.fulltitle = item.infoLabels["title"]
+ videolibrary(itemlist, item)
+
+ return itemlist
+
+
+def dooplay_get_links(item, host):
+ # get links from websites using dooplay theme and dooplay_player
+ # return a list of dict containing these values: url, title and server
+
+ data = httptools.downloadpage(item.url).data.replace("'", '"')
+ patron = r'([^<>]+)(?:([^<>]+))?'
+ matches = scrapertoolsV2.find_multiple_matches(data, patron)
+
+ ret = []
+
+ for type, post, nume, title, server in matches:
+ postData = urllib.urlencode({
+ "action": "doo_player_ajax",
+ "post": post,
+ "nume": nume,
+ "type": type
+ })
+ dataAdmin = httptools.downloadpage(host + 'wp-admin/admin-ajax.php', post=postData,headers={'Referer': item.url}).data
+ link = scrapertoolsV2.find_single_match(dataAdmin, "([^<>]+).*?([^<>]+).*?([0-9]{4}).*?
(.*?)
')
+ #
+ # # Estrae i contenuti
+ # # patron = r'([^<]+)<\/a>'
+ # patron = r'(.*?)<'
+ matches = re.compile(patron, re.DOTALL).findall(data)
+
+ # logger.debug(matches)
+ for scrapedurl, scrapedtitle in matches:
+ scrapedplot = ""
+ scrapedthumbnail = ""
+ scrapedtitle = cleantitle(scrapedtitle)
+ episode = scrapertools.find_multiple_matches(scrapedtitle,r'((\d*)x(\d*))')[0]
+
+ season = episode[1].lstrip('0')
+ # if season in seasons and '/page/' not in item.url: break
+ # logger.debug(scrapedtitle)
+ # logger.debug(episode)
+ # return False
+
+ infoLabels = {}
+ infoLabels['season'] = season
+ infoLabels['episode'] = episode[2]
+ title = infoLabels['season']+'x'+infoLabels['episode']
+
+ if "http:" not in scrapedurl:
+ scrapedurl = "http:" + scrapedurl
+
+ itemlist.append(
+ Item(channel=item.channel,
+ action="findvideos",
+ contentTpye="tvshow",
+ title=title,
+ fulltitle=scrapedtitle,
+ url=scrapedurl,
+ thumbnail=scrapedthumbnail,
+ plot=scrapedplot,
+ show=item.show,
+ extra=item.extra,
+ infoLabels=infoLabels,
+ folder=True))
+
+
+ next_page = scrapertools.find_single_match(data,r'Successivi')
+ if next_page != "":
+ urls.insert(0,next_page)
+
+ # logger.debug(urls)
+
+ if(len(urls) > 0):
+ item.url = '{|}'.join(urls)
+ itemlist = episodios(item, itemlist)
+ else:
+ cleanItemlist = []
+ episodes = []
+ for episode in itemlist:
+ if episode.title in episodes: continue
+ cleanItemlist.append(episode)
+ episodes.append(episode.title)
+ itemlist = cleanItemlist
+
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+ item.url = item.originalUrl
+ support.videolibrary(itemlist, item, 'bold color kod')
+
+ return itemlist
+
+# ================================================================================================================
diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py
index 4cb682d0..4cb880b5 100644
--- a/channels/serietvsubita.py
+++ b/channels/serietvsubita.py
@@ -30,7 +30,7 @@ def mainlist(item):
itemlist = []
support.menu(itemlist, 'Serie TV bold', 'lista_serie', host,'tvshow')
support.menu(itemlist, 'Novità submenu', 'peliculas_tv', host,'tvshow')
- support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host,'tvshow')
+ support.menu(itemlist, 'Archivio A-Z submenu', 'list_az', host,'tvshow',args=['serie'])
support.menu(itemlist, 'Cerca', 'search', host,'tvshow')
@@ -293,9 +293,13 @@ def peliculas_tv(item):
scrapedthumbnail = ""
scrapedplot = ""
scrapedtitle = cleantitle(scrapedtitle)
+ episode = scrapertools.find_multiple_matches(scrapedtitle, r'((\d*)x(\d*))')[0]
title = scrapedtitle.split(" S0")[0].strip()
title = title.split(" S1")[0].strip()
title = title.split(" S2")[0].strip()
+
+
+
itemlist.append(
Item(channel=item.channel,
action="findvideos",
@@ -304,7 +308,7 @@ def peliculas_tv(item):
title=scrapedtitle,
url=scrapedurl,
thumbnail=scrapedthumbnail,
- contentSerieName=title,
+ contentSerieName=title+" ("+episode[0]+" Sub-Ita)",
plot=scrapedplot,
folder=True))
From 4c4f6182550ca0643f94c8610dbe451c61c063d9 Mon Sep 17 00:00:00 2001
From: Alhaziel
Date: Thu, 23 May 2019 18:30:04 +0200
Subject: [PATCH 8/8] Reorganized channels and support moved to core
---
channels/altadefinizione01.py | 4 +-
channels/altadefinizione01_club.json | 2 +-
channels/altadefinizione01_club.py | 8 +-
channels/altadefinizione01_link.json | 2 +-
channels/altadefinizione01_link.py | 8 +-
channels/altadefinizioneclick.py | 4 +-
channels/altadefinizionehd.py | 2 +-
channels/animeleggendari.py | 6 +-
channels/animesaturn.py | 6 +-
channels/animespace.py | 6 +-
channels/animesubita.py | 3 +-
channels/animeworld.py | 4 +-
channels/casacinema.py | 4 +-
channels/casacinemaInfo.py | 4 +-
channels/cineblog01.py | 4 +-
channels/cinemalibero.py | 5 +-
channels/cinemastreaming.py | 4 +-
channels/community.py | 4 +-
channels/eurostreaming.json | 2 +-
channels/eurostreaming.py | 4 +-
channels/fastsubita.py | 2 +-
channels/filmigratis.py | 4 +-
channels/filmpertutti.py | 4 +-
channels/filmsenzalimiti.py | 5 +-
channels/filmsenzalimiticc.py | 4 +-
channels/guardaserieclick.py | 3 +-
channels/ilgeniodellostreaming.py | 4 +-
channels/italiafilmhd.py | 7 +-
channels/itastreaming.py | 5 +-
channels/mondoserietv.py | 4 +-
channels/piratestreaming.py | 4 +-
channels/seriehd.py | 6 +-
channels/serietvonline.py | 4 +-
channels/serietvsubita.py | 4 +-
channels/serietvu.py | 4 +-
channels/streamingaltadefinizione.py | 10 +-
channels/support.py | 2 +-
channels/tantifilm.py | 6 +-
channels/thumbzilla.json | 2 +-
channels/toonitalia.py | 4 +-
channels/vedohd.py | 4 +-
channels/xms.json | 2 +-
channelselector.py | 4 +-
core/channeltools.py | 4 +-
core/support.py | 534 ++++++++++++++++++
default.py | 4 +
{channels => platformcode}/help.json | 0
{channels => platformcode}/help.py | 10 +-
{channels => platformcode}/infoplus.py | 4 +-
platformcode/launcher.py | 38 +-
platformcode/platformtools.py | 20 +-
platformcode/xbmc_config_menu.py | 6 +-
platformcode/xbmc_videolibrary.py | 4 +-
resources/settings.xml | 4 +-
.../skins/Default/720p/ChannelSettings.xml | 2 +-
specials/__init__.py | 12 +
{channels => specials}/autoplay.py | 0
{channels => specials}/autorenumber.py | 8 +-
{channels => specials}/downloads.json | 14 +-
{channels => specials}/downloads.py | 26 +-
{channels => specials}/favorites.py | 0
{channels => specials}/filmontv.json | 0
{channels => specials}/filmontv.py | 5 +-
{channels => specials}/filtertools.py | 0
.../kodfavorites.py | 2 +-
{channels => specials}/news.json | 0
{channels => specials}/news.py | 2 +-
{channels => specials}/search.json | 0
{channels => specials}/search.py | 3 +-
{channels => specials}/searchall.py | 2 +-
{channels => specials}/setting.py | 0
{channels => specials}/side_menu.py | 2 +-
{channels => specials}/tvmoviedb.json | 0
{channels => specials}/tvmoviedb.py | 6 +-
{channels => specials}/url.json | 0
{channels => specials}/url.py | 0
{channels => specials}/videolibrary.json | 0
{channels => specials}/videolibrary.py | 2 +-
videolibrary_service.py | 2 +-
79 files changed, 716 insertions(+), 184 deletions(-)
create mode 100644 core/support.py
rename {channels => platformcode}/help.json (100%)
rename {channels => platformcode}/help.py (96%)
rename {channels => platformcode}/infoplus.py (99%)
create mode 100644 specials/__init__.py
rename {channels => specials}/autoplay.py (100%)
rename {channels => specials}/autorenumber.py (95%)
rename {channels => specials}/downloads.json (92%)
rename {channels => specials}/downloads.py (98%)
rename {channels => specials}/favorites.py (100%)
rename {channels => specials}/filmontv.json (100%)
rename {channels => specials}/filmontv.py (96%)
rename {channels => specials}/filtertools.py (100%)
rename channels/alfavorites.py => specials/kodfavorites.py (99%)
rename {channels => specials}/news.json (100%)
rename {channels => specials}/news.py (99%)
rename {channels => specials}/search.json (100%)
rename {channels => specials}/search.py (99%)
rename {channels => specials}/searchall.py (99%)
rename {channels => specials}/setting.py (100%)
rename {channels => specials}/side_menu.py (99%)
rename {channels => specials}/tvmoviedb.json (100%)
rename {channels => specials}/tvmoviedb.py (99%)
rename {channels => specials}/url.json (100%)
rename {channels => specials}/url.py (100%)
rename {channels => specials}/videolibrary.json (100%)
rename {channels => specials}/videolibrary.py (99%)
diff --git a/channels/altadefinizione01.py b/channels/altadefinizione01.py
index f117eae5..962297e1 100644
--- a/channels/altadefinizione01.py
+++ b/channels/altadefinizione01.py
@@ -5,8 +5,8 @@
import re
import urlparse
-from channels import filtertools, autoplay, support
-from core import servertools, httptools, tmdb, scrapertoolsV2
+from specials import filtertools, autoplay
+from core import servertools, httptools, tmdb, scrapertoolsV2, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/altadefinizione01_club.json b/channels/altadefinizione01_club.json
index 62672c18..19890b5b 100644
--- a/channels/altadefinizione01_club.json
+++ b/channels/altadefinizione01_club.json
@@ -14,7 +14,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py
index 8ab09f31..e54d3179 100644
--- a/channels/altadefinizione01_club.py
+++ b/channels/altadefinizione01_club.py
@@ -5,13 +5,9 @@
# -*- last change: 04/05/2019
-from channels import autoplay, support, filtertools
+from specials import autoplay, filtertools
from channelselector import get_thumb
-from core import httptools
-from core import channeltools
-from core import scrapertools
-from core import servertools
-from core import tmdb
+from core import httptools, channeltools, scrapertools, servertools, tmdb, support
from core.item import Item
from platformcode import config, logger
diff --git a/channels/altadefinizione01_link.json b/channels/altadefinizione01_link.json
index c43a2939..e56d2b1a 100644
--- a/channels/altadefinizione01_link.json
+++ b/channels/altadefinizione01_link.json
@@ -16,7 +16,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py
index 7b26cf89..3626719b 100644
--- a/channels/altadefinizione01_link.py
+++ b/channels/altadefinizione01_link.py
@@ -6,13 +6,9 @@
# -*- last change: 04/05/2019
-from channels import autoplay, support, filtertools
+from specials import autoplay, filtertools
from channelselector import get_thumb
-from core import httptools
-from core import channeltools
-from core import scrapertools
-from core import servertools
-from core import tmdb
+from core import httptools, channeltools, scrapertools, servertools, tmdb, support
from core.item import Item
from platformcode import config, logger
diff --git a/channels/altadefinizioneclick.py b/channels/altadefinizioneclick.py
index d6b570a6..8cdeaa69 100644
--- a/channels/altadefinizioneclick.py
+++ b/channels/altadefinizioneclick.py
@@ -5,8 +5,8 @@
import re
-from channels import autoplay, filtertools, support
-from core import servertools
+from specials import autoplay, filtertools
+from core import servertools, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/altadefinizionehd.py b/channels/altadefinizionehd.py
index 1d56c404..2187c1a4 100644
--- a/channels/altadefinizionehd.py
+++ b/channels/altadefinizionehd.py
@@ -7,7 +7,7 @@ import re
from core import httptools, scrapertools, servertools, tmdb
from platformcode import logger, config
from core.item import Item
-from channels import autoplay
+from specials import autoplay
from channelselector import thumb
diff --git a/channels/animeleggendari.py b/channels/animeleggendari.py
index 0cd8d2ff..853aadf7 100644
--- a/channels/animeleggendari.py
+++ b/channels/animeleggendari.py
@@ -5,9 +5,9 @@
import re
-from channels import filtertools, autoplay, support, autorenumber
-from channels.support import log, menu
-from core import servertools, httptools, scrapertoolsV2, scrapertools, tmdb
+from specials import filtertools, autoplay, autorenumber
+from core.support import log, menu
+from core import servertools, httptools, scrapertoolsV2, scrapertools, tmdb, support
from platformcode import logger, config
from core.item import Item
from lib.js2py.host import jsfunctions
diff --git a/channels/animesaturn.py b/channels/animesaturn.py
index c0a3d675..7d164821 100644
--- a/channels/animesaturn.py
+++ b/channels/animesaturn.py
@@ -8,9 +8,9 @@ import re
import time
import urlparse
-import channelselector
-from channels import autoplay, support, filtertools
-from core import httptools, tmdb, scrapertools, servertools
+import channelselector, filtertools
+from core import httptools, tmdb, scrapertools, servertools, support
+from specials import autoplay
from core.item import Item
from platformcode import logger, config
__channel__ = "animesaturn"
diff --git a/channels/animespace.py b/channels/animespace.py
index a77405b7..e19fdfac 100644
--- a/channels/animespace.py
+++ b/channels/animespace.py
@@ -13,9 +13,9 @@ from channelselector import get_thumb
from core import tmdb
from core.item import Item
from platformcode import logger, config
-from channels import autoplay
-from channels import filtertools
-from channels import renumbertools
+from specials import autoplay
+from specials import filtertools
+from specials import renumbertools
host = "https://animespace.tv/"
diff --git a/channels/animesubita.py b/channels/animesubita.py
index 167e7084..cb77da59 100644
--- a/channels/animesubita.py
+++ b/channels/animesubita.py
@@ -7,10 +7,9 @@
import re, urllib, urlparse
-from core import servertools, httptools, scrapertools, tmdb
+from core import servertools, httptools, scrapertools, tmdb, support
from platformcode import logger, config
from core.item import Item
-from channels import support
diff --git a/channels/animeworld.py b/channels/animeworld.py
index f79980a1..7ee895d2 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -4,10 +4,10 @@
# ----------------------------------------------------------
import re, urlparse
-from core import httptools, scrapertoolsV2, servertools, tmdb, tvdb
+from core import httptools, scrapertoolsV2, servertools, tmdb, tvdb, support
from core.item import Item
from platformcode import logger, config
-from channels import autoplay, filtertools, support, autorenumber
+from specials import autoplay, filtertools, autorenumber
from channelselector import thumb
diff --git a/channels/casacinema.py b/channels/casacinema.py
index 46b06a34..fa0c794a 100644
--- a/channels/casacinema.py
+++ b/channels/casacinema.py
@@ -5,8 +5,8 @@
# ------------------------------------------------------------
import re, urlparse
-from core import scrapertools, scrapertoolsV2, httptools, servertools, tmdb
-from channels import autoplay, filtertools, support
+from core import scrapertools, scrapertoolsV2, httptools, servertools, tmdb, support
+from specials import autoplay, filtertools
from core.item import Item
from platformcode import logger, config
from channelselector import thumb, get_thumb
diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py
index 1c198b7d..38fa29d3 100644
--- a/channels/casacinemaInfo.py
+++ b/channels/casacinemaInfo.py
@@ -4,8 +4,8 @@
# ------------------------------------------------------------
import re, urlparse, base64
-from core import scrapertoolsV2, httptools, servertools, tmdb
-from channels import autoplay, support
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
+from specials import autoplay
from core.item import Item
from platformcode import logger, config
diff --git a/channels/cineblog01.py b/channels/cineblog01.py
index ba16123f..3ded6e1f 100644
--- a/channels/cineblog01.py
+++ b/channels/cineblog01.py
@@ -6,8 +6,8 @@
import re
import urlparse
-from channels import autoplay, filtertools, support
-from core import scrapertoolsV2, httptools, servertools, tmdb
+from specials import autoplay, filtertools
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
from core.item import Item
from lib import unshortenit
from platformcode import logger, config
diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index 8b18fd60..c00f9709 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -6,9 +6,8 @@ import base64
import re
import urlparse
-from channels import autoplay, support
-from channels import filtertools
-from core import scrapertools, servertools, httptools
+from specials import autoplay, filtertools
+from core import scrapertools, servertools, httptools, support
from platformcode import logger, config
from core.item import Item
from lib import unshortenit
diff --git a/channels/cinemastreaming.py b/channels/cinemastreaming.py
index ce7834c4..0120d3e6 100644
--- a/channels/cinemastreaming.py
+++ b/channels/cinemastreaming.py
@@ -4,8 +4,8 @@
# ------------------------------------------------------------
import re
-from channels import filtertools, support, autoplay
-from core import scrapertools, servertools, httptools, scrapertoolsV2
+from specials import filtertools, autoplay
+from core import scrapertools, servertools, httptools, scrapertoolsV2, support
from core.item import Item
host = 'https://cinemastreaming.icu'
diff --git a/channels/community.py b/channels/community.py
index 53123d10..5ab15928 100644
--- a/channels/community.py
+++ b/channels/community.py
@@ -15,8 +15,8 @@ from channelselector import get_thumb
from core import tmdb
from core.item import Item
from platformcode import logger, config, platformtools
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
list_data = {}
diff --git a/channels/eurostreaming.json b/channels/eurostreaming.json
index d63dde60..e4641e02 100644
--- a/channels/eurostreaming.json
+++ b/channels/eurostreaming.json
@@ -19,7 +19,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py
index 841f9c21..70ebc4ee 100644
--- a/channels/eurostreaming.py
+++ b/channels/eurostreaming.py
@@ -17,8 +17,8 @@
import re
-from channels import autoplay, filtertools, support
-from core import scrapertoolsV2, httptools, servertools, tmdb
+from specials import autoplay, filtertools
+from core import scrapertoolsV2, httptools, servertools, tmdb, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/fastsubita.py b/channels/fastsubita.py
index b3d10bef..194cefc4 100644
--- a/channels/fastsubita.py
+++ b/channels/fastsubita.py
@@ -6,7 +6,7 @@
import re, urlparse
-from channels import autoplay, filtertools
+from specials import autoplay, filtertools
from core import scrapertools, servertools, httptools, tmdb
from core.item import Item
from platformcode import config, logger
diff --git a/channels/filmigratis.py b/channels/filmigratis.py
index 9252686f..82e9bca8 100644
--- a/channels/filmigratis.py
+++ b/channels/filmigratis.py
@@ -7,8 +7,8 @@ import re
import urlparse
from channelselector import get_thumb
-from channels import filtertools, support, autoplay
-from core import scrapertools, servertools, httptools, tmdb
+from specials import filtertools, autoplay
+from core import scrapertools, servertools, httptools, tmdb, support
from platformcode import logger, config
from core.item import Item
diff --git a/channels/filmpertutti.py b/channels/filmpertutti.py
index 646fce27..bca50d7e 100644
--- a/channels/filmpertutti.py
+++ b/channels/filmpertutti.py
@@ -5,8 +5,8 @@
import re
import urlparse
-from channels import autoplay, support
-from core import scrapertoolsV2, servertools, httptools, tmdb
+from specials import autoplay
+from core import scrapertoolsV2, servertools, httptools, tmdb, support
from core.item import Item
from lib import unshortenit
from platformcode import config, logger
diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py
index 6b51f642..a0103af7 100644
--- a/channels/filmsenzalimiti.py
+++ b/channels/filmsenzalimiti.py
@@ -7,9 +7,8 @@ import re
import urlparse
from channelselector import get_thumb
-from channels import autoplay
-from channels import filtertools, support
-from core import scrapertools, servertools, httptools
+from specials import filtertools, autoplay
+from core import scrapertools, servertools, httptools, support
from platformcode import logger, config
from core.item import Item
from platformcode import config
diff --git a/channels/filmsenzalimiticc.py b/channels/filmsenzalimiticc.py
index 0fd0b10f..d54afbdd 100644
--- a/channels/filmsenzalimiticc.py
+++ b/channels/filmsenzalimiticc.py
@@ -6,8 +6,8 @@ import base64
import re
import urlparse
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import scrapertools, servertools, httptools
from platformcode import logger, config
from core.item import Item
diff --git a/channels/guardaserieclick.py b/channels/guardaserieclick.py
index b013f92e..71915f5d 100644
--- a/channels/guardaserieclick.py
+++ b/channels/guardaserieclick.py
@@ -6,11 +6,10 @@
import re
-from core import httptools, scrapertools, servertools
+from core import httptools, scrapertools, servertools, support
from core.item import Item
from core import tmdb
from platformcode import logger, config
-from channels import support
host = "http://www.guardaserie.watch"
diff --git a/channels/ilgeniodellostreaming.py b/channels/ilgeniodellostreaming.py
index 3a24cc2e..77bcc496 100644
--- a/channels/ilgeniodellostreaming.py
+++ b/channels/ilgeniodellostreaming.py
@@ -8,8 +8,8 @@ import re, urlparse
from platformcode import config, logger
from core import scrapertools, servertools, httptools
from core.item import Item
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import tmdb
__channel__ = "ilgeniodellostreaming"
diff --git a/channels/italiafilmhd.py b/channels/italiafilmhd.py
index fd15b1c3..ba41d390 100644
--- a/channels/italiafilmhd.py
+++ b/channels/italiafilmhd.py
@@ -7,11 +7,10 @@ import base64
import re
import urlparse
-from channels import autoplay
-from channels import filtertools, support
-from core import scrapertools, servertools, httptools
+from specials import autoplay
+from specials import filtertools
+from core import scrapertools, servertools, httptools, tmdb, support
from core.item import Item
-from core import tmdb
from platformcode import logger, config
IDIOMAS = {'Italiano': 'IT'}
diff --git a/channels/itastreaming.py b/channels/itastreaming.py
index bf40844f..79a5318c 100644
--- a/channels/itastreaming.py
+++ b/channels/itastreaming.py
@@ -7,12 +7,9 @@ import base64
import re
import urlparse
-from core import scrapertools, httptools
-from core import servertools
+from core import scrapertools, httptools, servertools, tmdb, support
from core.item import Item
-from core import tmdb
from platformcode import logger, config
-from channels import support
diff --git a/channels/mondoserietv.py b/channels/mondoserietv.py
index 272e25ac..a7649b10 100644
--- a/channels/mondoserietv.py
+++ b/channels/mondoserietv.py
@@ -7,8 +7,8 @@
import re
import urllib
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import scrapertools, servertools, httptools, scrapertoolsV2
from core.item import Item
from core import tmdb
diff --git a/channels/piratestreaming.py b/channels/piratestreaming.py
index 0c80d520..d7b3c11f 100644
--- a/channels/piratestreaming.py
+++ b/channels/piratestreaming.py
@@ -6,8 +6,8 @@
import re
import urlparse
-from channels import autoplay
-from channels import filtertools
+from specials import autoplay
+from specials import filtertools
from core import httptools, scrapertools, servertools
from core.item import Item
from core import tmdb
diff --git a/channels/seriehd.py b/channels/seriehd.py
index e98887a5..2f167ac6 100644
--- a/channels/seriehd.py
+++ b/channels/seriehd.py
@@ -4,9 +4,9 @@
# ------------------------------------------------------------
import urlparse
-from channels import autoplay, filtertools, support
-from channels.support import menu, log
-from core import scrapertoolsV2, servertools, httptools, tmdb
+from specials import autoplay, filtertools
+from core.support import menu, log
+from core import scrapertoolsV2, servertools, httptools, tmdb, support
from core.item import Item
from platformcode import logger, config
from channelselector import thumb
diff --git a/channels/serietvonline.py b/channels/serietvonline.py
index 40360979..adc05134 100644
--- a/channels/serietvonline.py
+++ b/channels/serietvonline.py
@@ -4,11 +4,11 @@
# ----------------------------------------------------------
import re
-from core import httptools, scrapertoolsV2, servertools, tmdb
+from core import httptools, scrapertoolsV2, servertools, tmdb, support
from core.item import Item
from lib import unshortenit
from platformcode import logger, config
-from channels import autoplay, support
+from specials import autoplay
from channelselector import thumb
host = "https://serietvonline.live"
diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py
index 4cb682d0..b8515ef6 100644
--- a/channels/serietvsubita.py
+++ b/channels/serietvsubita.py
@@ -8,8 +8,8 @@ import re
import time
import channelselector
-from channels import autoplay, support, filtertools
-from core import httptools, tmdb, scrapertools, servertools
+from specials import autoplay, filtertools
+from core import httptools, tmdb, scrapertools, servertools, support
from core.item import Item
from platformcode import logger, config
__channel__ = "serietvsubita"
diff --git a/channels/serietvu.py b/channels/serietvu.py
index fa0a7091..c4dedb4f 100644
--- a/channels/serietvu.py
+++ b/channels/serietvu.py
@@ -6,8 +6,8 @@
import re
import channelselector
-from channels import autoplay, support, filtertools
-from core import httptools, tmdb, scrapertools, servertools
+from specials import autoplay, filtertools
+from core import httptools, tmdb, scrapertools, servertools, support
from core.item import Item
from platformcode import logger, config
__channel__ = 'serietvu'
diff --git a/channels/streamingaltadefinizione.py b/channels/streamingaltadefinizione.py
index 748c225d..5e190e68 100644
--- a/channels/streamingaltadefinizione.py
+++ b/channels/streamingaltadefinizione.py
@@ -1,7 +1,13 @@
-from channels import support, autoplay
+# -*- coding: utf-8 -*-
+# ------------------------------------------------------------
+# Canale per Streaming Altadefinizione
+# ------------------------------------------------------------
+
+from core import support
+from specials import autoplay
from core.item import Item
-host = 'https://www.streamingaltadefinizione.world/'
+host = 'https://www.streamingaltadefinizione.space'
list_servers = ['verystream', 'openload', 'wstream']
list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM']
diff --git a/channels/support.py b/channels/support.py
index a6cbc968..4a00dee6 100644
--- a/channels/support.py
+++ b/channels/support.py
@@ -7,7 +7,7 @@ import urllib
from lib import unshortenit
from platformcode import logger, config
from channelselector import thumb
-from channels import autoplay
+from specials import autoplay
def hdpass_get_servers(item):
diff --git a/channels/tantifilm.py b/channels/tantifilm.py
index d706f154..c82d92e5 100644
--- a/channels/tantifilm.py
+++ b/channels/tantifilm.py
@@ -6,9 +6,9 @@
import re
import urlparse
-from channels import support, autorenumber
-from channels.support import menu, log, aplay
-from core import scrapertoolsV2, httptools, tmdb
+from specials import autorenumber
+from core.support import menu, log, aplay
+from core import scrapertoolsV2, httptools, tmdb, support
from core.item import Item
from platformcode import config, logger
diff --git a/channels/thumbzilla.json b/channels/thumbzilla.json
index fcce22f8..bf9e0378 100644
--- a/channels/thumbzilla.json
+++ b/channels/thumbzilla.json
@@ -14,7 +14,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channels/toonitalia.py b/channels/toonitalia.py
index 7af084db..6b881f03 100644
--- a/channels/toonitalia.py
+++ b/channels/toonitalia.py
@@ -7,8 +7,8 @@
import re
import urlparse
-from channels import autoplay, filtertools, support
-from core import scrapertools, scrapertoolsV2, httptools, tmdb, servertools
+from specials import autoplay, filtertool
+from core import scrapertools, scrapertoolsV2, httptools, tmdb, servertoolss, support
from core.item import Item
from platformcode import logger, config
diff --git a/channels/vedohd.py b/channels/vedohd.py
index c42dd0db..2e21ae8e 100644
--- a/channels/vedohd.py
+++ b/channels/vedohd.py
@@ -6,8 +6,8 @@
import re
import urlparse
-from channels import autoplay, support
-from core import scrapertoolsV2, httptools, servertools
+from specials import autoplay
+from core import scrapertoolsV2, httptools, servertools, support
from core.item import Item
from platformcode import logger
from channelselector import thumb
diff --git a/channels/xms.json b/channels/xms.json
index 64e505cd..4c3088f3 100644
--- a/channels/xms.json
+++ b/channels/xms.json
@@ -14,7 +14,7 @@
{
"id": "modo_grafico",
"type": "bool",
- "label": "Buscar información extra",
+ "label": "Cerca informazioni extra",
"default": true,
"enabled": true,
"visible": true
diff --git a/channelselector.py b/channelselector.py
index 87323a90..66c09c56 100644
--- a/channelselector.py
+++ b/channelselector.py
@@ -27,11 +27,11 @@ def getmainlist(view="thumb_"):
thumbnail=get_thumb("channels.png", view), view=view,
category=config.get_localized_string(30119), viewmode="thumbnails"))
- itemlist.append(Item(title=config.get_localized_string(70527), channel="alfavorites", action="mainlist",
+ itemlist.append(Item(title=config.get_localized_string(70527), channel="kodfavorites", action="mainlist",
thumbnail=get_thumb("mylink.png", view), view=view,
category=config.get_localized_string(70527), viewmode="thumbnails"))
- itemlist.append(Item(title=config.get_localized_string(30103), channel="search", action="mainlist",
+ itemlist.append(Item(title=config.get_localized_string(30103), channel="search", path='special', action="mainlist",
thumbnail=get_thumb("search.png", view),
category=config.get_localized_string(30119), viewmode="list",
context=[{"title": config.get_localized_string(70286), "channel": "search", "action": "opciones",
diff --git a/core/channeltools.py b/core/channeltools.py
index 5595ddaa..39d6b60b 100644
--- a/core/channeltools.py
+++ b/core/channeltools.py
@@ -133,6 +133,8 @@ def get_channel_json(channel_name):
channel_json = None
try:
channel_path = filetools.join(config.get_runtime_path(), "channels", channel_name + ".json")
+ if not os.path.isfile(channel_path):
+ channel_path = filetools.join(config.get_runtime_path(), "specials", channel_name + ".json")
if filetools.isfile(channel_path):
# logger.info("channel_data=" + channel_path)
channel_json = jsontools.load(filetools.read(channel_path))
@@ -149,7 +151,7 @@ def get_channel_json(channel_name):
def get_channel_controls_settings(channel_name):
# logger.info("channel_name=" + channel_name)
dict_settings = {}
-
+ # import web_pdb; web_pdb.set_trace()
list_controls = get_channel_json(channel_name).get('settings', list())
for c in list_controls:
diff --git a/core/support.py b/core/support.py
new file mode 100644
index 00000000..bff31475
--- /dev/null
+++ b/core/support.py
@@ -0,0 +1,534 @@
+# support functions that are needed by many channels, to no repeat the same code
+import base64, urlparse, re, os, inspect
+from core import httptools, scrapertoolsV2, servertools, tmdb
+from core.item import Item
+import urllib
+
+from lib import unshortenit
+from platformcode import logger, config
+from channelselector import thumb
+from specials import autoplay
+
+
+def hdpass_get_servers(item):
+ # Carica la pagina
+ data = httptools.downloadpage(item.url).data.replace('\n', '')
+ patron = r']+><\/iframe>'
+ url = scrapertoolsV2.find_single_match(data, patron).replace("?alta", "")
+ url = url.replace("&download=1", "")
+ if 'https' not in url:
+ url = 'https:' + url
+
+ if 'hdpass' or 'hdplayer' in url:
+ data = httptools.downloadpage(url).data
+
+ start = data.find('')
+ end = data.find('', start)
+ data = data[start:end]
+
+ patron_res = '(.*?)'
+ patron_mir = '(.*?)'
+ patron_media = r''
+
+ res = scrapertoolsV2.find_single_match(data, patron_res)
+
+ itemlist = []
+
+ for res_url, res_video in scrapertoolsV2.find_multiple_matches(res, '([^<]+?)'):
+
+ data = httptools.downloadpage(urlparse.urljoin(url, res_url)).data.replace('\n', '')
+
+ mir = scrapertoolsV2.find_single_match(data, patron_mir)
+
+ for mir_url, server in scrapertoolsV2.find_multiple_matches(mir, '([^<]+?)'):
+
+ data = httptools.downloadpage(urlparse.urljoin(url, mir_url)).data.replace('\n', '')
+ for media_label, media_url in scrapertoolsV2.find_multiple_matches(data, patron_media):
+ itemlist.append(Item(channel=item.channel,
+ action="play",
+ title=item.title+" ["+color(server, 'orange')+"]"+" - "+color(res_video, 'limegreen'),
+ fulltitle=item.fulltitle,
+ quality=res_video,
+ show=item.show,
+ thumbnail=item.thumbnail,
+ contentType=item.contentType,
+ server=server,
+ url=url_decode(media_url)))
+ log("video -> ", res_video)
+
+ return itemlist
+
+
+def url_decode(url_enc):
+ lenght = len(url_enc)
+ if lenght % 2 == 0:
+ len2 = lenght / 2
+ first = url_enc[0:len2]
+ last = url_enc[len2:lenght]
+ url_enc = last + first
+ reverse = url_enc[::-1]
+ return base64.b64decode(reverse)
+
+ last_car = url_enc[lenght - 1]
+ url_enc[lenght - 1] = ' '
+ url_enc = url_enc.strip()
+ len1 = len(url_enc)
+ len2 = len1 / 2
+ first = url_enc[0:len2]
+ last = url_enc[len2:len1]
+ url_enc = last + first
+ reverse = url_enc[::-1]
+ reverse = reverse + last_car
+ return base64.b64decode(reverse)
+
+
+def color(text, color):
+ return "[COLOR " + color + "]" + text + "[/COLOR]"
+
+
+def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="", patron_block="",
+ patronNext="", action="findvideos", addVideolibrary = True):
+ # patron: the patron to use for scraping page, all capturing group must match with listGroups
+ # listGroups: a list containing the scraping info obtained by your patron, in order
+ # accepted values are: url, title, thumb, quality, year, plot, duration, genre, rating
+
+ # header: values to pass to request header
+ # blacklist: titles that you want to exclude(service articles for example)
+ # data: if you want to pass data manually, maybe because you need some custom replacement
+ # patron_block: patron to get parts of the page (to scrape with patron attribute),
+ # if you need a "block inside another block" you can create a list, please note that all matches
+ # will be packed as string
+ # patronNext: patron for scraping next page link
+ # action: if you want results perform an action different from "findvideos", useful when scraping film by genres
+ # url_host: string to prepend to scrapedurl, useful when url don't contain host
+ # example usage:
+ # import support
+ # itemlist = []
+ # patron = 'blablabla'
+ # headers = [['Referer', host]]
+ # blacklist = 'Request a TV serie!'
+ # return support.scrape(item, itemlist, patron, ['thumb', 'quality', 'url', 'title', 'year', 'plot'],
+ # headers=headers, blacklist=blacklist)
+
+ itemlist = []
+
+ if not data:
+ data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"')
+ data = re.sub('\n|\t', ' ', data)
+ # replace all ' with " and eliminate newline, so we don't need to worry about
+ log('DATA =', data)
+
+ block = data
+
+ if patron_block:
+ if type(patron_block) == str:
+ patron_block = [patron_block]
+
+ for n, regex in enumerate(patron_block):
+ blocks = scrapertoolsV2.find_multiple_matches(block, regex)
+ block = ""
+ for b in blocks:
+ block += "\n" + b
+ log('BLOCK ', n, '=', block)
+ else:
+ block = data
+ if patron and listGroups:
+ matches = scrapertoolsV2.find_multiple_matches(block, patron)
+ log('MATCHES =', matches)
+
+ 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)
+ match.extend([''] * (len(listGroups) - len(match)))
+
+ scraped = {}
+ for kk in known_keys:
+ val = match[listGroups.index(kk)] if kk in listGroups else ''
+ if val and (kk == "url" or kk == 'thumb') and 'http' not in val:
+ val = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + val
+ scraped[kk] = val
+
+ title = scrapertoolsV2.decodeHtmlentities(scraped["title"]).strip()
+ plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"]))
+
+ 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]'
+
+ if item.infoLabels["title"] or item.fulltitle: # if title is set, probably this is a list of episodes or video sources
+ infolabels = item.infoLabels
+ else:
+ infolabels = {}
+ if scraped["year"]:
+ infolabels['year'] = scraped["year"]
+ if scraped["plot"]:
+ infolabels['plot'] = plot
+ if scraped["duration"]:
+ matches = scrapertoolsV2.find_multiple_matches(scraped["duration"],r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)')
+ for h, m in matches:
+ scraped["duration"] = int(h) * 60 + int(m)
+ if not matches:
+ scraped["duration"] = scrapertoolsV2.find_single_match(scraped["duration"], r'(\d+)')
+ infolabels['duration'] = int(scraped["duration"]) * 60
+ if scraped["genere"]:
+ genres = scrapertoolsV2.find_multiple_matches(scraped["genere"], '[A-Za-z]+')
+ infolabels['genere'] = ", ".join(genres)
+ if scraped["rating"]:
+ infolabels['rating'] = scrapertoolsV2.decodeHtmlentities(scraped["rating"])
+
+ if scraped["title"] not in blacklist:
+ it = Item(
+ channel=item.channel,
+ action=action,
+ contentType=item.contentType,
+ title=longtitle,
+ fulltitle=title,
+ show=title,
+ quality=scraped["quality"],
+ url=scraped["url"],
+ infoLabels=infolabels,
+ thumbnail=scraped["thumb"],
+ args=item.args
+ )
+
+ for lg in list(set(listGroups).difference(known_keys)):
+ it.__setattr__(lg, match[listGroups.index(lg)])
+
+ itemlist.append(it)
+
+ if (item.contentType == "episode" and (action != "findvideos" and action != "play")) \
+ or (item.contentType == "movie" and action != "play"):
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+ else:
+ for it in itemlist:
+ it.infoLabels = item.infoLabels
+
+ if patronNext:
+ nextPage(itemlist, item, data, patronNext, 2)
+
+ if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
+ item.fulltitle = item.infoLabels["title"]
+ videolibrary(itemlist, item)
+
+ return itemlist
+
+
+def dooplay_get_links(item, host):
+ # get links from websites using dooplay theme and dooplay_player
+ # return a list of dict containing these values: url, title and server
+
+ data = httptools.downloadpage(item.url).data.replace("'", '"')
+ patron = r'([^<>]+)(?:([^<>]+))?'
+ matches = scrapertoolsV2.find_multiple_matches(data, patron)
+
+ ret = []
+
+ for type, post, nume, title, server in matches:
+ postData = urllib.urlencode({
+ "action": "doo_player_ajax",
+ "post": post,
+ "nume": nume,
+ "type": type
+ })
+ dataAdmin = httptools.downloadpage(host + 'wp-admin/admin-ajax.php', post=postData,headers={'Referer': item.url}).data
+ link = scrapertoolsV2.find_single_match(dataAdmin, "([^<>]+).*?([^<>]+).*?([0-9]{4}).*?
')
+ end = data.find('
', start)
+ data = data[start:end]
+
+ patron_res = '([^<]+?)'):
+
+ data = httptools.downloadpage(urlparse.urljoin(url, res_url)).data.replace('\n', '')
+
+ mir = scrapertoolsV2.find_single_match(data, patron_mir)
+
+ for mir_url, server in scrapertoolsV2.find_multiple_matches(mir, '([^<]+?)'):
+
+ data = httptools.downloadpage(urlparse.urljoin(url, mir_url)).data.replace('\n', '')
+ for media_label, media_url in scrapertoolsV2.find_multiple_matches(data, patron_media):
+ itemlist.append(Item(channel=item.channel,
+ action="play",
+ title=item.title+" ["+color(server, 'orange')+"]"+" - "+color(res_video, 'limegreen'),
+ fulltitle=item.fulltitle,
+ quality=res_video,
+ show=item.show,
+ thumbnail=item.thumbnail,
+ contentType=item.contentType,
+ server=server,
+ url=url_decode(media_url)))
+ log("video -> ", res_video)
+
+ return itemlist
+
+
+def url_decode(url_enc):
+ lenght = len(url_enc)
+ if lenght % 2 == 0:
+ len2 = lenght / 2
+ first = url_enc[0:len2]
+ last = url_enc[len2:lenght]
+ url_enc = last + first
+ reverse = url_enc[::-1]
+ return base64.b64decode(reverse)
+
+ last_car = url_enc[lenght - 1]
+ url_enc[lenght - 1] = ' '
+ url_enc = url_enc.strip()
+ len1 = len(url_enc)
+ len2 = len1 / 2
+ first = url_enc[0:len2]
+ last = url_enc[len2:len1]
+ url_enc = last + first
+ reverse = url_enc[::-1]
+ reverse = reverse + last_car
+ return base64.b64decode(reverse)
+
+
+def color(text, color):
+ return "[COLOR " + color + "]" + text + "[/COLOR]"
+
+
+def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data="", patron_block="",
+ patronNext="", action="findvideos", addVideolibrary = True):
+ # patron: the patron to use for scraping page, all capturing group must match with listGroups
+ # listGroups: a list containing the scraping info obtained by your patron, in order
+ # accepted values are: url, title, thumb, quality, year, plot, duration, genre, rating
+
+ # header: values to pass to request header
+ # blacklist: titles that you want to exclude(service articles for example)
+ # data: if you want to pass data manually, maybe because you need some custom replacement
+ # patron_block: patron to get parts of the page (to scrape with patron attribute),
+ # if you need a "block inside another block" you can create a list, please note that all matches
+ # will be packed as string
+ # patronNext: patron for scraping next page link
+ # action: if you want results perform an action different from "findvideos", useful when scraping film by genres
+ # url_host: string to prepend to scrapedurl, useful when url don't contain host
+ # example usage:
+ # import support
+ # itemlist = []
+ # patron = 'blablabla'
+ # headers = [['Referer', host]]
+ # blacklist = 'Request a TV serie!'
+ # return support.scrape(item, itemlist, patron, ['thumb', 'quality', 'url', 'title', 'year', 'plot'],
+ # headers=headers, blacklist=blacklist)
+
+ itemlist = []
+
+ if not data:
+ data = httptools.downloadpage(item.url, headers=headers).data.replace("'", '"')
+ data = re.sub('\n|\t', ' ', data)
+ # replace all ' with " and eliminate newline, so we don't need to worry about
+ log('DATA =', data)
+
+ block = data
+
+ if patron_block:
+ if type(patron_block) == str:
+ patron_block = [patron_block]
+
+ for n, regex in enumerate(patron_block):
+ blocks = scrapertoolsV2.find_multiple_matches(block, regex)
+ block = ""
+ for b in blocks:
+ block += "\n" + b
+ log('BLOCK ', n, '=', block)
+ else:
+ block = data
+ if patron and listGroups:
+ matches = scrapertoolsV2.find_multiple_matches(block, patron)
+ log('MATCHES =', matches)
+
+ 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)
+ match.extend([''] * (len(listGroups) - len(match)))
+
+ scraped = {}
+ for kk in known_keys:
+ val = match[listGroups.index(kk)] if kk in listGroups else ''
+ if val and (kk == "url" or kk == 'thumb') and 'http' not in val:
+ val = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + val
+ scraped[kk] = val
+
+ title = scrapertoolsV2.decodeHtmlentities(scraped["title"]).strip()
+ plot = scrapertoolsV2.htmlclean(scrapertoolsV2.decodeHtmlentities(scraped["plot"]))
+
+ 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]'
+
+ if item.infoLabels["title"] or item.fulltitle: # if title is set, probably this is a list of episodes or video sources
+ infolabels = item.infoLabels
+ else:
+ infolabels = {}
+ if scraped["year"]:
+ infolabels['year'] = scraped["year"]
+ if scraped["plot"]:
+ infolabels['plot'] = plot
+ if scraped["duration"]:
+ matches = scrapertoolsV2.find_multiple_matches(scraped["duration"],r'([0-9])\s*?(?:[hH]|:|\.|,|\\|\/|\||\s)\s*?([0-9]+)')
+ for h, m in matches:
+ scraped["duration"] = int(h) * 60 + int(m)
+ if not matches:
+ scraped["duration"] = scrapertoolsV2.find_single_match(scraped["duration"], r'(\d+)')
+ infolabels['duration'] = int(scraped["duration"]) * 60
+ if scraped["genere"]:
+ genres = scrapertoolsV2.find_multiple_matches(scraped["genere"], '[A-Za-z]+')
+ infolabels['genere'] = ", ".join(genres)
+ if scraped["rating"]:
+ infolabels['rating'] = scrapertoolsV2.decodeHtmlentities(scraped["rating"])
+
+ if scraped["title"] not in blacklist:
+ it = Item(
+ channel=item.channel,
+ action=action,
+ contentType=item.contentType,
+ title=longtitle,
+ fulltitle=title,
+ show=title,
+ quality=scraped["quality"],
+ url=scraped["url"],
+ infoLabels=infolabels,
+ thumbnail=scraped["thumb"],
+ args=item.args
+ )
+
+ for lg in list(set(listGroups).difference(known_keys)):
+ it.__setattr__(lg, match[listGroups.index(lg)])
+
+ itemlist.append(it)
+
+ if (item.contentType == "episode" and (action != "findvideos" and action != "play")) \
+ or (item.contentType == "movie" and action != "play"):
+ tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
+ else:
+ for it in itemlist:
+ it.infoLabels = item.infoLabels
+
+ if patronNext:
+ nextPage(itemlist, item, data, patronNext, 2)
+
+ if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
+ item.fulltitle = item.infoLabels["title"]
+ videolibrary(itemlist, item)
+
+ return itemlist
+
+
+def dooplay_get_links(item, host):
+ # get links from websites using dooplay theme and dooplay_player
+ # return a list of dict containing these values: url, title and server
+
+ data = httptools.downloadpage(item.url).data.replace("'", '"')
+ patron = r'([^<>]+)(?:([^<>]+))?'
+ matches = scrapertoolsV2.find_multiple_matches(data, patron)
+
+ ret = []
+
+ for type, post, nume, title, server in matches:
+ postData = urllib.urlencode({
+ "action": "doo_player_ajax",
+ "post": post,
+ "nume": nume,
+ "type": type
+ })
+ dataAdmin = httptools.downloadpage(host + 'wp-admin/admin-ajax.php', post=postData,headers={'Referer': item.url}).data
+ link = scrapertoolsV2.find_single_match(dataAdmin, "([^<>]+).*?([^<>]+).*?([0-9]{4}).*?
(.*?)
'
+ patron_mir = '(.*?)
'
+ patron_media = r''
+
+ res = scrapertoolsV2.find_single_match(data, patron_res)
+
+ itemlist = []
+
+ for res_url, res_video in scrapertoolsV2.find_multiple_matches(res, '