KoD 1.4.1
- ridisegnata la finestra della scelta film/serietv quando si aggiunge in videoteca\n- modifiche minori, qualche fix ai canali/server ed alla ricerca alternativa\n
This commit is contained in:
marco
@@ -137,7 +137,11 @@ def search(item, text):
|
||||
json = load_json(item)
|
||||
if json:
|
||||
for key in json:
|
||||
peliculas(item, json, key, itemlist)
|
||||
if key not in ['sort']:
|
||||
if item.custom_search and key == 'menu':
|
||||
get_menu(item, json, key, itemlist)
|
||||
else:
|
||||
peliculas(item, json, key, itemlist)
|
||||
|
||||
return itemlist
|
||||
|
||||
|
||||
@@ -138,7 +138,10 @@ def renameFavourite(item):
|
||||
# Features to migrate old favorites (.txt)
|
||||
def readbookmark(filepath):
|
||||
logger.info()
|
||||
import urllib
|
||||
try:
|
||||
import urllib.parse as urllib
|
||||
except ImportError:
|
||||
import urllib
|
||||
|
||||
bookmarkfile = filetools.file_open(filepath)
|
||||
|
||||
|
||||
@@ -4,8 +4,10 @@
|
||||
# ------------------------------------------------------------
|
||||
|
||||
import re
|
||||
import urllib
|
||||
from channelselector import get_thumb
|
||||
try:
|
||||
import urllib.parse as urllib
|
||||
except ImportError:
|
||||
import urllib
|
||||
from core import httptools, scrapertools, support, tmdb, filetools
|
||||
from core.item import Item
|
||||
from platformcode import logger, config, platformtools
|
||||
|
||||
+29
-27
@@ -174,10 +174,10 @@ def channel_search(item):
|
||||
mode = item.mode
|
||||
|
||||
if item.infoLabels['tvshowtitle']:
|
||||
item.text = item.infoLabels['tvshowtitle'].split('-')[0]
|
||||
item.text = item.infoLabels['tvshowtitle'].split(' - ')[0]
|
||||
item.title = item.text
|
||||
elif item.infoLabels['title']:
|
||||
item.text = item.infoLabels['title'].split('-')[0]
|
||||
item.text = item.infoLabels['title'].split(' - ')[0]
|
||||
item.title = item.text
|
||||
|
||||
temp_search_file = config.get_temp_file('temp-search')
|
||||
@@ -235,6 +235,8 @@ def channel_search(item):
|
||||
if channel not in ch_list:
|
||||
ch_list[channel] = []
|
||||
ch_list[channel].extend(res.result()[1])
|
||||
if res.result()[2]:
|
||||
valid.extend(res.result()[2])
|
||||
|
||||
if progress.iscanceled():
|
||||
break
|
||||
@@ -261,21 +263,7 @@ def channel_search(item):
|
||||
ch_name = channel_titles[channel_list.index(key)]
|
||||
grouped = list()
|
||||
cnt += 1
|
||||
progress.update(old_div((cnt * 100), len(ch_list)), config.get_localized_string(60295) + '\n' + config.get_localized_string(60293))
|
||||
if item.mode != 'all':
|
||||
if len(value) == 1:
|
||||
if not value[0].action or config.get_localized_string(70006).lower() in value[0].title.lower():
|
||||
continue
|
||||
for elem in value:
|
||||
if not elem.infoLabels.get('year', ""):
|
||||
elem.infoLabels['year'] = '-'
|
||||
tmdb.set_infoLabels_itemlist(value, True, forced=True)
|
||||
for elem in value:
|
||||
if elem.infoLabels['tmdb_id'] == searched_id:
|
||||
elem.from_channel = key
|
||||
if not config.get_setting('unify'):
|
||||
elem.title += ' [%s]' % key
|
||||
valid.append(elem)
|
||||
progress.update(old_div((cnt * 100), len(ch_list)), config.get_localized_string(60295))
|
||||
|
||||
for it in value:
|
||||
if it.channel == item.channel:
|
||||
@@ -355,24 +343,38 @@ def channel_search(item):
|
||||
|
||||
def get_channel_results(item, module_dict, search_action):
|
||||
ch = search_action.channel
|
||||
max_results = 10
|
||||
results = list()
|
||||
valid = list()
|
||||
module = module_dict[ch]
|
||||
searched_id = item.infoLabels['tmdb_id']
|
||||
|
||||
try:
|
||||
results.extend(module.search(search_action, item.text))
|
||||
if len(results) == 1:
|
||||
if not results[0].action or config.get_localized_string(70006).lower() in results[0].title.lower():
|
||||
results.clear()
|
||||
elif item.mode != 'all':
|
||||
for elem in results:
|
||||
if not elem.infoLabels.get('year', ""):
|
||||
elem.infoLabels['year'] = '-'
|
||||
tmdb.set_infoLabels_item(elem)
|
||||
if elem.infoLabels['tmdb_id'] == searched_id:
|
||||
elem.from_channel = ch
|
||||
if not config.get_setting('unify'):
|
||||
elem.title += ' [%s]' % ch
|
||||
valid.append(elem)
|
||||
|
||||
if len(results) < 0 and len(results) < max_results and item.mode != 'all':
|
||||
# if len(results) < 0 and len(results) < max_results and item.mode != 'all':
|
||||
#
|
||||
# if len(results) == 1:
|
||||
# if not results[0].action or config.get_localized_string(30992).lower() in results[0].title.lower():
|
||||
# return [ch, []]
|
||||
#
|
||||
# results = get_info(results)
|
||||
|
||||
if len(results) == 1:
|
||||
if not results[0].action or config.get_localized_string(30992).lower() in results[0].title.lower():
|
||||
return [ch, []]
|
||||
|
||||
results = get_info(results)
|
||||
|
||||
return [search_action, results]
|
||||
return [search_action, results, valid]
|
||||
except:
|
||||
return [search_action, results]
|
||||
return [search_action, results, valid]
|
||||
|
||||
|
||||
def get_servers(item, module_dict):
|
||||
|
||||
@@ -15,50 +15,8 @@ from channelselector import get_thumb
|
||||
from core import filetools, servertools
|
||||
from core.item import Item
|
||||
from platformcode import config, logger, platformtools
|
||||
import xbmcgui
|
||||
|
||||
CHANNELNAME = "setting"
|
||||
AUTOSTART = config.is_autorun_enabled()
|
||||
|
||||
def mainlist(item):
|
||||
logger.info()
|
||||
|
||||
itemlist = list()
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60535), action="settings", folder=False,
|
||||
thumbnail=get_thumb("setting_0.png")))
|
||||
if AUTOSTART is False:
|
||||
autostart_mode = config.get_localized_string(70707)
|
||||
else:
|
||||
autostart_mode = config.get_localized_string(70708)
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=autostart_mode + " " + config.get_localized_string(70706), action="autostart", folder=False, thumbnail=get_thumb("setting_0.png")))
|
||||
|
||||
#itemlist.append(Item(channel=CHANNELNAME, title="", action="", folder=False, thumbnail=get_thumb("setting_0.png")))
|
||||
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60536) + ":", text_bold=True, action="", folder=False,
|
||||
thumbnail=get_thumb("setting_0.png")))
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=" " + config.get_localized_string(60537), action="menu_channels", folder=True,
|
||||
thumbnail=get_thumb("channels.png")))
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=" " + config.get_localized_string(60538), action="menu_servers", folder=True,
|
||||
thumbnail=get_thumb("channels.png")))
|
||||
itemlist.append(Item(channel="news", title=" " + config.get_localized_string(60539), action="menu_opciones",
|
||||
folder=True, thumbnail=get_thumb("news.png")))
|
||||
itemlist.append(Item(channel="search", title=" " + config.get_localized_string(60540), action="opciones", folder=True,
|
||||
thumbnail=get_thumb("search.png")))
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=" " + config.get_localized_string(60541), action="channel_config",
|
||||
config="downloads", folder=True, thumbnail=get_thumb("downloads.png")))
|
||||
|
||||
if config.get_videolibrary_support():
|
||||
itemlist.append(Item(channel="videolibrary", title=" " + config.get_localized_string(60542), action="channel_config",
|
||||
folder=True, thumbnail=get_thumb("videolibrary.png")))
|
||||
|
||||
if config.is_xbmc():
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=" " + config.get_localized_string(70253), action="setting_torrent",
|
||||
folder=True, thumbnail=get_thumb("channels_torrent.png")))
|
||||
#itemlist.append(Item(channel=CHANNELNAME, action="", title="", folder=False, thumbnail=get_thumb("setting_0.png")))
|
||||
itemlist.append(Item(channel=CHANNELNAME, title=config.get_localized_string(60544), action="submenu_tools", folder=True,
|
||||
thumbnail=get_thumb("setting_0.png")))
|
||||
|
||||
return itemlist
|
||||
|
||||
|
||||
def menu_channels(item):
|
||||
@@ -96,15 +54,6 @@ def channel_config(item):
|
||||
return platformtools.show_channel_settings(channelpath=filetools.join(config.get_runtime_path(), "channels", item.config))
|
||||
|
||||
|
||||
def autostart(item): # item required launcher.py line 265
|
||||
if config.enable_disable_autorun(AUTOSTART):
|
||||
logger.info('AUTOSTART ENABLED')
|
||||
# xbmcgui.Dialog().ok(config.get_localized_string(20000), config.get_localized_string(70709))
|
||||
else:
|
||||
logger.info('AUTOSTART ENABLED')
|
||||
# xbmcgui.Dialog().ok(config.get_localized_string(20000), config.get_localized_string(70710))
|
||||
|
||||
|
||||
# def setting_torrent(item):
|
||||
# logger.info()
|
||||
|
||||
|
||||
+34
-33
@@ -5,7 +5,7 @@ from core.tmdb import Tmdb
|
||||
from core.scrapertools import htmlclean, decodeHtmlentities
|
||||
from core.support import thumb, typo, match, Item
|
||||
from platformcode import config, platformtools
|
||||
from platformcode.logger import info, error
|
||||
from platformcode import logger
|
||||
|
||||
info_language = ["de", "en", "es", "fr", "it", "pt"] # from videolibrary.json
|
||||
def_lang = info_language[config.get_setting("info_language", "videolibrary")]
|
||||
@@ -14,9 +14,9 @@ langs = ['auto', 'de', 'fr', 'pt', 'it', 'es-MX', 'ca', 'en', 'es']
|
||||
langt = langs[config.get_setting('tmdb', "tvmoviedb")]
|
||||
if langt == 'auto': langt = def_lang
|
||||
langt_alt = langs[config.get_setting('tmdb_alternativo', "tvmoviedb")]
|
||||
langs = ['auto', 'co', 'cl', 'ar', 'mx', 'en', 'es']
|
||||
langf = langs[config.get_setting('filmaff', "tvmoviedb")]
|
||||
if langf == 'auto': langf = 'en'
|
||||
# langs = ['auto', 'co', 'cl', 'ar', 'mx', 'en', 'es']
|
||||
# langf = langs[config.get_setting('filmaff', "tvmoviedb")]
|
||||
# if langf == 'auto': langf = 'en'
|
||||
langs = ['auto', 'de-de', 'fr-fr', 'pt-pt', 'it-it', 'es-MX', 'ca-es', 'en', 'es']
|
||||
langi = langs[config.get_setting('imdb', "tvmoviedb")]
|
||||
if langi == 'auto': langi = def_lang
|
||||
@@ -28,7 +28,7 @@ default_fan = filetools.join(config.get_runtime_path(), "fanart.jpg")
|
||||
|
||||
|
||||
def mainlist(item):
|
||||
info()
|
||||
logger.info()
|
||||
itemlist = [
|
||||
# TMDB
|
||||
# item.clone(title=typo(config.get_localized_string(70021), 'bold'), action=""),
|
||||
@@ -55,7 +55,7 @@ def configuracion(item):
|
||||
return ret
|
||||
|
||||
def search_star(item):
|
||||
info()
|
||||
logger.info()
|
||||
|
||||
itemlist = []
|
||||
item.type='movie'
|
||||
@@ -97,7 +97,7 @@ def search_(item):
|
||||
|
||||
|
||||
def searcing(item):
|
||||
info()
|
||||
logger.info()
|
||||
|
||||
new_item = Item(title=item.contentTitle, text=item.contentTitle.replace("+", " "), mode=item.contentType, infoLabels=item.infoLabels)
|
||||
|
||||
@@ -351,7 +351,7 @@ def list_tmdb(item):
|
||||
itemlist.append(new_item)
|
||||
except:
|
||||
import traceback
|
||||
error(traceback.format_exc())
|
||||
logger.error(traceback.format_exc())
|
||||
|
||||
if orden:
|
||||
itemlist.sort(key=lambda item: item.infoLabels["year"], reverse=True)
|
||||
@@ -625,7 +625,7 @@ def indices_tmdb(item):
|
||||
|
||||
|
||||
def filter(item):
|
||||
info()
|
||||
logger.info()
|
||||
|
||||
from datetime import datetime
|
||||
list_controls = []
|
||||
@@ -705,7 +705,7 @@ def filtered(item, values):
|
||||
|
||||
|
||||
def musica_movie(item):
|
||||
info()
|
||||
logger.info()
|
||||
itemlist = []
|
||||
data = match(item).data
|
||||
matches = match(data, patron=r'<td class="left">([^<]+)<br><small>([^<]+)</small>.*?<td>(\d+:\d+).*?<p id="([^"]+)"').matches
|
||||
@@ -729,7 +729,7 @@ def list_imdb(item):
|
||||
url = 'http://www.imdb.com/search/title?' + item.url
|
||||
# data = httptools.downloadpage(url, headers=headers, replace_headers=True).data
|
||||
data = match(url, headers=headers).data
|
||||
info(data)
|
||||
logger.info(data)
|
||||
|
||||
# data = re.sub(r"\n|\r|\t| ", "", data)
|
||||
# data = re.sub(r"\s{2}", " ", data)
|
||||
@@ -812,7 +812,7 @@ def list_imdb(item):
|
||||
|
||||
|
||||
def filter_imdb(item):
|
||||
info()
|
||||
logger.info()
|
||||
|
||||
from datetime import datetime
|
||||
list_controls = []
|
||||
@@ -1392,7 +1392,7 @@ def indices_imdb(item):
|
||||
|
||||
|
||||
# def filter_fa(item):
|
||||
# info()
|
||||
# logger.info()
|
||||
|
||||
# from datetime import datetime
|
||||
# list_controls = []
|
||||
@@ -1494,7 +1494,7 @@ def indices_imdb(item):
|
||||
|
||||
|
||||
# def login_fa():
|
||||
# info()
|
||||
# logger.info()
|
||||
|
||||
# try:
|
||||
# user = config.get_setting("usuariofa", "tvmoviedb")
|
||||
@@ -1510,7 +1510,7 @@ def indices_imdb(item):
|
||||
# data = httptools.downloadpage("https://m.filmaffinity.com/%s/account.ajax.php?action=login" % langf, post=post).data
|
||||
|
||||
# if "Invalid username" in data:
|
||||
# error("Error en el login")
|
||||
# logger.error("Error en el login")
|
||||
# return False, config.get_localized_string(70330)
|
||||
# else:
|
||||
# post = "name=user-menu&url=http://m.filmaffinity.com/%s/main.php" % langf
|
||||
@@ -1519,11 +1519,11 @@ def indices_imdb(item):
|
||||
# userid = scrapertools.find_single_match(data, 'id-user=(\d+)')
|
||||
# if userid:
|
||||
# config.set_setting("userid", userid, "tvmoviedb")
|
||||
# info("Login correcto")
|
||||
# logger.info("Login correcto")
|
||||
# return True, ""
|
||||
# except:
|
||||
# import traceback
|
||||
# error(traceback.format_exc())
|
||||
# logger.error(traceback.format_exc())
|
||||
# return False, config.get_localized_string(70331)
|
||||
|
||||
|
||||
@@ -1644,7 +1644,7 @@ def indices_imdb(item):
|
||||
|
||||
# def votar_fa(item):
|
||||
# # Window to select the vote
|
||||
# info()
|
||||
# logger.info()
|
||||
|
||||
# list_controls = []
|
||||
# valores = {}
|
||||
@@ -1752,6 +1752,7 @@ def imagenes(item):
|
||||
# return itemlist
|
||||
elif "Imdb" in item.title:
|
||||
try:
|
||||
from core import httptools
|
||||
data = jsontools.load(httptools.downloadpage(item.images["imdb"]["url"], cookies=False).data)
|
||||
item.images["imdb"].pop("url")
|
||||
if data.get("allImages"):
|
||||
@@ -1920,7 +1921,7 @@ def acciones_trakt(item):
|
||||
ratings = []
|
||||
try:
|
||||
for i, entry in enumerate(data):
|
||||
info('ENTRY:',entry)
|
||||
logger.info('ENTRY:',entry)
|
||||
if i <= item.pagina: continue
|
||||
# try: entry = entry[item.args]
|
||||
# except: pass
|
||||
@@ -1974,7 +1975,7 @@ def acciones_trakt(item):
|
||||
if ratings[i]: new_item.title += typo("Trakt: %.2f | Tmdb: %.2f" % (ratings[i], new_item.infoLabels["rating"]), '_ [] color kod')
|
||||
except:
|
||||
import traceback
|
||||
error(traceback.format_exc())
|
||||
logger.error(traceback.format_exc())
|
||||
|
||||
if "page" in item.url and len(itemlist) == 20:
|
||||
page = match(item.url, patron=r'page=(\d+)').match
|
||||
@@ -1996,7 +1997,7 @@ def acciones_trakt(item):
|
||||
|
||||
|
||||
def order_list(item):
|
||||
info()
|
||||
logger.info()
|
||||
|
||||
list_controls = []
|
||||
valores1 = ['rating', 'added', 'title', 'released', 'runtime', 'popularity', 'percentage', 'votes']
|
||||
@@ -2338,7 +2339,7 @@ def indices_mal(item):
|
||||
matches = match("https://myanimelist.net/anime.php", cookies=False, patronBlock=patronBlock, patron=patron).matches
|
||||
for url, title in matches:
|
||||
genero = title.split(" (", 1)[0]
|
||||
info(url_base, genero)
|
||||
logger.info(url_base, genero)
|
||||
thumbnail = url_base + genero.lower().replace(" ", "%20")
|
||||
if genero in ["Hentai", "Yaoi", "Yuri"] and not adult_mal:
|
||||
continue
|
||||
@@ -2387,7 +2388,7 @@ def season_mal(item):
|
||||
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))
|
||||
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="(.*?).jpg.*?<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
|
||||
for url, scrapedtitle, epis, scrapedgenres, thumbnail, plot, tipo, year, score in matches:
|
||||
if ("Hentai" in scrapedgenres or "Yaoi" in scrapedgenres or "Yuri" in scrapedgenres) and not adult_mal:
|
||||
@@ -2413,7 +2414,7 @@ def season_mal(item):
|
||||
else:
|
||||
args = "tv"
|
||||
contentType = "tvshow"
|
||||
thumbnail = thumbnail.replace("r/167x242/", "") + "l.jpg"
|
||||
thumbnail = thumbnail.replace(".webp", ".jpg")
|
||||
itemlist.append(Item(channel=item.channel, action="details_mal", url=url, title=title,
|
||||
thumbnail=thumbnail, infoLabels=infoLabels, args=args, tipo=tipo,
|
||||
contentTitle=scrapedtitle, contentType=contentType,
|
||||
@@ -2487,7 +2488,7 @@ def detail_staff(item):
|
||||
patron_bio = r'<?<div class="spaceit_pad">(.*?)</td>'
|
||||
bio = match(data, patron=patron_bio).match
|
||||
bio = htmlclean(bio.replace("</div>", "\n"))
|
||||
info(bio)
|
||||
logger.info(bio)
|
||||
infoLabels = {'plot': bio}
|
||||
if not "No voice acting roles" in data:
|
||||
itemlist.append(Item(channel=item.channel, title=typo(config.get_localized_string(70374),'bold bullet'), action="", thumbnail=item.thumbnail, infoLabels=infoLabels))
|
||||
@@ -2550,7 +2551,7 @@ def searching_mal(item):
|
||||
title += " (%s)" % year
|
||||
except:
|
||||
import traceback
|
||||
error(traceback.format_exc())
|
||||
logger.error(traceback.format_exc())
|
||||
|
||||
if tipo == "Movie" or tipo == "OVA":
|
||||
infolabels["mediatype"] = "movie"
|
||||
@@ -2625,7 +2626,7 @@ def info_anidb(item, itemlist, url):
|
||||
|
||||
|
||||
def filter_mal(item):
|
||||
info()
|
||||
logger.info()
|
||||
|
||||
list_controls = []
|
||||
valores = {}
|
||||
@@ -2703,7 +2704,7 @@ def callback_mal(item, values):
|
||||
|
||||
def musica_anime(item):
|
||||
# List available anime and songs similar to the anime title
|
||||
info()
|
||||
logger.info()
|
||||
itemlist = []
|
||||
|
||||
data = match("http://www.freeanimemusic.org/song_search.php", post=item.post).data
|
||||
@@ -2738,7 +2739,7 @@ def musica_anime(item):
|
||||
|
||||
|
||||
def login_mal(from_list=False):
|
||||
info()
|
||||
logger.info()
|
||||
from core import httptools
|
||||
from base64 import b64decode as bdec
|
||||
|
||||
@@ -2762,16 +2763,16 @@ def login_mal(from_list=False):
|
||||
response = httptools.downloadpage("https://myanimelist.net/login.php?from=%2F", post=post)
|
||||
|
||||
if not re.search(r'(?i)' + user, response.data):
|
||||
error("Login failed")
|
||||
logger.error("Login failed")
|
||||
return False, config.get_localized_string(70330), user
|
||||
else:
|
||||
if generic:
|
||||
return False, config.get_localized_string(70393), user
|
||||
info("Correct login")
|
||||
logger.info("Correct login")
|
||||
return True, "", user
|
||||
except:
|
||||
import traceback
|
||||
error(traceback.format_exc())
|
||||
logger.error(traceback.format_exc())
|
||||
return False, config.get_localized_string(70331) , ''
|
||||
|
||||
|
||||
@@ -2799,7 +2800,7 @@ def cuenta_mal(item):
|
||||
|
||||
def items_mal(item):
|
||||
# Scraper for personal lists
|
||||
info()
|
||||
logger.info()
|
||||
itemlist = []
|
||||
data = match(item.url).data
|
||||
|
||||
|
||||
Reference in New Issue
Block a user