Merge branch 'master' into master

channels.json

@@ -3,50 +3,63 @@
     "altadefinizione01_link": "http://altadefinizione01.link",
     "altadefinizione01": "https://altadefinizione01.to",
     "altadefinizioneclick": "https://altadefinizione.cloud",
-    
-    "altadefinizioneclub": "https://altadefinizione.cloud",
-    "altadefinizionehd": "https://altadefinizionehd.org",
+    "altadefinizionehd": "https://altadefinizione.doctor",
     "animeforge": "https://ww1.animeforce.org",
     "animeleggendari": "https://animepertutti.com",
     "animestream": "https://www.animeworld.it",
+    "animespace": "https://animespace.tv",
     "animesubita": "http://www.animesubita.org",
     "animetubeita": "http://www.animetubeita.com",
     "animevision": "https://www.animevision.it",
     "animeworld": "https://www.animeworld.it",
     "asiansubita": "http://asiansubita.altervista.org",
     "casacinema": "https://www.casacinema.site",
-    "cb01anime": "http://www.cineblog01.ink/anime/",
+    "casacinemainfo": "https://www.casacinema.info",
+    "cb01anime": "http://www.cineblog01.ink",
     "cineblog01": "https://cb01.tools",
-    "documentaristreamingdb": "https://documentari-streaming-da.com",
-    "downloadme": "https://www.downloadme.gratis",
-    "dragonballforever": "https://www.dragonballforever.it",
+    "cinemalibero": "https://cinemalibero.icu",
+    "cinemastreaming": "https://cinemastreaming.icu",
+    "documentaristreamingda": "https://documentari-streaming-da.com",
     "dreamsub": "https://www.dreamsub.stream",
     "eurostreaming": "https://eurostreaming.gratis",
     "eurostreaming_video": "https://www.eurostreaming.best",
     "fastsubita": "http://fastsubita.com",
     "ffilms":"https://ffilms.org",
+    "filmigratis": "https://filmigratis.net",
     "filmgratis": "https://www.filmaltadefinizione.net",
     "filmontv": "https://www.comingsoon.it",
     "filmpertutti": "https://www.filmpertutti.tube",
+    "filmsenzalimiti": "https://filmsenzalimiti.best",
+    "filmsenzalimiticc": "https://www.filmsenzalimiti.host",
     "filmsenzalimiti_blue": "https://filmsenzalimiti.best",
     "filmsenzalimiti_info": "https://www.filmsenzalimiti.host",
     "filmstreaming01": "https://filmstreaming01.com",
     "filmstreamingita": "http://filmstreamingita.live",
     "guarda_serie": "https://guardaserie.site",
     "guardafilm": "http://www.guardafilm.top",
+    "guardarefilm": "https://www.guardarefilm.video",
+    "guardaseriecc": "https://guardaserie.site",
+    "guardaserieclick": "https://www.guardaserie.media",
     "guardaserie_stream": "https://guardaserie.co",
     "guardaserieonline": "http://www.guardaserie.media",
     "guardogratis": "http://guardogratis.io",
     "ilgeniodellostreaming": "https://ilgeniodellostreaming.pw",
-    "italiaserie": "https://italiaserie.org",
     "italiafilm": "https://www.italia-film.pw",
+    "italiafilmhd": "https://italiafilm.info",
     "italiafilmvedohd": "https://italiafilm.info",
-    "italiaserie_uno": "https:://italiaserie.org",
+    "italiaserie": "https://italiaserie.org",
+    "itastreaming": "https://itastreaming.film",
     "majintoon": "https://toonitalia.org",
+    "mondolunatico": "http://mondolunatico.org",
+    "mondolunatico2": "http://mondolunatico.org/stream/",
     "mondoserietv": "https://mondoserietv.com",
     "piratestreaming": "https://www.piratestreaming.watch",
     "seriehd": "https://www.seriehd.info",
     "serietvonline": "https://serietvonline.xyz",
+    "serietvsubita": "http://serietvsubita.xyz",
     "serietvu": "https://www.serietvu.club",
-    "tantifilm": "https://www.tantifilm.plus"
+    "streamingaltadefinizione": "https://www.streamingaltadefinizione.space",
+    "streamking": "http://streamking.cc",
+    "tantifilm": "https://www.tantifilm.plus",
+    "toonitalia": "https://toonitalia.org"
 }

