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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
marco
2020-05-23 18:05:22 +02:00
parent d2ceafe36c 6e1443b69b
commit 68b3545322
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/netfreex.py
View File

@@ -23,8 +23,7 @@ list_quality = ['1080p', 'HD', 'SD', 'CAM']
def mainlist(item):
film = ['/film',
('Generi', ['', 'menu', 'genres']),
('Anno', ['', 'menu', 'releases']),
('Generi', ['', 'menu', 'genres'])
]
tvshow = ['/serietv']
anime = ['/genere/anime']
@@ -74,4 +73,7 @@ def findvideos(item):
@support.scrape
def menu(item):
return support.dooplay_menu(item, item.args)
action = 'peliculas'
data = support.match(item, patron=r'<a href="#">Genere<(.*?)</ul').match
patronMenu= r'<a href="(?P<url>[^"]+)"[^>]*>(?P<title>[^<]+)<'
return locals()

4
core/support.py
View File

@@ -336,8 +336,8 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
infoLabels=infolabels,
thumbnail=item.thumbnail if function == 'episodios' or not scraped["thumb"] else scraped["thumb"],
args=item.args,
contentSerieName= item.contentSerieName if item.contentSerieName else title if 'movie' not in [item.contentType, CT] and function == 'episodios' else item.fulltitle,
contentTitle=item.contentTitle if item.contentTitle else title if 'movie' in [item.contentType, CT] else '',
contentSerieName= item.contentSerieName if item.contentSerieName and function == 'peliculas' else title if 'movie' not in [item.contentType, CT] and function != 'episodios' else item.fulltitle,
contentTitle=item.contentTitle if item.contentTitle and function == 'peliculas' else title if 'movie' in [item.contentType, CT] and function == 'peliculas' else '',
contentLanguage = lang1,
contentEpisodeNumber=episode if episode else '',
news= item.news if item.news else '',

11
core/tmdb.py
View File

@@ -462,11 +462,11 @@ def set_infoLabels_item(item, seekTmdb=True, idioma_busqueda=def_lang, lock=None
year=item.infoLabels['year'])
else:
# Busqueda de pelicula por titulo...
if item.infoLabels['year'] or item.infoLabels['filtro']:
# ...y año o filtro
searched_title = item.contentTitle if item.contentTitle else item.fulltitle
otmdb = Tmdb(texto_buscado=searched_title, tipo=tipo_busqueda, idioma_busqueda=idioma_busqueda,
filtro=item.infoLabels.get('filtro', {}), year=item.infoLabels['year'])
# if item.infoLabels['year'] or item.infoLabels['filtro']:
# ...y año o filtro
searched_title = item.contentTitle if item.contentTitle else item.fulltitle
otmdb = Tmdb(texto_buscado=searched_title, tipo=tipo_busqueda, idioma_busqueda=idioma_busqueda,
filtro=item.infoLabels.get('filtro', {}), year=item.infoLabels['year'])
if otmdb is not None:
if otmdb.get_id() and config.get_setting("tmdb_plus_info", default=False):
# Si la busqueda ha dado resultado y no se esta buscando una lista de items,
@@ -480,7 +480,6 @@ def set_infoLabels_item(item, seekTmdb=True, idioma_busqueda=def_lang, lock=None
# La busqueda ha encontrado un resultado valido
__leer_datos(otmdb)
return len(item.infoLabels)
# La busqueda en tmdb esta desactivada o no ha dado resultado
# item.contentType = item.infoLabels['mediatype']
return -1 * len(item.infoLabels)