Altadefinizione01 è .games -> cambio dominio e aggiustamenti

channels.json

@@ -1,5 +1,6 @@
 {
     "direct": {
+        "altadefinizione01": "https://www.altadefinizione01.games",
         "altadefinizione01_link": "https://altadefinizione01.house",
         "animealtadefinizione": "https://www.animealtadefinizione.it",
         "animeforce": "https://www.animeforce.it",
@@ -48,10 +49,8 @@
         "vvvvid": "https://www.vvvvid.it"
     },
     "findhost": {
-        "altadefinizione01": "https://altadefinizione01-nuovo.info",
         "altadefinizioneclick": "https://altadefinizione-nuovo.click",
         "animealtadefinizione": "https://www.animealtadefinizione.it",
-        "film4k": "https://film4k-nuovo.link",
         "filmpertutti": "https://filmpertutti.nuovo.live",
         "seriehd": "https://nuovoindirizzo.info/seriehd",
         "tantifilm": "https://www.tantifilm.wiki"

channels/altadefinizione01.py

@@ -18,18 +18,16 @@ from core.item import Item
 from platformcode import config, logger
 
 
-def findhost(url):
+# def findhost(url):
-    data = httptools.downloadpage(url).data
+#     data = httptools.downloadpage(url).data
-    host = scrapertools.find_single_match(data, '<div class="elementor-button-wrapper"> <a href="([^"]+)"')
+#     host = scrapertools.find_single_match(data, '<div class="elementor-button-wrapper"> <a href="([^"]+)"')
-    return host
+#     return host
 
 
-host = config.get_channel_url(findhost)
+host = config.get_channel_url()
 headers = [['Referer', host]]
 
 
-
-
 @support.menu
 def mainlist(item):
 
@@ -44,6 +42,7 @@ def mainlist(item):
 
     return locals()
 
+
 @support.scrape
 def peliculas(item):
     support.info('peliculas', item)
@@ -58,7 +57,11 @@ def peliculas(item):
         
     elif item.args == 'update':
         patronBlock = r'<div class="widget-title">Ultimi Film Aggiunti/Aggiornati</div>(?P<block>.*?)<div id="alt_menu">'
-        patron = r'style="background-image:url\((?P<thumb>[^\)]+).+?<p class="h4">(?P<title>.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> [^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+).+?>.*?(?:>Film (?P<lang>Sub ITA)</a></p> )?<p>(?P<plot>[^<]+)<.*?href="(?P<url>[^"]+)'
+        patron = r'style="background-image:url\((?P<thumb>[^\)]+).+?<p class="h4">(?P<title>.*?)</p>[^>]+> [^>]+> [^>]+>[^>]+>[^>]+>[^>]+>[^>]+>[^>]+> [^>]+> [^>]+>[^>]+>(?P<year>\d{4})[^>]+>[^>]+> [^>]+>[^>]+>(?P<duration>\d+|N/A).+?>.*?(?:>Film (?P<lang>Sub ITA)</a></p> )?<p>(?P<plot>[^<]+)<.*?href="(?P<url>[^"]+)'
+    elif item.args == 'orderalf':
+        patron = r'<td class="mlnh-thumb"><a href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"' \
+                 '.+?[^>]+>[^>]+ [^>]+[^>]+ [^>]+>(?P<title>[^<]+).*?[^>]+>(?P<year>\d{4})<' \
+                 '[^>]+>[^>]+>(?P<quality>[A-Z]+)[^>]+> <td class="mlnh-5">(?P<lang>.*?)</td>'
     else:
         patronBlock = r'<div class="cover_kapsul ml-mask">(?P<block>.*)<div class="page_nav">'
 
@@ -66,12 +69,12 @@ def peliculas(item):
     # debug = True
     return locals()
 
+
 @support.scrape
 def genres(item):
     support.info('genres',item)
     
-    if item.args != 'orderalf': action = "peliculas"
+    action = "peliculas"
-    else: action = 'orderalf'
 
     blacklist = ['Altadefinizione01']
     if item.args == 'genres':
@@ -90,12 +93,12 @@ def genres(item):
 @support.scrape
 def orderalf(item):
     support.info('orderalf',item)
-    
+
-    action= 'findvideos'
+    action = 'findvideos'
     patron = r'<td class="mlnh-thumb"><a href="(?P<url>[^"]+)".*?src="(?P<thumb>[^"]+)"'\
              '.+?[^>]+>[^>]+ [^>]+[^>]+ [^>]+>(?P<title>[^<]+).*?[^>]+>(?P<year>\d{4})<'\
              '[^>]+>[^>]+>(?P<quality>[A-Z]+)[^>]+> <td class="mlnh-5">(?P<lang>.*?)</td>'
-    patronNext =  r'<span>[^<]+</span>[^<]+<a href="(.*?)">'
+    patronNext = r'<span>[^<]+</span>[^<]+<a href="(.*?)">'
 
     return locals()
 
@@ -141,4 +144,11 @@ def newest(categoria):
 
 def findvideos(item):
     support.info('findvideos', item)
-    return support.server(item, headers=headers)
+    data = httptools.downloadpage(item.url).data
+    iframe = support.match(data, patron='player-container[^>]+>\s*<iframe[^>]+src="([^"]+)').match
+    if iframe:
+        item.url = iframe
+        return support.server(item)
+    else:
+        itemlist = [item.clone(action="play", url=srv[0], quality=srv[1]) for srv in support.match(item, patron='<a href="#" data-link="([^"]+).*?<span class="d">([^<]+)').matches]
+        return support.server(item, itemlist=itemlist, headers=headers)

servers/doodstream.json

@@ -4,7 +4,7 @@
     "ignore_urls": [],
     "patterns": [
       {
-        "pattern": "https://dood(?:stream|).[^/]+/((?:e|d)/[a-z0-9]+)",
+        "pattern": "dood(?:stream|).[^/]+/((?:e|d)/[a-z0-9]+)",
         "url": "https://dood.to/\\1"
       }
     ]

servers/mystream.json

@@ -4,7 +4,7 @@
     "ignore_urls": ["https://embed.mystream.to/span"],
     "patterns": [
       {
-        "pattern": "my?stream\\.(?:\\w+\\.)?[^/]+/(?:external|watch/|embed-)?([0-9a-zA-Z_]+)",
+        "pattern": "my?stream\\.(?:\\w+\\.)?[^/ <>]+/(?:external|watch/|embed-)?([0-9a-zA-Z_]+)",
         "url": "https://embed.mystream.to/\\1"
       }
     ]

servers/streamtape.json

@@ -3,10 +3,10 @@
     "find_videos": {
         "ignore_urls": [],
         "patterns": [{
-            "pattern": "https?://streamtape\\.com/(?:e|v)/(\\w+)",
+            "pattern": "streamtape\\.com/(?:e|v)/(\\w+)",
             "url": "https://streamta.pe/e/\\1"
         },{
-            "pattern": "https?://streamta\\.pe/(?:e|v)/(\\w+)",
+            "pattern": "streamta\\.pe/(?:e|v)/(\\w+)",
             "url": "https://streamta.pe/e/\\1"
         }]
     },

servers/supervideo.json

@@ -8,7 +8,7 @@
         "url": "https://supervideo.tv/embed-\\1.html"
       },
       {
-        "pattern": "supervideo.tv/([a-z0-9]{12})",
+        "pattern": "supervideo.tv/(?:e/)?([a-z0-9]{12})",
         "url": "https://supervideo.tv/embed-\\1.html"
       }
     ]

tests/test_generic.py

@@ -68,7 +68,7 @@ chBlackList = ['url', 'mediasetplay']
 srvBlacklist = ['mega', 'hdmario', 'torrent', 'youtube']
 chNumRis = {
     'altadefinizione01': {
-        'Film': 20
+        'Film': 30
     },
     'altadefinizione01_link': {
         'Film': 16,