diff --git a/plugin.video.alfa/channels/altadefinizione01.py b/plugin.video.alfa/channels/altadefinizione01.py
index db3db198..59077b13 100644
--- a/plugin.video.alfa/channels/altadefinizione01.py
+++ b/plugin.video.alfa/channels/altadefinizione01.py
@@ -42,14 +42,17 @@ def mainlist(item):
return itemlist
+
def categories(item):
support.log(item)
return support.scrape(item,'(.*?)',['url','title'],headers,'Altadefinizione01',patron_block='',action='peliculas',url_host=host)
+
def AZlist(item):
support.log()
return support.scrape(item,r'(.*?)<\/div>',action='peliculas_list',url_host=host)
+
def newest(categoria):
# import web_pdb; web_pdb.set_trace()
support.log(categoria)
diff --git a/plugin.video.alfa/channels/animevision.json b/plugin.video.alfa/channels/animevision.json
index 94702fdf..b80ef4c4 100644
--- a/plugin.video.alfa/channels/animevision.json
+++ b/plugin.video.alfa/channels/animevision.json
@@ -1,7 +1,7 @@
{
"id": "animevision",
"name": "Animevision",
- "active": true,
+ "active": false,
"adult": false,
"language": ["ita"],
"thumbnail": "http:\/\/animevision.it\/images\/logo.png",
diff --git a/plugin.video.alfa/channels/cineblog01.py b/plugin.video.alfa/channels/cineblog01.py
index d93edc7d..23e06e00 100644
--- a/plugin.video.alfa/channels/cineblog01.py
+++ b/plugin.video.alfa/channels/cineblog01.py
@@ -7,11 +7,10 @@ import re
import urlparse
from channels import autoplay, filtertools, support
-from core import scrapertoolsV2, httptools, servertools, tmdb
+from core import scrapertoolsV2, httptools, servertools
from core.item import Item
from lib import unshortenit
from platformcode import logger, config
-from channelselector import thumb
#impostati dinamicamente da getUrl()
host = ""
@@ -40,23 +39,20 @@ def mainlist(item):
# Main options
itemlist = []
- support.menu(itemlist, '[B]Film[/B]', 'peliculas', host)
- support.menu(itemlist, '[B] > HD [/B]', 'menu', host, args="Film HD Streaming")
- support.menu(itemlist, '[B] > Per genere [/B]', 'menu', host, args="Film per Genere")
- support.menu(itemlist, '[B] > Per anno [/B]', 'menu', host, args="Film per Anno")
- support.menu(itemlist, '[COLOR blue] > Cerca [/COLOR]', 'search', host)
+ support.menu(itemlist, 'Film bold', 'peliculas', host)
+ support.menu(itemlist, 'HD submenu', 'menu', host, args="Film HD Streaming")
+ support.menu(itemlist, 'Per genere submenu', 'menu', host, args="Film per Genere")
+ support.menu(itemlist, 'Per anno submenu', 'menu', host, args="Film per Anno")
+ support.menu(itemlist, 'Cerca submenu color blue', 'search', host)
- support.menu(itemlist, '[B]Serie TV[/B]', 'peliculas', host + '/serietv/', contentType='episode')
- support.menu(itemlist, '[B] > Per lettera[/B]', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Lettera")
- support.menu(itemlist, '[B] > Per genere[/B]', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Genere")
- support.menu(itemlist, '[B] > Per Anno[/B]', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Anno")
- support.menu(itemlist, '[COLOR blue] > Cerca [/COLOR]', 'search', host + '/serietv/', contentType='episode')
+ support.menu(itemlist, 'Serie TV bold', 'peliculas', host + '/serietv/', contentType='episode')
+ support.menu(itemlist, 'Per lettera submenu', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Lettera")
+ support.menu(itemlist, 'Per genere submenu', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Genere")
+ support.menu(itemlist, 'Per Anno submenu', 'menu', host + '/serietv/', contentType='episode', args="Serie-Tv per Anno")
+ support.menu(itemlist, 'Cerca submenu color blue', 'search', host + '/serietv/', contentType='episode')
autoplay.show_option(item.channel, itemlist)
- # auto thumb
- itemlist = thumb(itemlist)
-
return itemlist
diff --git a/plugin.video.alfa/channels/cinemastreaming.json b/plugin.video.alfa/channels/cinemastreaming.json
index a738a680..d229b77b 100644
--- a/plugin.video.alfa/channels/cinemastreaming.json
+++ b/plugin.video.alfa/channels/cinemastreaming.json
@@ -2,7 +2,7 @@
"id": "cinemastreaming",
"name": "Cinemastreaming",
"language": ["ita"],
- "active": true,
+ "active": false,
"adult": false,
"thumbnail": "https://www.telegramitalia.it/wp-content/uploads/2018/02/IMG_20180222_214809_805.jpg",
"banner": "https://www.telegramitalia.it/wp-content/uploads/2018/02/IMG_20180222_214809_805.jpg",
diff --git a/plugin.video.alfa/channels/dragonballforever.json b/plugin.video.alfa/channels/dragonballforever.json
index d62d2df5..8ea3fd1c 100644
--- a/plugin.video.alfa/channels/dragonballforever.json
+++ b/plugin.video.alfa/channels/dragonballforever.json
@@ -2,7 +2,7 @@
"id": "dragonballforever",
"name": "Dragonball Forever",
"language": ["ita"],
- "active": true,
+ "active": false,
"adult": false,
"thumbnail": "https://www.dragonballforever.it/wp-content/uploads/2017/02/header_dbf-1.jpg",
"banner": "https://www.dragonballforever.it/wp-content/uploads/2017/02/header_dbf-1.jpg",
diff --git a/plugin.video.alfa/channels/filmperevolvere.json b/plugin.video.alfa/channels/filmperevolvere.json
index 04918db5..843e7e86 100644
--- a/plugin.video.alfa/channels/filmperevolvere.json
+++ b/plugin.video.alfa/channels/filmperevolvere.json
@@ -1,7 +1,7 @@
{
"id": "filmperevolvere",
"name": "FilmPerEvolvere",
- "active": true,
+ "active": false,
"adult": false,
"language": ["ita"],
"thumbnail": "https:\/\/filmperevolvere.it\/wp-content\/uploads\/2017\/06\/cropped-coversito.jpg",
diff --git a/plugin.video.alfa/channels/filmsenzalimiti.json b/plugin.video.alfa/channels/filmsenzalimiti.json
index 1c0fb9f4..698e2f2a 100644
--- a/plugin.video.alfa/channels/filmsenzalimiti.json
+++ b/plugin.video.alfa/channels/filmsenzalimiti.json
@@ -1,7 +1,7 @@
{
"id": "filmsenzalimiti",
"name": "Filmsenzalimiti",
- "active": true,
+ "active": false,
"adult": false,
"language": ["ita"],
"thumbnail": "filmsenzalimiti.png",
diff --git a/plugin.video.alfa/channels/filmsenzalimiticc.json b/plugin.video.alfa/channels/filmsenzalimiticc.json
index 5e3f3671..2bbe1ec3 100644
--- a/plugin.video.alfa/channels/filmsenzalimiticc.json
+++ b/plugin.video.alfa/channels/filmsenzalimiticc.json
@@ -1,7 +1,7 @@
{
"id": "filmsenzalimiticc",
"name": "Filmsenzalimiti CC",
- "active": true,
+ "active": false,
"adult": false,
"language": ["ita"],
"thumbnail": "filmsenzalimiticc.png",
diff --git a/plugin.video.alfa/channels/filmstreaminggratis.json b/plugin.video.alfa/channels/filmstreaminggratis.json
deleted file mode 100644
index 1ba56ad4..00000000
--- a/plugin.video.alfa/channels/filmstreaminggratis.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
- "id": "filmstreaminggratis",
- "name": "FilmStreamingGratis",
- "active": true,
- "adult": false,
- "language": ["ita"],
- "thumbnail": "http:\/\/www.filmstreaminggratis.org\/wp-content\/uploads\/2016\/10\/filmstreaminglogo.png",
- "bannermenu": "http:\/\/www.filmstreaminggratis.org\/wp-content\/uploads\/2016\/10\/filmstreaminglogo.png",
- "categories": ["movie"],
- "settings": [
- {
- "id": "include_in_global_search",
- "type": "bool",
- "label": "Includi ricerca globale",
- "default": true,
- "enabled": true,
- "visible": true
- },
- {
- "id": "include_in_newest_peliculas",
- "type": "bool",
- "label": "Includi in Novità - Film",
- "default": true,
- "enabled": true,
- "visible": true
- },
- {
- "id": "include_in_newest_italiano",
- "type": "bool",
- "label": "Includi in Novità - Italiano",
- "default": true,
- "enabled": true,
- "visible": true
- },
- {
- "id": "comprueba_enlaces",
- "type": "bool",
- "label": "Verifica se i link esistono",
- "default": false,
- "enabled": true,
- "visible": true
- },
- {
- "id": "comprueba_enlaces_num",
- "type": "list",
- "label": "Numero di link da verificare",
- "default": 1,
- "enabled": true,
- "visible": "eq(-1,true)",
- "lvalues": [ "3", "5", "10", "15" ]
- },
- {
- "id": "filter_languages",
- "type": "list",
- "label": "Mostra link in lingua...",
- "default": 0,
- "enabled": true,
- "visible": true,
- "lvalues": ["Non filtrare","IT"]
- }
- ]
-}
diff --git a/plugin.video.alfa/channels/filmstreaminggratis.py b/plugin.video.alfa/channels/filmstreaminggratis.py
deleted file mode 100644
index fe4c8d27..00000000
--- a/plugin.video.alfa/channels/filmstreaminggratis.py
+++ /dev/null
@@ -1,227 +0,0 @@
-# -*- coding: utf-8 -*-
-# ------------------------------------------------------------
-# Ringraziamo Icarus crew
-# Canale per filmstreaminggratis
-# ----------------------------------------------------------
-
-import re
-
-from channels import autoplay
-from channels import filtertools, support
-from core import scrapertools, servertools, httptools
-from core.item import Item
-from core import tmdb
-from platformcode import logger, config
-
-IDIOMAS = {'Italiano': 'IT'}
-list_language = IDIOMAS.values()
-list_servers = ['openload', 'thevideome', 'okru', 'mailru']
-list_quality = ['default']
-
-__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', 'filmstreaminggratis')
-__comprueba_enlaces_num__ = config.get_setting('comprueba_enlaces_num', 'filmstreaminggratis')
-
-host = "https://www.filmstreaminggratis.org"
-
-
-def mainlist(item):
- logger.info("kod.filmstreaminggratis mainlist")
- logger.info("[FilmStreamingGratis.py]==> mainlist")
- itemlist = [Item(channel=item.channel,
- action="ultimifilm",
- title=support.color("Ultimi Film", "azure"),
- 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,
- action="categorie",
- title=support.color("Categorie", "azure"),
- 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,
- action="search",
- title=support.color("Cerca film ...", "yellow"),
- extra="movie",
- thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")]
-
- autoplay.show_option(item.channel, itemlist)
-
- return itemlist
-
-
-
-def newest(categoria):
- logger.info("[FilmStreamingGratis.py]==> newest" + categoria)
- itemlist = []
- item = Item()
- try:
- if categoria == "film":
- item.url = host
- item.action = "ultimifilm"
- itemlist = ultimifilm(item)
-
- if itemlist[-1].action == "ultimifilm":
- itemlist.pop()
-
- # Continua la ricerca in caso di errore
- except:
- import sys
- for line in sys.exc_info():
- logger.error("{0}".format(line))
- return []
-
- return itemlist
-
-
-
-def search(item, texto):
- logger.info("[FilmStreamingGratis.py]==> search")
- item.url = host + "/?s=" + texto
- try:
- return loadfilms(item)
- # Continua la ricerca in caso di errore
- except:
- import sys
- for line in sys.exc_info():
- logger.error("%s" % line)
- return []
-
-
-
-def ultimifilm(item):
- logger.info("[FilmStreamingGratis.py]==> ultimifilm")
- itemlist = []
-
- data = httptools.downloadpage(item.url).data
- blocco = scrapertools.get_match(data, '(.*?)
')
- patron = ''
- matches = re.compile(patron, re.DOTALL).findall(blocco)
-
- for scrapedurl, scrapedtitle in matches:
- scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
- itemlist.append(
- Item(channel=item.channel,
- action="findvideos",
- contentType="movie",
- title=scrapedtitle,
- fulltitle=scrapedtitle,
- url=scrapedurl,
- extra="movie",
- thumbnail=item.thumbnail,
- folder=True))
-
- tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- return itemlist
-
-
-
-def categorie(item):
- logger.info("[FilmStreamingGratis.py]==> categorie")
- itemlist = []
-
- data = httptools.downloadpage(item.url).data
- blocco = scrapertools.get_match(data, '')
- patron = '([^<]+)'
- matches = re.compile(patron, re.DOTALL).findall(blocco)
-
- for scrapedurl, scrapedtitle in matches:
- if "Serie TV" not in scrapedtitle: # Il sito non ha una buona gestione per le Serie TV
- itemlist.append(
- Item(channel=item.channel,
- action="loadfilms",
- title=scrapedtitle,
- url=scrapedurl,
- extra="movie",
- thumbnail=item.thumbnail,
- folder=True))
-
- return itemlist
-
-
-
-def loadfilms(item):
- logger.info("[FilmStreamingGratis.py]==> loadfilms")
- itemlist = []
-
- data = httptools.downloadpage(item.url).data
-
- patron = '[^>]+>[^>]+>[^>]+><.*?data-src="([^"]+)"'
- patron += '[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s+?([^<]+)'
- matches = re.compile(patron, re.DOTALL).findall(data)
-
- for scrapedurl, scrapedtitle, scrapedthumbnail, scrapedplot in matches:
- scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle)
- scrapedplot = scrapertools.decodeHtmlentities(scrapedplot.strip())
- itemlist.append(
- Item(channel=item.channel,
- action="findvideos",
- title=scrapedtitle,
- fulltitle=scrapedtitle,
- url=scrapedurl,
- plot=scrapedplot,
- thumbnail=scrapedthumbnail,
- folder=True))
-
- patronvideos = ''
- matches = re.compile(patronvideos, re.DOTALL).findall(data)
-
- if len(matches) > 0:
- scrapedurl = matches[0]
- itemlist.append(
- Item(channel=item.channel,
- action="loadfilms",
- 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",
- folder=True))
-
- tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
- return itemlist
-
-
-
-def findvideos(item):
- logger.info("[FilmStreamingGratis.py]==> findvideos")
-
- data = httptools.downloadpage(item.url).data
-
- if '%s/go/' % host in data:
- urls = scrapertools.find_multiple_matches(data, r'%s/go/[0-9\-]{6}' % host) # Multiple matches con go/9575-2/
- data = ""
- for url in urls:
- data += httptools.downloadpage(url).url + '\n'
-
- itemlist = servertools.find_video_items(data=data)
-
- for videoitem in itemlist:
- server = re.sub(r'[-\[\]\s]+', '', videoitem.title)
- videoitem.title = "".join(["[%s] " % support.color(server.capitalize(), 'orange'), item.title])
- videoitem.fulltitle = item.fulltitle
- videoitem.show = item.show
- videoitem.thumbnail = item.thumbnail
- 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)
-
- if item.contentType != 'episode':
- if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
- itemlist.append(
- Item(channel=item.channel, title='[COLOR yellow][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url,
- action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
-
- return itemlist
-
-
diff --git a/plugin.video.alfa/channels/filmzstreaming.json b/plugin.video.alfa/channels/filmzstreaming.json
index d557e55a..fb0628d7 100644
--- a/plugin.video.alfa/channels/filmzstreaming.json
+++ b/plugin.video.alfa/channels/filmzstreaming.json
@@ -1,7 +1,7 @@
{
"id": "filmzstreaming",
"name": "Filmzstreaming",
- "active": true,
+ "active": false,
"adult": false,
"language": ["ita"],
"thumbnail": "https:\/\/filmzstreaming.pw\/wp-content\/uploads\/2017\/10\/FilmZStreaming-2.png",
diff --git a/plugin.video.alfa/channels/filmzstreaming.py b/plugin.video.alfa/channels/filmzstreaming.py
index ce21d39f..37bdea17 100644
--- a/plugin.video.alfa/channels/filmzstreaming.py
+++ b/plugin.video.alfa/channels/filmzstreaming.py
@@ -14,7 +14,7 @@ from core import tmdb
-host = "https://filmzstreaming.is"
+host = "https://filmzstreaming.blue"
IDIOMAS = {'Italiano': 'IT'}
list_language = IDIOMAS.values()
@@ -66,11 +66,11 @@ def peliculas(item):
logger.info("kod.filmzstreaming peliculas")
itemlist = []
- # Carica la pagina
+ # Carica la pagina
data = httptools.downloadpage(item.url, headers=headers).data
blocco = scrapertools.find_single_match(data, '(.*?)