channels/LIKUOO.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.likuoo.video'
 

channels/TXXX.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.txxx.com'
 

channels/absoluporn.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.absoluporn.es'
 

channels/alsoporn.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.alsoporn.com'
 

channels/altadefinizione01.py

@@ -12,7 +12,7 @@ from specials import autoplay
 #host = "https://altadefinizione01.to"
 
 __channel__ = "altadefinizione01"
-host = config.get_addon_version(__channel__)
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()

channels/altadefinizionehd.py

@@ -10,7 +10,8 @@ from core.item import Item
 from platformcode import logger, config
 from specials import autoplay
 
-host = "https://altadefinizione.doctor"
+__channel__ = 'altadefinizionehd'
+host = config.get_channel_url(__channel__)
 
 headers = [['Referer', host]]
 

channels/analdin.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.analdin.com/es'
 

channels/animeforce.py

@@ -12,7 +12,8 @@ from core.item import Item
 from platformcode import config, logger
 from servers.decrypters import adfly
 
-host = "https://ww1.animeforce.org"
+__channel__ = "animeforge"
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()

channels/animeleggendari.py

@@ -12,7 +12,8 @@ from lib.js2py.host import jsfunctions
 from platformcode import logger, config
 from specials import autoplay, autorenumber
 
-host = "https://animepertutti.com"
+__channel__ = "animeleggendari"
+host = config.get_channel_url(__channel__)
 
 # Richiesto per Autoplay
 IDIOMAS = {'Italiano': 'IT'}
@@ -34,7 +35,6 @@ def mainlist(item):
     menu(itemlist, 'Anime in Corso', 'peliculas', host + '/category/anime-in-corso/')
     menu(itemlist, 'Genere', 'genres', host)
     menu(itemlist, 'Cerca...', 'search')
-    menu(itemlist, 'novita', 'newest')
                      
     autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
