dooplay full scrape

channels/streamingaltadefinizione.py

@@ -14,22 +14,16 @@ host = config.get_channel_url(__channel__)
 list_servers = ['verystream', 'openload', 'wstream']
 list_quality = ['1080p', 'HD', 'DVDRIP', 'SD', 'CAM']
 
+@support.menu
 def mainlist(item):
-    support.log()
-    itemlist = []
+    film = ["/film/"]
+    anime = ["/genere/anime/",
+        ('Film Anime', ["/genere/anime/", 'peliculas']),
+        ('Film Anime per genere', ["/genere/anime/", 'generos'])
+    ]
+    tvshow = ["/serietv/"]
 
-    film =  "/film/"
-    support.menu(itemlist, 'Film Anime', 'peliculas', host + "/genere/anime/")
-    support.menu(itemlist, 'Film per genere', 'generos', host)
-    tvshow = "/serietv/"
-    support.menu(itemlist, 'Anime', 'peliculas', host + "/genere/anime/", contentType='tvshow')
-
-
-
-    autoplay.init(item.channel, list_servers, list_quality)
-    autoplay.show_option(item.channel, itemlist)
-
-    return itemlist
+    return locals()
 
 
 def search(item, text):
@@ -39,14 +33,16 @@ def search(item, text):
     return support.dooplay_search(item)
 
 
+@support.scrape
 def generos(item):
-    patron = '<a href="([^"#]+)">([a-zA-Z]+)'
-    return support.scrape(item, patron, ['url', 'title'], patron_block='<a href="#">Genere</a><ul class="sub-menu">.*?</ul>', action='peliculas')
+    patron = '<a href="(?P<url>[^"#]+)">(?P<title>[a-zA-Z]+)'
+    patronBlock='<a href="#">Genere</a><ul class="sub-menu">(?P<block>.*?)</ul>'
+    action='peliculas'
+
+    return locals()
 
 
 def peliculas(item):
-    support.log("[streamingaltadefinizione.py] video")
-
     return support.dooplay_films(item)
 
 

channels/vedohd.py

@@ -5,26 +5,12 @@
 
 from core import scrapertoolsV2, httptools, support
 from core.item import Item
-from platformcode import logger
+from platformcode import logger, config
 from specials import autoplay
-from platformcode import config
 
+__channel__ = "vedohd"
+host = config.get_channel_url(__channel__)
 headers = ""
-host = ""
-
-
-def findhost():
-    permUrl = httptools.downloadpage('https://www.cb01.uno/', follow_redirects=False).headers
-    cb01Url = 'https://www.'+permUrl['location'].replace('https://www.google.it/search?q=site:', '')
-    data = httptools.downloadpage(cb01Url).data
-    global host, headers
-
-    host = scrapertoolsV2.find_single_match(data, r'class="?mega-menu-link"? href="?(https://vedohd[^/"]+)"?')+'/'
-
-    if 'https' not in host:  # in caso cb01 cambi, si spera di riuscire ad accedere da questo URL
-        host = "https://vedohd.pw/"
-    headers = [['Referer', host]]
-
 
 IDIOMAS = {'Italiano': 'IT'}
 list_language = IDIOMAS.values()
@@ -34,25 +20,16 @@ list_quality = ['HD', 'SD']
 #esclusione degli articoli 'di servizio'
 blacklist = ['CB01.UNO ▶ TROVA L’INDIRIZZO UFFICIALE ', 'AVVISO IMPORTANTE – CB01.UNO', 'GUIDA VEDOHD']
 
-
+@support.menu
 def mainlist(item):
-    logger.info("[vedohd.py] mainlist")
-    findhost()
 
-    autoplay.init(item.channel, list_servers, list_quality)
-
-    # Main options
-    itemlist = []
-    film = "film-hd"
-    support.menu(itemlist, 'I più votati', "peliculas", host+"ratings/?get=movies")
-    support.menu(itemlist, 'I più popolari', "peliculas", host+"trending/?get=movies")
-    support.menu(itemlist, 'Generi', "generos", host)
-    support.menu(itemlist, 'Anno', "year", host)
-
-
-    autoplay.show_option(item.channel, itemlist)
-
-    return itemlist
+    film = [
+        ('I più votati', ["ratings/?get=movies", 'peliculas']),
+        ('I più popolari', ["trending/?get=movies", 'peliculas']),
+        ('Generi', ['ratings/?get=movies', 'menu', 'genres']),
+        ('Anno', ["", 'menu', 'releases']),
+    ]
+    return locals()
 
 
 def search(item, text):
@@ -63,13 +40,10 @@ def search(item, text):
 
 
 def peliculas(item):
-    logger.info("[vedohd.py] video")
-
     return support.dooplay_films(item, blacklist)
 
 
 def findvideos(item):
-    findhost()
     itemlist = []
     for link in support.dooplay_get_links(item, host):
         if link['title'] != 'Trailer':
@@ -97,16 +71,13 @@ def findvideos(item):
     return itemlist
 
 
-def generos(item):
-    findhost()
-    patron = '<a href="([^"#]+)">([a-zA-Z]+)'
-    return support.scrape(item, patron, ['url', 'title'], patron_block='<a href="#">Genere</a><ul class="sub-menu">.*?</ul>', action='peliculas')
+@support.scrape
+def menu(item):
+    patron = '<a href="(?P<url>[^"#]+)"(?: title="[^"]+")?>(?P<title>[a-zA-Z0-9]+)'
+    patronBlock = '<nav class="' + item.args + '">(?P<block>.*?)</nav>'
+    action = 'peliculas'
 
-
-def year(item):
-    findhost()
-    patron = r'<a href="([^"#]+)">(\d+)'
-    return support.scrape(item, patron, ['url', 'title'], patron_block='<a href="#">Anno</a><ul class="sub-menu">.*?</ul>', action='peliculas')
+    return locals()
 
 
 def play(item):