fix tantifilm e server correlati, migliorato unshortenit

channels/tantifilm.py

@@ -7,7 +7,7 @@ import re
 
 from core import scrapertools, httptools, tmdb, support
 from core.item import Item
-from core.support import menu, log
+from core.support import log
 from platformcode import logger
 from specials import autorenumber
 from platformcode import config, unify
@@ -29,11 +29,8 @@ list_quality = ['default']
 def mainlist(item):
     log()
 
-
-    #top = [(support.typo('Novità Film/Serie/Anime/Altro', 'bold'),['/film/'])]
-    top = [('Novità Film/Serie/Anime/Altro', ['/film/', 'peliculas', 'all'])]
-
-    film = ['/watch-genre/film-aggiornati/',
+    top = [('Generi', ['', 'category'])]
+    film = ['/film',
         ('Al Cinema', ['/watch-genre/al-cinema/']),
         ('HD', ['/watch-genre/altadefinizione/']),
         ('Sub-ITA', ['/watch-genre/sub-ita/'])
@@ -66,17 +63,16 @@ def peliculas(item):
         patron = r'<div class="mediaWrap mediaWrapAlt">\s?<a href="(?P<url>[^"]+)"(?:[^>]+>|)>?\s?<img[^s]+src="([^"]+)"[^>]+>\s?<\/a>[^>]+>[^>]+>[^>]+>(?P<title>.+?)(?:[ ]<lang>[sSuUbB\-iItTaA]+)?(?:[ ]?\((?P<year>[\-\d+]+)\)).[^<]+[^>]+><\/a>.+?<p>\s*(?P<quality>[a-zA-Z-0-9\.]+)\s*<\/p>[^>]+>'
         patronBlock = r'<div id="main_col">(?P<block>.*?)<!\-\- main_col \-\->'
 
-    if item.args != 'all' and item.args != 'search':
-        action = 'findvideos' if item.extra == 'movie' else 'episodios'
-        item.contentType = 'movie' if item.extra == 'movie' else 'tvshow'
-
+    # if item.args != 'all' and item.args != 'search':
+    #     action = 'findvideos' if item.extra == 'movie' else 'episodios'
+    #     item.contentType = 'movie' if item.extra == 'movie' else 'tvshow'
     #debug = True
     return locals()
 
+
 @support.scrape
 def episodios(item):
     log()
-
     if not item.data:
         data_check = httptools.downloadpage(item.url, headers=headers).data
         data_check = re.sub('\n|\t', ' ', data_check)
@@ -90,6 +86,8 @@ def episodios(item):
     patron = r'<a href="(?P<url>[^"]+)"\s*>\s*<i[^>]+><\/i>\s*(?P<episode>\d+)<\/a>'
     # debug = True
 
+    otherLinks = support.match(data_check, patronBlock='<div class="content-left-film">.*?Keywords', patron='([0-9]+)(?:×|x)([0-9]+(?:-[0-9]+)?)(.*?)(?:<br|$)').matches
+
     def itemlistHook(itemlist):
         retItemlist = []
         for item in itemlist:
@@ -105,51 +103,30 @@ def episodios(item):
                 i = item.clone()
                 i.action = 'findvideos'
                 i.url = url
+                i.contentSeason = str(season)
+                i.contentEpisodeNumber = str(episode)
                 i.title = str(season) + 'x' + str(episode)
+                for ep in otherLinks:
+                    if int(ep[0]) == int(season) and int(ep[1].split('-')[-1]) == int(episode):
+                        i.otherLinks = ep[2]
+                        break
                 retItemlist.append(i)
-
+        retItemlist.sort(key=lambda e: (int(e.contentSeason), int(e.contentEpisodeNumber)))
         return retItemlist
 
     #debug = True
     return locals()
 
+
+@support.scrape
 def category(item):
-    log()
-
     blacklist = ['Serie TV Altadefinizione', 'HD AltaDefinizione', 'Al Cinema', 'Serie TV', 'Miniserie', 'Programmi Tv', 'Live', 'Trailers', 'Serie TV Aggiornate', 'Aggiornamenti', 'Featured']
-    itemlist = support.scrape(item, '<li><a href="([^"]+)"><span></span>([^<]+)</a></li>', ['url', 'title'], headers, blacklist, patron_block='<ul class="table-list">(.*?)</ul>', action='peliculas')
-    return support.thumb(itemlist)
+    patron = '<li><a href="(?P<url>[^"]+)"><span></span>(?P<title>[^<]+)</a></li>'
+    patron_block = '<ul class="table-list">(.*?)</ul>'
+    action = 'peliculas'
 
-def anime(item):
-    log()
-    itemlist = []
+    return locals()
 
-    seasons = support.match(item, patron=r'<div class="sp-body[^"]+">(.*?)<\/div>').matches
-    for season in seasons:
-        episodes = scrapertools.find_multiple_matches(season, r'<a.*?href="([^"]+)"[^>]+>([^<]+)<\/a>(.*?)<(:?br|\/p)')
-        for url, title, urls, none in episodes:
-            urls = scrapertools.find_multiple_matches(urls, '<a.*?href="([^"]+)"[^>]+>')
-
-            for url2 in urls:
-                url += url2 + '\n'
-
-            #log('EP URL',url)
-
-            itemlist.append(
-                Item(channel=item.channel,
-                     action="findvideos",
-                     contentType=item.contentType,
-                     title=support.typo(title + ' - ' + item.fulltitle,'bold'),
-                     url=url,
-                     fulltitle=title + ' - ' + item.show,
-                     show=item.show,
-                     thumbnail=item.thumbnail,
-                     args=item.args))
-
-    autorenumber.renumber(itemlist, item,'bold')
-    support.videolibrary(itemlist, item, 'color kod bold')
-
-    return itemlist
 
 def search(item, texto):
     log(texto)
@@ -168,79 +145,28 @@ def search(item, texto):
         return []
 
 
-##def search_peliculas(item):
-##    log()
-##    itemlist = []
-##
-##    action = 'findvideos' if item.extra == 'movie' else 'episodios'
-##
-##    data = httptools.downloadpage(item.url, headers=headers, ignore_response_code=True).data.replace('\t','').replace('\n','')
-##    log(data)
-##    patron = r'<a href="([^"]+)" title="Permalink to\s([^"]+) \(([^<]+)\).*?".*?<img[^s]+src="([^"]+)".*?<div class="calitate">\s*<p>([^<]+)<\/p>'
-##    matches = re.compile(patron, re.MULTILINE).findall(data)
-##
-##    for url, title, year, thumb, quality in matches:
-##        infoLabels = {}
-##        infoLabels['year'] = year
-##        title = scrapertools.decodeHtmlentities(title)
-##        quality = scrapertools.decodeHtmlentities(quality)
-##        longtitle = title + support.typo(quality,'_ [] color kod')
-##        itemlist.append(
-##            Item(channel=item.channel,
-##                 action=action,
-##                 contentType=item.contentType,
-##                 fulltitle=title,
-##                 show=title,
-##                 title=longtitle,
-##                 url=url,
-##                 thumbnail=thumb,
-##                 infoLabels=infoLabels,
-##                 args=item.args))
-##
-##    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-##
-##    return itemlist
-
-
+@support.scrape
 def newest(categoria):
-    log()
-    itemlist = []
-    item = Item()
-    item.url = host +'/aggiornamenti/'
+    if categoria == 'series':
+        item = Item(url=host + '/aggiornamenti-giornalieri-serie-tv-2')
+        item.contentType = 'tvshow'
+        patronBlock = 'Aggiornamenti Giornalieri Serie TV.*?<div class="sp-body folded">(?P<block>.*?)</div>'
+        patron = '<p>(?P<title>.*?)\((?P<year>[0-9]{4})-?\)\s*streaming.*?href="(?P<url>[^"]+)'
 
-    matches = support.match(item, patron=r'mediaWrapAlt recomended_videos"[^>]+>\s*<a href="([^"]+)" title="([^"]+)" rel="bookmark">\s*<img[^s]+src="([^"]+)"[^>]+>').matches
+        def itemHook(item):
+            item.title = item.contentTitle = item.fulltitle = item.contentSerieName = item.contentTitle = scrapertools.htmlclean(item.title)
+            return item
 
-    for url, title, thumb in matches:
-        title = scrapertools.decodeHtmlentities(title).replace("Permalink to ", "").replace("streaming", "")
-        title = re.sub(r'\s\(\d+\)','',title)
-        itemlist.append(
-            Item(channel=item.channel,
-                 action="findvideos",
-                 contentType="movie",
-                 fulltitle=title,
-                 show=title,
-                 title=support.typo(title, 'bold'),
-                 url=url,
-                 thumbnail=thumb,
-                 folder=True))
+    return locals()
 
-    tmdb.set_infoLabels_itemlist(itemlist, seekTmdb=True)
-    return itemlist
 
 def findvideos(item):
     log()
     listurl = set()
-    # itemlist = []
+    itemlist = []
     support.log("ITEMLIST: ", item)
-##    if item.args == 'anime':
-##        data = item.url
-##    else:
-##        data = httptools.downloadpage(item.url, headers=headers).data
     data = support.match(item.url, headers=headers).data
-
-    data = re.sub('\n|\t', ' ', data)
-    data = re.sub(r'>\s+<', '> <', data)
-    check = support.match(data, patron=r'<div class="category-film">\s+<h3>\s+(.*?)\s+</h3>\s+</div>').match
+    check = support.match(data, patron=r'<div class="category-film">(.*?)</div>').match
     if 'sub' in check.lower():
         item.contentLanguage = 'Sub-ITA'
     support.log("CHECK : ", check)
@@ -248,7 +174,10 @@ def findvideos(item):
         item.contentType = 'tvshow'
         item.data = data
         support.log('select = ### è una anime ###')
-        return episodios(item)
+        try:
+            return episodios(item)
+        except:
+            pass
     elif 'serie' in check.lower():
         item.contentType = 'tvshow'
         item.data = data
@@ -267,69 +196,6 @@ def findvideos(item):
             if url:
                 listurl.add(url)
     data += '\n'.join(listurl)
-    return support.server(item, data)#, headers=headers)
-    # return itemlist
 
-##def findvideos(item):
-##    log()
-##
-##    # Carica la pagina
-##    data = item.url if item.contentType == "episode" else httptools.downloadpage(item.url, headers=headers).data
-##
-##    if 'protectlink' in data:
-##        urls = scrapertools.find_multiple_matches(data, r'<iframe src="[^=]+=(.*?)"')
-##        for url in urls:
-##            url = url.decode('base64')
-##            data += '\t' + url
-##            url, c = unshorten_only(url)
-##            data += '\t' + url
-##
-##    itemlist = servertools.find_video_items(data=data)
-##
-##    for videoitem in itemlist:
-##        videoitem.title = item.title + videoitem.title
-##        videoitem.fulltitle = item.fulltitle
-##        videoitem.thumbnail = item.thumbnail
-##        videoitem.show = item.show
-##        videoitem.plot = item.plot
-##        videoitem.channel = item.channel
-##        videoitem.contentType = item.contentType
-####        videoitem.language = IDIOMAS['Italiano']
-##
-####    # Requerido para Filtrar enlaces
-####
-####    if __comprueba_enlaces__:
-####        itemlist = servertools.check_list_links(itemlist, __comprueba_enlaces_num__)
-####
-####    # Requerido para FilterTools
-####
-####    itemlist = filtertools.get_links(itemlist, item, list_language)
-####
-####    # Requerido para AutoPlay
-####
-####    autoplay.start(itemlist, item)
-##
-##    if item.contentType != 'episode':
-##        if config.get_videolibrary_support() and len(itemlist) > 0 and item.extra != 'findvideos':
-##            itemlist.append(
-##                Item(channel=item.channel, title='[COLOR yellow][B]Aggiungi alla videoteca[/B][/COLOR]', url=item.url,
-##                     action="add_pelicula_to_library", extra="findvideos", contentTitle=item.contentTitle))
-##
-##    # Estrae i contenuti
-##    patron = r'\{"file":"([^"]+)","type":"[^"]+","label":"([^"]+)"\}'
-##    matches = re.compile(patron, re.DOTALL).findall(data)
-##    for scrapedurl, scrapedtitle in matches:
-##        title = item.title + " " + scrapedtitle + " quality"
-##        itemlist.append(
-##            Item(channel=item.channel,
-##                 action="play",
-##                 title=title,
-##                 url=scrapedurl.replace(r'\/', '/').replace('%3B', ';'),
-##                 thumbnail=item.thumbnail,
-##                 fulltitle=item.title,
-##                 show=item.title,
-##                 server='',
-##                 contentType=item.contentType,
-##                 folder=False))
-##
-##    return itemlist
+    itemlist = support.server(item, data + item.otherLinks, patronTag='Keywords:\s*<span>([^<]+)')
+    return itemlist

lib/unshortenit.py

@@ -38,9 +38,10 @@ class UnshortenIt(object):
     _cryptmango_regex = r'cryptmango|xshield\.net'
     _vcrypt_regex = r'vcrypt\.net|vcrypt\.pw'
     _linkup_regex = r'linkup\.pro|buckler.link'
+    _linkhub_regex = r'linkhub\.icu'
 
     listRegex = [_adfly_regex, _linkbucks_regex, _adfocus_regex, _lnxlu_regex, _shst_regex, _hrefli_regex, _anonymz_regex,
-                 _shrink_service_regex, _rapidcrypt_regex, _cryptmango_regex, _vcrypt_regex, _linkup_regex]
+                 _shrink_service_regex, _rapidcrypt_regex, _cryptmango_regex, _vcrypt_regex, _linkup_regex, _linkhub_regex]
 
     _maxretries = 5
 
@@ -48,44 +49,49 @@ class UnshortenIt(object):
     _timeout = 10
 
     def unshorten(self, uri, type=None):
+        code = 0
+        while True:
+            oldUri = uri
+            domain = urlsplit(uri).netloc
+            if not domain:
+                return uri, "No domain found in URI!"
+            had_google_outbound, uri = self._clear_google_outbound_proxy(uri)
 
-        domain = urlsplit(uri).netloc
+            if re.search(self._adfly_regex, domain,
+                         re.IGNORECASE) or type == 'adfly':
+                uri, code = self._unshorten_adfly(uri)
+            if re.search(self._adfocus_regex, domain,
+                         re.IGNORECASE) or type == 'adfocus':
+                uri, code = self._unshorten_adfocus(uri)
+            if re.search(self._linkbucks_regex, domain,
+                         re.IGNORECASE) or type == 'linkbucks':
+                uri, code = self._unshorten_linkbucks(uri)
+            if re.search(self._lnxlu_regex, domain,
+                         re.IGNORECASE) or type == 'lnxlu':
+                uri, code = self._unshorten_lnxlu(uri)
+            if re.search(self._shrink_service_regex, domain, re.IGNORECASE):
+                uri, code = self._unshorten_shrink_service(uri)
+            if re.search(self._shst_regex, domain, re.IGNORECASE):
+                uri, code = self._unshorten_shst(uri)
+            if re.search(self._hrefli_regex, domain, re.IGNORECASE):
+                uri, code = self._unshorten_hrefli(uri)
+            if re.search(self._anonymz_regex, domain, re.IGNORECASE):
+                uri, code = self._unshorten_anonymz(uri)
+            if re.search(self._rapidcrypt_regex, domain, re.IGNORECASE):
+                uri, code = self._unshorten_rapidcrypt(uri)
+            if re.search(self._cryptmango_regex, uri, re.IGNORECASE):
+                uri, code = self._unshorten_cryptmango(uri)
+            if re.search(self._vcrypt_regex, uri, re.IGNORECASE):
+                uri, code = self._unshorten_vcrypt(uri)
+            if re.search(self._linkup_regex, uri, re.IGNORECASE):
+                uri, code = self._unshorten_linkup(uri)
+            if re.search(self._linkhub_regex, uri, re.IGNORECASE):
+                uri, code = self._unshorten_linkhub(uri)
 
-        if not domain:
-            return uri, "No domain found in URI!"
+            if oldUri == uri:
+                break
 
-        had_google_outbound, uri = self._clear_google_outbound_proxy(uri)
-
-        if re.search(self._adfly_regex, domain,
-                     re.IGNORECASE) or type == 'adfly':
-            return self._unshorten_adfly(uri)
-        if re.search(self._adfocus_regex, domain,
-                     re.IGNORECASE) or type == 'adfocus':
-            return self._unshorten_adfocus(uri)
-        if re.search(self._linkbucks_regex, domain,
-                     re.IGNORECASE) or type == 'linkbucks':
-            return self._unshorten_linkbucks(uri)
-        if re.search(self._lnxlu_regex, domain,
-                     re.IGNORECASE) or type == 'lnxlu':
-            return self._unshorten_lnxlu(uri)
-        if re.search(self._shrink_service_regex, domain, re.IGNORECASE):
-            return self._unshorten_shrink_service(uri)
-        if re.search(self._shst_regex, domain, re.IGNORECASE):
-            return self._unshorten_shst(uri)
-        if re.search(self._hrefli_regex, domain, re.IGNORECASE):
-            return self._unshorten_hrefli(uri)
-        if re.search(self._anonymz_regex, domain, re.IGNORECASE):
-            return self._unshorten_anonymz(uri)
-        if re.search(self._rapidcrypt_regex, domain, re.IGNORECASE):
-            return self._unshorten_rapidcrypt(uri)
-        if re.search(self._cryptmango_regex, uri, re.IGNORECASE):
-            return self._unshorten_cryptmango(uri)
-        if re.search(self._vcrypt_regex, uri, re.IGNORECASE):
-            return self._unshorten_vcrypt(uri)
-        if re.search(self._linkup_regex, uri, re.IGNORECASE):
-            return self._unshorten_linkup(uri)
-
-        return uri, 0
+        return uri, code
 
     def unwrap_30x(self, uri, timeout=10):
         def unwrap_30x(uri, timeout=10):
@@ -556,6 +562,19 @@ class UnshortenIt(object):
         except Exception as e:
             return uri, str(e)
 
+    def _unshorten_linkhub(self, uri):
+        try:
+            r = httptools.downloadpage(uri, follow_redirect=True, timeout=self._timeout, cookies=False)
+            if 'get/' in r.url:
+                uri = 'https://linkhub.icu/view/' + re.search('\.\./view/([^"]+)', r.data).group(1)
+                logger.info(uri)
+                r = httptools.downloadpage(uri, follow_redirect=True, timeout=self._timeout, cookies=False)
+            uri = re.search('<div id="text-url".*\n\s+<a href="([^"]+)', r.data).group(0)
+            return uri, r.code
+        except Exception as e:
+            return uri, str(e)
+
+
 def unwrap_30x_only(uri, timeout=10):
     unshortener = UnshortenIt()
     uri, status = unshortener.unwrap_30x(uri, timeout=timeout)

servers/fembed.py

@@ -12,8 +12,8 @@ def test_video_exists(page_url):
     page_url = page_url.replace("/f/","/v/")
     page_url = page_url.replace("/v/","/api/source/")
     data = httptools.downloadpage(page_url, post={}).data
-    if "Video not found or" in data:
-        return False, "[fembed] El fichero ha sido borrado"
+    if "Video not found or" in data or "We are encoding this video" in data:
+        return False, config.get_localized_string(70449) % "fembed"
     return True, ""
 
 

servers/mystream.json

@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "(?:\\w+\\.)?my?stream\\.(?:to|fun)/(?:watch/)?([a-zA-Z0-9]+)",
+        "pattern": "my?stream\\.(?:\\w+\\.)?(?:la|to|cloud|xyz|club)/(?:external|watch/)?([0-9a-zA-Z_]+)",
         "url": "https://embed.mystream.to/\\1"
       }
     ]