fix per bit.ly (#58)

fix per bit.ly e fix di alcuni canali

channels/altadefinizione01_club.json

@@ -11,6 +11,14 @@
     "movie"
   ],
   "settings": [
+    {
+    "id": "channel_host",
+    "type": "text",
+    "label": "Host del canale",
+    "default": "https://altadefinizione01.estate/",
+    "enabled": true,
+    "visible": true
+    },
     {
       "id": "modo_grafico",
       "type": "bool",
@@ -19,6 +27,14 @@
       "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_film",
       "type": "bool",

channels/altadefinizione01_club.py

@@ -5,11 +5,10 @@
 # -*- last change: 04/05/2019
 
 
-from channelselector import get_thumb
+from core import channeltools, servertools, support
-from core import httptools, channeltools, scrapertools, servertools, tmdb, support
 from core.item import Item
 from platformcode import config, logger
-from specials import autoplay, filtertools
+from specials import autoplay
 
 __channel__ = "altadefinizione01_club"
 host = config.get_channel_url(__channel__)
@@ -28,8 +27,8 @@ thumbnail_host = parameters['thumbnail']
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
-list_servers = ['verystream','openload','rapidvideo','streamango'] # per l'autoplay
+list_servers = ['verystream','openload','supervideo','rapidvideo','streamango'] # per l'autoplay
-list_quality = ['default'] #'rapidvideo', 'streamango', 'openload', 'streamcherry'] # per l'autoplay
+list_quality = ['default']
 
 
 # =========== home menu ===================
@@ -43,8 +42,6 @@ def mainlist(item):
     logger.info("%s mainlist log: %s" % (__channel__, item)) 
     itemlist = []
 
-    autoplay.init(item.channel, list_servers, list_quality)
-
     # Menu Principale
     support.menu(itemlist, 'Film Ultimi Arrivi bold', 'peliculas', host, args='pellicola')
     support.menu(itemlist, 'Genere', 'categorie', host, args='genres')
@@ -52,9 +49,12 @@ def mainlist(item):
     support.menu(itemlist, 'Per lettera', 'categorie', host + '/catalog/a/', args=['Film per Lettera','orderalf'])
     support.menu(itemlist, 'Al Cinema bold', 'peliculas', host + '/cinema/', args='pellicola')
     support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host + '/sub-ita/', args='pellicola')
-    support.menu(itemlist, 'Cerca film submenu', 'search', host)
+    support.menu(itemlist, 'Cerca film submenu', 'search', host, args = 'search')
 
+    autoplay.init(item.channel, list_servers, list_quality)
     autoplay.show_option(item.channel, itemlist)
+
+    support.channel_config(item, itemlist)
     
     return itemlist
 
@@ -64,43 +64,19 @@ def mainlist(item):
 def peliculas(item):
     logger.info("%s mainlist peliculas log: %s" % (__channel__, item))
     itemlist = []
-    # scarico la pagina
-    data = httptools.downloadpage(item.url, headers=headers).data
-    # da qui fare le opportuni modifiche
-    if item.args != 'orderalf':
-        if item.args == 'pellicola' or item.args == 'years':
-            bloque = scrapertools.find_single_match(data, '<div class="cover boxcaption">(.*?)<div id="right_bar">')
-        elif item.args == "search":
-            bloque = scrapertools.find_single_match(data, '<div class="cover boxcaption">(.*?)</a>')
-        else:
-            bloque = scrapertools.find_single_match(data, '<div class="cover boxcaption">(.*?)<div class="page_nav">')
-        patron = '<h2>.<a href="(.*?)".*?src="(.*?)".*?class="trdublaj">(.*?)<div class="ml-item-hiden".*?class="h4">(.*?)<.*?label">(.*?)</span'
-        matches = scrapertools.find_multiple_matches(data, patron)
-        for scrapedurl, scrapedimg, scrapedqualang, scrapedtitle, scrapedyear in matches:
 
-            if 'sub ita' in scrapedqualang.lower():
+    patron_block = r'<div id="dle-content">(.*?)<div class="page_nav">'
-                scrapedlang = 'Sub-Ita'
+    if item.args == "search":
-            else:
+        patron_block = r'</table> </form>(.*?)<div class="search_bg">'
-                scrapedlang = 'ITA'
+    patron = r'<h2>.<a href="(.*?)".*?src="(.*?)".*?(?:|<div class="sub_ita">(.*?)</div>)[ ]</div>.*?<p class="h4">(.*?)</p>'
-            itemlist.append(Item(
-                channel=item.channel,
-                action="findvideos",
-                contentTitle=scrapedtitle,
-                fulltitle=scrapedtitle,
-                url=scrapedurl,
-                infoLabels={'year': scrapedyear},
-                contenType="movie",
-                thumbnail=host+scrapedimg,
-                title= "%s [%s]" % (scrapedtitle, scrapedlang),
-                language=scrapedlang
-                ))
 
-    # poichè  il sito ha l'anno del film con TMDB la ricerca titolo-anno è esatta quindi inutile fare lo scrap delle locandine 
+    listGroups = ['url', 'thumb', 'lang', 'title', 'year']
-    # e della trama dal sito che a volte toppano
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
 
-    # Paginazione
+    patronNext =  '<span>[^<]+</span>[^<]+<a href="(.*?)">'
-    support.nextPage(itemlist,item,data,'<span>[^<]+</span>[^<]+<a href="(.*?)">')
+    
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
+                          headers= headers, patronNext=patronNext,patron_block=patron_block,
+                          action='findvideos')    
     
     return itemlist
 
