diff --git a/channels/cineblog01.py b/channels/cineblog01.py index 402466bc..ad76cbc9 100644 --- a/channels/cineblog01.py +++ b/channels/cineblog01.py @@ -147,7 +147,7 @@ def peliculas(item): patron = r'src="(?P[^"]+)" alt="(?P.*?)(?: – \d+×\d+)?(?:"| – )(?:(?P<lang>Sub-ITA|ITA))?[^>]*>[^>]+>[^>]+><a href="(?P<url>[^"]+)".*?<div class="rpwe-summary">.*?\((?P<year>\d{4})[^\)]*\) (?P<plot>[^<]+)<' action = 'episodios' elif '/serietv/' not in item.url: - patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<genre>[^<>&–]+)(?:[^ ]+\s*DURATA\s*(?P<duration>[0-9]+)[^>]+>[^>]+>[^>]+>(?P<plot>[^<>]+))?' + patron = r'<div class="card-image">\s<a[^>]+>\s*<img src="(?P<thumb>[^" ]+)" alt[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+><a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>(?P<genre>[^<>&–]+)(?:[^ ]+\s*DURATA\s*(?P<duration>[0-9]+)[^>]+>[^>]+>[^>]+>(?P<plot>[^<>]+))?' # patron = r'<div class="?card-image"?>.*?<img src="?(?P<thumb>[^" ]+)"? alt.*?<a href="?(?P<url>[^" >]+)(?:\/|"|\s+)>(?P<title>[^<[(]+)(?:\[(?P<quality>[A-Za-z0-9/-]+)])? (?:\((?P<year>[0-9]{4})\))?.*?<strong>(?P<genre>[^<>&–]+).*?DURATA (?P<duration>[0-9]+).*?<br(?: /)?>(?P<plot>[^<>]+)' action = 'findvideos' else: diff --git a/channels/pufimovies.py b/channels/pufimovies.py index 9600c9fe..6c001c64 100644 --- a/channels/pufimovies.py +++ b/channels/pufimovies.py @@ -39,12 +39,15 @@ def menu(item): def search(item, text): support.log('search', item) - + itemlist = [] text = text.replace(' ', '+') item.url = host + '/search/keyword/' + text try: item.args = 'search' - return peliculas(item) + itemlist = peliculas(item) + if itemlist[-1].action == 'peliculas': + itemlist.pop() + return itemlist # Continua la ricerca in caso di errore except: import sys @@ -68,8 +71,8 @@ def newest(categoria): item.contentType = 'tvshow' itemlist = peliculas(item) - if itemlist[-1].action == 'peliculas': - itemlist.pop() + if itemlist[-1].action == 'peliculas': + itemlist.pop() # Continua la ricerca in caso di errore except: import sys diff --git a/core/support.py b/core/support.py index cbef9591..644779ec 100755 --- a/core/support.py +++ b/core/support.py @@ -751,8 +751,8 @@ def typo(string, typography=''): string = '[' + re.sub(r'\s\[\]','',string) + ']' if '()' in string: string = '(' + re.sub(r'\s\(\)','',string) + ')' - # if '{}' in string: - # string = '{' + re.sub(r'\s\{\}','',string) + '}' + if '{}' in string: + string = '{' + re.sub(r'\s\{\}','',string) + '}' if 'submenu' in string: string = "•• " + re.sub(r'\ssubmenu','',string) if 'color' in string: