Fix cb01->ultimi/e aggiornati/e, wstream e piccole migliorie

channels/animeworld.py

@@ -118,8 +118,8 @@ def search(item, texto):
 
 @support.scrape
 def peliculas(item):
-    anime=True
+    anime = True
-    # debug =True
+    # debug = True
     if item.args not in ['noorder', 'updated'] and not item.url[-1].isdigit(): item.url += order() # usa l'ordinamento di configura canale
     data = get_data(item)
 

channels/cineblog01.py

@@ -27,14 +27,14 @@ def mainlist(item):
         ('Generi', ['', 'menu', 'Film per Genere']),
         ('Anni', ['', 'menu', 'Film per Anno']),
         ('Paese', ['', 'menu', 'Film per Paese']),
-        ('Ultimi Aggiornati', ['/lista-film-ultimi-100-film-aggiornati/', 'peliculas', 'newest']),
+        ('Ultimi Aggiornati', ['/ultimi-100-film-aggiornati/', 'peliculas', 'newest']),
         ('Ultimi Aggiunti', ['/lista-film-ultimi-100-film-aggiunti/', 'peliculas', 'newest'])
     ]
     tvshow = ['/serietv/',
               ('Per Lettera', ['/serietv/', 'menu', 'Serie-Tv per Lettera']),
               ('Per Genere', ['/serietv/', 'menu', 'Serie-Tv per Genere']),
               ('Per anno', ['/serietv/', 'menu', 'Serie-Tv per Anno']),
-              ('Ultime Aggiornate', ['/serietv/', 'peliculas', 'newest'])
+              ('Ultime Aggiornate', ['/serietv/ultime-100-serie-tv-aggiornate/', 'peliculas', 'newest'])
               ]
     docu = [('Documentari {bullet bold}', ['/category/documentario/', 'peliculas']),
             ('HD {submenu} {documentari}', ['/category/hd-alta-definizione/documentario-hd/', 'peliculas'])
@@ -97,16 +97,14 @@ def peliculas(item):
                  'Openload: la situazione. Benvenuto Verystream', 'Openload: lo volete ancora?',
                  'OSCAR ' + str(curYear) + ' ▶ VOTA IL TUO FILM PREFERITO! 🎬',
                  'Auguri di Buon Natale e Felice Anno Nuovo! – ' + str(curYear) + '!']
-    # debug= True
+    # debug = True
     if 'newest' in item.args:
+        pagination = ''
+        patronBlock = r'sequex-page-left(?P<block>.*?)sequex-page-right'
         if '/serietv/' not in item.url:
-            # debug = True
+            patron = r'src="?(?P<thumb>[^ "]+)"? alt="?(?P<title>.*?\((?P<year>\d{4})[^\)]*\))(?: &#8211; \d+&#215;\d+)?(?:>|"| &#8211; )(?:(?P<lang>Sub-ITA|ITA))?[^>]*>.*?<a href=(?:")?(?P<url>[^" ]+)(?:")?.*?rpwe-summary[^>]*>(?P<genre>\w+) [^ ]+ DURATA (?P<duration>[0-9]+)(?P<plot>[^<]+)<'
-            pagination = ''
-            patronBlock = r'Ultimi 100 film [^:]+:(?P<block>.*?)<\/td>'
-            patron = r'<a href="?(?P<url>[^">]+)"?>(?P<title>[^<([]+)(?:\[(?P<lang>Sub-ITA|B/N|SUB-ITA)\])?\s*(?:\[(?P<quality>HD|SD|HD/3D)\])?\s*\((?P<year>[0-9]{4})\)<\/a>'
             action = 'findvideos'
         else:
