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

TMDB Fallback Language e informazioni per singoli episodi

Browse Source
This commit is contained in:
Alhaziel01
2021-04-29 16:19:55 +02:00
parent 0eae151584
commit 5988776120
7 changed files with 489 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/support.py
+16 -11
View File
@@ -385,7 +385,8 @@ def scrapeBlock(item, args, block, patron, headers, action, pagination, debug, t
contentSerieName= title if 'movie' not in [contentType] and function != 'episodios' else item.contentSerieName, contentSerieName= title if 'movie' not in [contentType] and function != 'episodios' else item.contentSerieName,
contentTitle= title if 'movie' in [contentType] and function == 'peliculas' else item.contentTitle, contentTitle= title if 'movie' in [contentType] and function == 'peliculas' else item.contentTitle,
contentLanguage = lang1, contentLanguage = lang1,
contentEpisodeNumber=episode if episode else '', contentSeasonNumber= infolabels.get('season', ''),
contentEpisodeNumber=infolabels.get('episode', ''),
news= item.news if item.news else '', news= item.news if item.news else '',
other = scraped['other'] if scraped['other'] else '', other = scraped['other'] if scraped['other'] else '',
grouped=group grouped=group
@@ -530,15 +531,25 @@ def scrape(func):
itemlist = newFunc() itemlist = newFunc()
itemlist = [i for i in itemlist if i.action not in ['add_pelicula_to_library', 'add_serie_to_library']] itemlist = [i for i in itemlist if i.action not in ['add_pelicula_to_library', 'add_serie_to_library']]
if action != 'play' and function != 'episodios' and 'patronMenu' not in args and item.contentType in ['movie', 'tvshow', 'episode', 'undefined'] and not disabletmdb: if anime and inspect.stack()[1][3] not in ['find_episodes']:
from platformcode import autorenumber
if function == 'episodios': autorenumber.start(itemlist, item)
else: autorenumber.start(itemlist)
if action != 'play' and 'patronMenu' not in args and not disabletmdb: # and function != 'episodios' and item.contentType in ['movie', 'tvshow', 'episode', 'undefined']
tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
if not group and not args.get('groupExplode') and ((pagination and len(matches) <= pag * pagination) or not pagination): # next page with pagination if not group and not args.get('groupExplode') and ((pagination and len(matches) <= pag * pagination) or not pagination): # next page with pagination
if patronNext and inspect.stack()[1][3] not in ['newest'] and len(inspect.stack()) > 2 and inspect.stack()[2][3] not in ['get_channel_results']: if patronNext and inspect.stack()[1][3] not in ['newest'] and len(inspect.stack()) > 2 and inspect.stack()[2][3] not in ['get_channel_results']:
nextPage(itemlist, item, data, patronNext, function) nextPage(itemlist, item, data, patronNext, function)
# if function == 'episodios': for it in itemlist:
# scraper.sort_episode_list(itemlist) if it.contentEpisodeNumber and it.contentSeason:
it.title = '[B]{:d}x{:02d} - {}[/B]'.format(it.contentSeason, it.contentEpisodeNumber, it.infoLabels['title'] if it.infoLabels['title'] else it.fulltitle)
if it.contentLanguage:
it.title += typo(it.contentLanguage, '_ [] color kod')
if it.quality:
it.title += typo(it.quality, '_ [] color kod')
# next page for pagination # next page for pagination
if pagination and len(matches) > pag * pagination and not search: if pagination and len(matches) > pag * pagination and not search:
@@ -556,13 +567,7 @@ def scrape(func):
thumbnail=thumb(), thumbnail=thumb(),
prevthumb=item.prevthumb if item.prevthumb else item.thumbnail)) prevthumb=item.prevthumb if item.prevthumb else item.thumbnail))
if anime and inspect.stack()[1][3] not in ['find_episodes']:
from platformcode import autorenumber
if function == 'episodios': autorenumber.start(itemlist, item)
else: autorenumber.start(itemlist)
# if anime and autorenumber.check(item) == False and len(itemlist)>0 and not scrapertools.find_single_match(itemlist[0].title, r'(\d+.\d+)'):
# pass
# else:
if inspect.stack()[1][3] not in ['find_episodes']: if inspect.stack()[1][3] not in ['find_episodes']:
if addVideolibrary and (item.infoLabels["title"] or item.fulltitle): if addVideolibrary and (item.infoLabels["title"] or item.fulltitle):
# item.fulltitle = item.infoLabels["title"] # item.fulltitle = item.infoLabels["title"]
core/tmdb.py
+403 -345
View File
File diff suppressed because it is too large Load Diff
platformcode/infoplus.py
+4 -4
View File
@@ -107,7 +107,7 @@ class MainWindow(xbmcgui.WindowXMLDialog):
Trailer(info) Trailer(info)
elif control_id in [IMAGES]: elif control_id in [IMAGES]:
info = self.getControl(RECOMANDED).getSelectedItem() info = self.getControl(RECOMANDED).getSelectedItem()
images = tmdb.Tmdb(id_Tmdb=info.getProperty('tmdb_id'), tipo='movie' if mode == 'movie' else 'tv').result.get("images", {}) images = tmdb.Tmdb(id_Tmdb=info.getProperty('tmdb_id'), search_type='movie' if mode == 'movie' else 'tv').result.get("images", {})
for key, value in list(images.items()): for key, value in list(images.items()):
if not value: images.pop(key) if not value: images.pop(key)
ImagesWindow(tmdb = images).doModal() ImagesWindow(tmdb = images).doModal()
@@ -287,7 +287,7 @@ def Trailer(info):
trailers_list = [] trailers_list = []
Type = info.getProperty('mediatype') Type = info.getProperty('mediatype')
if Type != "movie": Type = "tv" if Type != "movie": Type = "tv"
trailers_list = tmdb.Tmdb(id_Tmdb=info.getProperty('tmdb_id'), tipo=Type).get_videos() trailers_list = tmdb.Tmdb(id_Tmdb=info.getProperty('tmdb_id'), search_type=Type).get_videos()
if trailers_list: if trailers_list:
for i, trailer in enumerate(trailers_list): for i, trailer in enumerate(trailers_list):
item = xbmcgui.ListItem(trailer['name']) item = xbmcgui.ListItem(trailer['name'])
@@ -444,7 +444,7 @@ def get_recomendations(info):
Type = info.getProperty('mediatype') Type = info.getProperty('mediatype')
if Type != "movie": Type = "tv" if Type != "movie": Type = "tv"
search = {'url': '%s/%s/recommendations' % (Type, info.getProperty('tmdb_id')), 'language': 'it', 'page': 1} search = {'url': '%s/%s/recommendations' % (Type, info.getProperty('tmdb_id')), 'language': 'it', 'page': 1}
tmdb_res = tmdb.Tmdb(discover=search, tipo=Type, idioma_Search='it').results tmdb_res = tmdb.Tmdb(discover=search, search_type=Type, idioma_Search='it').results
for result in tmdb_res: for result in tmdb_res:
if Type == 'movie': if Type == 'movie':
title = result.get("title", '') title = result.get("title", '')
@@ -473,7 +473,7 @@ def get_cast(info):
cast_list = [] cast_list = []
actors_list = [] actors_list = []
Type = "movie" if info.getProperty('mediatype') == 'movie' else 'tv' Type = "movie" if info.getProperty('mediatype') == 'movie' else 'tv'
otmdb = tmdb.Tmdb(id_Tmdb=info.getProperty('tmdb_id'), tipo=Type) otmdb = tmdb.Tmdb(id_Tmdb=info.getProperty('tmdb_id'), search_type=Type)
actors = otmdb.result.get("credits", {}).get("cast", []) actors = otmdb.result.get("credits", {}).get("cast", [])
cast = otmdb.result.get("credits", {}).get("crew", []) if Type == 'movie' else otmdb.result.get("created_by", []) cast = otmdb.result.get("credits", {}).get("crew", []) if Type == 'movie' else otmdb.result.get("created_by", [])
for i, crew in enumerate(cast): for i, crew in enumerate(cast):
specials/globalsearch.py
+1 -1
View File
@@ -139,7 +139,7 @@ class SearchWindow(xbmcgui.WindowXML):
tmdb_info = tmdb.discovery(self.item, dict_=self.item.discovery) tmdb_info = tmdb.discovery(self.item, dict_=self.item.discovery)
results = tmdb_info.results.get('cast',[]) results = tmdb_info.results.get('cast',[])
else: else:
tmdb_info = tmdb.Tmdb(texto_buscado=self.item.text, tipo=self.item.mode.replace('show', '')) tmdb_info = tmdb.Tmdb(searched_text=self.item.text, search_type=self.item.mode.replace('show', ''))
results = tmdb_info.results results = tmdb_info.results
for result in results: for result in results:
specials/search.py
+2 -2
View File
@@ -135,7 +135,7 @@ def new_search(item):
return actor_list(item) return actor_list(item)
if item.mode != 'all': if item.mode != 'all':
tmdb_info = tmdb.Tmdb(texto_buscado=searched_text, tipo=item.mode.replace('show', '')) tmdb_info = tmdb.Tmdb(searched_text=searched_text, search_type=item.mode.replace('show', ''))
results = tmdb_info.results results = tmdb_info.results
for result in results: for result in results:
result = tmdb_info.get_infoLabels(result, origen=result) result = tmdb_info.get_infoLabels(result, origen=result)
@@ -563,7 +563,7 @@ def genres_menu(item):
itemlist = [] itemlist = []
mode = item.mode.replace('show', '') mode = item.mode.replace('show', '')
genres = tmdb.get_genres(mode) genres = tmdb.get_dic_genres(mode)
for key, value in list(genres[mode].items()): for key, value in list(genres[mode].items()):
discovery = {'url': 'discover/%s' % mode, 'with_genres': key, discovery = {'url': 'discover/%s' % mode, 'with_genres': key,
'language': def_lang, 'page': '1'} 'language': def_lang, 'page': '1'}
specials/trailertools.py
+2 -2
View File
@@ -165,9 +165,9 @@ def tmdb_trailers(item, dialog, tipo="movie"):
itemlist = [] itemlist = []
tmdb_search = None tmdb_search = None
if item.infoLabels['tmdb_id']: if item.infoLabels['tmdb_id']:
tmdb_search = Tmdb(id_Tmdb=item.infoLabels['tmdb_id'], tipo=tipo, idioma_busqueda=def_lang) tmdb_search = Tmdb(id_Tmdb=item.infoLabels['tmdb_id'], tipo=tipo, search_language=def_lang)
elif item.infoLabels['year']: elif item.infoLabels['year']:
tmdb_search = Tmdb(texto_buscado=item.contentTitle, tipo=tipo, year=item.infoLabels['year']) tmdb_search = Tmdb(searched_text=item.contentTitle, tipo=tipo, year=item.infoLabels['year'])
if tmdb_search: if tmdb_search:
found = False found = False
specials/tvmoviedb.py
+61 -61
View File
@@ -242,7 +242,7 @@ def mal(item):
itemlist.append(item.clone(title=config.get_localized_string(70058), url="https://myanimelist.net/topanime.php?type=tv&limit=0", action="top_mal", contentType="tvshow", args="tv")) itemlist.append(item.clone(title=config.get_localized_string(70058), url="https://myanimelist.net/topanime.php?type=tv&limit=0", action="top_mal", contentType="tvshow", args="tv"))
itemlist.append(item.clone(title=config.get_localized_string(70059), url="https://myanimelist.net/topanime.php?type=movie&limit=0", action="top_mal", contentType="movie", args="movie")) itemlist.append(item.clone(title=config.get_localized_string(70059), url="https://myanimelist.net/topanime.php?type=movie&limit=0", action="top_mal", contentType="movie", args="movie"))
itemlist.append(item.clone(title=config.get_localized_string(70061), url="https://myanimelist.net/topanime.php?type=ova&limit=0", action="top_mal", contentType="tvshow", args="tv", tipo="ova")) itemlist.append(item.clone(title=config.get_localized_string(70061), url="https://myanimelist.net/topanime.php?type=ova&limit=0", action="top_mal", contentType="tvshow", args="tv", Type="ova"))
itemlist.append(item.clone(title=config.get_localized_string(70028), url="https://myanimelist.net/topanime.php?type=bypopularity&limit=0", action="top_mal")) itemlist.append(item.clone(title=config.get_localized_string(70028), url="https://myanimelist.net/topanime.php?type=bypopularity&limit=0", action="top_mal"))
itemlist.append(item.clone(title=config.get_localized_string(70060), url="https://myanimelist.net/topanime.php?type=upcoming&limit=0", action="top_mal")) itemlist.append(item.clone(title=config.get_localized_string(70060), url="https://myanimelist.net/topanime.php?type=upcoming&limit=0", action="top_mal"))
itemlist.append(item.clone(title=config.get_localized_string(70062), url="", action="indices_mal")) itemlist.append(item.clone(title=config.get_localized_string(70062), url="", action="indices_mal"))
@@ -267,15 +267,15 @@ def list_tmdb(item):
# List of actors # List of actors
if 'nm' in item.infoLabels['imdb_id']: if 'nm' in item.infoLabels['imdb_id']:
try: try:
ob_tmdb = Tmdb(discover=item.search, tipo=item.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=item.search, search_type=item.args, search_language=langt)
id_cast = ob_tmdb.result["person_results"][0]["id"] id_cast = ob_tmdb.result["person_results"][0]["id"]
if item.contentType == "movie": item.search = {'url': 'discover/movie', 'with_cast': id_cast, 'page': item.pagina, 'sort_by': 'primary_release_date.desc', 'language': langt} if item.contentType == "movie": item.search = {'url': 'discover/movie', 'with_cast': id_cast, 'page': item.pagina, 'sort_by': 'primary_release_date.desc', 'language': langt}
else:item.search = {'url': 'person/%s/tv_credits' % id_cast, 'language': langt} else:item.search = {'url': 'person/%s/tv_credits' % id_cast, 'language': langt}
ob_tmdb = Tmdb(discover=item.search, tipo=item.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=item.search, search_type=item.args, search_language=langt)
except: except:
pass pass
else: else:
ob_tmdb = Tmdb(discover=item.search, tipo=item.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=item.search, search_type=item.args, search_language=langt)
# Sagas and collections # Sagas and collections
if "collection" in item.search["url"]: if "collection" in item.search["url"]:
@@ -307,8 +307,8 @@ def list_tmdb(item):
new_item.infoLabels = ob_tmdb.get_infoLabels(new_item.infoLabels, origen=ob_tmdb.results[i]) new_item.infoLabels = ob_tmdb.get_infoLabels(new_item.infoLabels, origen=ob_tmdb.results[i])
# If there is no synopsis in the chosen language, search in the alternative # If there is no synopsis in the chosen language, search in the alternative
if not new_item.infoLabels["plot"] and not 'person' in item.search["url"]: if not new_item.infoLabels["plot"] and not 'person' in item.search["url"]:
ob_tmdb2 = Tmdb(id_Tmdb=new_item.infoLabels["tmdb_id"], tipo=item.args, idioma_busqueda=langt_alt) ob_tmdb2 = Tmdb(id_Tmdb=new_item.infoLabels["tmdb_id"], search_type=item.args, search_language=langt_alt)
new_item.infoLabels["plot"] = ob_tmdb2.get_sinopsis() new_item.infoLabels["plot"] = ob_tmdb2.get_plot()
if new_item.infoLabels['thumbnail']: if new_item.infoLabels['thumbnail']:
new_item.thumbnail = new_item.infoLabels['thumbnail'] new_item.thumbnail = new_item.infoLabels['thumbnail']
elif new_item.infoLabels['profile_path']: elif new_item.infoLabels['profile_path']:
@@ -375,10 +375,10 @@ def details(item):
pics = match(data, patron=r'showAllVidsAndPics.*?href=".*?(tt\d+)').match pics = match(data, patron=r'showAllVidsAndPics.*?href=".*?(tt\d+)').match
if pics: images["imdb"] = {'url': 'http://www.imdb.com/_json/title/%s/mediaviewer' % pics} if pics: images["imdb"] = {'url': 'http://www.imdb.com/_json/title/%s/mediaviewer' % pics}
ob_tmdb = Tmdb(external_id=item.infoLabels["imdb_id"], external_source="imdb_id", tipo=item.args, idioma_busqueda=langt) ob_tmdb = Tmdb(external_id=item.infoLabels["imdb_id"], external_source="imdb_id", search_type=item.args, search_language=langt)
item.infoLabels["tmdb_id"] = ob_tmdb.get_id() item.infoLabels["tmdb_id"] = ob_tmdb.get_id()
ob_tmdb = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.args, idioma_busqueda=langt) ob_tmdb = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], search_type=item.args, search_language=langt)
try: try:
item.infoLabels = ob_tmdb.get_infoLabels(item.infoLabels) item.infoLabels = ob_tmdb.get_infoLabels(item.infoLabels)
@@ -420,7 +420,7 @@ def details(item):
itemlist.append(item.clone(channel='search', action="search", search_text=item.infoLabels['originaltitle'], title=config.get_localized_string(70070) % item.infoLabels['originaltitle'], mode=item.contentType)) itemlist.append(item.clone(channel='search', action="search", search_text=item.infoLabels['originaltitle'], title=config.get_localized_string(70070) % item.infoLabels['originaltitle'], mode=item.contentType))
# if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: # if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]:
# tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.args, idioma_busqueda=def_lang) # tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], search_type=item.args, search_language=def_lang)
# if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle and tmdb_lang.result["title"] != item.infoLabels['originaltitle']: # if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle and tmdb_lang.result["title"] != item.infoLabels['originaltitle']:
# tmdb_lang = tmdb_lang.result["title"] # tmdb_lang = tmdb_lang.result["title"]
# itemlist.append(item.clone(channel='search', action="search", title=config.get_localized_string(70066) % tmdb_lang, contentTitle=tmdb_lang, mode=item.contentType)) # itemlist.append(item.clone(channel='search', action="search", title=config.get_localized_string(70066) % tmdb_lang, contentTitle=tmdb_lang, mode=item.contentType))
@@ -500,7 +500,7 @@ def distribution(item):
itemlist = [] itemlist = []
item.args=item.contentType.replace('tvshow','tv') item.args=item.contentType.replace('tvshow','tv')
item.search = {'url': '%s/%s/credits' % (item.args, item.infoLabels['tmdb_id'])} item.search = {'url': '%s/%s/credits' % (item.args, item.infoLabels['tmdb_id'])}
ob_tmdb = Tmdb(discover=item.search, tipo=item.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=item.search, search_type=item.args, search_language=langt)
try: try:
cast = ob_tmdb.result["cast"] cast = ob_tmdb.result["cast"]
@@ -545,7 +545,7 @@ def distribution(item):
def info_seasons(item): def info_seasons(item):
# Season and episode info # Season and episode info
itemlist = [] itemlist = []
ob_tmdb = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo="tv", idioma_busqueda=langt) ob_tmdb = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], search_type="tv", search_language=langt)
logger.info(item.infoLabels) logger.info(item.infoLabels)
for temp in range(int(item.infoLabels["number_of_seasons"]), 0, -1): for temp in range(int(item.infoLabels["number_of_seasons"]), 0, -1):
@@ -1217,19 +1217,19 @@ def indices_imdb(item):
# item_tmdb = item.clone() # item_tmdb = item.clone()
# if item.contentType == "movie": # if item.contentType == "movie":
# ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, year=item_tmdb.infoLabels['year'], tipo=item_tmdb.args, # ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, year=item_tmdb.infoLabels['year'], search_type=item_tmdb.args,
# idioma_busqueda=langt) # search_language=langt)
# if not ob_tmdb.result: # if not ob_tmdb.result:
# ob_tmdb = Tmdb(text_buscado=item_tmdb.infoLabels['originaltitle'], year=item_tmdb.infoLabels['year'], # ob_tmdb = Tmdb(text_buscado=item_tmdb.infoLabels['originaltitle'], year=item_tmdb.infoLabels['year'],
# tipo=item_tmdb.args, idioma_busqueda=langt) # search_type=item_tmdb.args, search_language=langt)
# else: # else:
# ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, tipo=item_tmdb.args, idioma_busqueda=langt) # ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, search_type=item_tmdb.args, search_language=langt)
# if not ob_tmdb.result: # if not ob_tmdb.result:
# ob_tmdb = Tmdb(text_buscado=item_tmdb.infoLabels['tvshowtitle'], tipo=item_tmdb.args, # ob_tmdb = Tmdb(text_buscado=item_tmdb.infoLabels['tvshowtitle'], search_type=item_tmdb.args,
# idioma_busqueda=langt) # search_language=langt)
# if ob_tmdb.result: # if ob_tmdb.result:
# ob_tmdb = Tmdb(id_Tmdb=ob_tmdb.get_id(), tipo=item_tmdb.args, idioma_busqueda=langt) # ob_tmdb = Tmdb(id_Tmdb=ob_tmdb.get_id(), search_type=item_tmdb.args, search_language=langt)
# item.infoLabels = ob_tmdb.get_infoLabels(item.infoLabels) # item.infoLabels = ob_tmdb.get_infoLabels(item.infoLabels)
# # If there is no synopsis in the chosen language, search in the alternative # # If there is no synopsis in the chosen language, search in the alternative
@@ -1289,7 +1289,7 @@ def indices_imdb(item):
# title=config.get_localized_string(70070) % item.infoLabels['originaltitle'])) # title=config.get_localized_string(70070) % item.infoLabels['originaltitle']))
# if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]: # if langt != "es" and langt != "en" and item.infoLabels["tmdb_id"]:
# tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], tipo=item.args, idioma_busqueda=def_lang) # tmdb_lang = Tmdb(id_Tmdb=item.infoLabels["tmdb_id"], search_type=item.args, search_language=def_lang)
# if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle: # if tmdb_lang.result.get("title") and tmdb_lang.result["title"] != item.contentTitle:
# tmdb_lang = tmdb_lang.result["title"] # tmdb_lang = tmdb_lang.result["title"]
# itemlist.append(item.clone(action="searching", title=config.get_localized_string(70066) % tmdb_lang, # itemlist.append(item.clone(action="searching", title=config.get_localized_string(70066) % tmdb_lang,
@@ -1778,11 +1778,11 @@ def imagenes(item):
for key, value in item.images.items(): for key, value in item.images.items():
if key == "tmdb" and "Tmdb" in item.title: if key == "tmdb" and "Tmdb" in item.title:
if item.folder: if item.folder:
for tipo, child in value.iteritems(): for Type, child in value.iteritems():
for i, imagen in enumerate(child): for i, imagen in enumerate(child):
thumb = 'https://image.tmdb.org/t/p/w500' + imagen["file_path"] thumb = 'https://image.tmdb.org/t/p/w500' + imagen["file_path"]
fanart = 'https://image.tmdb.org/t/p/original' + imagen["file_path"] fanart = 'https://image.tmdb.org/t/p/original' + imagen["file_path"]
title = " %s %s [%sx%s]" % (tipo.capitalize(), i + 1, imagen["width"], imagen["height"]) title = " %s %s [%sx%s]" % (Type.capitalize(), i + 1, imagen["width"], imagen["height"])
itemlist.append(Item(channel=item.channel, action="", thumbnail=thumb, fanart=fanart, itemlist.append(Item(channel=item.channel, action="", thumbnail=thumb, fanart=fanart,
title=title, infoLabels=item.infoLabels)) title=title, infoLabels=item.infoLabels))
else: else:
@@ -1790,11 +1790,11 @@ def imagenes(item):
elif key == "fanart.tv": elif key == "fanart.tv":
if item.folder: if item.folder:
for tipo, child in value.iteritems(): for Type, child in value.iteritems():
for i, imagen in enumerate(child): for i, imagen in enumerate(child):
thumb = imagen["url"].replace("/fanart/", "/preview/") thumb = imagen["url"].replace("/fanart/", "/preview/")
fanart = imagen["url"] fanart = imagen["url"]
title = " %s %s [%s]" % (tipo.capitalize(), i + 1, imagen["lang"]) title = " %s %s [%s]" % (Type.capitalize(), i + 1, imagen["lang"])
itemlist.append(Item(channel=item.channel, action="", thumbnail=thumb, fanart=fanart, itemlist.append(Item(channel=item.channel, action="", thumbnail=thumb, fanart=fanart,
title=title, infoLabels=item.infoLabels)) title=title, infoLabels=item.infoLabels))
else: else:
@@ -1838,7 +1838,7 @@ def fanartv(item):
id_search = item.infoLabels['tmdb_id'] id_search = item.infoLabels['tmdb_id']
if item.contentType == "tvshow" and id_search: if item.contentType == "tvshow" and id_search:
search = {'url': 'tv/%s/external_ids' % item.infoLabels['tmdb_id'], 'language': langt} search = {'url': 'tv/%s/external_ids' % item.infoLabels['tmdb_id'], 'language': langt}
ob_tmdb = Tmdb(discover=search, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=search, search_language=langt)
id_search = ob_tmdb.result.get("tvdb_id") id_search = ob_tmdb.result.get("tvdb_id")
resultado = False resultado = False
@@ -1869,27 +1869,27 @@ def menu_trakt(item):
# Menu with trakt account actions (views, watchlist, collection) # Menu with trakt account actions (views, watchlist, collection)
itemlist = [] itemlist = []
token_auth = config.get_setting("token_trakt", "trakt") token_auth = config.get_setting("token_trakt", "trakt")
tipo = item.args.replace("tv", "show") + "s" Type = item.args.replace("tv", "show") + "s"
title = item.contentType.replace("movie", config.get_localized_string(70283)).replace("tvshow", config.get_localized_string(30123)) title = item.contentType.replace("movie", config.get_localized_string(70283)).replace("tvshow", config.get_localized_string(30123))
try: try:
result = acciones_trakt(item.clone(url="sync/watched/%s" % tipo)) result = acciones_trakt(item.clone(url="sync/watched/%s" % Type))
post = {tipo: [{"ids": {"tmdb": item.infoLabels["tmdb_id"]}}]} post = {Type: [{"ids": {"tmdb": item.infoLabels["tmdb_id"]}}]}
if '"tmdb":%s' % item.infoLabels["tmdb_id"] in result: itemlist.append(item.clone(title=config.get_localized_string(70341) % title, action="acciones_trakt", url="sync/history/remove", post=post)) if '"tmdb":%s' % item.infoLabels["tmdb_id"] in result: itemlist.append(item.clone(title=config.get_localized_string(70341) % title, action="acciones_trakt", url="sync/history/remove", post=post))
else: itemlist.append(item.clone(title=config.get_localized_string(70342) % title, action="acciones_trakt", url="sync/history", post=post)) else: itemlist.append(item.clone(title=config.get_localized_string(70342) % title, action="acciones_trakt", url="sync/history", post=post))
except: except:
pass pass
try: try:
result = acciones_trakt(item.clone(url="sync/watchlist/%s" % tipo)) result = acciones_trakt(item.clone(url="sync/watchlist/%s" % Type))
post = {tipo: [{"ids": {"tmdb": item.infoLabels["tmdb_id"]}}]} post = {Type: [{"ids": {"tmdb": item.infoLabels["tmdb_id"]}}]}
if '"tmdb":%s' % item.infoLabels["tmdb_id"] in result: itemlist.append(item.clone(title=config.get_localized_string(70343) % title, action="acciones_trakt", url="sync/watchlist/remove", post=post)) if '"tmdb":%s' % item.infoLabels["tmdb_id"] in result: itemlist.append(item.clone(title=config.get_localized_string(70343) % title, action="acciones_trakt", url="sync/watchlist/remove", post=post))
else: itemlist.append(item.clone(title=config.get_localized_string(70344) % title, action="acciones_trakt", url="sync/watchlist", post=post)) else: itemlist.append(item.clone(title=config.get_localized_string(70344) % title, action="acciones_trakt", url="sync/watchlist", post=post))
except: except:
pass pass
try: try:
result = acciones_trakt(item.clone(url="sync/collection/%s" % tipo)) result = acciones_trakt(item.clone(url="sync/collection/%s" % Type))
post = {tipo: [{"ids": {"tmdb": item.infoLabels["tmdb_id"]}}]} post = {Type: [{"ids": {"tmdb": item.infoLabels["tmdb_id"]}}]}
if '"tmdb":%s' % item.infoLabels["tmdb_id"] in result: itemlist.append(item.clone(title=config.get_localized_string(70345) % title, action="acciones_trakt", url="sync/collection/remove", post=post)) if '"tmdb":%s' % item.infoLabels["tmdb_id"] in result: itemlist.append(item.clone(title=config.get_localized_string(70345) % title, action="acciones_trakt", url="sync/collection/remove", post=post))
else: itemlist.append(item.clone(title=config.get_localized_string(70346) % title, action="acciones_trakt", url="sync/collection", post=post)) else: itemlist.append(item.clone(title=config.get_localized_string(70346) % title, action="acciones_trakt", url="sync/collection", post=post))
except: except:
@@ -2104,7 +2104,7 @@ def details_mal(item):
title_mal = item.contentTitle title_mal = item.contentTitle
if not item.args: if not item.args:
args = match(data, patron=r'Type:</span>.*?>([^<]+)</a>').match.lower() args = match(data, patron=r'Type:</span>.*?>([^<]+)</a>').match.lower()
item.tipo = args item.type = args
if args == "movie" or args == "special": if args == "movie" or args == "special":
item.args = "movie" item.args = "movie"
item.contentType = "movie" item.contentType = "movie"
@@ -2124,25 +2124,25 @@ def details_mal(item):
item_tmdb = item.clone() item_tmdb = item.clone()
if item.contentType == "movie": if item.contentType == "movie":
ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, year=item_tmdb.infoLabels['year'], tipo=item_tmdb.args, idioma_busqueda=langt) ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, year=item_tmdb.infoLabels['year'], search_type=item_tmdb.args, search_language=langt)
if not ob_tmdb.result and eng_title: if not ob_tmdb.result and eng_title:
ob_tmdb = Tmdb(text_buscado=eng_title, year=item_tmdb.infoLabels['year'], tipo=item_tmdb.args, idioma_busqueda=langt) ob_tmdb = Tmdb(text_buscado=eng_title, year=item_tmdb.infoLabels['year'], search_type=item_tmdb.args, search_language=langt)
if not ob_tmdb.result and ("Special (" in item.title or item.tipo == "special"): if not ob_tmdb.result and ("Special (" in item.title or item.type == "special"):
item_tmdb.args = "tv" item_tmdb.args = "tv"
search = {'url': 'search/tv', 'language': langt, 'query': item_tmdb.contentTitle, 'first_air_date': item_tmdb.infoLabels["year"]} search = {'url': 'search/tv', 'language': langt, 'query': item_tmdb.contentTitle, 'first_air_date': item_tmdb.infoLabels["year"]}
ob_tmdb = Tmdb(discover=search, tipo=item_tmdb.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=search, search_type=item_tmdb.args, search_language=langt)
else: else:
search = {'url': 'search/tv', 'language': langt, 'query': eng_title, 'first_air_date': item_tmdb.infoLabels["year"]} search = {'url': 'search/tv', 'language': langt, 'query': eng_title, 'first_air_date': item_tmdb.infoLabels["year"]}
ob_tmdb = Tmdb(discover=search, tipo=item_tmdb.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=search, search_type=item_tmdb.args, search_language=langt)
if not ob_tmdb.result and eng_title: if not ob_tmdb.result and eng_title:
search['query'] = eng_title search['query'] = eng_title
ob_tmdb = Tmdb(discover=search, tipo=item_tmdb.args, idioma_busqueda=langt) ob_tmdb = Tmdb(discover=search, search_type=item_tmdb.args, search_language=langt)
if not ob_tmdb.result and ("OVA (" in item.title or item.tipo == "ova"): if not ob_tmdb.result and ("OVA (" in item.title or item.type == "ova"):
item_tmdb.args = "movie" item_tmdb.args = "movie"
ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, tipo=item_tmdb.args, idioma_busqueda=langt, year=item_tmdb.infoLabels['year']) ob_tmdb = Tmdb(text_buscado=item_tmdb.contentTitle, search_type=item_tmdb.args, search_language=langt, year=item_tmdb.infoLabels['year'])
if ob_tmdb.result: if ob_tmdb.result:
ob_tmdb = Tmdb(id_Tmdb=ob_tmdb.get_id(), tipo=item_tmdb.args, idioma_busqueda=langt) ob_tmdb = Tmdb(id_Tmdb=ob_tmdb.get_id(), search_type=item_tmdb.args, search_language=langt)
item.infoLabels = ob_tmdb.get_infoLabels(item.infoLabels) item.infoLabels = ob_tmdb.get_infoLabels(item.infoLabels)
# Myanimelist synopsis is concatenated with that of tmdb if any # Myanimelist synopsis is concatenated with that of tmdb if any
@@ -2389,10 +2389,10 @@ def season_mal(item):
matches = match(block, patron=patron, debug=True).matches matches = match(block, patron=patron, debug=True).matches
if matches: if matches:
itemlist.append(Item(channel=item.channel, action="", title=head_title, )) itemlist.append(Item(channel=item.channel, action="", title=head_title, ))
for url, scrapedtitle, episode, genres, thumb, plot, tipo, year, score in matches: for url, scrapedtitle, episode, genres, thumb, plot, Type, year, score in matches:
if ("Hentai" in genres or "Yaoi" in genres or "Yuri" in genres) and adult_mal: continue if ("Hentai" in genres or "Yaoi" in genres or "Yuri" in genres) and adult_mal: continue
scrapedtitle = scrapedtitle.replace("(TV)", "").replace("(Movie)", "") scrapedtitle = scrapedtitle.replace("(TV)", "").replace("(Movie)", "")
if tipo == "Movie": title = scrapedtitle + " (%s)" % year if Type == "Movie": title = scrapedtitle + " (%s)" % year
else: title = scrapedtitle + " %ss (%s)" % (episode, year) else: title = scrapedtitle + " %ss (%s)" % (episode, year)
infoLabels = {} infoLabels = {}
if score != "N/A": if score != "N/A":
@@ -2403,23 +2403,23 @@ def season_mal(item):
genres = match(genres, patron=r'title="([^"]+)"').matches genres = match(genres, patron=r'title="([^"]+)"').matches
infoLabels["genre"] = ", ".join(genres) infoLabels["genre"] = ", ".join(genres)
tipo = tipo.lower() Type = Type.lower()
if tipo == "movie" or tipo == "special": if Type == "movie" or Type == "special":
args = "movie" args = "movie"
contentType = "movie" contentType = "movie"
else: else:
args = "tv" args = "tv"
contentType = "tvshow" contentType = "tvshow"
thumb = thumb.replace("r/167x242/", "") + "l.jpg" thumb = thumb.replace("r/167x242/", "") + "l.jpg"
itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title, thumbnail=thumb, infoLabels=infoLabels, args=args, tipo=tipo, contentTitle=scrapedtitle, contentType=contentType, fanart=default_fan)) itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title, thumbnail=thumb, infoLabels=infoLabels, args=args, Type=Type, contentTitle=scrapedtitle, contentType=contentType, fanart=default_fan))
else: else:
patron = r'<a href="([^"]+)" class="link-title">([^<]+)</a>.*?<span>(\? ep|\d+ ep).*?<div class="genres-inner js-genre-inner">(.*?)</div>.*?<div class="image".*?src="([^"]+).*?<span class="preline">(.*?)</span>.*?<div class="info">\s*(.*?)\s*-.*?(\d{4}).*?title="Score">\s*(N/A|\d\.\d+)' patron = r'<a href="([^"]+)" class="link-title">([^<]+)</a>.*?<span>(\? ep|\d+ ep).*?<div class="genres-inner js-genre-inner">(.*?)</div>.*?<div class="image".*?src="([^"]+).*?<span class="preline">(.*?)</span>.*?<div class="info">\s*(.*?)\s*-.*?(\d{4}).*?title="Score">\s*(N/A|\d\.\d+)'
matches = match(data, patron=patron).matches matches = match(data, patron=patron).matches
for url, scrapedtitle, epis, scrapedgenres, thumbnail, plot, tipo, year, score in matches: for url, scrapedtitle, epis, scrapedgenres, thumbnail, plot, Type, year, score in matches:
if ("Hentai" in scrapedgenres or "Yaoi" in scrapedgenres or "Yuri" in scrapedgenres) and not adult_mal: if ("Hentai" in scrapedgenres or "Yaoi" in scrapedgenres or "Yuri" in scrapedgenres) and not adult_mal:
continue continue
scrapedtitle = scrapedtitle.replace("(TV)", "").replace("(Movie)", "") scrapedtitle = scrapedtitle.replace("(TV)", "").replace("(Movie)", "")
if tipo == "Movie": if Type == "Movie":
title = scrapedtitle + " (%s)" % year title = scrapedtitle + " (%s)" % year
else: else:
title = scrapedtitle + " %ss (%s)" % (epis, year) title = scrapedtitle + " %ss (%s)" % (epis, year)
@@ -2432,8 +2432,8 @@ def season_mal(item):
genres = match(scrapedgenres, patron=r'title="([^"]+)"').matches genres = match(scrapedgenres, patron=r'title="([^"]+)"').matches
infoLabels["genre"] = ", ".join(genres) infoLabels["genre"] = ", ".join(genres)
tipo = tipo.lower() Type = Type.lower()
if tipo == "movie" or tipo == "special": if Type == "movie" or Type == "special":
args = "movie" args = "movie"
contentType = "movie" contentType = "movie"
else: else:
@@ -2441,7 +2441,7 @@ def season_mal(item):
contentType = "tvshow" contentType = "tvshow"
thumbnail = thumbnail.replace(".webp", ".jpg") thumbnail = thumbnail.replace(".webp", ".jpg")
itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title, itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title,
thumbnail=thumbnail, infoLabels=infoLabels, args=args, tipo=tipo, thumbnail=thumbnail, infoLabels=infoLabels, args=args, Type=Type,
contentTitle=scrapedtitle, contentType=contentType, contentTitle=scrapedtitle, contentType=contentType,
fanart=default_fan)) fanart=default_fan))
next_page = match(data, patron=r'<a class="link current" href.*?href="([^"]+)"').match next_page = match(data, patron=r'<a class="link current" href.*?href="([^"]+)"').match
@@ -2552,12 +2552,12 @@ def searching_mal(item):
data = match(item.url, headers=header_mal, cookies=False).data data = match(item.url, headers=header_mal, cookies=False).data
patron = r'<a class="hoverinfo_trigger" href="([^"]+)".*?(?:data-src|src)="([^"]+)".*?<div class="hoverinfo".*?href.*?><strong>([^<]+)<.*?<div class="pt4">(.*?)<.*?<td.*?>(.*?)</td>.*?<td.*?>(.*?)</td>.*?<td.*?>(.*?)</td>.*?<td.*?>(.*?)</td>' patron = r'<a class="hoverinfo_trigger" href="([^"]+)".*?(?:data-src|src)="([^"]+)".*?<div class="hoverinfo".*?href.*?><strong>([^<]+)<.*?<div class="pt4">(.*?)<.*?<td.*?>(.*?)</td>.*?<td.*?>(.*?)</td>.*?<td.*?>(.*?)</td>.*?<td.*?>(.*?)</td>'
matches = match(data, patron=patron).matches matches = match(data, patron=patron).matches
for url, thumb, title, plot, tipo, epis, rating, date in matches: for url, thumb, title, plot, Type, epis, rating, date in matches:
infolabels = {"mediatype": "tvshow"} infolabels = {"mediatype": "tvshow"}
contentType = "tvshow" contentType = "tvshow"
args = "tv" args = "tv"
title = title.strip() title = title.strip()
tipo = tipo.strip() Type = Type.strip()
rating = rating.strip() rating = rating.strip()
epis = epis.strip() epis = epis.strip()
infolabels["plot"] = htmlclean(plot.strip()) infolabels["plot"] = htmlclean(plot.strip())
@@ -2578,20 +2578,20 @@ def searching_mal(item):
import traceback import traceback
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
if tipo == "Movie" or tipo == "OVA": if Type == "Movie" or Type == "OVA":
infolabels["mediatype"] = "movie" infolabels["mediatype"] = "movie"
contentType = "movie" contentType = "movie"
args = "movie" args = "movie"
show = "" show = ""
if epis and tipo != "Movie": if epis and Type != "Movie":
title += " %s eps" % epis title += " %s eps" % epis
if rating != "0.00" and rating != "N/A": if rating != "0.00" and rating != "N/A":
infolabels["rating"] = float(rating) infolabels["rating"] = float(rating)
title += " %s" % (rating) title += " %s" % (rating)
itemlist.append(Item(channel=item.channel, title=title, action="details_mal", url=url, show=show, itemlist.append(Item(channel=item.channel, title=title, action="details_mal", url=url, show=show,
thumbnail=thumb, infoLabels=infolabels, contentTitle=contentitle, thumbnail=thumb, infoLabels=infolabels, contentTitle=contentitle,
contentType=contentType, tipo=tipo.lower(), args=args)) contentType=contentType, Type=Type.lower(), args=args))
if not "&show=" in item.url: if not "&show=" in item.url:
next_page = item.url + "&show=50" next_page = item.url + "&show=50"
@@ -2713,13 +2713,13 @@ def callback_mal(item, values):
genero_ids = "&".join(genero_ids) genero_ids = "&".join(genero_ids)
query = values["keyword"].replace(" ", "%20") query = values["keyword"].replace(" ", "%20")
tipo = item.valores["tipo"][values["tipo"]] Type = item.valores["tipo"][values["tipo"]]
valoracion = item.valores["valoracion"][values["valoracion"]] valoracion = item.valores["valoracion"][values["valoracion"]]
estado = item.valores["estado"][values["estado"]] estado = item.valores["estado"][values["estado"]]
item.url = "https://myanimelist.net/anime.php?q=%s&type=%s&score=%s&status=%s" \ item.url = "https://myanimelist.net/anime.php?q=%s&type=%s&score=%s&status=%s" \
"&p=0&r=0&sm=0&sd=0&sy=0&em=0&ed=0&ey=0&c[0]=a&c[1]=b&c[2]=c&c[3]=d&c[4]=f&gx=0" \ "&p=0&r=0&sm=0&sd=0&sy=0&em=0&ed=0&ey=0&c[0]=a&c[1]=b&c[2]=c&c[3]=d&c[4]=f&gx=0" \
% (query, tipo, valoracion, estado) % (query, Type, valoracion, estado)
if genero_ids: if genero_ids:
item.url += "&" + genero_ids item.url += "&" + genero_ids
@@ -2851,14 +2851,14 @@ def items_mal(item):
title = title.replace("] (TV)", "]") title = title.replace("] (TV)", "]")
elif title.count("(Movie)") == 2: elif title.count("(Movie)") == 2:
title = title.replace("] (Movie)", "]") title = title.replace("] (Movie)", "]")
tipo = "tvshow" Type = "tvshow"
args = "tv" args = "tv"
if "Movie" in d["anime_media_type_string"]: if "Movie" in d["anime_media_type_string"]:
tipo = "movie" Type = "movie"
args = "movie" args = "movie"
itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title, thumbnail=thumbnail, itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title, thumbnail=thumbnail,
contentTitle=contentTitle, contentType=tipo, args=args, login=True)) contentTitle=contentTitle, contentType=Type, args=args, login=True))
if itemlist: if itemlist:
itemlist.insert(0, Item(channel=item.channel, action="", title=config.get_localized_string(70387))) itemlist.insert(0, Item(channel=item.channel, action="", title=config.get_localized_string(70387)))