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

Formattazione Titoli in render_items + correzione di alcuni canali

Browse Source
This commit is contained in:
Alhaziel01
2021-06-05 15:51:46 +02:00
parent ab8136e326
commit 1868420425
10 changed files with 194 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
platformcode/autorenumber.py
View File

@@ -69,7 +69,7 @@ def b64(json, mode = 'encode'):
def find_episodes(item):
logger.debug()
ch = __import__('channels.' + item.channel, fromlist=["channels.%s" % item.channel])
ch = __import__('channels.' + item.channel, fromlist=["channels.{}".format(item.channel)])
itemlist = ch.episodios(item)
return itemlist
@@ -111,14 +111,14 @@ class autorenumber():
self.renumberdict = load(item)
self.auto = config.get_setting('autorenumber', item.channel)
self.title = self.item.fulltitle.strip()
if match(self.itemlist[0].title, patron=r'[Ss]?(\d+)(?:x|_|\s+)[Ee]?[Pp]?(\d+)').match:
if item.contentSeason:
item.exit = True
return
elif (self.item.channel in self.item.channel_prefs and RENUMBER in self.item.channel_prefs[item.channel] and self.title not in self.renumberdict) or self.item.renumber:
from core.videolibrarytools import check_renumber_options
from specials.videolibrary import update_videolibrary
# from specials.videolibrary import update_videolibrary
check_renumber_options(self.item)
update_videolibrary(self.item)
# update_videolibrary(self.item)
self.series = self.renumberdict.get(self.title,{})
self.id = self.series.get(ID, 0)
@@ -177,13 +177,18 @@ class autorenumber():
def renumber(self):
def sub_thread(item):
if not match(item.title, patron=r'[Ss]?(\d+)(?:x|_|\s+)[Ee]?[Pp]?(\d+)').match:
number = match(item.title, patron=r'(\d+)').match.lstrip('0')
if not item.contentSeason:
number = str(item.contentEpisodeNumber)
if number:
if not number in self.episodes: self.makelist()
item.title = '{} - {}'.format(typo(self.episodes[number], 'bold'), item.title)
item.contentSeason = int(self.episodes[number].split('x')[0])
item.contentEpisodeNumber = int(self.episodes[number].split('x')[1])
if number in self.episodes:
item.contentSeason = int(self.episodes[number].split('x')[0])
item.contentEpisodeNumber = int(self.episodes[number].split('x')[1])
# support.dbg()
# for i in self.itemlist:
# sub_thread(i)
if not self.item.setrenumber and self.itemlist:
with futures.ThreadPoolExecutor() as executor:
renumber_list = [executor.submit(sub_thread, item,) for item in self.itemlist]
@@ -244,9 +249,9 @@ class autorenumber():
count = 0
if self.epdict:
for item in itemlist:
if not match(re.sub(r'\[[^\]]+\]','',item.title), patron=r'[Ss]?(\d+)(?:x|_|\s+)[Ee]?[Pp]?(\d+)').match:
if not item.contentSeason:
# Otiene Numerazione Episodi
scraped_ep = match(re.sub(r'\[[^\]]+\]','',item.title), patron=r'(\d+)').match
scraped_ep = item.contentEpisodeNumber
if scraped_ep:
episode = int(scraped_ep)
if episode == 0:
@@ -325,7 +330,7 @@ def SelectreNumeration(opt, itemlist, manual=False):
ep = '1'
position = 0
for i, item in enumerate(self.itemlist):
title = match(item.title, patron=r'(\d+)').match.lstrip('0')
title = str(item.contentEpisodeNumber)
it = xbmcgui.ListItem(title)
if int(title) <= len(self.episodes):
se, ep = self.episodes[title].split('x')
@@ -345,10 +350,14 @@ def SelectreNumeration(opt, itemlist, manual=False):
# MAIN / SPECIALS
else:
for item in self.itemlist:
if not match(item.title, patron=r'[Ss]?(\d+)(?:x|_|\s+)[Ee]?[Pp]?(\d+)').match:
title = match(item.title, patron=r'(\d+)').match.lstrip('0')
if not item.contentSeason:
title = str(item.contentEpisodeNumber)
it = xbmcgui.ListItem(title)
self.items.append(it)
if title not in self.specials.keys():
self.items.append(it)
else:
self.selected.append(it)
it.setProperty('title', title)
self.getControl(POSTER).setImage(thumb)
self.getControl(MPOSTER).setImage(thumb)
@@ -357,6 +366,7 @@ def SelectreNumeration(opt, itemlist, manual=False):
self.getControl(MBACKGROUND).setImage(fanart)
self.getControl(INFO).setLabel(typo(config.get_localized_string(70824) + self.title, 'bold'))
self.getControl(LIST).addItems(self.items)
self.getControl(SELECTED).addItems(self.selected)
if self.sp:
self.getControl(SPECIALS).setVisible(True)
@@ -492,7 +502,7 @@ def SelectreNumeration(opt, itemlist, manual=False):
ep = str(int(ep) + 1)
item.setProperties({'season': se, "episode": ep})
items.append(item)
self.seasons[item.getLabel()] = '%sx%s' % (se, ep)
self.seasons[item.getLabel()] = '{}x{}'.format(se, ep)
self.items = items
else:
self.makerenumber()
@@ -520,7 +530,7 @@ def SelectreNumeration(opt, itemlist, manual=False):
p1 = self.getControl(SELECTED).getSelectedPosition()
if control_id in [LIST]:
item = self.getControl(LIST).getSelectedItem()
it = xbmcgui.ListItem(str(len(self.selected) + len(self.specials) + 1))
it = xbmcgui.ListItem(str(len(self.selected) + 1))
it.setProperty('title', item.getLabel())
self.selected.append(it)
index = self.getControl(SELECTED).getSelectedPosition()
@@ -541,7 +551,6 @@ def SelectreNumeration(opt, itemlist, manual=False):
self.selected[p1], self.selected[p2] = self.selected[p2], self.selected[p1]
for i, it in enumerate(self.selected):
it.setLabel(str(i + 1))
break
self.getControl(SELECTED).reset()
self.getControl(SELECTED).addItems(self.selected)
self.getControl(SELECTED).selectItem(p2)
@@ -552,7 +561,6 @@ def SelectreNumeration(opt, itemlist, manual=False):
self.selected[p1], self.selected[p2] = self.selected[p2], self.selected[p1]
for i, it in enumerate(self.selected):
it.setLabel(str(i + 1))
break
self.getControl(SELECTED).reset()
self.getControl(SELECTED).addItems(self.selected)
self.getControl(SELECTED).selectItem(p2)
@@ -579,19 +587,21 @@ def SelectreNumeration(opt, itemlist, manual=False):
# RELOAD SPECIALS
if control_id in [SELECTED]:
epnumber = platformtools.dialog_numeric(0, config.get_localized_string(60386))
it = self.getControl(SELECTED).getSelectedItem()
it.setLabel(str(epnumber))
self.selected.sort(key=lambda it: int(it.getLabel()))
for i, it in enumerate(self.selected):
if it.getLabel() == epnumber: pos = i
if epnumber:
it = self.getControl(SELECTED).getSelectedItem()
it.setLabel(str(epnumber))
self.selected.sort(key=lambda it: int(it.getLabel()))
self.getControl(SELECTED).reset()
self.getControl(SELECTED).addItems(self.selected)
self.getControl(SELECTED).selectItem(pos)
break
for i, it in enumerate(self.selected):
if it.getLabel() == epnumber: pos = i
self.selected.sort(key=lambda it: int(it.getLabel()))
self.getControl(SELECTED).reset()
self.getControl(SELECTED).addItems(self.selected)
self.getControl(SELECTED).selectItem(pos)
break
if len(self.selected) > 0:
self.getControl(SPECIALCOMMANDS).setVisible(True)
else:
self.setFocusId(LIST)
self.getControl(SPECIALCOMMANDS).setVisible(False)
## MANUAL SECTION
@@ -619,8 +629,10 @@ def SelectreNumeration(opt, itemlist, manual=False):
self.getControl(MLIST).selectItem(pos)
# OK
if control_id in [OK]:
if not self.selected:
self.specials = {}
for it in self.selected:
self.specials[int(it.getProperty('title'))] = '0x' + it.getLabel()
self.specials[it.getProperty('title')] = '0x' + it.getLabel()
self.close()
# CLOSE
elif control_id in [CLOSE]:
@@ -645,7 +657,7 @@ def SelectreNumeration(opt, itemlist, manual=False):
if i > pos: prevEpisode += 1
item.setProperties({'season': self.season, 'episode': prevEpisode})
items.append(item)
self.seasons[item.getLabel()] = '%sx%s' % (item.getProperty('season'), item.getProperty('episode'))
self.seasons[item.getLabel()] = '{}x{}'.format(item.getProperty('season'), item.getProperty('episode'))
self.items = items
logger.debug('SELF', self.seasons)
@@ -662,7 +674,7 @@ def SelectreNumeration(opt, itemlist, manual=False):
if season in seasonlist:
if season not in self.episodes:
self.episodes[season] = []
item = xbmcgui.ListItem('%s - Ep. %s' % (value, ep))
item = xbmcgui.ListItem('{} - Ep. {}'.format(value, ep))
item.setProperty('episode', ep)
self.episodes[season].append(item)
logger.log('EPISODES', self.episodes[season])

