disable problematic channels, to fix later

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,'<li><a href="([^"]+)">(.*?)</a></li>',['url','title'],headers,'Altadefinizione01',patron_block='<ul class="kategori_list">(.*?)</ul>',action='peliculas',url_host=host)
 
+
 def AZlist(item):
     support.log()
     return support.scrape(item,r'<a title="([^"]+)" href="([^"]+)"',['title','url'],headers,patron_block=r'<div class="movies-letter">(.*?)<\/div>',action='peliculas_list',url_host=host)
 
+
 def newest(categoria):
     # import web_pdb; web_pdb.set_trace()
     support.log(categoria)

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",

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, 'Film bold', 'peliculas', host)
-    support.menu(itemlist, '[B] > HD [/B]', 'menu', host, args="Film HD Streaming")
+    support.menu(itemlist, 'HD submenu', 'menu', host, args="Film HD Streaming")
-    support.menu(itemlist, '[B] > Per genere [/B]', 'menu', host, args="Film per Genere")
+    support.menu(itemlist, 'Per genere submenu', 'menu', host, args="Film per Genere")
-    support.menu(itemlist, '[B] > Per anno [/B]', 'menu', host, args="Film per Anno")
+    support.menu(itemlist, 'Per anno submenu', 'menu', host, args="Film per Anno")
-    support.menu(itemlist, '[COLOR blue] > Cerca [/COLOR]', 'search', host)
+    support.menu(itemlist, 'Cerca submenu color blue', 'search', host)
 
-    support.menu(itemlist, '[B]Serie TV[/B]', 'peliculas', host + '/serietv/', contentType='episode')
+    support.menu(itemlist, 'Serie TV bold', '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, 'Per lettera submenu', '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, 'Per genere submenu', '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, 'Per Anno submenu', '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, 'Cerca submenu color blue', 'search', host + '/serietv/', contentType='episode')
     
     autoplay.show_option(item.channel, itemlist)
 
-    # auto thumb
-    itemlist = thumb(itemlist)
-
     return itemlist
 
 

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",

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",

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",

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",

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",

plugin.video.alfa/channels/filmstreaminggratis.json

@@ -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"]
-        }
-    ]
-}

plugin.video.alfa/channels/filmstreaminggratis.py

@@ -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, '<div class="es-carousel">(.*?)</div></li></ul>')
-    patron = '<h5><a href="([^"]+)"[^>]+>([^<]+)</a></h5>'
-    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, '<div class="list styled custom-list"><ul>(.*?)</ul></div>')
-    patron = '<li><a href="([^"]+)" title="[^"]+" >([^<]+)</a></li>'
-    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 = '<h2 class="post-title"><a href="([^"]+)" title="[^"]+">'
-    patron += '([^<]+)</a></h2>[^>]+>[^>]+>[^>]+><.*?data-src="([^"]+)"'
-    patron += '[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s+?([^<]+)</div>'
-    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 = '<link rel="next" href="([^"]+)"\s*/>'
-    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
-
-

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",

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()

plugin.video.alfa/channels/ilgeniodellostreaming.json