@@ -137,7 +137,7 @@ def episodios(item):
     itemlist.append(
         Item(channel=item.channel,
              action='findvideos',
-             contentType=item.contentType,
+             contentType='episode',
              title=support.typo('Episodio 1 bold'),
              fulltitle=item.title,
              url=item.url,
@@ -149,7 +149,7 @@ def episodios(item):
             itemlist.append(
                 Item(channel=item.channel,
                      action='findvideos',
-                     contentType=item.contentType,
+                     contentType='episode',
                      title=support.typo('Episodio ' + number,'bold'),
                      fulltitle=item.title,
                      url=url,

channels/animespace.py

@@ -15,7 +15,8 @@ from platformcode import logger, config
 from specials import autoplay
 from specials import renumbertools
 
-host = "https://animespace.tv/"
+__channel__ = "animespace"
+host = config.get_channel_url(__channel__)
 
 checklinks = config.get_setting('checklinks', 'animespace')
 checklinks_number = config.get_setting('checklinks_number', 'animespace')

channels/animesubita.py

@@ -13,8 +13,8 @@ from core import httptools, scrapertools, tmdb, support
 from core.item import Item
 from platformcode import logger, config
 
-host = "http://www.animesubita.org"
-
+__channel__ = "animesubita"
+host = config.get_channel_url(__channel__)
 PERPAGE = 20
 
 # ----------------------------------------------------------------------------------------------------------------

channels/animetubeita.py

@@ -10,7 +10,8 @@ from core import httptools, scrapertools, tmdb
 from core.item import Item
 from platformcode import logger, config
 
-host = "http://www.animetubeita.com"
+__channel__ = "animetubeita"
+host = config.get_channel_url(__channel__)
 hostlista = host + "/lista-anime/"
 hostgeneri = host + "/generi/"
 hostcorso = host + "/category/serie-in-corso/"

channels/animeworld.py

@@ -13,7 +13,8 @@ from core.item import Item
 from platformcode import logger, config
 from specials import autoplay, autorenumber
 
-host = config.get_setting("channel_host", 'animeworld')
+__channel__ = "animeworld"
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 IDIOMAS = {'Italiano': 'Italiano'}
@@ -229,7 +230,7 @@ def video(item):
 
         # Controlla se sono Episodi o Film
         if movie == '':
-            contentType = 'episode'
+            contentType = 'tvshow'
             action = 'episodios'
         else:
             contentType = 'movie'
@@ -256,65 +257,45 @@ def video(item):
 
 def episodios(item):
     log()
-    itemlist = [] 
-
-    data = httptools.downloadpage(item.url, headers=headers).data.replace('\n', '')
-    block1 = scrapertoolsV2.find_single_match(data, r'<div class="widget servers".*?>(.*?)<div id="download"')
-    block = scrapertoolsV2.find_single_match(block1,r'<div class="server.*?>(.*?)<div class="server.*?>')
-   
-    patron = r'<li><a.*?href="([^"]+)".*?>(.*?)<\/a>'
-    matches = re.compile(patron, re.DOTALL).findall(block)
-
-    extra = {}
-    extra['data'] = block1.replace('<strong>Attenzione!</strong> Non ci sono episodi in questa sezione, torna indietro!.','')
+    itemlist = []
+    
+    patron_block = r'<div class="widget servers".*?>(.*?)<div id="download"'
+    patron = r'<li><a [^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+"[^=]+="[^"]+" href="([^"]+)"[^>]+>([^<]+)<'
+    matches = support.match(item, patron, patron_block)[0]
 
     for scrapedurl, scrapedtitle in matches:
-        extra['episode'] = scrapedtitle
-        scrapedtitle = '[B] Episodio ' + scrapedtitle + '[/B]'
         itemlist.append(
             Item(
                 channel=item.channel,
                 action="findvideos",
                 contentType="episode",
-                title=scrapedtitle,
+                title='[B] Episodio ' + scrapedtitle + '[/B]',
                 url=urlparse.urljoin(host, scrapedurl),
                 fulltitle=scrapedtitle,
                 show=scrapedtitle,
                 plot=item.plot,
                 fanart=item.thumbnail,
-                extra=extra,
                 thumbnail=item.thumbnail))
     
     autorenumber.renumber(itemlist, item,'bold')
     support.videolibrary(itemlist, item)
-
     return itemlist
 
 
 def findvideos(item):
     log()
-
     itemlist = []
-    episode = ''
-
-    if item.extra and item.extra['episode']:
-        data = item.extra['data']
-        episode = item.extra['episode']
-    else:
-        data = httptools.downloadpage(item.url, headers=headers).data
-    block = scrapertoolsV2.find_single_match(data,r'data-target="\.widget\.servers.*?>(.*?)</div>')
-    servers = scrapertoolsV2.find_multiple_matches(block,r'class="tab.*?data-name="([0-9]+)">([^<]+)</span')
-
-    videolist = []
+   
+    data = httptools.downloadpage(item.url, headers=headers).data
+    matches, data = support.match(item, r'class="tab.*?data-name="([0-9]+)">([^<]+)</span', headers=headers)
     videoData = ''
     
-    for serverid, servername in servers:
-        #recupero l'id del video per questo server
-        block = str(scrapertoolsV2.find_multiple_matches(data,r'<div class="server.*?data-id="'+serverid+'">(.*?)</ul>'))
-        id = scrapertoolsV2.find_single_match(data,r'<a\sdata-id="([^"]+)"\sdata-base="'+episode+'"')
-
+    for serverid, servername in matches:
+        block = scrapertoolsV2.find_multiple_matches(data,'data-id="'+serverid+'">(.*?)<div class="server')
+        id = scrapertoolsV2.find_single_match(str(block),r'<a data-id="([^"]+)" data-base="'+item.fulltitle+'"')
         dataJson = httptools.downloadpage('%s/ajax/episode/info?id=%s&server=%s&ts=%s' % (host, id, serverid, int(time.time())), headers=[['x-requested-with', 'XMLHttpRequest']]).data
         json = jsontools.load(dataJson)
+        log('JSON= ',json)
 
         videoData +='\n'+json['grabber']
 
@@ -331,7 +312,5 @@ def findvideos(item):
                     contentType=item.contentType,
                     folder=False))
 
-
-    itemlist += servertools.find_video_items(item,videoData)
-    return support.server(item,itemlist=itemlist)
+    return support.server(item, videoData, itemlist)
 

channels/bleachportal.py

@@ -10,6 +10,7 @@ import re
 from core import scrapertools, httptools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "http://www.bleachportal.it"
 

channels/bravoporn.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.bravoporn.com'
 

channels/camwhoresbay.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.camwhoresbay.com'
 

channels/canalporno.py

@@ -3,6 +3,7 @@
 from core import httptools
 from core import scrapertools
 from platformcode import logger
+from platformcode import config
 
 host = "http://www.canalporno.com"
 

channels/casacinema.py

@@ -12,8 +12,8 @@ from core.item import Item
 from platformcode import logger, config
 from specials import autoplay
 
-host = 'https://www.casacinema.site'
-
+__channel__ = "casacinema"
+host = config.get_channel_url(__channel__)
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
 list_servers = ['verystream', 'openload', 'wstream', 'speedvideo']

channels/casacinemaInfo.py

@@ -8,8 +8,8 @@ from core.item import Item
 from platformcode import logger, config
 from specials import autoplay
 
-host = 'https://casacinema.info'
-
+__channel__ = "casacinemainfo"
+host = config.get_channel_url(__channel__)
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
 list_servers = ['verystream', 'openload', 'wstream', 'speedvideo']

channels/cb01anime.py

@@ -10,8 +10,8 @@ from core import httptools, scrapertools, servertools, tmdb
 from core.item import Item
 from platformcode import logger, config
 
-host = "https://www.cineblog01.pink"
-
+__channel__ = "cb01anime"
+host = config.get_channel_url(__channel__)
 #esclusione degli articoli 'di servizio'
 blacklist = ['AVVISO IMPORTANTE – CB01.ROCKS', 'Lista Alfabetica Completa Anime/Cartoon', 'CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE']
 

channels/cineblog01.py

@@ -118,13 +118,19 @@ def last(item):
     itemlist = []
     infoLabels = {}
     quality = ''
+    PERPAGE = 20
+    page = 1
+    if item.page:
+        page = item.page
 
     if item.contentType == 'tvshow':
         matches = support.match(item, r'<a href="([^">]+)".*?>([^(:(|[)]+)([^<]+)<\/a>', '<article class="sequex-post-content.*?</article>', headers)[0]
     else:
         matches = support.match(item, r'<a href=([^>]+)>([^(:(|[)]+)([^<]+)<\/a>', r'<strong>Ultimi 100 film Aggiornati:<\/a><\/strong>(.*?)<td>', headers)[0]
 
-    for url, title, info in matches:
+    for i, (url, title, info) in enumerate(matches):
+        if (page - 1) * PERPAGE > i: continue
+        if i >= page * PERPAGE: break
         add = True
         title = title.rstrip()
         if item.contentType == 'tvshow':
@@ -143,16 +149,17 @@ def last(item):
         if add:
             itemlist.append(
                     Item(channel=item.channel,
-                         action='findvideos' if item.contentType == 'movie' else 'episodios',
-                         contentType=item.contentType,
-                         title=longtitle,
-                         fulltitle=title,
-                         show=title,
-                         quality=quality,
-                         url=url,
-                         infoLabels=infoLabels
-                         )
+                        action='findvideos' if item.contentType == 'movie' else 'episodios',
+                        contentType=item.contentType,
+                        title=longtitle,
+                        fulltitle=title,
+                        show=title,
+                        quality=quality,
+                        url=url,
+                        infoLabels=infoLabels
+                        )
                 )
+    support.pagination(itemlist, item, page, PERPAGE)
 
     tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 

channels/cinemalibero.py

@@ -13,7 +13,6 @@ from platformcode import logger
 from specials import autoplay
 import channelselector
 
-__channel__ = 'cinemalibero'
 # Necessario per Autoplay
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
@@ -24,9 +23,9 @@ list_quality = ['default']
 checklinks = config.get_setting('checklinks', 'cinemalibero')
 checklinks_number = config.get_setting('checklinks_number', 'cinemalibero')
 
-#host = 'https://www.cinemalibero.fun/'
+__channel__ = "cinemalibero"
+host = config.get_channel_url(__channel__)
 
-host = config.get_setting("channel_host", __channel__)
 headers = [['Referer', host]]
 
 def mainlist(item):

channels/cinemastreaming.py

@@ -7,9 +7,10 @@ import re
 from core import scrapertools, httptools, scrapertoolsV2, support
 from core.item import Item
 from specials import autoplay
+from platformcode import config
 
-host = 'https://cinemastreaming.icu'
-
+__channel__ = "cinemastreaming"
+host = config.get_channel_url(__channel__)
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
 list_servers = ['openload', 'streamango']

channels/cliphunter.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.cliphunter.com'
 

channels/coomelonitas.py

@@ -6,6 +6,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host ='http://www.coomelonitas.com'
 

channels/czechvideo.py

@@ -9,6 +9,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://czechvideo.org'
 

channels/datoporn.py

@@ -5,6 +5,7 @@ import re
 from core import httptools
 from core import scrapertools
 from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):

