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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
marco
2020-01-16 21:22:48 +01:00
parent d6e776cdcb e155a35ea2
commit 20f0038734
9 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformcode/launcher.py
View File

@@ -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()

15
resources/skins/Default/720p/NextDialog.xml
View File

@@ -15,14 +15,14 @@
</animation>
<control type="group">
<right>0</right>
<top>10</top>
<height>50</height>
<top>15</top>
<height>40</height>
<width>100%</width>
<!-- Background -->
<control type="image">
<top>0</top>
<width>100%</width>
<height>50</height>
<height>40</height>
<texture colordiffuse="00111111">NextDialog/background-diffuse.png</texture>
</control>
<control type="group">
@@ -38,14 +38,13 @@
</control>
<control type="grouplist" id="20">
<orientation>horizontal</orientation>
<height>50</height>
<height>40</height>
<itemgap>0</itemgap>
<align>right</align>
<control type="button" id="11">
<label>$ADDON[plugin.video.kod 70750] $INFO[Player.TimeRemaining(ss),,] $ADDON[plugin.video.kod 70751]</label>
<onclick>SendClick(3012)</onclick>
<visible>!Integer.IsGreater(Player.TimeRemaining,59)</visible>
<height>50</height>
<height>40</height>
<width min="50">auto</width>
<font>font30_title</font>
<textoffsetx>20</textoffsetx>
@@ -61,7 +60,7 @@
</control>
<control type="button" id="3013">
<label>$ADDON[plugin.video.kod 60396]</label>
<height>50</height>
<height>40</height>
<width min="50">auto</width>
<font>font30_title</font>
<textoffsetx>20</textoffsetx>
@@ -78,7 +77,7 @@
<control type="image">
<top>0</top>
<width>30</width>
<height>50</height>
<height>40</height>
<texture colordiffuse="88232323">NextDialog/background-diffuse.png</texture>
</control>
</control>

24
resources/skins/Default/720p/NextDialogCompact.xml
View File

@@ -15,14 +15,14 @@
</animation>
<control type="group">
<right>0</right>
<top>10</top>
<top>15</top>
<height>50</height>
<width>100%</width>
<!-- Background -->
<control type="image">
<top>0</top>
<width>100%</width>
<height>50</height>
<height>40</height>
<!-- <texture colordiffuse="00111111">NextDialog/button-bg.png</texture> -->
</control>
<control type="group">
@@ -38,17 +38,17 @@
</control>
<control type="grouplist" id="20">
<orientation>horizontal</orientation>
<height>50</height>
<height>40</height>
<itemgap>0</itemgap>
<align>right</align>
<control type="button" id="11">
<label>$INFO[Player.TimeRemaining(ss),,]</label>
<label>[B]$INFO[Player.TimeRemaining(ss),,][/B]</label>
<onclick>SendClick(3012)</onclick>
<visible>!Integer.IsGreater(Player.TimeRemaining,59)</visible>
<height>50</height>
<width>70</width>
<!-- <visible>!Integer.IsGreater(Player.TimeRemaining,59)</visible> -->
<height>40</height>
<width>65</width>
<font>font30_title</font>
<textoffsetx>15</textoffsetx>
<textoffsetx>12</textoffsetx>
<textcolor>80FFFFFF</textcolor>
<focusedcolor>FFFFFFFF</focusedcolor>
<selectedcolor>80FFFFFF</selectedcolor>
@@ -61,8 +61,8 @@
</control>
<control type="button" id="3013">
<label></label>
<height>50</height>
<width>50</width>
<height>40</height>
<width>40</width>
<font>font30_title</font>
<textoffsetx>30</textoffsetx>
<textcolor>80FFFFFF</textcolor>
@@ -77,8 +77,8 @@
</control>
<control type="image">
<top>0</top>
<width>30</width>
<height>50</height>
<width>20</width>
<height>40</height>
<texture>NextDialog/background.png</texture>
</control>
</control>

BIN
resources/skins/Default/media/NextDialog/close-fo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
resources/skins/Default/media/NextDialog/close-nf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
resources/skins/Default/media/NextDialog/play-fo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
resources/skins/Default/media/NextDialog/play-nf.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

9
specials/nextep.py
View File

@@ -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)

3
specials/videolibrary.py
View File

@@ -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