@@ -1,7 +1,7 @@
 {
     "id": "ilgeniodellostreaming",
     "name": "IlGenioDelloStreaming",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "https://i.imgur.com/Nsa81r0.png",

plugin.video.alfa/channels/italiaserie.json

@@ -1,7 +1,7 @@
 {
     "id": "italiaserie",
     "name": "Italia Serie",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/italiaserie.png",

plugin.video.alfa/channels/itastreaming.json

@@ -1,7 +1,7 @@
 {
     "id": "itastreaming",
     "name": "ItaStreaming",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/itastreaming.png",

plugin.video.alfa/channels/marapcana.json

@@ -2,7 +2,7 @@
 	"id": "marapcana",
 	"name": "Marapcana",
 	"language": ["ita"],
-	"active": true,
+	"active": false,
 	"adult": false,
 	"thumbnail": "http://marapcana.site/maraplogo7.png",
 	"banner": "http://marapcana.site/maraplogo7.png",

plugin.video.alfa/channels/mmaiptv.json

@@ -1,7 +1,7 @@
 {
     "id": "mmaiptv",
     "name": "MmaIptv",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "https:\/\/imageshack.com\/a\/img924\/5981\/XN1yc1.png",

plugin.video.alfa/channels/mondolunatico_new.json

@@ -2,7 +2,7 @@
 	"id": "mondolunatico_new",
 	"name": "Mondo Lunatico New",
 	"language": ["ita"],
-	"active": true,
+	"active": false,
 	"adult": false,
 	"thumbnail": "http://mondolunatico.org/stream/wp-content/uploads/2016/10/dooplay1-2.png",
 	"banner": "http://mondolunatico.org/stream/wp-content/uploads/2016/10/dooplay1-2.png",

plugin.video.alfa/channels/seriehd.json

@@ -1,7 +1,7 @@
 {
     "id": "seriehd",
     "name": "SerieHD",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/seriehd.png",

plugin.video.alfa/channels/serietvsubita.json

@@ -2,7 +2,7 @@
 	"id": "serietvsubita",
 	"name": "Serie TV Sub ITA",
 	"language": ["ita"],
-	"active": true,
+	"active": false,
 	"adult": false,
 	"thumbnail": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/serietvsubita.png",
 	"banner": "https://raw.githubusercontent.com/Zanzibar82/images/master/posters/serietvsubita.png",

plugin.video.alfa/channels/serietvu.json

@@ -2,7 +2,7 @@
 	"id": "serietvu",
 	"name": "SerieTVU",
 	"language": ["ita"],
-	"active": true,
+	"active": false,
 	"adult": false,
 	"thumbnail": "http://www.serietvu.com/wp-content/themes/gurarjbar/images/logo.png",
 	"banner": "http://www.serietvu.com/wp-content/themes/gurarjbar/images/logo.png",

plugin.video.alfa/channels/streaminghd.json

@@ -2,7 +2,7 @@
 	"id": "streaminghd",
 	"name": "Streaming HD*",
 	"language": ["ita"],
-	"active": true,
+	"active": false,
 	"adult": false,
 	"thumbnail": "https://www.visions.tn/wp-content/uploads/2015/11/large_news_HD-STREAMING.jpg",
 	"banner": "https://www.visions.tn/wp-content/uploads/2015/11/large_news_HD-STREAMING.jpg",

plugin.video.alfa/channels/streaminghd.py

@@ -13,7 +13,7 @@ import re
 __channel__ = "streaminghd"
 listtools.__channel__ = __channel__
 
-host = "https://streaminghd.online"
+host = "https://streaminghd.blog"
 
 headers = [['User-Agent', 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:58.0) Gecko/20100101 Firefox/58.0']] ## <-- user agent per poter accedere
 

plugin.video.alfa/channels/support.py

@@ -253,11 +253,11 @@ def swzz_get_url(item):
                 from lib import jsunpack
 
                 try:
-                    data = scrapertoolsV2.get_match(data, r"(eval\s?\(function\(p,a,c,k,e,d.*?)</script>")
+                    data = scrapertoolsV2.get_match(data.replace('\n', ''), r"(eval\s?\(function\(p,a,c,k,e,d.*?)</script>")
                     data = jsunpack.unpack(data)
 
                     logger.debug("##### play /link/ unpack ##\n%s\n##" % data)
-                except IndexError:
+                except:
                     logger.debug("##### The content is yet unpacked ##\n%s\n##" % data)
 
                 data = scrapertoolsV2.find_single_match(data, r'var link(?:\s)?=(?:\s)?"([^"]+)";')
@@ -387,6 +387,7 @@ def server(item, data='', headers=''):
 
     return itemlist
 
+
 def log(stringa1="", stringa2="", stringa3="", stringa4="", stringa5=""):
     frame = inspect.stack()[1]
     filename = frame[0].f_code.co_filename

plugin.video.alfa/channels/toonitalia.json

@@ -1,7 +1,7 @@
 {
     "id": "toonitalia",
     "name": "ToonItalia",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "https://toonitalia.org/wp-content/themes/seos-video/images/header.png",

plugin.video.alfa/channels/tvmoviedb.py

@@ -42,6 +42,7 @@ langs = ['auto', 'de-de', 'fr-fr', 'pt-pt', 'it-it', 'es-MX', 'ca-es', 'en', 'es
 langi = langs[config.get_setting('imdb', "tvmoviedb")]
 if langi == 'auto':
     langi = def_lang
+
 adult_mal = config.get_setting('adult_mal', "tvmoviedb")
 mal_ck = "MzE1MDQ2cGQ5N2llYTY4Z2xwbGVzZjFzbTY="
 images_predef = "https://raw.githubusercontent.com/master-1970/resources/master/images/genres/"

plugin.video.alfa/channels/umsfunsub.json

@@ -1,7 +1,7 @@
 {
     "id": "umsfunsub",
     "name": "UMSFunSub",
-    "active": true,
+    "active": false,
     "adult": false,
     "language": ["ita"],
     "thumbnail": "http:\/\/www.hiumi.it\/public\/forum\/styles\/art_deluxe\/imageset\/logo.png",

plugin.video.alfa/channels/vedohd.py

@@ -6,22 +6,20 @@
 import re
 import urlparse
 
-from channels import autoplay, filtertools, support
+from channels import autoplay, 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
-from platformcode import logger, config
 from channelselector import thumb
 
-#impostati dinamicamente da getUrl()
-host = ""
 headers = ""
 
 permUrl = httptools.downloadpage('https://www.cb01.uno/', follow_redirects=False).headers
 cb01Url = 'https://www.'+permUrl['location'].replace('https://www.google.it/search?q=site:', '')
 data = httptools.downloadpage(cb01Url).data
-host = scrapertoolsV2.get_match(data, r'<a class=mega-menu-link href=(https://vedohd[^/]+)')+'/'
+host = scrapertoolsV2.get_match(data, r'<a class="?mega-menu-link"? href=(https://vedohd[^/"]+)')+'/'
-if host=="":  # in caso cb01 cambi, si spera di riuscire ad accedere da questo URL
+
+if 'https' not in host:  # in caso cb01 cambi, si spera di riuscire ad accedere da questo URL
     host = "https://vedohd.pw/"
 headers = [['Referer', host]]
 
@@ -40,43 +38,16 @@ def mainlist(item):
     autoplay.init(item.channel, list_servers, list_quality)
 
     # Main options
-    itemlist = [Item(channel=item.channel,
+    itemlist = []
-                     action="peliculas",
+    support.menu(itemlist, 'Film', "peliculas", host+"film-hd")
-                     title="Film",
+    support.menu(itemlist, 'I più votati', "peliculas", host+"ratings/?get=movies")
-                     url=host+"film-hd",
+    support.menu(itemlist, 'I più popolari', "peliculas", host+"trending/?get=movies")
-                     contentType="movie"),
+    support.menu(itemlist, 'Generi', "generos", host)
-                Item(channel=item.channel,
+    support.menu(itemlist, 'Anno', "year", host)
-                     action="peliculas",
+    support.menu(itemlist, 'Cerca', "search", host)
-                     title="I più votati",
-                     url=host + "ratings/?get=movies",
-                     contentType="movie"),
-                Item(channel=item.channel,
-                     action="peliculas",
-                     title="I più popolari",
-                     url=host + "trending/?get=movies",
-                     contentType="movie"),
-                Item(channel=item.channel,
-                     action="generos",
-                     title="Generi",
-                     url=host,
-                     contentType="movie"),
-                Item(channel=item.channel,
-                     action="year",
-                     title="Anno",
-                     url=host,
-                     contentType="movie"),
-                Item(channel=item.channel,
-                     action="search",
-                     title="Cerca",
-                     url=host,
-                     contentType="movie")
-                ]
 
     autoplay.show_option(item.channel, itemlist)
 
-    # auto thumb
-    itemlist=thumb(itemlist) 
-
     return itemlist
 
 
@@ -133,21 +104,7 @@ def year(item):
 
 def play(item):
     logger.info("[vedohd.py] play")
-    itemlist = []
 
     data = support.swzz_get_url(item)
 
-    try:
+    return support.server(item, data, headers)
-        itemlist = servertools.find_video_items(data=data)
-
-        for videoitem in itemlist:
-            videoitem.title = item.show
-            videoitem.fulltitle = item.fulltitle
-            videoitem.show = item.show
-            videoitem.thumbnail = item.thumbnail
-            videoitem.contentType = item.contentType
-            videoitem.channel = item.channel
-    except AttributeError:
-        logger.error("vcrypt data doesn't contain expected URL")
-
-    return itemlist