Ricerca Globale:

- Aggiunto QualityTag
 - piccoli fix
This commit is contained in:
Alhaziel01
2020-12-01 09:21:17 +01:00
parent d57af7d738
commit ac40d94d9f
3 changed files with 29 additions and 13 deletions

View File

@@ -1295,6 +1295,7 @@ def addQualityTag(item, itemlist, data, patron):
itemlist.insert(0,Item(channel=item.channel,
action="",
title=typo(qualityStr, '[] color kod bold'),
fulltitle=qualityStr,
plot=descr,
folder=False,
thumbnail=thumb('info')))

View File

@@ -26,7 +26,7 @@ def set_workers():
def Search(item):
xbmc.executebuiltin('Dialog.Close(all,true)')
SearchWindow('GlobalSearch.xml', config.get_runtime_path()).start(item)
xbmc.sleep(700)
xbmc.sleep(600)
# Actions
LEFT = 1
@@ -55,6 +55,7 @@ COUNT = 501
MENU = 502
BACK = 503
CLOSE = 504
QUALITYTAG = 505
# Servers
EPISODESLIST = 200
@@ -378,12 +379,12 @@ class SearchWindow(xbmcgui.WindowXML):
if action in [CONTEXT] and focus in [RESULTS, EPISODESLIST, SERVERLIST]:
self.context()
elif action in [SWIPEUP]:
elif action in [SWIPEUP] and self.CHANNELS.isVisible() :
self.setFocusId(CHANNELS)
pos = self.CHANNELS.getSelectedPosition()
self.CHANNELS.selectItem(pos)
elif action in [LEFT, RIGHT] and focus in [CHANNELS]:
elif action in [LEFT, RIGHT] and focus in [CHANNELS] and self.CHANNELS.isVisible():
items = []
name = self.CHANNELS.getSelectedItem().getLabel()
subpos = int(self.CHANNELS.getSelectedItem().getProperty('position'))
@@ -460,7 +461,6 @@ class SearchWindow(xbmcgui.WindowXML):
else:
self.pos = self.EPISODESLIST.getSelectedPosition()
item = self.episodes[self.pos]
# dbg()
try:
self.channel = __import__('channels.%s' % item.channel, fromlist=["channels.%s" % item.channel])
self.itemsResult = getattr(self.channel, item.action)(item)
@@ -470,7 +470,7 @@ class SearchWindow(xbmcgui.WindowXML):
logger.error(traceback.format_exc())
self.itemsResult = []
if self.itemsResult and self.itemsResult[0].action in ['play']:
if self.itemsResult and self.itemsResult[0].action in ['play', '']:
if config.get_setting('checklinks') and not config.get_setting('autoplay'):
self.itemsResult = servertools.check_list_links(self.itemsResult, config.get_setting('checklinks_number'))
@@ -500,6 +500,9 @@ class SearchWindow(xbmcgui.WindowXML):
else:
it.setProperty('quality', '')
unknown.append(it)
elif not item.action:
self.getControl(QUALITYTAG).setText(item.fulltitle)
uhd.sort(key=lambda it: it.getProperty('index'))
fhd.sort(key=lambda it: it.getProperty('index'))

View File

@@ -44,7 +44,7 @@
<control type="group"> <!-- SEARCH GROUP-->
<description>Search Group</description>
<visible allowhiddenfocus="true">Control.IsVisible(1)</visible>
<visible>Control.IsVisible(1)</visible>
<control type="textbox" id='100'>
<description>Title</description>
@@ -55,14 +55,14 @@
<!-- <font>font30_title</font> -->
<textcolor>FFFFFFFF</textcolor>
<shadowcolor>00000000</shadowcolor>
<visible allowhiddenfocus="true">Integer.IsGreater(Container(101).NumItems, 0)</visible>
<visible>Integer.IsGreater(Container(101).NumItems, 0)</visible>
<align>left</align>
<aligny>center</aligny>
</control>
<control type="group"> <!-- Search Result Group -->
<description>Search Result Group</description>
<visible allowhiddenfocus="true">Integer.IsGreater(Container(102).NumItems, 0)</visible>
<visible>Integer.IsGreater(Container(102).NumItems, 0)</visible>
<animation effect="fade" time="200">Visible</animation>
<control type="textbox">
@@ -271,7 +271,7 @@
<control type="group"> <!-- EPISODES GROUP-->
<description>Episodes Group</description>
<visible allowhiddenfocus="true">Control.IsVisible(2)</visible>
<visible>Control.IsVisible(2)</visible>
<control type="image">
<description>Poster</description>
@@ -345,7 +345,7 @@
<control type="group"> <!-- SERVERS GROUP-->
<description>Servers Group</description>
<visible allowhiddenfocus="true">Control.IsVisible(3)</visible>
<visible>Control.IsVisible(3)</visible>
<control type="image">
<description>Poster</description>
@@ -493,7 +493,7 @@
<align>right</align>
<aligny>center</aligny>
<animation effect="slide" tween="linear" center="auto" end="-40,-311" time="200" condition="Integer.IsGreater(Container(101).NumItems, 0)">Conditional</animation>
<visible allowhiddenfocus="true">Control.IsVisible(500)</visible>
<visible>Control.IsVisible(500)</visible>
</control>
<control type="textbox">
@@ -508,7 +508,7 @@
<align>center</align>
<aligny>center</aligny>
<label>[UPPERCASE]$ADDON[plugin.video.kod 60473][/UPPERCASE]</label>
<visible allowhiddenfocus="true">Control.IsVisible(4)</visible>
<visible>Control.IsVisible(4)</visible>
</control>
<control type="textbox">
@@ -523,7 +523,7 @@
<align>center</align>
<aligny>center</aligny>
<label>[UPPERCASE]$ADDON[plugin.video.kod 60519][/UPPERCASE]</label>
<visible allowhiddenfocus="true">Control.IsVisible(5)</visible>
<visible>Control.IsVisible(5)</visible>
</control>
<control type="button" id="502">
@@ -563,5 +563,17 @@
<texturenofocus colordiffuse="80FFFFFF">close.png</texturenofocus>
</control>
<control type="textbox" id="505">
<description>Load Channels</description>
<top>680</top>
<right>20</right>
<width>200</width>
<height>40</height>
<textcolor>FFFFFFFF</textcolor>
<shadowcolor>00000000</shadowcolor>
<align>right</align>
<aligny>center</aligny>
</control>
</controls>
</window>