-            patronBlock = r'Ultime SerieTv aggiornate(?P<block>.*?)Lista'
             patron = r'src=(?:")?(?P<thumb>[^ "]+)(?:")? alt=(?:")?(?P<title>.*?)(?: &#8211; \d+&#215;\d+)?(?:>|"| &#8211; )(?:(?P<lang>Sub-ITA|ITA))?[^>]*>.*?<a href=(?:")?(?P<url>[^" ]+)(?:")?.*?rpwe-summary[^>]*>(?P<genre>[^\(]*)\((?P<year>\d{4})[^\)]*\) (?P<plot>[^<]+)<'
             action = 'episodios'
 

channels/tantifilm.py

@@ -48,12 +48,12 @@ def mainlist(item):
 
 @support.scrape
 def peliculas(item):
-    # debug=True
+    # debug = True
     if item.args == 'search':
         patron = r'<a href="(?P<url>[^"]+)" title="Permalink to\s*(?P<title>[^"]+) \((?P<year>[0-9]+)[^<]*\)[^"]*"[^>]+>\s*<img[^s]+src="(?P<thumb>[^"]+)".*?<div class="calitate">\s*<p>(?P<quality>[^<]+)<\/p>'
     else:
         patronNext = r'<a class="nextpostslink" rel="next" href="([^"]+)">'
-        patron = r'<div class="mediaWrap mediaWrapAlt">\s*<a href="(?P<url>[^"]+)"(?:[^>]+)?>?\s*<img[^s]+src="(?P<thumb>[^"]+)"[^>]+>\s*<\/a>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+?)(?P<lang>[sS][uU][bB]\-[iI][tT][aA]+)?(?:[ ]?\((?P<year>\d{4})-?(?:\d{4})?)\).[^<]+[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*(?P<quality>[a-zA-Z-0-9\.]+)?'
+        patron = r'<div class="mediaWrap mediaWrapAlt">\s*<a href="(?P<url>[^"]+)"(?:[^>]+)?>?\s*(?:<img[^s]+src="(?P<thumb>[^"]+)"[^>]+>\s*)?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>[^<]+?)(?P<lang>[sS][uU][bB]\-[iI][tT][aA]+)?(?:[ ]?\((?P<year>\d{4})-?(?:\d{4})?)\).[^<]+[^>]+><\/a>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+>\s*(?P<quality>[a-zA-Z-0-9\.]+)?'
         patronBlock = r'<div id="main_col">(?P<block>.*?)<!\-\- main_col \-\->'
 
     # if item.args != 'all' and item.args != 'search':

servers/vidmoly.py

@@ -9,7 +9,7 @@ def test_video_exists(page_url):
     global data
     resp = httptools.downloadpage(page_url)
     data = resp.data
-    if resp.code == 404:
+    if resp.code == 404 or 'Video is processing now' in data:
         return False, config.get_localized_string(70449) % "Vidmoly"
     return True, ""
 

servers/vupplayer.py

@@ -9,7 +9,7 @@ def test_video_exists(page_url):
     page = httptools.downloadpage(page_url)
     global data
     data = page.data
-    if page.code == 404 or 'File is no longer available' in data:
+    if page.code == 404 or 'File is no longer available' in data or "We're sorry!" in data:
         return False, config.get_localized_string(70449) % "VUP Player"
     return True, ""
 

servers/wstream.py

@@ -19,12 +19,12 @@ errorsStr = ['Sorry this file is not longer available', 'Sorry this video is una
 def test_video_exists(page_url):
     logger.debug("(page_url='%s')" % page_url)
     disable_directIP = False
-    # if 'swvideoid' in page_url: disable_directIP = True
+    if 'swvideoid' in page_url: disable_directIP = True
 
     resp = httptools.downloadpage(page_url, verify=False, disable_directIP=disable_directIP, follow_redirects=False)
     while resp.headers.get('location'):
         page_url = resp.headers.get('location')
-        resp = httptools.downloadpage(page_url.replace('https:', 'http:'), verify=False, disable_directIP=disable_directIP, follow_redirects=False)
+        resp = httptools.downloadpage(page_url, verify=False, disable_directIP=disable_directIP, follow_redirects=False)
 
     global data, real_url
     data = resp.data