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

Fix Dialogs

Browse Source
This commit is contained in:
Alhaziel01
2020-08-18 11:34:17 +02:00
parent 42028f3e33
commit bbf7cabc35
11 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/downloadtools.py
View File

@@ -408,7 +408,7 @@ def downloadfile(url, nombrefichero, headers=None, silent=False, continuar=False
error = downloadfileRTMP(url, nombrefichero, silent)
if error and not silent:
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:
import traceback
from pprint import pprint
@@ -480,7 +480,7 @@ def downloadfileRTMP(url, nombrefichero, silent):
rtmpdump_exit = spawnv(P_NOWAIT, rtmpdump_cmd, rtmpdump_args)
if not silent:
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:
return True

7
platformcode/launcher.py
View File

@@ -330,15 +330,14 @@ def run(item=None):
if Channel:
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))
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:
platformtools.dialog_ok(
config.get_localized_string(60038),
config.get_localized_string(60015),
log_message)
config.get_localized_string(60015) + '\n' + log_message)
def new_search(item, channel=None):

12
platformcode/platformtools.py
View File

@@ -8,8 +8,10 @@
import sys
if sys.version_info[0] >= 3:
PY3 = True
import urllib.parse as urllib
else:
PY3 = False
import urllib
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):
# customlabel only on kodi 19
dialog = xbmcgui.Dialog()
if config.get_platform() == 'kodi-matrix':
if PY3:
if autoclose:
return dialog.yesno(heading, message, nolabel=nolabel, yeslabel=yeslabel, customlabel=customlabel, autoclose=autoclose)
else:
@@ -671,7 +673,7 @@ def show_recaptcha(key, referer):
def alert_no_disponible_server(server):
# '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():
@@ -773,11 +775,11 @@ def get_dialogo_opciones(item, default_action, strm, autoplay):
if not autoplay:
if item.server != "":
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:
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:
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:
xbmc.executebuiltin("Container.Update (%s?%s)" % (sys.argv[0], Item(action="open_browser", url=item.url).tourl()))
if item.channel == "favorites":

2
platformcode/xbmc_videolibrary.py
View File

@@ -1234,7 +1234,7 @@ def ask_set_content(silent=False):
# ask to configure Kodi video library
if platformtools.dialog_yesno(config.get_localized_string(20000), config.get_localized_string(80015)):
# 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
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))

8
specials/downloads.py
View File

@@ -1037,7 +1037,7 @@ def save_download_video(item):
write_json(item)
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:
start_download(item)
@@ -1064,7 +1064,7 @@ def save_download_movie(item):
progreso.close()
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:
play_item = select_server(item)
if play_item == 'Auto':
@@ -1105,7 +1105,7 @@ def save_download_tvshow(item):
progreso.close()
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:
if len(episodes) == 1:
@@ -1138,4 +1138,4 @@ def show_disclaimer():
line1 = config.get_localized_string(70690)
line2 = config.get_localized_string(70691)
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)

6
specials/favorites.py
View File

@@ -96,7 +96,7 @@ def addFavourite(item):
favourites_list.append((titulo, item.thumbnail, data))
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):
@@ -112,7 +112,7 @@ def delFavourite(item):
favourites_list.remove(fav)
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()
break
@@ -130,7 +130,7 @@ def renameFavourite(item):
if new_title:
favourites_list[i] = (new_title, fav[1], fav[2])
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()

34
specials/kodfavorites.py
View File

@@ -118,7 +118,7 @@ class KodfavouritesData(object):
jsondata['user_favorites'] = self.user_favorites
jsondata['info_lista'] = self.info_lista
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)
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
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)
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
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)
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
nombre = get_name_from_filename(item.lista)
@@ -677,12 +677,12 @@ def renombrar_lista(item):
# Check that the new name does not exist
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
# Rename the file
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
# 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)
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
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
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)
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
alfav = KodfavouritesData(item.lista)
@@ -745,7 +745,7 @@ def compartir_lista(item):
fullfilename = os.path.join(config.get_data_path(), item.lista)
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
try:
@@ -779,7 +779,7 @@ def compartir_lista(item):
codigo = scrapertools.find_single_match(data, 'href="index\.php\?file_id=([^"]+)')
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
# Point code in log file and inside the list
@@ -790,7 +790,7 @@ def compartir_lista(item):
alfav.info_lista['tinyupload_code'] = codigo
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
@@ -842,7 +842,7 @@ def crear_lista(item):
# Check that the file does not already exist
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
# 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>([^<]*)')
url_json = '{uri.scheme}://{uri.netloc}/'.format(uri=urlparse(url)) + down_url
except:
platformtools.dialog_ok('KoD', config.get_localized_string(70655), url)
platformtools.dialog_ok('KoD', config.get_localized_string(70655) + '\n' + url)
return False
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)
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
url_json = video_urls[0][1] # https://www58.zippyshare.com/d/qPzzQ0UM/25460/kodfavourites-testeanding.json
url_name = url_json[url_json.rfind('/')+1:]
@@ -916,8 +916,8 @@ def descargar_lista(item, url):
return False
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()
return True

6
specials/news.py
View File

@@ -235,8 +235,8 @@ def novedades(item):
if not multithread:
if platformtools.dialog_yesno(config.get_localized_string(60515),
config.get_localized_string(60516),
config.get_localized_string(60517),
config.get_localized_string(60516) + '\n' +
config.get_localized_string(60517) + '\n' +
config.get_localized_string(60518)):
if config.set_setting("multithread", True, "news"):
multithread = True
@@ -340,7 +340,7 @@ def novedades(item):
return ret
else:
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

2
specials/setting.py
View File

@@ -806,7 +806,7 @@ def restore_tools(item):
import os
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))
if seleccion == 1:
# tvshows

3
specials/side_menu.py
View File

@@ -51,8 +51,7 @@ def check_user_home(item):
else:
item = Item(channel="channelselector", action="getmainlist", viewmode="movie")
from platformcode import platformtools
undefined_start = platformtools.dialog_ok(config.get_localized_string(70664), config.get_localized_string(70665),
config.get_localized_string(70666))
undefined_start = platformtools.dialog_ok(config.get_localized_string(70664), config.get_localized_string(70665) + '\n' + config.get_localized_string(70666))
return item
def set_custom_start(item):

2
specials/videolibrary.py
View File

@@ -129,7 +129,7 @@ def get_results(nfo_path, root, Type, local=False):
library_urls=item.library_urls,
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
else: confirm = True