stevazi/addon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Add files via upload

Browse Source 
Fixato e rifixato.
Dovrebbe essere ok
This commit is contained in:
greko17
2019-05-04 23:53:46 +02:00
committed by GitHub
parent 87bf359e12
commit 86f2cc28ed
2 changed files with 18 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
channels/altadefinizione01_club.py
View File

@@ -6,16 +6,13 @@
from channels import autoplay, support, filtertools
from channelselector import get_thumb
from core import httptools
from core import channeltools
from core import scrapertools
from core import servertools
from core import tmdb
from core.item import Item
from platformcode import config, logger
__channel__ = "altadefinizione01_club"
@@ -23,6 +20,7 @@ __channel__ = "altadefinizione01_club"
#host = "https://www.altadefinizione01.club/" # host da cambiare
#host = "https://www.altadefinizione01.team/" #aggiornato al 22 marzo 2019
host = "https://www.altadefinizione01.vision/" #aggiornato al 30-04-209
# ======== Funzionalità =============================
__comprueba_enlaces__ = config.get_setting('comprueba_enlaces', __channel__)
@@ -55,7 +53,7 @@ def mainlist(item):
autoplay.init(item.channel, list_servers, list_quality)
# Menu Principale
support.menu(itemlist, 'Film Ultimi Arrivi bold', 'peliculas', host+'', args='pellicola')
support.menu(itemlist, 'Film Ultimi Arrivi bold', 'peliculas', host, args='pellicola')
support.menu(itemlist, 'Genere', 'categorie', host, args='genres')
support.menu(itemlist, 'Per anno submenu', 'categorie', host, args=['Film per Anno','years'])
support.menu(itemlist, 'Per lettera', 'categorie', host+'catalog/a/', args=['Film per Lettera','orderalf'])
@@ -81,7 +79,7 @@ def peliculas(item):
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: #item.extra == 'cat':
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)
@@ -93,7 +91,7 @@ def peliculas(item):
scrapedlang = 'ITA'
itemlist.append(Item(
channel=item.channel,
action="findvideos_film",
action="findvideos",
contentTitle=scrapedtitle,
fulltitle=scrapedtitle,
url=scrapedurl,
@@ -104,7 +102,8 @@ def peliculas(item):
language=scrapedlang
))
# se il sito permette l'estrazione dell'anno del film aggiungere la riga seguente
# poichè il sito ha l'anno del film con TMDB la ricerca titolo-anno è esatta quindi inutile fare lo scrap delle locandine
# e della trama dal sito che a volte toppano
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
# Paginazione
@@ -193,7 +192,7 @@ def orderalf(item):
# =========== def pagina del film con i server per verderlo =============
def findvideos_film(item):
def findvideos(item):
logger.info("%s mainlist findvideos_film log: %s" % (__channel__, item))
itemlist = []
@@ -210,7 +209,7 @@ def findvideos_film(item):
for videoitem in itemlist:
logger.info("Videoitemlist2: %s" % videoitem)
videoitem.title = "%s [%s]" % (item.contentTitle, videoitem.title)#"[%s] %s" % (videoitem.server, item.title) #"[%s]" % (videoitem.title)
videoitem.title = "%s [%s]" % (item.contentTitle, videoitem.title)
videoitem.show = item.show
videoitem.contentTitle = item.contentTitle
videoitem.contentType = item.contentType
@@ -225,13 +224,13 @@ def findvideos_film(item):
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
# Requerido para FilterTools
#itemlist = filtertools.get_links(itemlist, item, list_language)
itemlist = filtertools.get_links(itemlist, item, list_language)
# Requerido para AutoPlay
autoplay.start(itemlist, item)
# Aggiunge alla videoteca
if config.get_videolibrary_support() and len(itemlist) != 0 and item.extra != "library":
if item.extra != 'findvideos' and item.extra != "library" and config.get_videolibrary_support() and len(itemlist) != 0 :
support.videolibrary(itemlist, item)
return itemlist
@@ -246,7 +245,7 @@ def search(item, text):
#item.extra = "search"
try:
return peliculas(item)
# Se captura la excepciÛn, para no interrumpir al buscador global si un canal falla
# Cattura la eccezione così non interrompe la ricerca globle se il canale si rompe!
except:
import sys
for line in sys.exc_info():

65
channels/altadefinizione01_link.py
View File

