diff --git a/channels.json b/channels.json
index 98d53014..5572180b 100644
--- a/channels.json
+++ b/channels.json
@@ -16,7 +16,6 @@
"casacinema": "https://www.casacinema.site",
"casacinemainfo": "https://www.casacinema.info",
"cb01anime": "http://www.cineblog01.ink",
- "cineblog01": "https://cb01.tools",
"cinemalibero": "https://cinemalibero.icu",
"cinemastreaming": "https://cinemastreaming.icu",
"documentaristreamingda": "https://documentari-streaming-da.com",
@@ -46,7 +45,6 @@
"ilgeniodellostreaming": "https://ilgeniodellostreaming.pw",
"italiafilm": "https://www.italia-film.pw",
"italiafilmhd": "https://italiafilm.info",
- "italiafilmvedohd": "https://italiafilm.info",
"italiaserie": "https://italiaserie.org",
"itastreaming": "https://itastreaming.film",
"majintoon": "https://toonitalia.org",
diff --git a/channels/altadefinizione01_club.py b/channels/altadefinizione01_club.py
index b24bf0b2..47acc6d8 100644
--- a/channels/altadefinizione01_club.py
+++ b/channels/altadefinizione01_club.py
@@ -49,9 +49,9 @@ def mainlist(item):
support.menu(itemlist, 'Film Ultimi Arrivi bold', 'peliculas', host, args='pellicola')
support.menu(itemlist, 'Genere', 'categorie', host, args='genres')
support.menu(itemlist, 'Per anno submenu', 'categorie', host, args=['Film per Anno','years'])
- support.menu(itemlist, 'Per lettera', 'categorie', host+'catalog/a/', args=['Film per Lettera','orderalf'])
- support.menu(itemlist, 'Al Cinema bold', 'peliculas', host+'cinema/', args='pellicola')
- support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host+'sub-ita/', args='pellicola')
+ support.menu(itemlist, 'Per lettera', 'categorie', host + '/catalog/a/', args=['Film per Lettera','orderalf'])
+ support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/cinema/', args='pellicola')
+ support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/sub-ita/', args='pellicola')
support.menu(itemlist, 'Cerca film submenu', 'search', host)
autoplay.show_option(item.channel, itemlist)
@@ -234,7 +234,7 @@ def search(item, text):
logger.info("%s mainlist search log: %s %s" % (__channel__, item, text))
itemlist = []
text = text.replace(" ", "+")
- item.url = host+"index.php?do=search&story=%s&subaction=search" % (text)
+ item.url = host + "/index.php?do=search&story=%s&subaction=search" % (text)
#item.extra = "search"
try:
return peliculas(item)
diff --git a/channels/altadefinizione01_link.py b/channels/altadefinizione01_link.py
index b46e87b6..584e175b 100644
--- a/channels/altadefinizione01_link.py
+++ b/channels/altadefinizione01_link.py
@@ -34,24 +34,17 @@ def mainlist(item):
support.menu(itemlist, 'Film per Genere', 'genres', host, args='genres')
support.menu(itemlist, 'Film per Anno submenu', 'genres', host, args='years')
support.menu(itemlist, 'Film per Qualità submenu', 'genres', host, args='quality')
- support.menu(itemlist, 'Al Cinema bold', 'peliculas', host+'film-del-cinema')
- support.menu(itemlist, 'Popolari bold', 'peliculas', host+'piu-visti.html')
+ support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/film-del-cinema')
+ support.menu(itemlist, 'Popolari bold', 'peliculas', host + '/piu-visti.html')
support.menu(itemlist, 'Mi sento fortunato bold', 'genres', host, args='lucky')
- support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host+'film-sub-ita/')
+ support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/film-sub-ita/')
support.menu(itemlist, 'Cerca film submenu', 'search', host)
# per autoplay
autoplay.init(item.channel, list_servers, list_quality)
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'))
- )
+ support.channel_config(item, itemlist)
return itemlist
diff --git a/channels/animeforce.py b/channels/animeforce.py
index c38b6d1b..54a14d80 100644
--- a/channels/animeforce.py
+++ b/channels/animeforce.py
@@ -478,7 +478,7 @@ def scrapedSingle(url="", single="", patron=""):
def Crea_Url(pagina="1", azione="ricerca", categoria="", nome=""):
# esempio
# chiamate.php?azione=ricerca&cat=&nome=&pag=
- Stringa = host + "chiamate.php?azione=" + azione + "&cat=" + categoria + "&nome=" + nome + "&pag=" + pagina
+ Stringa = host + "/chiamate.php?azione=" + azione + "&cat=" + categoria + "&nome=" + nome + "&pag=" + pagina
log("crea_Url", Stringa)
return Stringa
diff --git a/channels/animespace.py b/channels/animespace.py
index 9e6a6d5a..4f9b88b0 100644
--- a/channels/animespace.py
+++ b/channels/animespace.py
@@ -42,42 +42,42 @@ def mainlist(item):
itemlist.append(Item(channel=item.channel, title="Ultimas",
action="list_all",
thumbnail=get_thumb('last', auto=True),
- url=host + 'emision'))
+ url=host + '/emision'))
itemlist.append(Item(channel=item.channel, title="Todas",
action="list_all",
thumbnail=get_thumb('all', auto=True),
- url=host + 'animes'))
+ url=host + '/animes'))
itemlist.append(Item(channel=item.channel, title="Anime",
action="list_all",
thumbnail=get_thumb('anime', auto=True),
- url=host + 'categoria/anime'))
+ url=host + '/categoria/anime'))
itemlist.append(Item(channel=item.channel, title="Películas",
action="list_all",
thumbnail=get_thumb('movies', auto=True),
- url=host + 'categoria/pelicula'))
+ url=host + '/categoria/pelicula'))
itemlist.append(Item(channel=item.channel, title="OVAs",
action="list_all",
thumbnail='',
- url=host + 'categoria/ova'))
+ url=host + '/categoria/ova'))
itemlist.append(Item(channel=item.channel, title="ONAs",
action="list_all",
thumbnail='',
- url=host + 'categoria/ona'))
+ url=host + '/categoria/ona'))
itemlist.append(Item(channel=item.channel, title="Especiales",
action="list_all",
thumbnail='',
- url=host + 'categoria/especial'))
+ url=host + '/categoria/especial'))
itemlist.append(Item(channel=item.channel, title="Buscar",
action="search",
- url=host + 'search?q=',
+ url=host + '/search?q=',
thumbnail=get_thumb('search', auto=True),
fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'
))
diff --git a/channels/casacinema.py b/channels/casacinema.py
index 8758598a..5c742def 100644
--- a/channels/casacinema.py
+++ b/channels/casacinema.py
@@ -100,7 +100,7 @@ def newest(categoria):
def search(item, texto):
logger.info("[casacinema.py] " + item.url + " search " + texto)
- item.url = host + "?s=" + texto
+ item.url = host + "/?s=" + texto
try:
if item.extra == "tvshow":
diff --git a/channels/casacinemaInfo.py b/channels/casacinemaInfo.py
index a853aa5e..9c54779e 100644
--- a/channels/casacinemaInfo.py
+++ b/channels/casacinemaInfo.py
@@ -63,7 +63,7 @@ def mainlist(item):
def search(item, texto):
logger.info("[casacinemaInfo.py] " + item.url + " search " + texto)
- item.url = host + "?s=" + texto
+ item.url = host + "/?s=" + texto
data = httptools.downloadpage(item.url).data
itemlist = []
diff --git a/channels/cat3plus.py b/channels/cat3plus.py
index 140056b3..f746a00d 100644
--- a/channels/cat3plus.py
+++ b/channels/cat3plus.py
@@ -83,7 +83,7 @@ def search(item, texto):
logger.info()
if texto != "":
texto = texto.replace(" ", "+")
- item.url = host + "search?q=" + texto
+ item.url = host + "/search?q=" + texto
item.extra = "busqueda"
try:
return list_all(item)
diff --git a/channels/cb01anime.py b/channels/cb01anime.py
index c818dcf3..c3b62c31 100644
--- a/channels/cb01anime.py
+++ b/channels/cb01anime.py
@@ -71,7 +71,7 @@ def listacompleta(item):
return build_itemlist(item,
'Z(.*?)',
- '([^<]+)', "episodios")
+ '([^<]+)', "episodios")
def build_itemlist(item, re_bloque, re_patron, iaction):
diff --git a/channels/cinemalibero.py b/channels/cinemalibero.py
index 22f07591..58634f13 100644
--- a/channels/cinemalibero.py
+++ b/channels/cinemalibero.py
@@ -45,14 +45,7 @@ def mainlist(item):
autoplay.show_option(item.channel, itemlist) # Necessario per Autoplay (Menu Configurazione)
- 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'))
- )
+ support.channel_config(item, itemlist)
return itemlist
diff --git a/channels/eurostreaming.py b/channels/eurostreaming.py
index f209b064..a80cb31b 100644
--- a/channels/eurostreaming.py
+++ b/channels/eurostreaming.py
@@ -42,9 +42,9 @@ def mainlist(item):
itemlist = []
support.menu(itemlist, 'Serie TV', 'serietv', host, contentType = 'episode') # mettere sempre episode per serietv, anime!!
- support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "category/serie-tv-archive/", contentType = 'episode')
- support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + 'aggiornamento-episodi/', args='True', contentType = 'episode')
- support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + 'category/anime-cartoni-animati/', contentType = 'episode')
+ support.menu(itemlist, 'Serie TV Archivio submenu', 'serietv', host + "/category/serie-tv-archive/", contentType = 'episode')
+ support.menu(itemlist, 'Ultimi Aggiornamenti submenu', 'serietv', host + '/aggiornamento-episodi/', args='True', contentType = 'episode')
+ support.menu(itemlist, 'Anime / Cartoni', 'serietv', host + '/category/anime-cartoni-animati/', contentType = 'episode')
support.menu(itemlist, 'Cerca...', 'search', host, contentType = 'episode')
## itemlist = filtertools.show_option(itemlist, item.channel, list_language, list_quality)
@@ -52,14 +52,7 @@ def mainlist(item):
autoplay.init(item.channel, list_servers, list_quality)
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'))
- )
+ support.channel_config(item, itemlist)
return itemlist
diff --git a/channels/mondolunatico2.py b/channels/mondolunatico2.py
index d08863a0..2f4b18ef 100644
--- a/channels/mondolunatico2.py
+++ b/channels/mondolunatico2.py
@@ -31,9 +31,9 @@ def mainlist(item):
support.menu(itemlist, 'Ultime Richieste Inserite bold', 'carousel_request', host, contentType='movie', args='movies')
support.menu(itemlist, 'Film Nelle Sale bold', 'carousel_cinema', host, contentType='movie', args='movies')
support.menu(itemlist, 'Film Ultimi Inseriti submenu', 'carousel_last', host, contentType='movie', args='movies')
- support.menu(itemlist, 'Film Top ImDb submenu', 'top_imdb', host + 'top-imdb/', contentType='movie', args='movies')
+ support.menu(itemlist, 'Film Top ImDb submenu', 'top_imdb', host + '/top-imdb/', contentType='movie', args='movies')
support.menu(itemlist, 'Serie TV', 'carousel_episodes', host, contentType='episode', args='tvshows')
- support.menu(itemlist, 'Serie TV Top ImDb submenu', 'top_serie', host + 'top-imdb/', contentType='episode', args='tvshows')
+ support.menu(itemlist, 'Serie TV Top ImDb submenu', 'top_serie', host + '/top-imdb/', contentType='episode', args='tvshows')
support.menu(itemlist, '[COLOR blue]Cerca...[/COLOR] bold', 'search', host)
autoplay.init(item.channel, list_servers, list_quality)
autoplay.show_option(item.channel, itemlist)
@@ -146,7 +146,7 @@ def top_serie(item):
def search(item, texto):
logger.info("[mondolunatico2.py] " + item.url + " search " + texto)
- item.url = host + "?s=" + texto
+ item.url = host + "/?s=" + texto
try:
return peliculas(item)
diff --git a/channels/playpornx.py b/channels/playpornx.py
index 54a45d57..8a03ef39 100644
--- a/channels/playpornx.py
+++ b/channels/playpornx.py
@@ -22,7 +22,7 @@ def mainlist(item):
itemlist.append(Item(channel=item.channel, title="Escenas", action="lista",
url = urlparse.urljoin(host, "category/xxx-scenes/")))
- itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host+'?s=',
+ itemlist.append(Item(channel=item.channel, title="Buscar", action="search", url=host + '/?s=',
thumbnail='https://s30.postimg.cc/pei7txpa9/buscar.png',
fanart='https://s30.postimg.cc/pei7txpa9/buscar.png'))
diff --git a/channels/siska.py b/channels/siska.py
index 92001dd9..b38151da 100644
--- a/channels/siska.py
+++ b/channels/siska.py
@@ -16,11 +16,11 @@ def mainlist(item):
logger.info()
itemlist = []
- itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "newVideo.php?language=en"))
- itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "MostViewed.php?views=month&language=en"))
- itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "Channel.php?language=en"))
+ itemlist.append( Item(channel=item.channel, title="Nuevos" , action="lista", url=host + "/newVideo.php?language=en"))
+ itemlist.append( Item(channel=item.channel, title="Mas vistos" , action="lista", url=host + "/MostViewed.php?views=month&language=en"))
+ itemlist.append( Item(channel=item.channel, title="Canal" , action="categorias", url=host + "/Channel.php?language=en"))
- itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "index.php?category=1&language=en"))
+ itemlist.append( Item(channel=item.channel, title="Categorias" , action="categorias", url=host + "/index.php?category=1&language=en"))
itemlist.append( Item(channel=item.channel, title="Buscar", action="search"))
return itemlist
@@ -28,7 +28,7 @@ def mainlist(item):
def search(item, texto):
logger.info()
texto = texto.replace(" ", "+")
- item.url = host + "search.php?q=%s&language=en&search=Search" % texto
+ item.url = host + "/search.php?q=%s&language=en&search=Search" % texto
try:
return lista(item)
except:
diff --git a/channels/sleazemovies.py b/channels/sleazemovies.py
index 1f7d8744..a3574ee5 100644
--- a/channels/sleazemovies.py
+++ b/channels/sleazemovies.py
@@ -71,7 +71,7 @@ def search(item, texto):
logger.info()
if texto != "":
texto = texto.replace(" ", "+")
- item.url = host + "?s=" + texto
+ item.url = host + "/?s=" + texto
item.extra = "busqueda"
try:
return list_all(item)
diff --git a/channels/x18hentai.py b/channels/x18hentai.py
index f6aa698b..db4b37ec 100644
--- a/channels/x18hentai.py
+++ b/channels/x18hentai.py
@@ -22,11 +22,11 @@ def mainlist(item):
itemlist.append(Item(channel=item.channel, title="Todos", action="todas", url=host, thumbnail='', fanart=''))
itemlist.append(
- Item(channel=item.channel, title="Sin Censura", action="todas", url=host + 'tag/sin-censura/', thumbnail='',
+ Item(channel=item.channel, title="Sin Censura", action="todas", url=host + '/tag/sin-censura/', thumbnail='',
fanart=''))
itemlist.append(
- Item(channel=item.channel, title="Estrenos", action="todas", url=host + 'category/estreno/', thumbnail='',
+ Item(channel=item.channel, title="Estrenos", action="todas", url=host + '/category/estreno/', thumbnail='',
fanart=''))
itemlist.append(
diff --git a/channels/xms.py b/channels/xms.py
index ad360a8c..969aae7e 100644
--- a/channels/xms.py
+++ b/channels/xms.py
@@ -45,20 +45,20 @@ def mainlist(item):
logger.info()
itemlist = []
- itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '?filtre=date&cat=0',
+ itemlist.append(Item(channel=__channel__, title="Últimas", url=host + '/?filtre=date&cat=0',
action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
thumbnail=thumbnail % '1'))
- itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '?display=extract&filtre=views',
+ itemlist.append(Item(channel=__channel__, title="Más Vistas", url=host + '/?display=extract&filtre=views',
action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
thumbnail=thumbnail % '2'))
- itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '?display=extract&filtre=rate',
+ itemlist.append(Item(channel=__channel__, title="Mejor Valoradas", url=host + '/?display=extract&filtre=rate',
action="peliculas", viewmode="movie_with_plot", viewcontent='movies',
thumbnail=thumbnail % '3'))
itemlist.append(Item(channel=__channel__, title="Categorías", action="categorias",
- url=host + 'categories/', viewmode="movie_with_plot", viewcontent='movies',
+ url=host + '/categories/', viewmode="movie_with_plot", viewcontent='movies',
thumbnail=thumbnail % '4'))
itemlist.append(Item(channel=__channel__, title="WebCam", action="webcamenu",
diff --git a/channels/xxxfreeinhd.py b/channels/xxxfreeinhd.py
index 89637648..b29172a4 100644
--- a/channels/xxxfreeinhd.py
+++ b/channels/xxxfreeinhd.py
@@ -29,7 +29,7 @@ def mainlist(item):
def search(item, texto):
logger.info()
texto = texto.replace(" ", "+")
- item.url = host + "search.php?q=%s&language=en&search=Search" % texto
+ item.url = host + "/search.php?q=%s&language=en&search=Search" % texto
try:
return lista(item)
except:
diff --git a/servers/deltabit.py b/servers/deltabit.py
index 34c76456..1e60f022 100644
--- a/servers/deltabit.py
+++ b/servers/deltabit.py
@@ -7,38 +7,3 @@ def test_video_exists(page_url):
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
return turbovid.get_video_url(page_url, premium, user, password, video_password, 'deltabit')
-
-##import time
-##import urllib
-##
-##from core import httptools
-##from core import scrapertools
-##from platformcode import logger
-##
-##
-##def test_video_exists(page_url):
-## logger.info("(page_url='%s')" % page_url)
-## data = httptools.downloadpage(page_url).data
-## if "Not Found" in data or "File Does not Exist" in data:
-## return False, "[deltabit] El fichero no existe o ha sido borrado"
-## return True, ""
-##
-##
-##def get_video_url(page_url, premium=False, user="", password="", video_password=""):
-#### logger.info("(deltabit page_url='%s')" % page_url)
-## video_urls = []
-## data = httptools.downloadpage(page_url).data
-## data = data.replace('"', "'")
-## page_url_post = scrapertools.find_single_match(data, "