From 8ce21e8e10ab394052b4261bd12dd9f2c046a123 Mon Sep 17 00:00:00 2001 From: Alhaziel01 Date: Wed, 22 Dec 2021 19:04:37 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20successivo=20in=20novit=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- channels/streamingcommunity.py | 10 ++++++---- channels/vvvvid.py | 34 ++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/channels/streamingcommunity.py b/channels/streamingcommunity.py index 3eeb1bfa..626de91f 100644 --- a/channels/streamingcommunity.py +++ b/channels/streamingcommunity.py @@ -87,6 +87,7 @@ def newest(category): itemlist = [] item = support.Item() item.args = 1 + item.newest = True if category == 'peliculas': item.url = host + '/film' else: @@ -147,10 +148,11 @@ def peliculas(item): recordlist.append(it) itemlist.sort(key=lambda item: item.n) - if recordlist: - itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), thumbnail=support.thumb(), page=page, records=recordlist)) - elif len(itemlist) >= 20: - itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), thumbnail=support.thumb(), records=[], page=page + 1)) + if not item.newest: + if recordlist: + itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), thumbnail=support.thumb(), page=page, records=recordlist)) + elif len(itemlist) >= 20: + itemlist.append(item.clone(title=support.typo(support.config.get_localized_string(30992), 'color kod bold'), thumbnail=support.thumb(), records=[], page=page + 1)) support.tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True) support.check_trakt(itemlist) diff --git a/channels/vvvvid.py b/channels/vvvvid.py index 645913fb..d2f3e127 100644 --- a/channels/vvvvid.py +++ b/channels/vvvvid.py @@ -90,6 +90,7 @@ def search(item, text): def newest(categoria): item = support.Item() item.args = 'channel/10007/last/' + item.newest = True if categoria == 'peliculas': item.contentType = 'movie' item.url = main_host + 'film/' @@ -133,24 +134,25 @@ def peliculas(item): make_itemlist(itemlist, item, json_file) itlist = [] - for i, it in enumerate(itemlist): - if pagination and (item.page - 1) * pagination > i: continue # pagination - if pagination and i >= item.page * pagination: break # pagination + if not item.newest: + for i, it in enumerate(itemlist): + if pagination and (item.page - 1) * pagination > i: continue # pagination + if pagination and i >= item.page * pagination: break # pagination - itlist.append(it) + itlist.append(it) - if pagination and len(itemlist) >= pagination: - if inspect.stack()[1][3] != 'get_newest': - itlist.append( - item.clone(action='peliculas', - title=support.typo(config.get_localized_string(30992), 'color kod bold'), - fulltitle=item.fulltitle, - show=item.show, - url=item.url, - args=item.args, - page=item.page + 1, - thumbnail=support.thumb())) - itemlist = itlist + if pagination and len(itemlist) >= pagination: + if inspect.stack()[1][3] != 'get_newest': + itlist.append( + item.clone(action='peliculas', + title=support.typo(config.get_localized_string(30992), 'color kod bold'), + fulltitle=item.fulltitle, + show=item.show, + url=item.url, + args=item.args, + page=item.page + 1, + thumbnail=support.thumb())) + itemlist = itlist if 'category' in item.args: support.thumb(itemlist,genre=True)