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

Merge branch 'master' of https://github.com/kodiondemand/addon

Browse Source
This commit is contained in:
Alhaziel01
2020-08-18 12:33:50 +02:00
parent 4b4ffe09a8 ce3e12064b
commit 2e43b023aa
12 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/downloadtools.py
+2 -2
View File
@@ -408,7 +408,7 @@ def downloadfile(url, nombrefichero, headers=None, silent=False, continuar=False
error = downloadfileRTMP(url, nombrefichero, silent) error = downloadfileRTMP(url, nombrefichero, silent)
if error and not silent: if error and not silent:
from platformcode import platformtools from platformcode import platformtools
platformtools.dialog_ok("You cannot download that video "," RTMP downloads not yet "," are supported") platformtools.dialog_ok("You cannot download that video "," RTMP downloads not yet supported")
else: else:
import traceback import traceback
from pprint import pprint from pprint import pprint
@@ -480,7 +480,7 @@ def downloadfileRTMP(url, nombrefichero, silent):
rtmpdump_exit = spawnv(P_NOWAIT, rtmpdump_cmd, rtmpdump_args) rtmpdump_exit = spawnv(P_NOWAIT, rtmpdump_cmd, rtmpdump_args)
if not silent: if not silent:
from platformcode import platformtools from platformcode import platformtools
advertencia = platformtools.dialog_ok("RTMP download option is experimental", "and the video will download in the background.", "No progress bar will be displayed.") advertencia = platformtools.dialog_ok("RTMP download option is experimental", "and the video will download in the background. \n No progress bar will be displayed.")
except: except:
return True return True
core/videolibrarytools.py
+7 -7
View File
@@ -205,7 +205,7 @@ def save_movie(item, silent=False):
logger.error(traceback.format_exc()) logger.error(traceback.format_exc())
if filetools.write(json_path, item.tojson()): if filetools.write(json_path, item.tojson()):
if not silent: p_dialog.update(100, config.get_localized_string(60062) + '\n' + item.contentTitle) if not silent: p_dialog.update(100, item.contentTitle)
item_nfo.library_urls[item.channel] = item.url item_nfo.library_urls[item.channel] = item.url
if filetools.write(nfo_path, head_nfo + item_nfo.tojson()): if filetools.write(nfo_path, head_nfo + item_nfo.tojson()):
@@ -221,7 +221,7 @@ def save_movie(item, silent=False):
# If we get to this point it is because something has gone wrong # If we get to this point it is because something has gone wrong
logger.error("Could not save %s in the video library" % item.contentTitle) logger.error("Could not save %s in the video library" % item.contentTitle)
if not silent: if not silent:
p_dialog.update(100, config.get_localized_string(60063) + '\n' + item.contentTitle) p_dialog.update(100, item.contentTitle)
p_dialog.close() p_dialog.close()
return 0, 0, -1, path return 0, 0, -1, path
@@ -645,8 +645,8 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
# Silent is to show no progress (for service) # Silent is to show no progress (for service)
if not silent: if not silent:
# progress dialog # progress dialog
p_dialog = platformtools.dialog_progress(config.get_localized_string(20000), config.get_localized_string(60064)) p_dialog = platformtools.dialog_progress(config.get_localized_string(60064) ,'')
p_dialog.update(0, config.get_localized_string(60065)) # p_dialog.update(0, config.get_localized_string(60065))
channel_alt = serie.channel # We prepare to add the emergency urls channel_alt = serie.channel # We prepare to add the emergency urls
emergency_urls_stat = config.get_setting("emergency_urls", channel_alt) # Does the channel want emergency urls? emergency_urls_stat = config.get_setting("emergency_urls", channel_alt) # Does the channel want emergency urls?
@@ -673,7 +673,7 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
json_path = filetools.join(path, ("%s [%s].json" % (season_episode, e.channel)).lower()) # Path of the episode .json json_path = filetools.join(path, ("%s [%s].json" % (season_episode, e.channel)).lower()) # Path of the episode .json
if emergency_urls_stat == 1 and not e.emergency_urls and e.contentType == 'episode': # Do we keep emergency urls? if emergency_urls_stat == 1 and not e.emergency_urls and e.contentType == 'episode': # Do we keep emergency urls?
if not silent: if not silent:
p_dialog.update(0, 'Caching links and .torren filest...', e.title) # progress dialog p_dialog.update(0, 'Caching links and .torren filest...\n' + e.title) # progress dialog
if json_path in ficheros: # If there is the .json we get the urls from there if json_path in ficheros: # If there is the .json we get the urls from there
if overwrite: # but only if .json are overwritten if overwrite: # but only if .json are overwritten
json_epi = Item().fromjson(filetools.read(json_path)) #We read the .json json_epi = Item().fromjson(filetools.read(json_path)) #We read the .json
@@ -690,7 +690,7 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
emergency_urls_succ = True # ... is a success and we are going to mark the .nfo emergency_urls_succ = True # ... is a success and we are going to mark the .nfo
elif emergency_urls_stat == 3 and e.contentType == 'episode': # Do we update emergency urls? elif emergency_urls_stat == 3 and e.contentType == 'episode': # Do we update emergency urls?
if not silent: if not silent:
p_dialog.update(0, 'Caching links and .torrent files...', e.title) # progress dialog p_dialog.update(0, 'Caching links and .torrent files...\n' + e.title) # progress dialog
e = emergency_urls(e, channel, json_path, headers=headers) # we generate the urls e = emergency_urls(e, channel, json_path, headers=headers) # we generate the urls
if e.emergency_urls: # If we already have urls... if e.emergency_urls: # If we already have urls...
emergency_urls_succ = True # ... is a success and we are going to mark the .nfo emergency_urls_succ = True # ... is a success and we are going to mark the .nfo
@@ -722,7 +722,7 @@ def save_episodes(path, episodelist, serie, silent=False, overwrite=True):
t = 0 t = 0
for i, e in enumerate(scraper.sort_episode_list(new_episodelist)): for i, e in enumerate(scraper.sort_episode_list(new_episodelist)):
if not silent: if not silent:
p_dialog.update(int(math.ceil((i + 1) * t)), config.get_localized_string(60064) + '\n' + e.title) p_dialog.update(int(math.ceil((i + 1) * t)), e.title)
high_sea = e.contentSeason high_sea = e.contentSeason
high_epi = e.contentEpisodeNumber high_epi = e.contentEpisodeNumber
platformcode/launcher.py
+3 -4
View File
@@ -330,15 +330,14 @@ def run(item=None):
if Channel: if Channel:
if item.url: if item.url:
if platformtools.dialog_yesno(config.get_localized_string(60087) % Channel, config.get_localized_string(60014), log_message, nolabel='ok', yeslabel=config.get_localized_string(70739)): if platformtools.dialog_yesno(config.get_localized_string(60087) % Channel, config.get_localized_string(60014) + '\n' + log_message, nolabel='ok', yeslabel=config.get_localized_string(70739)):
run(Item(action="open_browser", url=item.url)) run(Item(action="open_browser", url=item.url))
else: else:
platformtools.dialog_ok(config.get_localized_string(60087) % Channel, config.get_localized_string(60014), log_message) platformtools.dialog_ok(config.get_localized_string(60087) % Channel, config.get_localized_string(60014) + '\n' + log_message)
else: else:
platformtools.dialog_ok( platformtools.dialog_ok(
config.get_localized_string(60038), config.get_localized_string(60038),
config.get_localized_string(60015), config.get_localized_string(60015) + '\n' + log_message)
log_message)
def new_search(item, channel=None): def new_search(item, channel=None):
platformcode/platformtools.py
+7 -5
View File
@@ -8,8 +8,10 @@
import sys import sys
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
PY3 = True
import urllib.parse as urllib import urllib.parse as urllib
else: else:
PY3 = False
import urllib import urllib
import os, xbmc, xbmcgui, xbmcplugin import os, xbmc, xbmcgui, xbmcplugin
@@ -48,7 +50,7 @@ def dialog_notification(heading, message, icon=3, time=5000, sound=True):
def dialog_yesno(heading, message, nolabel=config.get_localized_string(70170), yeslabel=config.get_localized_string(30022), autoclose=0, customlabel=None): def dialog_yesno(heading, message, nolabel=config.get_localized_string(70170), yeslabel=config.get_localized_string(30022), autoclose=0, customlabel=None):
# customlabel only on kodi 19 # customlabel only on kodi 19
dialog = xbmcgui.Dialog() dialog = xbmcgui.Dialog()
if config.get_platform() == 'kodi-matrix': if PY3:
if autoclose: if autoclose:
return dialog.yesno(heading, message, nolabel=nolabel, yeslabel=yeslabel, customlabel=customlabel, autoclose=autoclose) return dialog.yesno(heading, message, nolabel=nolabel, yeslabel=yeslabel, customlabel=customlabel, autoclose=autoclose)
else: else:
@@ -671,7 +673,7 @@ def show_recaptcha(key, referer):
def alert_no_disponible_server(server): def alert_no_disponible_server(server):
# 'The video is no longer in %s', 'Try another server or another channel' # 'The video is no longer in %s', 'Try another server or another channel'
dialog_ok(config.get_localized_string(30055), (config.get_localized_string(30057) % server), config.get_localized_string(30058)) dialog_ok(config.get_localized_string(30055), (config.get_localized_string(30057) % server) + '\n' + config.get_localized_string(30058))
def alert_unsopported_server(): def alert_unsopported_server():
@@ -773,11 +775,11 @@ def get_dialogo_opciones(item, default_action, strm, autoplay):
if not autoplay: if not autoplay:
if item.server != "": if item.server != "":
if "<br/>" in motivo: if "<br/>" in motivo:
ret = dialog_yesno(config.get_localized_string(60362), motivo.split("<br/>")[0], motivo.split("<br/>")[1], item.url, nolabel='ok', yeslabel=config.get_localized_string(70739)) ret = dialog_yesno(config.get_localized_string(60362), motivo.split("<br/>")[0] + '\n' + motivo.split("<br/>")[1] + '\n' + item.url, nolabel='ok', yeslabel=config.get_localized_string(70739))
else: else:
ret = dialog_yesno(config.get_localized_string(60362), motivo, item.url, nolabel='ok', yeslabel=config.get_localized_string(70739)) ret = dialog_yesno(config.get_localized_string(60362), motivo + '\n' + item.url, nolabel='ok', yeslabel=config.get_localized_string(70739))
else: else:
ret = dialog_yesno(config.get_localized_string(60362), config.get_localized_string(60363), config.get_localized_string(60364), item.url, nolabel='ok', yeslabel=config.get_localized_string(70739)) ret = dialog_yesno(config.get_localized_string(60362), config.get_localized_string(60363) + '\n' + config.get_localized_string(60364) + '\n' + item.url, nolabel='ok', yeslabel=config.get_localized_string(70739))
if ret: if ret:
xbmc.executebuiltin("Container.Update (%s?%s)" % (sys.argv[0], Item(action="open_browser", url=item.url).tourl())) xbmc.executebuiltin("Container.Update (%s?%s)" % (sys.argv[0], Item(action="open_browser", url=item.url).tourl()))
if item.channel == "favorites": if item.channel == "favorites":
platformcode/xbmc_videolibrary.py
+1 -1
View File
@@ -1234,7 +1234,7 @@ def ask_set_content(silent=False):
# ask to configure Kodi video library # ask to configure Kodi video library
if platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80015)): if platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80015)):
# ask for custom or default settings # ask for custom or default settings
if not platformtools.dialog_yesno(config.get_localized_string(80026), config.get_localized_string(80016), "", "", config.get_localized_string(80017), config.get_localized_string(80018)): if not platformtools.dialog_yesno(config.get_localized_string(80026), config.get_localized_string(80016), config.get_localized_string(80017), config.get_localized_string(80018)):
# input path and folders # input path and folders
path = platformtools.dialog_browse(3, config.get_localized_string(80019), config.get_setting("videolibrarypath")) path = platformtools.dialog_browse(3, config.get_localized_string(80019), config.get_setting("videolibrarypath"))
movies_folder = platformtools.dialog_input(config.get_setting("folder_movies"), config.get_localized_string(80020)) movies_folder = platformtools.dialog_input(config.get_setting("folder_movies"), config.get_localized_string(80020))
specials/downloads.py
+4 -4
View File
@@ -1037,7 +1037,7 @@ def save_download_video(item):
write_json(item) write_json(item)
if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)): if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)):
platformtools.dialog_ok(config.get_localized_string(30101), item.contentTitle, config.get_localized_string(30109)) platformtools.dialog_ok(config.get_localized_string(30101), item.contentTitle + '\n' + config.get_localized_string(30109))
else: else:
start_download(item) start_download(item)
@@ -1064,7 +1064,7 @@ def save_download_movie(item):
progreso.close() progreso.close()
if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)): if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)):
platformtools.dialog_ok(config.get_localized_string(30101), item.contentTitle, config.get_localized_string(30109)) platformtools.dialog_ok(config.get_localized_string(30101), item.contentTitle + '\n' + config.get_localized_string(30109))
else: else:
play_item = select_server(item) play_item = select_server(item)
if play_item == 'Auto': if play_item == 'Auto':
@@ -1105,7 +1105,7 @@ def save_download_tvshow(item):
progreso.close() progreso.close()
if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)): if not platformtools.dialog_yesno(config.get_localized_string(30101), config.get_localized_string(70189)):
platformtools.dialog_ok(config.get_localized_string(30101), str(len(episodes)) + config.get_localized_string(30110) + item.contentSerieName, config.get_localized_string(30109)) platformtools.dialog_ok(config.get_localized_string(30101), str(len(episodes)) + config.get_localized_string(30110) + '\n' + item.contentSerieName + '\n' + config.get_localized_string(30109))
else: else:
if len(episodes) == 1: if len(episodes) == 1:
@@ -1138,4 +1138,4 @@ def show_disclaimer():
line1 = config.get_localized_string(70690) line1 = config.get_localized_string(70690)
line2 = config.get_localized_string(70691) line2 = config.get_localized_string(70691)
line3 = config.get_localized_string(70692) line3 = config.get_localized_string(70692)
platformtools.dialog_ok(config.get_localized_string(20000), line1, line2, line3) platformtools.dialog_ok(config.get_localized_string(20000), line1 + '\n' + line2 + '\n' + line3)
specials/favorites.py
+3 -3
View File
@@ -96,7 +96,7 @@ def addFavourite(item):
favourites_list.append((titulo, item.thumbnail, data)) favourites_list.append((titulo, item.thumbnail, data))
if save_favourites(favourites_list): if save_favourites(favourites_list):
platformtools.dialog_ok(config.get_localized_string(30102), titulo, config.get_localized_string(30108)) # 'added to favorites' platformtools.dialog_ok(config.get_localized_string(30102), titulo + '\n' + config.get_localized_string(30108)) # 'added to favorites'
def delFavourite(item): def delFavourite(item):
@@ -112,7 +112,7 @@ def delFavourite(item):
favourites_list.remove(fav) favourites_list.remove(fav)
if save_favourites(favourites_list): if save_favourites(favourites_list):
platformtools.dialog_ok(config.get_localized_string(30102), item.title, config.get_localized_string(30105).lower()) # 'Removed from favorites' platformtools.dialog_ok(config.get_localized_string(30102), item.title + '\n' + config.get_localized_string(30105).lower()) # 'Removed from favorites'
platformtools.itemlist_refresh() platformtools.itemlist_refresh()
break break
@@ -130,7 +130,7 @@ def renameFavourite(item):
if new_title: if new_title:
favourites_list[i] = (new_title, fav[1], fav[2]) favourites_list[i] = (new_title, fav[1], fav[2])
if save_favourites(favourites_list): if save_favourites(favourites_list):
platformtools.dialog_ok(config.get_localized_string(30102), item.from_title, config.get_localized_string(60086) + ' ', new_title) # 'Removed from favorites' platformtools.dialog_ok(config.get_localized_string(30102), item.from_title + '\n' + config.get_localized_string(60086) + '\n' + new_title) # 'Removed from favorites'
platformtools.itemlist_refresh() platformtools.itemlist_refresh()
specials/kodfavorites.py
+17 -17
View File
@@ -118,7 +118,7 @@ class KodfavouritesData(object):
jsondata['user_favorites'] = self.user_favorites jsondata['user_favorites'] = self.user_favorites
jsondata['info_lista'] = self.info_lista jsondata['info_lista'] = self.info_lista
if not filetools.write(self.user_favorites_file, jsontools.dump(jsondata)): if not filetools.write(self.user_favorites_file, jsontools.dump(jsondata)):
platformtools.dialog_ok('KoD', config.get_localized_string(70614), os.path.basename(self.user_favorites_file)) platformtools.dialog_ok('KoD', config.get_localized_string(70614) + '\n' + os.path.basename(self.user_favorites_file))
# ============================ # ============================
@@ -503,7 +503,7 @@ def editar_enlace_lista(item):
opciones.append(it.lista) opciones.append(it.lista)
if len(opciones) == 0: if len(opciones) == 0:
platformtools.dialog_ok('KoD', 'There are no other lists where to move the link.', 'You can create them from the Manage link lists menu') platformtools.dialog_ok('KoD', 'There are no other lists where to move the link.\nYou can create them from the Manage link lists menu')
return False return False
ret = platformtools.dialog_select('Select destination list', opciones) ret = platformtools.dialog_select('Select destination list', opciones)
@@ -645,7 +645,7 @@ def activar_lista(item):
fullfilename = os.path.join(config.get_data_path(), item.lista) fullfilename = os.path.join(config.get_data_path(), item.lista)
if not os.path.exists(fullfilename): if not os.path.exists(fullfilename):
platformtools.dialog_ok('KoD', config.get_localized_string(70630), item.lista) platformtools.dialog_ok('KoD', config.get_localized_string(70630) + '\n' + item.lista)
return False return False
config.set_setting('lista_activa', item.lista) config.set_setting('lista_activa', item.lista)
@@ -663,7 +663,7 @@ def renombrar_lista(item):
fullfilename_current = os.path.join(config.get_data_path(), item.lista) fullfilename_current = os.path.join(config.get_data_path(), item.lista)
if not os.path.exists(fullfilename_current): if not os.path.exists(fullfilename_current):
platformtools.dialog_ok('KoD', config.get_localized_string(70630), fullfilename_current) platformtools.dialog_ok('KoD', config.get_localized_string(70630) + '\n' + fullfilename_current)
return False return False
nombre = get_name_from_filename(item.lista) nombre = get_name_from_filename(item.lista)
@@ -677,12 +677,12 @@ def renombrar_lista(item):
# Check that the new name does not exist # Check that the new name does not exist
if os.path.exists(fullfilename): if os.path.exists(fullfilename):
platformtools.dialog_ok('KoD', config.get_localized_string(70613), fullfilename) platformtools.dialog_ok('KoD', config.get_localized_string(70613) + '\n' + fullfilename)
return False return False
# Rename the file # Rename the file
if not filetools.rename(fullfilename_current, filename): if not filetools.rename(fullfilename_current, filename):
platformtools.dialog_ok('KoD', config.get_localized_string(70631), fullfilename) platformtools.dialog_ok('KoD', config.get_localized_string(70631) + '\n' + fullfilename)
return False return False
# Update settings if it is the active list # Update settings if it is the active list
@@ -699,11 +699,11 @@ def eliminar_lista(item):
fullfilename = os.path.join(config.get_data_path(), item.lista) fullfilename = os.path.join(config.get_data_path(), item.lista)
if not os.path.exists(fullfilename): if not os.path.exists(fullfilename):
platformtools.dialog_ok('KoD', config.get_localized_string(70630), item.lista) platformtools.dialog_ok('KoD', config.get_localized_string(70630) + '\n' + item.lista)
return False return False
if item.lista == get_lista_activa(): if item.lista == get_lista_activa():
platformtools.dialog_ok('KoD', config.get_localized_string(70632), item.lista) platformtools.dialog_ok('KoD', config.get_localized_string(70632) + '\n' + item.lista)
return False return False
if not platformtools.dialog_yesno(config.get_localized_string(70606), config.get_localized_string(70633) + ' %s ?' % item.lista): return False if not platformtools.dialog_yesno(config.get_localized_string(70606), config.get_localized_string(70633) + ' %s ?' % item.lista): return False
@@ -718,7 +718,7 @@ def informacion_lista(item):
fullfilename = os.path.join(config.get_data_path(), item.lista) fullfilename = os.path.join(config.get_data_path(), item.lista)
if not os.path.exists(fullfilename): if not os.path.exists(fullfilename):
platformtools.dialog_ok('KoD', config.get_localized_string(70630), item.lista) platformtools.dialog_ok('KoD', config.get_localized_string(70630) + '\n' + item.lista)
return False return False
alfav = KodfavouritesData(item.lista) alfav = KodfavouritesData(item.lista)
@@ -745,7 +745,7 @@ def compartir_lista(item):
fullfilename = os.path.join(config.get_data_path(), item.lista) fullfilename = os.path.join(config.get_data_path(), item.lista)
if not os.path.exists(fullfilename): if not os.path.exists(fullfilename):
platformtools.dialog_ok('KoD', config.get_localized_string(70630), fullfilename) platformtools.dialog_ok('KoD', config.get_localized_string(70630) + '\n' + fullfilename)
return False return False
try: try:
@@ -779,7 +779,7 @@ def compartir_lista(item):
codigo = scrapertools.find_single_match(data, 'href="index\.php\?file_id=([^"]+)') codigo = scrapertools.find_single_match(data, 'href="index\.php\?file_id=([^"]+)')
except: except:
platformtools.dialog_ok('KoD', config.get_localized_string(70647), item.lista) platformtools.dialog_ok('KoD', config.get_localized_string(70647) + '\n' + item.lista)
return False return False
# Point code in log file and inside the list # Point code in log file and inside the list
@@ -790,7 +790,7 @@ def compartir_lista(item):
alfav.info_lista['tinyupload_code'] = codigo alfav.info_lista['tinyupload_code'] = codigo
alfav.save() alfav.save()
platformtools.dialog_ok('KoD', config.get_localized_string(70650), codigo) platformtools.dialog_ok('KoD', config.get_localized_string(70650) + '\n' + codigo)
return True return True
@@ -842,7 +842,7 @@ def crear_lista(item):
# Check that the file does not already exist # Check that the file does not already exist
if os.path.exists(fullfilename): if os.path.exists(fullfilename):
platformtools.dialog_ok('KoD', config.get_localized_string(70613), fullfilename) platformtools.dialog_ok('KoD', config.get_localized_string(70613) + '\n' + fullfilename)
return False return False
# Cause it to be saved with empty folders by default # Cause it to be saved with empty folders by default
@@ -864,7 +864,7 @@ def descargar_lista(item, url):
down_url, url_name = scrapertools.find_single_match(data, ' href="(download\.php[^"]*)"><b>([^<]*)') down_url, url_name = scrapertools.find_single_match(data, ' href="(download\.php[^"]*)"><b>([^<]*)')
url_json = '{uri.scheme}://{uri.netloc}/'.format(uri=urlparse(url)) + down_url url_json = '{uri.scheme}://{uri.netloc}/'.format(uri=urlparse(url)) + down_url
except: except:
platformtools.dialog_ok('KoD', config.get_localized_string(70655), url) platformtools.dialog_ok('KoD', config.get_localized_string(70655) + '\n' + url)
return False return False
elif 'zippyshare.com/' in url: elif 'zippyshare.com/' in url:
@@ -872,7 +872,7 @@ def descargar_lista(item, url):
video_urls, puedes, motivo = servertools.resolve_video_urls_for_playing('zippyshare', url) video_urls, puedes, motivo = servertools.resolve_video_urls_for_playing('zippyshare', url)
if not puedes: if not puedes:
platformtools.dialog_ok('KoD', config.get_localized_string(70655), motivo) platformtools.dialog_ok('KoD', config.get_localized_string(70655) + '\n' + motivo)
return False return False
url_json = video_urls[0][1] # https://www58.zippyshare.com/d/qPzzQ0UM/25460/kodfavourites-testeanding.json url_json = video_urls[0][1] # https://www58.zippyshare.com/d/qPzzQ0UM/25460/kodfavourites-testeanding.json
url_name = url_json[url_json.rfind('/')+1:] url_name = url_json[url_json.rfind('/')+1:]
@@ -916,8 +916,8 @@ def descargar_lista(item, url):
return False return False
if not filetools.write(fullfilename, data): if not filetools.write(fullfilename, data):
platformtools.dialog_ok('KoD', config.get_localized_string(70659), filename) platformtools.dialog_ok('KoD', config.get_localized_string(70659) + '\n' + filename)
platformtools.dialog_ok('KoD', config.get_localized_string(70660), filename) platformtools.dialog_ok('KoD', config.get_localized_string(70660) + '\n' + filename)
platformtools.itemlist_refresh() platformtools.itemlist_refresh()
return True return True
specials/news.py
+3 -3
View File
@@ -235,8 +235,8 @@ def novedades(item):
if not multithread: if not multithread:
if platformtools.dialog_yesno(config.get_localized_string(60515), if platformtools.dialog_yesno(config.get_localized_string(60515),
config.get_localized_string(60516), config.get_localized_string(60516) + '\n' +
config.get_localized_string(60517), config.get_localized_string(60517) + '\n' +
config.get_localized_string(60518)): config.get_localized_string(60518)):
if config.set_setting("multithread", True, "news"): if config.set_setting("multithread", True, "news"):
multithread = True multithread = True
@@ -340,7 +340,7 @@ def novedades(item):
return ret return ret
else: else:
if mode != 'set_cache': if mode != 'set_cache':
no_channels = platformtools.dialog_ok(config.get_localized_string(30130) + ' - ' + item.extra, config.get_localized_string(70661), config.get_localized_string(70662)) no_channels = platformtools.dialog_ok(config.get_localized_string(30130) + ' - ' + item.extra + '\n' + config.get_localized_string(70661) + '\n' + config.get_localized_string(70662))
return return
specials/setting.py
+1 -1
View File
@@ -806,7 +806,7 @@ def restore_tools(item):
import os import os
seleccion = platformtools.dialog_yesno(config.get_localized_string(60581), seleccion = platformtools.dialog_yesno(config.get_localized_string(60581),
config.get_localized_string(60582), config.get_localized_string(60582) + '\n' +
config.get_localized_string(60583)) config.get_localized_string(60583))
if seleccion == 1: if seleccion == 1:
# tvshows # tvshows
specials/side_menu.py
+1 -2
View File
@@ -51,8 +51,7 @@ def check_user_home(item):
else: else:
item = Item(channel="channelselector", action="getmainlist", viewmode="movie") item = Item(channel="channelselector", action="getmainlist", viewmode="movie")
from platformcode import platformtools from platformcode import platformtools
undefined_start = platformtools.dialog_ok(config.get_localized_string(70664), config.get_localized_string(70665), undefined_start = platformtools.dialog_ok(config.get_localized_string(70664), config.get_localized_string(70665) + '\n' + config.get_localized_string(70666))
config.get_localized_string(70666))
return item return item
def set_custom_start(item): def set_custom_start(item):
specials/videolibrary.py
+1 -1
View File
@@ -129,7 +129,7 @@ def get_results(nfo_path, root, Type, local=False):
library_urls=item.library_urls, library_urls=item.library_urls,
infoLabels={'title': item.contentTitle}) infoLabels={'title': item.contentTitle})
if canal not in dead_list and canal not in zombie_list: confirm = platformtools.dialog_yesno(config.get_localized_string(30131), config.get_localized_string(30132) % canal.upper(), config.get_localized_string(30133)) if canal not in dead_list and canal not in zombie_list: confirm = platformtools.dialog_yesno(config.get_localized_string(30131), config.get_localized_string(30132) % canal.upper() + '\n' + config.get_localized_string(30133))
elif canal in zombie_list: confirm = False elif canal in zombie_list: confirm = False
else: confirm = True else: confirm = True