26
platformcode/platformtools.py
View File

@@ -317,6 +317,7 @@ def render_items(itemlist, parent_item):
logger.debug('START render_items')
thumb_type = config.get_setting('video_thumbnail_type')
from platformcode import shortcuts
from core.support import typo
# from core import httptools
_handle = int(sys.argv[1])
default_fanart = config.get_fanart()
@@ -358,7 +359,30 @@ def render_items(itemlist, parent_item):
# break
icon_image = "DefaultFolder.png" if item.folder else "DefaultVideo.png"
listitem = xbmcgui.ListItem(item.title)
title = item.title
episode = ''
if type(item.contentSeason) == int and type(item.contentEpisodeNumber) == int and not parent_item.onlyep:
episode = '{}x{:02d}'.format(item.contentSeason, item.contentEpisodeNumber)
elif type(item.contentEpisodeNumber) == int:
episode = '{:02d}'.format(item.contentEpisodeNumber)
if episode and item.episode2:
if len(item.episode2) < 4: episode = '{}-{}'.format(episode, '-'.join('{:02d}'.format(e) for e in item.episode2))
else: episode = '{} -> {:02d}'.format(episode, item.episode2[-1])
if episode: title = '{}. {}'.format(episode, title)
if item.title2: title = '{} - {}'.format(title, item.title2)
if not config.get_setting('format_title') and title[:1] not in ['[', '•']:
server = typo(item.server, '_ []') if item.server else ''
quality = typo(item.quality, '_ [] color kod') if item.quality else ''
lang = typo(item.contentLanguage, '_ [] color kod') if item.contentLanguage else ''
extra = typo(item.extraInfo, '_ [] color kod') if item.extraInfo else ''
title = '[B]{}{}[/B]{}{}{}'.format(title, server, quality, lang, extra)
listitem = xbmcgui.ListItem(title)
art = {'icon': icon_image, 'thumb': item.thumbnail, 'poster': item.thumbnail, 'fanart': item.fanart if item.fanart else default_fanart}
if item.infoLabels.get('landscape'): art['landscape'] = item.infoLabels['landscape']
if item.infoLabels.get('clearlogo'): art['clearlogo'] = item.infoLabels['clearlogo']