channels/documentaristreamingda.py

@@ -10,8 +10,8 @@ from core import httptools, scrapertools, servertools
 from core.item import Item
 from platformcode import logger, config
 
-host = "https://documentari-streaming-da.com"
-
+__channel__ = "documentaristreamingda"
+host = config.get_channel_url(__channel__)
 
 def mainlist(item):
     logger.info("kod.documentaristreamingda mainlist")

channels/dreamsub.py

@@ -10,8 +10,8 @@ from core import scrapertools, httptools, servertools, tmdb
 from core.item import Item
 from platformcode import logger, config
 
-host = "https://www.dreamsub.co"
-
+__channel__ = "dreamsub"
+host = config.get_channel_url(__channel__)
 
 def mainlist(item):
     logger.info("kod.dreamsub mainlist")

channels/elreyx.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.elreyx.com'
 

channels/eporner.py

@@ -7,6 +7,7 @@ import urlparse
 from core import httptools
 from core import jsontools
 from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):

channels/eroticage.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.eroticage.net'
 

channels/eroticasonlinetv.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.peliculaseroticasonline.tv'
 

channels/erotik.py

@@ -9,6 +9,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.youfreeporntube.net"
 

channels/eurostreaming.py

@@ -24,9 +24,7 @@ from core.item import Item
 from platformcode import logger, config
 
 __channel__ = "eurostreaming"