@@ -7,16 +7,13 @@
from channels import autoplay, support, filtertools
from channelselector import get_thumb
from core import httptools
from core import channeltools
from core import scrapertools
from core import servertools
from core import tmdb
from core.item import Item
from platformcode import config, logger
__channel__ = "altadefinizione01_link"
@@ -50,7 +47,6 @@ def mainlist(item):
"""
logger.info("%s mainlist log: %s" % (__channel__, item))
itemlist = []
title = ''
autoplay.init(item.channel, list_servers, list_quality)
# Menu Principale
@@ -60,57 +56,9 @@ def mainlist(item):
support.menu(itemlist, 'Per qualità submenu', 'categorie', host, args=['Film per qualità','quality'])
support.menu(itemlist, 'Al Cinema bold', 'peliculas', host+'film-del-cinema')
support.menu(itemlist, 'Popolari bold', 'categorie', host+'piu-visti.html', args=['popular',''])
support.menu(itemlist, 'Mi sento fortunato bold', 'categorie', host+'piu-visti.html',args=['fortunato','lucky'])
support.menu(itemlist, 'Mi sento fortunato bold', 'categorie', host, args=['fortunato','lucky'])
support.menu(itemlist, 'Sub-ITA bold', 'peliculas', host+'film-sub-ita/')
support.menu(itemlist, 'Cerca film submenu', 'search', host)
## itemlist = [
## # new upload
## Item(channel=__channel__, title="Ultimi Arrivi", action="peliculas",
## url="%s" % host, text_color=color4, extra="film", # color4 = red
## thumbnail=get_thumb(title, auto = True)
## ),
## # x to Cinema
## Item(channel=__channel__, title="Al Cinema", action="peliculas",
## url="%sfilm-del-cinema" % host, text_color=color4, extra="",
## thumbnail=get_thumb(title, auto = True)
## ),
## # Popolari
## Item(channel=__channel__, title="Popolari", action="peliculas",
## url="%spiu-visti.html" % host, text_color=color4, extra="",
## thumbnail=get_thumb(title, auto = True)
## ),
## # x Sub-ita
## Item(channel=__channel__, title="Sottotitolati", action="peliculas",
## url="%sfilm-sub-ita/" % host, text_color=color4, extra="",
## thumbnail=get_thumb(title, auto = True)
## ),
## # x mi sento fortunato - Prende solo film con player a pagamento
## Item(channel=__channel__, title="Mi Sento Fortunato", action="categorie",
## url="%s" % host, text_color=color4, extra="lucky",
## thumbnail=""),
## # x Category
## Item(channel=__channel__, title="Generi", action="categorie",
## url="%s" % host, text_color=color4, extra="genres",
## viewcontent='movies',
## thumbnail=get_thumb(title, auto = True)
## ),
## # x year
## Item(channel=__channel__, title="Anno", action="categorie",
## url="%s" % host, text_color=color4, extra="year",
## thumbnail=get_thumb(title, auto = True)
## ),
## # x quality
## Item(channel=__channel__, title="Qualità", action="categorie",
## url="%s" % host, text_color=color4, extra="quality",
## thumbnail=get_thumb(title, auto = True)
## ),
## # Search
## Item(channel=__channel__, title="Cerca Film...", action="search",
## text_color=color4, extra="",
## thumbnail=get_thumb(title, auto = True)
## ),
## ]
autoplay.show_option(item.channel, itemlist)
@@ -136,7 +84,7 @@ def peliculas(item):
scrapedlang = 'Sub-Ita'
itemlist.append(Item(
channel=item.channel,
action="findvideos_film",
action="findvideos",
contentTitle=scrapedtitle,
fulltitle=scrapedtitle,
url=scrapedurl,
@@ -148,7 +96,8 @@ def peliculas(item):
context="buscar_trailer"
))
# poiché c'è l'anno negli item prendiamo le info direttamente da tmdb, anche se a volte può non esserci l'informazione
# poichè il sito ha l'anno del film con TMDB la ricerca titolo-anno è esatta quindi inutile fare lo scrap delle locandine
# e della trama dal sito che a volte toppano
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
# Paginazione
@@ -203,7 +152,7 @@ def categorie(item):
# =========== def pagina del film con i server per verderlo =============
# da sistemare che ne da solo 1 come risultato
def findvideos_film(item):
def findvideos(item):
logger.info("%s mainlist findvideos_film log: %s" % (__channel__, item))
itemlist = []
# scarico la pagina
@@ -235,13 +184,13 @@ def findvideos_film(item):
itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
# Requerido para FilterTools
#itemlist = filtertools.get_links(itemlist, item, list_language)
itemlist = filtertools.get_links(itemlist, item, list_language)
# Requerido para AutoPlay
autoplay.start(itemlist, item)
# Aggiunge alla videoteca
if config.get_videolibrary_support() and len(itemlist) != 0 and item.extra != "library":
if item.extra != 'findvideos' and item.extra != "library" and config.get_videolibrary_support() and len(itemlist) != 0 :
support.videolibrary(itemlist, item)
return itemlist