diff --git a/platformcode/launcher.py b/platformcode/launcher.py index aa0c9278..c89d7a7d 100644 --- a/platformcode/launcher.py +++ b/platformcode/launcher.py @@ -473,7 +473,6 @@ def play_from_library(item): else: # Ventana emergente - item.play_from = 'window' item.show_server = True from specials import videolibrary, autoplay @@ -543,13 +542,13 @@ def play_from_library(item): return else: item = videolibrary.play(itemlist[seleccion])[0] + item.play_from = 'window' platformtools.play_video(item) if (platformtools.is_playing() and item.action) or item.server == 'torrent' or autoplay.is_active(item.contentChannel): break if it.show_server and check_next_ep: - logger.info('PARTITO') nextep.run(it) sleep(0.5) p_dialog.close() diff --git a/resources/skins/Default/720p/NextDialog.xml b/resources/skins/Default/720p/NextDialog.xml index 55fe82b5..2455d71d 100644 --- a/resources/skins/Default/720p/NextDialog.xml +++ b/resources/skins/Default/720p/NextDialog.xml @@ -15,14 +15,14 @@ 0 - 10 - 50 + 15 + 40 100% 0 100% - 50 + 40 NextDialog/background-diffuse.png @@ -38,14 +38,13 @@ horizontal - 50 + 40 0 right SendClick(3012) - !Integer.IsGreater(Player.TimeRemaining,59) - 50 + 40 auto font30_title 20 @@ -61,7 +60,7 @@ - 50 + 40 auto font30_title 20 @@ -78,7 +77,7 @@ 0 30 - 50 + 40 NextDialog/background-diffuse.png diff --git a/resources/skins/Default/720p/NextDialogCompact.xml b/resources/skins/Default/720p/NextDialogCompact.xml index 1d3c6627..2164ace3 100644 --- a/resources/skins/Default/720p/NextDialogCompact.xml +++ b/resources/skins/Default/720p/NextDialogCompact.xml @@ -15,14 +15,14 @@ 0 - 10 + 15 50 100% 0 100% - 50 + 40 @@ -38,17 +38,17 @@ horizontal - 50 + 40 0 right - + SendClick(3012) - !Integer.IsGreater(Player.TimeRemaining,59) - 50 - 70 + + 40 + 65 font30_title - 15 + 12 80FFFFFF FFFFFFFF 80FFFFFF @@ -61,8 +61,8 @@ - 50 - 50 + 40 + 40 font30_title 30 80FFFFFF @@ -77,8 +77,8 @@ 0 - 30 - 50 + 20 + 40 NextDialog/background.png diff --git a/resources/skins/Default/media/NextDialog/close-fo.png b/resources/skins/Default/media/NextDialog/close-fo.png index 9b08887e..b6e4ece7 100644 Binary files a/resources/skins/Default/media/NextDialog/close-fo.png and b/resources/skins/Default/media/NextDialog/close-fo.png differ diff --git a/resources/skins/Default/media/NextDialog/close-nf.png b/resources/skins/Default/media/NextDialog/close-nf.png index 7bcca513..aa61c1eb 100644 Binary files a/resources/skins/Default/media/NextDialog/close-nf.png and b/resources/skins/Default/media/NextDialog/close-nf.png differ diff --git a/resources/skins/Default/media/NextDialog/play-fo.png b/resources/skins/Default/media/NextDialog/play-fo.png index ed9eaabf..969dfd90 100644 Binary files a/resources/skins/Default/media/NextDialog/play-fo.png and b/resources/skins/Default/media/NextDialog/play-fo.png differ diff --git a/resources/skins/Default/media/NextDialog/play-nf.png b/resources/skins/Default/media/NextDialog/play-nf.png index 4b53fa7b..1c12b92e 100644 Binary files a/resources/skins/Default/media/NextDialog/play-nf.png and b/resources/skins/Default/media/NextDialog/play-nf.png differ diff --git a/specials/nextep.py b/specials/nextep.py index bc4d9106..e69a4600 100644 --- a/specials/nextep.py +++ b/specials/nextep.py @@ -14,14 +14,14 @@ def check(item): def return_item(item): - logger.info('AS ITEM\n'+str(item)) + logger.info() with futures.ThreadPoolExecutor() as executor: future = executor.submit(next_ep, item) item = future.result() return item def run(item): - logger.info('AS ITEM\n'+str(item)) + logger.info() with futures.ThreadPoolExecutor() as executor: future = executor.submit(next_ep, item) item = future.result() @@ -71,9 +71,7 @@ def next_ep(item): # check i next file exist current_filename = os.path.basename(item.strm_path) base_path = os.path.basename(os.path.normpath(os.path.dirname(item.strm_path))) - logger.info('PATH:' + base_path) path = filetools.join(config.get_videolibrary_path(), config.get_setting("folder_tvshows"),base_path) - logger.info('PATH:' + path) fileList = [] for file in os.listdir(path): if file.endswith('.strm'): @@ -112,13 +110,12 @@ def next_ep(item): pass nextDialog.close() - logger.info('CONTINUE: ' +str(nextDialog.stillwatching)) + logger.info('Next Episode: ' +str(nextDialog.stillwatching)) if nextDialog.stillwatching or nextDialog.continuewatching: item.next_ep = True xbmc.Player().stop() if VL: - logger.info('BACK STILL') sleep(1) xbmc.executebuiltin('Action(Back)') sleep(0.5) diff --git a/specials/videolibrary.py b/specials/videolibrary.py index 4f4f3c88..ec50021f 100644 --- a/specials/videolibrary.py +++ b/specials/videolibrary.py @@ -579,9 +579,8 @@ def findvideos(item): autoplay.play_multi_channel(item, itemlist) from inspect import stack from specials import nextep - logger.info('STACK= ' + stack()[1][3]) if nextep.check(item) and stack()[1][3] == 'run': - nextep.videolibrary(item) + nextep.videolibrary(item) return itemlist