- Fix SerieHD
- Fix VVVVID - Fix TMDB - Fix Rinumerazione - Fix Mediaset (Rimossa Numerazione)
This commit is contained in:
Alhaziel01
@@ -174,27 +174,27 @@ def peliculas(item):
|
||||
for it in json:
|
||||
if item.search.lower() in it['title'].lower() and it['title'] not in titlelist:
|
||||
titlelist.append(it['title'])
|
||||
if item.contentType == 'movie':
|
||||
# if item.contentType == 'movie':
|
||||
# action = 'findvideos'
|
||||
# urls = []
|
||||
# if 'media' not in it: it = subBrand(it['mediasetprogram$brandId'])[-1]
|
||||
# if 'media' in it:
|
||||
# for key in it['media']:
|
||||
# urls.append(key['publicUrl'])
|
||||
# elif item.contentType == 'tvshow':
|
||||
# action = 'epmenu'
|
||||
# urls = it['mediasetprogram$brandId']
|
||||
# else:
|
||||
if 'media' in it:
|
||||
action = 'findvideos'
|
||||
contentType = 'movie'
|
||||
urls = []
|
||||
if 'media' not in it: it = subBrand(it['mediasetprogram$brandId'])[-1]
|
||||
if 'media' in it:
|
||||
for key in it['media']:
|
||||
urls.append(key['publicUrl'])
|
||||
elif item.contentType == 'tvshow':
|
||||
action = 'epmenu'
|
||||
urls = it['mediasetprogram$brandId']
|
||||
for key in it['media']:
|
||||
urls.append(key['publicUrl'])
|
||||
else:
|
||||
if 'media' in it:
|
||||
action = 'findvideos'
|
||||
contentType = 'movie'
|
||||
urls = []
|
||||
for key in it['media']:
|
||||
urls.append(key['publicUrl'])
|
||||
else:
|
||||
action = 'epmenu'
|
||||
contentType = 'tvshow'
|
||||
urls = it['mediasetprogram$brandId']
|
||||
action = 'epmenu'
|
||||
contentType = 'tvshow'
|
||||
urls = it['mediasetprogram$brandId']
|
||||
if urls:
|
||||
title = it['mediasetprogram$brandTitle'] + ' - ' if 'mediasetprogram$brandTitle' in it and it['mediasetprogram$brandTitle'] != it['title'] else ''
|
||||
itemlist.append(
|
||||
@@ -254,14 +254,14 @@ def episodios(item):
|
||||
for key in it['media']:
|
||||
urls.append(key['publicUrl'])
|
||||
if urls:
|
||||
title = it['title'].split('-')[-1].strip()
|
||||
if it['tvSeasonNumber'] and it['tvSeasonEpisodeNumber'] and 'puntata del' not in title.lower():
|
||||
item.infoLabels['season'] = it['tvSeasonNumber']
|
||||
item.infoLabels['episode'] = it['tvSeasonEpisodeNumber']
|
||||
episode = '%dx%02d - ' % (it['tvSeasonNumber'], it['tvSeasonEpisodeNumber'])
|
||||
title = it['title']
|
||||
# if it['tvSeasonNumber'] and it['tvSeasonEpisodeNumber'] and 'puntata del' not in title.lower():
|
||||
# item.infoLabels['season'] = it['tvSeasonNumber']
|
||||
# item.infoLabels['episode'] = it['tvSeasonEpisodeNumber']
|
||||
# episode = '%dx%02d - ' % (it['tvSeasonNumber'], it['tvSeasonEpisodeNumber'])
|
||||
itemlist.append(
|
||||
item.clone(action='findvideos',
|
||||
title=support.typo(episode + title, 'bold'),
|
||||
title=support.typo(title, 'bold'),
|
||||
contentType='episode',
|
||||
thumbnail=it['thumbnails']['image_vertical-264x396']['url'] if 'image_vertical-264x396' in it['thumbnails'] else '',
|
||||
fanart=it['thumbnails']['image_keyframe_poster-1280x720']['url'] if 'image_keyframe_poster-1280x720' in it['thumbnails'] else '',
|
||||
@@ -271,9 +271,12 @@ def episodios(item):
|
||||
year=it.get('year',''),
|
||||
forcethumb=True,
|
||||
no_return=True))
|
||||
if episode:
|
||||
itemlist = sorted(itemlist, key=lambda it: it.title)
|
||||
support.videolibrary(itemlist, item)
|
||||
# support.dbg()
|
||||
if 'episodi' in item.title.lower() or 'puntate intere' in item.title.lower():
|
||||
itemlist.reverse()
|
||||
# if episode:
|
||||
# itemlist = sorted(itemlist, key=lambda it: it.title)
|
||||
# support.videolibrary(itemlist, item)
|
||||
return itemlist
|
||||
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@ def search(item, texto):
|
||||
|
||||
|
||||
item.contentType = 'tvshow'
|
||||
item.url = host + "/search/" + texto
|
||||
item.url = host + "/?s=" + texto
|
||||
try:
|
||||
return peliculas(item)
|
||||
# Continua la ricerca in caso di errore .
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
# Canale per vvvvid
|
||||
# ----------------------------------------------------------
|
||||
import requests, sys, inspect
|
||||
from core import support, tmdb
|
||||
from core import jsontools, support, tmdb
|
||||
from platformcode import autorenumber, logger, config
|
||||
|
||||
host = support.config.get_channel_url()
|
||||
@@ -135,41 +135,35 @@ def peliculas(item):
|
||||
|
||||
def episodios(item):
|
||||
itemlist = []
|
||||
json_file = current_session.get(item.url, headers=headers, params=payload).json()
|
||||
for i, block in enumerate(json_file['data']):
|
||||
if len(json_file['data']) > 1:
|
||||
prepend = str(i + 1) + 'x'
|
||||
if item.episodes:
|
||||
episodes = item.episodes
|
||||
show_id = item.show_id
|
||||
season_id = item.season_id
|
||||
else:
|
||||
json_file = current_session.get(item.url, headers=headers, params=payload).json()['data']
|
||||
if len(json_file) > 1:
|
||||
for key in json_file:
|
||||
itemlist.append(item.clone(title=support.typo(key['name'],'bold'), show_id = str(key['show_id']), season_id = str(key['season_id']), episodes = key['episodes']))
|
||||
return itemlist
|
||||
else:
|
||||
prepend = 'Episodio '
|
||||
show_id = str(block['show_id'])
|
||||
season_id = str(block['season_id'])
|
||||
episodes = []
|
||||
support.info('SEASON ID= ',season_id)
|
||||
for episode in json_file['data']:
|
||||
episodes.append(episode['episodes'])
|
||||
for episode in episodes:
|
||||
for key in episode:
|
||||
if 'stagione' in encode(key['title']).lower():
|
||||
season = support.match(encode(key['title']), patron=r'[Ss]tagione\s*(\d+)').match
|
||||
episode = support.match(encode(key['title']), patron=r'[Ee]pisodio\s*(\d+)').match
|
||||
if season and episode:
|
||||
title = season + 'x' + episode + ' - ' + item.fulltitle
|
||||
make_item = True
|
||||
elif int(key['season_id']) == int(season_id):
|
||||
try:
|
||||
title = prepend + key['number'] + ' - ' + key['title'].encode('utf8')
|
||||
except:
|
||||
title = prepend + key['number'] + ' - ' + key['title']
|
||||
make_item = True
|
||||
else:
|
||||
make_item = False
|
||||
if make_item == True:
|
||||
if type(title) == tuple: title = title[0]
|
||||
itemlist.append(
|
||||
item.clone(title = title,
|
||||
url= host + show_id + '/season/' + str(key['season_id']),
|
||||
action= 'findvideos',
|
||||
video_id= key['video_id']))
|
||||
episodes = json_file[0]['episodes']
|
||||
show_id = str(json_file[0]['show_id'])
|
||||
season_id = str(json_file[0]['season_id'])
|
||||
|
||||
|
||||
for episode in episodes:
|
||||
try:
|
||||
title = 'Episodio ' + episode['number'] + ' - ' + episode['title'].encode('utf8')
|
||||
except:
|
||||
title = 'Episodio ' + episode['number'] + ' - ' + episode['title']
|
||||
|
||||
if type(title) == tuple: title = title[0]
|
||||
itemlist.append(
|
||||
item.clone(title = support.typo(title, 'bold'),
|
||||
url= host + show_id + '/season/' + str(season_id),
|
||||
action= 'findvideos',
|
||||
video_id= episode['video_id']))
|
||||
|
||||
if inspect.stack()[1][3] not in ['find_episodes']:
|
||||
autorenumber.start(itemlist, item)
|
||||
if autorenumber.check(item) == True \
|
||||
|
||||
Reference in New Issue
Block a user