From c212fa482c5d13315a58e542eb835cee75751f51 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Sun, 31 Mar 2019 19:48:28 +0200 Subject: [PATCH] disable problematic channels, to fix later --- .../channels/altadefinizione01.py | 3 + plugin.video.alfa/channels/animevision.json | 2 +- plugin.video.alfa/channels/cineblog01.py | 26 +- .../channels/cinemastreaming.json | 2 +- .../channels/dragonballforever.json | 2 +- .../channels/filmperevolvere.json | 2 +- .../channels/filmsenzalimiti.json | 2 +- .../channels/filmsenzalimiticc.json | 2 +- .../channels/filmstreaminggratis.json | 62 ----- .../channels/filmstreaminggratis.py | 227 ------------------ .../channels/filmzstreaming.json | 2 +- plugin.video.alfa/channels/filmzstreaming.py | 6 +- .../channels/ilgeniodellostreaming.json | 2 +- plugin.video.alfa/channels/italiaserie.json | 2 +- plugin.video.alfa/channels/itastreaming.json | 2 +- plugin.video.alfa/channels/marapcana.json | 2 +- plugin.video.alfa/channels/mmaiptv.json | 2 +- .../channels/mondolunatico_new.json | 2 +- plugin.video.alfa/channels/seriehd.json | 2 +- plugin.video.alfa/channels/serietvsubita.json | 2 +- plugin.video.alfa/channels/serietvu.json | 2 +- plugin.video.alfa/channels/streaminghd.json | 2 +- plugin.video.alfa/channels/streaminghd.py | 2 +- plugin.video.alfa/channels/support.py | 5 +- plugin.video.alfa/channels/toonitalia.json | 2 +- plugin.video.alfa/channels/tvmoviedb.py | 1 + plugin.video.alfa/channels/umsfunsub.json | 2 +- plugin.video.alfa/channels/vedohd.py | 73 ++---- 28 files changed, 56 insertions(+), 387 deletions(-) delete mode 100644 plugin.video.alfa/channels/filmstreaminggratis.json delete mode 100644 plugin.video.alfa/channels/filmstreaminggratis.py 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 = '

    ' - 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, '(.*?)
    ') - # Estrae i contenuti + # Estrae i contenuti patron = r'

    (.*?)

    ' matches = re.compile(patron, re.DOTALL).findall(blocco) diff --git a/plugin.video.alfa/channels/ilgeniodellostreaming.json b/plugin.video.alfa/channels/ilgeniodellostreaming.json index 1d1afbcc..ea628e93 100644 --- a/plugin.video.alfa/channels/ilgeniodellostreaming.json +++ b/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", diff --git a/plugin.video.alfa/channels/italiaserie.json b/plugin.video.alfa/channels/italiaserie.json index ba094b25..ce9d7686 100644 --- a/plugin.video.alfa/channels/italiaserie.json +++ b/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", diff --git a/plugin.video.alfa/channels/itastreaming.json b/plugin.video.alfa/channels/itastreaming.json index 9339c791..f34077c2 100644 --- a/plugin.video.alfa/channels/itastreaming.json +++ b/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", diff --git a/plugin.video.alfa/channels/marapcana.json b/plugin.video.alfa/channels/marapcana.json index 6f9ca3b1..a662807b 100644 --- a/plugin.video.alfa/channels/marapcana.json +++ b/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", diff --git a/plugin.video.alfa/channels/mmaiptv.json b/plugin.video.alfa/channels/mmaiptv.json index 8e617072..2bc7ff30 100644 --- a/plugin.video.alfa/channels/mmaiptv.json +++ b/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", diff --git a/plugin.video.alfa/channels/mondolunatico_new.json b/plugin.video.alfa/channels/mondolunatico_new.json index 77449bb2..b59320a0 100644 --- a/plugin.video.alfa/channels/mondolunatico_new.json +++ b/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", diff --git a/plugin.video.alfa/channels/seriehd.json b/plugin.video.alfa/channels/seriehd.json index e2a505ec..9af8f726 100644 --- a/plugin.video.alfa/channels/seriehd.json +++ b/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", diff --git a/plugin.video.alfa/channels/serietvsubita.json b/plugin.video.alfa/channels/serietvsubita.json index a031e8b8..3cf95d59 100644 --- a/plugin.video.alfa/channels/serietvsubita.json +++ b/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", diff --git a/plugin.video.alfa/channels/serietvu.json b/plugin.video.alfa/channels/serietvu.json index 51cb4aab..bb53073e 100644 --- a/plugin.video.alfa/channels/serietvu.json +++ b/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", diff --git a/plugin.video.alfa/channels/streaminghd.json b/plugin.video.alfa/channels/streaminghd.json index 3fbac06b..d0d9a473 100644 --- a/plugin.video.alfa/channels/streaminghd.json +++ b/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", diff --git a/plugin.video.alfa/channels/streaminghd.py b/plugin.video.alfa/channels/streaminghd.py index d88c4c1a..5b66ecd5 100644 --- a/plugin.video.alfa/channels/streaminghd.py +++ b/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 diff --git a/plugin.video.alfa/channels/support.py b/plugin.video.alfa/channels/support.py index f4c6abfd..07987285 100644 --- a/plugin.video.alfa/channels/support.py +++ b/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.*?)") + data = scrapertoolsV2.get_match(data.replace('\n', ''), r"(eval\s?\(function\(p,a,c,k,e,d.*?)") 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 diff --git a/plugin.video.alfa/channels/toonitalia.json b/plugin.video.alfa/channels/toonitalia.json index c1874913..c0c1a597 100644 --- a/plugin.video.alfa/channels/toonitalia.json +++ b/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", diff --git a/plugin.video.alfa/channels/tvmoviedb.py b/plugin.video.alfa/channels/tvmoviedb.py index b3625080..2ad24ca5 100644 --- a/plugin.video.alfa/channels/tvmoviedb.py +++ b/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/" diff --git a/plugin.video.alfa/channels/umsfunsub.json b/plugin.video.alfa/channels/umsfunsub.json index 21ce0832..c0f7e38e 100644 --- a/plugin.video.alfa/channels/umsfunsub.json +++ b/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", diff --git a/plugin.video.alfa/channels/vedohd.py b/plugin.video.alfa/channels/vedohd.py index 4f96c650..257526f3 100644 --- a/plugin.video.alfa/channels/vedohd.py +++ b/plugin.video.alfa/channels/vedohd.py @@ -6,22 +6,20 @@ import re import urlparse -from channels import autoplay, filtertools, support -from core import scrapertoolsV2, httptools, servertools, tmdb +from channels import autoplay, support +from core import scrapertoolsV2, httptools, servertools from core.item import Item -from lib import unshortenit -from platformcode import logger, config +from platformcode import logger 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'