From 0b76972c42bb18303167a85d5978b38ed95f3255 Mon Sep 17 00:00:00 2001 From: mac12m99 Date: Mon, 18 Nov 2019 14:08:43 +0100 Subject: [PATCH] pulizia canali 2 --- channels.json | 15 +- channels/filmsenzalimiti.json | 70 -------- channels/filmsenzalimiti.py | 222 ------------------------- channels/itastreaming.json | 36 ----- channels/itastreaming.py | 295 ---------------------------------- 5 files changed, 5 insertions(+), 633 deletions(-) delete mode 100644 channels/filmsenzalimiti.json delete mode 100644 channels/filmsenzalimiti.py delete mode 100644 channels/itastreaming.json delete mode 100644 channels/itastreaming.py diff --git a/channels.json b/channels.json index c04cdcfa..b8326f3d 100644 --- a/channels.json +++ b/channels.json @@ -21,20 +21,15 @@ "filmgratis": "https://www.filmaltadefinizione.net", "filmigratis": "https://filmigratis.org", "filmpertutti": "https://www.filmpertutti.link", - "filmsenzalimiti": "https://filmsenzalimiti.best", - "filmsenzalimiticc": "https://www.filmsenzalimiti.press", + "filmsenzalimiticc": "https://www.filmsenzalimiti.press", "filmstreaming01": "https://filmstreaming01.com", - "guardafilm": "http://www.guardafilm.top", - "guardarefilm": "https://www.guardarefilm.red", + "guardarefilm": "https://www.guardarefilm.red", "guardaserie_stream": "https://guardaserie.co", - "guardaseriecc": "https://guardaserie.site", - "guardaserieclick": "https://www.guardaserie.media", - "guardogratis": "https://guardogratis.net", - "ilgeniodellostreaming": "https://igds.red", + "guardaserieclick": "https://www.guardaserie.media", + "ilgeniodellostreaming": "https://igds.red", "italiafilm": "https://www.italia-film.pw", "italiaserie": "https://italiaserie.org", - "itastreaming": "https://itastreaming.film", - "mondolunatico": "http://mondolunatico.org", + "mondolunatico": "http://mondolunatico.org", "mondolunatico2": "https://mondolunatico.org:443/stream", "mondoserietv": "https://mondoserietv.com", "piratestreaming": "https://www.piratestreaming.media", diff --git a/channels/filmsenzalimiti.json b/channels/filmsenzalimiti.json deleted file mode 100644 index db57b0c2..00000000 --- a/channels/filmsenzalimiti.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "id": "filmsenzalimiti", - "name": "Filmsenzalimiti", - "active": false, - "adult": false, - "language": ["ita"], - "thumbnail": "filmsenzalimiti.png", - "banner": "filmsenzalimiti.png", - "categories": ["movie","tvshow"], - "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_series", - "type": "bool", - "label": "Includi in Novità - Serie TV", - "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": "checklinks", - "type": "bool", - "label": "Verifica se i link esistono", - "default": false, - "enabled": true, - "visible": true - }, - { - "id": "checklinks_number", - "type": "list", - "label": "Numero de link da verificare", - "default": 1, - "enabled": true, - "visible": "eq(-1,true)", - "lvalues": [ "1", "2", "5", "10" ] - }, - { - "id": "filter_languages", - "type": "list", - "label": "Mostra link in lingua...", - "default": 0, - "enabled": true, - "visible": true, - "lvalues": ["Non filtrare","IT"] - } - ] -} diff --git a/channels/filmsenzalimiti.py b/channels/filmsenzalimiti.py deleted file mode 100644 index 8d664e37..00000000 --- a/channels/filmsenzalimiti.py +++ /dev/null @@ -1,222 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------ -# Canale per Filmsenzalimiti -# ------------------------------------------------------------ -""" - Trasformate le sole def per support.menu e support.scrape - da non inviare nel test. - Test solo a trasformazione completa - -""" -import re - -from core import scrapertools, servertools, httptools, support -from core.item import Item -from platformcode import config -from platformcode import logger -from specials import autoplay - -__channel__ = 'filmsenzalimiti' -host = config.get_channel_url(__channel__) - -IDIOMAS = {'Italiano': 'IT'} -list_language = IDIOMAS.values() -list_servers = ['verystream', 'openload', 'streamango', 'vidoza', 'okru'] -list_quality = ['1080p', '720p', '480p', '360'] - -checklinks = config.get_setting('checklinks', 'filmsenzalimiti') -checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiti') - -headers = [['Referer', host]] - - -def mainlist(item): - logger.info('[filmsenzalimiti.py] mainlist') - - autoplay.init(item.channel, list_servers, list_quality) - - itemlist = [Item(channel=item.channel, - action='video', - title='Film', - contentType='movie', - url=host, - thumbnail= ''), - Item(channel=item.channel, - action='video', - title='Novità', - contentType='movie', - url=host + '/category/nuove-uscite', - thumbnail=''), - Item(channel=item.channel, - action='video', - title='In Sala', - contentType='movie', - url=host + '/category/in-sala', - thumbnail=''), - Item(channel=item.channel, - action='video', - title='Sottotitolati', - contentType='movie', - url=host + '/category/sub-ita', - thumbnail=''), - Item(channel=item.channel, - action='sottomenu', - title='[B]Categoria[/B]', - contentType='movie', - url=host, - thumbnail=''), - Item(channel=item.channel, - action='search', - extra='tvshow', - title='[B]Cerca...[/B]', - contentType='movie', - thumbnail='')] - - autoplay.show_option(item.channel, itemlist) - - return itemlist - - -def search(item, texto): - logger.info('[filmsenzalimiti.py] search') - - item.url = host + '/?s=' + texto - - try: - return cerca(item) - - # Continua la ricerca in caso di errore . - except: - import sys - for line in sys.exc_info(): - logger.error('%s' % line) - return [] - - -def sottomenu(item): - logger.info('[filmsenzalimiti.py] sottomenu') - itemlist = [] - - data = httptools.downloadpage(item.url).data - - patron = '
  • (.*?)<' - - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedurl, scrapedtitle in matches: - itemlist.append( - Item(channel=item.channel, - action='video', - title=scrapedtitle, - url=scrapedurl)) - - # Elimina Film dal Sottomenù - itemlist.pop(0) - - return itemlist - -@support.scrape -def video(item): - logger.info('[filmsenzalimiti.py] video') - itemlist = [] - - patron = '
    .*?.*?(?P.*?)<.*? 0 and item.extra != 'findservers': - itemlist.append( - Item(channel=item.channel, title='[COLOR lightblue][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url, - action="add_pelicula_to_library", extra="findservers", contentTitle=item.contentTitle)) - - #Necessario per filtrare i Link - if checklinks: - itemlist = servertools.check_list_links(itemlist, checklinks_number) - - # Necessario per FilterTools - # itemlist = filtertools.get_links(itemlist, item, list_language) - - # Necessario per AutoPlay - autoplay.start(itemlist, item) - - return itemlist - - -def play(item): - itemlist = servertools.find_video_items(data=item.url) - - return itemlist - -def newest(categoria): - logger.info('[filmsenzalimiti.py] newest' + categoria) - itemlist = [] - item = Item() - try: - - ## cambiare i valori 'peliculas, infantiles, series, anime, documentales por los que correspondan aqui en - # nel py e nel json ### - if categoria == 'peliculas': - item.url = host - itemlist = video(item) - - if 'Successivo>>' in itemlist[-1].title: - 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 diff --git a/channels/itastreaming.json b/channels/itastreaming.json deleted file mode 100644 index f34077c2..00000000 --- a/channels/itastreaming.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "id": "itastreaming", - "name": "ItaStreaming", - "active": false, - "adult": false, - "language": ["ita"], - "thumbnail": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/itastreaming.png", - "bannermenu": "https:\/\/raw.githubusercontent.com\/Zanzibar82\/images\/master\/posters\/itastreaming.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 - } - ] -} diff --git a/channels/itastreaming.py b/channels/itastreaming.py deleted file mode 100644 index 09802a29..00000000 --- a/channels/itastreaming.py +++ /dev/null @@ -1,295 +0,0 @@ -# -*- coding: utf-8 -*- -# ------------------------------------------------------------ -# Ringraziamo Icarus crew -# Canale per itastreaming -# ---------------------------------------------------------- -import re - -from core import scrapertools, httptools, tmdb, support -from core.item import Item -from platformcode import logger, config - -__channel__ = 'itastreaming' -host = config.get_channel_url(__channel__) -headers = [['Referer', host]] - - -def mainlist(item): - logger.info("[itastreaming.py] mainlist") - - itemlist = [ - Item(channel=item.channel, - title="[COLOR azure]Home[/COLOR]", - action="fichas", - url=host, - thumbnail=""), - Item(channel=item.channel, - title="[COLOR azure]Nuove uscite[/COLOR]", - action="fichas", - url=host + "/nuove-uscite/", - 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]Film per Genere[/COLOR]", - action="genere", - 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]Film per Qualita'[/COLOR]", - action="quality", - url=host, - thumbnail="http://files.softicons.com/download/computer-icons/disks-icons-by-wil-nichols/png/256x256/Blu-Ray.png"), - - Item(channel=item.channel, - title="[COLOR azure]Film A-Z[/COLOR]", - action="atoz", - url=host + "/tag/a/", - thumbnail="http://i.imgur.com/IjCmx5r.png"), - - Item(channel=item.channel, - title="[COLOR orange]Cerca...[/COLOR]", - action="search", - extra="movie", - thumbnail="http://dc467.4shared.com/img/fEbJqOum/s7/13feaf0c8c0/Search")] - - return itemlist - - -def newest(categoria): - logger.info("[itastreaming.py] newest" + categoria) - itemlist = [] - item = Item() - try: - if categoria == "film": - item.url = host + "/nuove-uscite/" - item.action = "fichas" - itemlist = fichas(item) - - if itemlist[-1].action == "fichas": - 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("[itastreaming.py] " + item.url + " search " + texto) - - item.url = host + "/?s=" + texto - - try: - return searchfilm(item) - - # Continua la ricerca in caso di errore - except: - import sys - for line in sys.exc_info(): - logger.error("%s" % line) - return [] - - -def searchfilm(item): - logger.info("[itastreaming.py] fichas") - - itemlist = [] - - # Carica la pagina - data = httptools.downloadpage(item.url, headers=headers).data - # fix - calidad - data = re.sub( - r'
    SD
    ', - 'IMDB: 0.0', - data - ) - - patron = '
  • .*?' - patron += 'src="([^"]+)".*?' - patron += 'alt="([^"]+)".*?' - patron += 'href="([^"]+)".*?' - - matches = re.compile(patron, re.DOTALL).findall(data) - - for scrapedthumbnail, scrapedtitle, scrapedurl in matches: - scrapedtitle = scrapertools.decodeHtmlentities(scrapedtitle) - - # ------------------------------------------------ - scrapedthumbnail = httptools.get_url_headers(scrapedthumbnail) - # ------------------------------------------------ - itemlist.append( - Item(channel=item.channel, - action="findvideos", - title=scrapedtitle, - contentType="movie", - url=scrapedurl, - thumbnail=scrapedthumbnail, - fulltitle=scrapedtitle, - show=scrapedtitle)) - - # Paginación - next_page = scrapertools.find_single_match(data, "href='([^']+)'>Seguente ›") - if next_page != "": - itemlist.append( - Item(channel=item.channel, - action="searchfilm", - title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]", - url=next_page, - thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png")) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - return itemlist - - -def genere(item): - logger.info("[itastreaming.py] genere") - itemlist = [] - - data = httptools.downloadpage(item.url, headers=headers).data - patron = '
      (.+?)
    ' - data = scrapertools.find_single_match(data, patron) - - patron = ']+>    (.*?)
    • ' - - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - - for scrapedurl, scrapedtitle in matches: - scrapedtitle = scrapedtitle.replace('&', '-') - itemlist.append( - Item(channel=item.channel, - action="fichas", - title=scrapedtitle, - url=scrapedurl, - folder=True)) - - return itemlist - - -def atoz(item): - logger.info("[itastreaming.py] genere") - itemlist = [] - - data = httptools.downloadpage(item.url, headers=headers).data - patron = '
    (.+?)' - data = scrapertools.find_single_match(data, patron) - - patron = '
  • .*?' - patron += 'href="([^"]+)".*?' - patron += '>([^"]+)' - - matches = re.compile(patron, re.DOTALL).findall(data) - scrapertools.printMatches(matches) - - for scrapedurl, scrapedtitle in matches: - scrapedtitle = scrapedtitle.replace('&', '-') - itemlist.append( - Item(channel=item.channel, - action="fichas", - title=scrapedtitle, - url=scrapedurl, - folder=True)) - - return itemlist - - -def quality(item): - logger.info("[itastreaming.py] genere") - itemlist = [] - - data = httptools.downloadpage(item.url, headers=headers).data - patron = 'Qualità(.+?)' - data = scrapertools.find_single_match(data, patron) - - patron = '
  • SD
    • ', - 'IMDB: 0.0', - data - ) - - patron = '
    .*?' - patron += 'href="([^"]+)".*?' - patron += 'title="([^"]+)".*?' - patron += 'Seguente ›") - if next_page != "": - itemlist.append( - Item(channel=item.channel, - action="fichas", - title="[COLOR lightgreen]" + config.get_localized_string(30992) + "[/COLOR]", - url=next_page, - thumbnail="http://2.bp.blogspot.com/-fE9tzwmjaeQ/UcM2apxDtjI/AAAAAAAAeeg/WKSGM2TADLM/s1600/pager+old.png")) - - tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) - return itemlist - - -def findvideos(item): - logger.info("[italiafilmvideohd.py] findvideos") - - itemlist = support.hdpass_get_servers(item) - - return itemlist - -