diff --git a/plugin.video.alfa/channels/cineblog01.py b/plugin.video.alfa/channels/cineblog01.py index 7310780e..1bc28664 100644 --- a/plugin.video.alfa/channels/cineblog01.py +++ b/plugin.video.alfa/channels/cineblog01.py @@ -109,7 +109,7 @@ def newest(categoria): def peliculas(item): support.log() if item.contentType == 'movie' or '/serietv/' not in item.url: - patron = r'
.*?]+)\/>([^<[(]+)(?:\[([A-Za-z0-9/-]+)])? (?:\(([0-9]{4})\))?.*?([^<>]+)DURATA ([0-9]+).*?
([^<>]+)' + patron = r'
.*?]+)(?:\/|")>([^<[(]+)(?:\[([A-Za-z0-9/-]+)])? (?:\(([0-9]{4})\))?.*?([^<>&]+).*?DURATA ([0-9]+).*?([^<>]+)' listGroups = ['thumb', 'url', 'title', 'quality', 'year', 'genre', 'duration', 'plot'] action = 'findvideos' else: diff --git a/plugin.video.alfa/channels/serietvonline.py b/plugin.video.alfa/channels/serietvonline.py index 331f30c0..a47cdaa3 100644 --- a/plugin.video.alfa/channels/serietvonline.py +++ b/plugin.video.alfa/channels/serietvonline.py @@ -11,12 +11,12 @@ from platformcode import logger, config from channels import autoplay, support from channelselector import thumb -host = "https://serietvonline.co" +host = "https://serietvonline.live" headers = [['Referer', host]] IDIOMAS = {'Italiano': 'IT'} list_language = IDIOMAS.values() -list_servers = ['wstream', 'backin', 'akvideo', 'vidto', 'nowvideo'] +list_servers = ['akvideo', 'wstream', 'backin', 'vidto', 'nowvideo'] list_quality = ['default'] PERPAGE = 30 @@ -53,7 +53,6 @@ def web_menu(): return itemlist - def search(item, texto): logger.info(item.channel + 'search' + texto) @@ -61,6 +60,7 @@ def search(item, texto): return search_peliculas(item) + def search_peliculas(item): logger.info(item.channel + 'search_peliculas') @@ -71,37 +71,9 @@ def search_peliculas(item): else: action = 'episodios' - itemlist = [] - data = httptools.downloadpage(item.url, headers=headers).data - logger.info('DATA SEARCH= ' + data) - - patron = r']+><[^>]+><\/a>[^h]+h2>(.*?)<' - matches = re.compile(patron, re.DOTALL).findall(data) - - for url, title in matches: - - title = scrapertoolsV2.decodeHtmlentities(title) - itemlist.append( - Item(channel=item.channel, - action=action, - contentType=item.contentType, - fulltitle=title, - show=title, - title=title, - url=url)) - - next_page = scrapertoolsV2.find_single_match(data, "]+><[^>]+><\/a>[^h]+h2>(.*?)<', + ["url", "title"], patronNext="