-
-#host = "https://eurostreaming.cafe/"
-host = config.get_setting("channel_host", __channel__)
+host = config.get_channel_url(__channel__)
 headers = ['Referer', host]
 
 list_servers = ['verystream', 'wstream', 'speedvideo', 'flashx', 'nowvideo', 'streamango', 'deltabit', 'openload']

channels/fapality.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://fapality.com'
 

channels/fastsubita.py

@@ -311,7 +311,7 @@ def episodios(item, itemlist=[]):
         itemlist.append(
             Item(channel=item.channel,
                  action="findvideos",
-                 contentTpye="tvshow",
+                 contentTpye="episode",
                  title=title,
                  fulltitle=scrapedtitle,
                  url=scrapedurl,

channels/fetishshrine.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.fetishshrine.com'
 

channels/filmigratis.py

@@ -9,10 +9,8 @@ from core.item import Item
 from platformcode import logger, config
 from specials import autoplay
 
-channel = 'filmigratis'
-
-host = 'https://filmigratis.net'
-
+__channel__ = 'filmigratis'
+host = config.get_channel_url(__channel__)
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
 list_servers = ['openload', 'streamango', 'vidoza', 'okru']
@@ -32,9 +30,9 @@ def mainlist(item):
     support.menu(itemlist, 'Al Cinema bold', 'carousel', host, contentType='movie')
     support.menu(itemlist, 'Film alta definizione bold', 'peliculas', host, contentType='movie', args='film')
     support.menu(itemlist, 'Categorie Film bold', 'categorias_film', host , contentType='movie', args='film')
-    support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='episode', args='serie')
+    support.menu(itemlist, 'Categorie Serie bold', 'categorias_serie', host, contentType='tvshow', args='serie')
     support.menu(itemlist, '[COLOR blue]Cerca Film...[/COLOR] bold', 'search', host, contentType='movie', args='film')
-    support.menu(itemlist, '[COLOR blue]Cerca Serie...[/COLOR] bold', 'search', host, contentType='episode', args='serie')
+    support.menu(itemlist, '[COLOR blue]Cerca Serie...[/COLOR] bold', 'search', host, contentType='tvshow', args='serie')
 
     autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
@@ -142,7 +140,7 @@ def categorias_serie(item):
     for scrapedurl, scrapedtitle in matches:
         itemlist.append(
             Item(channel=channel,
-                 contentType='episode',
+                 contentType='tvshow',
                  action="peliculas_serie",
                  title="[COLOR azure]" + scrapedtitle + "[/COLOR]",
                  url=scrapedurl,
@@ -205,7 +203,7 @@ def peliculas_serie(item):
         itemlist.append(
             Item(channel=item.channel,
                  action="episodios",
-                 contentType='episode',
+                 contentType='tvshow',
                  title=scrapedtitle,
                  fulltitle=scrapedtitle,
                  url=scrapedurl,

channels/filmoviXXX.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 
 # BLOQUEO ESET INTERNET SECURITY

channels/filmpertutti.py

@@ -10,7 +10,8 @@ from core.item import Item
 from platformcode import config, logger
 from specials import autoplay
 
-host = "https://www.filmpertutti.club"
+__channel__ = 'filmpertutti'
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 list_servers = ['verystream', 'openload', 'streamango', 'wstream', 'akvideo']
 list_quality = ['HD', 'SD']

channels/filmpornoita.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.streamxxxx.com'
 

channels/filmsenzalimiti.py

@@ -11,8 +11,7 @@ from platformcode import logger
 from specials import autoplay
 
 __channel__ = 'filmsenzalimiti'
-
-host = 'https://filmsenzalimiti.space'
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()

channels/filmsenzalimiticc.py

@@ -15,6 +15,7 @@ from specials import autoplay
 
 # Necessario per Autoplay
 __channel__ = 'filmsenzalimiticc'
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
@@ -25,8 +26,6 @@ list_quality = ['default']
 checklinks = config.get_setting('checklinks', 'filmsenzalimiticc')
 checklinks_number = config.get_setting('checklinks_number', 'filmsenzalimiticc')
 
-host = 'https://filmsenzalimiti.pw'
-
 headers = [['Referer', host]]
 
 
@@ -53,7 +52,7 @@ def mainlist(item):
                      action='video',
                      title='Serie TV',
                      url=host+'/serie-tv/',
-                     contentType='episode',
+                     contentType='tvshow',
                      thumbnail=''),
                 Item(channel=item.channel,
                      action='sottomenu_serie',
@@ -119,19 +118,19 @@ def sottomenu_serie(item):
                      action='video',
                      title='Serie TV HD',
                      url=host+'/watch-genre/serie-altadefinizione/',
-                     contentType='episode',
+                     contentType='tvshow',
                      thumbnail=''),
                 Item(channel=item.channel,
                      action='video',
                      title='Miniserie',
                      url=host+'/watch-genre/miniserie/',
-                     contentType='episode',
+                     contentType='tvshow',
                      thumbnail=''),
                 Item(channel=item.channel,
                      action='video',
                      title='Programmi TV',
                      url=host+'/watch-genre/programmi-tv/',
-                     contentType='episode',
+                     contentType='tvshow',
                      thumbnail='')   
                 ]
                 
@@ -166,7 +165,7 @@ def video(item):
         if item.contentType == 'movie':
             azione = 'findvideos'
             tipologia = 'movie'
-        if item.contentType == 'episode':
+        if item.contentType == 'tvshow':
             azione='episodios'
             tipologia = 'tv'
         

channels/foxtube.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://es.foxtube.com'
 

channels/freeporn.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://frprn.com'
 

channels/freepornstreams.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://freepornstreams.org'
 

channels/guardarefilm.py

@@ -13,7 +13,8 @@ from core import servertools
 from core.item import Item
 from platformcode import logger, config
 
-host = "https://www.guardarefilm.video"
+__channel__ = 'guardarefilm'
+host = config.get_channel_url(__channel__)
 
 headers = [['Referer', host]]
 

channels/guardaseriecc.py

@@ -12,7 +12,8 @@ from core.item import Item
 from lib import unshortenit
 from platformcode import logger, config
 
-host = 'https://guardaserie.site'
+__channel__ = 'guardaseriecc'
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 

channels/guardaserieclick.py

@@ -13,7 +13,7 @@ from core.support import log
 from platformcode import logger, config
 
 __channel__ = 'guardaserieclick'
-host = config.get_setting("channel_host", __channel__)
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 IDIOMAS = {'Italiano': 'IT'}
@@ -120,7 +120,7 @@ def nuoveserie(item):
         itemlist.append(
             Item(channel=item.channel,
                  action="episodios",
-                 contentType="episode",
+                 contentType="tvshow",
                  title=scrapedtitle,
                  fulltitle=scrapedtitle,
                  url=scrapedurl,
@@ -165,7 +165,7 @@ def serietvaggiornate(item):
         itemlist.append(
             Item(channel=item.channel,
                  action="findepvideos",
-                 contentType="episode",
+                 contentType="tvshow",
                  title=title,
                  show=scrapedtitle,
                  fulltitle=scrapedtitle,

channels/guardogratis.py

@@ -16,8 +16,7 @@ from core.item import Item
 from platformcode import logger, config
 
 __channel__ = "guardogratis"
-
-host = "https://guardogratis.it/"
+host = config.get_channel_url(__channel__)
 
 headers = [['Referer', host]]
 

channels/hclips.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.hclips.com'
 

channels/hdblog.py

@@ -9,6 +9,7 @@ import urlparse
 from core import httptools, scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.hdblog.it"
 

channels/hdzog.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.hdzog.com'
 

channels/hellporno.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://hellporno.com'
 

channels/hentaiid.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 CHANNEL_HOST = "http://hentai-id.tv/"
 

channels/hotmovs.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://hotmovs.com'
 

channels/ilgeniodellostreaming.py

@@ -9,8 +9,10 @@ from platformcode import  logger
 from core import scrapertoolsV2, httptools, tmdb, support
 from core.support import log, menu, aplay
 from core.item import Item
+from platformcode import config
 
-host = "https://ilgeniodellostreaming.pw"
+__channel__ = 'ilgeniodellostreaming'
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()

channels/ilgiramondo.py

@@ -9,6 +9,7 @@ import urlparse
 from core import httptools, scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "http://www.ilgiramondo.net"
 

channels/italiafilm.py

@@ -14,8 +14,8 @@ from core import tmdb
 from core.item import Item
 from platformcode import logger, config
 
-host = "https://www.italia-film.pro"
-
+__channel__ = 'italiafilm'
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 

channels/italiafilmhd.py

@@ -20,8 +20,8 @@ list_quality = ['default']
 checklinks = config.get_setting('checklinks', 'italiafilmhd')
 checklinks_number = config.get_setting('checklinks_number', 'italiafilmhd')
 
-host = "https://italiafilm.network"
-
+__channel__ = 'italiafilmhd'
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 

channels/italiaserie.py

@@ -11,9 +11,10 @@ from core import httptools, scrapertools
 from core import tmdb
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
-host = "https://italiaserie.org"
-
+__channel__ = 'italiaserie'
+host = config.get_channel_url(__channel__)
 list_servers = ['speedvideo']
 
 IDIOMAS = {'Italiano': 'IT'}

channels/itastreaming.py

@@ -9,8 +9,8 @@ from core import scrapertools, httptools, tmdb, support
 from core.item import Item
 from platformcode import logger, config
 
-host = "https://itastreaming.film"
-
+__channel__ = 'itastreaming'
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 

channels/javlin.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://javl.in'
 

channels/javus.py

@@ -6,6 +6,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://javus.net/'
 

channels/javwhores.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.javwhores.com/'
 

channels/jizzbunker.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://jizzbunker.com/es'
 

channels/justporn.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://xxx.justporno.tv'
 

channels/mondolunatico.py

@@ -19,9 +19,7 @@ from platformcode import config
 from platformcode import logger
 
 __channel__ = "mondolunatico"
-
-host = "http://mondolunatico.org"
-
+host = config.get_channel_url(__channel__)
 captcha_url = '%s/pass/CaptchaSecurityImages.php?width=100&height=40&characters=5' % host
 
 PERPAGE = 25

channels/mondolunatico2.py

@@ -15,8 +15,8 @@ from core import scrapertools, httptools, tmdb, servertools, support, scrapertoo
 from core.item import Item
 from platformcode import logger, config, platformtools
 
-channel = "mondolunatico2"
-host = "https://mondolunatico.org/stream/"
+__channel__ = "mondolunatico2"
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 list_servers = ['verystream', 'wstream', 'openload', 'streamango']

channels/mondoserietv.py

@@ -13,7 +13,9 @@ from lib.unshortenit import unshorten
 from platformcode import logger, config
 from specials import autoplay
 
-host = "https://mondoserietv.com"
+__channel__ = "mondoserietv"
+host = config.get_channel_url(__channel__)
+
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
 list_servers = ['akstream']

channels/mporno.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://mporno.tv'
 

channels/muchoporno.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.pornburst.xxx'
 

channels/nuvid.py

@@ -8,6 +8,7 @@ import urlparse
 from core import httptools
 from core import scrapertools
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.nuvid.com"
 

channels/pandamovie.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://pandamovies.pw'
 

channels/peliculaseroticas.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):

channels/pelisxporno.py

@@ -3,6 +3,7 @@
 from core import httptools
 from core import scrapertools
 from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):

channels/perfectgirls.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.perfectgirls.net'
 

channels/piratestreaming.py

@@ -15,8 +15,7 @@ from platformcode import logger, config
 from specials import autoplay
 
 __channel__ = "piratestreaming"
-
-host = "http://www.piratestreaming.watch"
+host = config.get_channel_url(__channel__)
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()

channels/playpornx.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "https://watchfreexxx.net/"
 

channels/porn300.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.porn300.com'
 

channels/pornboss.py

@@ -7,6 +7,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://pornboss.org'
 

channels/porneq.py

@@ -6,6 +6,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://porneq.com'
 

channels/pornhive.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.pornhive.tv/en'
 

channels/pornhub.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 
 def mainlist(item):

channels/pornrewind.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://www.pornrewind.com'
 

channels/porntrex.py

@@ -9,6 +9,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import config, logger
+from platformcode import config
 
 host = "https://www.porntrex.com"
 perpage = 20

channels/programmazione.py

@@ -10,6 +10,7 @@ import re
 from core import httptools, scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 site = "https://www.youtube.com"
 

channels/qwertty.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://qwertty.net'
 

channels/redtube.py

@@ -9,6 +9,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'https://es.redtube.com'
 

channels/ricettevideo.py

@@ -9,6 +9,7 @@ import urlparse
 from core import httptools, scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "http://ricettevideo.net"
 

channels/serietvonline.py

@@ -11,7 +11,8 @@ from lib import unshortenit
 from platformcode import logger, config
 from specials import autoplay
 
-host = "https://serietvonline.live"
+__channel__ = "serietvonline"
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 IDIOMAS = {'Italiano': 'IT'}

channels/serietvsubita.py

@@ -13,7 +13,7 @@ from core.support import log
 from platformcode import logger, config
 
 __channel__ = "serietvsubita"
-host = config.get_setting("channel_host", __channel__)
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 IDIOMAS = {'Italiano': 'IT'}

channels/serietvu.py

@@ -11,7 +11,7 @@ from core.support import log
 from platformcode import logger, config
 
 __channel__ = 'serietvu'
-host = config.get_setting("channel_host", __channel__)
+host = config.get_channel_url(__channel__)
 headers = [['Referer', host]]
 
 IDIOMAS = {'Italiano': 'IT'}

channels/serviporno.py

@@ -8,6 +8,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = "https://www.serviporno.com"
 

channels/sexgalaxy.py

@@ -9,6 +9,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://sexgalaxy.net'
 

channels/sexkino.py

@@ -9,6 +9,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://sexkino.to'
 

channels/sexofilm.py

@@ -8,6 +8,7 @@ from core import scrapertools
 from core import servertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://sexofilm.com'
 

channels/siska.py

@@ -7,6 +7,7 @@ from core import httptools
 from core import scrapertools
 from core.item import Item
 from platformcode import logger
+from platformcode import config
 
 host = 'http://www.siska.tv/'