diff --git a/channels/animealtadefinizione.py b/channels/animealtadefinizione.py index 18489ab8..ee9a5082 100644 --- a/channels/animealtadefinizione.py +++ b/channels/animealtadefinizione.py @@ -78,11 +78,10 @@ def peliculas(item): query='category_name' searchtext = item.url.split('/')[-2] if not item.pag: item.pag = 1 - - anime=True + # debug = True + anime = True data = support.match(host + '/wp-admin/admin-ajax.php', post='action=itajax-sort&loop=main+loop&location=&thumbnail=1&rating=1sorter=recent&columns=4&numarticles='+perpage+'&paginated='+str(item.pag)+'¤tquery%5B'+query+'%5D='+searchtext).data.replace('\\','') - patron=r'[^"]+)">[^"]+)"[^=]+="(?P[^"]+)">
]+>(?P[^\(\[<]+)(?:\[(?P<quality1>HD)\])?[ ]?(?:\(|\[)?(?P<lang>Sub-ITA)?(?:\)|\])?[ ]?(?:\[(?P<quality>.+?)\])?[ ]?(?:\((?P<year>\d+)\))?<(?:[^>]+>.+?(?:title="Nuovi episodi">(?P<episode>\d+x\d+)[ ]?(?P<lang2>Sub-Ita)?|title="IMDb">(?P<rating>[^<]+)))?' else: - patron = r'<li><a href="(?P<url>[^"]+)"[^=]+="(?P<thumb>[^"]+)"><div> <div[^>]+>(?P<title>[^\(\[<]+)(?:\[(?P<quality1>HD)\])?[ ]?(?:\(|\[)?(?P<lang>Sub-ITA)?(?:\)|\])?[ ]?(?:\[(?P<quality>.+?)\])?[ ]?(?:\((?P<year>\d+)\))?<' + patron = r'<li><a href="(?P<url>[^"]+)"[^=]+="(?P<thumb>[^"]+)"><div> <div[^>]+>(?P<title>[^\(\[<]+)(?:\[(?P<quality1>HD)\])?[ ]?(?:\(|\[)?(?P<lang>Sub-ITA)?(?:\)|\])?[ ]?(?:\[(?P<quality>.+?)\])?[ ]?(?:\((?P<year>\d+)\))?' patronNext = r'<a href="([^"]+)" >Pagina' # debug = True diff --git a/channels/serietvonline.py b/channels/serietvonline.py index 5c6ac43d..592800d1 100644 --- a/channels/serietvonline.py +++ b/channels/serietvonline.py @@ -76,13 +76,13 @@ def peliculas(item): pagination = 35 if not item.args and 'anime' not in item.url: - patron = r'<div class="movie">[^>]+>.+?src="(?P<thumb>[^"]+)" alt="[^"]+".+?href="(?P<url>[^"]+)">[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[ ](?P<rating>\d+.\d+|\d+)<[^>]+>[^>]+><h2>(?P<title>[^"]+)</h2>[ ]?(?:<span class="year">(?P<year>\d+|\-\d+))?<' + patron = r'<div class="movie">[^>]+>.+?src="(?P<thumb>[^"]+)" alt="[^"]+".+? href="(?P<url>[^"]+)">.*?<h2>(?P<title>[^"]+)</h2>\s?(?:<span class="year">(?P<year>\d+|\-\d+))?<' else: anime = True patron = r'(?:<td>)?<a href="(?P<url>[^"]+)"(?:[^>]+)?>\s?(?P<title>[^<]+)(?P<episode>[\d\-x]+)?(?P<title2>[^<]+)?<' else: # SEZIONE FILM - # pagination = 25 + pagination = 25 if item.args == 'lista': patron = r'href="(?P<url>[^"]+)"[^>]+>(?P<title>.*?)(?P<year>\d{4})?<' diff --git a/channels/serietvsubita.py b/channels/serietvsubita.py index a052df09..a89d0b0b 100644 --- a/channels/serietvsubita.py +++ b/channels/serietvsubita.py @@ -94,10 +94,7 @@ def lista_serie(item): PERPAGE = 15 - p = 1 - if '{}' in item.url: - item.url, p = item.url.split('{}') - p = int(p) + p = 1 if not item.args else int(item.args) if '||' in item.data: series = item.data.split('\n\n') @@ -129,7 +126,8 @@ def lista_serie(item): # Paginazione if len(matches) >= p * PERPAGE: - support.nextPage(itemlist, item, next_page=(item.url + '{}' + str(p + 1))) + item.args = p + 1 + support.nextPage(itemlist, item, next_page=item.url) return itemlist diff --git a/tests/test_generic.py b/tests/test_generic.py index 25847573..a488fd0b 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -120,7 +120,7 @@ chNumRis = { 'Serie TV': 12 }, 'serietvonline': { - 'Film': 35, + 'Film': 50, 'Serie TV': 35 }, 'tantifilm': {