@@ -109,39 +85,25 @@ def peliculas(item):
 def categorie(item):
     logger.info("%s mainlist categorie log: %s" % (__channel__, item))
     itemlist = []
-    # scarico la pagina
-    data = httptools.downloadpage(item.url, headers=headers).data
 
     # da qui fare le opportuni modifiche
+    patron = r'<li><a href="(.*?)">(.*?)</a>'
+    action = 'peliculas'
     if item.args == 'genres':
-        bloque = scrapertools.find_single_match(data, '<ul class="kategori_list">(.*?)</ul>')
+        bloque = r'<ul class="kategori_list">(.*?)</ul>'
-        patron = '<li><a href="/(.*?)">(.*?)</a>'
     elif item.args[1] == 'years':
-        bloque = scrapertools.find_single_match(data, '<ul class="anno_list">(.*?)</ul>')
+        bloque = r'<ul class="anno_list">(.*?)</ul>'
-        patron = '<li><a href="/(.*?)">(.*?)</a>'
     elif item.args[1] == 'orderalf':
-        bloque = scrapertools.find_single_match(data, '<div class="movies-letter">(.*)<div class="clearfix">')
+        bloque = r'<div class="movies-letter">(.*)<div class="clearfix">'
-        patron = '<a title=.*?href="(.*?)"><span>(.*?)</span>'
+        patron = r'<a title=.*?href="(.*?)"><span>(.*?)</span>'
+        action = 'orderalf'
 
-    matches = scrapertools.find_multiple_matches(bloque, patron)
+    listGroups = ['url', 'title']
-
+    patronNext = ''
-    for scrapurl, scraptitle in sorted(matches):
+       
-
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
-        if "01" in scraptitle:
+                          headers= headers, patronNext=patronNext, patron_block = bloque,
-          continue
+                          action=action)
-        else:
-          scrapurl = host+scrapurl
-
-        if item.args[1] != 'orderalf': action = "peliculas"
-        else: action = 'orderalf'
-        itemlist.append(Item(
-            channel=item.channel,
-            action= action,
-            title = scraptitle,
-            url= scrapurl,
-            thumbnail = get_thumb(scraptitle, auto = True),
-            extra = item.extra,
-        ))
 
     return itemlist
 
@@ -150,36 +112,14 @@ def categorie(item):
 def orderalf(item):
     logger.info("%s mainlist orderalf log: %s" % (__channel__, item))
     itemlist = []
-    # scarico la pagina
-    data = httptools.downloadpage(item.url, headers=headers).data
-    # da qui fare le opportuni modifiche
-    patron = '<td class="mlnh-thumb"><a href="(.*?)".title="(.*?)".*?src="(.*?)".*?mlnh-3">(.*?)<.*?"mlnh-5">.<(.*?)<td' #scrapertools.find_single_match(data, '<td class="mlnh-thumb"><a href="(.*?)".title="(.*?)".*?src="(.*?)".*?mlnh-3">(.*?)<.*?"mlnh-5">.<(.*?)<td')
-    matches = scrapertools.find_multiple_matches(data, patron)
-    for scrapedurl, scrapedtitle, scrapedimg, scrapedyear, scrapedqualang in matches:
 
-            if 'sub ita' in scrapedqualang.lower():
+    listGroups = ['url', 'title', 'thumb', 'year', 'lang']
-                scrapedlang = 'Sub-ita'
+    patron = r'<td class="mlnh-thumb"><a href="(.*?)".title="(.*?)".*?src="(.*?)".*?mlnh-3">(.*?)<.*?"mlnh-5">.<(.*?)<td' #scrapertools.find_single_match(data, '<td class="mlnh-thumb"><a href="(.*?)".title="(.*?)".*?src="(.*?)".*?mlnh-3">(.*?)<.*?"mlnh-5">.<(.*?)<td')
-            else:
+    patronNext = r'<span>[^<]+</span>[^<]+<a href="(.*?)">'
-                scrapedlang = 'ITA'
+    
-            itemlist.append(Item(
+    itemlist = support.scrape(item, patron=patron, listGroups=listGroups,
-                channel=item.channel,
+                          headers= headers, patronNext=patronNext,
-                action="findvideos_film",
+                          action='findvideos')
-                contentTitle=scrapedtitle,
-                fulltitle=scrapedtitle,
-                url=scrapedurl,
-                infoLabels={'year': scrapedyear},
-                contenType="movie",
-                thumbnail=host+scrapedimg,
-                title = "%s [%s]" % (scrapedtitle, scrapedlang),
-                language=scrapedlang,
-                context="buscar_trailer"
-            ))
-
-    # se il sito permette l'estrazione dell'anno del film aggiungere la riga seguente
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-
-    # Paginazione
-    support.nextPage(itemlist,item,data,'<span>[^<]+</span>[^<]+<a href="(.*?)">')
 
     return itemlist
 
@@ -188,45 +128,7 @@ def orderalf(item):
 def findvideos(item):
     logger.info("%s mainlist findvideos_film log: %s" % (__channel__, item))
     itemlist = []
-
+    return support.server(item, headers=headers)
-    # scarico la pagina
-    data = httptools.downloadpage(item.url, headers=headers).data
-    # da qui fare le opportuni modifiche
-    patron = '<a href="#" data-link="(.*?)">'
-    matches = scrapertools.find_multiple_matches(data, patron)
-
-    for scrapedurl in matches:
-        logger.info("altadefinizione01_club scrapedurl log: %s" % scrapedurl)
-        try:
-            itemlist = servertools.find_video_items(data=data)
-
-            for videoitem in itemlist:
-                logger.info("Videoitemlist2: %s" % videoitem)
-                videoitem.title = "%s [%s]" % (item.contentTitle, videoitem.title)
-                videoitem.show = item.show
-                videoitem.contentTitle = item.contentTitle
-                videoitem.contentType = item.contentType
-                videoitem.channel = item.channel
-                videoitem.year = item.infoLabels['year']
-                videoitem.infoLabels['plot'] = item.infoLabels['plot']
-        except AttributeError:
-            logger.error("data doesn't contain expected URL")
-
-    # Controlla se i link sono validi
-    if checklinks:
-        itemlist = servertools.check_list_links(itemlist, checklinks_number)
-
-    # Requerido para FilterTools
-    itemlist = filtertools.get_links(itemlist, item, list_language)
-
-    # Requerido para AutoPlay
-    autoplay.start(itemlist, item)
-
-    # Aggiunge alla videoteca
-    if  item.extra != 'findvideos' and item.extra != "library" and config.get_videolibrary_support() and len(itemlist) != 0 :
-       support.videolibrary(itemlist, item)
-    
-    return itemlist
 
 # =========== def per cercare film/serietv =============
 #http://altadefinizione01.link/index.php?do=search&story=avatar&subaction=search
@@ -248,16 +150,15 @@ def search(item, text):
 # =========== def per le novità nel menu principale =============
 
 def newest(categoria):
-    logger.info("%s mainlist newest log: %s %s %s" % (__channel__, categoria))
+    logger.info("%s mainlist newest log: %s" % (__channel__, categoria))
     itemlist = []
     item = Item()
     try:
-        if categoria == "film":
+        item.url = host
-            item.url = host
+        item.action = "peliculas"
-            item.action = "peliculas"
+        itemlist = peliculas(item)
-            itemlist = peliculas(item)
+        if itemlist[-1].action == "peliculas":
-            if itemlist[-1].action == "peliculas":
+            itemlist.pop()
-                itemlist.pop()
 
     # Continua la ricerca in caso di errore
     except:

