piccoli fix vari ai canali

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)+'&currentquery%5B'+query+'%5D='+searchtext).data.replace('\\','')
-    patron=r'<a href="(?P<url>[^"]+)"><img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)" class="[^"]+" alt="" title="(?P<title>.*?)\s+(?P<type>Movie)?\s*(?P<lang>Sub Ita|Ita)'
-
+    patron = '<a href="(?P<url>[^"]+)"><img width="[^"]+" height="[^"]+" src="(?P<thumb>[^"]+)" class="[^"]+" alt="" title="(?P<title>.*?)\s+(?P<type>Movie)?\s*(?P<lang>Sub Ita|Ita)?\s*[sS]treaming'
     typeContentDict = {'movie':['movie']}
     typeActionDict = {'findvideos':['movie']}
 

channels/casacinema.py

@@ -107,7 +107,7 @@ def peliculas(item):
     if item.args == 'newest':
         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+)\))?<(?:[^>]+>.+?(?: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

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})?<'

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
 

tests/test_generic.py

@@ -120,7 +120,7 @@ chNumRis = {
         'Serie TV': 12
     },
     'serietvonline': {
-        'Film': 35,
+        'Film': 50,
         'Serie TV': 35
     },
     'tantifilm': {