diff --git a/channels/animesaturn.py b/channels/animesaturn.py index e303929f..e4696377 100644 --- a/channels/animesaturn.py +++ b/channels/animesaturn.py @@ -60,7 +60,7 @@ def newest(categoria): def submenu(item): data = support.match(item.url + item.args).data action = 'filter' - patronMenu = r'
(?P[^<]+)[^>]+>[^>]+>\s*<select id="(?P<parameter>[^"]+)"[^>]+>(?P<url>.*?)</select>' + patronMenu = r'<h5 class="[^"]+">(?P<title>[^<]+)[^>]+>[^>]+>\s*<select id="(?P<parameter>[^"]+)"[^>]+>(?P<data>.*?)</select>' def itemlistHook(itemlist): itemlist.insert(0, item.clone(title=support.typo('Tutti','bold'), url=item.url + item.args, action='peliculas')) return itemlist[:-1] @@ -69,7 +69,7 @@ def submenu(item): def filter(item): itemlist = [] - matches = support.match(item.url, patron=r'<option value="(?P<value>[^"]+)"[^>]*>(?P<title>[^<]+)').matches + matches = support.match(item.data if item.data else item.url, patron=r'<option value="(?P<value>[^"]+)"[^>]*>(?P<title>[^<]+)').matches for value, title in matches: itemlist.append(item.clone(title= support.typo(title,'bold'), url='{}{}&{}%5B0%5D={}'.format(host, item.args, item.parameter, value), action='peliculas', args='filter')) support.thumb(itemlist, genre=True) @@ -95,7 +95,7 @@ def peliculas(item): deflang= 'Sub-ITA' action = 'check' page = None - post = "page=" + str(item.page if item.page else 1) if item.page and item.page > 1 else None + post = "page=" + str(item.page if item.page else 1) if item.page and int(item.page) > 1 else None if item.args == 'top': data = item.other diff --git a/channels/paramount.py b/channels/paramount.py index f1d33281..17d545e6 100644 --- a/channels/paramount.py +++ b/channels/paramount.py @@ -64,7 +64,7 @@ def live(item): def peliculas(item): logger.debug() def load_more(url): - second_url = host if url.startswith('/') else '' + url.replace('\u002F','/').replace('%5C','/') + second_url = host if url.startswith('/') else '' + url.replace('\u002F','/').replace('\\u002F','/').replace('%5C','/') new_data = support.match(host + second_url).data.replace('\x01','l').replace('\x02','a') return jsontools.load(new_data)['items'] diff --git a/channels/serietvsubita.json b/channels/serietvsubita.json index b087171f..2cd33c2f 100644 --- a/channels/serietvsubita.json +++ b/channels/serietvsubita.json @@ -1,7 +1,7 @@ { "id": "serietvsubita", "name": "Serie TV Sub ITA", - "active": true, + "active": false, "language": ["ita"], "thumbnail": "serietvsubita.png", "banner": "serietvsubita.png", diff --git a/core/autoplay.py b/core/autoplay.py index af904cad..4f3c3dff 100644 --- a/core/autoplay.py +++ b/core/autoplay.py @@ -153,11 +153,13 @@ def start(itemlist, item): autoplay_list.append(autoplay_elem) # We order according to priority - if priority == 0: autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server'])) # Servers and qualities + if priority == 0: autoplay_list.sort(key=lambda orden: ((orden['indice_server'], orden['indice_quality']))) # Servers and qualities elif priority == 1: autoplay_list.sort(key=lambda orden: (orden['indice_quality'], orden['indice_server'])) # Qualities and servers elif priority == 2: autoplay_list.sort(key=lambda orden: (orden['indice_server'])) # Servers only elif priority == 3: autoplay_list.sort(key=lambda orden: (orden['indice_quality'])) # Only qualities + logger.debug('PRIORITY',priority, autoplay_list) + # if quality priority is active if priority == 0 and config.get_setting('quality_priority'): max_quality = autoplay_list[0]["indice_quality"] if autoplay_list and "indice_quality" in autoplay_list[0] else 0 diff --git a/core/support.py b/core/support.py index f02b26d2..ff9e83cd 100755 --- a/core/support.py +++ b/core/support.py @@ -1182,7 +1182,7 @@ def server(item, data='', itemlist=[], headers='', AutoPlay=True, CheckLinks=Tru srv_param = servertools.get_server_parameters(videoitem.server.lower()) if srv_param.get('active', False): - item.title = typo(item.contentTitle.strip(), 'bold') if item.contentType == 'movie' or (config.get_localized_string(30161) in item.title) else item.title + item.title = typo(item.contentTitle.strip() if item.contentTitle else item.fulltitle.strip(), 'bold') if item.contentType == 'movie' or (config.get_localized_string(30161) in item.title) else item.title quality = videoitem.quality if videoitem.quality else item.quality if item.quality else '' videoitem.title = (item.title if item.channel not in ['url'] else '') + (typo(videoitem.title, '_ color kod [] bold') if videoitem.title else "") + (typo(videoitem.quality, '_ color kod []') if videoitem.quality else "") diff --git a/specials/setting.py b/specials/setting.py index d3d7eb78..2f847944 100644 --- a/specials/setting.py +++ b/specials/setting.py @@ -349,7 +349,7 @@ def cb_servers_favorites(server_names, dict_values): dict_favorites[dict_name[server_parameters['name']]] = server config.set_setting("favorites_servers_list", dict_name[server_parameters['name']], server=server) else: - config.set_setting("favorites_servers_list", 0, server=server) + config.set_setting("favorites_servers_list", 999, server=server) progreso.update(old_div((i * 100), n), config.get_localized_string(60559) % server_parameters['name']) i += 1