channels/animesubita.py

@@ -179,7 +179,7 @@ def lista_anime(item, nextpage=True, show_lang=True):
             Item(channel=item.channel,
                  action="episodi",
                  contentType="tvshow" if 'oav' not in scrapedtitle.lower() else "movie",
-                 title=color(scrapedtitle.replace(lang, "(%s)" % support.color(lang, "red") if show_lang else "").strip(), 'azure'),
+                 title=scrapedtitle.replace(lang, "(%s)" % support.color(lang, "red") if show_lang else "").strip(),
                  fulltitle=cleantitle,
                  url=scrapedurl,
                  show=cleantitle,

channels/cinetecadibologna.py

@@ -55,7 +55,8 @@ def peliculas(item):
         scrapedurl = host + scrapedurl
         if not "/video/" in scrapedurl:
             continue
-        html = scrapertools.cache_page(scrapedurl)
+##        html = scrapertools.cache_page(scrapedurl)
+        html = httptools.downloadpage(scrapedurl, headers=headers).data
         start = html.find("Sinossi:")
         end = html.find('<div class="sx_col">', start)
         scrapedplot = html[start:end]

channels/filmpertutti.json

@@ -1,7 +1,7 @@
 {
   "id": "filmpertutti",
   "name": "Filmpertutti",
-  "active": true,
+  "active": false,
   "adult": false,
   "language": ["ita"],
   "thumbnail": "https://www.filmpertutti.club/wp-content/themes/blunge/assets/logo.png",

channels/guardarefilm.py

@@ -39,7 +39,7 @@ def mainlist(item):
                 Item(channel=item.channel,
                      title="[COLOR azure]Categorie[/COLOR]",
                      action="categorias",
-                     url=host,
+                     url=host+'/streaming-film/',
                      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]Animazione[/COLOR]",

channels/istitutoluce.py

@@ -140,7 +140,8 @@ def peliculas(item):
         scrapedtitle = scrapedtitle.rsplit('/', 1)[-1].rsplit(".", 1)[0].replace("-", " ").title()
         scrapedurl = host + scrapedurl
 
-        html = scrapertools.cache_page(scrapedurl)
+##        html = scrapertools.cache_page(scrapedurl)
+        html = httptools.downloadpage(scrapedurl, headers=headers).data
         start = html.find('<p class="abstract">')
         end = html.find('</p>', start)
         scrapedplot = html[start:end]

channels/italiaserie.py

@@ -4,14 +4,14 @@
 # ------------------------------------------------------------
 import re
 
-import autoplay
-import support
 
-from core import httptools, scrapertools
+
+from core import httptools, scrapertools, support
 from core import tmdb
 from core.item import Item
 from platformcode import logger
 from platformcode import config
+from specials import autoplay
 
 __channel__ = 'italiaserie'
 host = config.get_channel_url(__channel__)

core/support.py

@@ -178,7 +178,9 @@ def scrape(item, patron = '', listGroups = [], headers="", blacklist="", data=""
                 longtitle = longtitle + typo(title2, 'bold _ -- _')
 
             ##    Aggiunto/modificato per gestire i siti che hanno i video
-            ##    in ita e subita delle serie tv nella stessa pagina                             
+            ##    in ita e subita delle serie tv nella stessa pagina
+            if scraped['lang'] == '': #altrimenti nei canali dei film mi aggiunge sub-ita a tutti i film successivi
+                lang = '' # o in alternativa lang = 'ITA'
             if scraped['lang']:              
                 if 'sub' in scraped['lang'].lower():
                     lang = 'Sub-ITA'

servers/decrypters/zcrypt.py

@@ -19,7 +19,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
 
     patronvideos = [
         r'(https?://(gestyy|rapidteria|sprysphere)\.com/[a-zA-Z0-9]+)',
-        r'(https?://(?:www\.)?(vcrypt|linkup)\.[^/]+/[^/]+/[a-zA-Z0-9_]+)'
+        r'(https?://(?:www\.)?(vcrypt|linkup)\.[^/]+/[^/]+/[a-zA-Z0-9_]+)',
+        r'(https?://(?:www\.)?(bit)\.ly/[a-zA-Z0-9]+)',        
     ]
 
     for patron in patronvideos: