From 04e15d8ed0bd9b54221952ea3eebb1dc0e14a12b Mon Sep 17 00:00:00 2001
From: Alhaziel <46535975+lozioangie@users.noreply.github.com>
Date: Sun, 9 Jun 2019 18:51:24 +0200
Subject: [PATCH] fix next page

---
 channels/animeworld.py | 4 ++--
 core/support.py        | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/channels/animeworld.py b/channels/animeworld.py
index 671ede36..6df9d4a4 100644
--- a/channels/animeworld.py
+++ b/channels/animeworld.py
@@ -172,7 +172,7 @@ def video(item):
     log()
     itemlist = []
 
-    matches, data = support.match(item, r'<a href="([^"]+)" class[^>]+><img src="([^"]+)"(.*?)data-jtitle="([^"]+)" .*?>(.*?)<\/a>', headers=headers)
+    matches, data = support.match(item, r'<a href="([^"]+)" class[^>]+><img src="([^"]+)"(.*?)data-jtitle="([^"]+)" .*?>(.*?)<\/a>', '<div class="widget-body">(.*?)<div id="sidebar"', headers=headers)
 
     for scrapedurl, scrapedthumb ,scrapedinfo, scrapedoriginal, scrapedtitle in matches:
         # Cerca Info come anno o lingua nel Titolo
@@ -251,7 +251,7 @@ def video(item):
     autorenumber.renumber(itemlist)
 
     # Next page
-    support.nextPage(itemlist, item, data, r'<a\sclass="page-link"\shref="([^"]+)"\srel="next"\saria-label="Successiva')
+    support.nextPage(itemlist, item, data, r'href="([^"]+)" rel="next"', resub=['&amp;','&'])
     return itemlist
 
 
diff --git a/core/support.py b/core/support.py
index d08bc3f2..4ba70a24 100644
--- a/core/support.py
+++ b/core/support.py
@@ -531,13 +531,14 @@ def videolibrary(itemlist, item, typography='', function_level=1):
 
     return itemlist
 
-def nextPage(itemlist, item, data='', patron='', function_level=1, next_page=''):
+def nextPage(itemlist, item, data='', patron='', function_level=1, next_page='', resub=[]):
     # Function_level is useful if the function is called by another function.
     # If the call is direct, leave it blank
     if next_page == '':
         next_page = scrapertoolsV2.find_single_match(data, patron)
 
     if next_page != "":
+        if resub: next_page = re.sub(resub[0], resub[1], next_page)
         if 'http' not in next_page:
             next_page = scrapertoolsV2.find_single_match(item.url, 'https?://[a-z0-9.-]+') + next_page
         log('NEXT= ', next_page)